3.1.1封包（０．０）

2.增加超出文字字数处理逻辑

.gitignore

@@ -5,4 +5,6 @@ local.properties
 # sign.properties
 .DS_Store
 captures/
-build/
+build/
+release-app/
+scripts/apk-channel/

CHANGELOG.md

@@ -1,5 +1,14 @@
+### Ver 3.1
+
 ### Ver 3.0
-* x
+* 升级账号系统(登录流程/用户信息相关/用户账号相关操作(评论,礼包...))
+* 新增收藏功能(文章/工具箱)
+* 删除用户相关的所有本地数据库
+* 重做总开服表
+* 重做首页插件化模块
+* 礼包重复领取机制改变(可重复领取的礼包,领取后立刻显示再领一个/再淘一个)
+* 游戏下载平台面板修改(加快弹出速度,不再读取本地平台图片)
+* 接入bugly(tinker)
 
 ### Ver 2.6
 * xx

README.md

@@ -1,27 +1,66 @@
 # 光环助手Android客户端
 
-### 多渠道打包配置
+### sourcesets/debug/release
+
+* https://developer.android.com/studio/build/build-variants.html#sourcesets
+
+### APK打包配置
+
 * 使用[ApkChannelPackage](https://github.com/ltlovezh/ApkChannelPackage)的方案
-* 正式打包命令：请使用./gradlew channelRelease打包渠道包
+* 打包命令，视情况使用：
+
+    > 打包Tinker基准包：`./scripts/tinker_release_base.sh`
+
+    > 以Tinker基准包打渠道包：`./scripts/tinker_release_channel.sh`
+
+    > 以Tinker基准包打补丁包：`./scripts/tinker_release_patch.sh`
 
 ### 混淆配置
+
 * 配置文件：Android默认配置+proguard-rules.txt等
-* 参考libraries下每个项目独立的配置文件``proguard-project.txt``
+* 参考libraries下每个项目独立的配置文件`proguard-project.txt`
 
 ### apk大小优化
+
 * 限制resConfig资源集
 * 开启ShrinkResources
 * 开启混淆，使用minifyEnabled(仅在release开启）
 * pngquant对png压缩、png/jpg->webp(未尝试)
 
 ### 第三方appkey等配置
-* 修改``gradle.properties``文件将各种key填入其中，实现统一管理
+
+* 修改`gradle.properties`文件将各种key填入其中，实现统一管理
 * 通过gradle文件内的resValue/buildConfigField/manifestPlaceHolder方式实现编译期间修改，具体情况请参考``./build.gradle``和``./app/build.gradle``配置
 
 ### 拉取代码步骤
-1. 拉取主项目代码: `git clone -b master git@gitlab.ghzhushou.com:halo/assistant-android.git`
-2. 初始化公用类库: `git submodule init && git submodule update`
+
+1. 拉取主项目代码: `git clone -b dev git@gitlab.ghzhushou.com:halo/assistant-android.git`
+2. 初始化公用类库: `bash ./scripts/submodules_init.sh`
 
 ### submodule管理方式(只拉取master)
-* 拉取子模块代码：`git submodule foreach git pull origin master`
-* 提交代码，需要cd到submodule文件夹去做修改
+
+* 提交代码，需要cd到submodule文件夹去做修改
+* 更新远端代码，`bash ./scripts/submodules_update.sh`
+
+### TODO
+
+* GSON 序列化用统一的一个, GsonUtil fromJson
+* CleanApkAdapter 转化字符串size工具函数 比如SpeedUtils
+* getString 解决 字符串hardcode问题
+* ~~Adapter 里面clicklistener 用接口传参将点击操作委托给controller~~
+* ~~Adapter ViewHolder的功能，部分重写到ViewHolder类本身~~
+
+* ~~activity 统一入口未完成(外部入口相关)，去除多余activity使用，统一toolbar~~
+* release / debug compile不同的类库，不需要再做什么开关
+
+* ~~Toolbar分离，有图形按钮/没有图形按钮~~
+
+### TODO Since 3.1
+
+- 解决 Utils 工具类引发的内存泄漏问题
+- 把原有 EventBus 的消息 Type 统一到一个文件内
+- 明确 MVVM 中 Repository 及其衍生类的具体实现方式
+- 将实现细节从 View(Fragment、Activity) 剥离并以 MVVM 结构改造
+- 将 ListViewModel 所对应的 ListRepository 合并到 ListViewModel 中
+- 依照光环助手界面功能以大模块 - 小模块的方式去修改包结构，包内文件建议以包名摘要作为前缀
+- 使用 RxJava 的 Debounce 和 Map 操作优化搜索触发机制 参考资料:[1](https://proandroiddev.com/building-an-autocompleting-edittext-using-rxjava-f69c5c3f5a40),[2](https://medium.com/@kurtisnusbaum/rxandroid-basics-part-2-6e877af352)

app/build.gradle

@@ -1,19 +1,17 @@
 apply plugin: 'com.android.application'
 
-apply plugin: 'com.neenbedankt.android-apt'
-
 apply plugin: 'kotlin-android' // kotlin
-//tinker插件
-//apply plugin: 'com.tencent.tinker.patch'
 
 // apkChannelPackage
 apply plugin: 'channel'
 
+apply from: 'tinker-support.gradle'
+
 android {
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
 
     dexOptions {
@@ -22,9 +20,10 @@ android {
 
     defaultConfig {
 
+        multiDexEnabled true
         javaCompileOptions {
             annotationProcessorOptions {
-                arguments = [ eventBusIndex : 'com.gh.EventBusIndex' ]
+                arguments = [eventBusIndex: 'com.gh.EventBusIndex']
             }
         }
 
@@ -41,16 +40,12 @@ android {
         // 由于app只针对中文用户，所以仅保留zh资源，其他删掉
         resConfigs "zh"
 
-//		jackOptions {
-//			enabled true
-//		}
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode rootProject.ext.versionCode
         versionName rootProject.ext.versionName
         applicationId rootProject.ext.applicationId
 
-        multiDexEnabled true
         proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt', 'proguard-fresco.txt'
 
         /**
@@ -62,6 +57,7 @@ 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}\""
 
     }
 
@@ -83,6 +79,7 @@ android {
             minifyEnabled false
             zipAlignEnabled false
             versionNameSuffix "-debug"
+            signingConfig signingConfigs.debug
 
             buildConfigField "String", "UMENG_APPKEY", "\"${DEBUG_UMENG_APPKEY}\""
             buildConfigField "String", "UMENG_MESSAGE_SECRET", "\"${DEBUG_UMENG_MESSAGE_SECRET}\""
@@ -103,27 +100,43 @@ android {
         }
     }
 
+    flavorDimensions "nonsense"
+
     /**
      * 多渠道打包，渠道请参考"channel.txt"文件，所有渠道值均通过java code设置
      */
     productFlavors {
-        // public release host
-        pub {
-            buildConfigField "String", "HOST", "\"${HOST}\""
+        // publish release host
+        publish {
+            dimension "nonsense"
+            buildConfigField "String", "API_HOST", "\"${API_HOST}\""
             buildConfigField "String", "USER_HOST", "\"${USER_HOST}\""
             buildConfigField "String", "COMMENT_HOST", "\"${COMMENT_HOST}\""
             buildConfigField "String", "LIBAO_HOST", "\"${LIBAO_HOST}\""
             buildConfigField "String", "MESSAGE_HOST", "\"${MESSAGE_HOST}\""
             buildConfigField "String", "DATA_HOST", "\"${DATA_HOST}\""
+            buildConfigField "String", "USERSEA_HOST", "\"${USERSEA_HOST}\""
+
+            buildConfigField "String", "BUGLY_APPID", "\"${BUGLY_APPID}\""
+
+            buildConfigField "String", "USERSEA_APP_ID", "\"${USERSEA_APP_ID}\""
+            buildConfigField "String", "USERSEA_APP_SECRET", "\"${USERSEA_APP_SECRET}\""
         }
-        // internal dev host
-        dev {
-            buildConfigField "String", "HOST", "\"${DEV_HOST}\""
+        // internal test dev host
+        internal {
+            dimension "nonsense"
+            buildConfigField "String", "API_HOST", "\"${DEV_API_HOST}\""
             buildConfigField "String", "USER_HOST", "\"${DEV_USER_HOST}\""
             buildConfigField "String", "COMMENT_HOST", "\"${DEV_COMMENT_HOST}\""
             buildConfigField "String", "LIBAO_HOST", "\"${DEV_LIBAO_HOST}\""
             buildConfigField "String", "MESSAGE_HOST", "\"${DEV_MESSAGE_HOST}\""
             buildConfigField "String", "DATA_HOST", "\"${DEV_DATA_HOST}\""
+            buildConfigField "String", "USERSEA_HOST", "\"${DEV_USERSEA_HOST}\""
+
+            buildConfigField "String", "BUGLY_APPID", "\"${DEBUG_BUGLY_APPID}\""
+
+            buildConfigField "String", "USERSEA_APP_ID", "\"${DEV_USERSEA_APP_ID}\""
+            buildConfigField "String", "USERSEA_APP_SECRET", "\"${DEV_USERSEA_APP_SECRET}\""
         }
     }
 
@@ -141,12 +154,6 @@ channel {
     apkNameFormat = '${appName}-${versionName}-${versionCode}-${flavorName}-${buildType}'
 }
 
-apt {
-    arguments {
-        eventBusIndex "com.gh.EventBusIndex"
-    }
-}
-
 rebuildChannel {
 //    baseDebugApk = 已有Debug APK
 //    baseReleaseApk = 已有Release APK
@@ -157,84 +164,103 @@ rebuildChannel {
 }
 
 dependencies {
-    testCompile test.junit
-    compile fileTree(include: '*.jar', dir: 'libs')
-    compile libs.supportMultidex
-    compile libs.supportDesign
-    compile libs.supportAppCompat
-    compile libs.supportAnnotation
-    compile libs.supportPercent
-    compile libs.supportDesign
 
-    compile libs.switchButton
+    implementation fileTree(include: '*.jar', dir: 'libs')
 
-    compile libs.systemBarTint
+    debugImplementation "com.squareup.leakcanary:leakcanary-android:${leakcanary}"
+    debugImplementation "com.facebook.stetho:stetho:${stetho}"
+    debugImplementation "com.facebook.stetho:stetho-okhttp3:${stetho}"
+    debugImplementation "com.squareup.okhttp3:logging-interceptor:${okHttp}"
 
-    compile libs.fresco
-    compile libs.frescoAnimatedGif
+    implementation "com.android.support:multidex:${multidex}"
+    implementation "com.android.support:design:${androidSupport}"
+    implementation "com.android.support:support-v4:${androidSupport}"
+    implementation "com.android.support:appcompat-v7:${androidSupport}"
+    implementation "com.android.support:support-annotations:${androidSupport}"
+    implementation "com.android.support:percent:${androidSupport}"
+    implementation "com.android.support.constraint:constraint-layout:${constraintLayout}"
+    implementation "com.kyleduo.switchbutton:library:${switchButton}"
+    implementation "com.readystatesoftware.systembartint:systembartint:${systemBarTint}"
 
-    compile libs.okHttp
-    compile libs.okHttpLogInterceptor
+    implementation "com.facebook.fresco:fresco:${fresco}"
+    implementation "com.facebook.fresco:animated-gif:${fresco}"
 
-    compile libs.apkChannelPackage
+    implementation "com.squareup.okhttp3:okhttp:${okHttp}"
 
-//    debugCompile libs.stetho
-//    debugCompile libs.stethoWithOkHttp
+    implementation "com.leon.channel:helper:${apkChannelPackage}"
 
-    compile libs.retrofit
-    compile libs.retrofitWithGson   // include gson 2.7
-    compile libs.retrofitWithRxJava
-//    compile libs.gson
+    implementation "com.squareup.retrofit2:retrofit:${retrofit}"
+    implementation "com.squareup.retrofit2:converter-gson:${retrofit}"   // include gson 2.7
+    implementation "com.squareup.retrofit2:adapter-rxjava:${retrofit}"
+//    implementation "com.google.code.gson:gson:${gson}"
 
-    compile libs.ormliteAndroid
-    compile libs.ormliteCore
+    implementation "com.j256.ormlite:ormlite-android:${ormlite}"
+    implementation "com.j256.ormlite:ormlite-core:${ormlite}"
 
-    compile libs.butterKnife
-    apt libs.butterKnifeApt
+    implementation "com.jakewharton:butterknife:${butterKnife}"
+    annotationProcessor "com.jakewharton:butterknife-compiler:${butterKnife}"
 
-    compile libs.rxJava
-    compile libs.rxAndroid
-    compile libs.rxBinding
-    compile libs.zxing
-    compile libs.zxingAndroid
+    implementation "org.greenrobot:eventbus:${eventbus}"
+    annotationProcessor "org.greenrobot:eventbus-annotation-processor:${eventbusApt}"
 
-    compile libs.swipeLayout
-    compile(libs.autoScrollViewPager) {
+    implementation "io.reactivex:rxjava:${rxJava}"
+    implementation "io.reactivex:rxandroid:${rxAndroid}"
+    implementation "com.jakewharton.rxbinding:rxbinding:${rxBinding}"
+
+    //TODO update to rx 2.x
+//    implementation "io.reactivex.rxjava2:rxjava:${rxJava2}"
+//    implementation "io.reactivex.rxjava2:rxandroid:${rxAndroid2}"
+//    implementation "com.jakewharton.rxbinding2:rxbinding:${rxBinding2}"
+
+    implementation "com.google.zxing:core:${zxing}"
+    implementation "com.google.zxing:android-core:${zxing}"
+
+    implementation "com.daimajia.swipelayout:library:${swipeLayout}"
+    implementation("cn.trinea.android.view.autoscrollviewpager:android-auto-scroll-view-pager:${autoScrollViewPager}") {
         exclude module: 'support-v4'
     }
 
-    //  tinker
-//    provided libs.tinker_anno
-//    compile libs.tinker_lib
+    implementation "com.sina.weibo.sdk:core:${weiboSDK}"
 
-    compile libs.weiboSDK
+    // bugly with tinker support
+    implementation "com.tencent.bugly:crashreport_upgrade:${buglyTinkerSupport}"
 
-    compile libs.eventbus
-    apt libs.eventbusApt
-    compile project(':libraries:LGLibrary')
-    compile project(':libraries:MiPush')
-    compile project(':libraries:MTA')
-    compile project(':libraries:QQShare')
-    compile project(':libraries:TalkingData')
-    compile project(':libraries:UmengPush')
-    compile project(':libraries:WechatShare')
-    compile project(':libraries:iosched')
+    implementation "pub.devrel:easypermissions:${easypermissions}"
+    // mvvm
+    implementation "android.arch.lifecycle:runtime:${archLifecycleVersion}"
+    annotationProcessor "android.arch.lifecycle:compiler:${archLifecycleVersion}"
+    implementation "android.arch.lifecycle:extensions:${archLifecycleVersion}"
+    implementation "android.arch.persistence.room:runtime:${archRoomVersion}"
+    annotationProcessor "android.arch.persistence.room:compiler:${archRoomVersion}"
+
+    implementation 'com.google.android:flexbox:0.2.2'
+
+    implementation project(':libraries:LGLibrary')
+    implementation project(':libraries:MTA')
+    implementation project(':libraries:QQShare')
+    implementation project(':libraries:TalkingData')
+    implementation project(':libraries:UmengPush')
+    implementation project(':libraries:WechatShare')
+    implementation project(':libraries:iosched')
+    implementation project(':libraries:LogHub')
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
 }
-File propFile = file('sign.properties');
+File propFile = file('sign.properties')
 if (propFile.exists()) {
-    def Properties props = new Properties()
+    Properties props = new Properties()
     props.load(new FileInputStream(propFile))
 
     if (props.containsKey('keyAlias') && props.containsKey('keyPassword') &&
             props.containsKey('storeFile') && props.containsKey('storePassword')) {
         android.signingConfigs {
-			debug {
-				keyAlias props.get('keyAlias')
-				keyPassword props.get('keyPassword')
-				storeFile file(props.get('storeFile'))
-				storePassword props.get('storePassword')
-			}
+            // debug 不要使用正式签名，这样tinker才不会打补丁。
+            debug {
+                keyAlias props.get('keyAlias')
+                keyPassword props.get('keyPassword')
+                storeFile file(props.get('storeFile'))
+                storePassword props.get('storePassword')
+            }
             release {
                 keyAlias props.get('keyAlias')
                 keyPassword props.get('keyPassword')

app/proguard-rules.txt

@@ -16,9 +16,23 @@
 #   public *;
 #}
 
+#--------- remove logs start  ----------------
+-assumenosideeffects class com.lightgame.config.CommonDebug {
+   private static String getLogTag(...);
+   private static String getMethodName();
+   public static void logMethodName(...);
+   public static void logParams(...);
+   public static void logFields(...);
+   public static void logMethodWithParams(...);
+}
+
+#-assumenosideeffects class com.lightgame.config.CommonDebug {*;}
+
+#-dontoptimize
+#--------- remove logs end  ----------------
+
 -keepattributes *Annotation*,Signature,InnerClasses,EnclosingMethod
 -dontwarn InnerClasses
--dontoptimize
 
 # OrmLite uses reflection
 -keep class com.j256.**
@@ -126,6 +140,7 @@
 -keep class com.gh.common.view.** {*;}
 -keep class com.gh.gamecenter.db.info.** {*;}
 -keep class com.gh.gamecenter.entity.** {*;}
+-keep class com.gh.gamecenter.ask.entity.** {*;}
 -keep class com.gh.gamecenter.retrofit.** {*;}
 -keep class com.gh.gamecenter.eventbus.** {*;}
 -keep class * extends rx.Subscriber
@@ -161,4 +176,18 @@
 
 -keepclassmembers enum * { *; }
 
-##---------------End: proguard configuration for Gson  ----------
+##---------------End: proguard configuration for Gson  ----------
+
+# ------ bugly ---------
+-dontwarn com.tencent.bugly.**
+-keep public class com.tencent.bugly.**{*;}
+
+# easypermission
+-keepclassmembers class * {
+    @pub.devrel.easypermissions.AfterPermissionGranted <methods>;
+}
+
+# 重命名文件为SourceFile，再配合mapping符号表，可以拿到真实的类名
+-renamesourcefileattribute SourceFile
+# 保留源文件行号
+-keepattributes SourceFile,LineNumberTable

app/src/debug/java/com/gh/gamecenter/DataUtils.java

@@ -0,0 +1,208 @@
+package com.gh.gamecenter;
+
+import android.app.Activity;
+import android.app.Application;
+import android.content.Context;
+
+import com.gh.common.constant.Config;
+import com.gh.common.util.PackageUtils;
+import com.tencent.bugly.crashreport.CrashReport;
+import com.tencent.stat.MtaSDkException;
+import com.tencent.stat.StatConfig;
+import com.tencent.stat.StatCrashReporter;
+import com.tencent.stat.StatReportStrategy;
+import com.tencent.stat.StatService;
+import com.tendcloud.tenddata.TCAgent;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
+/**
+ * Created by LGT on 2016/6/15.
+ * 数据收集 工具类 （TalkingData、MTA）
+ */
+public class DataUtils {
+
+    public static final boolean DEBUG = true;
+
+    /**
+     * 初始化各种统计工具，仅在release build（非debug）模式启用统计
+     *
+     * @param context
+     * @param channel
+     */
+    public static void init(final Application context, String channel) {
+
+//        // 神烦这些SDK上报，debug就不开了
+//        if (DEBUG) return;
+
+        //TalkingData
+        try {
+            TCAgent.LOG_ON = false;
+            TCAgent.init(context, Config.TALKINGDATA_APPID, channel);
+            /**
+             *
+             * 不要启用！！！！不要启用，全部由{@link com.gh.base.AppUncaughtHandler}处理
+             */
+            TCAgent.setReportUncaughtExceptions(false);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        //MTA
+        try {
+            /**
+             *
+             * 不要启用！！！！全部由{@link com.gh.base.AppUncaughtHandler}处理
+             */
+            StatConfig.setAutoExceptionCaught(false);
+
+            StatCrashReporter crashReporter = StatCrashReporter.getStatCrashReporter(context);
+            crashReporter.setJavaCrashHandlerStatus(false);
+//            crashReporter.setEnableInstantReporting(true);
+
+            StatConfig.setDebugEnable(DEBUG);
+
+            // 设置数据上报策略
+            if (DEBUG) {
+                StatConfig.setStatSendStrategy(StatReportStrategy.INSTANT);
+            } else {
+                StatConfig.setStatSendStrategy(StatReportStrategy.PERIOD);
+                StatConfig.setSendPeriodMinutes(5);
+            }
+
+            // 设置启用Tlink
+            StatConfig.setTLinkStatus(true);
+
+            StatConfig.init(context);
+            StatConfig.setInstallChannel(channel);
+            StatConfig.setAntoActivityLifecycleStat(true);
+            StatConfig.setAppVersion(PackageUtils.getPatchVersionName());
+
+            // 开启收集服务
+            StatService.startStatService(context, Config.MTA_APPKEY, com.tencent.stat.common.StatConstants.VERSION);
+            StatService.registerActivityLifecycleCallbacks(context);
+
+        } catch (MtaSDkException e) {
+            e.printStackTrace();
+        }
+
+        // init bugly
+        try {
+
+            CrashReport.setIsDevelopmentDevice(context, "GH_TEST".equals(channel));
+
+            CrashReport.UserStrategy strategy = new CrashReport.UserStrategy(context);
+            strategy.setEnableANRCrashMonitor(false);
+            strategy.setEnableNativeCrashMonitor(false);
+            strategy.setAppChannel(channel);
+            strategy.setAppVersion(PackageUtils.getPatchVersionName());
+
+            CrashReport.initCrashReport(context, Config.BUGLY_APPID, DEBUG, strategy);
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+//        Logger.setLogger(context, new LoggerInterface() {
+//
+//            @Override
+//            public void setTag(String tag) {
+//                CommonDebug.logMethodWithParams(this, tag);
+//            }
+//
+//            @Override
+//            public void log(String content) {
+//                CommonDebug.logMethodWithParams(this, content);
+//            }
+//
+//            @Override
+//            public void log(String content, Throwable t) {
+//                CommonDebug.logMethodWithParams(this, content, t);
+//            }
+//        });
+
+    }
+
+    public static void onEvent(Context var0, String var1, String var2) {
+        TCAgent.onEvent(var0, var1, var2);
+        StatService.trackCustomEvent(var0, var1, var2);
+    }
+
+    public static void onPause(Activity var0) {
+        TCAgent.onPageEnd(var0, var0.getClass().getSimpleName());
+        StatService.onPause(var0);
+    }
+
+    public static void onResume(Activity var0) {
+        TCAgent.onPageStart(var0, var0.getClass().getSimpleName());
+        StatService.onResume(var0);
+    }
+
+    // 游戏启动
+    public static void onGameLaunchEvent(Context context, String gameName, String platform, String page) {
+        Map<String, Object> kv = new HashMap<>();
+        kv.put("版本", platform);
+        kv.put("页面", page);
+        onEvent(context, "游戏启动", gameName, kv);
+    }
+
+    public static void onEvent(Context var0, String var1, String var2, Map<String, Object> var3) {
+        TCAgent.onEvent(var0, var1, var2, var3);
+        Properties prop = new Properties();
+        prop.setProperty("label", var2);
+        for (String key : var3.keySet()) {
+            prop.setProperty(key, var3.get(key) + "");
+        }
+        StatService.trackCustomKVEvent(var0, var1, prop);
+    }
+
+    // 游戏下载
+    public static void onGameDownloadEvent(Context context, String gameName, String platform, String entrance, String status) {
+        Map<String, Object> kv = new HashMap<>();
+        kv.put("版本", platform);
+        kv.put("状态", status);
+        onEvent(context, "游戏下载", gameName, kv);
+
+        Map<String, Object> kv2 = new HashMap<>();
+        kv2.put("版本", platform);
+        kv2.put("状态", status);
+        kv2.put("位置", entrance);
+        onEvent(context, "游戏下载位置", gameName, kv2);
+
+        Map<String, Object> kv3 = new HashMap<>();
+        kv3.put(entrance, "下载数");
+        kv3.put(entrance, status);
+        onEvent(context, "应用数据", gameName, kv3);
+    }
+
+    // 游戏更新
+    public static void onGameUpdateEvent(Context context, String gameName, String paltform, String status) {
+        Map<String, Object> kv = new HashMap<>();
+        kv.put("版本", paltform);
+        kv.put("状态", status);
+        onEvent(context, "游戏更新", gameName, kv);
+    }
+
+    public static void onError(Context context, Throwable throwable) {
+        // MTA主动上传错误
+        try {
+            StatService.reportException(context, throwable);
+        } catch (Exception e) {
+        }
+
+//        //bugly 作为默认处理异常的类库，已经上报了，此处不重复上报
+//        try {
+//            CrashReport.postCatchedException(throwable);
+//        } catch (Exception e) {
+//        }
+
+        //talkingdata
+        try {
+            TCAgent.onError(context, throwable);
+        } catch (Exception e) {
+        }
+    }
+
+}

app/src/debug/java/com/gh/gamecenter/Injection.java

@@ -0,0 +1,46 @@
+package com.gh.gamecenter;
+
+import android.app.Application;
+
+import com.facebook.stetho.Stetho;
+import com.facebook.stetho.okhttp3.StethoInterceptor;
+import com.squareup.leakcanary.LeakCanary;
+
+import okhttp3.OkHttpClient;
+import okhttp3.logging.HttpLoggingInterceptor;
+
+/**
+ * @author CsHeng
+ * @Date 03/09/2017
+ * @Time 4:34 PM
+ */
+
+public class Injection {
+
+    public static boolean appInit(Application application) {
+
+        // init leakcanary
+        if (LeakCanary.isInAnalyzerProcess(application)) {
+            // This process is dedicated to LeakCanary for heap analysis.
+            // You should not init your app in this process.
+            return false;
+        }
+        LeakCanary.install(application);
+
+        // init stetho
+        Stetho.initializeWithDefaults(application);
+
+        return true;
+    }
+
+    public static OkHttpClient.Builder provideRetrofitBuilder() {
+        OkHttpClient.Builder builder = new OkHttpClient.Builder();
+        HttpLoggingInterceptor interceptor = new HttpLoggingInterceptor();
+        interceptor.setLevel(HttpLoggingInterceptor.Level.BODY);
+        builder.addNetworkInterceptor(interceptor);
+        builder.addNetworkInterceptor(new StethoInterceptor());
+        return builder;
+    }
+
+
+}

app/src/main/AndroidManifest.xml

@@ -39,6 +39,14 @@
     <!-- 修改系统设置的权限 -->
     <uses-permission android:name = "android.permission.WRITE_SETTINGS" />
 
+    <!-- bugly with tinker -->
+    <uses-permission android:name = "android.permission.READ_PHONE_STATE" />
+    <uses-permission android:name = "android.permission.INTERNET" />
+    <uses-permission android:name = "android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name = "android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name = "android.permission.READ_LOGS" />
+    <uses-permission android:name = "android.permission.WRITE_EXTERNAL_STORAGE" />
+
     <supports-screens
         android:anyDensity = "true"
         android:largeScreens = "true"
@@ -48,7 +56,7 @@
 
     <!--android:largeHeap = "true"-->
     <application
-        android:name = "com.gh.base.AppController"
+        android:name = "com.halo.assistant.TinkerApp"
         android:allowBackup = "true"
         android:icon = "@drawable/logo"
         android:label = "@string/app_name"
@@ -66,6 +74,7 @@
 
                 <category android:name = "android.intent.category.LAUNCHER" />
             </intent-filter >
+
         </activity >
 
         <activity
@@ -79,9 +88,9 @@
             android:launchMode = "singleTask"
             android:screenOrientation = "portrait" />
 
+        <!--android:theme = "@android:style/Theme.Black.NoTitleBar.Fullscreen"  退出时屏幕抖动 -->
         <activity
-            android:name = "com.gh.gamecenter.ViewImageActivity"
-            android:theme = "@android:style/Theme.Black.NoTitleBar.Fullscreen" />
+            android:name = "com.gh.gamecenter.ViewImageActivity" />
         <activity
             android:name = "com.gh.gamecenter.SearchActivity"
             android:configChanges = "keyboardHidden"
@@ -160,9 +169,6 @@
         <activity
             android:name = "com.gh.gamecenter.AboutActivity"
             android:screenOrientation = "portrait" />
-        <activity
-            android:name = "com.gh.gamecenter.KaiFuActivity"
-            android:screenOrientation = "portrait" />
         <activity
             android:name = "com.gh.gamecenter.CommentDetailActivity"
             android:screenOrientation = "portrait" />
@@ -202,15 +208,42 @@
             android:screenOrientation = "portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.UserAreaActivity"
+            android:name = "com.gh.gamecenter.UserRegionActivity"
             android:screenOrientation = "portrait" />
 
-        <!--非全屏+ScrollView+adjustResize-->
+        <activity
+            android:name = "com.gh.gamecenter.CollectionActivity"
+            android:screenOrientation = "portrait" />
+
+        <activity
+            android:name = "com.gh.gamecenter.MessageActivity"
+            android:screenOrientation = "portrait" />
 
         <activity
             android:name = "com.gh.gamecenter.UserInfoEditActivity"
             android:screenOrientation = "portrait"
             android:windowSoftInputMode = "stateHidden" />
+        <activity
+            android:name = "com.gh.gamecenter.KaiFuActivity"
+            android:screenOrientation = "portrait" />
+        <activity
+            android:name = "com.gh.gamecenter.NormalActivity"
+            android:screenOrientation = "portrait" />
+
+        <activity
+            android:name = "com.gh.gamecenter.QuestionsDetailActivity"
+            android:screenOrientation = "portrait" />
+
+        <activity
+            android:name = "com.gh.gamecenter.AskSearchActivity"
+            android:screenOrientation = "portrait" />
+
+        <!-- 使用小米/华为推送弹窗功能提高推送成功率-->
+        <activity
+            android:name = "com.gh.gamecenter.PushProxyActivity"
+            android:exported = "true"
+            android:theme = "@android:style/Theme.Translucent" />
+
         <activity
             android:name = "com.gh.gamecenter.SkipActivity"
             android:theme = "@style/Theme.AppCompat.Light.Fullscreen.Transparent" >
@@ -236,13 +269,7 @@
                 <data android:scheme = "package" />
             </intent-filter >
         </receiver >
-        <receiver
-            android:name = "com.gh.gamecenter.receiver.NotificationReceiver"
-            android:exported = "false" >
-            <intent-filter >
-                <action android:name = "com.gh.gamecenter.NOTIFICATION" />
-            </intent-filter >
-        </receiver >
+
         <receiver
             android:name = "com.gh.gamecenter.receiver.DownloadReceiver"
             android:exported = "false" >
@@ -271,7 +298,7 @@
             </intent-filter >
         </receiver >
 
-        <service android:name = "com.gh.gamecenter.statistics.AppStaticService" />
+        <!--<service android:name = "com.gh.gamecenter.statistics.AppStaticService" />-->
 
     </application >
 

app/src/main/assets/content.js

@@ -0,0 +1,24 @@
+function requestContentFocus() {
+    $('#editor').focus();
+}
+
+function setupWhenContentEditable() {
+    var editor = $('#editor');
+    if (!editor[0].hasAttribute('contenteditable')) {
+        return;
+    }
+
+    // paste 回调只会获取粘贴之前的光标位置，需要自己手动加上粘贴文本的长度，并保证粘贴的是纯文本
+    editor.on('paste', function(e) {
+        e.preventDefault();
+        var text = (e.originalEvent || e).clipboardData.getData('text/plain');
+        text = text.replace(/\n/g, '<br>');
+        document.execCommand("insertHTML", false, text);
+    });
+
+    requestContentFocus();
+}
+
+$(document).ready(function() {
+    setupWhenContentEditable();
+});

app/src/main/assets/editor.html

@@ -0,0 +1,15 @@
+<!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">
+</head>
+<body>
+<div id="editor" contenteditable="true"></div>
+<script type="text/javascript" src="zepto.min.js"></script>
+<script type="text/javascript" src="rich_editor.js"></script>
+<script type="text/javascript" src="content.js"></script>
+</body>
+</html>

app/src/main/assets/normalize.css

@@ -0,0 +1,413 @@
+/*! normalize.css v3.0.2 | MIT License | git.io/normalize */
+
+/**
+ * 1. Set default font family to sans-serif.
+ * 2. Prevent iOS text size adjust after orientation change, without disabling
+ *    user zoom.
+ */
+
+html {
+  font-family: sans-serif; /* 1 */
+  -webkit-text-size-adjust: 100%; /* 2 */
+}
+
+/**
+ * Remove default margin.
+ */
+
+body {
+  margin: 0;
+}
+
+/* HTML5 display definitions
+   ========================================================================== */
+
+/**
+ * Correct `block` display not defined for any HTML5 element in IE 8/9.
+ * Correct `block` display not defined for `details` or `summary` in IE 10/11
+ * and Firefox.
+ * Correct `block` display not defined for `main` in IE 11.
+ */
+
+article,
+aside,
+details,
+figcaption,
+figure,
+footer,
+header,
+hgroup,
+main,
+menu,
+nav,
+section,
+summary {
+  display: block;
+}
+
+/**
+ * 1. Correct `inline-block` display not defined in IE 8/9.
+ * 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera.
+ */
+
+audio,
+canvas,
+progress,
+video {
+  display: inline-block; /* 1 */
+  vertical-align: baseline; /* 2 */
+}
+
+/**
+ * Prevent modern browsers from displaying `audio` without controls.
+ * Remove excess height in iOS 5 devices.
+ */
+
+audio:not([controls]) {
+  display: none;
+  height: 0;
+}
+
+/**
+ * Address `[hidden]` styling not present in IE 8/9/10.
+ * Hide the `template` element in IE 8/9/11, Safari, and Firefox < 22.
+ */
+
+[hidden],
+template {
+  display: none;
+}
+
+/* Links
+   ========================================================================== */
+
+/**
+ * Remove the gray background color from active links in IE 10.
+ */
+
+a {
+  background-color: transparent;
+}
+
+/**
+ * Improve readability when focused and also mouse hovered in all browsers.
+ */
+
+a:active,
+a:hover {
+  outline: 0;
+}
+
+/* Text-level semantics
+   ========================================================================== */
+
+/**
+ * Address styling not present in IE 8/9/10/11, Safari, and Chrome.
+ */
+
+abbr[title] {
+  border-bottom: 1px dotted;
+}
+
+/**
+ * Address style set to `bolder` in Firefox 4+, Safari, and Chrome.
+ */
+
+b,
+strong {
+  font-weight: bold;
+}
+
+/**
+ * Address styling not present in Safari and Chrome.
+ */
+
+dfn {
+  font-style: italic;
+}
+
+/**
+ * Address variable `h1` font-size and margin within `section` and `article`
+ * contexts in Firefox 4+, Safari, and Chrome.
+ */
+
+h1 {
+  font-size: 2em;
+  margin: 0.67em 0;
+}
+
+/**
+ * Address styling not present in IE 8/9.
+ */
+
+mark {
+  background: #ff0;
+  color: #000;
+}
+
+/**
+ * Address inconsistent and variable font size in all browsers.
+ */
+
+small {
+  font-size: 80%;
+}
+
+/**
+ * Prevent `sub` and `sup` affecting `line-height` in all browsers.
+ */
+
+sub,
+sup {
+  font-size: 75%;
+  line-height: 0;
+  position: relative;
+  vertical-align: baseline;
+}
+
+sup {
+  top: -0.5em;
+}
+
+sub {
+  bottom: -0.25em;
+}
+
+/* Embedded content
+   ========================================================================== */
+
+/**
+ * Remove border when inside `a` element in IE 8/9/10.
+ */
+
+img {
+  border: 0;
+}
+
+/**
+ * Correct overflow not hidden in IE 9/10/11.
+ */
+
+svg:not(:root) {
+  overflow: hidden;
+}
+
+/* Grouping content
+   ========================================================================== */
+
+/**
+ * Address margin not present in IE 8/9 and Safari.
+ */
+
+figure {
+  margin: 1em 40px;
+}
+
+/**
+ * Address differences between Firefox and other browsers.
+ */
+
+hr {
+  box-sizing: content-box;
+  height: 0;
+}
+
+/**
+ * Contain overflow in all browsers.
+ */
+
+pre {
+  overflow: auto;
+}
+
+/**
+ * Address odd `em`-unit font size rendering in all browsers.
+ */
+
+code,
+kbd,
+pre,
+samp {
+  font-family: monospace, monospace;
+  font-size: 1em;
+}
+
+/* Forms
+   ========================================================================== */
+
+/**
+ * Known limitation: by default, Chrome and Safari on OS X allow very limited
+ * styling of `select`, unless a `border` property is set.
+ */
+
+/**
+ * 1. Correct color not being inherited.
+ *    Known issue: affects color of disabled elements.
+ * 2. Correct font properties not being inherited.
+ * 3. Address margins set differently in Firefox 4+, Safari, and Chrome.
+ */
+
+button,
+input,
+optgroup,
+select,
+textarea {
+  color: inherit; /* 1 */
+  font: inherit; /* 2 */
+  margin: 0; /* 3 */
+}
+
+/**
+ * Address `overflow` set to `hidden` in IE 8/9/10/11.
+ */
+
+button {
+  overflow: visible;
+}
+
+/**
+ * Address inconsistent `text-transform` inheritance for `button` and `select`.
+ * All other form control elements do not inherit `text-transform` values.
+ * Correct `button` style inheritance in Firefox, IE 8/9/10/11, and Opera.
+ * Correct `select` style inheritance in Firefox.
+ */
+
+button,
+select {
+  text-transform: none;
+}
+
+/**
+ * 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio`
+ *    and `video` controls.
+ * 2. Correct inability to style clickable `input` types in iOS.
+ * 3. Improve usability and consistency of cursor style between image-type
+ *    `input` and others.
+ */
+
+button,
+html input[type="button"], /* 1 */
+input[type="reset"],
+input[type="submit"] {
+  -webkit-appearance: button; /* 2 */
+  cursor: pointer; /* 3 */
+}
+
+/**
+ * Re-set default cursor for disabled elements.
+ */
+
+button[disabled],
+html input[disabled] {
+  cursor: default;
+}
+
+/**
+ * Address Firefox 4+ setting `line-height` on `input` using `!important` in
+ * the UA stylesheet.
+ */
+
+input {
+  line-height: normal;
+}
+
+/**
+ * It's recommended that you don't attempt to style these elements.
+ * Firefox's implementation doesn't respect box-sizing, padding, or width.
+ *
+ * 1. Address box sizing set to `content-box` in IE 8/9/10.
+ * 2. Remove excess padding in IE 8/9/10.
+ */
+
+input[type="checkbox"],
+input[type="radio"] {
+  box-sizing: border-box; /* 1 */
+  padding: 0; /* 2 */
+}
+
+/**
+ * Fix the cursor style for Chrome's increment/decrement buttons. For certain
+ * `font-size` values of the `input`, it causes the cursor style of the
+ * decrement button to change from `default` to `text`.
+ */
+
+input[type="number"]::-webkit-inner-spin-button,
+input[type="number"]::-webkit-outer-spin-button {
+  height: auto;
+}
+
+/**
+ * 1. Address `appearance` set to `searchfield` in Safari and Chrome.
+ * 2. Address `box-sizing` set to `border-box` in Safari and Chrome
+ */
+
+input[type="search"] {
+  -webkit-appearance: textfield; /* 1 */
+  -webkit-box-sizing: content-box; /* 2 */
+  box-sizing: content-box;
+}
+
+/**
+ * Remove inner padding and search cancel button in Safari and Chrome on OS X.
+ * Safari (but not Chrome) clips the cancel button when the search input has
+ * padding (and `textfield` appearance).
+ */
+
+input[type="search"]::-webkit-search-cancel-button,
+input[type="search"]::-webkit-search-decoration {
+  -webkit-appearance: none;
+}
+
+/**
+ * Define consistent border, margin, and padding.
+ */
+
+fieldset {
+  border: 1px solid #c0c0c0;
+  margin: 0 2px;
+  padding: 0.35em 0.625em 0.75em;
+}
+
+/**
+ * 1. Correct `color` not being inherited in IE 8/9/10/11.
+ * 2. Remove padding so people aren't caught out if they zero out fieldsets.
+ */
+
+legend {
+  border: 0; /* 1 */
+  padding: 0; /* 2 */
+}
+
+/**
+ * Remove default vertical scrollbar in IE 8/9/10/11.
+ */
+
+textarea {
+  overflow: auto;
+}
+
+/**
+ * Don't inherit the `font-weight` (applied by a rule above).
+ * NOTE: the default cannot safely be changed in Chrome and Safari on OS X.
+ */
+
+optgroup {
+  font-weight: bold;
+}
+
+/* Tables
+   ========================================================================== */
+
+/**
+ * Remove most spacing between table cells.
+ */
+
+table {
+  border-collapse: collapse;
+  border-spacing: 0;
+}
+
+td,
+th {
+  padding: 0;
+}

app/src/main/assets/rich_editor.js

@@ -0,0 +1,392 @@
+/**
+ * Copyright (C) 2017 Wasabeef
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+var RE = {};
+
+RE.currentSelection = {
+    "startContainer": 0,
+    "startOffset": 0,
+    "endContainer": 0,
+    "endOffset": 0};
+
+RE.editor = document.getElementById('editor');
+
+document.addEventListener("selectionchange", function() { RE.backuprange(); });
+
+// Initializations
+RE.callback = function() {
+    window.location.href = "re-callback://" + encodeURI(RE.getHtml());
+}
+
+RE.setHtml = function(contents) {
+    RE.editor.innerHTML = decodeURIComponent(contents.replace(/\+/g, '%20'));
+}
+
+RE.getHtml = function() {
+    return RE.editor.innerHTML;
+}
+
+RE.getText = function() {
+    return RE.editor.innerText;
+}
+
+RE.setBaseTextColor = function(color) {
+    RE.editor.style.color  = color;
+}
+
+RE.setBaseFontSize = function(size) {
+    RE.editor.style.fontSize = size;
+}
+
+RE.setPadding = function(left, top, right, bottom) {
+  RE.editor.style.paddingLeft = left;
+  RE.editor.style.paddingTop = top;
+  RE.editor.style.paddingRight = right;
+  RE.editor.style.paddingBottom = bottom;
+}
+
+RE.setBackgroundColor = function(color) {
+    document.body.style.backgroundColor = color;
+}
+
+RE.setBackgroundImage = function(image) {
+    RE.editor.style.backgroundImage = image;
+}
+
+RE.setWidth = function(size) {
+    RE.editor.style.minWidth = size;
+}
+
+RE.setHeight = function(size) {
+    RE.editor.style.height = size;
+}
+
+RE.setTextAlign = function(align) {
+    RE.editor.style.textAlign = align;
+}
+
+RE.setVerticalAlign = function(align) {
+    RE.editor.style.verticalAlign = align;
+}
+
+RE.setPlaceholder = function(placeholder) {
+    RE.editor.setAttribute("placeholder", placeholder);
+}
+
+RE.setEditorFocus = function() {
+    RE.editor.focus();
+}
+
+RE.setInputEnabled = function(inputEnabled) {
+    RE.editor.contentEditable = String(inputEnabled);
+}
+
+RE.setFocusByEnd = function() {
+//alert("111111")
+//    var txt =RE.editor.createTextRange();
+//    ("22222")
+//    txt.moveStart('character',-1);
+//    ("333333")
+//    txt.collapse(true);
+//    ("444444")
+//    txt.select();
+//    alert("ddddddd")
+}
+
+RE.undo = function() {
+    document.execCommand('undo', false, null);
+}
+
+RE.redo = function() {
+    document.execCommand('redo', false, null);
+}
+
+RE.setBold = function() {
+    document.execCommand('bold', false, null);
+}
+
+RE.setItalic = function() {
+    document.execCommand('italic', false, null);
+}
+
+RE.setSubscript = function() {
+    document.execCommand('subscript', false, null);
+}
+
+RE.setSuperscript = function() {
+    document.execCommand('superscript', false, null);
+}
+
+RE.setStrikeThrough = function() {
+    document.execCommand('strikeThrough', false, null);
+}
+
+RE.setUnderline = function() {
+    document.execCommand('underline', false, null);
+}
+
+RE.setBullets = function() {
+    document.execCommand('insertUnorderedList', false, null);
+}
+
+RE.setNumbers = function() {
+    document.execCommand('insertOrderedList', false, null);
+}
+
+RE.setTextColor = function(color) {
+    RE.restorerange();
+    document.execCommand("styleWithCSS", null, true);
+    document.execCommand('foreColor', false, color);
+    document.execCommand("styleWithCSS", null, false);
+}
+
+RE.setTextBackgroundColor = function(color) {
+    RE.restorerange();
+    document.execCommand("styleWithCSS", null, true);
+    document.execCommand('hiliteColor', false, color);
+    document.execCommand("styleWithCSS", null, false);
+}
+
+RE.setFontSize = function(fontSize){
+    document.execCommand("fontSize", false, fontSize);
+}
+
+RE.setHeading = function(heading) {
+    document.execCommand('formatBlock', false, '<h'+heading+'>');
+}
+
+RE.setIndent = function() {
+    document.execCommand('indent', false, null);
+}
+
+RE.setOutdent = function() {
+    document.execCommand('outdent', false, null);
+}
+
+RE.setJustifyLeft = function() {
+    document.execCommand('justifyLeft', false, null);
+}
+
+RE.setJustifyCenter = function() {
+    document.execCommand('justifyCenter', false, null);
+}
+
+RE.setJustifyRight = function() {
+    document.execCommand('justifyRight', false, null);
+}
+
+RE.setBlockquote = function() {
+    document.execCommand('formatBlock', false, '<blockquote>');
+}
+
+RE.insertImage = function(url) {
+    var html = "<div><img src =\"" + url + "\" style=\" max-width: 100%; display:block; margin:8px auto; height: auto;\"></div>"
+    RE.insertHTML(html);
+}
+
+RE.replaceTbImage = function() {
+    var imgs = document.getElementsByTagName("img");
+    for (var i = 0; i < imgs.length; i++) {
+         var img = imgs[i];
+         if(img.src.indexOf("/tb/") > 0) continue;
+         var imgArr = img.src.split("/");
+         var tbImg = ""
+         for (var j = 0; j < imgArr.length; j++) {
+             if (j == imgArr.length - 1) {
+                 tbImg += "tb/" + imgArr[j];
+             } else {
+                 tbImg += imgArr[j] + "/";
+             }
+         }
+         img.style.cssText = "max-width: 30%; display:block; margin:8px auto; height: auto;"
+         img.src = tbImg;
+
+         if (i == 0) {
+             var bigImg = document.createElement('img');
+             bigImg.src = "file:///android_asset/web_load_dfimg_icon.png";
+             bigImg.style.cssText = "max-width: 20%; margin:8px 0 0 0; height: auto;"
+             img.parentNode.insertBefore(bigImg, img.parentNode.childNodes[0]);
+             i++;
+         }
+    }
+}
+
+RE.replaceAllDfImage = function() {
+    var imgs = document.getElementsByTagName("img");
+    for (var i = 0; i < imgs.length; i++) {
+         var img = imgs[i];
+         if(img.src.indexOf("web_load_dfimg_icon") > 0) {
+            img.parentNode.removeChild(img.parentNode.childNodes[0]);
+            i--;
+         } else {
+           img.style.cssText = "max-width: 100%; display:block; margin:8px auto; height: auto;"
+           img.src = img.src.replace("/tb/", "/");
+         }
+    }
+
+}
+
+RE.replaceDfImageByUrl = function(imgUrl) {
+    var imgs = document.getElementsByTagName("img");
+    for (var i = 0; i < imgs.length; i++) {
+         var img = imgs[i];
+         if (img.src == imgUrl) {
+             img.style.cssText = "max-width: 100%; display:block; margin:8px auto; height: auto;"
+             img.src = img.src.replace("/tb/", "/");
+         }
+    }
+}
+
+RE.ImageClickListener = function() {
+    var imgs = document.getElementsByTagName("img");
+    for (var i = 0; i < imgs.length; i++) {
+         var img = imgs[i];
+         window.imagelistener.imageArr(img.src);
+         img.onclick = function() {
+             window.imagelistener.imageClick(this.src);
+         }
+    }
+}
+
+RE.insertHTML = function(html) {
+    RE.restorerange();
+    document.execCommand('insertHTML', false, html);
+}
+
+RE.insertLink = function(url, title) {
+    RE.restorerange();
+    var sel = document.getSelection();
+    if (sel.toString().length == 0) {
+        document.execCommand("insertHTML",false,"<a href='"+url+"'>"+title+"</a>");
+    } else if (sel.rangeCount) {
+       var el = document.createElement("a");
+       el.setAttribute("href", url);
+       el.setAttribute("title", title);
+
+       var range = sel.getRangeAt(0).cloneRange();
+       range.surroundContents(el);
+       sel.removeAllRanges();
+       sel.addRange(range);
+   }
+    RE.callback();
+}
+
+RE.setTodo = function(text) {
+    var html = '<input type="checkbox" name="'+ text +'" value="'+ text +'"/> &nbsp;';
+    document.execCommand('insertHTML', false, html);
+}
+
+RE.prepareInsert = function() {
+    RE.backuprange();
+}
+
+RE.backuprange = function(){
+    var selection = window.getSelection();
+    if (selection.rangeCount > 0) {
+      var range = selection.getRangeAt(0);
+      RE.currentSelection = {
+          "startContainer": range.startContainer,
+          "startOffset": range.startOffset,
+          "endContainer": range.endContainer,
+          "endOffset": range.endOffset};
+    }
+}
+
+RE.restorerange = function(){
+    var selection = window.getSelection();
+    selection.removeAllRanges();
+    var range = document.createRange();
+    range.setStart(RE.currentSelection.startContainer, RE.currentSelection.startOffset);
+    range.setEnd(RE.currentSelection.endContainer, RE.currentSelection.endOffset);
+    selection.addRange(range);
+}
+
+RE.enabledEditingItems = function(e) {
+    var items = [];
+    if (document.queryCommandState('bold')) {
+        items.push('bold');
+    }
+    if (document.queryCommandState('italic')) {
+        items.push('italic');
+    }
+    if (document.queryCommandState('subscript')) {
+        items.push('subscript');
+    }
+    if (document.queryCommandState('superscript')) {
+        items.push('superscript');
+    }
+    if (document.queryCommandState('strikeThrough')) {
+        items.push('strikeThrough');
+    }
+    if (document.queryCommandState('underline')) {
+        items.push('underline');
+    }
+    if (document.queryCommandState('insertOrderedList')) {
+        items.push('orderedList');
+    }
+    if (document.queryCommandState('insertUnorderedList')) {
+        items.push('unorderedList');
+    }
+    if (document.queryCommandState('justifyCenter')) {
+        items.push('justifyCenter');
+    }
+    if (document.queryCommandState('justifyFull')) {
+        items.push('justifyFull');
+    }
+    if (document.queryCommandState('justifyLeft')) {
+        items.push('justifyLeft');
+    }
+    if (document.queryCommandState('justifyRight')) {
+        items.push('justifyRight');
+    }
+    if (document.queryCommandState('insertHorizontalRule')) {
+        items.push('horizontalRule');
+    }
+    var formatBlock = document.queryCommandValue('formatBlock');
+    if (formatBlock.length > 0) {
+        items.push(formatBlock);
+    }
+
+    window.location.href = "re-state://" + encodeURI(items.join(','));
+}
+
+RE.focus = function() {
+    var range = document.createRange();
+    range.selectNodeContents(RE.editor);
+    range.collapse(false);
+    var selection = window.getSelection();
+    selection.removeAllRanges();
+    selection.addRange(range);
+    RE.editor.focus();
+}
+
+RE.blurFocus = function() {
+    RE.editor.blur();
+}
+
+RE.removeFormat = function() {
+    document.execCommand('removeFormat', false, null);
+}
+
+// Event Listeners
+RE.editor.addEventListener("input", RE.callback);
+RE.editor.addEventListener("keyup", function(e) {
+    var KEY_LEFT = 37, KEY_RIGHT = 39;
+    if (e.which == KEY_LEFT || e.which == KEY_RIGHT) {
+        RE.enabledEditingItems(e);
+    }
+});
+RE.editor.addEventListener("click", RE.enabledEditingItems);

app/src/main/assets/style.css

@@ -0,0 +1,43 @@
+/**
+ * Copyright (C) 2017 Wasabeef
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+@charset "UTF-8";
+
+
+html {
+  height: 100%;
+}
+
+body {
+  overflow: scroll;
+  display: table;
+  table-layout: fixed;
+  width: 100%;
+  min-height:100%;
+}
+
+#editor {
+  display: table-cell;
+  outline: 0px solid transparent;
+  background-repeat: no-repeat;
+  background-position: center;
+  background-size: cover;
+}
+
+#editor[placeholder]:empty:not(:focus):before {
+  content: attr(placeholder);
+  opacity: .5;
+}}

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

@@ -1,244 +0,0 @@
-package com.gh.base;
-
-import android.app.ActivityManager;
-import android.app.ActivityManager.RunningAppProcessInfo;
-import android.app.Application;
-import android.content.Context;
-import android.os.Process;
-import android.support.multidex.MultiDex;
-import android.support.v4.util.ArrayMap;
-import android.text.TextUtils;
-import android.util.Log;
-
-import com.facebook.drawee.backends.pipeline.Fresco;
-import com.gh.EventBusIndex;
-import com.gh.common.constant.Config;
-import com.gh.common.util.DataUtils;
-import com.gh.common.util.StringUtils;
-import com.gh.common.util.TokenUtils;
-import com.gh.gamecenter.BuildConfig;
-import com.leon.channel.helper.ChannelReaderUtil;
-import com.lightgame.utils.Utils;
-import com.umeng.message.IUmengRegisterCallback;
-import com.umeng.message.PushAgent;
-import com.umeng.message.UTrack;
-import com.xiaomi.channel.commonutils.logger.LoggerInterface;
-import com.xiaomi.mipush.sdk.Logger;
-import com.xiaomi.mipush.sdk.MiPushClient;
-import com.xiaomi.mipush.sdk.MiPushCommandMessage;
-
-import org.greenrobot.eventbus.EventBus;
-
-import java.util.List;
-import java.util.concurrent.Executor;
-import java.util.concurrent.Executors;
-
-public class AppController extends Application {
-
-    public static final String TAG = AppController.class.getSimpleName();
-    public static final String KEY_FILE_INFO = "FileInfo";
-    //快传文件发送单线程
-    public static Executor FILE_SENDER_EXECUTOR = Executors.newSingleThreadExecutor();
-    //快传文件发送主要的线程池
-    public static Executor MAIN_EXECUTOR = Executors.newCachedThreadPool();
-    private static AppController mInstance;
-    private static ArrayMap<String, Object> objectMap = new ArrayMap<>();
-
-    private String mChannel;
-
-    public static void put(String key, Object object) {
-        if (objectMap == null) {
-            objectMap = new ArrayMap<>();
-        }
-        objectMap.put(key, object);
-    }
-
-    public static Object get(String key, boolean isRemove) {
-        if (objectMap == null) {
-            return null;
-        }
-        if (isRemove) {
-            return objectMap.remove(key);
-        } else {
-            return objectMap.get(key);
-        }
-    }
-
-    public static void remove(String key) {
-        if (objectMap == null) {
-            return;
-        }
-        objectMap.remove(key);
-    }
-
-    public static synchronized AppController getInstance() {
-        return mInstance;
-    }
-
-    public String getChannel() {
-        return mChannel;
-    }
-
-    @Override
-    protected void attachBaseContext(Context base) {
-        super.attachBaseContext(base);
-        MultiDex.install(this);
-    }
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-
-        mInstance = this;
-
-        //TODO 强烈不建议开发阶段开启这个Handler，必须处理错误
-        if (!BuildConfig.DEBUG) {
-            AppUncaughtHandler appUncaughtHandler = new AppUncaughtHandler(this);
-            Thread.setDefaultUncaughtExceptionHandler(appUncaughtHandler);
-        }
-
-        mChannel = ChannelReaderUtil.getChannel(this);
-        if (TextUtils.isEmpty(mChannel)) {
-            //默认用Android Studio run时并没有写入channel magic number到apk包里面，所以需要fallback
-            mChannel = "GH_TEST";
-        }
-
-        Log.e("CHANNEL_ID", mChannel);
-
-        //初始化Fresco
-        Fresco.initialize(this);
-
-        DataUtils.init(this, BuildConfig.DEBUG, mChannel);
-
-        //测试MTA崩溃的，坑爹
-//        if (BuildConfig.DEBUG) {
-//            StatConfig.setDebugEnable(true);
-//            StatConfig.setStatSendStrategy(StatReportStrategy.DEVELOPER);
-//            throw new RuntimeException("test again");
-//        }
-
-//        if (BuildConfig.DEBUG) {
-//            Stetho.initializeWithDefaults(this);
-//        }
-
-        /**
-         * 注册push服务，注册成功后会向{@link GHPushMessageReceiver}发送广播
-         * 可以从{@link GHPushMessageReceiver#onCommandResult(Context, MiPushCommandMessage)}
-         * 的{@link MiPushCommandMessage} 对象参数中获取注册信息
-         */
-        try {
-            if (shouldInit()) {
-                MiPushClient.registerPush(this, Config.MIPUSH_APPID, Config.MIPUSH_APPKEY);
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-        if (BuildConfig.DEBUG) {
-            LoggerInterface newLogger = new LoggerInterface() {
-
-                @Override
-                public void setTag(String tag) {
-                    // ignore
-                }
-
-                @Override
-                public void log(String content) {
-                    Log.d(TAG, content);
-                }
-
-                @Override
-                public void log(String content, Throwable t) {
-                    Log.d(TAG, content, t);
-                }
-            };
-            Logger.setLogger(this, newLogger);
-        }
-
-        try {
-            //友盟推送
-            final PushAgent pushAgent = PushAgent.getInstance(this);
-            pushAgent.setAppkeyAndSecret(Config.UMENG_APPKEY, Config.UMENG_MESSAGE_SECRET);
-
-            //注册推送服务，每次调用register方法都会回调该接口
-            pushAgent.register(new IUmengRegisterCallback() {
-
-                @Override
-                public void onSuccess(String deviceToken) {
-                    //注册成功会返回device token
-                    Utils.log("deviceToken::" + deviceToken);
-
-                    //设置别名
-                    pushAgent.addExclusiveAlias(TokenUtils.getDeviceId(getApplicationContext()),
-                            "GHDID", new UTrack.ICallBack() {
-                                @Override
-                                public void onMessage(boolean b, String s) {
-                                    Utils.log(StringUtils.buildString("ExclusiveAlias::", String.valueOf(b), "==", s));
-
-                                }
-                            });
-                }
-
-                @Override
-                public void onFailure(String s, String s1) {
-                    Utils.log("deviceToken::" + "注册失败");
-                }
-            });
-
-            // 友盟推送数据处理
-            pushAgent.setNotificationClickHandler(new GHUmengNotificationClickHandler());
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-//        // 监听屏幕状态广播
-//		if (shouldInit()) {
-//			UnlockScreenReceiver unlockScreenReceiver = new UnlockScreenReceiver();
-//			IntentFilter intentFilter = new IntentFilter();
-//			intentFilter.addAction(Intent.ACTION_SCREEN_ON);
-//			intentFilter.addAction(Intent.ACTION_SCREEN_OFF);
-//			registerReceiver(unlockScreenReceiver, intentFilter);
-//
-//			// 用户App运行数据统计服务
-//			Intent intent = new Intent(getApplicationContext(), AppStaticService.class);
-//			startService(intent);
-//
-//			AppRunTimeDao dao = new AppRunTimeDao(getApplicationContext());
-//			for (AppRunTimeInfo appRunTimeInfo : dao.getAll()) {
-//				Utils.log(appRunTimeInfo.getPackageName() + "====1111=====" + appRunTimeInfo.getRunTime());
-//			}
-//		}
-
-            // 启用EventBus3.0加速功能
-            EventBus.builder().addIndex(new EventBusIndex()).installDefaultEventBus();
-        }
-
-    private boolean shouldInit() {
-        ActivityManager am = ((ActivityManager) getSystemService(Context.ACTIVITY_SERVICE));
-        List<RunningAppProcessInfo> processInfos = am.getRunningAppProcesses();
-        String mainProcessName = getPackageName();
-        Log.d(TAG, mainProcessName);
-        int myPid = Process.myPid();
-        for (RunningAppProcessInfo info : processInfos) {
-            if (info.pid == myPid && mainProcessName.equals(info.processName)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-//    public static String getProcessName(Context cxt, int pid) {
-//        ActivityManager am = (ActivityManager) cxt.getSystemService(Context.ACTIVITY_SERVICE);
-//        List<RunningAppProcessInfo> runningApps = am.getRunningAppProcesses();
-//        if (runningApps == null) {
-//            return null;
-//        }
-//        for (RunningAppProcessInfo procInfo : runningApps) {
-//            if (procInfo.pid == pid) {
-//                return procInfo.processName;
-//            }
-//        }
-//        return null;
-//    }
-
-}

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

@@ -5,16 +5,18 @@ import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.os.Looper;
 import android.preference.PreferenceManager;
 import android.util.Log;
-import android.widget.Toast;
 
+import com.gh.common.constant.Config;
 import com.gh.common.util.DataCollectionUtils;
+import com.gh.gamecenter.DataUtils;
 import com.gh.gamecenter.SplashScreenActivity;
+import com.lightgame.config.CommonDebug;
 import com.lightgame.download.FileUtils;
 import com.lightgame.utils.AppManager;
-import com.lightgame.utils.RuntimeUtils;
-import com.tencent.stat.StatService;
+import com.lightgame.utils.Utils;
 
 import java.io.File;
 import java.io.FileWriter;
@@ -26,80 +28,58 @@ import java.util.Locale;
 
 public class AppUncaughtHandler implements UncaughtExceptionHandler {
 
-    private UncaughtExceptionHandler mDefaultHandler;
     private Context mContext;
 
     public AppUncaughtHandler(Context context) {
         // 获取系统默认的UncaughtException处理器
-        mDefaultHandler = Thread.getDefaultUncaughtExceptionHandler();
         mContext = context;
     }
 
     @Override
     public void uncaughtException(Thread thread, Throwable ex) {
-        if (!handleException(ex) && mDefaultHandler != null) {
-            // 如果用户没有处理则让系统默认的异常处理器来处理
-            mDefaultHandler.uncaughtException(thread, ex);
-        } else {
-            RuntimeUtils.getInstance().runOnUiThread(new Runnable() {
-                @Override
-                public void run() {
-                    Toast.makeText(mContext.getApplicationContext(),
-                            "\"光环助手\"发生错误", Toast.LENGTH_SHORT).show();
-                }
-            });
-            try {
-                Thread.sleep(1000);
-            } catch (InterruptedException e) {
-                e.printStackTrace();
+        new Thread(new Runnable() {
+            @Override
+            public void run() {
+                Looper.prepare();
+                Utils.toast(mContext.getApplicationContext(), "\"光环助手\"发生错误");
+                Looper.loop();
             }
-
-            // 防止重复奔溃，导致助手一直重启，20秒内不做处理
-            SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(mContext);
-            long time = sp.getLong("last_restart_time", 0);
-            if (System.currentTimeMillis() - time > 20 * 1000) {
-                sp.edit().putLong("last_restart_time", System.currentTimeMillis()).apply();
-                Intent intent = new Intent(mContext, SplashScreenActivity.class);
-                intent.setAction(Intent.ACTION_MAIN);
-                intent.addCategory(Intent.CATEGORY_LAUNCHER);
-                PendingIntent restartIntent = PendingIntent.getActivity(mContext, 0, intent,
-                        PendingIntent.FLAG_UPDATE_CURRENT);
-                // 退出程序并重启
-                AlarmManager mgr = (AlarmManager) mContext.getSystemService(Context.ALARM_SERVICE);
-                mgr.set(AlarmManager.RTC, System.currentTimeMillis() + 1000, restartIntent); // 1秒钟后重启应用
-            }
-            AppManager.getInstance().finishAllActivity();
-        }
+        });
+        saveLocalLog(mContext, ex);
+        restart(mContext);
     }
 
-    /**
-     * 自定义错误处理,收集错误信息 发送错误报告等操作均在此完成.
-     *
-     * @param ex
-     * @return true:如果处理了该异常信息;否则返回false.
-     */
-    private boolean handleException(Throwable ex) {
-        if (ex == null) {
-            return false;
+    public static void restart(final Context context) {
+
+        // 防止重复奔溃，导致助手一直重启，20秒内不做处理
+        SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(context);
+        long curTime = System.currentTimeMillis();
+        long time = sp.getLong("last_restart_time", 0);
+        if (curTime - time > 20 * 1000) {
+            sp.edit().putLong("last_restart_time", curTime).apply();
+            Intent intent = new Intent(context, SplashScreenActivity.class);
+            intent.setAction(Intent.ACTION_MAIN);
+            intent.addCategory(Intent.CATEGORY_LAUNCHER);
+            PendingIntent restartIntent = PendingIntent.getActivity(context, 0, intent,
+                    PendingIntent.FLAG_UPDATE_CURRENT);
+            // 退出程序并重启
+            AlarmManager mgr = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
+            mgr.set(AlarmManager.RTC, curTime + 3000, restartIntent); // 1秒钟后重启应用
         }
-        saveLog(ex);
-        return true;
+
+        //error restart
+//        System.exit(2);
+        AppManager.getInstance().finishAllActivity();
     }
 
     // 保存log到本地
-    private void saveLog(Throwable ex) {
+    public static void saveLocalLog(Context context, Throwable ex) {
         String errorMsg = Log.getStackTraceString(ex);
-
-        // MTA主动上传错误
-//        StatService.reportError(mContext.getApplicationContext(), errorMsg);
-        StatService.reportException(mContext, ex);
-
-        // 上传错误数据
-        DataCollectionUtils.uploadError(mContext, errorMsg);
+        Config.setExceptionMsg(context, errorMsg);
 
         // 保存到本地
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd-HH-mm-ss", Locale.getDefault());
-        File file = new File(FileUtils.getLogPath(mContext.getApplicationContext(),
+        File file = new File(FileUtils.getLogPath(context.getApplicationContext(),
                 format.format(new Date()) + "_gh_assist" + ".log"));
         FileWriter writer = null;
         try {
@@ -120,4 +100,25 @@ public class AppUncaughtHandler implements UncaughtExceptionHandler {
         }
 
     }
+
+    /**
+     * 下次应用启动再上报
+     *
+     * @param context
+     * @param throwable
+     */
+    public static void reportException(Context context, Throwable throwable) {
+
+        CommonDebug.logMethodWithParams(context, "ERRMSG", throwable);
+
+        // 上传错误数据
+        try {
+            DataCollectionUtils.uploadError(context, Log.getStackTraceString(throwable));
+        } catch (Exception e) {
+        }
+
+        DataUtils.onError(context, throwable);
+
+    }
+
 }

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

@@ -1,113 +1,118 @@
 package com.gh.base;
 
-import android.os.Build;
+import android.arch.lifecycle.Lifecycle;
+import android.content.Intent;
 import android.os.Bundle;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.TextView;
-import android.widget.Toast;
+import android.os.Handler;
+import android.os.Message;
+import android.support.annotation.NonNull;
 
-import com.gh.common.util.DataUtils;
 import com.gh.common.util.DialogUtils;
 import com.gh.common.util.PackageUtils;
 import com.gh.common.util.RunningUtils;
 import com.gh.common.util.ShareUtils;
-import com.gh.download.DownloadManager;
+import com.gh.common.util.StringUtils;
+import com.gh.gamecenter.DataUtils;
+import com.gh.gamecenter.LoginActivity;
 import com.gh.gamecenter.R;
 import com.gh.gamecenter.eventbus.EBShowDialog;
 import com.lightgame.download.FileUtils;
-import com.lightgame.utils.AppManager;
-import com.readystatesoftware.systembartint.SystemBarTintManager.SystemBarConfig;
+import com.lightgame.utils.Utils;
+import com.tencent.tauth.Tencent;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
+import org.json.JSONException;
+import org.json.JSONObject;
 
-import java.util.ArrayList;
+import java.lang.ref.WeakReference;
+import java.util.List;
 
 import butterknife.ButterKnife;
+import pub.devrel.easypermissions.EasyPermissions;
 
-import static com.gh.common.util.EntranceUtils.KEY_DATA;
 import static com.gh.common.util.EntranceUtils.KEY_ENTRANCE;
 
-public abstract class BaseActivity extends BaseAppCompatToolBarActivity {
+public abstract class BaseActivity extends BaseToolBarActivity implements EasyPermissions.PermissionCallbacks {
 
     protected String mEntrance;
+
     private boolean mIsPause;
+    private boolean mIsExistLogoutDialog;
+
+    protected final Handler mBaseHandler = new BaseHandler(this);
+
+    protected static class BaseHandler extends Handler {
+        private final WeakReference<BaseActivity> mActivityWeakReference;
+
+        BaseHandler(BaseActivity activity) {
+            mActivityWeakReference = new WeakReference<>(activity);
+        }
+
+        @Override
+        public void handleMessage(Message msg) {
+            super.handleMessage(msg);
+            mActivityWeakReference.get().handleMessage(msg);
+        }
+    }
+
+    protected void handleMessage(Message msg) {
+
+    }
+
+    //接收QQ或者QQ空间分享回调
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == com.tencent.connect.common.Constants.REQUEST_QQ_SHARE
+                || requestCode == com.tencent.connect.common.Constants.REQUEST_QZONE_SHARE) {
+            Tencent.onActivityResultData(requestCode, resultCode, data, ShareUtils.getInstance(this).QqShareListener);
+        }
+    }
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        init(mContentView);
-        AppManager.getInstance().addActivity(this);
         EventBus.getDefault().register(this);
+        ButterKnife.bind(this);
         mEntrance = getIntent().getStringExtra(KEY_ENTRANCE);
-        if (getIntent().getBundleExtra(KEY_DATA) != null) {
-            mEntrance = getIntent().getBundleExtra(KEY_DATA).getString(KEY_ENTRANCE);
-        }
+    }
+
+    @Override
+    protected void onDestroy() {
+        EventBus.getDefault().unregister(this);
+        mBaseHandler.removeCallbacksAndMessages(null);
+        super.onDestroy();
     }
 
     @Override
     protected boolean onNavigationIconClicked() {
-        return false;
-    }
-
-    private void init(View contentView) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-            SystemBarConfig config = getTintManager().getConfig();
-            contentView.setPadding(0, config.getPixelInsetTop(false), 0, config.getPixelInsetBottom());
-        }
-        setContentView(contentView);
-
-        ButterKnife.bind(this);
-
-        View back = findViewById(R.id.actionbar_rl_back);
-        if (back != null)
-            back.setOnClickListener(new OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    finish();
-                }
-            });
-    }
-
-    protected void initTitle(String title) {
-        TextView actionbar_tv_title = (TextView) findViewById(R.id.actionbar_tv_title);
-        actionbar_tv_title.setText(title);
-//        setNavigationTitle(title);
+        onBackPressed();
+        return true;
     }
 
     public void toast(String msg) {
-        Toast.makeText(this, msg, Toast.LENGTH_SHORT).show();
+        if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED))
+            Utils.toast(this, msg);
     }
 
     public void toast(int msg) {
-        Toast.makeText(this, msg, Toast.LENGTH_SHORT).show();
+        if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED))
+            toast(getString(msg));
     }
 
-    //如果是游戏分享，newsTitle默认为空
-    public void showShare(String url, String gameName, String icon, String newsTitle, ArrayList<String> tag, boolean isToolsBox) {
+    public void showShare(String url, String icon, String shareTitle, String shareSummary, ShareUtils.ShareType shareType) {
 
-        //判断是否是官方版
-        boolean isPlugin = false;
-        if (tag != null) {
-            for (String s : tag) {
-                if (!"官方版".equals(s)) {
-                    isPlugin = true;
-                }
-            }
-        }
+        ShareUtils.getInstance(this).showShareWindows(this, getWindow().getDecorView(), url, icon, shareTitle, shareSummary, shareType);
 
-        ShareUtils.getInstance(this).showShareWindows(getWindow().getDecorView(), url, gameName, icon, newsTitle, isPlugin, true, isToolsBox);
-
-        if (newsTitle == null) {
-            DataUtils.onEvent(this, "内容分享", gameName);
+        if (shareType == ShareUtils.ShareType.game || shareType == ShareUtils.ShareType.plugin) {
+            DataUtils.onEvent(this, "内容分享", shareTitle + shareSummary);
         } else {
-            DataUtils.onEvent(this, "内容分享", newsTitle);
+            DataUtils.onEvent(this, "内容分享", shareTitle);
         }
     }
 
-
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onEventMainThread(final EBShowDialog showDialog) {
         if (!mIsPause && this.getClass().getName().equals(RunningUtils.getTopActivity(this))) {
@@ -118,36 +123,61 @@ public abstract class BaseActivity extends BaseAppCompatToolBarActivity {
                     @Override
                     public void onConfirm() {
                         if (FileUtils.isEmptyFile(showDialog.getPath())) {
-                            Toast.makeText(BaseActivity.this, "解析包出错（可能被误删了），请重新下载", Toast.LENGTH_SHORT).show();
+                            toast(R.string.install_failure_hint);
                         } else {
                             startActivity(PackageUtils.getUninstallIntent(BaseActivity.this, showDialog.getPath()));
                         }
                     }
                 });
+            } else if ("loginException".equals(showDialog.getType())) {
+                if (mIsExistLogoutDialog) return;
+                mIsExistLogoutDialog = true;
+                try {
+                    JSONObject object = new JSONObject(showDialog.getPath());
+                    JSONObject device = object.getJSONObject("device");
+                    String manufacturer = device.getString("manufacturer");
+                    String model = device.getString("model");
+                    DialogUtils.showAlertDialog(this, "你的账号已在另外一台设备登录"
+                            , StringUtils.buildString("（", manufacturer, " - ", model, "）")
+                            , "知道了", "重新登录"
+                            , null
+                            , () -> startActivity(LoginActivity.getIntent(BaseActivity.this))
+                    );
+                    mBaseHandler.postDelayed(() -> mIsExistLogoutDialog = false, 5000);
+                } catch (JSONException e) {
+                    e.printStackTrace();
+                }
+
+
             }
         }
     }
 
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        EventBus.getDefault().unregister(this);
-        AppManager.getInstance().finishActivity(this);
-    }
-
     @Override
     protected void onPause() {
         super.onPause();
-        DataUtils.onPause(this);
         mIsPause = true;
     }
 
     @Override
     protected void onResume() {
         super.onResume();
-        DataUtils.onResume(this);
         mIsPause = false;
-        DownloadManager.getInstance(this).initGameMap();
     }
 
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+        EasyPermissions.onRequestPermissionsResult(requestCode, permissions, grantResults, this);
+    }
+
+    @Override
+    public void onPermissionsDenied(int requestCode, List<String> perms) {
+
+    }
+
+    @Override
+    public void onPermissionsGranted(int requestCode, List<String> perms) {
+
+    }
 }

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

@@ -1,154 +0,0 @@
-package com.gh.base;
-
-import android.annotation.TargetApi;
-import android.graphics.Color;
-import android.os.Build;
-import android.os.Bundle;
-import android.support.v7.widget.Toolbar;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.Window;
-import android.view.WindowManager;
-
-import com.gh.gamecenter.R;
-import com.lightgame.BaseAppCompatActivity;
-import com.lightgame.ToolbarContainer;
-import com.lightgame.ToolbarController;
-import com.readystatesoftware.systembartint.SystemBarTintManager;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-
-/**
- * Created by csheng on 15-10-12.
- */
-@ToolbarContainer
-public abstract class BaseAppCompatToolBarActivity extends BaseAppCompatActivity implements ToolbarController {
-
-    private Toolbar mToolbar;
-    private SystemBarTintManager mTintManager;
-
-    // TODO 获取沉浸栏管理，要进行版本判断或者判断是否为空
-    public SystemBarTintManager getTintManager() {
-        return mTintManager;
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        initToolbar();
-//        Util_Window.initStatusBarColor(getWindow(), ContextCompat.getColor(this, R.color.theme));
-        initStatusBar();
-    }
-
-    private void initToolbar() {
-        mToolbar = (Toolbar) findViewById(R.id.toolbar_navigation);
-        if (mToolbar != null) {
-//            mToolbar.setTitle("");
-            setSupportActionBar(mToolbar);
-            mToolbar.addView(View.inflate(this, R.layout.reuse_actionbar, null));
-            getSupportActionBar().setHomeButtonEnabled(false);
-//            getSupportActionBar().setDisplayHomeAsUpEnabled(false);
-//            getSupportActionBar().setDisplayShowHomeEnabled(false);
-//            getSupportActionBar().setDisplayOptions();
-        }
-    }
-
-    private void initStatusBar() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-            setTranslucentStatus(true);
-            mTintManager = new SystemBarTintManager(this);
-            mTintManager.setStatusBarTintEnabled(true);
-//            mTintManager.setNavigationBarTintEnabled(true);
-            if (Build.MANUFACTURER.equals("Meizu") || Build.MANUFACTURER.equals("Xiaomi")) {
-                mTintManager.setStatusBarTintColor(Color.WHITE);
-            } else {
-                mTintManager.setStatusBarTintColor(Color.BLACK);
-            }
-
-            switch (Build.MANUFACTURER) {
-                case "Meizu":
-                    try {
-                        Window window = getWindow();
-                        if (window != null) {
-                            WindowManager.LayoutParams lp = window.getAttributes();
-                            Field darkFlag = WindowManager.LayoutParams.class.getDeclaredField("MEIZU_FLAG_DARK_STATUS_BAR_ICON");
-                            Field meizuFlags = WindowManager.LayoutParams.class.getDeclaredField("meizuFlags");
-                            darkFlag.setAccessible(true);
-                            meizuFlags.setAccessible(true);
-                            int bit = darkFlag.getInt(null);
-                            int value = meizuFlags.getInt(lp);
-                            value |= bit;
-                            meizuFlags.setInt(lp, value);
-                            window.setAttributes(lp);
-                        }
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    }
-                    break;
-                case "Xiaomi":
-                    try {
-                        Window window = getWindow();
-                        if (window != null) {
-                            Class<?> clazz = window.getClass();
-                            Class layoutParams = Class.forName("android.view.MiuiWindowManager$LayoutParams");
-                            Field field = layoutParams.getField("EXTRA_FLAG_STATUS_BAR_DARK_MODE");
-                            int darkModeFlag = field.getInt(layoutParams);
-                            Method extraFlagField = clazz.getMethod("setExtraFlags", int.class, int.class);
-                            extraFlagField.invoke(window, darkModeFlag, darkModeFlag);
-                        }
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    }
-                    break;
-                default:
-                    break;
-
-            }
-        }
-    }
-
-    @TargetApi(Build.VERSION_CODES.KITKAT)
-    protected void setTranslucentStatus(boolean status) {
-        Window window = getWindow();
-        WindowManager.LayoutParams winParams = window.getAttributes();
-        final int bits = WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS;
-        if (status) {
-            winParams.flags |= bits;
-        } else {
-            winParams.flags &= ~bits;
-        }
-        window.setAttributes(winParams);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case android.R.id.home:
-                return onNavigationIconClicked();
-        }
-        return super.onOptionsItemSelected(item);
-    }
-
-    protected abstract boolean onNavigationIconClicked();
-
-    @Override
-    public void setNavigationTitle(int res) {
-        if (mToolbar != null) {
-            mToolbar.setTitle(res);
-        }
-    }
-
-    @Override
-    public void setNavigationTitle(CharSequence res) {
-        if (mToolbar != null) {
-            mToolbar.setTitle(res);
-        }
-    }
-
-    @Override
-    public Toolbar getToolBar() {
-        return mToolbar;
-    }
-
-}

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

@@ -1,397 +0,0 @@
-//package com.gh.base;
-//
-//import android.content.Intent;
-//import android.os.Bundle;
-//import android.support.v4.content.ContextCompat;
-//import android.support.v7.widget.RecyclerView;
-//import android.text.TextUtils;
-//import android.view.View;
-//import android.widget.ImageView;
-//import android.widget.LinearLayout;
-//import android.widget.ProgressBar;
-//import android.widget.RelativeLayout;
-//import android.widget.TextView;
-//
-//import com.gh.common.constant.Config;
-//import com.gh.common.util.ApkActiveUtils;
-//import com.gh.common.util.DataUtils;
-//import com.gh.common.util.DialogUtils;
-//import com.gh.common.util.DisplayUtils;
-//import com.gh.common.util.GameUtils;
-//import com.gh.common.util.NetworkUtils;
-//import com.gh.common.util.PackageUtils;
-//import com.gh.common.util.ShareUtils;
-//import com.gh.common.view.DownloadDialog;
-//import com.gh.download.DownloadManager;
-//import com.gh.gamecenter.DownloadManagerActivity;
-//import com.gh.gamecenter.R;
-//import com.gh.gamecenter.entity.ApkEntity;
-//import com.gh.gamecenter.entity.GameEntity;
-//import com.gh.gamecenter.eventbus.EBDownloadStatus;
-//import com.gh.gamecenter.eventbus.EBPackage;
-//import com.gh.gamecenter.manager.PackageManager;
-//import com.lightgame.download.DataWatcher;
-//import com.lightgame.download.DownloadEntity;
-//import com.lightgame.download.FileUtils;
-//import com.tencent.tauth.Tencent;
-//
-//import org.greenrobot.eventbus.Subscribe;
-//import org.greenrobot.eventbus.ThreadMode;
-//
-///**
-// * Created by Administrator on 2016/9/19.
-// * 游戏详情、新闻详情基类（控制底部下载栏）
-// */
-//public abstract class BaseDetailActivity extends BaseActivity implements View.OnClickListener {
-//
-//    protected TextView actionbar_tv_title;
-//    protected RecyclerView detail_rv_show;
-//    protected LinearLayout detail_ll_bottom;
-//    protected TextView detail_tv_download;
-//    protected ProgressBar detail_pb_progressbar;
-//    protected TextView detail_tv_per;
-//    protected LinearLayout reuse_ll_loading;
-//    protected LinearLayout reuse_no_connection;
-//    protected LinearLayout reuse_none_data;
-//    protected TextView reuse_tv_none_data;
-//    protected ImageView iv_share;
-//
-//    protected GameEntity gameEntity;
-//    protected DownloadEntity mDownloadEntity;
-//
-//    protected String name;
-//    protected String title;
-//    protected String downloadAddWord;
-//    protected String downloadOffText;
-//
-//    private DataWatcher dataWatcher = new DataWatcher() {
-//        @Override
-//        public void onDataChanged(DownloadEntity downloadEntity) {
-//            if (gameEntity != null && gameEntity.getApk().size() == 1) {
-//                String url = gameEntity.getApk().get(0).getUrl();
-//                if (url.equals(downloadEntity.getUrl())) {
-//                    if (!"pause".equals(DownloadManager.getInstance(BaseDetailActivity.this).
-//                            getStatus(downloadEntity.getUrl()))) {
-//                        mDownloadEntity = downloadEntity;
-//                        invalidate();
-//                    }
-//                }
-//            }
-//        }
-//    };
-//
-//    @Override
-//    protected int getLayoutId() {
-//        return R.layout.activity_detail;
-//    }
-//
-//    //接收QQ或者QQ空间分享回调
-//    @Override
-//    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-//        super.onActivityResult(requestCode, resultCode, data);
-//
-//        if (requestCode == com.tencent.connect.common.Constants.REQUEST_QQ_SHARE
-//                || requestCode == com.tencent.connect.common.Constants.REQUEST_QZONE_SHARE) {
-//            Tencent.onActivityResultData(requestCode, resultCode, data, ShareUtils.getInstance(this).QqShareListener);
-//        }
-//
-//    }
-//
-//    @Override
-//    protected void onCreate(Bundle savedInstanceState) {
-//        super.onCreate(savedInstanceState);
-//
-//        // 添加分享图标
-//        iv_share = new ImageView(this);
-//        iv_share.setImageResource(R.drawable.ic_share);
-//        iv_share.setOnClickListener(this);
-//        iv_share.setVisibility(View.GONE);
-//        iv_share.setPadding(DisplayUtils.dip2px(this, 13), DisplayUtils.dip2px(this, 11)
-//                , DisplayUtils.dip2px(this, 11), DisplayUtils.dip2px(this, 13));
-//        RelativeLayout.LayoutParams params = new RelativeLayout.LayoutParams(
-//                DisplayUtils.dip2px(this, 48), DisplayUtils.dip2px(this, 48));
-//        params.addRule(RelativeLayout.CENTER_VERTICAL);
-//        params.addRule(RelativeLayout.ALIGN_PARENT_RIGHT);
-//        RelativeLayout reuse_actionbar = (RelativeLayout) mContentView.findViewById(
-//                R.id.reuse_actionbar);
-//        reuse_actionbar.addView(iv_share, params);
-//
-//        actionbar_tv_title = (TextView) findViewById(R.id.actionbar_tv_title);
-//        detail_rv_show = (RecyclerView) findViewById(R.id.detail_rv_show);
-//        detail_ll_bottom = (LinearLayout) findViewById(R.id.detail_ll_bottom);
-//        detail_tv_download = (TextView) findViewById(R.id.detail_tv_download);
-//        detail_pb_progressbar = (ProgressBar) findViewById(R.id.detail_pb_progressbar);
-//        detail_tv_per = (TextView) findViewById(R.id.detail_tv_per);
-//        reuse_ll_loading = (LinearLayout) findViewById(R.id.reuse_ll_loading);
-//        reuse_no_connection = (LinearLayout) findViewById(R.id.reuse_no_connection);
-//        reuse_none_data = (LinearLayout) findViewById(R.id.reuse_none_data);
-//        reuse_tv_none_data = (TextView) findViewById(R.id.reuse_tv_none_data);
-//
-//        detail_ll_bottom.setOnClickListener(this);
-//        detail_tv_download.setOnClickListener(this);
-//        detail_pb_progressbar.setOnClickListener(this);
-//        detail_tv_per.setOnClickListener(this);
-//        reuse_no_connection.setOnClickListener(this);
-//
-//    }
-//
-//    @Override
-//    protected void onPause() {
-//        super.onPause();
-//        DownloadManager.getInstance(this).removeObserver(dataWatcher);
-//    }
-//
-//    @Override
-//    protected void onResume() {
-//        super.onResume();
-//        if (gameEntity != null
-//                && gameEntity.getApk() != null
-//                && gameEntity.getApk().size() == 1) {
-//            initDownload(true);
-//        }
-//        DownloadManager.getInstance(this).addObserver(dataWatcher);
-//    }
-//
-//    protected void initDownload(boolean isCheck) {
-//        if (Config.isShow(this)) {
-//            detail_ll_bottom.setVisibility(View.VISIBLE);
-//            detail_rv_show.setPadding(0, 0, 0,
-//                    DisplayUtils.dip2px(getApplicationContext(), 60));
-//        } else {
-//            detail_ll_bottom.setVisibility(View.GONE);
-//            detail_rv_show.setPadding(0, 0, 0, 0);
-//        }
-//        if (gameEntity != null && "光环助手".equals(gameEntity.getName())) {
-//            detail_ll_bottom.setVisibility(View.GONE);
-//            detail_rv_show.setPadding(0, 0, 0, 0);
-//        } else if (gameEntity == null || gameEntity.getApk().isEmpty()) {
-//            detail_tv_download.setVisibility(View.VISIBLE);
-//            detail_pb_progressbar.setVisibility(View.GONE);
-//            detail_tv_per.setVisibility(View.GONE);
-//            if (TextUtils.isEmpty(downloadOffText)) {
-//                detail_tv_download.setText("暂无下载");
-//            } else {
-//                detail_tv_download.setText(downloadOffText);
-//            }
-//            detail_tv_download.setBackgroundResource(R.drawable.game_item_btn_pause_style);
-//            detail_tv_download.setTextColor(0xFF999999);
-//            detail_tv_download.setClickable(false);
-//        } else {
-//            detail_tv_download.setVisibility(View.VISIBLE);
-//            detail_pb_progressbar.setVisibility(View.GONE);
-//            detail_tv_per.setVisibility(View.GONE);
-//            boolean isInstalled = false;
-//            if (gameEntity.getApk() != null && gameEntity.getApk().size() == 1
-//                    && PackageManager.isInstalled(gameEntity.getApk().get(0).getPackageName())) {
-//                isInstalled = true;
-//            }
-//            if (isInstalled) {
-//                if (PackageManager.isCanUpdate(gameEntity.getId(), gameEntity.getApk().get(0).getPackageName())) {
-//                    if (TextUtils.isEmpty(downloadAddWord)) {
-//                        detail_tv_download.setBackgroundResource(
-//                                R.drawable.game_item_btn_download_style);
-//                        detail_tv_download.setText(String.format("更新《%s》",
-//                                gameEntity.getName()));
-//                    } else {
-//                        detail_tv_download.setBackgroundResource(
-//                                R.drawable.game_item_btn_download_style);
-//                        detail_tv_download.setText(String.format("更新《%s》%s",
-//                                gameEntity.getName(), downloadAddWord));
-//                    }
-//                } else {
-//                    if (gameEntity.getTag() != null && gameEntity.getTag().size() != 0
-//                            && !TextUtils.isEmpty(gameEntity.getApk().get(0).getGhVersion())
-//                            && !PackageUtils.isSignature(this, gameEntity.getApk().get(0).getPackageName())) {
-//                        if (TextUtils.isEmpty(downloadAddWord)) {
-//                            detail_tv_download.setBackgroundResource(
-//                                    R.drawable.game_item_btn_plugin_style);
-//                            detail_tv_download.setText(String.format("插件化《%s》",
-//                                    gameEntity.getName()));
-//                        } else {
-//                            detail_tv_download.setBackgroundResource(
-//                                    R.drawable.game_item_btn_plugin_style);
-//                            detail_tv_download.setText(String.format("插件化《%s》%s",
-//                                    gameEntity.getName(), downloadAddWord));
-//                        }
-//                    } else {
-//                        if (TextUtils.isEmpty(downloadAddWord)) {
-//                            detail_tv_download.setBackgroundResource(
-//                                    R.drawable.game_item_btn_launch_style);
-//                            detail_tv_download.setText(String.format("启动《%s》",
-//                                    gameEntity.getName()));
-//                        } else {
-//                            detail_tv_download.setBackgroundResource(
-//                                    R.drawable.game_item_btn_launch_style);
-//                            detail_tv_download.setText(String.format("启动《%s》%s",
-//                                    gameEntity.getName(), downloadAddWord));
-//                        }
-//                    }
-//                }
-//            } else {
-//                String status = GameUtils.getDownloadBtnText(this, gameEntity);
-//
-//                switch (status) {
-//                    case "插件化":
-//                        detail_tv_download.setBackgroundResource(R.drawable.game_item_btn_plugin_style);
-//                        break;
-//                    case "打开":
-//                        detail_tv_download.setBackgroundResource(R.drawable.game_item_btn_launch_style);
-//                        break;
-//                    default:
-//                        detail_tv_download.setBackgroundResource(R.drawable.game_item_btn_download_style);
-//                        break;
-//                }
-//
-//                if (TextUtils.isEmpty(downloadAddWord)) {
-//                    detail_tv_download.setText(String.format(status + "《%s》",
-//                            gameEntity.getName()));
-//                } else {
-//                    detail_tv_download.setText(String.format(status + "《%s》%s",
-//                            gameEntity.getName(), downloadAddWord));
-//                }
-//            }
-//        }
-//        if (isCheck && gameEntity != null
-//                && gameEntity.getApk() != null
-//                && gameEntity.getApk().size() == 1) {
-//            String url = gameEntity.getApk().get(0).getUrl();
-//            DownloadEntity downloadEntity = DownloadManager.getInstance(getApplicationContext()).get(url);
-//            if (downloadEntity != null) {
-//                mDownloadEntity = downloadEntity;
-//                detail_tv_download.setVisibility(View.GONE);
-//                detail_pb_progressbar.setVisibility(View.VISIBLE);
-//                detail_tv_per.setVisibility(View.VISIBLE);
-//                invalidate();
-//            }
-//        }
-//    }
-//
-//    private void invalidate() {
-//        detail_pb_progressbar.setProgress((int) (mDownloadEntity.getPercent() * 10));
-//        detail_tv_per.setTextColor(0xFFFFFFFF);
-//        switch (mDownloadEntity.getStatus()) {
-//            case downloading:
-//            case pause:
-//            case timeout:
-//            case neterror:
-//            case waiting:
-//                detail_tv_per.setText("下载中");
-//                break;
-//            case done:
-//                detail_tv_per.setText("安装");
-//                if (mDownloadEntity.isPluggable()
-//                        && PackageManager.isInstalled(mDownloadEntity.getPackageName())) {
-//                    detail_pb_progressbar.setProgressDrawable(ContextCompat.getDrawable(this, R.drawable.progressbar_plugin_radius_style));
-//                } else {
-//                    detail_pb_progressbar.setProgressDrawable(ContextCompat.getDrawable(this, R.drawable.progressbar_normal_radius_style));
-//                }
-//                break;
-//            case cancel:
-//            case hijack:
-//            case notfound:
-//                initDownload(false);
-//                break;
-//            default:
-//                break;
-//        }
-//    }
-//
-//    // 接收下载被删除消息
-//    @Subscribe(threadMode = ThreadMode.MAIN)
-//    public void onEvent(EBDownloadStatus status) {
-//        if ("delete".equals(status.getStatus())
-//                && gameEntity != null
-//                && gameEntity.getApk() != null
-//                && gameEntity.getApk().size() == 1) {
-//            String url = gameEntity.getApk().get(0).getUrl();
-//            if (url.equals(status.getUrl())) {
-//                initDownload(false);
-//            }
-//        }
-//    }
-//
-//    // 接受安装、卸载消息
-//    @Subscribe(threadMode = ThreadMode.MAIN)
-//    public void onEventMainThread(EBPackage busFour) {
-//        if (gameEntity != null
-//                && gameEntity.getApk() != null
-//                && gameEntity.getApk().size() > 0) {
-//            for (ApkEntity apkEntity : gameEntity.getApk()) {
-//                String packageName = apkEntity.getPackageName();
-//                if (packageName.equals(busFour.getPackageName())) {
-//                    ApkActiveUtils.filterHideApk(gameEntity);
-//                    initDownload(false);
-//                }
-//            }
-//        }
-//    }
-//
-//    @Override
-//    public void onClick(View v) {
-//        if (v == detail_tv_download) {
-//            if (gameEntity != null && !gameEntity.getApk().isEmpty()) {
-//                if (gameEntity.getApk().size() == 1) {
-//                    if (NetworkUtils.isWifiConnected(this)) {
-//                        download();
-//                    } else {
-//                        DialogUtils.showDownloadDialog(this, new DialogUtils.ConfirmListener() {
-//                            @Override
-//                            public void onConfirm() {
-//                                download();
-//                            }
-//                        });
-//                    }
-//                } else {
-//                    DownloadDialog.getInstance(this).showPopupWindow(v, gameEntity, mEntrance, name + ":" + title);
-//                }
-//            } else {
-//                toast("稍等片刻~！游戏正在上传中...");
-//            }
-//        } else if (v == detail_pb_progressbar || v == detail_tv_per) {
-//            String str = detail_tv_per.getText().toString();
-//            if ("下载中".equals(str)) {
-//                DownloadManagerActivity.startDownloadManagerActivity(this, gameEntity.getApk().get(0).getUrl()
-//                        , mEntrance + "+(" + name + "[" + title + "])");
-//            } else if ("安装".equals(str)) {
-//                PackageUtils.launchSetup(this, mDownloadEntity.getPath());
-//            }
-//        }
-//    }
-//
-//    private void download() {
-//        String str = detail_tv_download.getText().toString();
-//        if (str.contains("启动")) {
-//            DataUtils.onGameLaunchEvent(this, gameEntity.getName(), gameEntity.getApk().get(0).getPlatform(), name);
-//
-//            PackageUtils.launchApplicationByPackageName(this, gameEntity.getApk().get(0).getPackageName());
-//        } else {
-//            String method;
-//            if (str.contains("更新")) {
-//                method = "更新";
-//            } else if (str.contains("插件化")) {
-//                method = "插件化";
-//            } else {
-//                method = "下载";
-//            }
-//            ApkEntity apkEntity = gameEntity.getApk().get(0);
-//            String msg = FileUtils.isCanDownload(this, apkEntity.getSize());
-//            if (TextUtils.isEmpty(msg)) {
-//                DataUtils.onGameDownloadEvent(this, gameEntity.getName(), apkEntity.getPlatform(), mEntrance, "下载开始");
-//
-//                DownloadManager.createDownload(this, apkEntity, gameEntity, method, mEntrance, name + ":" + title);
-//
-//                detail_tv_download.setVisibility(View.GONE);
-//                detail_pb_progressbar.setVisibility(View.VISIBLE);
-//                detail_tv_per.setVisibility(View.VISIBLE);
-//                detail_pb_progressbar.setProgress(0);
-//                detail_tv_per.setText("0.0%");
-//
-////                DownloadManager.getInstance(BaseDetailActivity.this).putStatus(apkEntity.getUrl(), "downloading");
-//            } else {
-//                toast(msg);
-//            }
-//        }
-//    }
-//
-//}
-//>>>>>>> b239407c25cb85374c0f50c257411b4b98e10e77

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

@@ -13,11 +13,35 @@ import butterknife.ButterKnife;
  * @Time 9:55 AM
  */
 
-public abstract class BaseRecyclerViewHolder extends RecyclerView.ViewHolder {
+public abstract class BaseRecyclerViewHolder<T> extends RecyclerView.ViewHolder implements View.OnClickListener {
+
+    private T mData;
+    private OnListClickListener mListClickListener;
 
     public BaseRecyclerViewHolder(View itemView) {
         super(itemView);
         ButterKnife.bind(this, itemView);
     }
 
+    /**
+     * 具体的设置监听在childViewHolder 设置
+     * @param itemView
+     * @param data              一般情况下只传列表数据
+     * @param listClickListener 列表事件接口
+     */
+    public BaseRecyclerViewHolder(View itemView, T data, OnListClickListener listClickListener) {
+        this(itemView);
+        this.mData = data;
+        this.mListClickListener = listClickListener;
+    }
+
+    @Override
+    public void onClick(View view) {
+        try {
+            mListClickListener.onListClick(view, getAdapterPosition(), mData);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
 }

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

@@ -0,0 +1,116 @@
+package com.gh.base;
+
+import android.graphics.drawable.Drawable;
+import android.graphics.drawable.LayerDrawable;
+import android.os.Bundle;
+import android.support.annotation.ColorInt;
+import android.support.annotation.ColorRes;
+import android.support.annotation.StringRes;
+import android.support.v4.app.Fragment;
+import android.support.v4.content.ContextCompat;
+import android.support.v7.widget.Toolbar;
+import android.text.TextUtils;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.TextView;
+
+import com.gh.gamecenter.R;
+import com.lightgame.BaseAppCompatActivity;
+import com.lightgame.OnTitleClickListener;
+import com.lightgame.view.TextDrawable;
+
+import java.util.List;
+
+/**
+ * Created by csheng on 15-10-12.
+ */
+
+public abstract class BaseToolBarActivity extends BaseAppCompatActivity {
+
+    private Toolbar mToolbar;
+    private Drawable mToolbarBackground;
+    private TextView mTitleTv;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        initToolbar();
+    }
+
+    public void setNavigationTitle(@StringRes int title, @ColorRes int color) {
+        setNavigationTitle(getString(title), ContextCompat.getColor(this, color));
+    }
+
+    public void setNavigationTitle(String title, @ColorInt int color) {
+        if (mToolbar != null) {
+            final TextDrawable textDrawable = new TextDrawable(getResources());
+            textDrawable.setTextColor(color);
+            textDrawable.setText(title);
+            if (mToolbarBackground == null) {
+                mToolbarBackground = mToolbar.getBackground();
+            }
+            LayerDrawable drawable = new LayerDrawable(new Drawable[]{mToolbarBackground, textDrawable});
+            mToolbar.setBackgroundDrawable(drawable);
+        }
+    }
+
+    @Deprecated
+    public void setNavigationTitle(String title) {
+//        if (mTitleTv != null) {
+//            mTitleTv.setText(title);
+//        }
+
+        if (mToolbar != null && !TextUtils.isEmpty(title)) {
+            final TextDrawable textDrawable = new TextDrawable(getResources());
+            textDrawable.setText(title);
+            if (mToolbarBackground == null) {
+                mToolbarBackground = mToolbar.getBackground();
+            }
+            LayerDrawable drawable = new LayerDrawable(new Drawable[]{mToolbarBackground, textDrawable});
+            mToolbar.setBackgroundDrawable(drawable);
+        }
+    }
+
+    public void setNavigationTitle(@StringRes int res) {
+        setNavigationTitle(getString(res));
+    }
+
+    private void initToolbar() {
+        mToolbar = findViewById(R.id.toolbar_navigation);
+        if (mToolbar != null) {
+            setSupportActionBar(mToolbar);
+            final View back = mToolbar.findViewById(R.id.actionbar_rl_back);
+            if (back != null) {
+                back.setOnClickListener(v -> onBackPressed());
+            }
+            mTitleTv = findViewById(R.id.actionbar_tv_title);
+            mTitleTv.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    final List<Fragment> fragmentList = getSupportFragmentManager().getFragments();
+                    for (Fragment fragment : fragmentList) {
+                        if (fragment instanceof OnTitleClickListener) {
+                            ((OnTitleClickListener) fragment).onTitleClick();
+                        }
+                    }
+                }
+            });
+            getSupportActionBar().setDisplayShowTitleEnabled(false);
+            getSupportActionBar().setDisplayHomeAsUpEnabled(false);
+            getSupportActionBar().setDisplayShowHomeEnabled(false);
+            getSupportActionBar().setHomeButtonEnabled(false);
+        }
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case android.R.id.home:
+                return onNavigationIconClicked();
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    protected abstract boolean onNavigationIconClicked();
+
+}

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

@@ -4,6 +4,14 @@ import android.app.Activity;
 import android.app.Application.ActivityLifecycleCallbacks;
 import android.os.Bundle;
 
+import com.gh.download.DownloadManager;
+import com.gh.gamecenter.DataUtils;
+import com.lightgame.config.CommonDebug;
+import com.lightgame.utils.AppManager;
+
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+
 /**
  * 1、写点针对生命周期的统计代码
  * 2、写点通用的逻辑
@@ -15,10 +23,10 @@ import android.os.Bundle;
  */
 public class GHActivityLifecycleCallbacksImpl implements ActivityLifecycleCallbacks {
 
-
     @Override
     public void onActivityCreated(Activity activity, Bundle savedInstanceState) {
 
+        AppManager.getInstance().addActivity(activity);
     }
 
     @Override
@@ -29,11 +37,19 @@ public class GHActivityLifecycleCallbacksImpl implements ActivityLifecycleCallba
     @Override
     public void onActivityResumed(Activity activity) {
 
+        DataUtils.onResume(activity);
+        //FIXME 这里应该只是部分Activity需要
+        try {
+            // 初始化gameMap
+            DownloadManager.getInstance(activity).initGameMap();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
 
     @Override
     public void onActivityPaused(Activity activity) {
-
+        DataUtils.onPause(activity);
     }
 
     @Override
@@ -48,7 +64,7 @@ public class GHActivityLifecycleCallbacksImpl implements ActivityLifecycleCallba
 
     @Override
     public void onActivityDestroyed(Activity activity) {
-
+        AppManager.getInstance().finishActivity(activity);
     }
 
 }

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

@@ -1,323 +0,0 @@
-package com.gh.base;
-
-import android.app.Notification;
-import android.app.NotificationManager;
-import android.app.PendingIntent;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageInfo;
-import android.graphics.BitmapFactory;
-import android.os.Build;
-import android.os.Bundle;
-import android.support.v4.app.NotificationCompat;
-import android.support.v4.util.ArrayMap;
-import android.text.TextUtils;
-import android.widget.RemoteViews;
-
-import com.gh.common.util.AppDebugConfig;
-import com.gh.common.util.EntranceUtils;
-import com.lightgame.download.FileUtils;
-import com.gh.common.util.PackageUtils;
-import com.gh.common.util.TokenUtils;
-import com.lightgame.utils.Utils;
-import com.gh.gamecenter.BuildConfig;
-import com.gh.gamecenter.R;
-import com.xiaomi.mipush.sdk.ErrorCode;
-import com.xiaomi.mipush.sdk.MiPushClient;
-import com.xiaomi.mipush.sdk.MiPushCommandMessage;
-import com.xiaomi.mipush.sdk.MiPushMessage;
-import com.xiaomi.mipush.sdk.PushMessageReceiver;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.io.File;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Locale;
-
-import static com.gh.common.util.EntranceUtils.ENTRANCE_MIPUSH;
-import static com.gh.common.util.EntranceUtils.HOST_ARTICLE;
-import static com.gh.common.util.EntranceUtils.HOST_GAME;
-import static com.gh.common.util.EntranceUtils.HOST_WEB;
-import static com.gh.common.util.EntranceUtils.HOSt_COLUMN;
-import static com.gh.common.util.EntranceUtils.KEY_ENTRANCE;
-import static com.gh.common.util.EntranceUtils.KEY_GAMEID;
-import static com.gh.common.util.EntranceUtils.KEY_ID;
-import static com.gh.common.util.EntranceUtils.KEY_NEWSID;
-import static com.gh.common.util.EntranceUtils.KEY_TARGET;
-import static com.gh.common.util.EntranceUtils.KEY_TO;
-import static com.gh.common.util.EntranceUtils.KEY_TYPE;
-import static com.gh.common.util.EntranceUtils.KEY_URL;
-
-/**
- * 1、PushMessageReceiver是个抽象类，该类继承了BroadcastReceiver。
- * 2、需要将自定义的DemoMessageReceiver注册在AndroidManifest.xml文件中 <receiver
- * android:exported="true"
- * android:name="com.xiaomi.mipushdemo.DemoMessageReceiver"> <intent-filter>
- * <action android:name="com.xiaomi.mipush.RECEIVE_MESSAGE" /> </intent-filter>
- * <intent-filter> <action android:name="com.xiaomi.mipush.ERROR" />
- * </intent-filter> <intent-filter> <action
- * android:name="com.xiaomi.mipush.MESSAGE_ARRIVED" /></intent-filter>
- * </receiver>
- * 3、DemoMessageReceiver的onReceivePassThroughMessage方法用来接收服务器向客户端发送的透传消息
- * 4、DemoMessageReceiver的onNotificationMessageClicked方法用来接收服务器向客户端发送的通知消息，
- * 这个回调方法会在用户手动点击通知后触发
- * 5、DemoMessageReceiver的onNotificationMessageArrived方法用来接收服务器向客户端发送的通知消息，
- * 这个回调方法是在通知消息到达客户端时触发。另外应用在前台时不弹出通知的通知消息到达客户端也会触发这个回调函数
- * 6、DemoMessageReceiver的onCommandResult方法用来接收客户端向服务器发送命令后的响应结果
- * 7、DemoMessageReceiver的onReceiveRegisterResult方法用来接收客户端向服务器发送注册命令后的响应结果
- * 8、以上这些方法运行在非UI线程中
- *
- * @author mayixiang
- *         //TODO 请勿更改此类路径，若需更改时请注意更改./libraries/MiPush/proguard-library.txt混淆对应配置
- */
-public class GHPushMessageReceiver extends PushMessageReceiver {
-
-    private String mAlias;
-
-    @Override
-    public void onReceivePassThroughMessage(Context context, MiPushMessage message) {
-        if (BuildConfig.DEBUG) {
-            AppDebugConfig.logMethodWithParams(this, message);
-        }
-        // 1判断notifyid是否为4
-        try {
-            //TODO what is magic number 4?
-            if (message.getNotifyId() == 4) {
-                JSONObject jsonObject = new JSONObject(message.getContent());
-                Utils.log(jsonObject.toString());
-                String channel = jsonObject.getString("channel");
-                Utils.log("channel = " + channel);
-
-                // 1判断渠道号是否一致或是否为ALL
-                String packageChannel = AppController.getInstance().getChannel();
-                if ("ALL".equals(channel) || channel.equalsIgnoreCase(packageChannel)) {
-                    String type = jsonObject.getString(KEY_TYPE);
-                    Utils.log("type = " + type);
-                    JSONArray jsonArray;
-                    ArrayMap<String, Boolean> map;
-                    switch (type) {
-                        case "NEWS":
-                            // 新闻推送
-                            jsonArray = jsonObject.getJSONArray("package");
-                            map = getInstalledMapFromLocal(context);
-                            for (int i = 0; i < jsonArray.length(); i++) {
-                                Boolean b = map.get(jsonArray.getString(i));
-                                if (b != null) {
-                                    // 显示推送的消息
-                                    showNotification(context, jsonObject, 0);
-                                    break;
-                                }
-                            }
-                            break;
-                        case "PLUGIN_UPDATE":
-                            // 插件更新推送
-                            jsonArray = jsonObject.getJSONArray("apk");
-                            map = getInstalledMapFromLocal(context);
-                            for (int i = 0; i < jsonArray.length(); i++) {
-                                JSONObject apk = jsonArray.getJSONObject(i);
-                                String packageName = apk.getString("package");
-                                Boolean b = map.get(packageName);
-                                if (b != null) {
-                                    // 判断是否gh_version是否相同
-                                    String gh_version = (String) PackageUtils
-                                            .getMetaData(context, packageName, "gh_version");
-                                    if (gh_version != null) {
-                                        gh_version = gh_version.substring(2);
-                                        // 判断gh_version是否相同
-                                        if (gh_version.equals(apk.getString("gh_version"))) {
-                                            // 判断version是否相同
-                                            String version = PackageUtils.getVersionByPackage(context, packageName);
-                                            if (apk.getString("version").equals(version)) {
-                                                // 版本相同,无需显示插件更新,继续查看是否有可更新的游戏包
-                                                continue;
-                                            }
-                                        }
-                                    }
-                                    // 显示推送的消息
-                                    showNotification(context, jsonObject, 1);
-                                    break;
-                                }
-                            }
-                            break;
-                        case "NEW_GAME":
-                            // 新游推送
-                            showNotification(context, jsonObject, 2);
-                    }
-                }
-            }
-        } catch (JSONException e) {
-            e.printStackTrace();
-        }
-    }
-
-    private ArrayMap<String, Boolean> getInstalledMapFromLocal(Context context) {
-        ArrayMap<String, Boolean> map = new ArrayMap<>();
-        ArrayList<String> list = getAllPackageName(context);
-        for (String str : list) {
-            map.put(str, true);
-        }
-        return map;
-    }
-
-    private void showNotification(Context context, JSONObject jsonObject, int id) throws JSONException {
-        Intent intent = new Intent();
-        intent.setAction("com.gh.gamecenter.NOTIFICATION");
-        intent.putExtra("notifyId", id);
-        intent.putExtra("notifyData", jsonObject.toString());
-        PendingIntent pendingIntent = PendingIntent.getBroadcast(context, id, intent, PendingIntent.FLAG_ONE_SHOT);
-
-        NotificationManager nManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
-
-        Notification notification = new NotificationCompat.Builder(context)
-                .setSmallIcon(R.drawable.logo)
-                .setTicker(jsonObject.getString("pushTitle"))
-                .setContentTitle(jsonObject.getString("pushTitle"))
-                .setContentText(jsonObject.getString("pushDesc"))
-                .setContentIntent(pendingIntent).build();
-
-        RemoteViews remoteViews = null;
-
-        if (Build.MANUFACTURER.equals("Meizu") &&
-                (Build.MODEL.startsWith("m") || Build.MODEL.startsWith("MX"))) {
-            remoteViews = new RemoteViews(context.getPackageName(), R.layout.notification_meizu);
-            SimpleDateFormat format = new SimpleDateFormat("HH:mm", Locale.getDefault());
-            remoteViews.setTextViewText(R.id.time, format.format(new Date()));
-        } else if (Build.MANUFACTURER.equals("Xiaomi") &&
-                (Build.MODEL.startsWith("MI") || Build.MODEL.startsWith("HM") || Build.MODEL.startsWith("Redmi"))) {
-            // 小米系统
-            remoteViews = new RemoteViews(context.getPackageName(), R.layout.notification_xiaomi);
-            SimpleDateFormat format = new SimpleDateFormat("ah:mm", Locale.getDefault());
-            remoteViews.setTextViewText(R.id.time, format.format(new Date()));
-        } else if (Build.MANUFACTURER.equals("HUAWEI")) {
-            // 华为系统
-            remoteViews = new RemoteViews(context.getPackageName(), R.layout.notification_huawei);
-        }
-
-        String url = jsonObject.getString("icon");
-        String path = context.getCacheDir() + File.separator + url.substring(url.lastIndexOf("/") + 1);
-        int result = FileUtils.downloadFile(url, path);
-        if (result != 200) {
-            // 下载出错，使用光环logo
-            path = null;
-        }
-
-        if (remoteViews != null) {
-            if (path == null) {
-                remoteViews.setImageViewBitmap(R.id.icon, BitmapFactory.decodeResource(context.getResources(), R.drawable.logo));
-            } else {
-                remoteViews.setImageViewBitmap(R.id.icon, BitmapFactory.decodeFile(path));
-            }
-            remoteViews.setTextViewText(R.id.title, jsonObject.getString("pushTitle"));
-            remoteViews.setTextViewText(R.id.intro, jsonObject.getString("pushDesc"));
-            notification.contentView = remoteViews;
-        } else {
-            NotificationCompat.Builder builder = new NotificationCompat.Builder(context)
-                    .setSmallIcon(R.drawable.logo_black)
-                    .setTicker(jsonObject.getString("pushTitle"))
-                    .setContentTitle(jsonObject.getString("pushTitle"))
-                    .setContentText(jsonObject.getString("pushDesc"))
-                    .setContentIntent(pendingIntent);
-            if (path == null) {
-                builder.setLargeIcon(BitmapFactory.decodeResource(context.getResources(), R.drawable.logo));
-            } else {
-                builder.setLargeIcon(BitmapFactory.decodeFile(path));
-            }
-            notification = builder.build();
-        }
-
-        notification.defaults = Notification.DEFAULT_SOUND;// 添加系统默认声音
-        notification.flags |= Notification.FLAG_AUTO_CANCEL; // FLAG_AUTO_CANCEL表明当通知被用户点击时，通知将被清除。
-        nManager.notify(((int) System.currentTimeMillis() / 1000), notification);// 通过通知管理器来发起通知。如果id不同，则每click，在status哪里增加一个提示
-    }
-
-    private ArrayList<String> getAllPackageName(Context context) {
-        ArrayList<String> list = new ArrayList<>();
-        List<PackageInfo> packageInfos = context.getPackageManager().getInstalledPackages(0);
-        for (PackageInfo packageInfo : packageInfos) {
-            if ((packageInfo.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) == 0) {
-                list.add(packageInfo.packageName);
-            }
-        }
-        return list;
-    }
-
-    @Override
-    public void onNotificationMessageClicked(Context context, MiPushMessage message) {
-        if (BuildConfig.DEBUG) {
-            AppDebugConfig.logMethodWithParams(this, message);
-        }
-        try {
-            String content = message.getContent();
-            JSONObject response = new JSONObject(content);
-            Bundle bundle = new Bundle();
-            bundle.putString(KEY_ENTRANCE, ENTRANCE_MIPUSH);
-            String type = response.getString(KEY_TYPE);
-            String target = response.getString(KEY_TARGET);
-
-            switch (type) {
-                case HOST_ARTICLE:
-                    bundle.putString(KEY_TO, "NewsDetailActivity");
-                    bundle.putString(KEY_NEWSID, target);
-                    break;
-                case HOST_GAME:
-                    bundle.putString(KEY_TO, "GameDetailActivity");
-                    bundle.putString(KEY_GAMEID, target);
-                    break;
-                case HOSt_COLUMN:
-                    bundle.putString(KEY_TO, "SubjectActivity");
-                    bundle.putString(KEY_ID, target);
-                    break;
-                case HOST_WEB:
-                    bundle.putString(KEY_TO, "WebActivity");
-                    bundle.putString(KEY_URL, target);
-                    break;
-            }
-            EntranceUtils.jumpActivity(context, bundle);
-        } catch (JSONException e) {
-            e.printStackTrace();
-        }
-    }
-
-    @Override
-    public void onNotificationMessageArrived(Context context,
-                                             MiPushMessage message) {
-        if (BuildConfig.DEBUG) {
-            AppDebugConfig.logMethodWithParams(this, message);
-        }
-    }
-
-    @Override
-    public void onReceiveRegisterResult(Context context, MiPushCommandMessage message) {
-        if (BuildConfig.DEBUG) {
-            AppDebugConfig.logMethodWithParams(this, message);
-        }
-    }
-
-    @Override
-    public void onCommandResult(Context context, MiPushCommandMessage message) {
-        if (BuildConfig.DEBUG) {
-            AppDebugConfig.logMethodWithParams(this, message);
-        }
-
-        String command = message.getCommand();
-        List<String> arguments = message.getCommandArguments();
-
-        if (MiPushClient.COMMAND_SET_ALIAS.equals(command)) {
-            if (message.getResultCode() == ErrorCode.SUCCESS) {
-                mAlias = arguments.get(0);
-            }
-        }
-
-        if (TextUtils.isEmpty(mAlias)) {
-            //添加别名
-            MiPushClient.setAlias(context, TokenUtils.getDeviceId(context), null);
-        }
-    }
-
-}

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

@@ -4,6 +4,10 @@ import android.content.Context;
 import android.os.Bundle;
 
 import com.gh.common.util.EntranceUtils;
+import com.gh.gamecenter.GameDetailActivity;
+import com.gh.gamecenter.NewsDetailActivity;
+import com.gh.gamecenter.SubjectActivity;
+import com.gh.gamecenter.WebActivity;
 import com.umeng.message.UmengNotificationClickHandler;
 import com.umeng.message.entity.UMessage;
 
@@ -26,19 +30,19 @@ public class GHUmengNotificationClickHandler extends UmengNotificationClickHandl
             String target = response.getString(EntranceUtils.KEY_TARGET);
             switch (type) {
                 case EntranceUtils.HOST_ARTICLE:
-                    bundle.putString(EntranceUtils.KEY_TO, "NewsDetailActivity");
+                    bundle.putString(EntranceUtils.KEY_TO, NewsDetailActivity.class.getSimpleName());
                     bundle.putString(EntranceUtils.KEY_NEWSID, target);
                     break;
                 case EntranceUtils.HOST_GAME:
-                    bundle.putString(EntranceUtils.KEY_TO, "GameDetailActivity");
+                    bundle.putString(EntranceUtils.KEY_TO, GameDetailActivity.class.getSimpleName());
                     bundle.putString(EntranceUtils.KEY_GAMEID, target);
                     break;
-                case EntranceUtils.HOSt_COLUMN:
-                    bundle.putString(EntranceUtils.KEY_TO, "SubjectActivity");
+                case EntranceUtils.HOST_COLUMN:
+                    bundle.putString(EntranceUtils.KEY_TO, SubjectActivity.class.getSimpleName());
                     bundle.putString(EntranceUtils.KEY_ID, target);
                     break;
                 case EntranceUtils.HOST_WEB:
-                    bundle.putString(EntranceUtils.KEY_TO, "WebActivity");
+                    bundle.putString(EntranceUtils.KEY_TO, WebActivity.class.getSimpleName());
                     bundle.putString(EntranceUtils.KEY_URL, target);
                     break;
             }

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

@@ -0,0 +1,19 @@
+package com.gh.base;
+
+import android.view.View;
+
+/**
+ * Created by khy on 26/09/17.
+ */
+
+public interface OnListClickListener  {
+
+    /**
+     *
+     * @param view
+     * @param position list position
+     * @param data list data (直接强转 如果列表传入不同数据类型 请做好判断)
+     * @param <T>
+     */
+    <T> void onListClick(View view, int position, T data);
+}

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

@@ -1,48 +0,0 @@
-//package com.gh.base;
-//
-//import java.io.Serializable;
-//
-//public enum SuggestionType implements Serializable {
-//
-//    FEEDBACK("普通反馈", 1),
-//    SUGGESTION("功能建议", 2),
-//    CRASH("发生闪退", 3),
-//    GAME("游戏问题", 4),
-//    COLLECT("游戏收录", 5),
-//    POST("文章投稿", 6);
-//
-//    private String mName;
-//    private int mIndex;
-//
-//    private SuggestionType(String name, int index) {
-//        mName = name;
-//        mIndex = index;
-//    }
-//
-//    public static String getName(int index) {
-//        for (SuggestionType c : SuggestionType.values()) {
-//            if (c.mIndex == index) {
-//                return c.mName;
-//            }
-//        }
-//        return "";
-//    }
-//
-//    public static int getIndex(String name) {
-//        for (SuggestionType c : SuggestionType.values()) {
-//            if (c.mName == name) {
-//                return c.mIndex;
-//            }
-//        }
-//        return -1;
-//    }
-//
-//    public int getIndex() {
-//        return mIndex;
-//    }
-//
-//    public String getName() {
-//        return mName;
-//    }
-//
-//}

app/src/main/java/com/gh/base/adapter/FragmentStateAdapter.java

@@ -0,0 +1,31 @@
+package com.gh.base.adapter;
+
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentStatePagerAdapter;
+
+import java.util.List;
+
+/**
+ * Created by khy on 7/12/28.
+ */
+public class FragmentStateAdapter extends FragmentStatePagerAdapter {
+
+    private List<Fragment> mFragmentList;
+
+    public FragmentStateAdapter(FragmentManager fm, List<Fragment> fragmentList) {
+        super(fm);
+        this.mFragmentList = fragmentList;
+    }
+
+    @Override
+    public Fragment getItem(int position) {
+        return mFragmentList.get(position);
+    }
+
+    @Override
+    public int getCount() {
+        return mFragmentList.size();
+    }
+
+}

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

@@ -1,4 +1,4 @@
-package com.gh.gamecenter.fragment;
+package com.gh.base.fragment;
 
 import android.app.Dialog;
 import android.os.Bundle;

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

@@ -1,42 +1,73 @@
 package com.gh.base.fragment;
 
+import android.arch.lifecycle.Lifecycle;
+import android.content.Intent;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
 import android.support.annotation.LayoutRes;
 import android.support.annotation.Nullable;
 import android.support.annotation.StringRes;
 import android.support.v4.app.Fragment;
-import android.support.v7.widget.Toolbar;
+import android.support.v4.app.FragmentTransaction;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.Toast;
 
+import com.gh.base.OnListClickListener;
 import com.gh.base.OnRequestCallBackListener;
-import com.gh.common.util.EntranceUtils;
 import com.gh.gamecenter.eventbus.EBMiPush;
-import com.lightgame.ToolbarController;
+import com.lightgame.OnTitleClickListener;
 import com.lightgame.utils.RuntimeUtils;
+import com.lightgame.utils.Utils;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
 
+import java.lang.ref.WeakReference;
+import java.util.List;
+
 import butterknife.ButterKnife;
+import rx.Observable;
+import rx.android.schedulers.AndroidSchedulers;
+import rx.schedulers.Schedulers;
+
+import static com.gh.common.util.EntranceUtils.KEY_ENTRANCE;
 
 /**
  * Created by LGT on 2016/9/4.
  * Fragment 基类
  */
 public abstract class BaseFragment<T> extends Fragment implements OnRequestCallBackListener<T>,
-        View.OnClickListener, ToolbarController {
+        View.OnClickListener, OnListClickListener, OnTitleClickListener {
 
-    // TODO private view
-    protected View view;
+    protected View mCachedView;
 
     protected boolean isEverPause;
 
     protected String mEntrance;
 
+    protected final Handler mBaseHandler = new BaseFragment.BaseHandler(this);
+
+    protected static class BaseHandler extends Handler {
+        private final WeakReference<BaseFragment> mfragmentWeakReference;
+
+        BaseHandler(BaseFragment fragment) {
+            mfragmentWeakReference = new WeakReference<>(fragment);
+        }
+
+        @Override
+        public void handleMessage(Message msg) {
+            super.handleMessage(msg);
+            mfragmentWeakReference.get().handleMessage(msg);
+        }
+    }
+
+    protected void handleMessage(Message msg) {
+
+    }
+
     @LayoutRes
     protected abstract int getLayoutId();
 
@@ -54,6 +85,7 @@ public abstract class BaseFragment<T> extends Fragment implements OnRequestCallB
         handleOnClick(v);
     }
 
+
     protected void initView(View view) {
     }
 
@@ -61,41 +93,22 @@ public abstract class BaseFragment<T> extends Fragment implements OnRequestCallB
         RuntimeUtils.getInstance().runOnUiThread(runnable);
     }
 
+    // 定时任务全部改用这个方法, 在onDestroy做统一取消定时
     protected void postDelayedRunnable(Runnable runnable, long delayMillis) {
         RuntimeUtils.getInstance().runOnUiThread(runnable, delayMillis);
     }
 
-    @Override
-    public void setNavigationTitle(@StringRes int res) {
-        if (getActivity() instanceof ToolbarController) {
-            ((ToolbarController) getActivity()).setNavigationTitle(res);
-        }
-    }
-
-    @Override
-    public void setNavigationTitle(CharSequence res) {
-        if (getActivity() instanceof ToolbarController) {
-            ((ToolbarController) getActivity()).setNavigationTitle(res);
-        }
-    }
-
-    @Override
-    public Toolbar getToolBar() {
-        if (getActivity() instanceof ToolbarController) {
-            return ((ToolbarController) getActivity()).getToolBar();
-        }
-        return null;
-    }
-
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        mEntrance = getActivity().getIntent().getStringExtra(EntranceUtils.KEY_ENTRANCE);
+        final Intent intent = getActivity().getIntent();
+        mEntrance = intent.getStringExtra(KEY_ENTRANCE);
+
         isEverPause = false;
         EventBus.getDefault().register(this);
-        view = View.inflate(getContext(), getLayoutId(), null);
-        ButterKnife.bind(this, view);
-        initView(view);
+        mCachedView = View.inflate(getContext(), getLayoutId(), null);
+        ButterKnife.bind(this, mCachedView);
+        initView(mCachedView);
     }
 
     //TODO 尴尬，必须的有subscribe才能register
@@ -108,9 +121,9 @@ public abstract class BaseFragment<T> extends Fragment implements OnRequestCallB
     @Override
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         if (container != null) {
-            container.removeView(view);
+            container.removeView(mCachedView);
         }
-        return view;
+        return mCachedView;
     }
 
     @Override
@@ -128,11 +141,27 @@ public abstract class BaseFragment<T> extends Fragment implements OnRequestCallB
     @Override
     public void onDestroy() {
         super.onDestroy();
+        mBaseHandler.removeCallbacksAndMessages(null);
+        RuntimeUtils.getInstance().removeRunnable();
         EventBus.getDefault().unregister(this);
     }
 
+    public void toast(@StringRes int res) {
+        if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED))
+            toast(getString(res));
+    }
+
     public void toast(String msg) {
-        Toast.makeText(getContext(), msg, Toast.LENGTH_SHORT).show();
+        if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED))
+            Utils.toast(getContext(), msg);
+    }
+
+    public void toastLong(@StringRes int msg) {
+        toastLong(getString(msg));
+    }
+
+    public void toastLong(String msg) {
+        RuntimeUtils.getInstance().toastLong(getContext(), msg);
     }
 
     public boolean isEverPause() {
@@ -145,7 +174,7 @@ public abstract class BaseFragment<T> extends Fragment implements OnRequestCallB
     }
 
     @Override
-    public void loadDone(Object obj) {
+    public void loadDone(T obj) {
 
     }
 
@@ -159,4 +188,31 @@ public abstract class BaseFragment<T> extends Fragment implements OnRequestCallB
 
     }
 
+    @Override
+    public <LIST> void onListClick(View view, int position, LIST data) {
+
+    }
+
+    protected <K> Observable<K> asyncCall(Observable<K> observable) {
+        return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread());
+    }
+
+    // 将所有的Fragment都置为隐藏状态。
+    protected void hideFragments(FragmentTransaction transaction) {
+        List<Fragment> list = getChildFragmentManager().getFragments();
+        for (Fragment fragment : list) {
+            transaction.hide(fragment);
+        }
+    }
+
+    @Override
+    public void onTitleClick() {
+        List<Fragment> list = getChildFragmentManager().getFragments();
+        for (Fragment fragment : list) {
+            if (fragment instanceof OnTitleClickListener) {
+                ((OnTitleClickListener) fragment).onTitleClick();
+            }
+        }
+    }
+
 }

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

@@ -19,6 +19,7 @@ import android.support.v4.view.PagerAdapter;
 import android.support.v4.view.ViewPager;
 import android.view.View;
 
+import com.gh.gamecenter.normal.NormalFragment;
 import com.lightgame.adapter.BaseFragmentPagerAdapter;
 import com.lightgame.config.CommonDebug;
 import com.lightgame.view.DoubleTapTextView;
@@ -33,9 +34,9 @@ import java.util.List;
  * @author CsHeng
  * @date 2013-3-6
  */
-public abstract class BaseFragment_ViewPager extends BaseFragment implements DoubleTapTextView.OnDoubleTapListener {
+public abstract class BaseFragment_ViewPager extends NormalFragment implements DoubleTapTextView.OnDoubleTapListener {
 
-    protected static final String ARGS_INDEX = "index";
+    public static final String ARGS_INDEX = "index";
     protected int mCheckedIndex = 0;
     protected PagerAdapter mAdapter;
     protected List<Fragment> mFragmentsList;
@@ -67,11 +68,6 @@ public abstract class BaseFragment_ViewPager extends BaseFragment implements Dou
         mViewPager = (ViewPager) view.findViewById(getViewPagerId());
         mViewPager.setOffscreenPageLimit(mFragmentsList.size());
         mViewPager.setAdapter(mAdapter);
-    }
-
-    @Override
-    public void onActivityCreated(Bundle savedInstanceState) {
-        super.onActivityCreated(savedInstanceState);
         if (mCheckedIndex < mFragmentsList.size()) {
             mViewPager.setCurrentItem(mCheckedIndex, false);
         }
@@ -116,10 +112,15 @@ public abstract class BaseFragment_ViewPager extends BaseFragment implements Dou
         }
         List<Fragment> fragments = getChildFragmentManager().getFragments();
         if (fragments != null) {
-            Fragment curFragment = fragments.get(mViewPager.getCurrentItem());
-            curFragment.onActivityResult(requestCode, resultCode, data);
+            for (Fragment fragment : fragments) {
+                fragment.onActivityResult(requestCode, resultCode, data);
+            }
         }
 
     }
 
+    public int getCurrentItem() {
+        return mViewPager != null ? mViewPager.getCurrentItem() : 0;
+    }
+
 }

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

@@ -1,4 +1,4 @@
-package com.gh.gamecenter.fragment;
+package com.gh.base.fragment;
 
 import android.os.Bundle;
 import android.support.annotation.Nullable;

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

@@ -9,12 +9,13 @@ import com.gh.gamecenter.BuildConfig;
 
 public class Config {
 
-    public static final String HOST = BuildConfig.HOST;
+    public static final String API_HOST = BuildConfig.API_HOST;
     public static final String USER_HOST = BuildConfig.USER_HOST;
     public static final String COMMENT_HOST = BuildConfig.COMMENT_HOST;
     public static final String DATA_HOST = BuildConfig.DATA_HOST;
     public static final String LIBAO_HOST = BuildConfig.LIBAO_HOST;
     public static final String MESSAGE_HOST = BuildConfig.MESSAGE_HOST;
+    public static final String USERSEA_HOST = BuildConfig.USERSEA_HOST;
 
     /**
      * 需要配置的请使用{@link PreferenceManager#getDefaultSharedPreferences(Context)}
@@ -30,13 +31,29 @@ public class Config {
     public static final String MIPUSH_APPID = BuildConfig.MIPUSH_APPID;
     public static final String MIPUSH_APPKEY = BuildConfig.MIPUSH_APPKEY;
     public static final String MTA_APPKEY = BuildConfig.MTA_APPKEY;
-    public static final String TD_APPID = BuildConfig.TD_APPID;// TalkingData
+    public static final String TALKINGDATA_APPID = BuildConfig.TD_APPID;// TalkingData
     public static final String UMENG_APPKEY = BuildConfig.UMENG_APPKEY;
     public static final String UMENG_MESSAGE_SECRET = BuildConfig.UMENG_MESSAGE_SECRET;
+    public static final String USERSEA_APP_ID = BuildConfig.USERSEA_APP_ID; // 登录验证
+    public static final String USERSEA_APP_SECRET = BuildConfig.USERSEA_APP_SECRET; //　登录验证
+    public static final String BUGLY_APPID = BuildConfig.BUGLY_APPID;
+    public static final String PATCH_VERSION_NAME = BuildConfig.PATCH_VERSION_NAME; // 补丁包版本 对应关于->版本号
+    // http://www.ghzs666.com/article/${articleId}.html
+    public static final String URL_ARTICLE = "http://www.ghzs666.com/article/"; // TODO ghzs/ghzs666 统一
+    public static final String PATCHES = "patches";
 
     public static boolean isShow(Context context) {
         SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(context);
         return sp.getBoolean("isShow", true);
     }
 
+    public static String getExceptionMsg(Context context) {
+        SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(context);
+        return sp.getString("errMsg", null);
+    }
+
+    public static void setExceptionMsg(Context context, String errMsg) {
+        PreferenceManager.getDefaultSharedPreferences(context).edit().putString("errMsg", errMsg).apply();
+    }
+
 }

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

@@ -5,6 +5,13 @@ public class Constants {
     public static final int SEND_NEWS_FEEDBACK = 0x126;
     public static final int SEND_COMMENT_FEEDBACK = 0x127;
 
+    public final static int LIST_FOOTER_ITEM = 1;
+    public final static int LIST_HEAD_ITEM = 1;
+
+    public final static int NOT_NETWORK_CODE = 504; // 没有网络的状态码(应该是这个吧!)
+
+    public static final String LOGIN_TOKEN_ID = "userToken_id"; // 用户ID 与服务器无关
+
     //手机号码匹配规则
     public static final String REGEX_MOBILE = "^((13[0-9])|(15[^4,\\D])|(18[0,5-9]))\\d{8}$";
     public static final String REGEX_ACCOUNT = "^[a-zA-Z_]\\w{5,17}$";

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

@@ -21,6 +21,15 @@ public class ItemViewType {
     public static final int LOADING = 14;       // 加载布局
     public static final int LIBAO_NORMAL = 15;   // 礼包正常布局
     public static final int LIBAO_SKIP_CONCERN = 16;  // 跳转关注管理页面布局
-    public static final int KC_HINT = 16;
+    public static final int KC_HINT = 17;
+    public static final int GAME_PULGIN = 18;     // 游戏插件模块
+
+    /**
+     * 普通列表
+     */
+    public static final int ITEM_BODY = 100;
+    public static final int ITEM_FOOTER = 101;
+    public static final int ITEM_TOP = 102;
+
 
 }

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

@@ -0,0 +1,103 @@
+package com.gh.common.util;
+
+import android.content.Context;
+
+import com.lightgame.utils.Utils;
+
+import org.json.JSONObject;
+
+import retrofit2.HttpException;
+
+/**
+ * Created by khy on 28/12/17.
+ */
+
+public class AskErrorResponseUtils {
+
+    public static void errorResponseControl(Context context, HttpException e) {
+        if (e == null) return;
+        int code = e.code();
+
+        try {
+            JSONObject object = new JSONObject(e.response().errorBody().string());
+            int errorCode = object.getInt("code");
+            if (errorCode == 400) {
+                switch (errorCode) {
+                    case 400001:
+                        Utils.toast(context, "提交的参数不符合接口的要求");
+                        break;
+                    case 400003:
+                        Utils.toast(context, "客户端提供的expert_id不存在");
+                        break;
+                    case 400004:
+                        Utils.toast(context, "缺少参数");
+                        break;
+                    case 400005:
+                        Utils.toast(context, "用户的评论被墙（黑名单）");
+                        break;
+                    default:
+                        Utils.toast(context, "网络错误");
+                        break;
+                }
+            } else if (code == 403) {
+                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 && errorCode == 404001) {
+                Utils.toast(context, "请求的资源不存在");
+            }
+
+        } catch (Exception e1) {
+            e1.printStackTrace();
+        }
+
+
+    }
+}

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

@@ -0,0 +1,87 @@
+package com.gh.common.util;
+
+import android.content.Context;
+import android.provider.Settings;
+import android.text.TextUtils;
+
+import com.gh.gamecenter.BuildConfig;
+import com.gh.gamecenter.ask.entity.Questions;
+import com.gh.gamecenter.manager.UserManager;
+import com.gh.loghub.LogHubUtils;
+import com.halo.assistant.HaloApp;
+import com.lightgame.utils.Util_System_Phone_State;
+import com.lightgame.utils.Utils;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+/**
+ * Created by khy on 2/01/18.
+ */
+public class AskLogUtils {
+
+
+    public static void uploadQuestions(Context context, String tracers, Questions questions) {
+        JSONObject object = new JSONObject();
+        try {
+            object.put("community_id", UserManager.getInstance().getCommunityId(context));
+            object.put("community_name", UserManager.getInstance().getCommunityName(context));
+            object.put("question_id", questions.getId());
+            object.put("question_name", questions.getTitle());
+            object.put("subject", "question");
+            object.put("tracers", tracers);
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+
+        upload(context, object);
+    }
+
+    public static void uploadAnswers(Context context, String tracers, Questions questions, String answerId) {
+        JSONObject object = new JSONObject();
+        try {
+            object.put("community_id", UserManager.getInstance().getCommunityId(context));
+            object.put("community_name", UserManager.getInstance().getCommunityName(context));
+            object.put("question_id", questions.getId());
+            object.put("question_name", questions.getTitle());
+            object.put("subject", "answer");
+            object.put("tracers", tracers);
+            object.put("answer_id", answerId);
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+
+        upload(context, object);
+    }
+
+    public static void uploadSearch(Context context, String searchKey) {
+        if (TextUtils.isEmpty(searchKey)) return;
+
+        JSONObject object = new JSONObject();
+        try {
+            object.put("community_id", UserManager.getInstance().getCommunityId(context));
+            object.put("community_name", UserManager.getInstance().getCommunityName(context));
+            object.put("keyword", searchKey);
+            object.put("subject", "search");
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+
+        upload(context, object);
+    }
+
+
+    private static void upload(Context context, JSONObject object) {
+        try {
+            object.put("version", BuildConfig.PATCH_VERSION_NAME);
+            object.put("channel", HaloApp.getInstance().getChannel());
+            object.put("android_id", Settings.Secure.getString(context.getContentResolver(), Settings.Secure.ANDROID_ID));
+            object.put("imei", Util_System_Phone_State.getDeviceId(context));
+            object.put("time", Utils.getTime(context));
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+
+        LogHubUtils.uploadLog(DeviceUtils.getIPAddress(context), object);
+    }
+}

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

@@ -0,0 +1,50 @@
+package com.gh.common.util;
+
+import android.text.TextUtils;
+
+import java.text.DecimalFormat;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Created by khy on 27/12/17.
+ */
+
+public class AskUtils {
+
+    public static String voteCountFormat(int voteCount) {
+        String vote;
+        if (voteCount >= 10000) {
+            DecimalFormat df = new DecimalFormat("#.0万");
+            vote = df.format(voteCount / 10000f);
+        } else {
+            vote = String.valueOf(voteCount);
+        }
+        return vote;
+    }
+
+    public static String stripHtml(String htmlStr) {
+
+
+        if (TextUtils.isEmpty(htmlStr)) return "";
+
+        String regEx_script = "<script[^>]*?>[\\s\\S]*?<\\/script>"; //定义script的正则表达式
+        String regEx_style = "<style[^>]*?>[\\s\\S]*?<\\/style>"; //定义style的正则表达式
+        String regEx_html = "<[^>]+>"; //定义HTML标签的正则表达式
+
+        Pattern p_script = Pattern.compile(regEx_script, Pattern.CASE_INSENSITIVE);
+        Matcher m_script = p_script.matcher(htmlStr);
+        htmlStr = m_script.replaceAll(""); //过滤script标签
+
+        Pattern p_style = Pattern.compile(regEx_style, Pattern.CASE_INSENSITIVE);
+        Matcher m_style = p_style.matcher(htmlStr);
+        htmlStr = m_style.replaceAll(""); //过滤style标签
+
+        Pattern p_html = Pattern.compile(regEx_html, Pattern.CASE_INSENSITIVE);
+        Matcher m_html = p_html.matcher(htmlStr);
+        htmlStr = m_html.replaceAll(""); //过滤html标签
+
+        return htmlStr.trim(); //返回文本字符串
+    }
+
+}

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

@@ -9,6 +9,7 @@ import android.graphics.drawable.Drawable;
 import android.media.ExifInterface;
 
 import java.io.BufferedOutputStream;
+import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -27,13 +28,16 @@ public class BitmapUtils {
      */
     public static boolean savePicture(String newPath, String filePath) {
         BitmapFactory.Options options = new BitmapFactory.Options();
-//        options.inSampleSize = 2;
-        Bitmap bitmap = BitmapFactory.decodeFile(filePath, options);
+        options.inJustDecodeBounds = true;
+        BitmapFactory.decodeFile(filePath, options);
+        options.inSampleSize = 2;
+        options.inJustDecodeBounds = false;
 
         File file = new File(newPath);
         int quality = 80;
         do {
             try {
+                Bitmap bitmap = BitmapFactory.decodeFile(filePath, options);
                 BufferedOutputStream bos = new BufferedOutputStream(new FileOutputStream(file));
                 bitmap.compress(Bitmap.CompressFormat.JPEG, quality, bos);
                 bos.flush();
@@ -51,6 +55,62 @@ public class BitmapUtils {
         return true;
     }
 
+    /**
+     * 保存图片
+     *
+     * @param newPath
+     * @param filePath
+     * @return
+     */
+    public static boolean savePicture(String newPath, String filePath, int compressSize) {
+        if (compressSize > new File(filePath).length()) {
+            return false;
+        }
+
+        BitmapFactory.Options options = new BitmapFactory.Options();
+        options.inJustDecodeBounds = true;
+        BitmapFactory.decodeFile(filePath, options);
+        options.inSampleSize = 2;
+        options.inJustDecodeBounds = false;
+
+        Bitmap bitmap = BitmapFactory.decodeFile(filePath, options);
+
+        ByteArrayOutputStream bos = new ByteArrayOutputStream();
+        bitmap.compress(Bitmap.CompressFormat.JPEG, 85, bos);
+        float zoom = (float) Math.sqrt(compressSize / (float) bos.toByteArray().length);
+
+        Matrix matrix = new Matrix();
+        matrix.setScale(zoom, zoom);
+        Bitmap result = Bitmap.createBitmap(bitmap, 0, 0, bitmap.getWidth(), bitmap.getHeight(), matrix, true);
+        bos.reset();
+        bitmap.recycle();
+
+        result.compress(Bitmap.CompressFormat.JPEG, 85, bos);
+        while (bos.toByteArray().length > compressSize) {
+            matrix.setScale(0.9f, 0.9f);
+
+            result = Bitmap.createBitmap(result, 0, 0, result.getWidth(), result.getHeight(), matrix, true);
+            bos.reset();
+            result.compress(Bitmap.CompressFormat.JPEG, 85, bos);
+        }
+
+        File file = new File(newPath);
+        try {
+            BufferedOutputStream fbos = new BufferedOutputStream(new FileOutputStream(file));
+            result.compress(Bitmap.CompressFormat.JPEG, 85, fbos);
+            fbos.flush();
+            fbos.close();
+
+            result.recycle();
+        } catch (Exception e) {
+            file.delete();
+            e.printStackTrace();
+            return false;
+        }
+
+        return true;
+    }
+
     /**
      * 根据文件路径返回bitmap
      *

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

@@ -2,8 +2,10 @@ package com.gh.common.util;
 
 import android.content.Context;
 import android.content.Intent;
+import android.text.TextUtils;
 
 import com.gh.gamecenter.LoginActivity;
+import com.gh.gamecenter.manager.UserManager;
 
 /**
  * Created by khy on 28/06/17.
@@ -12,8 +14,8 @@ import com.gh.gamecenter.LoginActivity;
 public class CheckLoginUtils {
 
     public static void checkLogin(final Context context, OnLoggenInListener listener) {
-        String token = "";
-        if (token == null) {
+//        String token = LoginUtils.getToken(context);
+        if (TextUtils.isEmpty(UserManager.getInstance().getToken())) {
             DialogUtils.showWarningDialog(context, "登录提示", "需要登录才能使用该功能喔！", "取消", "快速登录",
                     new DialogUtils.ConfirmListener() {
                         @Override
@@ -27,6 +29,9 @@ public class CheckLoginUtils {
         }
     }
 
+    public static boolean isLogin() {
+        return !TextUtils.isEmpty(UserManager.getInstance().getToken());
+    }
 
     public interface OnLoggenInListener {
         void onLoggedIn();

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

@@ -0,0 +1,110 @@
+package com.gh.common.util
+
+import android.content.Context
+import com.gh.gamecenter.eventbus.EBCollectionChanged
+import com.gh.gamecenter.retrofit.Response
+import com.gh.gamecenter.retrofit.RetrofitManager
+import okhttp3.MediaType
+import okhttp3.RequestBody
+import okhttp3.ResponseBody
+import org.greenrobot.eventbus.EventBus
+import org.json.JSONObject
+import retrofit2.HttpException
+import rx.Observable
+import rx.android.schedulers.AndroidSchedulers
+import rx.schedulers.Schedulers
+
+/**
+ * Created by khy on 26/07/17.
+ */
+object CollectionUtils {
+
+    enum class CollectionType {
+        toolkit, article, answer
+    }
+
+    fun postCollection(context: Context, content: String, type: CollectionType, listener: OnCollectionListener) {
+
+        val body = RequestBody.create(MediaType.parse("application/json"), content)
+        val postCollection = when (type) {
+            CollectionType.article -> RetrofitManager.getInstance(context).getApi().postCollectionArticle(body)
+            CollectionType.toolkit -> RetrofitManager.getInstance(context).getApi().postCollectionTools(body)
+            CollectionType.answer -> RetrofitManager.getInstance(context).getApi().postCollectionAnswer(content)
+        }
+        postCollection
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(object : Response<ResponseBody>() {
+                    override fun onResponse(response: ResponseBody?) {
+                        super.onResponse(response)
+                        listener.onSuccess()
+                        if(type != CollectionType.answer)
+                        EventBus.getDefault().post(EBCollectionChanged(JSONObject(content).getString("_id"), true, type))
+                    }
+
+                    override fun onFailure(e: HttpException?) {
+                        super.onFailure(e)
+                        if (e != null) {
+                            try {
+                                val string = e.response()?.errorBody()?.string()
+                                val errorBody = JSONObject(string)
+                                if (errorBody.getInt("status") == 40031) {
+                                    listener.onSuccess()
+                                    return
+                                }
+                            } catch (e: Exception) {
+                                e.printStackTrace()
+                            }
+                        }
+                        listener.onError()
+                    }
+                })
+    }
+
+    fun deleteCollection(context: Context, id: String, type: CollectionType, listener: OnCollectionListener) {
+
+        val postCollection: Observable<ResponseBody>
+        when (type) {
+            CollectionType.article -> postCollection = RetrofitManager.getInstance(context).getApi().deletaCollectionArticle(id)
+            CollectionType.toolkit -> postCollection = RetrofitManager.getInstance(context).getApi().deleteCollectionTools(id)
+            CollectionType.answer -> postCollection = RetrofitManager.getInstance(context).getApi().deleteCollectionAnswer(id)
+        }
+        postCollection
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(object : Response<ResponseBody>() {
+                    override fun onResponse(response: ResponseBody?) {
+                        super.onResponse(response)
+                        listener.onSuccess()
+                        if(type != CollectionType.answer)
+                        EventBus.getDefault().post(EBCollectionChanged(id, false, type))
+                    }
+
+                    override fun onFailure(e: HttpException?) {
+                        super.onFailure(e)
+                        listener.onError()
+                    }
+                })
+    }
+
+    fun patchCollection(context: Context, id: String, type: CollectionType) {
+        val postCollection = when (type) {
+            CollectionType.article -> RetrofitManager.getInstance(context).getApi().patchCollectionArticle(id)
+            CollectionType.toolkit -> RetrofitManager.getInstance(context).getApi().patchCollectionTools(id)
+            else -> {
+                return
+            }
+        }
+        postCollection
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(object : Response<ResponseBody>() {})
+    }
+
+
+    interface OnCollectionListener {
+        fun onSuccess()
+        fun onError()
+    }
+
+}

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

@@ -15,10 +15,11 @@ 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.db.CommentDao;
-import com.gh.gamecenter.db.VoteDao;
-import com.gh.gamecenter.db.info.VoteInfo;
+import com.gh.gamecenter.adapter.viewholder.CommentViewHolder;
 import com.gh.gamecenter.entity.CommentEntity;
+import com.gh.gamecenter.entity.UserDataEntity;
+import com.gh.gamecenter.entity.UserInfoEntity;
+import com.gh.gamecenter.manager.UserManager;
 import com.lightgame.utils.Utils;
 
 import org.json.JSONException;
@@ -72,8 +73,6 @@ public class CommentUtils {
     public static void showReportDialog(final CommentEntity commentEntity, final Context context,
                                         final OnCommentCallBackListener listener, final String newsId) {
 
-        CommentDao commentDao = new CommentDao(context);
-
         final Dialog dialog = new Dialog(context);
 
         LinearLayout container = new LinearLayout(context);
@@ -83,7 +82,7 @@ public class CommentUtils {
 
         List<String> dialogType = new ArrayList<>();
 
-        if (!commentDao.isMyComment(commentEntity.getId())) {
+        if (commentEntity.getUserData() == null || !commentEntity.getUserData().isCommentOwn()) {
             dialogType.add("回复");
         }
 
@@ -139,7 +138,7 @@ public class CommentUtils {
 
                             break;
                         case "查看对话":
-                            context.startActivity(CommentDetailActivity.getCommentDetailIntent(context, commentEntity.getId()));
+                            context.startActivity(CommentDetailActivity.getIntent(context, commentEntity.getId()));
                             break;
                     }
                 }
@@ -152,27 +151,27 @@ public class CommentUtils {
 
     }
 
-    private static void showReportTypeDialog(final CommentEntity commentEntity, final Context mContext) {
+    private static void showReportTypeDialog(final CommentEntity commentEntity, final Context context) {
         final String[] arrReportType = new String[]{"垃圾广告营销", "恶意攻击谩骂", "淫秽色情信息",
                 "违法有害信息", "其它"};
-        int widthPixels = mContext.getResources().getDisplayMetrics().widthPixels;
+        int widthPixels = context.getResources().getDisplayMetrics().widthPixels;
 
-        final Dialog reportTypeDialog = new Dialog(mContext);
-        LinearLayout container = new LinearLayout(mContext);
+        final Dialog reportTypeDialog = new Dialog(context);
+        LinearLayout container = new LinearLayout(context);
         container.setOrientation(LinearLayout.VERTICAL);
-        container.setPadding(0, DisplayUtils.dip2px(mContext, 12), 0, DisplayUtils.dip2px(mContext, 12));
+        container.setPadding(0, DisplayUtils.dip2px(context, 12), 0, DisplayUtils.dip2px(context, 12));
         container.setBackgroundColor(Color.WHITE);
 
         for (final String s : arrReportType) {
-            TextView reportTypeTv = new TextView(mContext);
+            TextView reportTypeTv = new TextView(context);
             reportTypeTv.setText(s);
             reportTypeTv.setTextSize(17);
-            reportTypeTv.setTextColor(ContextCompat.getColor(mContext, R.color.title));
+            reportTypeTv.setTextColor(ContextCompat.getColor(context, R.color.title));
             reportTypeTv.setBackgroundResource(R.drawable.textview_white_style);
             reportTypeTv.setLayoutParams(new LinearLayout.LayoutParams((widthPixels * 9) / 10,
                     LinearLayout.LayoutParams.WRAP_CONTENT));
-            reportTypeTv.setPadding(DisplayUtils.dip2px(mContext, 20), DisplayUtils.dip2px(mContext, 12),
-                    0, DisplayUtils.dip2px(mContext, 12));
+            reportTypeTv.setPadding(DisplayUtils.dip2px(context, 20), DisplayUtils.dip2px(context, 12),
+                    0, DisplayUtils.dip2px(context, 12));
             container.addView(reportTypeTv);
 
             reportTypeTv.setOnClickListener(new View.OnClickListener() {
@@ -186,16 +185,16 @@ public class CommentUtils {
                         e.printStackTrace();
                     }
 
-                    PostCommentUtils.addReportData(mContext, jsonObject.toString(), true,
+                    PostCommentUtils.addReportData(context, jsonObject.toString(),
                             new PostCommentUtils.PostCommentListener() {
                                 @Override
                                 public void postSuccess(JSONObject response) {
-                                    Utils.toast(mContext, "感谢您的举报");
+                                    Utils.toast(context, "感谢您的举报");
                                 }
 
                                 @Override
                                 public void postFailed(Throwable error) {
-                                    Utils.toast(mContext, "举报失败，请检查网络设置");
+                                    Utils.toast(context, "举报失败，请检查网络设置");
                                 }
                             });
                     reportTypeDialog.cancel();
@@ -208,7 +207,7 @@ public class CommentUtils {
         reportTypeDialog.show();
     }
 
-    public static void initVote(final Context context, final CommentEntity commentEntity, final VoteDao voteDao,
+    public static void postVote(final Context context, final CommentEntity commentEntity,
                                 final TextView commentLikeCountTv, final ImageView commentLikeIv, final OnVoteListener listener) {
         CheckLoginUtils.checkLogin(context, new CheckLoginUtils.OnLoggenInListener() {
             @Override
@@ -223,11 +222,10 @@ public class CommentUtils {
                 commentLikeCountTv.setText(String.valueOf(commentEntity.getVote()));
                 commentLikeCountTv.setVisibility(View.VISIBLE);
 
-                PostCommentUtils.addCommentVoto(context, commentEntity.getId(), true,
+                PostCommentUtils.addCommentVoto(context, commentEntity.getId(),
                         new PostCommentUtils.PostCommentListener() {
                             @Override
                             public void postSuccess(JSONObject response) {
-                                voteDao.add(new VoteInfo(commentEntity.getId()));
                                 if (listener != null) {
                                     listener.onVote();
                                 }
@@ -251,7 +249,7 @@ public class CommentUtils {
                                     if (exception.code() == 403) {
                                         try {
                                             String detail = new JSONObject(exception.response().errorBody().string()).getString("detail");
-                                            if (detail.equals("voted")) {
+                                            if ("voted".equals(detail)) {
                                                 Utils.toast(context, "已经点过赞啦！");
                                             }
                                         } catch (Exception ex) {
@@ -267,6 +265,39 @@ public class CommentUtils {
         });
     }
 
+
+    // 设置评论item 用户相关的view(点赞/头像/用户名)
+    public static void setCommentUserView(Context mContext, CommentViewHolder holder, CommentEntity entity) {
+        UserDataEntity userDataEntity = entity.getUserData();
+        holder.commentLikeCountTv.setTextColor(ContextCompat.getColor(mContext, R.color.hint));
+        holder.commentLikeIv.setImageResource(R.drawable.ic_like_unselect);
+
+        if (entity.getVote() == 0) {
+            holder.commentLikeCountTv.setVisibility(View.GONE);
+        } else { // 检查是否已点赞
+            if (userDataEntity != null && userDataEntity.isCommentVoted()) {
+                holder.commentLikeCountTv.setTextColor(ContextCompat.getColor(mContext, R.color.theme));
+                holder.commentLikeIv.setImageResource(R.drawable.ic_like_select);
+            }
+            holder.commentLikeCountTv.setVisibility(View.VISIBLE);
+            holder.commentLikeCountTv.setText(String.valueOf(entity.getVote()));
+        }
+
+        //检查是否是自身评论
+        UserInfoEntity userInfo = UserManager.getInstance().getUserInfoEntity();
+        if (userDataEntity != null && userDataEntity.isCommentOwn() && userInfo != null) {
+            holder.commentUserNameTv.setText(userInfo.getName());
+            ImageUtils.Companion.display(holder.commentUserIconDv, userInfo.getIcon());
+        } else {
+            holder.commentUserNameTv.setText(entity.getUser().getName());
+            if (TextUtils.isEmpty(entity.getUser().getIcon())) {
+                ImageUtils.Companion.display(holder.commentUserIconDv, R.drawable.user_default_icon_comment);
+            } else {
+                ImageUtils.Companion.display(holder.commentUserIconDv, entity.getUser().getIcon());
+            }
+        }
+    }
+
     public interface OnVoteListener {
         void onVote();
     }

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

@@ -1,7 +1,7 @@
 package com.gh.common.util
 
 import android.content.Context
-import com.gh.gamecenter.eventbus.EBReuse
+import com.gh.gamecenter.eventbus.EBConcernChanged
 import com.gh.gamecenter.retrofit.Response
 import com.gh.gamecenter.retrofit.RetrofitManager
 import okhttp3.MediaType
@@ -10,6 +10,7 @@ import okhttp3.ResponseBody
 import org.greenrobot.eventbus.EventBus
 import org.json.JSONArray
 import retrofit2.HttpException
+import rx.android.schedulers.AndroidSchedulers
 import rx.schedulers.Schedulers
 
 /**
@@ -18,46 +19,105 @@ import rx.schedulers.Schedulers
  */
 object ConcernUtils {
 
-    fun postConcernGameId(context: Context, gameId: String) {
-        TokenUtils.getToken(context, true)
-                .flatMap { token ->
-                    val params = JSONArray()
-                    params.put(gameId)
-                    val body = RequestBody.create(MediaType.parse("application/json"), params.toString())
-                    RetrofitManager.getUser().postConcern(token, body)
-                }.subscribeOn(Schedulers.io())
-                .observeOn(Schedulers.io())
-                .subscribe(Response<ResponseBody>())
+    fun postConcernGameId(context: Context, gameId: String, listener: onConcernListener?) {
+        val params = JSONArray()
+        params.put(gameId)
+        val body = RequestBody.create(MediaType.parse("application/json"), params.toString())
+        RetrofitManager.getInstance(context).getApi()
+                .postConcern(body)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(object : Response<ResponseBody>() {
+                    override fun onResponse(response: ResponseBody?) {
+                        super.onResponse(response)
+                        listener?.onSuccess()
+                        EventBus.getDefault().post(EBConcernChanged(gameId, true))
+                    }
+
+                    override fun onFailure(e: HttpException?) {
+                        super.onFailure(e)
+                        listener?.onError()
+                    }
+                })
     }
 
-    fun deleteConcernData(context: Context, gameId: String) {
-        TokenUtils.getToken(context, true)
-                .flatMap { token -> RetrofitManager.getUser().deleteConcern(token, gameId) }.subscribeOn(Schedulers.io())
-                .observeOn(Schedulers.io())
-                .subscribe(Response<ResponseBody>())
+    fun deleteConcernData(context: Context, gameId: String, listener: onConcernListener?) {
+        RetrofitManager.getInstance(context).getApi()
+                .deleteConcern(gameId)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(object : Response<ResponseBody>() {
+                    override fun onResponse(response: ResponseBody?) {
+                        super.onResponse(response)
+                        listener?.onSuccess()
+                        EventBus.getDefault().post(EBConcernChanged(gameId, false))
+                    }
+
+                    override fun onFailure(e: HttpException?) {
+                        super.onFailure(e)
+                        listener?.onError()
+                    }
+                })
     }
 
     fun updateConcernData(context: Context, data: JSONArray) {
-        TokenUtils.getToken(context, true)
-                .flatMap { token ->
-                    val body = RequestBody.create(MediaType.parse("application/json"),
-                            data.toString())
-                    RetrofitManager.getUser().putConcern(token, body)
-                }
+        val body = RequestBody.create(MediaType.parse("application/json"),
+                data.toString())
+        RetrofitManager.getInstance(context).getApi()
+                .putConcern(body)
                 .subscribeOn(Schedulers.io())
                 .observeOn(Schedulers.io())
                 .subscribe(object : Response<ResponseBody>() {
                     override fun onResponse(response: ResponseBody) {
                         super.onResponse(response)
-                        EventBus.getDefault().post(EBReuse("UpdateConcernSuccess"))
-                    }
-
-                    override fun onFailure(e: HttpException) {
-                        super.onFailure(e)
-                        EventBus.getDefault().post(EBReuse("UpdateConcernFailure"))
+                        EventBus.getDefault().post(EBConcernChanged())
                     }
                 })
     }
 
+    fun deleteConcernQuestions(context: Context, questionsId: String, listener: onConcernListener?) {
+        RetrofitManager.getInstance(context).getApi()
+                .deleteConcernQuestions(questionsId)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(object : Response<ResponseBody>() {
+                    override fun onResponse(response: ResponseBody?) {
+                        super.onResponse(response)
+                        listener?.onSuccess()
+                    }
+
+                    override fun onFailure(e: HttpException?) {
+                        super.onFailure(e)
+                        listener?.onError()
+                        AskErrorResponseUtils.errorResponseControl(context, e)
+                    }
+                })
+    }
+
+    fun postConcernQuestions(context: Context, questionsId: String, listener: onConcernListener?) {
+        RetrofitManager.getInstance(context).getApi()
+                .postConcernQuestions(questionsId)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(object : Response<ResponseBody>() {
+                    override fun onResponse(response: ResponseBody?) {
+                        super.onResponse(response)
+                        listener?.onSuccess()
+                    }
+
+                    override fun onFailure(e: HttpException?) {
+                        super.onFailure(e)
+                        listener?.onError()
+                        AskErrorResponseUtils.errorResponseControl(context, e)
+                    }
+                })
+    }
+
+
+    interface onConcernListener {
+        fun onSuccess()
+        fun onError()
+    }
+
 }
 

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

@@ -3,17 +3,14 @@ package com.gh.common.util;
 import android.content.Context;
 import android.os.Build;
 
-import com.lightgame.download.DownloadEntity;
-import com.gh.gamecenter.db.info.ConcernInfo;
 import com.gh.gamecenter.entity.GameEntity;
 import com.gh.gamecenter.entity.NewsDetailEntity;
-import com.gh.gamecenter.manager.ConcernManager;
 import com.gh.gamecenter.manager.DataCollectionManager;
 import com.gh.gamecenter.manager.PackageManager;
+import com.lightgame.download.DownloadEntity;
 
 import org.json.JSONArray;
 
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -118,18 +115,10 @@ public class DataCollectionUtils {
 
     // 上传用户数据
     public static void uploadUser(Context context) {
-        ConcernManager concernManager = new ConcernManager(context);
-        ArrayList<String> concernList = new ArrayList<>();
-        for (ConcernInfo entity : concernManager.getAllConcern()) {
-            if (entity.isConcern()) {
-                concernList.add(entity.getGameName());
-            }
-        }
         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.getInstalledList());
-        map.put("concern", concernList);
         DataCollectionManager.upsert(context, "user", map);
     }
 

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

@@ -2,7 +2,7 @@ package com.gh.common.util;
 
 import android.content.Context;
 
-import com.gh.base.AppController;
+import com.halo.assistant.HaloApp;
 import com.lightgame.download.DownloadEntity;
 import com.gh.gamecenter.retrofit.Response;
 import com.gh.gamecenter.retrofit.RetrofitManager;
@@ -37,9 +37,9 @@ public class DataLogUtils {
 
     // 上传日志
     public static void uploadLog(Context context, String topic, Map<String, Object> map) {
-        String version = PackageUtils.getVersionName(context);
+        String version = PackageUtils.getPatchVersionName();
         String user = Installation.getUUID(context);
-        String channel = AppController.getInstance().getChannel();
+        String channel = HaloApp.getInstance().getChannel();
         map.put("version", version);
         map.put("user", user);
         map.put("device_id", TokenUtils.getDeviceId(context));
@@ -53,7 +53,7 @@ public class DataLogUtils {
 
         RequestBody body = RequestBody.create(MediaType.parse("application/json"),
                 new JSONObject(params).toString());
-        RetrofitManager.getData().postLog(body)
+        RetrofitManager.getInstance(context).getData().postLog(body)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new Response<ResponseBody>());

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

@@ -1,22 +1,15 @@
 package com.gh.common.util;
 
-import android.content.Intent;
 import android.support.v4.content.ContextCompat;
 import android.text.TextUtils;
 import android.view.View;
 
 import com.gh.common.constant.Config;
-import com.gh.common.view.DownloadDialog;
 import com.gh.download.DownloadManager;
-import com.gh.gamecenter.DownloadManagerActivity;
 import com.gh.gamecenter.R;
 import com.gh.gamecenter.adapter.viewholder.DetailViewHolder;
-import com.gh.gamecenter.entity.ApkEntity;
-import com.gh.gamecenter.entity.GameEntity;
 import com.gh.gamecenter.manager.PackageManager;
 import com.lightgame.download.DownloadEntity;
-import com.lightgame.download.FileUtils;
-import com.lightgame.utils.Utils;
 
 /**
  * Created by khy on 27/06/17.
@@ -50,14 +43,14 @@ public class DetailDownloadUtils {
             viewHolder.downloadPb.setVisibility(View.GONE);
             viewHolder.downloadPer.setVisibility(View.GONE);
             boolean isInstalled = false;
-            if (viewHolder.gameEntity.getApk() != null && viewHolder.gameEntity.getApk().size() == 1
+            if (viewHolder.gameEntity.getApk().size() == 1
                     && PackageManager.isInstalled(viewHolder.gameEntity.getApk().get(0).getPackageName())) {
                 isInstalled = true;
             }
             if (isInstalled) {
                 if (PackageManager.isCanUpdate(viewHolder.gameEntity.getId(), viewHolder.gameEntity.getApk().get(0).getPackageName())) {
                     if (viewHolder.isNewsDetail) {
-                        viewHolder.downloadTv.setText("更新");
+                        viewHolder.downloadTv.setText(R.string.update);
                     } else if (TextUtils.isEmpty(viewHolder.downloadAddWord)) {
                         viewHolder.downloadTv.setText(String.format("更新《%s》",
                                 viewHolder.gameEntity.getName()));
@@ -72,7 +65,7 @@ public class DetailDownloadUtils {
                             && !TextUtils.isEmpty(viewHolder.gameEntity.getApk().get(0).getGhVersion())
                             && !PackageUtils.isSignature(viewHolder.context, viewHolder.gameEntity.getApk().get(0).getPackageName())) {
                         if (viewHolder.isNewsDetail) {
-                            viewHolder.downloadTv.setText("插件化");
+                            viewHolder.downloadTv.setText(R.string.pluggable);
                         } else if (TextUtils.isEmpty(viewHolder.downloadAddWord)) {
                             viewHolder.downloadTv.setText(String.format("插件化《%s》",
                                     viewHolder.gameEntity.getName()));
@@ -84,7 +77,7 @@ public class DetailDownloadUtils {
                                 R.drawable.game_item_btn_plugin_style);
                     } else {
                         if (viewHolder.isNewsDetail) {
-                            viewHolder.downloadTv.setText("启动");
+                            viewHolder.downloadTv.setText(R.string.launch);
                         } else if (TextUtils.isEmpty(viewHolder.downloadAddWord)) {
                             viewHolder.downloadTv.setText(String.format("启动《%s》",
                                     viewHolder.gameEntity.getName()));
@@ -122,7 +115,6 @@ public class DetailDownloadUtils {
             }
         }
         if (isCheck && viewHolder.gameEntity != null
-                && viewHolder.gameEntity.getApk() != null
                 && viewHolder.gameEntity.getApk().size() == 1) {
             String url = viewHolder.gameEntity.getApk().get(0).getUrl();
             DownloadEntity downloadEntity = DownloadManager.getInstance(viewHolder.context).getDownloadEntityByUrl(url);
@@ -146,7 +138,7 @@ public class DetailDownloadUtils {
             case timeout:
             case neterror:
             case waiting:
-                viewHolder.downloadPer.setText("下载中");
+                viewHolder.downloadPer.setText(R.string.downloading);
                 break;
             case done:
                 viewHolder.downloadPer.setText("安装");
@@ -167,90 +159,5 @@ public class DetailDownloadUtils {
         }
     }
 
-    public static class OnDetailDownloadClickListener implements View.OnClickListener {
-        private DetailViewHolder mViewHolder;
-        private GameEntity mGameEntity;
-        private DownloadEntity mDownloadEntity;
-        private String mEntrance;
-        private String mName;
-        private String mTitle;
 
-        public OnDetailDownloadClickListener(DetailViewHolder viewHolder, String entrance, String name, String title) {
-            mViewHolder = viewHolder;
-            mGameEntity = viewHolder.gameEntity;
-            mDownloadEntity = viewHolder.downloadEntity;
-            mEntrance = entrance;
-            mName = name;
-            mTitle = title;
-        }
-
-        @Override
-        public void onClick(View v) {
-            if (v == mViewHolder.downloadTv) {
-                if (mGameEntity != null && !mGameEntity.getApk().isEmpty()) {
-                    if (mGameEntity.getApk().size() == 1) {
-                        if (NetworkUtils.isWifiConnected(mViewHolder.context)) {
-                            download();
-                        } else {
-                            DialogUtils.showDownloadDialog(mViewHolder.context, new DialogUtils.ConfirmListener() {
-                                @Override
-                                public void onConfirm() {
-                                    download();
-                                }
-                            });
-                        }
-                    } else {
-                        DownloadDialog.getInstance(mViewHolder.context)
-                                .showPopupWindow(v, mGameEntity, mEntrance, mName + ":" + mTitle);
-                    }
-                } else {
-                    Utils.toast(mViewHolder.context, "稍等片刻~！游戏正在上传中...");
-                }
-            } else if (v == mViewHolder.downloadPb || v == mViewHolder.downloadPer) {
-                String str = mViewHolder.downloadPer.getText().toString();
-                if ("下载中".equals(str)) {
-                    Intent intent = DownloadManagerActivity.getDownloadMangerIntent(mViewHolder.context,
-                            mGameEntity.getApk().get(0).getUrl(), mEntrance + "("+ mName +"[" + mTitle + "])");
-                    mViewHolder.context.startActivity(intent);
-                } else if ("安装".equals(str)) {
-                    PackageUtils.launchSetup(mViewHolder.context, mDownloadEntity.getPath());
-                }
-            }
-        }
-
-        private void download() {
-            String str = mViewHolder.downloadTv.getText().toString();
-            if (str.contains("启动")) {
-                DataUtils.onGameLaunchEvent(mViewHolder.context, mGameEntity.getName(), mGameEntity.getApk().get(0).getPlatform(), mName);
-
-                PackageUtils.launchApplicationByPackageName(mViewHolder.context, mGameEntity.getApk().get(0).getPackageName());
-            } else {
-                String method;
-                if (str.contains("更新")) {
-                    method = "更新";
-                } else if (str.contains("插件化")) {
-                    method = "插件化";
-                } else {
-                    method = "下载";
-                }
-                ApkEntity apkEntity = mGameEntity.getApk().get(0);
-                String msg = FileUtils.isCanDownload(mViewHolder.context, apkEntity.getSize());
-                if (TextUtils.isEmpty(msg)) {
-                    DataUtils.onGameDownloadEvent(mViewHolder.context, mGameEntity.getName(), apkEntity.getPlatform(), mEntrance, "下载开始");
-
-                    DownloadManager.createDownload(mViewHolder.context, apkEntity, mGameEntity, method, mEntrance, mName + ":" + mTitle);
-
-                    mViewHolder.downloadTv.setVisibility(View.GONE);
-                    mViewHolder.downloadPb.setVisibility(View.VISIBLE);
-                    mViewHolder.downloadPer.setVisibility(View.VISIBLE);
-                    mViewHolder.downloadPb.setProgress(0);
-                    mViewHolder.downloadPer.setText("0.0%");
-
-//                    DownloadManager.getInstance(mViewHolder.context).putStatus(apkEntity.getUrl(), "downloading");
-                } else {
-                    Utils.toast(mViewHolder.context, msg);
-                }
-            }
-        }
-    }
 }

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

@@ -0,0 +1,199 @@
+package com.gh.common.util;
+
+import android.content.Context;
+import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
+import android.net.wifi.WifiManager;
+import android.os.Build;
+import android.provider.Settings;
+import android.telephony.TelephonyManager;
+import android.text.TextUtils;
+
+import com.gh.gamecenter.kuaichuan.WifiMgr;
+import com.lightgame.utils.Util_System_Phone_State;
+import com.tencent.stat.StatConfig;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.InputStreamReader;
+import java.io.LineNumberReader;
+import java.io.Reader;
+import java.net.Inet4Address;
+import java.net.InetAddress;
+import java.net.NetworkInterface;
+import java.net.SocketException;
+import java.util.Enumeration;
+
+import static android.os.Build.MANUFACTURER;
+import static android.os.Build.MODEL;
+
+/**
+ * Created by khy on 2/08/17.
+ */
+
+public class DeviceUtils {
+
+    public static JSONObject getLoginDevice(Context context) throws JSONException { // device数据
+        context = context.getApplicationContext();
+        JSONObject object = new JSONObject();
+        object.put("os", "Android");
+        object.put("imei", Util_System_Phone_State.getDeviceId(context));
+        object.put("mac", getMac(context));
+        object.put("model", MODEL);
+        object.put("manufacturer", MANUFACTURER);
+        object.put("android_id", Settings.Secure.getString(context.getContentResolver(), Settings.Secure.ANDROID_ID));
+        object.put("android_sdk", Build.VERSION.SDK_INT);
+        object.put("android_version", android.os.Build.VERSION.RELEASE);
+        object.put("ip", getIPAddress(context));
+        object.put("network", getNetwork(context));
+        return object;
+    }
+
+
+    public static JSONObject getUserDevice(Context context) { // 判断新老用户device数据
+        JSONObject object = new JSONObject();
+        try {
+            object.put("IMEI", Util_System_Phone_State.getDeviceId(context));
+            object.put("ANDROID_ID", Settings.Secure.getString(context.getContentResolver(), Settings.Secure.ANDROID_ID));
+            object.put("MAC", getMac(context));
+            object.put("MTA_ID", StatConfig.getMid(context));
+            object.put("MANUFACTURER", MANUFACTURER);
+            object.put("MODEL", MODEL);
+            object.put("ANDROID_SDK", Build.VERSION.SDK_INT);
+            object.put("ANDROID_VERSION", android.os.Build.VERSION.RELEASE);
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+
+        return object;
+    }
+
+    private static String getMac(Context context) {
+        String str = "";
+        String macSerial = "";
+        try {
+            Process pp = Runtime.getRuntime().exec(
+                    "cat /sys/class/net/wlan0/address ");
+            InputStreamReader ir = new InputStreamReader(pp.getInputStream());
+            LineNumberReader input = new LineNumberReader(ir);
+
+            for (; null != str; ) {
+                str = input.readLine();
+                if (str != null) {
+                    macSerial = str.trim();// 去空格
+                    break;
+                }
+            }
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
+        if ("".equals(macSerial)) {
+            try {
+                return loadFileAsString("/sys/class/net/eth0/address")
+                        .toUpperCase().substring(0, 17);
+            } catch (FileNotFoundException e) {
+                // do nothing
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+
+        }
+        if (TextUtils.isEmpty(macSerial)) { // 备用方案
+            macSerial = ((WifiManager) context.getSystemService(Context.WIFI_SERVICE)).getConnectionInfo().getMacAddress();
+        }
+        return macSerial;
+    }
+
+    private static String loadFileAsString(String fileName) throws Exception {
+        FileReader reader = new FileReader(fileName);
+        String text = loadReaderAsString(reader);
+        reader.close();
+        return text;
+    }
+
+    private static String loadReaderAsString(Reader reader) throws Exception {
+        StringBuilder builder = new StringBuilder();
+        char[] buffer = new char[4096];
+        int readLength = reader.read(buffer);
+        while (readLength >= 0) {
+            builder.append(buffer, 0, readLength);
+            readLength = reader.read(buffer);
+        }
+        return builder.toString();
+    }
+
+
+    public static String getIPAddress(Context context) {
+        NetworkInfo info = ((ConnectivityManager) context
+                .getSystemService(Context.CONNECTIVITY_SERVICE)).getActiveNetworkInfo();
+        if (info != null && info.isConnected()) {
+            if (info.getType() == ConnectivityManager.TYPE_MOBILE) {//当前使用2G/3G/4G网络
+                try {
+                    for (Enumeration<NetworkInterface> en = NetworkInterface.getNetworkInterfaces(); en.hasMoreElements(); ) {
+                        NetworkInterface intf = en.nextElement();
+                        for (Enumeration<InetAddress> enumIpAddr = intf.getInetAddresses(); enumIpAddr.hasMoreElements(); ) {
+                            InetAddress inetAddress = enumIpAddr.nextElement();
+                            if (!inetAddress.isLoopbackAddress() && inetAddress instanceof Inet4Address) {
+                                return inetAddress.getHostAddress();
+                            }
+                        }
+                    }
+                } catch (SocketException e) {
+                    e.printStackTrace();
+                }
+
+            } else if (info.getType() == ConnectivityManager.TYPE_WIFI) {//当前使用无线网络
+                return WifiMgr.getInstance(context).getCurrentIpAddress();
+            }
+        } else {
+            //当前无网络连接,请在设置中打开网络
+        }
+        return null;
+    }
+
+    private static String getNetwork(Context context) {
+        NetworkInfo info = ((ConnectivityManager) context
+                .getSystemService(Context.CONNECTIVITY_SERVICE)).getActiveNetworkInfo();
+        if (info != null && info.isConnected()) {
+            int typeMobile = info.getType();
+            if (typeMobile == ConnectivityManager.TYPE_WIFI) {
+                return "WIFI";
+            } else if (typeMobile == ConnectivityManager.TYPE_MOBILE) {
+                String status;
+                switch (typeMobile) {
+                    case TelephonyManager.NETWORK_TYPE_GPRS:
+                    case TelephonyManager.NETWORK_TYPE_EDGE:
+                    case TelephonyManager.NETWORK_TYPE_CDMA:
+                    case TelephonyManager.NETWORK_TYPE_1xRTT:
+                    case TelephonyManager.NETWORK_TYPE_IDEN:
+                        status = "2G";
+                        break;
+                    case TelephonyManager.NETWORK_TYPE_UMTS:
+                    case TelephonyManager.NETWORK_TYPE_EVDO_0:
+                    case TelephonyManager.NETWORK_TYPE_EVDO_A:
+                    case TelephonyManager.NETWORK_TYPE_HSDPA:
+                    case TelephonyManager.NETWORK_TYPE_HSUPA:
+                    case TelephonyManager.NETWORK_TYPE_HSPA:
+                    case TelephonyManager.NETWORK_TYPE_EVDO_B:
+                    case TelephonyManager.NETWORK_TYPE_EHRPD:
+                    case TelephonyManager.NETWORK_TYPE_HSPAP:
+                        status = "3G";
+                        break;
+                    case TelephonyManager.NETWORK_TYPE_LTE:
+                        status = "4G";
+                        break;
+                    default:
+                        status = "未知";
+                        break;
+                }
+                return status;
+            }
+        }
+
+        return null;
+    }
+
+}

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

@@ -15,6 +15,7 @@ import android.text.Spanned;
 import android.text.TextPaint;
 import android.view.Display;
 import android.view.Gravity;
+import android.view.LayoutInflater;
 import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
@@ -23,9 +24,10 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.gh.base.AppController;
+import com.gh.gamecenter.KcSelectGameActivity;
 import com.gh.gamecenter.R;
 import com.gh.gamecenter.kuaichuan.WifiMgr;
+import com.halo.assistant.HaloApp;
 
 import java.io.File;
 import java.text.DecimalFormat;
@@ -54,9 +56,9 @@ public class DialogUtils {
     // 快传成绩单
     public static void showKuaiChuanResult(final Activity activity, Handler handler, int requestCode, final String picName) {
 
-        AppController.remove("FileInfo");
+        HaloApp.remove(KcSelectGameActivity.KEY_FILE_INFO);
 
-        List<Map<String, String>> mapList = (List<Map<String, String>>) AppController.get("sendData", true);
+        List<Map<String, String>> mapList = (List<Map<String, String>>) HaloApp.get("sendData", true);
         if (mapList == null || mapList.size() == 0) return;
 
         WifiMgr.getInstance(activity).disconnectCurrentNetwork(); // 断开当前WiFi
@@ -68,8 +70,7 @@ public class DialogUtils {
         int filesSize = 0;
         int sendTime = 0;
 
-        View view = View.inflate(activity
-                , R.layout.dialog_kuaichuan, null);
+        View view = View.inflate(activity, R.layout.dialog_kuaichuan, null);
         final LinearLayout mShareLl = (LinearLayout) view.findViewById(R.id.kuaichuan_dialog_ll);
         final LinearLayout mShareBottomLl = (LinearLayout) view.findViewById(R.id.kuaichuan_dialog_share_rl);
         LinearLayout shareIconLl = (LinearLayout) view.findViewById(R.id.kuaichuan_icon_ll);
@@ -153,8 +154,8 @@ public class DialogUtils {
             sizeName = df.format(size) + "MB";
         }
 
-        if (sendTime == 0) {
-            sendTime = 1;
+        if (sendTime < 1000) { // 最少设置发送时间为1s（为了简易计算）
+            sendTime = 1000;
         }
 
         int i = (filesSize / 1024) / (sendTime / 1000);
@@ -191,7 +192,7 @@ public class DialogUtils {
                 mShareLl.buildDrawingCache();
                 Bitmap drawingCache = mShareLl.getDrawingCache();
                 saveBitmap(drawingCache, activity, picName);
-                MessageShareUtils.getInstance(activity).showShareWindows(mShareBottomLl, drawingCache, picName, 2);
+                MessageShareUtils.getInstance(activity).showShareWindows(activity, mShareBottomLl, drawingCache, picName, 2);
                 mShareBottomLl.setVisibility(View.VISIBLE);
             }
         }, 200);
@@ -324,6 +325,10 @@ public class DialogUtils {
     }
 
     public static void showWarningDialog(Context context, String title, CharSequence msg, final ConfirmListener listener) {
+        //TODO fix this
+        if (!(context instanceof Activity)) {
+            return ;
+        }
         showWarningDialog(context, title, msg, "取消", "确定", listener, null);
     }
 
@@ -331,61 +336,6 @@ public class DialogUtils {
                                          final ConfirmListener cmListener, final CancelListener clListener) {
 
         showAlertDialog(context, title, msg, confirm, cancel, cmListener, clListener);
-        if (true) return; // TODO TEST
-
-        if (isShow) {
-            return;
-        }
-        isShow = true;
-
-        final Dialog dialog = new Dialog(context);
-
-        View view = View.inflate(context, R.layout.common_alertdialog, null);
-
-        // 标题
-        TextView alertdialog_title = (TextView) view.findViewById(R.id.alertdialog_title);
-        alertdialog_title.setText(title);
-
-        // 内容
-        TextView alertdialog_content = (TextView) view.findViewById(R.id.alertdialog_content);
-        alertdialog_content.setText(msg);
-
-        // 取消按钮
-        TextView alertdialog_cannel = (TextView) view.findViewById(R.id.alertdialog_cannel);
-        alertdialog_cannel.setText(cancel);
-        alertdialog_cannel.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                dialog.dismiss();
-                if (clListener != null) {
-                    clListener.onCancel();
-                }
-            }
-        });
-
-        // 确定按钮
-        TextView alertdialog_confirm = (TextView) view.findViewById(R.id.alertdialog_confirm);
-        alertdialog_confirm.setText(confirm);
-        alertdialog_confirm.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                dialog.dismiss();
-                if (cmListener != null) {
-                    cmListener.onConfirm();
-                }
-            }
-        });
-
-        dialog.setOnDismissListener(new Dialog.OnDismissListener() {
-            @Override
-            public void onDismiss(DialogInterface dialog) {
-                isShow = false;
-            }
-        });
-
-        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
-        dialog.setContentView(view);
-        dialog.show();
     }
 
     // 网络劫持时 打开QQ客户端，创建临时会话
@@ -400,19 +350,17 @@ public class DialogUtils {
                 }, null);
     }
 
-    public static void showDownloadDialog(Context context, ConfirmListener listener, CancelListener cancelListener){
-        showWarningDialog(context, "下载提示", "您当前使用的网络为2G/3G/4G，开始下载将会消耗移动流量，确定下载？",  "取消", "确定", listener, cancelListener);
+    public static void showDownloadDialog(Context context, ConfirmListener listener, CancelListener cancelListener) {
+        showWarningDialog(context, "下载提示", "您当前使用的网络为2G/3G/4G，开始下载将会消耗移动流量，确定下载？", "取消", "确定", listener, cancelListener);
     }
 
     public static void showDownloadDialog(Context context, ConfirmListener listener) {
         showWarningDialog(context, "下载提示", "您当前使用的网络为2G/3G/4G，开始下载将会消耗移动流量，确定下载？", listener);
     }
 
-    public static void showCancelDialog(Context context, final ConfirmListener listener) {
-        Spanned content = Html.fromHtml("取消关注游戏后，您将无法及时收到游戏" +
-                "<font color=\"#ff0000\">攻略</font>、" +
-                "<font color=\"#ff0000\">资讯</font>等最新动态提醒。");
-        showWarningDialog(context, "取消关注", content, "暂不取消", "确定取消", listener, null);
+    public static void showCancelDialog(Context context, final ConfirmListener listener, CancelListener cancelListener) {
+        Spanned content = Html.fromHtml(context.getString(R.string.cancel_concern_dialog));
+        showCancelListenerDialog(context, "取消关注", content, "确定取消", "暂不取消", listener, cancelListener);
     }
 
     public static void showPluginDialog(Context context, final ConfirmListener listener) {
@@ -422,30 +370,6 @@ public class DialogUtils {
         showWarningDialog(context, "插件化安装", spanned, listener);
     }
 
-    public static void showDisclaimerDialog(Context context, String content) {
-        final Dialog disclaimerDialog = new Dialog(context);
-        View view = View.inflate(context, R.layout.dialog_disclaimer, null);
-
-//		TextView title = (TextView) view.findViewById(R.id.disclaimer_title);
-//		title.setText("免责声明");
-
-        TextView message = (TextView) view.findViewById(R.id.disclaimer_message);
-        Spanned spanned = Html.fromHtml(content);
-        message.setText(spanned);
-
-        view.findViewById(R.id.disclaimer_confirm).setOnClickListener(
-                new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        disclaimerDialog.dismiss();
-                    }
-                });
-
-        disclaimerDialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
-        disclaimerDialog.setContentView(view);
-        disclaimerDialog.show();
-    }
-
     /**
      * Material Design 风格弹窗
      *
@@ -457,45 +381,250 @@ public class DialogUtils {
      * @param cmListener 确认按钮监听
      * @param clListener 取消按钮监听
      */
-
     public static void showAlertDialog(Context context, String title, CharSequence message
             , String positive, String negative, final ConfirmListener cmListener, final CancelListener clListener) {
 
-        AlertDialog alertDialog = new AlertDialog.Builder(context, R.style.GhAlertDialog)
-                .setTitle(title)
-                .setMessage(message)
-                .setPositiveButton(positive, new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        if (cmListener != null) {
-                            cmListener.onConfirm();
-                        }
-                    }
-                })
-                .setNegativeButton(negative, new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        if (clListener != null) {
-                            clListener.onCancel();
-                        }
-                    }
-                })
-                .create();
-        alertDialog.show();
+        final Dialog dialog = new Dialog(context, R.style.GhAlertDialog);
 
-        TextView mesage = (TextView) alertDialog.findViewById(android.R.id.message);
-        Button positiveBtn = alertDialog.getButton(android.app.AlertDialog.BUTTON_POSITIVE);
-        Button negativeBtn = alertDialog.getButton(android.app.AlertDialog.BUTTON_NEGATIVE);
+        View contentView = LayoutInflater.from(context).inflate(R.layout.dialog_alert, null);
+        TextView contentTv = contentView.findViewById(R.id.dialog_content);
+        TextView titleTv = contentView.findViewById(R.id.dialog_title);
+        TextView negativeTv = contentView.findViewById(R.id.dialog_negative);
+        TextView positiveTv = contentView.findViewById(R.id.dialog_positive);
 
-        positiveBtn.setTextSize(13);
-        positiveBtn.setTextColor(ContextCompat.getColor(context, R.color.theme));
-        negativeBtn.setTextSize(13);
-        negativeBtn.setTextColor(ContextCompat.getColor(context, R.color.theme));
-        if (mesage != null) {
-            mesage.setTextSize(13);
-            mesage.setTextColor(ContextCompat.getColor(context, R.color.title));
-        }
+        contentTv.setText(message);
+        titleTv.setText(title);
+        negativeTv.setText(negative);
+        positiveTv.setText(positive);
 
+        negativeTv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (clListener != null) {
+                    clListener.onCancel();
+                }
+                dialog.dismiss();
+            }
+        });
+
+        positiveTv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (cmListener != null) {
+                    cmListener.onConfirm();
+                }
+                dialog.dismiss();
+            }
+        });
+
+        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
+        dialog.setContentView(contentView);
+        dialog.show();
+
+    }
+
+    /**
+     * 取消按钮灰色
+     *
+     * @param context
+     * @param title
+     * @param message
+     * @param positive
+     * @param negative
+     * @param cmListener
+     */
+
+    public static void showCancelAlertDialog(Context context, String title, CharSequence message
+            , String positive, String negative, final ConfirmListener cmListener, final CancelListener clListener) {
+
+        final Dialog dialog = new Dialog(context, R.style.GhAlertDialog);
+
+        View contentView = LayoutInflater.from(context).inflate(R.layout.dialog_alert, null);
+        TextView contentTv = contentView.findViewById(R.id.dialog_content);
+        TextView titleTv = contentView.findViewById(R.id.dialog_title);
+        TextView negativeTv = contentView.findViewById(R.id.dialog_negative);
+        TextView positiveTv = contentView.findViewById(R.id.dialog_positive);
+
+        contentTv.setText(message);
+        titleTv.setText(title);
+        negativeTv.setText(negative);
+        negativeTv.setTextColor(ContextCompat.getColor(context, R.color.hint));
+        positiveTv.setText(positive);
+
+        negativeTv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (clListener != null) {
+                    clListener.onCancel();
+                }
+                dialog.dismiss();
+            }
+        });
+
+        positiveTv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (cmListener != null) {
+                    cmListener.onConfirm();
+                }
+                dialog.dismiss();
+            }
+        });
+
+        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
+        dialog.setContentView(contentView);
+        dialog.show();
+
+
+    }
+
+    /**
+     * 点击外部退出和取消监听绑定
+     */
+    public static void showCancelListenerDialog(Context context, String title, CharSequence message
+            , String positive, String negative, final ConfirmListener cmListener, final CancelListener clListener) {
+
+
+        final Dialog dialog = new Dialog(context, R.style.GhAlertDialog);
+
+        View contentView = LayoutInflater.from(context).inflate(R.layout.dialog_alert, null);
+        TextView contentTv = contentView.findViewById(R.id.dialog_content);
+        TextView titleTv = contentView.findViewById(R.id.dialog_title);
+        TextView negativeTv = contentView.findViewById(R.id.dialog_negative);
+        TextView positiveTv = contentView.findViewById(R.id.dialog_positive);
+
+        contentTv.setText(message);
+        titleTv.setText(title);
+        negativeTv.setText(negative);
+        negativeTv.setTextColor(ContextCompat.getColor(context, R.color.hint));
+        positiveTv.setText(positive);
+
+        negativeTv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (clListener != null) {
+                    clListener.onCancel();
+                }
+                dialog.dismiss();
+            }
+        });
+
+        positiveTv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (cmListener != null) {
+                    cmListener.onConfirm();
+                }
+                dialog.dismiss();
+            }
+        });
+
+        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
+        dialog.setContentView(contentView);
+        dialog.setOnCancelListener(new DialogInterface.OnCancelListener() {
+            @Override
+            public void onCancel(DialogInterface dialogInterface) {
+                if (clListener != null)
+                clListener.onCancel();
+            }
+        });
+        dialog.show();
+
+
+    }
+
+
+    /**
+     * 权限弹窗
+     * 只能在弹窗内取消
+     */
+    public static void showPermissionDialog(Context context, String title, CharSequence message
+            , String positive, String negative, final ConfirmListener cmListener, final CancelListener clListener) {
+
+        final Dialog dialog = new Dialog(context, R.style.GhAlertDialog);
+
+        View contentView = LayoutInflater.from(context).inflate(R.layout.dialog_alert, null);
+        TextView contentTv = contentView.findViewById(R.id.dialog_content);
+        TextView titleTv = contentView.findViewById(R.id.dialog_title);
+        TextView negativeTv = contentView.findViewById(R.id.dialog_negative);
+        TextView positiveTv = contentView.findViewById(R.id.dialog_positive);
+
+        contentTv.setText(message);
+        titleTv.setText(title);
+        negativeTv.setText(negative);
+        negativeTv.setTextColor(ContextCompat.getColor(context, R.color.hint));
+        positiveTv.setText(positive);
+
+        negativeTv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (clListener != null) {
+                    clListener.onCancel();
+                }
+                dialog.dismiss();
+            }
+        });
+
+        positiveTv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (cmListener != null) {
+                    cmListener.onConfirm();
+                }
+                dialog.dismiss();
+            }
+        });
+
+        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
+        dialog.setContentView(contentView);
+        dialog.setCancelable(false);
+        dialog.show();
+
+    }
+
+    /**
+     * 只能在弹窗内取消
+     */
+    public static void showForceDialog(Context context, String title, CharSequence message
+            , String positive, String negative, final ConfirmListener cmListener, final CancelListener clListener) {
+
+        final Dialog dialog = new Dialog(context, R.style.GhAlertDialog);
+
+        View contentView = LayoutInflater.from(context).inflate(R.layout.dialog_alert, null);
+        TextView contentTv = contentView.findViewById(R.id.dialog_content);
+        TextView titleTv = contentView.findViewById(R.id.dialog_title);
+        TextView negativeTv = contentView.findViewById(R.id.dialog_negative);
+        TextView positiveTv = contentView.findViewById(R.id.dialog_positive);
+
+        contentTv.setText(message);
+        titleTv.setText(title);
+        negativeTv.setText(negative);
+        positiveTv.setText(positive);
+
+        negativeTv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (clListener != null) {
+                    clListener.onCancel();
+                }
+                dialog.dismiss();
+            }
+        });
+
+        positiveTv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (cmListener != null) {
+                    cmListener.onConfirm();
+                }
+                dialog.dismiss();
+            }
+        });
+
+        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
+        dialog.setContentView(contentView);
+        dialog.setCancelable(false);
+        dialog.show();
     }
 
     /**

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

@@ -9,11 +9,11 @@ import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import com.gh.common.constant.Config;
 import com.gh.common.view.DownloadDialog;
 import com.gh.download.DownloadManager;
+import com.gh.gamecenter.DataUtils;
 import com.gh.gamecenter.DownloadManagerActivity;
 import com.gh.gamecenter.R;
 import com.gh.gamecenter.adapter.viewholder.GameViewHolder;
@@ -24,6 +24,7 @@ import com.lightgame.download.DownloadConfig;
 import com.lightgame.download.DownloadEntity;
 import com.lightgame.download.DownloadStatus;
 import com.lightgame.download.FileUtils;
+import com.lightgame.utils.Utils;
 
 import java.util.concurrent.LinkedBlockingQueue;
 
@@ -60,9 +61,10 @@ public class DownloadItemUtils {
                 gameEntity.setEntryMap(entryMap);
             }
             entryMap.put(platform, downloadEntity);
-            if (!"pause".equals(DownloadManager.getInstance(context).getStatus(downloadEntity.getUrl()))) {
-                adapter.notifyItemChanged(index);
-            }
+            adapter.notifyItemChanged(index);
+//            if (!DownloadStatus.pause.equals(DownloadManager.getInstance(context).getStatus(downloadEntity.getUrl()))) {
+//                adapter.notifyItemChanged(index);
+//            }
         } else {
             if (!queue.contains(platform)) {
                 queue.offer(platform);
@@ -84,7 +86,7 @@ public class DownloadItemUtils {
                     gameEntity.setEntryMap(entryMap);
                 }
                 entryMap.put(platform, downloadEntity);
-                if (!"pause".equals(DownloadManager.getInstance(context).getStatus(downloadEntity.getUrl()))) {
+                if (!DownloadStatus.pause.equals(DownloadManager.getInstance(context).getStatus(downloadEntity.getUrl()))) {
                     adapter.notifyItemChanged(index);
                 }
             }
@@ -147,25 +149,25 @@ public class DownloadItemUtils {
         final String packageName = apkEntity.getPackageName();
 
         if (gameEntity.isPluggable()) {
-            holder.gameDownloadBtn.setText("插件化");
+            holder.gameDownloadBtn.setText(R.string.pluggable);
             setwhat(context, holder, apkEntity, packageName);
         } else if (PackageManager.isInstalled(packageName)) {
             if (PackageManager.isCanUpdate(gameEntity.getId(), packageName)) {
-                holder.gameDownloadBtn.setText("更新");
+                holder.gameDownloadBtn.setText(R.string.update);
                 holder.gameDownloadBtn.setBackgroundResource(R.drawable.game_item_btn_download_style);
             } else {
                 if (gameEntity.getTag() != null && gameEntity.getTag().size() != 0
                         && !TextUtils.isEmpty(apkEntity.getGhVersion())
                         && !PackageUtils.isSignature(context, packageName)) {
-                    holder.gameDownloadBtn.setText("插件化");
+                    holder.gameDownloadBtn.setText(R.string.pluggable);
                     setwhat(context, holder, apkEntity, packageName);
                 } else {
-                    holder.gameDownloadBtn.setText("启动");
+                    holder.gameDownloadBtn.setText(R.string.launch);
                     holder.gameDownloadBtn.setBackgroundResource(R.drawable.game_item_btn_launch_style);
                 }
             }
         } else {
-            holder.gameDownloadBtn.setText("下载");
+            holder.gameDownloadBtn.setText(R.string.download);
             holder.gameDownloadBtn.setBackgroundResource(R.drawable.game_item_btn_download_style);
         }
     }
@@ -230,7 +232,7 @@ public class DownloadItemUtils {
 
         DownloadStatus status = downloadEntity.getStatus();
         if (status.equals(DownloadStatus.downloading)) {
-            if (!"pause".equals(DownloadManager.getInstance(context).getStatus(downloadEntity.getUrl()))) {
+            if (!DownloadStatus.pause.equals(DownloadManager.getInstance(context).getStatus(downloadEntity.getUrl()))) {
                 holder.gameProgressbar.setProgress((int) (downloadEntity.getPercent() * 10));
                 if (isShowPlatform && platform != null) {
                     holder.gameDownloadSpeed.setText(String.format("%s - %s(剩%s)", platform,
@@ -244,7 +246,7 @@ public class DownloadItemUtils {
             }
 
             if (isNormal) {
-                holder.gameDownloadBtn.setText("下载中");
+                holder.gameDownloadBtn.setText(R.string.downloading);
                 holder.gameDownloadBtn.setBackgroundResource(R.drawable.game_item_btn_downloading_style);
                 holder.gameDownloadBtn.setTextColor(ContextCompat.getColorStateList(context, R.color.text_downloading_style));
             }
@@ -258,13 +260,14 @@ public class DownloadItemUtils {
             holder.gameDownloadPercentage.setText(downloadEntity.getPercent() + "%");
 
             if (isNormal) {
-                holder.gameDownloadBtn.setText("下载中");
+                holder.gameDownloadBtn.setText(R.string.downloading);
                 holder.gameDownloadBtn.setBackgroundResource(R.drawable.game_item_btn_downloading_style);
                 holder.gameDownloadBtn.setTextColor(ContextCompat.getColorStateList(context, R.color.text_downloading_style));
             }
         } else if (status.equals(DownloadStatus.pause)
                 || status.equals(DownloadStatus.timeout)
                 || status.equals(DownloadStatus.neterror)) {
+            Utils.log("=============AAAA::" + status);
             holder.gameProgressbar.setProgress((int) (downloadEntity.getPercent() * 10));
             if (isShowPlatform && platform != null) {
                 holder.gameDownloadSpeed.setText(String.format("%s - 暂停", platform));
@@ -274,7 +277,7 @@ public class DownloadItemUtils {
             holder.gameDownloadPercentage.setText(downloadEntity.getPercent() + "%");
 
             if (isNormal) {
-                holder.gameDownloadBtn.setText("下载中");
+                holder.gameDownloadBtn.setText(R.string.downloading);
                 holder.gameDownloadBtn.setBackgroundResource(R.drawable.game_item_btn_downloading_style);
                 holder.gameDownloadBtn.setTextColor(ContextCompat.getColorStateList(context, R.color.text_downloading_style));
             }
@@ -397,16 +400,16 @@ public class DownloadItemUtils {
         if (TextUtils.isEmpty(msg)) {
             DataUtils.onGameDownloadEvent(context, gameEntity.getName(), gameEntity.getApk().get(0).getPlatform(), entrance, "下载开始");
 
-            DownloadManager.createDownload(context, gameEntity, "下载", entrance, location);
-            Toast.makeText(context, gameEntity.getName() + "已加入下载队列", Toast.LENGTH_SHORT).show();
+            DownloadManager.createDownload(context, gameEntity, context.getString(R.string.download), entrance, location);
+            Utils.toast(context, gameEntity.getName() + "已加入下载队列");
 
-            downloadBtn.setText("下载中");
+            downloadBtn.setText(R.string.downloading);
             downloadBtn.setBackgroundResource(R.drawable.game_item_btn_downloading_style);
             downloadBtn.setTextColor(ContextCompat.getColorStateList(context, R.color.text_downloading_style));
 
 //            DownloadManager.getInstance(context).putStatus(gameEntity.getApk().get(0).getUrl(), "downloading");
         } else {
-            Toast.makeText(context, msg, Toast.LENGTH_SHORT).show();
+            Utils.toast(context, msg);
         }
     }
 
@@ -418,15 +421,15 @@ public class DownloadItemUtils {
             DataUtils.onGameDownloadEvent(context, gameEntity.getName(), gameEntity.getApk().get(0).getPlatform(), entrance, "下载开始");
 
             DownloadManager.createDownload(context, gameEntity, "插件化", entrance, location);
-            Toast.makeText(context, gameEntity.getName() + "已加入下载队列", Toast.LENGTH_SHORT).show();
+            Utils.toast(context, gameEntity.getName() + "已加入下载队列");
 
-            downloadBtn.setText("下载中");
+            downloadBtn.setText(R.string.downloading);
             downloadBtn.setBackgroundResource(R.drawable.game_item_btn_downloading_style);
             downloadBtn.setTextColor(ContextCompat.getColorStateList(context, R.color.text_downloading_style));
 
 //            DownloadManager.getInstance(context).putStatus(gameEntity.getApk().get(0).getUrl(), "downloading");
         } else {
-            Toast.makeText(context, msg, Toast.LENGTH_SHORT).show();
+            Utils.toast(context, msg);
         }
     }
 
@@ -438,7 +441,7 @@ public class DownloadItemUtils {
         if (downloadEntity != null) {
             final String path = downloadEntity.getPath();
             if (FileUtils.isEmptyFile(path)) {
-                Toast.makeText(context, "解析包出错（可能被误删了），请重新下载", Toast.LENGTH_SHORT).show();
+                Utils.toast(context, R.string.install_failure_hint);
                 DownloadManager.getInstance(context).cancel(downloadEntity.getUrl());
                 if (gameEntity.getEntryMap() != null) {
                     gameEntity.getEntryMap().remove(apkEntity.getPlatform());

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

@@ -6,7 +6,9 @@ import android.os.Bundle;
 import android.text.TextUtils;
 
 import com.gh.gamecenter.MainActivity;
+import com.gh.gamecenter.NormalActivity;
 import com.gh.gamecenter.SplashScreenActivity;
+import com.gh.gamecenter.normal.NormalFragment;
 
 /**
  * @author CsHeng
@@ -21,12 +23,15 @@ public class EntranceUtils {
     public static final String KEY_GAMEID = "gameId";
     public static final String KEY_ID = "id";
     public static final String KEY_URL = "url";
+    public static final String KEY_GAMENAME = "gameName";
     public static final String HOST_ARTICLE = "article";
     public static final String HOST_GAME = "game";
-    public static final String HOSt_COLUMN = "column";
+    public static final String HOST_COLUMN = "column";
     public static final String HOST_WEB = "web";
     public static final String HOST_DOWNLOAD = "download";
     public static final String HOST_SUGGESTION = "suggestion";
+    public static final String HOST_ANSWER = "answer";
+    public static final String HOST_QUESTION = "question";
     public static final String KEY_DATA = "data";
     public static final String KEY_TYPE = "type";
     public static final String KEY_NAME = "name";
@@ -43,7 +48,23 @@ public class EntranceUtils {
     public static final String KEY_VERSION = "version";
     public static final String KEY_CONTENT = "content";
     public static final String KEY_PLUGIN = "plugin";
-    public static final String KEY_CURRENT_ITEM = "currentItem";
+    public static final String KEY_CURRENTITEM = "currentItem";
+    public static final String KEY_COMMENTID = "commentId";
+    public static final String KEY_PATH = "path";
+    public static final String KEY_OLDERUSER = "isOldUser";
+    public static final String KEY_SEARCHKEY = "searchKey";
+    public static final String KEY_HINT = "hint";
+    public static final String KEY_GAME_ICON_URL = "gameIconUrl";
+    public static final String KEY_SHARECONTENT = "shareContent";
+    public static final String KEY_SUGGESTTYPE = "suggestType";
+    public static final String KEY_PROLIST = "provinceList";
+    public static final String KEY_ORDER = "order";
+    public static final String KEY_TAGTYPE = "tagType";
+    public static final String KEY_ANSWER_ID = "answerId";
+    public static final String KEY_ANSWER_CONTENT = "answerContent";
+    public static final String KEY_QUESTIONS_ID = "questionsId";
+    public static final String KEY_QUESTIONS_TITLE = "questionsTitle";
+    public static final String KEY_QUESTIONS_PATCH = "questionsPatch";
 
     public static void jumpActivity(Context context, Bundle bundle) {
 
@@ -55,10 +76,14 @@ public class EntranceUtils {
             if (!TextUtils.isEmpty(to)) {
                 Class<?> clazz = ClassUtils.forName(to);
                 if (clazz != null) {
-                    Intent intent1 = new Intent(context, clazz);
-                    intent1.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                    intent1.putExtra(KEY_DATA, bundle);
-                    context.startActivity(intent1);
+                    if (NormalFragment.class.isAssignableFrom(clazz)) { // 兼容NormalFragment
+                        NormalActivity.startFragment(context, (Class<? extends NormalFragment>) clazz, bundle);
+                    } else {
+                        Intent intent1 = new Intent(context, clazz);
+                        intent1.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                        intent1.putExtras(bundle);
+                        context.startActivity(intent1);
+                    }
                 }
             }
         } else {

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

@@ -65,7 +65,7 @@ public class GameViewUtils {
             tag.setTextColor(ContextCompat.getColor(context, R.color.tag_green));
         } else {
             String colorStr;
-            if (!TextUtils.isEmpty(tagType) && tagType.equals("type")) { // 游戏标签
+            if (!TextUtils.isEmpty(tagType) && "type".equals(tagType)) { // 游戏标签
                 colorStr = "#ff6a28";
             } else {
                 colorStr = TagUtils.getInstance(context).getColor(tagStr);
@@ -99,23 +99,21 @@ public class GameViewUtils {
         try {
             long today = format.parse(format.format(new Date())).getTime();
             long day = Long.parseLong(testTime + "000");
-            Calendar calendar = Calendar.getInstance(TimeZone
-                    .getTimeZone("Asia/Shanghai"));
-            calendar.setTimeInMillis(day);
-            int hour = calendar.get(Calendar.HOUR_OF_DAY);
+            SimpleDateFormat timeFormat = new SimpleDateFormat("HH:mm", Locale.CHINA);
+            String time = timeFormat.format(day);
+
             if (day >= today && day < today + 86400 * 1000) {
-                testDate = "今天" + hour + "点";
+                testDate = "今天 " + time;
             } else if (day >= today + 86400 * 1000
                     && day < today + 86400 * 1000 * 2) {
-                testDate = "明天" + hour + "点";
+                testDate = "明天 " + time;
             } else if (day >= today + 86400 * 1000 * 2
                     && day < today + 86400 * 1000 * 3) {
-                testDate = "后天" + hour + "点";
+                testDate = "后天 " + time;
             } else if (day >= today - 86400 * 1000 && day < today) {
-                testDate = "昨天" + hour + "点";
+                testDate = "昨天 " + time;
             } else {
-                format = new SimpleDateFormat("MM-dd", Locale.CHINA);
-                testDate = format.format(day) + " " + hour + "点";
+                testDate = new SimpleDateFormat("MM-dd HH:mm", Locale.CHINA).format(day);
             }
             return testDate;
         } catch (ParseException e) {

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

@@ -6,6 +6,8 @@ import android.content.Intent;
 import android.widget.Toast;
 
 import com.gh.common.constant.Config;
+import com.gh.gamecenter.R;
+import com.gh.gamecenter.login.LoginTag;
 import com.lightgame.utils.RuntimeUtils;
 import com.lightgame.utils.Utils;
 import com.sina.weibo.sdk.WbSdk;
@@ -75,7 +77,6 @@ public class GetLoginDataUtils {
     public IUiListener QqLoginListener = new IUiListener() {
         @Override
         public void onComplete(Object o) {
-            Toast.makeText(mContext, "登录成功", Toast.LENGTH_SHORT).show();
             Utils.log(GetLoginDataUtils.class.getSimpleName(), "QQ 登录成功");
             if (o instanceof JSONObject) {
                 JSONObject jsonObject = (JSONObject) o;
@@ -90,7 +91,7 @@ public class GetLoginDataUtils {
                     content.put("access_token_expire", Utils.getTime(mContext) + jsonObject.getLong("expires_in"));
                     content.put("access_token", jsonObject.getString("access_token"));
                     if (mLoginListener != null) {
-                        mLoginListener.OnLoginData(jsonObject, LoginUtils.LoginTag.qq);// QQ 登录回调
+                        mLoginListener.OnLoginData(content, LoginTag.qq);// QQ 登录回调
                     }
 
                 } catch (JSONException e) {
@@ -123,13 +124,13 @@ public class GetLoginDataUtils {
 
         @Override
         public void onError(UiError uiError) {
-            Toast.makeText(mContext, "登录失败", Toast.LENGTH_SHORT).show();
+            Utils.toast(mContext, "登录失败");
             Utils.log(GetLoginDataUtils.class.getSimpleName(), "QQ 登录失败");
         }
 
         @Override
         public void onCancel() {
-            Toast.makeText(mContext, "登录取消", Toast.LENGTH_SHORT).show();
+            Utils.toast(mContext, "登录取消");
             Utils.log(GetLoginDataUtils.class.getSimpleName(), "QQ 登录取消");
         }
     };
@@ -147,6 +148,12 @@ public class GetLoginDataUtils {
         }
     }
 
+    public void QQLogout() {
+        if (mTencent != null && mTencent.isSessionValid()) {
+            mTencent.logout(mContext);
+        }
+    }
+
 
     // 微信登录
     public void WCLogin(OnLoginDataListener listener) {
@@ -156,14 +163,19 @@ public class GetLoginDataUtils {
 
             SendAuth.Req req = new SendAuth.Req();
             req.scope = "snsapi_userinfo";
-            req.state = "光环助手";
+            req.state = mContext.getString(R.string.app_name);
             boolean b = mIWXAPI.sendReq(req);
             Utils.log(GetLoginDataUtils.class.getSimpleName(), "微信注册状态：：" + register + "\n 发送状态：：" + b);
+            if (!register || !b) {
+                Utils.toast(mContext, "请检查是否安装微信客户端");
+            }
         }
     }
 
     public void WCLofinCallBack(JSONObject content) {
-        mLoginListener.OnLoginData(content, LoginUtils.LoginTag.wechat);
+        if (mLoginListener != null) {
+            mLoginListener.OnLoginData(content, LoginTag.wechat);
+        }
     }
 
     public void onWeiboCallback(int requestCode, int resultCode, Intent data) {
@@ -209,9 +221,9 @@ public class GetLoginDataUtils {
                 content.put("access_token", token.getToken());
                 content.put("access_token_expire", Utils.getTime(mContext) + token.getExpiresTime());
                 content.put("refresh_token", token.getRefreshToken());
-//                content.put("refresh_token_expire", ""); // TODO refresh_token 好像没有有效期
+//                content.put("refresh_token_expire",  Utils.getTime(mContext) + 86400 * 30); //  refresh_token 有效期30天
                 if (mLoginListener != null) {
-                    mLoginListener.OnLoginData(content, LoginUtils.LoginTag.qq);// QQ 登录回调
+                    mLoginListener.OnLoginData(content, LoginTag.weibo);// 微博 登录回调
                 }
             } catch (JSONException e) {
                 e.printStackTrace();
@@ -227,12 +239,12 @@ public class GetLoginDataUtils {
 
         @Override
         public void cancel() {
-            Toast.makeText(mContext, "取消授权", Toast.LENGTH_LONG).show();
+            Utils.toast(mContext, "取消授权");
         }
 
         @Override
         public void onFailure(WbConnectErrorMessage errorMessage) {
-            Toast.makeText(mContext, errorMessage.getErrorMessage(), Toast.LENGTH_LONG).show();
+            Utils.toast(mContext, "微博登录需要客户端支持，请先安装微博");
         }
     }
 
@@ -285,7 +297,7 @@ public class GetLoginDataUtils {
 
     // 登录成功回调
     public interface OnLoginDataListener {
-        void OnLoginData(JSONObject content, LoginUtils.LoginTag loginTag);
+        void OnLoginData(JSONObject content, LoginTag loginTag);
     }
 
 }

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

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

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

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

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

@@ -5,7 +5,9 @@ import android.content.res.Resources
 import android.graphics.drawable.Animatable
 import android.graphics.drawable.ColorDrawable
 import android.net.Uri
+import android.support.annotation.DrawableRes
 import android.support.v4.content.ContextCompat
+import android.text.TextUtils
 import com.facebook.common.executors.CallerThreadExecutor
 import com.facebook.drawee.backends.pipeline.Fresco
 import com.facebook.drawee.controller.BaseControllerListener
@@ -17,33 +19,48 @@ import com.facebook.imagepipeline.datasource.BaseBitmapDataSubscriber
 import com.facebook.imagepipeline.image.ImageInfo
 import com.facebook.imagepipeline.request.ImageRequest
 import com.facebook.imagepipeline.request.ImageRequestBuilder
+import com.gh.common.constant.Config
 import com.gh.gamecenter.R
+import com.gh.gamecenter.manager.UserManager
+import com.gh.gamecenter.retrofit.Response
+import com.lightgame.config.CommonDebug
+import com.lightgame.download.FileUtils
+import com.lightgame.utils.Utils
+import org.json.JSONObject
+import retrofit2.HttpException
+import rx.Observable
+import rx.Observer
+import rx.android.schedulers.AndroidSchedulers
+import rx.schedulers.Schedulers
+import java.io.File
+import java.net.HttpURLConnection
 
-class ImageUtils {
+class ImageUtils private constructor() {
 
     // 自适应图片宽高
-    fun display(simpleDraweeView: SimpleDraweeView, url: String, width: Int) {
+    fun display(simpleDraweeView: SimpleDraweeView?, url: String?, width: Int) {
         val listener = object : BaseControllerListener<ImageInfo>() {
             override fun onFinalImageSet(id: String?, imageInfo: ImageInfo?, animatable: Animatable?) {
                 if (imageInfo == null) {
                     return
                 }
-                val layoutParams = simpleDraweeView.layoutParams
+                val layoutParams = simpleDraweeView?.layoutParams
                 val scale = imageInfo.height.toFloat() / imageInfo.width.toFloat()
-                layoutParams.height = (width * scale).toInt()
-                simpleDraweeView.layoutParams = layoutParams
+                layoutParams?.height = (width * scale).toInt()
+                simpleDraweeView?.layoutParams = layoutParams
             }
         }
-        simpleDraweeView.controller = Fresco.newDraweeControllerBuilder()
+        simpleDraweeView?.controller = Fresco.newDraweeControllerBuilder()
                 .setUri(url)
                 .setControllerListener(listener)
                 .build()
     }
 
     // 设置缩放类型，设置按压状态下的叠加图
-    fun display(resources: Resources, simpleDraweeView: SimpleDraweeView,
-                scaleType: ScalingUtils.ScaleType, url: String) {
-        val context = simpleDraweeView.context
+    fun display(resources: Resources?, simpleDraweeView: SimpleDraweeView?,
+                scaleType: ScalingUtils.ScaleType?, url: String?) {
+        if (simpleDraweeView == null) return
+        val context = simpleDraweeView.context ?: return
         simpleDraweeView.hierarchy = GenericDraweeHierarchyBuilder(resources)
                 .setFadeDuration(500)
                 .setPressedStateOverlay(ColorDrawable(ContextCompat.getColor(context, R.color.pressed_bg)))
@@ -56,8 +73,9 @@ class ImageUtils {
     }
 
     // 设置占位符
-    fun display(resources: Resources, simpleDraweeView: SimpleDraweeView, url: String, placeholderImage: Int) {
-        val context = simpleDraweeView.context
+    fun display(resources: Resources?, simpleDraweeView: SimpleDraweeView?, url: String?, placeholderImage: Int) {
+        if (simpleDraweeView == null) return
+        val context = simpleDraweeView.context ?: return
         simpleDraweeView.hierarchy = GenericDraweeHierarchyBuilder(resources)
                 .setFadeDuration(500)
                 .setPressedStateOverlay(ColorDrawable(ContextCompat.getColor(context, R.color.pressed_bg)))
@@ -69,9 +87,9 @@ class ImageUtils {
     }
 
     // 图片下载监听和设置低高分辨率图片
-    fun display(simpleDraweeView: SimpleDraweeView, url: String, lowUrl: String,
+    fun display(simpleDraweeView: SimpleDraweeView?, url: String?, lowUrl: String?,
                 listener: ControllerListener<in ImageInfo>) {
-        simpleDraweeView.controller = Fresco.newDraweeControllerBuilder()
+        simpleDraweeView?.controller = Fresco.newDraweeControllerBuilder()
                 .setImageRequest(ImageRequest.fromUri(url))
                 .setControllerListener(listener)
                 .setLowResImageRequest(ImageRequest.fromUri(lowUrl)) // 低分辨率图片
@@ -79,7 +97,7 @@ class ImageUtils {
     }
 
     // 获取bitmap
-    fun display(context: Context, url: String, dataSubscriber: BaseBitmapDataSubscriber) {
+    fun display(context: Context?, url: String?, dataSubscriber: BaseBitmapDataSubscriber) {
         val imageRequest = ImageRequestBuilder
                 .newBuilderWithSource(Uri.parse(url))
                 .setProgressiveRenderingEnabled(true)
@@ -91,6 +109,7 @@ class ImageUtils {
     }
 
     companion object {
+        const val RESPONSE403: String = "RESPONSE403"
 
         fun getInstance(): ImageUtils {
             return Inner.anotherSingle
@@ -100,12 +119,102 @@ class ImageUtils {
             val anotherSingle = ImageUtils()
         }
 
-        fun display(simpleDraweeView: SimpleDraweeView, url: String) {
-            //		if (url.startsWith("http://image.ghzs666.com") && url.endsWith(".jpg")) {
-            //			url = url + "?x-oss-process=image/format,webp";
-            //		}
+        fun display(simpleDraweeView: SimpleDraweeView, url: String?) {
             simpleDraweeView.setImageURI(url)
         }
+
+        fun display(draweeView: SimpleDraweeView, @DrawableRes res: Int?) {
+            draweeView.setImageURI("res:///" + res)
+        }
+
+        fun postImageArr(context: Context, imgArr: List<String>, listener: OnPostArrImageListener) {
+            val imgMap: HashMap<String, String> = HashMap()
+
+            Observable.create(Observable.OnSubscribe<JSONObject> { subscriber ->
+                var path: String
+                var index = 0
+                for (s in imgArr) {
+                    path = context.getCacheDir().path + File.separator + System.currentTimeMillis() + index + ".jpg"
+                    if (BitmapUtils.savePicture(path, s, 200000)) {
+                        subscriber.onNext(FileUtils.uploadFile(Config.API_HOST + "support/upload/img?type=community", path, s, UserManager.getInstance().token))
+                        index++
+                    } else {
+                        subscriber.onNext(FileUtils.uploadFile(Config.API_HOST + "support/upload/img?type=community", s, s, UserManager.getInstance().token))
+                    }
+                }
+                subscriber.onCompleted()
+            }).subscribeOn(Schedulers.io())
+                    .observeOn(AndroidSchedulers.mainThread())
+                    .subscribe(object : Observer<JSONObject> {
+                        override fun onCompleted() {
+                            Utils.log("图片上传完成")
+                            listener.postSuccess(imgMap)
+                        }
+
+                        override fun onError(e: Throwable) {
+                            Utils.log("图片上传失败" + e.toString())
+                            listener.postError()
+                        }
+
+                        override fun onNext(result: JSONObject?) {
+                            if (result != null) {
+                                try {
+                                    val statusCode = result.getInt("statusCode")
+                                    if (statusCode == HttpURLConnection.HTTP_OK) {
+                                        imgMap.put(result.getString("realPath"), result.getString("icon"))
+                                    } else if (statusCode == 403) {
+                                        imgMap.put(result.getString("realPath"), RESPONSE403)
+                                    }
+                                } catch (e: Exception) {
+                                    e.printStackTrace()
+                                }
+                            }
+                        }
+                    })
+        }
+
+        fun postImage(context: Context?, picturePath: String?, listener: OnPostImageListener) {
+            if (context == null || TextUtils.isEmpty(picturePath)) return
+            Observable.create(Observable.OnSubscribe<JSONObject> { subscriber ->
+                val path = context.getCacheDir().path + File.separator + System.currentTimeMillis() + ".jpg"
+                if (BitmapUtils.savePicture(path, picturePath, 200000)) {
+                    subscriber.onNext(FileUtils.uploadFile(Config.API_HOST + "support/upload/img?type=community", path, UserManager.getInstance().token))
+                } else {
+                    subscriber.onNext(FileUtils.uploadFile(Config.API_HOST + "support/upload/img?type=community", picturePath, UserManager.getInstance().token))
+                }
+            }).subscribeOn(Schedulers.io())
+                    .observeOn(AndroidSchedulers.mainThread())
+                    .subscribe(object : Response<JSONObject>() {
+                        override fun onResponse(response: JSONObject?) {
+                            if (CommonDebug.IS_DEBUG) {
+                                Utils.log("postImage:onResponse=>" + response.toString())
+                            }
+                            listener.postSuccess(response)
+                        }
+
+                        override fun onFailure(e: HttpException) {
+                            listener.postError()
+                        }
+                    })
+        }
+
+    }
+
+
+    interface OnPostImageListener {
+        fun postSuccess(response: JSONObject?)
+
+        fun postError()
+    }
+
+    interface OnPostArrImageListener {
+        /**
+         * key: 图片本地路径
+         * value: 图片提交成功后的链接
+         */
+        fun postSuccess(imgMap: HashMap<String, String>)
+
+        fun postError()
     }
 
 }

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

@@ -7,8 +7,11 @@ import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.os.Handler;
 import android.os.Message;
+import android.text.TextUtils;
 
+import com.gh.download.DownloadManager;
 import com.gh.gamecenter.eventbus.EBPackage;
+import com.lightgame.download.DownloadEntity;
 
 import org.greenrobot.eventbus.EventBus;
 
@@ -25,6 +28,7 @@ import java.util.Map;
 public class InstallUtils {
 
     private static final int MAX_TIME = 5 * 60 * 1000;
+    private static int INSTALL_WHAT = 20;
 
     private static Map<String, Long> installMap;
     private static Map<String, Long> uninstallMap;
@@ -42,7 +46,7 @@ public class InstallUtils {
         handler = new Handler(context.getMainLooper()) {
             @Override
             public void handleMessage(Message msg) {
-                if (msg.what == 0x123 && packageManager != null) {
+                if (msg.what == INSTALL_WHAT && packageManager != null) {
                     ArrayList<String> list = new ArrayList<>();
                     List<PackageInfo> packageInfos = packageManager.getInstalledPackages(0);
                     for (PackageInfo packageInfo : packageInfos) {
@@ -58,7 +62,17 @@ public class InstallUtils {
                                 keys.add(packageName);
                             } else if (list.contains(packageName)) {
                                 keys.add(packageName);
-                                EventBus.getDefault().post(new EBPackage("安装", packageName));
+
+                                DownloadEntity downloadEntity = DownloadManager.getInstance(context).getDownloadEntityByPackageName(packageName);
+                                String installVersion = PackageUtils.getVersionByPackage(context, packageName);
+                                if (!TextUtils.isEmpty(installVersion) && downloadEntity != null &&
+                                        installVersion.equals(downloadEntity.getVersionName())) {
+                                    if (!downloadEntity.isPluggable() || PackageUtils.isSignature(context, packageName)) {
+                                        EventBus.getDefault().post(new EBPackage("安装", packageName));
+                                    }
+
+                                }
+
                             }
                         }
                         for (String key : keys) {
@@ -71,7 +85,7 @@ public class InstallUtils {
                             long time = uninstallMap.get(packageName);
                             if (System.currentTimeMillis() - time >= MAX_TIME) {
                                 keys.add(packageName);
-                            } else if (list.contains(packageName)) {
+                            } else if (!list.contains(packageName)) {
                                 keys.add(packageName);
                                 EventBus.getDefault().post(new EBPackage("卸载", packageName));
                             }
@@ -82,7 +96,7 @@ public class InstallUtils {
                     }
                     if ((installMap != null && installMap.size() != 0)
                             || (uninstallMap != null && uninstallMap.size() != 0)) {
-                        sendEmptyMessageDelayed(0x123, 3000);
+                        sendEmptyMessageDelayed(INSTALL_WHAT, 3000);
                     } else {
                         isRunning = false;
                     }
@@ -118,7 +132,7 @@ public class InstallUtils {
             return;
         }
         isRunning = true;
-        handler.sendEmptyMessageDelayed(0x123, 10000);
+        handler.sendEmptyMessageDelayed(INSTALL_WHAT, 10000);
     }
 
     public void removeInstall(String packageName) {

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

@@ -50,7 +50,7 @@ public class IntentUtils {
                 "\n" +
                 "光环助手官网地址：\n" +
                 "\n" +
-                "http://www.ghzs666.com/link?source=appshare333");
+                "http://www.ghzs.com/link?source=appshare333");
         return data;
     }
 }

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

@@ -1,149 +1,29 @@
 package com.gh.common.util;
 
-import android.graphics.Color;
-import android.view.View;
+import android.support.v4.content.ContextCompat;
 import android.widget.TextView;
 
 import com.gh.gamecenter.R;
-import com.gh.gamecenter.entity.GameEntity;
-import com.gh.gamecenter.entity.KaiFuServerEntity;
-
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
-import java.util.Locale;
 
 /**
  * Created by khy on 2017/3/19.
  */
 public class KaiFuUtils {
 
-    public static void setKaiFuTimeHint(long curTime, long lastTime, GameEntity entity, boolean isTop) {
-
-        SimpleDateFormat format = new SimpleDateFormat("dd", Locale.getDefault());
-        String curDay = format.format(curTime);
-        String lastDay = format.format(lastTime);
-        if (!curDay.equals(lastDay)) {
-            if (isTop) {
-                entity.setKaifuTimeHint(curTime);
-            } else {
-                entity.setKaifuTimeHint(lastTime);
-            }
-        }
-    }
-
-    public static void initKaiFuTimeHintView(TextView view, Long time) {
-        SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd", Locale.getDefault());
-        try {
-            long today = format.parse(format.format(new Date())).getTime();
-            if (time >= today && time < today + 86400 * 1000) {
-                view.setText("↓今天开服");
-                view.setTextColor(Color.parseColor("#ffb13c"));
-            } else if (time >= today - 86400 * 1000 && time < today) {
-                view.setText("↑历史开服");
-                view.setTextColor(Color.parseColor("#c7c7c7"));
-            } else if (time > today && time < today + 86400 * 1000 * 2) {
-                view.setText("↓明天开服");
-                view.setTextColor(Color.parseColor("#ffb13c"));
-            } else if (time < today) {
-                view.setText("↑历史开服");
-                view.setTextColor(Color.parseColor("#c7c7c7"));
-            } else if (time > today && time < today + 86400 * 1000 * 3) {
-                view.setText("↓后天开服");
-                view.setTextColor(Color.parseColor("#c7c7c7"));
-            } else {
-                format.applyPattern("↓M月d日开服");
-                view.setText(format.format(time));
-                view.setTextColor(Color.parseColor("#c7c7c7"));
-            }
-        } catch (ParseException e) {
-            e.printStackTrace();
-            format.applyPattern("M月d日开服");
-            view.setText(format.format(time));
-        }
-    }
-
-    public static void setKaiFuTimeHint(TextView top, TextView bottom, List<GameEntity> gameList, int position) {
-        if (position == 0 || position + 1 >= gameList.size()) return;
-
-        GameEntity curGameEntity = gameList.get(position);
-        GameEntity lastGameEntity = gameList.get(position);
-        KaiFuServerEntity curServerEntity = curGameEntity.getServerEntity();
-        KaiFuServerEntity lastServerEntity = lastGameEntity.getServerEntity();
-
-        if (curServerEntity == null || lastServerEntity == null) return;
-
-        long curTime = curServerEntity.getTime() * 1000;
-        long lastTime = lastServerEntity.getTime() * 1000;
-        SimpleDateFormat format = new SimpleDateFormat("dd", Locale.getDefault());
-        String curDay = format.format(curTime);
-        String lastDay = format.format(lastTime);
-        if (!curDay.equals(lastDay)) {
-
-            bottom.setVisibility(View.VISIBLE);
-        } else {
-            bottom.setVisibility(View.GONE);
-        }
-    }
-
-    public static void setKaiFuTime(TextView textView, long time) {
-        time = time * 1000;
-        SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd", Locale.getDefault());
-        try {
-            long today = format.parse(format.format(new Date())).getTime();
-            if (time >= today && time < today + 86400 * 1000) {
-                format.applyPattern("HH:mm");
-                textView.setText(String.format("今天 %s", format.format(time)));
-                textView.setBackgroundResource(R.drawable.border_white_bg);
-                textView.setTextColor(Color.parseColor("#ffb13c"));
-            } else if (time >= today - 86400 * 1000 && time < today) {
-                format.applyPattern("HH:mm");
-                textView.setText(String.format("昨天 %s", format.format(time)));
-                textView.setBackgroundResource(R.drawable.kaifu_time_tag_gray);
-                textView.setTextColor(Color.parseColor("#c7c7c7"));
-            } else if (time > today && time < today + 86400 * 1000 * 2) {
-                format.applyPattern("HH:mm");
-                textView.setText(String.format("明天 %s", format.format(time)));
-                textView.setBackgroundResource(R.drawable.border_white_bg);
-                textView.setTextColor(Color.parseColor("#ffb13c"));
-            } else if (time >= today - 86400 * 1000 * 2 && time < today) {
-                format.applyPattern("HH:mm");
-                textView.setText(String.format("前天 %s", format.format(time)));
-                textView.setBackgroundResource(R.drawable.kaifu_time_tag_gray);
-                textView.setTextColor(Color.parseColor("#c7c7c7"));
-            } else if (time > today && time < today + 86400 * 1000 * 3) {
-                format.applyPattern("HH:mm");
-                textView.setText(String.format("后天 %s", format.format(time)));
-                textView.setBackgroundResource(R.drawable.kaifu_time_tag_gray);
-                textView.setTextColor(Color.parseColor("#c7c7c7"));
-            } else {
-                format.applyPattern("MM-dd HH:mm");
-                textView.setText(format.format(time));
-                textView.setBackgroundResource(R.drawable.kaifu_time_tag_gray);
-                textView.setTextColor(Color.parseColor("#c7c7c7"));
-            }
-        } catch (ParseException e) {
-            e.printStackTrace();
-            format.applyPattern("yyyy年MM月dd日 HH:mm");
-            textView.setText(format.format(time));
-        }
-    }
-
     public static void setKaiFuType(TextView textView, String type) {
         textView.setText(type);
         switch (type) {
             case "不删档内测":
-                textView.setBackgroundColor(Color.parseColor("#c7c7c7"));
+                textView.setBackgroundColor(ContextCompat.getColor(textView.getContext(), R.color.content));
                 break;
             case "删档内测":
-                textView.setBackgroundColor(Color.parseColor("#c7c7c7"));
+                textView.setBackgroundColor(ContextCompat.getColor(textView.getContext(), R.color.content));
                 break;
             case "公测":
-                textView.setBackgroundColor(Color.parseColor("#06d0a8"));
+                textView.setBackgroundColor(ContextCompat.getColor(textView.getContext(), R.color.tag_yellow));
                 break;
             default:
-                textView.setBackgroundColor(Color.parseColor("#06d0a8"));
+                textView.setBackgroundColor(ContextCompat.getColor(textView.getContext(), R.color.tag_yellow));
                 break;
         }
     }

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

@@ -1,11 +1,12 @@
 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.content.res.ColorStateList;
 import android.graphics.Color;
+import android.support.v4.content.ContextCompat;
 import android.text.Html;
 import android.text.Spanned;
 import android.text.TextUtils;
@@ -17,10 +18,10 @@ 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.db.LibaoDao;
-import com.gh.gamecenter.db.info.LibaoInfo;
 import com.gh.gamecenter.entity.LibaoEntity;
 import com.gh.gamecenter.entity.LibaoStatusEntity;
+import com.gh.gamecenter.entity.UserDataEntity;
+import com.gh.gamecenter.entity.UserDataLibaoEntity;
 import com.gh.gamecenter.eventbus.EBReuse;
 import com.gh.gamecenter.eventbus.EBUISwitch;
 import com.gh.gamecenter.geetest.GeetestListener;
@@ -40,7 +41,6 @@ import okhttp3.ResponseBody;
 import retrofit2.HttpException;
 import rx.Observable;
 import rx.android.schedulers.AndroidSchedulers;
-import rx.functions.Func1;
 import rx.schedulers.Schedulers;
 
 /**
@@ -71,59 +71,16 @@ public class LibaoUtils {
         return rawList;
     }
 
-    //初始化存号箱 获取存号箱所有礼包
-    public static void getCunHaoXiang(final Context context, final boolean isCheck) {
-        TokenUtils.getToken(context, isCheck)
-                .flatMap(new Func1<String, Observable<List<LibaoEntity>>>() {
-                    @Override
-                    public Observable<List<LibaoEntity>> call(String token) {
-                        return RetrofitManager.getLibao().getCunHaoXiang(token);
-                    }
-                }).subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Response<List<LibaoEntity>>() {
-                    @Override
-                    public void onResponse(List<LibaoEntity> response) {
-                        LibaoDao libaoDao = new LibaoDao(context);
-                        libaoDao.deleteAll(); // 清空之前所有数据
-                        for (LibaoEntity libaoEntity : response) {
-
-                            if ("ling".equals(libaoEntity.getStatus())) {
-                                libaoEntity.setStatus("linged");
-                            } else {
-                                libaoEntity.setStatus("taoed");
-                            }
-
-                            LibaoInfo libaoInfo = LibaoInfo.createLibaoInfo(libaoEntity);
-                            libaoInfo.setActive(libaoEntity.isActive());
-                            libaoDao.add(libaoInfo);
-                        }
-
-                        EventBus.getDefault().post(new EBReuse("libaoChanged"));
-                    }
-
-                    @Override
-                    public void onFailure(HttpException e) {
-                        if (e != null && e.code() == 401) {
-                            getCunHaoXiang(context, false);
-                        }
-                    }
-                });
-    }
-
-    private static void postLibaoLing(final Context context, final String libaoId, final boolean isCheck,
+    private static void postLibaoLing(final Context context, final String libaoId,
                                       final PostLibaoListener listener, final String captchaCode) {
-        TokenUtils.getToken(context, isCheck)
-                .flatMap(new Func1<String, Observable<ResponseBody>>() {
-                    @Override
-                    public Observable<ResponseBody> call(String token) {
-                        if (!TextUtils.isEmpty(captchaCode)) {
-                            return RetrofitManager.getLibao().postLibaoLing(token, captchaCode, libaoId);
-                        } else {
-                            return RetrofitManager.getLibao().postLibaoLing(token, libaoId);
-                        }
-                    }
-                }).subscribeOn(Schedulers.io())
+
+        Observable<ResponseBody> observable;
+        if (!TextUtils.isEmpty(captchaCode)) {
+            observable = RetrofitManager.getInstance(context).getApi().postLibaoLing(captchaCode, libaoId);
+        } else {
+            observable = RetrofitManager.getInstance(context).getApi().postLibaoLing(libaoId);
+        }
+        observable.subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new JSONObjectResponse() {
                     @Override
@@ -133,10 +90,7 @@ public class LibaoUtils {
 
                     @Override
                     public void onFailure(HttpException e) {
-                        if (e != null && e.code() == 401) {
-                            postLibaoLing(context, libaoId, false, listener, captchaCode);
-                            return;
-                        } else if (e != null && e.code() == 410) { // 该接口已废弃
+                        if (e != null && e.code() == 410) { // 该接口已废弃
                             Utils.toast(context, "领取失败，请安装最新版本的光环助手");
                         }
                         listener.postFailed(e);
@@ -144,15 +98,10 @@ public class LibaoUtils {
                 });
     }
 
-    private static void postLibaoTao(final Context context, final String libaoId, final boolean isCheck,
+    private static void postLibaoTao(final Context context, final String libaoId,
                                      final PostLibaoListener listener) {
-        TokenUtils.getToken(context, isCheck)
-                .flatMap(new Func1<String, Observable<ResponseBody>>() {
-                    @Override
-                    public Observable<ResponseBody> call(String token) {
-                        return RetrofitManager.getLibao().postLibaoTao(token, libaoId);
-                    }
-                }).subscribeOn(Schedulers.io())
+        RetrofitManager.getInstance(context).getApi().postLibaoTao(libaoId)
+                .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new JSONObjectResponse() {
                     @Override
@@ -162,24 +111,15 @@ public class LibaoUtils {
 
                     @Override
                     public void onFailure(HttpException e) {
-                        if (e != null && e.code() == 401) {
-                            postLibaoTao(context, libaoId, false, listener);
-                            return;
-                        }
                         listener.postFailed(e);
                     }
                 });
     }
 
-    public static void deleteLibaoCode(final Context context, final String code, final boolean isCheck,
+    public static void deleteLibaoCode(final Context context, final String code,
                                        final PostLibaoListener listener) {
-        TokenUtils.getToken(context, isCheck)
-                .flatMap(new Func1<String, Observable<ResponseBody>>() {
-                    @Override
-                    public Observable<ResponseBody> call(String token) {
-                        return RetrofitManager.getLibao().deleteLibaoCode(token, code);
-                    }
-                }).subscribeOn(Schedulers.io())
+        RetrofitManager.getInstance(context).getApi().deleteLibaoCode(code)
+                .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new Response<ResponseBody>() {
                     @Override
@@ -189,17 +129,13 @@ public class LibaoUtils {
 
                     @Override
                     public void onFailure(HttpException e) {
-                        if (e != null && e.code() == 401) {
-                            deleteLibaoCode(context, code, false, listener);
-                            return;
-                        }
                         listener.postFailed(e);
                     }
                 });
     }
 
-    public static void getLibaoStatus(String ids, final PostLibaoListener listener) {
-        RetrofitManager.getLibao().getLibaoStatus(ids)
+    public static void getLibaoStatus(Context context, String ids, final PostLibaoListener listener) {
+        RetrofitManager.getInstance(context).getApi().getLibaoStatus(ids)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new Response<List<LibaoStatusEntity>>() {
@@ -215,61 +151,72 @@ public class LibaoUtils {
                 });
     }
 
-    public static void initLibaoBtn(final Context context, final TextView libaoBtn, final LibaoEntity libaoEntity, final LibaoDao libaoDao,
+    public static void initLibaoBtn(final Context context, final TextView libaoBtn, final LibaoEntity libaoEntity,
                                     final boolean isInstallRequired, final LibaoDetailAdapter adapter, final String entrance) {
 
         libaoBtn.setTextColor(Color.WHITE);
-        String status = libaoEntity.getStatus();
+        final String status = libaoEntity.getStatus();
         if (TextUtils.isEmpty(status)) return;
         switch (status) {
             case "coming":
-                libaoBtn.setText("未开抢");
+                libaoBtn.setText(R.string.libao_coming);
                 libaoBtn.setBackgroundResource(R.drawable.textview_blue_style);
                 break;
             case "ling":
-                libaoBtn.setText("领取");
+                libaoBtn.setText(R.string.libao_ling);
                 libaoBtn.setBackgroundResource(R.drawable.textview_green_style);
                 break;
             case "tao":
-                libaoBtn.setText("淘号");
+                libaoBtn.setText(R.string.libao_tao);
                 libaoBtn.setBackgroundResource(R.drawable.textview_orange_style);
                 break;
             case "used_up":
-                libaoBtn.setText("已领光");
+                libaoBtn.setText(R.string.libao_used_up);
                 libaoBtn.setBackgroundResource(R.drawable.textview_cancel_up);
                 break;
             case "finish":
-                libaoBtn.setText("已结束");
+                libaoBtn.setText(R.string.libao_finish);
                 libaoBtn.setBackgroundResource(R.drawable.textview_cancel_up);
                 break;
             case "linged":
-                int[][] states = new int[2][];
-                states[0] = new int[]{android.R.attr.state_pressed};
-                states[1] = new int[]{};
-                int[] colors = new int[]{Color.WHITE,
-                        Color.parseColor("#06D0A8")};
-                ColorStateList sl = new ColorStateList(states, colors);
-                libaoBtn.setText("已领取");
+                libaoBtn.setText(R.string.libao_linged);
                 libaoBtn.setBackgroundResource(R.drawable.libao_linged_style);
-                libaoBtn.setTextColor(sl);
+                libaoBtn.setTextColor(ContextCompat.getColorStateList(context, R.color.libao_linged_selector));
                 break;
             case "taoed":
-                int[][] states2 = new int[2][];
-                states2[0] = new int[]{android.R.attr.state_pressed};
-                states2[1] = new int[]{};
-                int[] colors2 = new int[]{Color.WHITE, Color.parseColor("#ffb13c")};
-                ColorStateList sl2 = new ColorStateList(states2, colors2);
-                libaoBtn.setText("已淘号");
+                libaoBtn.setText(R.string.libao_taoed);
                 libaoBtn.setBackgroundResource(R.drawable.libao_taoed_style);
-                libaoBtn.setTextColor(sl2);
+                libaoBtn.setTextColor(ContextCompat.getColorStateList(context, R.color.libao_taoed_selector));
                 break;
             case "copy":
-                libaoBtn.setText("复制");
+                libaoBtn.setText(R.string.libao_copy);
                 libaoBtn.setBackgroundResource(R.drawable.textview_blue_style);
                 break;
+            case "repeatLing":
+                libaoBtn.setText(R.string.libao_repeat_ling);
+                libaoBtn.setBackgroundResource(R.drawable.textview_cancel_up);
+                break;
+            case "repeatLinged":
+                libaoBtn.setText(R.string.libao_repeat_ling);
+                libaoBtn.setBackgroundResource(R.drawable.textview_green_style);
+                break;
+
+            case "repeatTao":
+                libaoBtn.setText(R.string.libao_repeat_tao);
+                libaoBtn.setBackgroundResource(R.drawable.textview_cancel_up);
+                break;
+            case "repeatTaoed":
+                libaoBtn.setText(R.string.libao_repeat_tao);
+                libaoBtn.setBackgroundResource(R.drawable.textview_orange_style);
+                break;
+            case "unshelve":
+                libaoBtn.setBackgroundResource(R.drawable.textview_cancel_style);
+                libaoBtn.setText(R.string.libao_unshelve);
+                break;
             default:
                 libaoBtn.setBackgroundResource(R.drawable.textview_cancel_style);
                 libaoBtn.setText("异常");
+                break;
         }
 
         libaoBtn.setOnClickListener(new View.OnClickListener() {
@@ -289,10 +236,9 @@ public class LibaoUtils {
                                             .getPlatformName(libaoEntity.getPlatform()) + "版";
                                 }
 
+                                String dialogContent = context.getString(R.string.ling_rules_dialog, libaoEntity.getGame().getName(), platform);
                                 DialogUtils.showWarningDialog(context, "条件不符",
-                                        Html.fromHtml("请先" + "<font color=\"#06D0A8\">"
-                                                + "安装《" + libaoEntity.getGame().getName() + "》 "
-                                                + platform + "</font>"), "关闭", "立即安装"
+                                        Html.fromHtml(dialogContent), "关闭", "立即安装"
                                         , new DialogUtils.ConfirmListener() {
                                             @Override
                                             public void onConfirm() {
@@ -311,16 +257,30 @@ public class LibaoUtils {
                                 Intent intent = LibaoDetailActivity.getIntent(context, libaoEntity, entrance);
                                 context.startActivity(intent);
                                 break;
+                            case "再领一个":
                             case "领取":
-                                libaoLing(context, libaoBtn, libaoEntity, adapter, isInstallRequired, libaoDao, null, entrance);
+                                if ("repeatLing".equals(status)) {
+                                    DialogUtils.showWarningDialog(context, "礼包刷新提醒"
+                                            , "礼包每天0点刷新，换新区或者换新角色需要继续领取礼包的童鞋，请于明天0点之后回来即可[再领一个]"
+                                            , null, "知道了", null, null);
+                                } else {
+                                    libaoLing(context, libaoBtn, libaoEntity, adapter, isInstallRequired, null, entrance);
+                                }
                                 break;
+                            case "再淘一个":
                             case "淘号":
-                                postLibaoTao(context, libaoEntity.getId(), true, new PostLibaoListener() {
+                                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();
+
                                         JSONObject responseBody = (JSONObject) response;
-                                        Utils.log("postLibaoTao=====" + responseBody);
                                         String libaoCode = null;
                                         try {
                                             libaoCode = responseBody.getString("code");
@@ -352,35 +312,28 @@ public class LibaoUtils {
 
                                         libaoEntity.setStatus("taoed");
 
-                                        LibaoInfo libaoInfo = LibaoInfo.createLibaoInfo(libaoEntity);
-                                        libaoInfo.setCode(libaoCode);
-                                        libaoInfo.setTime(Utils.getTime(context));
-                                        libaoDao.add(libaoInfo);
-
                                         EventBus.getDefault().post(new EBReuse("libaoChanged"));
 
-                                        adapter.initLibaoDao();
-                                        adapter.notifyDataSetChanged();
+                                        adapter.initLibaoCode(new UserDataLibaoEntity(libaoCode, "tao", Utils.getTime(context)));
 
                                         final String finalLibaoCode = libaoCode;
-                                        DialogUtils.showWarningDialog(context, "淘号成功", Html.fromHtml("礼包码："
-                                                        + "<font color=\"#ffb13c\">" + libaoCode + "</font>" +
-                                                        "<br/>淘号礼包不保证可用，请尽快进入游戏尝试兑换")
+
+                                        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
-                                                                            , Html.fromHtml("礼包码："
-                                                                                    + "<font color=\"#ffb13c\">" + finalLibaoCode + "</font>"
-                                                                                    + " 复制成功"
-                                                                                    + "<br/>淘号礼包不保证可用，请尽快进入游戏尝试兑换"), libaoEntity);
+                                                                            , msg, libaoEntity);
                                                                 }
                                                             }, 300);
                                                         }
@@ -392,13 +345,15 @@ public class LibaoUtils {
                                     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);
+//                                                    Utils.toast(context, "返回::" + detail);
                                                     switch (detail) {
                                                         case "coming":
                                                             Utils.toast(context, "礼包领取时间未开始");
@@ -407,18 +362,11 @@ public class LibaoUtils {
                                                             Utils.toast(context, "礼包领取时间已结束");
                                                             break;
                                                         case "fetched":
-                                                            Utils.toast(context, "你已领过这个礼包了");
-                                                            getCunHaoXiang(context, true);
+                                                            Utils.toast(context, "你今天已领过这个礼包了, 不能再淘号");
 
-                                                            int[][] states2 = new int[2][];
-                                                            states2[0] = new int[]{android.R.attr.state_pressed};
-                                                            states2[1] = new int[]{};
-                                                            int[] colors2 = new int[]{Color.WHITE,
-                                                                    Color.parseColor("#ffb13c")};
-                                                            ColorStateList sl2 = new ColorStateList(states2, colors2);
                                                             libaoBtn.setText("已淘号");
                                                             libaoBtn.setBackgroundResource(R.drawable.libao_taoed_style);
-                                                            libaoBtn.setTextColor(sl2);
+                                                            libaoBtn.setTextColor(ContextCompat.getColorStateList(context, R.color.libao_taoed_selector));
                                                             libaoEntity.setStatus("taoed");
                                                             break;
                                                         case "try tao":
@@ -456,18 +404,20 @@ public class LibaoUtils {
     }
 
     private static void libaoLing(final Context context, final TextView libaoBtn, final LibaoEntity libaoEntity, final LibaoDetailAdapter adapter,
-                                  final boolean isInstallRequired, final LibaoDao libaoDao, String captchaCode, final String entrance) {
+                                  final boolean isInstallRequired, String captchaCode, final String entrance) {
 
         if (BuildConfig.DEBUG) {
             Log.e("LIBAO", "context? " + context + libaoBtn.getContext());
         }
 
-        postLibaoLing(context, libaoEntity.getId(), true, new PostLibaoListener() {
+        final Dialog loadingDialog = DialogUtils.showWaitDialog(context, "领取中...");
+
+        postLibaoLing(context, libaoEntity.getId(), new PostLibaoListener() {
             @Override
             public void postSucced(Object response) {
+                if (loadingDialog != null) loadingDialog.dismiss();
 
                 JSONObject responseBody = (JSONObject) response;
-                Utils.log("postLibaoLing=====" + responseBody);
                 String libaoCode = null;
                 try {
                     libaoCode = responseBody.getString("code");
@@ -483,20 +433,13 @@ public class LibaoUtils {
 
                 libaoEntity.setStatus("linged");
 
-                LibaoInfo libaoInfo = LibaoInfo.createLibaoInfo(libaoEntity);
-                libaoInfo.setTime(Utils.getTime(context));
-                libaoInfo.setCode(libaoCode);
-                libaoDao.add(libaoInfo);
-
                 EventBus.getDefault().post(new EBReuse("libaoChanged"));
 
-                adapter.initLibaoDao();
+                adapter.initLibaoCode(new UserDataLibaoEntity(libaoCode, "ling", Utils.getTime(context)));
                 adapter.notifyDataSetChanged();
 
                 final String finalLibaoCode = libaoCode;
-                DialogUtils.showWarningDialog(context, "领取成功", Html.fromHtml("礼包码："
-                                + "<font color=\"#00B7FA\">" + libaoCode + "</font>" +
-                                "<br/>请尽快使用，礼包码将于60分钟后进入淘号池")
+                DialogUtils.showWarningDialog(context, "领取成功", Html.fromHtml(context.getString(R.string.linged_dialog, libaoCode))
                         , "关闭", " 复制礼包码"
                         , new DialogUtils.ConfirmListener() {
                             @Override
@@ -506,10 +449,9 @@ public class LibaoUtils {
                                     libaoBtn.postDelayed(new Runnable() {
                                         @Override
                                         public void run() {
+                                            Spanned msg = Html.fromHtml(context.getString(R.string.linged_copy_dialog, finalLibaoCode));
                                             lunningAppDialog(context
-                                                    , Html.fromHtml("礼包码："
-                                                            + "<font color=\"#00B7FA\">" + finalLibaoCode + "</font>"
-                                                            + " 复制成功" + "<br/>请尽快进入游戏兑换"), libaoEntity);
+                                                    , msg, libaoEntity);
                                         }
                                     }, 300);
                                 }
@@ -519,7 +461,7 @@ public class LibaoUtils {
 
             @Override
             public void postFailed(Throwable error) {
-                Utils.log("-----" + error.toString());
+                if (loadingDialog != null) loadingDialog.dismiss();
 
                 if (error instanceof HttpException) {
                     HttpException exception = (HttpException) error;
@@ -528,7 +470,6 @@ public class LibaoUtils {
                             String string = exception.response().errorBody().string();
                             JSONObject errorJson = new JSONObject(string);
                             String detail = errorJson.getString("detail");
-
                             switch (detail) {
                                 case "coming":
                                     Utils.toast(context, "礼包领取时间未开始");
@@ -544,19 +485,11 @@ public class LibaoUtils {
                                     }
                                     if (countdown > 0 && countdown < 60 * 10) {
                                         EventBus.getDefault().post(new EBUISwitch(REFRESH_LIBAO_TIME, countdown));
-                                    } else {
-                                        getCunHaoXiang(context, true);
                                     }
 
-                                    int[][] states = new int[2][];
-                                    states[0] = new int[]{android.R.attr.state_pressed};
-                                    states[1] = new int[]{};
-                                    int[] colors = new int[]{Color.WHITE,
-                                            Color.parseColor("#06D0A8")};
-                                    ColorStateList sl = new ColorStateList(states, colors);
-                                    libaoBtn.setText("已领取");
+                                    libaoBtn.setText(R.string.libao_linged);
                                     libaoBtn.setBackgroundResource(R.drawable.libao_linged_style);
-                                    libaoBtn.setTextColor(sl);
+                                    libaoBtn.setTextColor(ContextCompat.getColorStateList(context, R.color.libao_linged_selector));
 
                                     libaoEntity.setStatus("linged");
                                     break;
@@ -565,7 +498,7 @@ public class LibaoUtils {
                                     DialogUtils.showHintDialog(context, "礼包已领光"
                                             , "手速不够快，礼包已经被抢光了，十分抱歉", "知道了");
                                     libaoEntity.setStatus("used_up");
-                                    initLibaoBtn(context, libaoBtn, libaoEntity, libaoDao, isInstallRequired, adapter, entrance);
+                                    initLibaoBtn(context, libaoBtn, libaoEntity, isInstallRequired, adapter, entrance);
                                     break;
                                 case "maintaining":
                                     Utils.toast(context, "网络状态异常，请稍后再试");
@@ -584,7 +517,7 @@ public class LibaoUtils {
                         GeetestUtils.getInstance().showDialog(context, new GeetestListener() {
                             @Override
                             public void onVerified(String captcha) {
-                                libaoLing(context, libaoBtn, libaoEntity, adapter, isInstallRequired, libaoDao, captcha, entrance);
+                                libaoLing(context, libaoBtn, libaoEntity, adapter, isInstallRequired, captcha, entrance);
                             }
                         });
                         return;
@@ -635,63 +568,58 @@ public class LibaoUtils {
     }
 
 
-    // 合并List<LibaoStatusEntity> 和 List<LibaoEntity> 并检查重复领取的礼包
-    public static void initLiBaoEntity(LibaoDao libaoDao, List<LibaoStatusEntity> statusList,
-                                       List<LibaoEntity> libaoEntities, Context mContext) {
-
-        for (LibaoInfo libaoInfo : libaoDao.getAll()) {
-            for (LibaoStatusEntity libaoStatusEntity : statusList) {
-                if (TextUtils.isEmpty(libaoInfo.getLibaoId()) || TextUtils.isEmpty(libaoStatusEntity.getId())) {
-                    continue;
-                }
-
-                if (TextUtils.isEmpty(libaoStatusEntity.getBeforeStatus())) {
-                    libaoStatusEntity.setBeforeStatus(libaoStatusEntity.getStatus());
-                }
-
-                if (libaoInfo.getLibaoId().equals(libaoStatusEntity.getId())) {
-                    if ("ling".equals(libaoInfo.getStatus()) || "linged".equals(libaoInfo.getStatus())) {
-                        libaoStatusEntity.setStatus("linged");
-                    } else {
-                        libaoStatusEntity.setStatus("taoed");
-                    }
-                }
-            }
-        }
+    // 合并List<LibaoStatusEntity> 和 List<LibaoEntity>
+    public static void initLiBaoEntity(List<LibaoStatusEntity> statusList,
+                                       List<LibaoEntity> libaoEntities) {
 
         for (LibaoEntity libaoEntity : libaoEntities) {
             for (LibaoStatusEntity libaoStatusEntity : statusList) {
                 if (libaoEntity.getId().equals(libaoStatusEntity.getId())) {
-                    libaoEntity.setAvailable(libaoStatusEntity.getAvailable());
-                    libaoEntity.setTotal(libaoStatusEntity.getTotal());
+                    libaoEntity.setBeforeStatus(libaoStatusEntity.getStatus());
+                    libaoStatusEntity.setBeforeStatus(libaoStatusEntity.getStatus());
 
-                    String beforeStatus = libaoStatusEntity.getBeforeStatus();
-                    int repeat = libaoEntity.getRepeat();
-                    if (repeat > 0
-                            && libaoDao.isCanLing(libaoEntity.getId(), mContext)
-                            && ("ling".equals(beforeStatus) || "tao".equals(beforeStatus))) {  // 判断是否可以重复领取
-                        if ("ling".equals(beforeStatus)) {
-                            if (libaoDao.repeatedLingedCount(libaoStatusEntity.getId()) >= repeat) {
-                                libaoEntity.setStatus(libaoStatusEntity.getStatus());
-                            } else {
-                                libaoEntity.setStatus(beforeStatus);
-                            }
+                    UserDataEntity userData = libaoEntity.getUserData();
+                    if (userData != null && userData.getUserDataLibaoList() != null && userData.getUserDataLibaoList().size() > 0) {
+                        List<UserDataLibaoEntity> userDataLibaoList = userData.getUserDataLibaoList();
+                        UserDataLibaoEntity userDataLibaoEntity = userDataLibaoList.get(userDataLibaoList.size() - 1);
+                        if ("ling".equals(userDataLibaoEntity.getType())) { // 拿最后一次领取的状态判断
+                            libaoEntity.setStatus("linged");
                         } else {
-                            if (libaoDao.repeatedTaoedCount(libaoStatusEntity.getId()) >= repeat) {
-                                libaoEntity.setStatus(libaoStatusEntity.getStatus());
-                            } else {
-                                libaoEntity.setStatus(beforeStatus);
-                            }
+                            libaoEntity.setStatus("taoed");
                         }
                     } else {
                         libaoEntity.setStatus(libaoStatusEntity.getStatus());
                     }
-                    libaoEntity.setBeforeStatus(beforeStatus);
+                    libaoEntity.setAvailable(libaoStatusEntity.getAvailable());
+                    libaoEntity.setTotal(libaoStatusEntity.getTotal());
                 }
             }
         }
     }
 
+    public static void initLiBaoEntity(LibaoStatusEntity libaoStatusEntity,
+                                       LibaoEntity libaoEntity) {
+        if (libaoEntity.getId().equals(libaoStatusEntity.getId())) {
+            libaoEntity.setBeforeStatus(libaoStatusEntity.getStatus());
+            libaoStatusEntity.setBeforeStatus(libaoStatusEntity.getStatus());
+
+            UserDataEntity userData = libaoEntity.getUserData();
+            if (userData != null && userData.getUserDataLibaoList() != null && userData.getUserDataLibaoList().size() > 0) {
+                List<UserDataLibaoEntity> userDataLibaoList = userData.getUserDataLibaoList();
+                UserDataLibaoEntity userDataLibaoEntity = userDataLibaoList.get(userDataLibaoList.size() - 1);
+                if ("ling".equals(userDataLibaoEntity.getType())) { // 拿最后一次领取的状态判断
+                    libaoEntity.setStatus("linged");
+                } else {
+                    libaoEntity.setStatus("taoed");
+                }
+            } else {
+                libaoEntity.setStatus(libaoStatusEntity.getStatus());
+            }
+            libaoEntity.setAvailable(libaoStatusEntity.getAvailable());
+            libaoEntity.setTotal(libaoStatusEntity.getTotal());
+        }
+    }
+
 
     public interface PostLibaoListener {
         void postSucced(Object response);

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

@@ -2,7 +2,6 @@ package com.gh.common.util;
 
 import android.content.Context;
 
-import com.gh.gamecenter.entity.LoginResponseEntity;
 import com.gh.gamecenter.retrofit.JSONObjectResponse;
 import com.gh.gamecenter.retrofit.Response;
 import com.gh.gamecenter.retrofit.RetrofitManager;
@@ -11,13 +10,10 @@ import com.lightgame.utils.Utils;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import java.util.HashMap;
-import java.util.Map;
-
 import okhttp3.MediaType;
 import okhttp3.RequestBody;
+import okhttp3.ResponseBody;
 import retrofit2.HttpException;
-import rx.Observable;
 import rx.android.schedulers.AndroidSchedulers;
 import rx.schedulers.Schedulers;
 
@@ -25,20 +21,66 @@ import rx.schedulers.Schedulers;
  * Created by khy on 7/07/17.
  */
 
+// TODO: 1/12/17 逐步整理 删除 
 public class LoginUtils {
 
-    public enum LoginTag {
-        qq, wechat, weibo, phone
-    }
+//    public static void checkPhoneNum(final Context context, final String phoneName, final onCaptchaCallBackListener listener) { // 老用户登录检查手机是否登录过
+//        RetrofitManager.getInstance(context).getApi()
+//                .checkPhoneNum(phoneName)
+//                .subscribeOn(Schedulers.io())
+//                .observeOn(AndroidSchedulers.mainThread())
+//                .subscribe(new Response<ResponseBody>() {
+//                    @Override
+//                    public void onResponse(ResponseBody response) {
+//                        super.onResponse(response);
+//                        try {
+//                            JSONObject content = new JSONObject(response.string());
+//                            String status = content.getString("status");
+//                            if ("ok".equals(status)) {
+//                                getPhoneCaptcha(context, phoneName, listener);
+//                            } else {
+//                                DialogUtils.showWarningDialog(context, null, "手机号已存在，请使用未登录过的手机号，以保证数据正常同步到新账号上"
+//                                        , null, "我知道了", null, null);
+//                            }
+//                        } catch (Exception e) {
+//                            e.printStackTrace();
+//                        }
+//                    }
+//
+//                    @Override
+//                    public void onFailure(HttpException e) {
+//                        super.onFailure(e);
+//                        if (e == null) {
+//                            Utils.toast(context, "请检查网络是否可用");
+//                            return;
+//                        }
+//                        try {
+//                            ResponseBody responseBody = e.response().errorBody();
+//                            String string = responseBody.string();
+//                            JSONObject content = new JSONObject(string);
+//                            int code = content.getInt("code");
+//                            outputErrorHint(context, code);
+//                        } catch (Exception e1) {
+//                            e1.printStackTrace();
+//                        }
+//                    }
+//                });
+//
+//    }
 
     // 获取验证码
     public static void getPhoneCaptcha(final Context context, String phoneNum, final onCaptchaCallBackListener listener) {
-        Map<String, String> params = new HashMap<>();
-        params.put("mobile", phoneNum);
-        RequestBody body = RequestBody.create(MediaType.parse("application/json"),
-                new JSONObject(params).toString());
-        RetrofitManager
-                .getUser()
+        JSONObject content = new JSONObject();
+        try {
+            content.put("mobile", phoneNum);
+            content.put("device", DeviceUtils.getLoginDevice(context.getApplicationContext()));
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+
+        RequestBody body = RequestBody.create(MediaType.parse("application/json"), content.toString());
+        RetrofitManager.getInstance(context)
+                .getUsersea()
                 .loginByCaptcha(body)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
@@ -48,6 +90,7 @@ public class LoginUtils {
                         super.onResponse(response);
                         try {
                             listener.onCaptcha(response.getString("service_id"));
+                            Utils.toast(context, "验证码短信已发送，请注意查收");
                         } catch (JSONException e) {
                             e.printStackTrace();
                         }
@@ -56,99 +99,199 @@ public class LoginUtils {
                     @Override
                     public void onFailure(HttpException e) {
                         super.onFailure(e);
-                        int code = e.code();
-                        switch (code) {
-                            case 40001:
-                                Utils.toast(context, "缺少mobile参数");
-                                break;
-                            case 40002:
-                                Utils.toast(context, "mobile格式错误");
-                                break;
-                            case 40003:
-                                Utils.toast(context, "一分钟内已发送过验证码");
-                                break;
-                            default:
-                                Utils.toast(context, "未知错误");
-                                break;
+                        if (e == null) {
+                            Utils.toast(context, "无法获取验证码，请检查你的网络状态");
+                            return;
+                        }
+                        try {
+                            ResponseBody responseBody = e.response().errorBody();
+                            String string = responseBody.string();
+                            JSONObject content = new JSONObject(string);
+                            int code = content.getInt("code");
+                            outputErrorHint(context, code);
+                        } catch (Exception e1) {
+                            e1.printStackTrace();
+                            Utils.toast(context, "无法获取验证码，请检查你的网络状态");
                         }
                     }
                 });
     }
 
 
-    // 登录前，做好body判断
-    public static void login(final Context context, RequestBody body, final LoginTag loginTag,
-                             final onLoginCallBackListener listener) {
+    // 注销登录
+    public static void logout(final Context context, final OnLogoutListener listener) {
 
-        Observable<LoginResponseEntity> observable;
-
-        if (loginTag == LoginTag.weibo) {
-            observable = RetrofitManager.getUser().loginByWeibo(body);
-        } else if (loginTag == LoginTag.qq){
-            observable = RetrofitManager.getUser().loginByQQ(body);
-        } else if (loginTag == LoginTag.wechat) {
-            observable = RetrofitManager.getUser().loginByWechat(body);
-        } else {
-            observable = RetrofitManager.getUser().loginByMobile(body);
-        }
-
-        observable
+        RetrofitManager.getInstance(context)
+                .getUsersea()
+                .logout()
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Response<LoginResponseEntity>() {
+                .subscribe(new Response<ResponseBody>() {
+
                     @Override
-                    public void onResponse(LoginResponseEntity response) {
+                    public void onResponse(ResponseBody response) {
                         super.onResponse(response);
-                        listener.onLogin(response, loginTag);
+                        listener.onCompleted();
                     }
 
                     @Override
                     public void onFailure(HttpException e) {
                         super.onFailure(e);
-                        int code = e.code();
-                        switch (code) {
-                            case 40000:
-                                Utils.toast(context,"参数错误或不完整");
-                            case 40004:
-                                Utils.toast(context,"缺少mobile参数");
-                                break;
-                            case 40005:
-                                Utils.toast(context,"缺少code参数");
-                                break;
-                            case 40006:
-                                Utils.toast(context,"缺少service_id参数");
-                                break;
-                            case 40007:
-                                Utils.toast(context,"服务已超时");
-                                break;
-                            case 40008:
-                                Utils.toast(context,"验证码已超时");
-                                break;
-                            case 40009:
-                                Utils.toast(context,"验证码错误");
-                                break;
-                            case 40010:
-                                Utils.toast(context,"登录授权失败");
-                                break;
-                            case 40011:
-                                Utils.toast(context,"缺少token参数");
-                                break;
-                            case 40012:
-                                Utils.toast(context,"令牌已过期");
-                                break;
-                            default:
-                                Utils.toast(context,"未知错误");
-                                break;
-                        }
+                        listener.onCompleted();
                     }
                 });
     }
 
+    public static void outputErrorHint(Context context, int code) {
+
+        switch (code) {
+            case 40000:
+                Utils.toast(context, "参数不全");
+                break;
+            case 40001:
+                Utils.toast(context, "验证码获取过快，请稍后重试");// 已经发送过短信
+                break;
+            case 40002:
+                Utils.toast(context, "请求第三方开放平台时发生错误");
+                break;
+            case 40003:
+                Utils.toast(context, "上传用户头像时发生错误");
+                break;
+            case 40101:
+                Utils.toast(context, "缺少参数 app_id");
+                break;
+            case 40102:
+                Utils.toast(context, "缺少签名验证的头信息");
+                break;
+            case 40104:
+                Utils.toast(context, "缺少token");
+                break;
+            case 40105:
+                Utils.toast(context, "缺少手机号码");
+                break;
+            case 40106:
+                Utils.toast(context, "缺少用户名");
+                break;
+            case 40107:
+                Utils.toast(context, "缺少密码参数");
+                break;
+            case 40202:
+                Utils.toast(context, "无效的手机号码");
+                break;
+            case 40203:
+                Utils.toast(context, "无效的用户名");
+                break;
+            case 40204:
+                Utils.toast(context, "无效的头像地址");
+                break;
+            case 40205:
+                Utils.toast(context, "无效的性别参数");
+                break;
+            case 40206:
+                Utils.toast(context, "无效的地区参数");
+                break;
+            case 40208:
+                Utils.toast(context, "无效的密码");
+                break;
+            case 40209:
+                Utils.toast(context, "无效的URL 地址");
+                break;
+            case 42000:
+                Utils.toast(context, "无效的app_id");
+                break;
+            case 42001:
+                Utils.toast(context, "无效的app_secret");
+                break;
+            case 42002:
+                Utils.toast(context, "无效的Union_id");
+                break;
+            case 42003:
+                Utils.toast(context, "无效的设备信息");
+                break;
+            case 42004:
+                Utils.toast(context, "无效的请求");
+                break;
+            case 40301:
+                Utils.toast(context, "签名验证失败");
+                break;
+            case 40302:
+                Utils.toast(context, "验证码错误");
+                break;
+            case 40303:
+                Utils.toast(context, "密码错误");
+                break;
+            case 40304:
+                Utils.toast(context, "不支持该种方式登录");
+                break;
+            case 40305:
+                Utils.toast(context, "错误的状态值(应用只有两种状态: working / stop)");
+                break;
+            case 40306:
+                Utils.toast(context, "传递了无法识别的参数");
+                break;
+            case 40401:
+                Utils.toast(context, "token过期");
+                break;
+            case 40402:
+                Utils.toast(context, "Service_id过期,主要原因是:收到手机短信验证码后长时间没有进行登录操作");
+                break;
+            case 40403:
+                Utils.toast(context, "验证码已过期");
+                break;
+            case 40501:
+                Utils.toast(context, "同名应用已经存在");
+                break;
+            case 40502:
+                Utils.toast(context, "用户名已存在");
+                break;
+            case 40503:
+                Utils.toast(context, "名称已经存在");
+                break;
+            case 40601:
+                Utils.toast(context, "应用不存在");
+                break;
+            case 40602:
+                Utils.toast(context, "用户不存在");
+                break;
+            case 40603:
+                Utils.toast(context, "用户系统不存在");
+                break;
+            case 40604:
+                Utils.toast(context, "用户已被冻结");
+                break;
+            case 40605:
+                Utils.toast(context, "用户没有冻结");
+                break;
+            case 40606:
+                Utils.toast(context, "该应用被停止运行了");
+                break;
+            case 40801:
+                Utils.toast(context, "访问过于频繁");
+                break;
+            case 403001:
+                Utils.toast(context, "设备异常，获取验证码失败，请更换登陆方式或明天再试");
+                break;
+            case 403202:
+                Utils.toast(context, "403202");
+                break;
+            case 400213:
+                Utils.toast(context, "昵称违规");
+                break;
+            default:
+                Utils.toast(context, "未知错误");
+                break;
+        }
+
+    }
+
+    //　更改用户信息回调
+    public interface OnLogoutListener {
+        void onCompleted();
+    }
+
+    //　获取验证码回调
     public interface onCaptchaCallBackListener {
         void onCaptcha(String serviceId);
     }
 
-    public interface onLoginCallBackListener {
-        void onLogin(LoginResponseEntity entity, LoginTag loginTag);
-    }
 }

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

@@ -71,13 +71,11 @@ public class MessageShareUtils {
     private Context mContext;
 
     //TODO 干掉activity，将context变成applicationcontext
-//    private Activity activity; // 用来关闭分享页面
+    private Activity mActivity; // 用来关闭分享页面
     //QQ或者QQ空间分享回调处理
     public IUiListener QqShareListener = new IUiListener() {
         @Override
         public void onComplete(Object o) {
-//            activity.finish();
-//            activity.overridePendingTransition(0, 0);//禁止退出Activity 动画
             Utils.toast(mContext, "分享成功");
         }
 
@@ -88,9 +86,7 @@ public class MessageShareUtils {
 
         @Override
         public void onCancel() {
-//            activity.finish();
-//            activity.overridePendingTransition(0, 0);//禁止退出Activity 动画
-            Utils.toast(mContext, "分享已取消");
+            Utils.toast(mContext, R.string.share_cancel_hint);
         }
     };
     // 适配快传成绩单分享
@@ -123,7 +119,7 @@ public class MessageShareUtils {
         if (pinfo != null) {
             for (int i = 0; i < pinfo.size(); i++) {
                 String pn = pinfo.get(i).packageName;
-                if (pn.equals("com.tencent.mobileqq")) {
+                if ("com.tencent.mobileqq".equals(pn)) {
                     return true;
                 }
             }
@@ -139,11 +135,11 @@ public class MessageShareUtils {
         return mTencent;
     }
 
-    public void showShareWindows(View view, Bitmap bitmap, String picName, int shareType) {
+    public void showShareWindows(Activity activity, View view, Bitmap bitmap, String picName, int shareType) {
         this.shareBm = bitmap;
         this.picName = picName;
         this.shareType = shareType;
-//        this.activity = (Activity) mContext;
+        this.mActivity = activity;
 
         if (shareType == 2) {
             contentSize = 75;
@@ -230,11 +226,11 @@ public class MessageShareUtils {
         params.putInt(QQShare.SHARE_TO_QQ_KEY_TYPE,
                 QQShare.SHARE_TO_QQ_TYPE_IMAGE);
         params.putString(QQShare.SHARE_TO_QQ_IMAGE_LOCAL_URL, mContext.getExternalCacheDir().getPath() + "/ShareImg/" + picName);
-        params.putString(QQShare.SHARE_TO_QQ_APP_NAME, "光环助手");
+        params.putString(QQShare.SHARE_TO_QQ_APP_NAME, mContext.getString(R.string.app_name));
         params.putInt(QQShare.SHARE_TO_QQ_EXT_INT,
                 QQShare.SHARE_TO_QQ_FLAG_QZONE_ITEM_HIDE);
         mTencent.shareToQQ(
-                (Activity) mContext, params, QqShareListener);
+                mActivity, params, QqShareListener);
         if (mPopupWindow == null) return;
         mPopupWindow.dismiss();
     }
@@ -246,11 +242,11 @@ public class MessageShareUtils {
         params.putInt(QQShare.SHARE_TO_QQ_KEY_TYPE,
                 QQShare.SHARE_TO_QQ_TYPE_IMAGE);
         params.putString(QQShare.SHARE_TO_QQ_IMAGE_LOCAL_URL, mContext.getExternalCacheDir().getPath() + "/ShareImg/" + picName);
-        params.putString(QQShare.SHARE_TO_QQ_APP_NAME, "光环助手");
+        params.putString(QQShare.SHARE_TO_QQ_APP_NAME, mContext.getString(R.string.app_name));
         params.putInt(QQShare.SHARE_TO_QQ_EXT_INT,
                 QQShare.SHARE_TO_QQ_FLAG_QZONE_AUTO_OPEN);
         mTencent.shareToQQ(
-                (Activity) mContext, params, QqShareListener);
+                mActivity, params, QqShareListener);
         if (mPopupWindow == null) return;
         mPopupWindow.dismiss();
     }

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

@@ -1,5 +1,6 @@
 package com.gh.common.util;
 
+import android.content.Context;
 import android.graphics.Color;
 import android.widget.TextView;
 
@@ -44,8 +45,8 @@ public class NewsUtils {
     /**
      * 统计阅读量
      */
-    public static void statNewsViews(String news_id) {
-        RetrofitManager.getData().postNewsViews(news_id)
+    public static void statNewsViews(Context context, String news_id) {
+        RetrofitManager.getInstance(context).getData().postNewsViews(news_id)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new Response<ResponseBody>());
@@ -79,9 +80,9 @@ public class NewsUtils {
     public static void setNewsType(TextView textView, String type, int priority, int position) {
         if (priority != 0) {
             if (position == 0) {
-                textView.setText("置顶");
+                textView.setText(R.string.article_top);
             } else {
-                textView.setText("热门");
+                textView.setText(R.string.article_hot);
             }
             textView.setBackgroundResource(R.drawable.textview_all_red_style);
             return;
@@ -137,4 +138,36 @@ public class NewsUtils {
         }
     }
 
+
+    public static void setNewsDetailTime(TextView textView, long time) {
+        SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd", Locale.getDefault());
+        try {
+            long today = format.parse(format.format(new Date())).getTime();
+            long day = time * 1000;
+            if (day >= today && day < today + 86400 * 1000) {
+                long min = new Date().getTime() / 1000 - day / 1000;
+                int hour = (int) (min / (60 * 60));
+                if (hour == 0) {
+                    if (min < 60) {
+                        textView.setText("刚刚");
+                    } else {
+                        textView.setText(String.format(Locale.getDefault(), "%d分钟前", (int) (min / 60)));
+                    }
+                } else {
+                    textView.setText(String.format(Locale.getDefault(), "%d小时前", hour));
+                }
+            } else if (day >= today - 86400 * 1000 && day < today) {
+                format.applyPattern("HH:mm");
+                textView.setText("昨天 ");
+            } else {
+                format.applyPattern("yyyy-MM-dd");
+                textView.setText(format.format(day));
+            }
+        } catch (ParseException e) {
+            e.printStackTrace();
+            format.applyPattern("yyyy-MM-dd");
+            textView.setText(format.format(time * 1000));
+        }
+    }
+
 }

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

@@ -12,7 +12,9 @@ import android.os.Bundle;
 import android.text.TextUtils;
 import android.widget.Toast;
 
+import com.gh.common.constant.Config;
 import com.gh.gamecenter.entity.GameUpdateEntity;
+import com.lightgame.utils.Utils;
 
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -200,6 +202,16 @@ public class PackageUtils {
         return 0;
     }
 
+    /**
+     * 数据统计或反馈用PatchVersionName
+     * 判断助手是否是第一次启动或版本更新提交的版本号用AppVersionName{@link PackageUtils#getVersionName(Context)}
+     *
+     * @return 补丁包版本号
+     */
+    public static String getPatchVersionName() {
+        return Config.PATCH_VERSION_NAME;
+    }
+
     /*
      * 返回光环助手的版本信息
      */
@@ -286,11 +298,11 @@ public class PackageUtils {
             if (intent != null) {
                 context.startActivity(intent);
             } else {
-                Toast.makeText(context, "启动失败", Toast.LENGTH_SHORT).show();
+                Utils.toast(context, "启动失败");
             }
         } catch (Exception e) {
             e.printStackTrace();
-            Toast.makeText(context, "启动失败", Toast.LENGTH_SHORT).show();
+            Utils.toast(context, "启动失败");
         }
     }
 

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

@@ -7,13 +7,13 @@ import android.os.Handler;
 import android.support.v4.util.ArrayMap;
 import android.text.TextUtils;
 
-import com.gh.base.AppController;
-import com.lightgame.download.FileUtils;
 import com.gh.gamecenter.R;
 import com.gh.gamecenter.entity.PlatformEntity;
 import com.gh.gamecenter.eventbus.EBReuse;
 import com.gh.gamecenter.retrofit.Response;
 import com.gh.gamecenter.retrofit.RetrofitManager;
+import com.halo.assistant.HaloApp;
+import com.lightgame.download.FileUtils;
 
 import org.greenrobot.eventbus.EventBus;
 
@@ -128,7 +128,7 @@ public class PlatformUtils {
                 }
             }
             if (urls.size() != 0) {
-                checkPlatformPic(urls);
+//                checkPlatformPic(urls);
             }
         }
 
@@ -152,7 +152,7 @@ public class PlatformUtils {
             }
         }
         if (urls.size() != 0) {
-            AppController.MAIN_EXECUTOR.execute(new Runnable() {
+            HaloApp.getInstance().getMainExecutor().execute(new Runnable() {
                 @Override
                 public void run() {
                     int success = 0;
@@ -221,29 +221,8 @@ public class PlatformUtils {
         return 0;
     }
 
-    public String getPlatformPicPath(String platform) {
-        String path = null;
-        String url = platformPicUrlMap.get(platform);
-        if (url != null) {
-            String fileName = url.substring(url.lastIndexOf("/") + 1);
-            File file = new File(FileUtils.getPlatformPicDir(context));
-            if (file.isDirectory()) {
-                for (File f : file.listFiles()) {
-                    if (f.getName().equals(fileName)) {
-                        path = f.getAbsolutePath();
-                        break;
-                    }
-                }
-            }
-            if (path == null && !isCheck) {
-                ArrayList<String> urls = new ArrayList<>();
-                for (String value : platformPicUrlMap.values()) {
-                    urls.add(value);
-                }
-                checkPlatformPic(urls);
-            }
-        }
-        return path;
+    public String getPlatformPicUrl(String platform) {
+        return platformPicUrlMap.get(platform);
     }
 
     public String getPlatformName(String platform) {
@@ -262,7 +241,7 @@ public class PlatformUtils {
             return;
         }
         isUpdate = true;
-        RetrofitManager.getApi().getGamePlatform()
+        RetrofitManager.getInstance(context).getApi().getGamePlatform()
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new Response<List<PlatformEntity>>() {

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

@@ -2,6 +2,7 @@ package com.gh.common.util;
 
 import android.content.Context;
 
+import com.gh.gamecenter.R;
 import com.gh.gamecenter.entity.CommentEntity;
 import com.gh.gamecenter.retrofit.JSONObjectResponse;
 import com.gh.gamecenter.retrofit.Response;
@@ -16,7 +17,6 @@ import okhttp3.ResponseBody;
 import retrofit2.HttpException;
 import rx.Observable;
 import rx.android.schedulers.AndroidSchedulers;
-import rx.functions.Func1;
 import rx.schedulers.Schedulers;
 
 /**
@@ -25,22 +25,16 @@ import rx.schedulers.Schedulers;
 public class PostCommentUtils {
 
     public static void addCommentData(final Context context, final String newsId, final String content,
-                                      final boolean isCheck, final CommentEntity commentEntity,
+                                      final CommentEntity commentEntity,
                                       final PostCommentListener listener) {
-        TokenUtils.getToken(context, isCheck)
-                .flatMap(new Func1<String, Observable<ResponseBody>>() {
-                    @Override
-                    public Observable<ResponseBody> call(String token) {
-                        RequestBody body = RequestBody.create(MediaType.parse("application/json"), content);
-
-                        if (commentEntity != null) {
-                            return RetrofitManager.getComment().postReplyComment(token, commentEntity.getId(), body);
-                        } else {
-                            return RetrofitManager.getComment().postNewsComment(token, newsId, body);
-                        }
-                    }
-                })
-                .subscribeOn(Schedulers.io())
+        RequestBody body = RequestBody.create(MediaType.parse("application/json"), content);
+        Observable<ResponseBody> observable;
+        if (commentEntity != null) {
+            observable = RetrofitManager.getInstance(context).getApi().postReplyComment(commentEntity.getId(), body);
+        } else {
+            observable = RetrofitManager.getInstance(context).getApi().postNewsComment(newsId, body);
+        }
+        observable.subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new JSONObjectResponse() {
                     @Override
@@ -50,22 +44,12 @@ public class PostCommentUtils {
                                 listener.postSuccess(response);
                             }
                         } else {
-                            Utils.toast(context, "提交失败，请检查网络设置");
+                            Utils.toast(context, R.string.post_failure_hint);
                         }
                     }
 
-                    @Override
-                    public void onError(Throwable e) {
-                        super.onError(e);
-                        Utils.log("======" + e.toString());
-                    }
-
                     @Override
                     public void onFailure(HttpException e) {
-                        if (e != null && e.code() == 401) {
-                            addCommentData(context, newsId, content, false, commentEntity, listener);
-                            return;
-                        }
                         if (listener != null) {
                             listener.postFailed(e);
                         }
@@ -73,15 +57,10 @@ public class PostCommentUtils {
                 });
     }
 
-    public static void addCommentVoto(final Context context, final String commentId, final boolean isCheck,
+    public static void addCommentVoto(final Context context, final String commentId,
                                       final PostCommentListener listener) {
-        TokenUtils.getToken(context, isCheck)
-                .flatMap(new Func1<String, Observable<ResponseBody>>() {
-                    @Override
-                    public Observable<ResponseBody> call(String token) {
-                        return RetrofitManager.getComment().postCommentVote(token, commentId);
-                    }
-                })
+        RetrofitManager.getInstance(context).getApi()
+                .postCommentVote(commentId)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new Response<ResponseBody>() {
@@ -94,10 +73,6 @@ public class PostCommentUtils {
 
                     @Override
                     public void onFailure(HttpException e) {
-                        if (e != null && e.code() == 401) {
-                            addCommentVoto(context, commentId, false, listener);
-                            return;
-                        }
                         if (listener != null) {
                             listener.postFailed(e);
                         }
@@ -105,16 +80,11 @@ public class PostCommentUtils {
                 });
     }
 
-    public static void addReportData(final Context context, final String reportData, boolean isCheck,
+    public static void addReportData(final Context context, final String reportData,
                                      final PostCommentListener listener) {
-        TokenUtils.getToken(context, isCheck)
-                .flatMap(new Func1<String, Observable<ResponseBody>>() {
-                    @Override
-                    public Observable<ResponseBody> call(String token) {
-                        RequestBody body = RequestBody.create(MediaType.parse("application/json"), reportData);
-                        return RetrofitManager.getComment().postReportData(body, token);
-                    }
-                })
+        RequestBody body = RequestBody.create(MediaType.parse("application/json"), reportData);
+        RetrofitManager.getInstance(context).getApi()
+                .postReportData(body)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new Response<ResponseBody>() {
@@ -125,10 +95,6 @@ public class PostCommentUtils {
 
                     @Override
                     public void onFailure(HttpException e) {
-                        if (e != null && e.code() == 401) {
-                            addReportData(context, reportData, false, listener);
-                            return;
-                        }
                         listener.postFailed(e);
                     }
                 });

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

@@ -19,7 +19,13 @@ public class QQUtils {
         }
         if (ShareUtils.isQQClientAvailable(context)) {
             //安装了QQ会直接调用QQ，打开手机QQ进行会话 QQ号：2586716223
-            String str = "mqqwpa://im/chat?chat_type=wpa&uin=" + qq + "&version=1&src_type=web&web_src=oicqzone.com";
+            String chatType;
+            if (qq.startsWith("400") || qq.startsWith("800")) {
+                chatType = "crm";
+            } else {
+                chatType = "wpa";
+            }
+            String str = "mqqwpa://im/chat?chat_type=" + chatType + "&uin=" + qq + "&version=1&src_type=web";
             context.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(str)));
         } else {
             //没有安装QQ 复制账号

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

@@ -1,5 +1,6 @@
 package com.gh.common.util;
 
+import java.math.BigDecimal;
 import java.util.Random;
 
 /**
@@ -41,4 +42,13 @@ public class RandomUtils {
         return random.nextInt(size);
     }
 
+    /**
+     * 四舍五入取整
+     * @return
+     */
+    public static int getInt(double d) {
+        BigDecimal bigDecimal = new BigDecimal(d).setScale(0, BigDecimal.ROUND_HALF_UP);
+        return bigDecimal.intValue();
+    }
+
 }

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

@@ -0,0 +1,56 @@
+package com.gh.common.util;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Canvas;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Drawable;
+import android.util.Base64;
+
+import java.io.ByteArrayOutputStream;
+
+/**
+ * Created by khy on 15/12/17.
+ */
+
+public  class RichEditorUtils {
+
+    private RichEditorUtils() throws InstantiationException {
+        throw new InstantiationException("This class is not for instantiation");
+    }
+
+    public static String toBase64(Bitmap bitmap) {
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        bitmap.compress(Bitmap.CompressFormat.PNG, 100, baos);
+        byte[] bytes = baos.toByteArray();
+
+        return Base64.encodeToString(bytes, Base64.NO_WRAP);
+    }
+
+    public static Bitmap toBitmap(Drawable drawable) {
+        if (drawable instanceof BitmapDrawable) {
+            return ((BitmapDrawable) drawable).getBitmap();
+        }
+
+        int width = drawable.getIntrinsicWidth();
+        width = width > 0 ? width : 1;
+        int height = drawable.getIntrinsicHeight();
+        height = height > 0 ? height : 1;
+
+        Bitmap bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas(bitmap);
+        drawable.setBounds(0, 0, canvas.getWidth(), canvas.getHeight());
+        drawable.draw(canvas);
+
+        return bitmap;
+    }
+
+    public static Bitmap decodeResource(Context context, int resId) {
+        return BitmapFactory.decodeResource(context.getResources(), resId);
+    }
+
+    public static long getCurrentTime() {
+        return System.currentTimeMillis();
+    }
+}

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

@@ -13,6 +13,7 @@ import android.graphics.Matrix;
 import android.os.Bundle;
 import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.RecyclerView;
+import android.text.TextUtils;
 import android.view.Gravity;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
@@ -57,16 +58,14 @@ import static com.gh.common.util.GetLoginDataUtils.SCOPE;
  */
 public class ShareUtils {
 
-    private static ShareUtils instance;
+    private static ShareUtils sInstance;
     private IWXAPI mIWXAPI;
     private Tencent mTencent;
     private String shareUrl;
-    private String shareGameName;
     private String shareIcon;
-    private String shareNewsTitle; // shareNewsTitle不为空就是新闻分享，否则是游戏分享
-    private boolean isPlugin = false;
-    private boolean ispopupWindow;
-    private boolean isToolsBox;
+    private String mTitle;
+    private String mSummary;
+
 
     private int[] arrLogo = {
             R.drawable.share_wechat_logo,
@@ -78,41 +77,57 @@ public class ShareUtils {
             R.drawable.share_copyfont_logo,
             R.drawable.share_cancel_logo
     };
+
+    public enum ShareType {
+        news,
+        game,      // 普通游戏
+        plugin,    // 插件游戏
+        tools,
+        askInvite,
+        askNormal,  // 问答问题/答案
+        shareGh
+    }
+
     private String[] arrLabel = {"微信好友", "朋友圈", "QQ好友", "QQ空间", "新浪微博", "短信", "复制链接", "取消"};
 
     private PopupWindow popupWindow;
 
+    private ShareType mShareType;
+
+    private Activity mActivity;
+
     private Context mContext;
     //QQ或者QQ空间分享回调处理
     public IUiListener QqShareListener = new IUiListener() {
         @Override
         public void onComplete(Object o) {
-            Utils.toast(mContext, mContext.getString(R.string.share_success_hint));
+            Utils.toast(mContext, R.string.share_success_hint);
         }
 
         @Override
         public void onError(UiError uiError) {
-            Utils.toast(mContext, mContext.getString(R.string.share_fail_hint));
+            Utils.toast(mContext, R.string.share_fail_hint);
         }
 
         @Override
         public void onCancel() {
-            Utils.toast(mContext, mContext.getString(R.string.share_cancel_hint));
+            Utils.toast(mContext, R.string.share_cancel_hint);
         }
     };
 
     private ShareUtils(Context context) {
         mTencent = Tencent.createInstance(Config.TENCENT_APPID, context); //初始化QQ分享
         mIWXAPI = WXAPIFactory.createWXAPI(context, Config.WECHAT_APPID); //初始化微信分享
-        WbSdk.install(context,new AuthInfo(context, Config.WEIBO_APPKEY, "http://www.sina.com", SCOPE));
+        WbSdk.install(context, new AuthInfo(context, Config.WEIBO_APPKEY, "http://www.sina.com", SCOPE));
+        // FIXME 此处严重泄露，把Activity Context 存为static？？？？？
         mContext = context;
     }
 
-    public static ShareUtils getInstance(Activity context) {
-        if (instance == null) {
-            instance = new ShareUtils(context);
+    public static ShareUtils getInstance(Context context) {
+        if (sInstance == null) {
+            sInstance = new ShareUtils(context);
         }
-        return instance;
+        return sInstance;
     }
 
     //检查是否安装手机QQ
@@ -122,7 +137,7 @@ public class ShareUtils {
         if (pinfo != null) {
             for (int i = 0; i < pinfo.size(); i++) {
                 String pn = pinfo.get(i).packageName;
-                if (pn.equals("com.tencent.mobileqq")) {
+                if ("com.tencent.mobileqq".equals(pn)) {
                     return true;
                 }
             }
@@ -130,24 +145,14 @@ public class ShareUtils {
         return false;
     }
 
-    /**
-     * @param view          ispopupWindow-true是绑定的布局， ispopupWindow-false 则是嵌套的父控件
-     * @param url           分享链接
-     * @param gameName      游戏名 与 新闻标题区分
-     * @param icon          分享图标
-     * @param newsTitle     新闻标题 与 游戏名区分
-     * @param isPlugin      判断游戏是否是插件
-     * @param ispopupWindow 判断是否是 PopupWindow false可直接嵌套进布局（分享光环），view是父控件
-     */
-    public void showShareWindows(View view, String url, String gameName, String icon, String newsTitle,
-                                 boolean isPlugin, boolean ispopupWindow, boolean isToolsBox) {
+
+    public void showShareWindows(Activity activity, View view, String url, String icon, String shareTitle, String shareSummary, ShareType shareType) {
+        this.mActivity = activity;
         this.shareIcon = icon;
-        this.shareGameName = gameName;
         this.shareUrl = url;
-        this.shareNewsTitle = newsTitle;
-        this.isPlugin = isPlugin;
-        this.ispopupWindow = ispopupWindow;
-        this.isToolsBox = isToolsBox;
+        this.mSummary = shareSummary;
+        this.mTitle = shareTitle;
+        this.mShareType = shareType;
 
         View contentView = View.inflate(mContext, R.layout.share_popup_layout, null);
         contentView.setFocusable(true);
@@ -167,7 +172,7 @@ public class ShareUtils {
         shareRecyclerView.setLayoutManager(gridLayoutManager);
         shareRecyclerView.setAdapter(new ShareRecyclerViewAdapter());
 
-        if (!ispopupWindow) {
+        if (mShareType == ShareType.shareGh) {
             RelativeLayout layout = (RelativeLayout) view;
             layout.addView(contentView);
             arrLabel[6] = "邮件";
@@ -209,79 +214,52 @@ public class ShareUtils {
     }
 
     //QQ分享
-    private void qqSahre() {
-        Utils.toast(mContext, mContext.getString(R.string.share_skip));
+    private void qqShare() {
+        Utils.toast(mContext, R.string.share_skip);
         Bundle params = new Bundle();
 
-        String title;
-        String summary;
-
-        if (isToolsBox) {
-            title = shareNewsTitle;
-            summary = shareGameName;
-        } else if (ispopupWindow) {
-            if (shareNewsTitle != null) {
-                title = shareNewsTitle;
-                summary = "来自光环助手（最强卡牌神器）";
-            } else {
-                title = "向你推荐：";
-                if (isPlugin) {
-                    summary = shareGameName + "（光环加速版）";
-                } else {
-                    summary = shareGameName;
-                }
-            }
-        } else {
-            title = "玩手游不用肝的感觉真好";
-            summary = "绿色安全的手游加速助手";
+        switch (mShareType) {
+            case plugin:
+                mSummary += "（光环加速版）";
+                break;
+            case askNormal:
+                mTitle += " - 光环助手";
+                break;
         }
-        params.putString(QQShare.SHARE_TO_QQ_TITLE, title);
-        params.putString(QQShare.SHARE_TO_QQ_SUMMARY, summary);
+
+        params.putString(QQShare.SHARE_TO_QQ_TITLE, mTitle);
+        params.putString(QQShare.SHARE_TO_QQ_SUMMARY, mSummary);
         params.putInt(QQShare.SHARE_TO_QQ_KEY_TYPE, QQShare.SHARE_TO_QQ_TYPE_DEFAULT);
         params.putString(QQShare.SHARE_TO_QQ_TARGET_URL, shareUrl);
         params.putString(QQShare.SHARE_TO_QQ_IMAGE_URL, shareIcon);
-        params.putString(QQShare.SHARE_TO_QQ_APP_NAME, "光环助手");
+        params.putString(QQShare.SHARE_TO_QQ_APP_NAME, mContext.getString(R.string.app_name));
 
-        mTencent.shareToQQ(
-                (Activity) mContext, params, QqShareListener);
+        mTencent.shareToQQ(mActivity, params, QqShareListener);
 
-        if (ispopupWindow) {
+        if (mShareType != ShareType.shareGh) {
             popupWindow.dismiss();
         }
     }
 
     //微信好友分享
-    private void wechatSahre() {
-        Utils.toast(mContext, mContext.getString(R.string.share_skip));
+    private void wechatShare() {
+        Utils.toast(mContext, R.string.share_skip);
         WXWebpageObject webpage = new WXWebpageObject();
         WXMediaMessage msg = new WXMediaMessage(webpage);
         webpage.webpageUrl = shareUrl;
 
-        String title;
-        String summary;
+        switch (mShareType) {
+            case plugin:
+                mSummary += "（光环加速版）";
+                break;
+            case askNormal:
+                mTitle += " - 光环助手";
+                break;
 
-        if (isToolsBox) {
-            title = shareNewsTitle;
-            summary = shareGameName;
-        } else if (ispopupWindow) {
-            if (shareNewsTitle != null) {
-                title = shareNewsTitle;
-                summary = "来自光环助手（最强卡牌神器）";
-            } else {
-                title = "向你推荐：";
-                if (isPlugin) {
-                    summary = shareGameName + "（光环加速版）";
-                } else {
-                    summary = shareGameName;
-                }
-            }
-        } else {
-            title = "玩手游不用肝的感觉真好";
-            summary = "绿色安全的手游加速助手";
         }
 
-        msg.title = title;
-        msg.description = summary;
+        msg.title = mTitle;
+        msg.description = mSummary;
 
         SendMessageToWX.Req req = new SendMessageToWX.Req();
         req.transaction = buildTransaction("webpage");
@@ -289,7 +267,7 @@ public class ShareUtils {
         req.scene = SendMessageToWX.Req.WXSceneSession;
 
         loadBitMap(shareIcon, msg, req);
-        if (ispopupWindow) {
+        if (mShareType != ShareType.shareGh) {
             popupWindow.dismiss();
         }
     }
@@ -303,8 +281,12 @@ public class ShareUtils {
             @Override
             protected void onNewResultImpl(Bitmap bitmap) {
                 Bitmap compressBp = compressBitmap(bitmap);
-                Bitmap resultBp = addBackGround(compressBp);
-                msg.thumbData = Util.bmpToByteArray(resultBp, true);
+                if (mShareType == ShareType.askNormal || mShareType == ShareType.askInvite) {
+                    msg.thumbData = Util.bmpToByteArray(compressBp, true);
+                } else {
+                    Bitmap resultBp = addBackGround(compressBp);
+                    msg.thumbData = Util.bmpToByteArray(resultBp, true);
+                }
                 mIWXAPI.sendReq(req);
             }
 
@@ -316,10 +298,10 @@ public class ShareUtils {
     }
 
     //压缩图片
-    private Bitmap compressBitmap(Bitmap bitmap) {
+    public static Bitmap compressBitmap(Bitmap bitmap) {
         ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        bitmap.compress(Bitmap.CompressFormat.JPEG, 85, bos);
-        float zoom = (float) Math.sqrt(10 * 1024 / (float) bos.toByteArray().length);
+        bitmap.compress(Bitmap.CompressFormat.JPEG, 100, bos);
+        float zoom = (float) Math.sqrt(9 * 1024 / (float) bos.toByteArray().length);
 
         Matrix matrix = new Matrix();
         matrix.setScale(zoom, zoom);
@@ -327,15 +309,14 @@ public class ShareUtils {
         Bitmap result = Bitmap.createBitmap(bitmap, 0, 0, bitmap.getWidth(), bitmap.getHeight(), matrix, true);
         bos.reset();
 
-        result.compress(Bitmap.CompressFormat.JPEG, 85, bos);
+        result.compress(Bitmap.CompressFormat.JPEG, 100, bos);
 
-        while (bos.toByteArray().length > 10 * 1024) {
+        while (bos.toByteArray().length > 9 * 1024) {
             System.out.println(bos.toByteArray().length);
             matrix.setScale(0.9f, 0.9f);
             result = Bitmap.createBitmap(result, 0, 0, result.getWidth(), result.getHeight(), matrix, true);
             bos.reset();
-            result.compress(Bitmap.CompressFormat.JPEG, 85, bos);
-
+            result.compress(Bitmap.CompressFormat.JPEG, 100, bos);
         }
 
         return result;
@@ -363,78 +344,61 @@ public class ShareUtils {
     }
 
     //QQ空间分享
-    private void qZoneSahre() {
-        Utils.toast(mContext, mContext.getString(R.string.share_skip));
+    private void qZoneShare() {
+        Utils.toast(mContext, R.string.share_skip);
         Bundle params = new Bundle();
 
-        String title;
-        String summary = null;
-
-        if (isToolsBox) {
-            title = shareNewsTitle;
-            summary = shareGameName;
-        } else if (ispopupWindow) {
-            if (shareNewsTitle != null) {
-                title = shareNewsTitle;
-            } else {
-                title = "向你推荐：";
-                if (isPlugin) {
-                    summary = shareGameName + "（光环加速版）";
-                } else {
-                    summary = shareGameName;
-                }
-            }
-        } else {
-            title = "玩手游不用肝的感觉真好";
-            summary = "绿色安全的手游加速助手";
+        switch (mShareType) {
+            case plugin:
+                mSummary += "（光环加速版）";
+                break;
+            case askNormal:
+                mTitle += " - 光环助手";
+                break;
         }
 
         ArrayList<String> imageUrls = new ArrayList<>();
         imageUrls.add(shareIcon);
 
-        if (summary != null) {
-            params.putString(QzoneShare.SHARE_TO_QQ_SUMMARY, summary);
+        if (!TextUtils.isEmpty(mSummary)) {
+            params.putString(QzoneShare.SHARE_TO_QQ_SUMMARY, mSummary);
         }
-        params.putString(QzoneShare.SHARE_TO_QQ_TITLE, title);
+        params.putString(QzoneShare.SHARE_TO_QQ_TITLE, mTitle);
         params.putInt(QzoneShare.SHARE_TO_QZONE_KEY_TYPE, QzoneShare.SHARE_TO_QZONE_TYPE_NO_TYPE);
         params.putString(QzoneShare.SHARE_TO_QQ_TARGET_URL, shareUrl);
         params.putStringArrayList(QzoneShare.SHARE_TO_QQ_IMAGE_URL, imageUrls);
-        params.putString(QzoneShare.SHARE_TO_QQ_APP_NAME, "光环助手");
+        params.putString(QzoneShare.SHARE_TO_QQ_APP_NAME, mContext.getString(R.string.app_name));
 
-        mTencent.shareToQzone(
-                (Activity) mContext, params, QqShareListener);
-        if (ispopupWindow) {
+        mTencent.shareToQzone(mActivity, params, QqShareListener);
+        if (mShareType != ShareType.shareGh) {
             popupWindow.dismiss();
         }
     }
 
     //微信朋友圈分享
-    private void wechatMomentsSahre() {
-        Utils.toast(mContext, mContext.getString(R.string.share_skip));
+    private void wechatMomentsShare() {
+        Utils.toast(mContext, R.string.share_skip);
         WXWebpageObject webpage = new WXWebpageObject();
         WXMediaMessage msg = new WXMediaMessage(webpage);
 
         webpage.webpageUrl = shareUrl;
 
-        String title;
-
-        if (isToolsBox) {
-            title = shareNewsTitle;
-        } else if (ispopupWindow) {
-            if (shareNewsTitle != null) {
-                title = shareNewsTitle;
-            } else {
-                if (isPlugin) {
-                    title = shareGameName + "（光环加速版）";
-                } else {
-                    title = shareGameName;
-                }
-            }
-        } else {
-            title = "玩手游不用肝的感觉真好";
+        switch (mShareType) {
+            case plugin:
+                msg.title = mSummary + "（光环加速版）";
+                break;
+            case game:
+                msg.title = mSummary;
+                break;
+            case askNormal:
+                msg.title = mTitle + " - 光环助手";
+                break;
+            default:
+                msg.title = mTitle;
+                break;
         }
 
-        msg.title = title;
+
         SendMessageToWX.Req req = new SendMessageToWX.Req();
 
         req.transaction = buildTransaction("webpage");
@@ -442,39 +406,46 @@ public class ShareUtils {
         req.scene = SendMessageToWX.Req.WXSceneTimeline;
 
         loadBitMap(shareIcon, msg, req);
-        if (ispopupWindow) {
+        if (mShareType != ShareType.shareGh) {
             popupWindow.dismiss();
         }
     }
 
     //新浪微博分享
-    private void sinaWeiboSahre() {
+    private void sinaWeiboShare() {
         Intent intent = WeiBoShareActivity.getWeiboshareIntent(mContext,
-                shareNewsTitle, shareIcon, shareGameName, shareUrl, isPlugin, ispopupWindow, isToolsBox);
+                shareUrl, shareIcon, mTitle, mSummary, mShareType.toString());
         mContext.startActivity(intent);
 
-        if (ispopupWindow) {
+        if (mShareType != ShareType.shareGh) {
             popupWindow.dismiss();
         }
     }
 
     //短信分享
-    private void shortMessageSahre() {
+    private void shortMessageShare() {
         String smsBody;
-        if (isToolsBox) {
-            smsBody = shareNewsTitle + shareUrl;
-        } else if (ispopupWindow) {
-            if (shareNewsTitle != null) {
-                smsBody = shareNewsTitle + shareUrl;
-            } else {
-                if (isPlugin) {
-                    smsBody = "向你推荐：" + shareGameName + "（光环加速版）" + shareUrl;
-                } else {
-                    smsBody = "向你推荐：" + shareGameName + shareUrl;
-                }
-            }
-        } else {
-            smsBody = "这个App可以下载各种热门卡牌手游的加速版，绿色安全，超级省心，做日常效率提高3-5倍！光环助手官网地址：" + shareUrl;
+        switch (mShareType) {
+            case news:
+            case tools:
+                smsBody = mTitle + shareUrl;
+                break;
+            case plugin:
+                smsBody = mTitle + mSummary + "（光环加速版）" + shareUrl;
+                break;
+            case game:
+                smsBody = mTitle + mSummary + shareUrl;
+                break;
+            case shareGh:
+                smsBody = "这个App可以下载各种热门卡牌手游的加速版，绿色安全，超级省心，做日常效率提高3-5倍！光环助手官网地址：" + shareUrl;
+                break;
+            case askInvite:
+            case askNormal:
+                smsBody = mTitle + " - 光环助手" + shareUrl;
+                break;
+            default:
+                smsBody = mTitle;
+                break;
         }
 
         try {
@@ -485,7 +456,7 @@ public class ShareUtils {
             e.printStackTrace();
         }
 
-        if (ispopupWindow) {
+        if (mShareType != ShareType.shareGh) {
             popupWindow.dismiss();
         }
     }
@@ -494,7 +465,7 @@ public class ShareUtils {
     private void copyLink(String copyContent) {
         ClipboardManager cmb = (ClipboardManager) mContext.getSystemService(Context.CLIPBOARD_SERVICE);
         cmb.setText(copyContent);
-        if (ispopupWindow) {
+        if (mShareType != ShareType.shareGh) {
             Utils.toast(mContext, "复制成功");
             popupWindow.dismiss();
         } else {
@@ -519,25 +490,27 @@ public class ShareUtils {
                 public void onClick(View v) {
                     switch (holder.getPosition()) {
                         case 0:
-                            wechatSahre();
+                            wechatShare();
                             break;
                         case 1:
-                            wechatMomentsSahre();
+                            wechatMomentsShare();
                             break;
                         case 2:
-                            qqSahre();
+                            qqShare();
                             break;
                         case 3:
-                            qZoneSahre();
+                            qZoneShare();
                             break;
                         case 4:
-                            sinaWeiboSahre();
+                            sinaWeiboShare();
                             break;
                         case 5:
-                            shortMessageSahre();
+                            shortMessageShare();
                             break;
                         case 6:
-                            if (ispopupWindow) {
+                            if (mShareType == ShareType.askInvite || mShareType == ShareType.askNormal) {
+                                copyLink(mTitle + " - 光环助手" + shareUrl);
+                            } else if (mShareType != ShareType.shareGh) {
                                 copyLink(shareUrl);
                             } else {
                                 Intent data = IntentUtils.getEmailToGHIntent();
@@ -545,7 +518,7 @@ public class ShareUtils {
                             }
                             break;
                         case 7:
-                            if (ispopupWindow) {
+                            if (mShareType != ShareType.shareGh) {
                                 popupWindow.dismiss();
                             } else {
                                 copyLink("推荐光环助手，绿色安全的手游加速助手：" + shareUrl);

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

@@ -8,7 +8,7 @@ import android.view.ViewTreeObserver;
 import android.widget.FrameLayout;
 
 /**
- * 用于解决因为沉浸式状态栏时键盘不遮挡输入框
+ * 用于解决因为沉浸式状态栏(自定义)时键盘不遮挡输入框
  */
 public class SoftInputHidWidgetUtils {
     private View mChildOfContent;

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

@@ -66,7 +66,7 @@ public class TagUtils {
             return;
         }
         isUpdate = true;
-        RetrofitManager.getApi().getTags()
+        RetrofitManager.getInstance(context).getApi().getTags()
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new Response<List<TagEntity>>() {

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

@@ -23,84 +23,97 @@ public class TimestampUtils {
 
     private static void initIntervalMap() {
         intervalMap = new ArrayMap<>();
-        intervalMap.put("^" + Config.HOST + "index/slides" + "$", 5);
-        intervalMap.put("^" + Config.HOST + "game/chajian" + "$", 10);
-        intervalMap.put("^" + Config.HOST + "game/tuijian" + "$", 15);
-        intervalMap.put("^" + Config.HOST + "game/.+/detail" + "$", 20);
-        intervalMap.put("^" + Config.HOST + "game/.+/digest" + "$", 25);
-        intervalMap.put("^" + Config.HOST + "game/remenkapai" + "$", 30);
-        intervalMap.put("^" + Config.HOST + "game/.+/news_digest" + "$", 35);
-        intervalMap.put("^" + Config.HOST + "game/column/.+\\?page=.+" + "$", 40);
-        intervalMap.put("^" + Config.HOST + "support/package/.+/game/digest" + "$", 45);
-        intervalMap.put("^" + Config.HOST + "game/danjiyouxi\\?limit=20\\&offset=.+" + "$", 50);
-        intervalMap.put("^" + Config.HOST + "news/.+/digest" + "$", 55);
-        intervalMap.put("^" + Config.HOST + "news/.+/detail" + "$", 60);
-        intervalMap.put("^" + Config.HOST + "news/.+/suggestion" + "$", 65);
-        intervalMap.put("^" + Config.HOST + "game/.+/news\\?limit=3" + "$", 70);
-        intervalMap.put("^" + Config.HOST + "zixun/zixun\\?limit=20\\&offset=.+" + "$", 75);
-        intervalMap.put("^" + Config.HOST + "game/.+/news\\?limit=20\\&offset=.+" + "$", 80);
-        intervalMap.put("^" + Config.HOST + "zixun/yuanchuang\\?limit=20\\&offset=.+" + "$", 85);
-        intervalMap.put("^" + Config.HOST + "news\\?type_group=.+\\&offset=.+\\&limit=20" + "$", 90);
-        intervalMap.put("^" + Config.HOST + "zixun/guanzhu\\?key=.+\\&limit=20\\&offset=.+" + "$", 95);
-        intervalMap.put("^" + Config.HOST + "game/.+/news\\?limit=20\\&offset=.+\\&type=.+" + "$", 100);
-        intervalMap.put("^" + Config.HOST + "zixun/guanzhu\\?game_id=.+\\&limit=20\\&offset=.+" + "$", 105);
-        intervalMap.put("^" + Config.HOST + "search/news\\?game_id=.+\\&keyword=.+\\&page=.+\\&limit=20" + "$", 110);
-        intervalMap.put("^" + Config.HOST + "search/game\\?keyword=.+" + "$", 115);
-        intervalMap.put("^" + Config.HOST + "support/setting/platform" + "$", 120);
-        intervalMap.put("^" + Config.HOST + "update/package/.+" + "$", 125);
-        intervalMap.put("^" + Config.HOST + "update/game/.+/package/.+" + "$", 130);
+        intervalMap.put("^" + Config.API_HOST + "index/slides" + "$", 5);
+        intervalMap.put("^" + Config.API_HOST + "game/chajian" + "$", 10);
+        intervalMap.put("^" + Config.API_HOST + "game/tuijian" + "$", 15);
+        intervalMap.put("^" + Config.API_HOST + "game/.+/detail" + "$", 20);
+        intervalMap.put("^" + Config.API_HOST + "game/.+/digest" + "$", 25);
+        intervalMap.put("^" + Config.API_HOST + "game/remenkapai" + "$", 30);
+        intervalMap.put("^" + Config.API_HOST + "game/.+/news_digest" + "$", 35);
+        intervalMap.put("^" + Config.API_HOST + "game/column/.+\\?page=.+" + "$", 40);
+        intervalMap.put("^" + Config.API_HOST + "support/package/.+/game/digest" + "$", 45);
+        intervalMap.put("^" + Config.API_HOST + "game/danjiyouxi\\?limit=20\\&offset=.+" + "$", 50);
+        intervalMap.put("^" + Config.API_HOST + "news/.+/digest" + "$", 55);
+        intervalMap.put("^" + Config.API_HOST + "news/.+/detail" + "$", 60);
+        intervalMap.put("^" + Config.API_HOST + "news/.+/suggestion" + "$", 65);
+        intervalMap.put("^" + Config.API_HOST + "game/.+/news\\?limit=3" + "$", 70);
+        intervalMap.put("^" + Config.API_HOST + "zixun/zixun\\?limit=20\\&offset=.+" + "$", 75);
+        intervalMap.put("^" + Config.API_HOST + "game/.+/news\\?limit=20\\&offset=.+" + "$", 80);
+        intervalMap.put("^" + Config.API_HOST + "zixun/yuanchuang\\?limit=20\\&offset=.+" + "$", 85);
+        intervalMap.put("^" + Config.API_HOST + "news\\?type_group=.+\\&offset=.+\\&limit=20" + "$", 90);
+        intervalMap.put("^" + Config.API_HOST + "zixun/guanzhu\\?key=.+\\&limit=20\\&offset=.+" + "$", 95);
+        intervalMap.put("^" + Config.API_HOST + "game/.+/news\\?limit=20\\&offset=.+\\&type=.+" + "$", 100);
+        intervalMap.put("^" + Config.API_HOST + "zixun/guanzhu\\?game_id=.+\\&limit=20\\&offset=.+" + "$", 105);
+        intervalMap.put("^" + Config.API_HOST + "search/news\\?game_id=.+\\&keyword=.+\\&page=.+\\&limit=20" + "$", 110);
+        intervalMap.put("^" + Config.API_HOST + "search/game\\?keyword=.+" + "$", 115);
+        intervalMap.put("^" + Config.API_HOST + "support/setting/platform" + "$", 120);
+        intervalMap.put("^" + Config.API_HOST + "update/package/.+" + "$", 125);
+        intervalMap.put("^" + Config.API_HOST + "update/game/.+/package/.+" + "$", 130);
         intervalMap.put("^" + Config.COMMENT_HOST + "article/.+/comment\\?limit=10\\&offset=.+" + "$", 135);
         intervalMap.put("^" + Config.COMMENT_HOST + "article/.+/comment\\?order=hot\\&limit=10\\&offset=.+" + "$", 140);
     }
 
     private static void initCDMap() {
         cdMap = new ArrayMap<>();
-        cdMap.put("^" + Config.HOST + "index/slides" + "$", Constants.GAME_CD);
-        cdMap.put("^" + Config.HOST + "game/chajian" + "$", Constants.GAME_CD);
-        cdMap.put("^" + Config.HOST + "game/tuijian" + "$", Constants.GAME_CD);
-        cdMap.put("^" + Config.HOST + "game/.+/detail" + "$", Constants.GAME_CD);
-        cdMap.put("^" + Config.HOST + "game/.+/digest" + "$", Constants.GAME_CD);
-        cdMap.put("^" + Config.HOST + "game/remenkapai" + "$", Constants.GAME_CD);
-        cdMap.put("^" + Config.HOST + "game/.+/news_digest" + "$", Constants.GAME_CD);
-        cdMap.put("^" + Config.HOST + "game/column/.+\\?page=.+" + "$", Constants.GAME_CD);
-        cdMap.put("^" + Config.HOST + "support/package/.+/game/digest" + "$", Constants.GAME_CD);
-        cdMap.put("^" + Config.HOST + "game/danjiyouxi\\?limit=20\\&offset=.+" + "$", Constants.GAME_CD);
-        cdMap.put("^" + Config.HOST + "news/.+/digest" + "$", Constants.NEWS_CD);
-        cdMap.put("^" + Config.HOST + "news/.+/detail" + "$", Constants.NEWS_CD);
-        cdMap.put("^" + Config.HOST + "news/.+/suggestion" + "$", Constants.NEWS_CD);
-        cdMap.put("^" + Config.HOST + "game/.+/news\\?limit=3" + "$", Constants.NEWS_CD);
-        cdMap.put("^" + Config.HOST + "zixun/zixun\\?limit=20\\&offset=.+" + "$", Constants.NEWS_CD);
-        cdMap.put("^" + Config.HOST + "game/.+/news\\?limit=20\\&offset=.+" + "$", Constants.NEWS_CD);
-        cdMap.put("^" + Config.HOST + "zixun/yuanchuang\\?limit=10\\&offset=.+" + "$", Constants.NEWS_CD);
-        cdMap.put("^" + Config.HOST + "news\\?type_group=.+\\&offset=.+\\&limit=20" + "$", Constants.NEWS_CD);
-        cdMap.put("^" + Config.HOST + "zixun/guanzhu\\?key=.+\\&limit=20\\&offset=.+" + "$", Constants.NEWS_CD);
-        cdMap.put("^" + Config.HOST + "game/.+/news\\?limit=20\\&offset=.+\\&type=.+" + "$", Constants.NEWS_CD);
-        cdMap.put("^" + Config.HOST + "zixun/guanzhu\\?game_id=.+\\&limit=20\\&offset=.+" + "$", Constants.NEWS_CD);
-        cdMap.put("^" + Config.HOST + "search/news\\?game_id=.+\\&keyword=.+\\&page=.+\\&limit=20" + "$", Constants.NEWS_CD);
-        cdMap.put("^" + Config.HOST + "search/game\\?keyword=.+" + "$", Constants.SEARCH_CD);
-        cdMap.put("^" + Config.HOST + "support/setting/platform" + "$", Constants.PLATFORM_CD);
-        cdMap.put("^" + Config.HOST + "update/package/.+" + "$", Constants.UPDATE_CD);
-        cdMap.put("^" + Config.HOST + "update/game/.+/package/.+" + "$", Constants.UPDATE_CD);
+        cdMap.put("^" + Config.API_HOST + "index/slides" + "$", Constants.GAME_CD);
+        cdMap.put("^" + Config.API_HOST + "game/chajian" + "$", Constants.GAME_CD);
+        cdMap.put("^" + Config.API_HOST + "game/tuijian" + "$", Constants.GAME_CD);
+        cdMap.put("^" + Config.API_HOST + "game/.+/detail" + "$", Constants.GAME_CD);
+        cdMap.put("^" + Config.API_HOST + "game/.+/digest" + "$", Constants.GAME_CD);
+        cdMap.put("^" + Config.API_HOST + "game/remenkapai" + "$", Constants.GAME_CD);
+        cdMap.put("^" + Config.API_HOST + "game/.+/news_digest" + "$", Constants.GAME_CD);
+        cdMap.put("^" + Config.API_HOST + "game/column/.+\\?page=.+" + "$", Constants.GAME_CD);
+        cdMap.put("^" + Config.API_HOST + "support/package/.+/game/digest" + "$", Constants.GAME_CD);
+        cdMap.put("^" + Config.API_HOST + "game/danjiyouxi\\?limit=20\\&offset=.+" + "$", Constants.GAME_CD);
+        cdMap.put("^" + Config.API_HOST + "news/.+/digest" + "$", Constants.NEWS_CD);
+        cdMap.put("^" + Config.API_HOST + "news/.+/detail" + "$", Constants.NEWS_CD);
+        cdMap.put("^" + Config.API_HOST + "news/.+/suggestion" + "$", Constants.NEWS_CD);
+        cdMap.put("^" + Config.API_HOST + "game/.+/news\\?limit=3" + "$", Constants.NEWS_CD);
+        cdMap.put("^" + Config.API_HOST + "zixun/zixun\\?limit=20\\&offset=.+" + "$", Constants.NEWS_CD);
+        cdMap.put("^" + Config.API_HOST + "game/.+/news\\?limit=20\\&offset=.+" + "$", Constants.NEWS_CD);
+        cdMap.put("^" + Config.API_HOST + "zixun/yuanchuang\\?limit=10\\&offset=.+" + "$", Constants.NEWS_CD);
+        cdMap.put("^" + Config.API_HOST + "news\\?type_group=.+\\&offset=.+\\&limit=20" + "$", Constants.NEWS_CD);
+        cdMap.put("^" + Config.API_HOST + "zixun/guanzhu\\?key=.+\\&limit=20\\&offset=.+" + "$", Constants.NEWS_CD);
+        cdMap.put("^" + Config.API_HOST + "game/.+/news\\?limit=20\\&offset=.+\\&type=.+" + "$", Constants.NEWS_CD);
+        cdMap.put("^" + Config.API_HOST + "zixun/guanzhu\\?game_id=.+\\&limit=20\\&offset=.+" + "$", Constants.NEWS_CD);
+        cdMap.put("^" + Config.API_HOST + "search/news\\?game_id=.+\\&keyword=.+\\&page=.+\\&limit=20" + "$", Constants.NEWS_CD);
+        cdMap.put("^" + Config.API_HOST + "search/game\\?keyword=.+" + "$", Constants.SEARCH_CD);
+        cdMap.put("^" + Config.API_HOST + "support/setting/platform" + "$", Constants.PLATFORM_CD);
+        cdMap.put("^" + Config.API_HOST + "update/package/.+" + "$", Constants.UPDATE_CD);
+        cdMap.put("^" + Config.API_HOST + "update/game/.+/package/.+" + "$", Constants.UPDATE_CD);
         cdMap.put("^" + Config.COMMENT_HOST + "article/.+/comment\\?limit=10\\&offset=.+" + "$", Constants.COMMENT_CD);
         cdMap.put("^" + Config.COMMENT_HOST + "article/.+/comment\\?order=hot\\&limit=10\\&offset=.+" + "$", Constants.COMMENT_CD);
-        cdMap.put("^" + Config.HOST + "device/.+/concern" + "$", 0);
-        cdMap.put("^" + Config.HOST + "device/.+/concern/.+" + "$", 0);
-        cdMap.put("^" + Config.HOST + "stat/download" + "$", 0);
-        cdMap.put("^" + Config.HOST + "disclaimer" + "$", 0);
-        cdMap.put("^" + Config.HOST + "search/game/default" + "$", 0);
-        cdMap.put("^" + Config.HOST + "support/upgrade\\?version=.+\\&channel=.+" + "$", 0);
-        cdMap.put("^" + Config.HOST + "support/time/current" + "$", 0);
-        cdMap.put("^" + Config.HOST + "support/setting/ui" + "$", 0);
-        cdMap.put("^" + Config.HOST + "support/download_status\\?version=.+\\&channel=.+" + "$", 0);
-        cdMap.put("^" + Config.HOST + "support/suggestion" + "$", 0);
-        cdMap.put("^" + Config.HOST + "game/.+/serverInfo" + "$", 0);
-        cdMap.put("^" + Config.HOST + "support/package/unused\\?skip=.+" + "$", 0);
+        cdMap.put("^" + Config.API_HOST + "device/.+/concern" + "$", 0);
+        cdMap.put("^" + Config.API_HOST + "device/.+/concern/.+" + "$", 0);
+        cdMap.put("^" + Config.API_HOST + "stat/download" + "$", 0);
+        cdMap.put("^" + Config.API_HOST + "disclaimer" + "$", 0);
+        cdMap.put("^" + Config.API_HOST + "search/game/default" + "$", 0);
+        cdMap.put("^" + Config.API_HOST + "support/upgrade\\?version=.+\\&channel=.+" + "$", 0);
+        cdMap.put("^" + Config.API_HOST + "support/time/current" + "$", 0);
+        cdMap.put("^" + Config.API_HOST + "support/setting/ui" + "$", 0);
+        cdMap.put("^" + Config.API_HOST + "support/download_status\\?version=.+\\&channel=.+" + "$", 0);
+        cdMap.put("^" + Config.API_HOST + "support/suggestion" + "$", 0);
+        cdMap.put("^" + Config.API_HOST + "game/.+/serverInfo" + "$", 0);
+        cdMap.put("^" + Config.API_HOST + "support/package/unused\\?skip=.+" + "$", 0);
     }
 
     /*
      * 为url添加timestamp
      */
     public static String addTimestamp(String url) {
+
+//        // TODO: 22/12/17 刷新版
+//        if (TextUtils.isEmpty(url)) {
+//            return url;
+//        }
+//        if (url.contains("?")) {
+//            String u = url + "&timestamp=" + System.currentTimeMillis();
+//            return u;
+//        } else {
+//            String u = url + "?timestamp=" +  System.currentTimeMillis();
+//            return u;
+//        }
+
         if (TextUtils.isEmpty(url)) {
             return url;
         }
@@ -160,6 +173,8 @@ public class TimestampUtils {
      * 去除url中的timestamp
      */
     public static String removeTimestamp(String url) {
+        if (!url.contains("timestamp")) return url;
+
         int index = url.lastIndexOf("timestamp");
         String params = url.substring(index);
         //连接符

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

@@ -3,216 +3,27 @@ package com.gh.common.util;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
-import android.net.wifi.WifiManager;
-import android.os.Build;
-import android.os.Environment;
 import android.preference.PreferenceManager;
-import android.provider.Settings;
-import android.text.TextUtils;
 
-import com.gh.gamecenter.BuildConfig;
-import com.gh.gamecenter.retrofit.JSONObjectResponse;
-import com.gh.gamecenter.retrofit.Response;
 import com.gh.gamecenter.retrofit.RetrofitManager;
 import com.gh.gamecenter.retrofit.StringResponse;
 import com.lightgame.utils.Util_System_Phone_State;
-import com.lightgame.utils.Utils;
-import com.tencent.stat.StatConfig;
 
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
-import okhttp3.MediaType;
-import okhttp3.RequestBody;
-import okhttp3.ResponseBody;
-import rx.Observable;
 import rx.android.schedulers.AndroidSchedulers;
-import rx.functions.Func1;
 import rx.schedulers.Schedulers;
 
 public class TokenUtils {
 
-    // 注册设备
-    public static synchronized void register(final Context context) {
-        Map<String, String> params = new HashMap<>();
-        params.put("MANUFACTURER", Build.MANUFACTURER);
-        params.put("MODEL", Build.MODEL);
-        params.put("ANDROID_SDK", String.valueOf(Build.VERSION.SDK_INT));
-        params.put("ANDROID_VERSION", Build.VERSION.RELEASE);
-        String android_id = Settings.Secure.getString(context.getContentResolver(), Settings.Secure.ANDROID_ID);
-        if (!TextUtils.isEmpty(android_id)) {
-            params.put("ANDROID_ID", android_id);
-        }
-        String imei = Util_System_Phone_State.getDeviceId(context);
-        if (!TextUtils.isEmpty(imei)) {
-            params.put("IMEI", imei);
-        }
-        WifiManager wm = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
-        String mac = wm.getConnectionInfo().getMacAddress();
-        if (!TextUtils.isEmpty(mac) || !":::::".equals(mac)) {
-            params.put("MAC", mac);
-        } else {
-            SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(context);
-            sp.edit().putBoolean("isUploadMac", false).apply();
-        }
-        String mid = StatConfig.getMid(context);
-        if (!TextUtils.isEmpty(mid) || !"0".equals(mid)) {
-            params.put("MTA_ID", mid);
-        } else {
-            SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(context);
-            sp.edit().putBoolean("isUploadMid", false).apply();
-        }
-        RequestBody body = RequestBody.create(MediaType.parse("application/json"), new JSONObject(params).toString());
-        RetrofitManager.getUser().postRegister(body)
-                .subscribeOn(Schedulers.io())
-                .observeOn(Schedulers.io())
-                .subscribe(new JSONObjectResponse() {
-                    @Override
-                    public void onResponse(JSONObject response) {
-                        if (response.length() != 0) {
-                            try {
-                                // 保存device_id
-                                saveDeviceId(context, response.getString("device_id"));
-                                Utils.log("device_id = " + response.getString("device_id"));
-                            } catch (JSONException e) {
-                                e.printStackTrace();
-                            }
-                        }
-                    }
-                });
-    }
-
-    public static synchronized void saveDeviceId(Context context, String device_id) {
-        saveSharedPreferences(context, device_id);
-        saveDataFile(context, device_id);
-        svaeSDCard(device_id, "/gh-uuid");// SDCard根目录
-        svaeSDCard(device_id, "/system"); // SDCard system目录
-        svaeSDCard(device_id, "/data");   // SDCard data目录
-    }
-
-    //将uuid存到sp
-    private static void saveSharedPreferences(Context context, String device_id) {
-        SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(context);
-        SharedPreferences.Editor edit = sp.edit();
-        edit.putString("uuid", device_id);
-        edit.apply();
-        Utils.log("saveDeviceId", "保存成功SP");
-    }
-
-    //将uuid存到data/data/PackageName/files文件夹下
-    private static void saveDataFile(Context context, String device_id) {
-        FileOutputStream fops;
-        try {
-            fops = context.openFileOutput("uuid", Context.MODE_PRIVATE);
-            fops.write(device_id.getBytes());
-            fops.close();
-            Utils.log("saveDeviceId", "保存成功DataFile");
-        } catch (Exception e) {
-            Utils.log("保存uuid到data/data/PackageName/files文件异常" + e.toString());
-            e.printStackTrace();
-        }
-    }
-
-    //将uuid存到SD卡
-    private static void svaeSDCard(String device_id, String saveDir) {
-        File sdCardDir = Environment.getExternalStorageDirectory();
-        String path = sdCardDir.getPath() + saveDir;
-
-        File file = new File(path);
-        if (!file.exists()) {
-            file.mkdirs();
-        }
-
-        // 判断文件是否存在，存在则删除
-        File uuidFile = new File(path + "/uuid");
-        if (uuidFile.isFile() && uuidFile.exists()) {
-            Utils.log(saveDir + "文件夹里的文件存在，执行删除操作");
-            uuidFile.delete();
-        }
-
-        File writeFile = new File(file, "uuid");
-        FileOutputStream fos;
-        try {
-            fos = new FileOutputStream(writeFile);
-            fos.write(device_id.getBytes());
-            fos.close();
-            Utils.log("saveDeviceId", "保存成功SDCard" + "目录为：" + saveDir);
-        } catch (Exception e) {
-            Utils.log("保存uuid到SDCard异常" + saveDir + e.toString());
-            e.printStackTrace();
-        }
-
-    }
-
-    // 获取用户token
-    public static synchronized Observable<String> getToken(final Context context, boolean isCheck) {
-        String token = null;
-        if (isCheck) {
-            SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(context);
-            token = sp.getString("token", null);
-            if (token != null) {
-                long expire = sp.getLong("token_expire", 0) * 1000 - 10 * 1000;
-                long time = Utils.getTime(context);
-                // 判断token是否过期
-                if (time >= expire) {
-                    // token已过期
-                    token = null;
-                }
-            }
-        }
-        if (token == null) {
-            Map<String, String> params = new HashMap<>();
-            params.put("device_id", getDeviceId(context));
-            return RetrofitManager.getUser()
-                    .postLogin(RequestBody.create(MediaType.parse("application/json"), new JSONObject(params).toString()))
-                    .flatMap(new Func1<ResponseBody, Observable<String>>() {
-                        @Override
-                        public Observable<String> call(ResponseBody responseBody) {
-                            String value = null;
-                            try {
-                                SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(context);
-                                Editor editor = sp.edit();
-                                JSONObject response = new JSONObject(responseBody.string());
-                                editor.putString("user_name", response.getString("name"));
-                                editor.putString("user_icon", response.getString("icon"));
-                                response = response.getJSONObject("token");
-                                editor.putString("token", response.getString("value"));
-                                editor.putLong("token_expire", response.getLong("expire"));
-                                editor.apply();
-                                // 服务器返回的token和本地已存的token相同，更新本地时间
-                                getTime(context);
-                                value = response.getString("value");
-                            } catch (IOException | JSONException e) {
-                                e.printStackTrace();
-                            }
-                            return Observable.just(value);
-                        }
-                    }).onErrorResumeNext(new Func1<Throwable, Observable<? extends String>>() {
-                        @Override
-                        public Observable<? extends String> call(Throwable throwable) {
-                            return Observable.error(throwable);
-                        }
-                    });
-        }
-        return Observable.just(token);
-    }
-
+    // TODO VERSION:3.0 之后不存在deviceId
+    @Deprecated
     public static synchronized String getDeviceId(Context context) {
-        return loadSharedPreferences(context, false);
+        return Util_System_Phone_State.getDeviceId(context); // 暂时用IMEI代替
     }
 
     // 获取服务器时间
     public static synchronized void getTime(Context context) {
         final SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(context);
-        RetrofitManager.getApi().getTime()
+        RetrofitManager.getInstance(context).getApi().getTime()
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new StringResponse() {
@@ -232,118 +43,4 @@ public class TokenUtils {
                 });
     }
 
-    //读取SharedPreferences的uuid
-    private static String loadSharedPreferences(Context context, boolean isCheck) {
-        SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(context);
-        String uuid = sp.getString("uuid", null);
-        if (isCheck) {
-            return uuid;
-        }
-        if (uuid == null) {
-            return loadDataFile(context, false);
-        }
-        if (BuildConfig.DEBUG) {
-            Utils.log("getDeviceId", "获取成功SP" + uuid);
-        }
-        return uuid;
-    }
-
-    //读取data/data/PackageName/files的uuid
-    private static String loadDataFile(Context context, boolean isCheck) {
-        File file = new File(context.getFilesDir(), "uuid");
-        if (file.exists()) {
-            try {
-                FileInputStream fis = new FileInputStream(file);
-                byte[] b = new byte[1024];
-                int count = -1;
-                String uuid = null;
-                while ((count = fis.read(b)) != -1) {
-                    uuid = new String(b, 0, count, "UTF-8");
-                }
-                Utils.log("getDeviceId", "获取成功DataFile" + uuid);
-                return uuid;
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        } else if (!isCheck) {
-            String[] dirName = {"/gh-uuid", "/system", "/data"};
-            for (int i = 0; i < 3; i++) {
-                String s = loadSDCard(dirName[i]);
-                if (s != null) {
-                    return s;
-                }
-            }
-        }
-        return null;
-    }
-
-    //读取SD卡的uuid
-    private static String loadSDCard(String saveDir) {
-        File sdCardDir = Environment.getExternalStorageDirectory();
-        String path = sdCardDir.getPath() + saveDir;
-        File file = new File(path, "uuid");
-        if (file.exists()) {
-            FileInputStream fis;
-            ByteArrayOutputStream bos;
-            try {
-                fis = new FileInputStream(file);
-                bos = new ByteArrayOutputStream();
-                byte[] array = new byte[1024];
-                int len = -1;
-                while ((len = fis.read(array)) != -1) {
-                    bos.write(array, 0, len);
-                }
-                bos.close();
-                fis.close();
-                Utils.log("getDeviceId", "获取成功SDCard" + "目录为：" + saveDir + "::" + bos.toString());
-                return bos.toString();
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-        return null;
-    }
-
-    // 检查设备信息是否已经上传完整
-    public static synchronized void checkDeviceInfo(Context context, String token) {
-        final SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(context);
-        final HashMap<String, String> params = new HashMap<>();
-        if (!sp.getBoolean("isUploadExtra", false)) {
-            params.put("MANUFACTURER", Build.MANUFACTURER);
-            params.put("MODEL", Build.MODEL);
-            params.put("ANDROID_SDK", String.valueOf(Build.VERSION.SDK_INT));
-            params.put("ANDROID_VERSION", Build.VERSION.RELEASE);
-        }
-        if (!sp.getBoolean("isUploadMac", true)) {
-            WifiManager wm = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
-            String mac = wm.getConnectionInfo().getMacAddress();
-            if (!TextUtils.isEmpty(mac) || !":::::".equals(mac)) {
-                params.put("MAC", mac);
-            }
-        }
-        if (!sp.getBoolean("isUploadMid", true)) {
-            String mid = StatConfig.getMid(context);
-            if (!TextUtils.isEmpty(mid) || !"0".equals(mid)) {
-                params.put("MTA_ID", mid);
-            }
-        }
-        if (params.size() != 0) {
-            RequestBody body = RequestBody.create(MediaType.parse("application/json"),
-                    new JSONObject(params).toString());
-            RetrofitManager.getUser().postDevice(token, body, TokenUtils.getDeviceId(context))
-                    .subscribeOn(Schedulers.io())
-                    .observeOn(AndroidSchedulers.mainThread())
-                    .subscribe(new Response<ResponseBody>() {
-                        @Override
-                        public void onResponse(ResponseBody response) {
-                            SharedPreferences.Editor editor = sp.edit();
-                            editor.putBoolean("isUploadExtra", true);
-                            editor.putBoolean("isUploadMac", true);
-                            editor.putBoolean("isUploadMid", true);
-                            editor.apply();
-                        }
-                    });
-        }
-    }
-
 }

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

@@ -30,7 +30,7 @@ public class Concern_LinearLayout extends LinearLayout {
             concern_rv_recommend.setLayoutParams(lparams);
             invalidate();
             if (concern_rv_recommend.getHeight() < height) {
-                postDelayed(show, 10);
+                postDelayed(show, 5);
             } else {
                 concern_iv_delete.setImageResource(R.drawable.concern_down);
             }
@@ -49,7 +49,7 @@ public class Concern_LinearLayout extends LinearLayout {
             concern_rv_recommend.setLayoutParams(lparams);
             invalidate();
             if (concern_rv_recommend.getHeight() > 0) {
-                postDelayed(hide, 10);
+                postDelayed(hide, 5);
             } else {
                 concern_rv_recommend.setVisibility(View.GONE);
                 concern_iv_delete.setImageResource(R.drawable.concern_up);
@@ -60,7 +60,7 @@ public class Concern_LinearLayout extends LinearLayout {
     public Concern_LinearLayout(Context context, AttributeSet attrs) {
         super(context, attrs);
         height = DisplayUtils.dip2px(context, 150);
-        distance = DisplayUtils.dip2px(context, 6);
+        distance = DisplayUtils.dip2px(context, 8);
     }
 
     @Override

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

@@ -73,7 +73,7 @@ public class DownloadDialog implements OnCollectionCallBackListener {
         @Override
         public void onDataChanged(DownloadEntity downloadEntity) {
             if (downloadEntity.getName().equals(gameEntity.getName())
-                    && !"delete".equals(DownloadManager.getInstance(mContext).getStatus(downloadEntity.getUrl()))) {
+                    && !DownloadStatus.delete.equals(DownloadManager.getInstance(mContext).getStatus(downloadEntity.getUrl()))) {
 
                 adapter.putDownloadEntity(downloadEntity);
 
@@ -91,17 +91,14 @@ public class DownloadDialog implements OnCollectionCallBackListener {
     private boolean isLoadPlatform;
 
     private DownloadDialog() {
-    }
-
-    private DownloadDialog(Context context) {
-        mContext = context;
         isShow = false;
     }
 
     public static DownloadDialog getInstance(Context context) {
         if (instance == null) {
-            instance = new DownloadDialog(context);
+            instance = new DownloadDialog();
         }
+        instance.mContext = context; // 每次创建context重新赋值, Dialog持有context问题
         return instance;
     }
 
@@ -234,7 +231,7 @@ public class DownloadDialog implements OnCollectionCallBackListener {
                 String platform = apkEntity.getPlatform();
                 int id = PlatformUtils.getInstance(mContext).getPlatformPic(platform);
                 if (id == 0) {
-                    String path = PlatformUtils.getInstance(mContext).getPlatformPicPath(platform);
+                    String path = PlatformUtils.getInstance(mContext).getPlatformPicUrl(platform);
                     if (path == null) {
                         apkEntity.setOrder(0);
                     }

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

@@ -0,0 +1,106 @@
+package com.gh.common.view;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.text.Editable;
+import android.text.Spannable;
+import android.text.SpannableString;
+import android.text.style.ImageSpan;
+import android.util.AttributeSet;
+
+import java.io.FileOutputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by khy on 14/12/17.
+ */
+
+public class EditorView extends android.support.v7.widget.AppCompatEditText {
+
+    int mEditorWidth;
+
+    List<String> mImgArr = new ArrayList<>();
+
+    public EditorView(Context context) {
+        super(context);
+    }
+
+    public EditorView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public EditorView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    private void insertPicToEt(String picturePath) {
+        Bitmap bitmap = compressPicture(picturePath);
+        if (bitmap == null) return;
+        mImgArr.add(picturePath);
+
+        ImageSpan imageSpan = new ImageSpan(getContext(), bitmap);
+        int index = getSelectionStart();
+        String tempUrl = "<img src=\"" + picturePath + "\" />";
+        SpannableString spannableString = new SpannableString(tempUrl);
+        spannableString.setSpan(imageSpan, 0, tempUrl.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+        Editable editableText = getEditableText();
+        if (index < 0 || index >= editableText.length()) {
+            editableText.append(spannableString);
+        } else {
+            editableText.insert(index, spannableString);
+        }
+        if (bitmap.getWidth() >= mEditorWidth)
+            editableText.insert(index + spannableString.length(), "\n");
+    }
+
+    /**
+     * 压缩图片
+     * 规则：
+     * 1.如果图片大于当前EditText的最大宽度则按比例缩放，使图片宽度和EditText的宽度保持一致 （高度不处理）
+     * 2.如果图片小于当前EditText 由于比例限制 将不处理
+     *
+     * @param srcPath 图片路径
+     * @return
+     */
+    public Bitmap compressPicture(String srcPath) {
+
+        FileOutputStream fos = null;
+        BitmapFactory.Options op = new BitmapFactory.Options();
+
+        // 开始读入图片，此时把options.inJustDecodeBounds 设回true了
+        op.inJustDecodeBounds = true;
+        Bitmap bitmap = BitmapFactory.decodeFile(srcPath, op);
+        op.inJustDecodeBounds = false;
+
+        // 缩放图片的尺寸
+        float w = op.outWidth;
+        float h = op.outHeight;
+        float index = w / h;
+        int width = mEditorWidth;
+        float hh = width / index;
+        float ww = width;
+
+        float be = 1.0f;
+        if (w > h && w > ww / 2) {
+            be = w / ww;
+        } else if (w < h && h > hh/2) {
+            be = h / hh;
+        }
+        if (be <= 0) {
+            be = 1.0f;
+        }
+        op.inSampleSize = (int) be;// 设置缩放比例,这个数字越大,图片大小越小.
+        // 重新读入图片，注意此时已经把options.inJustDecodeBounds 设回false了
+        bitmap = BitmapFactory.decodeFile(srcPath, op);
+        int desWidth = (int) (w / be);
+        int desHeight = (int) (h / be);
+        return Bitmap.createScaledBitmap(bitmap, desWidth, desHeight, true);
+
+    }
+
+    public List<String> getImgArr() {
+        return mImgArr;
+    }
+}

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

@@ -0,0 +1,52 @@
+package com.gh.common.view;
+
+import android.content.Context;
+import android.support.design.widget.AppBarLayout;
+import android.support.design.widget.CoordinatorLayout;
+import android.support.v4.view.ViewCompat;
+import android.util.AttributeSet;
+import android.view.View;
+
+/**
+ * Workaround AppBarLayout.Behavior for https://issuetracker.google.com/66996774
+ *
+ * See https://gist.github.com/chrisbanes/8391b5adb9ee42180893300850ed02f2 for
+ * example usage.
+ *
+ * Change the package name as you wish.
+ */
+public class FixAppBarLayoutBehavior extends AppBarLayout.Behavior {
+
+    public FixAppBarLayoutBehavior() {
+        super();
+    }
+
+    public FixAppBarLayoutBehavior(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    @Override
+    public void onNestedScroll(CoordinatorLayout coordinatorLayout, AppBarLayout child, View target,
+                               int dxConsumed, int dyConsumed, int dxUnconsumed, int dyUnconsumed, int type) {
+        super.onNestedScroll(coordinatorLayout, child, target, dxConsumed, dyConsumed,
+                dxUnconsumed, dyUnconsumed, type);
+        stopNestedScrollIfNeeded(dyUnconsumed, child, target, type);
+    }
+
+    @Override
+    public void onNestedPreScroll(CoordinatorLayout coordinatorLayout, AppBarLayout child,
+            View target, int dx, int dy, int[] consumed, int type) {
+        super.onNestedPreScroll(coordinatorLayout, child, target, dx, dy, consumed, type);
+        stopNestedScrollIfNeeded(dy, child, target, type);
+    }
+
+    private void stopNestedScrollIfNeeded(int dy, AppBarLayout child, View target, int type) {
+        if (type == ViewCompat.TYPE_NON_TOUCH) {
+            final int currOffset = getTopAndBottomOffset();
+            if ((dy < 0 && currOffset == 0)
+                    || (dy > 0 && currOffset == -child.getTotalScrollRange())) {
+                ViewCompat.stopNestedScroll(target, ViewCompat.TYPE_NON_TOUCH);
+            }
+        }
+    }
+}

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

@@ -14,16 +14,20 @@ import android.view.View;
 public class GridDivider extends RecyclerView.ItemDecoration {
     public final int[] ATRRS = new int[]{android.R.attr.listDivider};
     private Drawable mDividerDarwable;
-    private int mDividerHight = 1;
+
     private Paint mColorPaint;
 
+    private int mDividerHight = 1;
+    private int mGridCount;
+
     /*
      int dividerHight  分割线的线宽
      int dividerColor  分割线的颜色
      */
-    public GridDivider(Context context, int dividerHight, int dividerColor) {
+    public GridDivider(Context context, int dividerHight, int gridCount, int dividerColor) {
         this(context);
         mDividerHight = dividerHight;
+        mGridCount = gridCount;
         mColorPaint = new Paint();
         mColorPaint.setColor(dividerColor);
     }
@@ -65,7 +69,7 @@ public class GridDivider extends RecyclerView.ItemDecoration {
             int bottom = 0;
 
             // 最上面一行
-            if ((i / 7) == 0) {
+            if ((i / mGridCount) == 0) {
                 //当前item最上面的分割线
                 top = child.getTop();
                 //当前item下面的分割线
@@ -103,7 +107,7 @@ public class GridDivider extends RecyclerView.ItemDecoration {
             int right = 0;
 
             //左边第一列
-            if ((i % 7) == 0) {
+            if ((i % mGridCount) == 0) {
                 //item左边分割线
                 left = child.getLeft();
                 right = left + mDividerHight;

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

@@ -44,7 +44,7 @@ public class RadarView extends View {
     }
 
     /**
-     * TODO<提前初始化好需要使用的对象,避免在绘制过程中多次初始化>
+     * 提前初始化好需要使用的对象,避免在绘制过程中多次初始化
      *
      * @return void
      */
@@ -58,7 +58,6 @@ public class RadarView extends View {
      */
     @Override
     protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-        // TODO Auto-generated method stub
         super.onMeasure(widthMeasureSpec, heightMeasureSpec);
 
         // 获取控件区域宽高
@@ -131,7 +130,7 @@ public class RadarView extends View {
     }
 
     /**
-     * TODO<设置扫描状态>
+     * 设置扫描状态
      *
      * @return void
      */
@@ -141,7 +140,7 @@ public class RadarView extends View {
     }
 
     /**
-     * TODO<解析获取控件宽高>
+     * 解析获取控件宽高
      *
      * @return int
      */

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

@@ -0,0 +1,490 @@
+package com.gh.common.view;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.Bitmap;
+import android.graphics.drawable.Drawable;
+import android.os.Build;
+import android.text.TextUtils;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.Gravity;
+import android.webkit.WebChromeClient;
+import android.webkit.WebView;
+import android.webkit.WebViewClient;
+
+import com.gh.common.util.AskUtils;
+import com.gh.common.util.NetworkUtils;
+import com.gh.common.util.RichEditorUtils;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.net.URLEncoder;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+
+/**
+ * Copyright (C) 2017 Wasabeef
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+public class RichEditor extends WebView {
+
+    public enum Type {
+        BOLD,
+        ITALIC,
+        SUBSCRIPT,
+        SUPERSCRIPT,
+        STRIKETHROUGH,
+        UNDERLINE,
+        H1,
+        H2,
+        H3,
+        H4,
+        H5,
+        H6,
+        ORDEREDLIST,
+        UNORDEREDLIST,
+        JUSTIFYCENTER,
+        JUSTIFYFULL,
+        JUSTUFYLEFT,
+        JUSTIFYRIGHT
+    }
+
+    public interface OnTextChangeListener {
+
+        void onTextChange(String text);
+    }
+
+    public interface OnDecorationStateListener {
+
+        void onStateChangeListener(String text, List<Type> types);
+    }
+
+    public interface AfterInitialLoadListener {
+
+        void onAfterInitialLoad(boolean isReady);
+    }
+
+    private static final String SETUP_HTML = "file:///android_asset/editor.html";
+    private static final String CALLBACK_SCHEME = "re-callback://";
+    private static final String STATE_SCHEME = "re-state://";
+    private boolean isReady = false;
+    private String mContents;
+    private OnTextChangeListener mTextChangeListener;
+    private OnDecorationStateListener mDecorationStateListener;
+    private AfterInitialLoadListener mLoadListener;
+
+    public RichEditor(Context context) {
+        this(context, null);
+    }
+
+    public RichEditor(Context context, AttributeSet attrs) {
+        this(context, attrs, android.R.attr.webViewStyle);
+    }
+
+    @SuppressLint("SetJavaScriptEnabled")
+    public RichEditor(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+
+        setVerticalScrollBarEnabled(false);
+        setHorizontalScrollBarEnabled(false);
+        getSettings().setJavaScriptEnabled(true);
+        setWebChromeClient(new WebChromeClient());
+        setWebViewClient(createWebviewClient());
+        loadUrl(SETUP_HTML);
+
+        applyAttributes(context, attrs);
+    }
+
+    protected EditorWebViewClient createWebviewClient() {
+        return new EditorWebViewClient();
+    }
+
+    public void setOnTextChangeListener(OnTextChangeListener listener) {
+        mTextChangeListener = listener;
+    }
+
+    public void setOnDecorationChangeListener(OnDecorationStateListener listener) {
+        mDecorationStateListener = listener;
+    }
+
+    public void setOnInitialLoadListener(AfterInitialLoadListener listener) {
+        mLoadListener = listener;
+    }
+
+    private void callback(String text) {
+        mContents = text.replaceFirst(CALLBACK_SCHEME, "");
+        if (mTextChangeListener != null) {
+            mTextChangeListener.onTextChange(mContents);
+        }
+    }
+
+    private void stateCheck(String text) {
+        String state = text.replaceFirst(STATE_SCHEME, "").toUpperCase(Locale.ENGLISH);
+        List<Type> types = new ArrayList<>();
+        for (Type type : Type.values()) {
+            if (TextUtils.indexOf(state, type.name()) != -1) {
+                types.add(type);
+            }
+        }
+
+        if (mDecorationStateListener != null) {
+            mDecorationStateListener.onStateChangeListener(state, types);
+        }
+    }
+
+    private void applyAttributes(Context context, AttributeSet attrs) {
+        final int[] attrsArray = new int[]{
+                android.R.attr.gravity
+        };
+        TypedArray ta = context.obtainStyledAttributes(attrs, attrsArray);
+
+        int gravity = ta.getInt(0, NO_ID);
+        switch (gravity) {
+            case Gravity.LEFT:
+                exec("javascript:RE.setTextAlign(\"left\")");
+                break;
+            case Gravity.RIGHT:
+                exec("javascript:RE.setTextAlign(\"right\")");
+                break;
+            case Gravity.TOP:
+                exec("javascript:RE.setVerticalAlign(\"top\")");
+                break;
+            case Gravity.BOTTOM:
+                exec("javascript:RE.setVerticalAlign(\"bottom\")");
+                break;
+            case Gravity.CENTER_VERTICAL:
+                exec("javascript:RE.setVerticalAlign(\"middle\")");
+                break;
+            case Gravity.CENTER_HORIZONTAL:
+                exec("javascript:RE.setTextAlign(\"center\")");
+                break;
+            case Gravity.CENTER:
+                exec("javascript:RE.setVerticalAlign(\"middle\")");
+                exec("javascript:RE.setTextAlign(\"center\")");
+                break;
+        }
+
+        ta.recycle();
+    }
+
+    public void setHtml(String contents, boolean isLoadTbImage) {
+        if (contents == null) {
+            contents = "";
+        }
+        try {
+            exec("javascript:RE.setHtml('" + URLEncoder.encode(contents, "UTF-8") + "');");
+
+            if (isLoadTbImage && !NetworkUtils.isWifiConnected(getContext())) {
+                exec("javascript:RE.replaceTbImage()");
+            }
+
+            exec("javascript:RE.ImageClickListener()");
+
+            callback(contents);
+        } catch (UnsupportedEncodingException e) {
+            // No handling
+        }
+        mContents = contents;
+    }
+
+//    public void replaceTbImage() {
+//        exec("javascript:RE.replaceTbImage()");
+//    }
+
+    public String getHtml() {
+        return mContents;
+    }
+
+    public void setEditorFontColor(int color) {
+        String hex = convertHexColorString(color);
+        exec("javascript:RE.setBaseTextColor('" + hex + "');");
+    }
+
+    public void setEditorFontSize(int px) {
+        exec("javascript:RE.setBaseFontSize('" + px + "px');");
+    }
+
+    @Override
+    public void setPadding(int left, int top, int right, int bottom) {
+        super.setPadding(left, top, right, bottom);
+        exec("javascript:RE.setPadding('" + left + "px', '" + top + "px', '" + right + "px', '" + bottom
+                + "px');");
+    }
+
+    @Override
+    public void setPaddingRelative(int start, int top, int end, int bottom) {
+        // still not support RTL.
+        setPadding(start, top, end, bottom);
+    }
+
+    public void setEditorBackgroundColor(int color) {
+        setBackgroundColor(color);
+    }
+
+    @Override
+    public void setBackgroundColor(int color) {
+        super.setBackgroundColor(color);
+    }
+
+    @Override
+    public void setBackgroundResource(int resid) {
+        Bitmap bitmap = RichEditorUtils.decodeResource(getContext(), resid);
+        String base64 = RichEditorUtils.toBase64(bitmap);
+        bitmap.recycle();
+
+        exec("javascript:RE.setBackgroundImage('url(data:image/png;base64," + base64 + ")');");
+    }
+
+    @Override
+    public void setBackground(Drawable background) {
+        Bitmap bitmap = RichEditorUtils.toBitmap(background);
+        String base64 = RichEditorUtils.toBase64(bitmap);
+        bitmap.recycle();
+
+        exec("javascript:RE.setBackgroundImage('url(data:image/png;base64," + base64 + ")');");
+    }
+
+    public void setBackground(String url) {
+        exec("javascript:RE.setBackgroundImage('url(" + url + ")');");
+    }
+
+    public void setEditorWidth(int px) {
+        exec("javascript:RE.setWidth('" + px + "px');");
+    }
+
+    public void setEditorHeight(int px) {
+        exec("javascript:RE.setHeight('" + px + "px');");
+    }
+
+    public void setPlaceholder(String placeholder) {
+        exec("javascript:RE.setPlaceholder('" + placeholder + "');");
+    }
+
+    public void setEditorFocus() {
+        exec("javascript:RE.setEditorFocus();");
+    }
+
+    public void setInputEnabled(Boolean inputEnabled) {
+        exec("javascript:RE.setInputEnabled(" + inputEnabled + ")");
+    }
+
+    public void replaceAllDfImage() {
+        exec("javascript:RE.replaceAllDfImage()");
+    }
+
+    public void setFocusByEnd() {
+        exec("javascript:RE.setFocusByEnd()");
+    }
+
+    public void replaceDfImageByUrl(String imgUrl) {
+        exec("javascript:RE.replaceDfImageByUrl('" + imgUrl + "');");
+    }
+
+    public void loadCSS(String cssFile) {
+        String jsCSSImport = "(function() {" +
+                "    var head  = document.getElementsByTagName(\"head\")[0];" +
+                "    var link  = document.createElement(\"link\");" +
+                "    link.rel  = \"stylesheet\";" +
+                "    link.type = \"text/css\";" +
+                "    link.href = \"" + cssFile + "\";" +
+                "    link.media = \"all\";" +
+                "    head.appendChild(link);" +
+                "}) ();";
+        exec("javascript:" + jsCSSImport + "");
+    }
+
+    public void undo() {
+        exec("javascript:RE.undo();");
+    }
+
+    public void redo() {
+        exec("javascript:RE.redo();");
+    }
+
+    public void setBold() {
+        exec("javascript:RE.setBold();");
+    }
+
+    public void setItalic() {
+        exec("javascript:RE.setItalic();");
+    }
+
+    public void setSubscript() {
+        exec("javascript:RE.setSubscript();");
+    }
+
+    public void setSuperscript() {
+        exec("javascript:RE.setSuperscript();");
+    }
+
+    public void setStrikeThrough() {
+        exec("javascript:RE.setStrikeThrough();");
+    }
+
+    public void setUnderline() {
+        exec("javascript:RE.setUnderline();");
+    }
+
+    public void setTextColor(int color) {
+        exec("javascript:RE.prepareInsert();");
+
+        String hex = convertHexColorString(color);
+        exec("javascript:RE.setTextColor('" + hex + "');");
+    }
+
+    public void setTextBackgroundColor(int color) {
+        exec("javascript:RE.prepareInsert();");
+
+        String hex = convertHexColorString(color);
+        exec("javascript:RE.setTextBackgroundColor('" + hex + "');");
+    }
+
+    public void setFontSize(int fontSize) {
+        if (fontSize > 7 || fontSize < 1) {
+            Log.e("RichEditor", "Font size should have a value between 1-7");
+        }
+        exec("javascript:RE.setFontSize('" + fontSize + "');");
+    }
+
+    public void removeFormat() {
+        exec("javascript:RE.removeFormat();");
+    }
+
+    public void setHeading(int heading) {
+        exec("javascript:RE.setHeading('" + heading + "');");
+    }
+
+    public void setIndent() {
+        exec("javascript:RE.setIndent();");
+    }
+
+    public void setOutdent() {
+        exec("javascript:RE.setOutdent();");
+    }
+
+    public void setAlignLeft() {
+        exec("javascript:RE.setJustifyLeft();");
+    }
+
+    public void setAlignCenter() {
+        exec("javascript:RE.setJustifyCenter();");
+    }
+
+    public void setAlignRight() {
+        exec("javascript:RE.setJustifyRight();");
+    }
+
+    public void setBlockquote() {
+        exec("javascript:RE.setBlockquote();");
+    }
+
+    public void setBullets() {
+        exec("javascript:RE.setBullets();");
+    }
+
+    public void setNumbers() {
+        exec("javascript:RE.setNumbers();");
+    }
+
+    public void insertImage(String url) {
+        exec("javascript:RE.prepareInsert();");
+        exec("javascript:RE.insertImage('" + url + "');");
+    }
+
+    public void insertLink(String href, String title) {
+        exec("javascript:RE.prepareInsert();");
+        exec("javascript:RE.insertLink('" + href + "', '" + title + "');");
+    }
+
+    public void insertTodo() {
+        exec("javascript:RE.prepareInsert();");
+        exec("javascript:RE.setTodo('" + RichEditorUtils.getCurrentTime() + "');");
+    }
+
+    public void focusEditor() {
+        requestFocus();
+        exec("javascript:RE.focus();");
+    }
+
+    public void clearFocusEditor() {
+        exec("javascript:RE.blurFocus();");
+    }
+
+
+    public String getText() {
+        return AskUtils.stripHtml(mContents);
+    }
+
+
+    private String convertHexColorString(int color) {
+        return String.format("#%06X", (0xFFFFFF & color));
+    }
+
+    protected void exec(final String trigger) {
+        if (isReady) {
+            load(trigger);
+        } else {
+            postDelayed(new Runnable() {
+                @Override
+                public void run() {
+                    exec(trigger);
+                }
+            }, 100);
+        }
+    }
+
+    private void load(String trigger) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+            evaluateJavascript(trigger, null);
+        } else {
+            loadUrl(trigger);
+        }
+    }
+
+    protected class EditorWebViewClient extends WebViewClient {
+
+        @Override
+        public void onPageFinished(WebView view, String url) {
+            isReady = url.equalsIgnoreCase(SETUP_HTML);
+            if (mLoadListener != null) {
+                mLoadListener.onAfterInitialLoad(isReady);
+            }
+        }
+
+        @Override
+        public boolean shouldOverrideUrlLoading(WebView view, String url) {
+            String decode;
+            try {
+                decode = URLDecoder.decode(url, "UTF-8");
+            } catch (UnsupportedEncodingException e) {
+                // No handling
+                return false;
+            }
+
+            if (TextUtils.indexOf(url, CALLBACK_SCHEME) == 0) {
+                callback(decode);
+                return true;
+            } else if (TextUtils.indexOf(url, STATE_SCHEME) == 0) {
+                stateCheck(decode);
+                return true;
+            }
+
+            return super.shouldOverrideUrlLoading(view, url);
+        }
+    }
+}

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

@@ -0,0 +1,226 @@
+package com.gh.common.view;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.RectF;
+import android.graphics.drawable.Drawable;
+import android.support.design.widget.TabLayout;
+import android.support.v4.view.ViewCompat;
+import android.support.v4.view.ViewPager;
+import android.util.AttributeSet;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.ViewTreeObserver;
+
+import com.gh.common.util.DisplayUtils;
+import com.gh.gamecenter.R;
+import com.lightgame.config.CommonDebug;
+import com.lightgame.utils.Utils;
+
+
+/**
+ * Created by khy on 2/12/17.
+ */
+
+public class TabIndicatorView extends View implements TabLayout.OnTabSelectedListener, ViewPager.OnPageChangeListener {
+
+    private TabLayout mTabLayout;
+    private ViewPager mViewPager;
+
+    private int mIndicatorSpace;
+
+    private int mIndicatorHeight;
+
+    private int mIndicatorWidth;
+
+
+    public TabIndicatorView(Context context) {
+        this(context, null);
+    }
+
+    public TabIndicatorView(Context context, AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public TabIndicatorView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+        mIndicatorHeight = MeasureSpec.getSize(heightMeasureSpec);
+    }
+
+    public void setupWithTabLayout(final TabLayout tableLayout) {
+        mTabLayout = tableLayout;
+
+
+        tableLayout.setSelectedTabIndicatorColor(Color.TRANSPARENT);
+        tableLayout.setOnTabSelectedListener(this);
+
+
+        tableLayout.getViewTreeObserver().addOnScrollChangedListener(new ViewTreeObserver.OnScrollChangedListener() {
+            @Override
+            public void onScrollChanged() {
+                if (mTabLayout.getScrollX() != getScrollX())
+                    scrollTo(mTabLayout.getScrollX(), mTabLayout.getScrollY());
+            }
+        });
+
+        ViewCompat.setElevation(this, ViewCompat.getElevation(mTabLayout));
+        tableLayout.post(new Runnable() {
+            @Override
+            public void run() {
+                if (mTabLayout.getTabCount() > 0)
+                    onTabSelected(mTabLayout.getTabAt(0));
+
+            }
+        });
+
+        //清除Tab background
+        for (int tab = 0; tab < tableLayout.getTabCount(); tab++) {
+            View tabView = getTabViewByPosition(tab);
+            if (tabView != null) tabView.setBackgroundResource(0);
+        }
+    }
+
+    public void setupWithViewPager(ViewPager viewPager) {
+        mViewPager = viewPager;
+        viewPager.addOnPageChangeListener(this);
+    }
+
+    public void setIndicatorWidth(int width) {
+        this.mIndicatorWidth = DisplayUtils.dip2px(getContext(), width);
+    }
+
+    public void setIndicatorSpace(int space) {
+        this.mIndicatorSpace = DisplayUtils.dip2px(getContext(), space);
+    }
+
+    private int getIndicatorSpace() {
+        if (mIndicatorSpace != 0) return mIndicatorSpace;
+        if (mIndicatorWidth != 0) {
+            View tag = getTabViewByPosition(0);
+            if (tag != null) return (tag.getWidth() - mIndicatorWidth) / 2;
+        }
+        return 0;
+    }
+
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        super.onDraw(canvas);
+        Drawable drawable = getResources().getDrawable(R.drawable.ask_tab_indicator_bg); // 固定Indicator背景 有需要可以自行更改
+        drawable.setBounds(l, t, r, b);
+        drawable.draw(canvas);
+    }
+
+    int l;
+    int t;
+    int r;
+    int b;
+
+    private void generatePath(int position, float positionOffset) {
+
+        RectF range = new RectF();
+        View tabView = getTabViewByPosition(position);
+
+        if (tabView == null)
+            return;
+
+        int left, top, right, bottom;
+        left = top = right = bottom = 0;
+
+        if (positionOffset > 0.f && position < mTabLayout.getTabCount() - 1) {
+            View nextTabView = getTabViewByPosition(position + 1);
+            if (nextTabView != null) {
+                left += (int) (nextTabView.getLeft() * positionOffset + tabView.getLeft() * (1.f - positionOffset));
+                right += (int) (nextTabView.getRight() * positionOffset + tabView.getRight() * (1.f - positionOffset));
+            }
+
+            left += getIndicatorSpace();
+            right -= getIndicatorSpace();
+            top = tabView.getTop() + getPaddingTop();
+            bottom = tabView.getBottom() - getPaddingBottom();
+            range.set(left, top, right, bottom);
+        } else {
+
+            left = tabView.getLeft() + getIndicatorSpace();
+            right = tabView.getRight() - getIndicatorSpace();
+            top = tabView.getTop() + getPaddingTop();
+            bottom = tabView.getBottom() - getPaddingBottom();
+            range.set(left, top, right, bottom);
+
+            if (range.isEmpty())
+                return;
+        }
+        r = right;
+        l = left;
+        t = top;
+        b = top + mIndicatorHeight;
+    }
+
+    private View getTabViewByPosition(int position) {
+        if (mTabLayout != null && mTabLayout.getTabCount() > 0) {
+            ViewGroup tabStrip = (ViewGroup) mTabLayout.getChildAt(0);
+            return tabStrip != null ? tabStrip.getChildAt(position) : null;
+        }
+
+        return null;
+    }
+
+
+    @Override
+    public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
+        generatePath(position, positionOffset);
+        invalidate();
+    }
+
+    @Override
+    public void onPageSelected(int position) {
+        if (mTabLayout.getSelectedTabPosition() != position) {
+            TabLayout.Tab tab = mTabLayout.getTabAt(position);
+            if (tab != null) tab.select();
+        }
+
+    }
+
+
+    @Override
+    public void onPageScrollStateChanged(int state) {
+
+    }
+
+    /**
+     * 当已经有一个ViewPager后，当TabLayout的tab改变的时候在onTabSelected方法直接调用ViewPager的
+     * setCurrentItem方法调用这个方法后会触发ViewPager的scroll事件也就是在onPageScrolled方法中调用
+     * generatePath方法来更新Path，如果没有ViewPager的话直接在onTabSelected的方法中调用generatePath
+     * 方法。
+     **/
+    @Override
+    public void onTabSelected(TabLayout.Tab tab) {
+        if (mViewPager != null) {
+            if (CommonDebug.IS_DEBUG) {
+                Utils.log("onTabSelected : TabPosition=>" + tab.getPosition()
+                        + "  ViewPagerCount=>" + mViewPager.getAdapter().getCount());
+            }
+            if (tab.getPosition() != mViewPager.getCurrentItem())
+                mViewPager.setCurrentItem(tab.getPosition());
+        } else {
+            generatePath(tab.getPosition(), 0);
+            invalidate();
+        }
+    }
+
+    @Override
+    public void onTabUnselected(TabLayout.Tab tab) {
+
+    }
+
+    @Override
+    public void onTabReselected(TabLayout.Tab tab) {
+
+    }
+}

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

@@ -15,13 +15,13 @@ public class VerticalItemDecoration extends RecyclerView.ItemDecoration {
 
     private Paint paint;
     private int mInterval = 0;
-    private boolean isShowIntervalTop;
+    private boolean mIsShowIntervalTop;
 
     public VerticalItemDecoration(Context context, int interval, boolean isShowIntervalTop) {
         paint = new Paint();
         paint.setColor(ContextCompat.getColor(context, R.color.background));
         mInterval = DisplayUtils.dip2px(context, interval);
-        this.isShowIntervalTop = isShowIntervalTop;
+        mIsShowIntervalTop = isShowIntervalTop;
     }
 
     @Override
@@ -35,7 +35,7 @@ public class VerticalItemDecoration extends RecyclerView.ItemDecoration {
             int top = child.getBottom() + layoutParams.bottomMargin;
             int bottom = top + mInterval;
 
-            if (i == 0 && isShowIntervalTop) {
+            if (i == 0 && mIsShowIntervalTop) {
                 c.drawRect(left, 0, right, bottom, paint);
             } else {
                 c.drawRect(left, top, right, bottom, paint);
@@ -47,7 +47,7 @@ public class VerticalItemDecoration extends RecyclerView.ItemDecoration {
     public void getItemOffsets(Rect outRect, View view, RecyclerView parent,
                                RecyclerView.State state) {
         int position = parent.getChildPosition(view);
-        if (position == 0 && isShowIntervalTop) {
+        if (position == 0 && mIsShowIntervalTop) {
             outRect.set(0, mInterval, 0, mInterval);
         } else {
             outRect.set(0, 0, 0, mInterval);

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

@@ -8,7 +8,6 @@ import android.os.Looper;
 import android.os.Message;
 import android.preference.PreferenceManager;
 import android.support.v4.util.ArrayMap;
-import android.widget.Toast;
 
 import com.gh.common.util.AppDebugConfig;
 import com.gh.common.util.DataCollectionUtils;
@@ -19,6 +18,7 @@ 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.lightgame.config.CommonDebug;
 import com.lightgame.download.ConnectionUtils;
 import com.lightgame.download.DataChanger;
 import com.lightgame.download.DataWatcher;
@@ -52,10 +52,7 @@ public class DownloadManager implements DownloadStatusListener {
     private ArrayMap<String, LinkedBlockingQueue<String>> platformMap;
     private ArrayMap<String, ArrayMap<String, DownloadEntity>> gameMap;
 
-    /**
-     * TODO change to {@link DownloadStatus}
-     */
-    private ArrayMap<String, String> statusMap;
+    private ArrayMap<String, DownloadStatus> statusMap;
     private ArrayMap<String, DownloadEntity> downloadingMap;
 
     private DownloadDao mDownloadDao;
@@ -69,7 +66,7 @@ public class DownloadManager implements DownloadStatusListener {
 
         DownloadNotification.showDownloadingNotification(mContext);
 
-        DownloadManager.getInstance(mContext).putStatus(entity.getUrl(), "delete");
+        DownloadManager.getInstance(mContext).putStatus(entity.getUrl(), DownloadStatus.delete);
 
         downloadingMap.remove(entity.getUrl());
     }
@@ -131,12 +128,13 @@ public class DownloadManager implements DownloadStatusListener {
                 String url = (String) msg.obj;
                 switch (msg.what) {
                     case DownloadConfig.CONTINUE_DOWNLOAD_TASK:
-                        if (System.currentTimeMillis() - lastTimeMap.get(url) >= 1000) {
-                            resume(url);
+                        if (lastTimeMap.get(url) != null && System.currentTimeMillis() - lastTimeMap.get(url) >= 1000) {
+                            DownloadEntity downloadEntity = getDownloadEntityByUrl(url);
+                            if (downloadEntity != null) add(downloadEntity);
                         }
                         break;
                     case DownloadConfig.PAUSE_DOWNLOAD_TASK:
-                        if (System.currentTimeMillis() - lastTimeMap.get(url) >= 1000) {
+                        if (lastTimeMap.get(url) != null && System.currentTimeMillis() - lastTimeMap.get(url) >= 1000) {
                             pause(url);
                         }
                         break;
@@ -156,7 +154,7 @@ public class DownloadManager implements DownloadStatusListener {
 
         List<DownloadEntity> list = getAll();
         for (DownloadEntity downloadEntity : list) {
-            statusMap.put(downloadEntity.getUrl(), downloadEntity.getStatus().name());
+            statusMap.put(downloadEntity.getUrl(), downloadEntity.getStatus());
             if (!DownloadStatus.done.equals(downloadEntity.getStatus())) {
                 downloadingMap.put(downloadEntity.getUrl(), downloadEntity);
             }
@@ -221,6 +219,7 @@ public class DownloadManager implements DownloadStatusListener {
         downloadEntity.setGameId(gameEntity.getId());
         downloadEntity.setEntrance(entrance);
         downloadEntity.setLocation(location);
+        downloadEntity.setVersionName(apkEntity.getVersion());
         int installed = 0;
         for (ApkEntity apk : gameEntity.getApk()) {
             if (PackageManager.isInstalled(apk.getPackageName())) {
@@ -228,9 +227,9 @@ public class DownloadManager implements DownloadStatusListener {
             }
         }
         downloadEntity.setInstalled(installed);
-        if (method.equals("更新")) {
+        if ("更新".equals(method)) {
             downloadEntity.setUpdate(true);
-        } else if (method.equals("插件化")) {
+        } else if ("插件化".equals(method)) {
             downloadEntity.setPluggable(true);
         }
         downloadEntity.setPlugin(gameEntity.getTag() != null && gameEntity.getTag().size() != 0);
@@ -242,7 +241,7 @@ public class DownloadManager implements DownloadStatusListener {
         }
 
         //TODO remove
-        DownloadManager.getInstance(context).putStatus(downloadEntity.getUrl(), "downloading");
+        DownloadManager.getInstance(context).putStatus(downloadEntity.getUrl(), DownloadStatus.downloading);
 
         // 收集下载数据
         DataCollectionUtils.uploadDownload(context, downloadEntity, "开始");
@@ -264,7 +263,7 @@ public class DownloadManager implements DownloadStatusListener {
                 mContext.startService(getIntent(downloadEntity, DownloadStatus.add));
             }
             put(url, System.currentTimeMillis());
-            putStatus(url, DownloadStatus.downloading.name());
+            putStatus(url, DownloadStatus.downloading);
         }
         Utils.log(DownloadManager.class.getSimpleName(), "add");
     }
@@ -387,7 +386,9 @@ public class DownloadManager implements DownloadStatusListener {
      * @return null表示没有下载任务
      */
     public List<DownloadEntity> getAll() {
-        Utils.log(DownloadManager.class.getSimpleName(), "getAll");
+        if (CommonDebug.IS_DEBUG) {
+            CommonDebug.logMethodName(this);
+        }
         return mDownloadDao.getAll();
     }
 
@@ -395,16 +396,16 @@ public class DownloadManager implements DownloadStatusListener {
         return gameMap.get(name);
     }
 
-    void putStatus(String url, String status) {
+    private void putStatus(String url, DownloadStatus status) {
         statusMap.put(url, status);
         onTaskStatusChanged(getDownloadEntityByUrl(url));
     }
 
-    public String getStatus(String url) {
+    public DownloadStatus getStatus(String url) {
         return statusMap.get(url);
     }
 
-    public ArrayMap<String, String> getStatusMap() {
+    public ArrayMap<String, DownloadStatus> getStatusMap() {
         return statusMap;
     }
 
@@ -412,32 +413,6 @@ public class DownloadManager implements DownloadStatusListener {
         mHandler.sendMessageDelayed(msg, delayMillis);
     }
 
-    /**
-     * 根据url恢复下载  //TODO 这个可以删除的，全都在add判断，add的时候不需要关注任务真实状态
-     *
-     * @param url
-     */
-    @Deprecated
-    void resume(String url) {
-        DownloadEntity entry = getDownloadEntityByUrl(url);
-
-        // 暂停任务后，把文件删除，然后点继续，文件不存在，需要重新加入下载队列进行下载
-        if (checkDownloadEntryRecordValidate(url)) {
-            Toast.makeText(mContext, "文件不存在！已重新加入下载队列", Toast.LENGTH_SHORT).show();
-            add(entry);
-        } else {
-            if (entry != null) {
-                if (isFileCompleted(url)) {
-                    entry.setStatus(DownloadStatus.done);
-                    DataChanger.INSTANCE.notifyDataChanged(entry);
-                } else if (!isTaskDownloading(url)) {
-                    mContext.startService(getIntent(entry, DownloadStatus.resume));
-                }
-            }
-        }
-        Utils.log(DownloadManager.class.getSimpleName(), "resume");
-    }
-
     /**
      * 根据url取消下载，并删除已下载的文件
      *
@@ -504,7 +479,7 @@ public class DownloadManager implements DownloadStatusListener {
         if (entry != null) {
             mContext.startService(getIntent(entry, DownloadStatus.pause));
             put(url, System.currentTimeMillis());
-            statusMap.put(url, DownloadStatus.pause.name());
+            statusMap.put(url, DownloadStatus.pause);
         }
         Utils.log(DownloadManager.class.getSimpleName(), "pause");
     }

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

@@ -8,6 +8,7 @@ import android.content.Intent;
 import android.support.v4.app.NotificationCompat;
 
 import com.gh.common.util.AppDebugConfig;
+import com.gh.common.util.EntranceUtils;
 import com.gh.common.util.PlatformUtils;
 import com.gh.gamecenter.R;
 import com.lightgame.download.DownloadEntity;
@@ -37,9 +38,9 @@ public class DownloadNotification {
     public static void showDownloadDoneNotification(Context context, DownloadEntity downloadEntity) {
         final NotificationManager manager = getNotificationManager(context);
         Intent intent = new Intent();
-        intent.putExtra("path", downloadEntity.getPath());
+        intent.putExtra(EntranceUtils.KEY_PATH, downloadEntity.getPath());
         intent.setAction(ACTION_INSTALL);
-        final int requestCode = downloadEntity.getUrl().hashCode();
+        final int requestCode = downloadEntity.getPackageName().hashCode();
         final PendingIntent pendingIntent = PendingIntent.getBroadcast(context, requestCode, intent, PendingIntent.FLAG_UPDATE_CURRENT);
         String text;
         String title;

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

@@ -2,94 +2,23 @@ package com.gh.gamecenter;
 
 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.view.View;
-import android.widget.ProgressBar;
-import android.widget.RelativeLayout;
-import android.widget.TextView;
 
-import com.gh.base.BaseActivity;
-import com.gh.common.util.PackageUtils;
-import com.gh.common.util.StringUtils;
-import com.gh.gamecenter.manager.UpdateManager;
-
-import java.lang.ref.WeakReference;
-
-import butterknife.BindView;
-import butterknife.OnClick;
+import com.halo.assistant.fragment.AboutFragment;
 
 /**
  * Created by khy on 2017/2/28.
  */
-public class AboutActivity extends BaseActivity {
-
-    @BindView(R.id.about_version_tv)
-    TextView mAboutVersion;
-    @BindView(R.id.setting_rl_update)
-    RelativeLayout mAboutUpdateRl;
-    @BindView(R.id.about_version_pb)
-    ProgressBar mAboutPb;
-
-    private Handler handler = new MyHandler(this);
+@Deprecated
+public class AboutActivity extends NormalActivity {
 
     @NonNull
     public static Intent getIntent(Context context) {
-        Intent intent = new Intent(context, AboutActivity.class);
-        return intent;
+
+//        return new IntentFactory.Builder(context)
+//                .setActivity(AboutActivity.class)
+//                .setFragment(AboutFragment.class).build();
+        return getIntent(context, AboutFragment.class);
     }
 
-    @Override
-    protected int getLayoutId() {
-        return R.layout.activity_about;
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        initTitle(getString(R.string.title_about));
-
-        ((TextView) findViewById(R.id.about_tv_version)).setText("V" + PackageUtils.getVersionName(this));
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        handler.removeCallbacksAndMessages(null);
-    }
-
-    @OnClick({R.id.about_shengming, R.id.setting_rl_update})
-    public void OnClick(View view) {
-        if (view.getId() == R.id.setting_rl_update) {
-            UpdateManager.getInstance(AboutActivity.this).checkUpdate(false, handler); // 检出更新
-        } else if (view.getId() == R.id.about_shengming) {
-            Intent intent = WebActivity.getWebIntent(this);
-            startActivity(intent);
-        }
-    }
-
-    private static class MyHandler extends Handler {
-
-        private WeakReference<AboutActivity> mWeakReference;
-
-        public MyHandler(AboutActivity activity) {
-            mWeakReference = new WeakReference<>(activity);
-        }
-
-        @Override
-        public void handleMessage(Message msg) {
-            super.handleMessage(msg);
-            final AboutActivity activity = mWeakReference.get();
-            if (activity != null) {
-                if (msg.what == 0) {
-                    final String version = (String) msg.obj;
-                    activity.mAboutVersion.setText(StringUtils.buildString("发现新版本 V", version));
-                } else if (msg.what == 1) {
-                    activity.mAboutVersion.setText("已是最新版本");
-                }
-            }
-        }
-    }
 }

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

@@ -0,0 +1,130 @@
+package com.gh.gamecenter;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.Message;
+import android.text.Editable;
+import android.text.TextWatcher;
+import android.view.KeyEvent;
+import android.view.View;
+import android.view.inputmethod.EditorInfo;
+import android.widget.EditText;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.gh.base.BaseActivity;
+import com.gh.common.util.CheckLoginUtils;
+import com.gh.common.util.EntranceUtils;
+import com.gh.gamecenter.ask.QuestionsEditFragment;
+import com.gh.gamecenter.ask.search.AskSearchFragment;
+import com.lightgame.utils.Util_System_Keyboard;
+
+import butterknife.BindView;
+import butterknife.OnClick;
+
+/**
+ * Created by khy on 8/12/17.
+ */
+
+public class AskSearchActivity extends BaseActivity {
+
+    @BindView(R.id.etSearch)
+    EditText mSearchEt;
+    @BindView(R.id.ivDeleteText)
+    ImageView mSearchCancel;
+    @BindView(R.id.btnQuestions)
+    View mQuestionsBtn;
+
+    private AskSearchFragment mAskSearchFragment;
+
+    private String mSearchKey;
+
+    public static Intent getIntent(Context context) {
+        return new Intent(context, AskSearchActivity.class);
+    }
+
+    @Override
+    protected void handleMessage(Message msg) {
+        if (msg.what == 1) search();
+    }
+
+    @Override
+    protected int getLayoutId() {
+        return R.layout.activity_ask_search;
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        mAskSearchFragment = new AskSearchFragment();
+        getSupportFragmentManager().beginTransaction().replace(
+                R.id.layout_fragment_content, mAskSearchFragment).commitAllowingStateLoss();
+
+        findViewById(R.id.btnGoBack).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                finish();
+            }
+        });
+
+        mSearchEt.setOnEditorActionListener(new TextView.OnEditorActionListener() {
+            @Override
+            public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
+                if (actionId == EditorInfo.IME_ACTION_SEARCH) {
+                    Util_System_Keyboard.hideSoftKeyboard(AskSearchActivity.this);
+                    search();
+                }
+                return false;
+            }
+        });
+
+        mSearchEt.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+
+            }
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+                if (s.length() > 0) {
+                    mSearchCancel.setVisibility(View.VISIBLE);
+                } else {
+                    mSearchCancel.setVisibility(View.GONE);
+                }
+            }
+
+            @Override
+            public void afterTextChanged(Editable s) {
+                String newSearchKey = s.toString().trim();
+                if (!newSearchKey.equals(mSearchKey)) {
+                    mBaseHandler.removeMessages(1);
+                    mSearchKey = newSearchKey;
+                    if (mSearchKey.length() >= 0) {
+                        mBaseHandler.sendEmptyMessageDelayed(1, 300);
+                    }
+                }
+            }
+        });
+    }
+
+    @OnClick({R.id.ivDeleteText, R.id.btnQuestions})
+    public void onClick(View v) {
+        if (v.getId() == R.id.ivDeleteText) {
+            mSearchCancel.setVisibility(View.GONE);
+            mSearchEt.setText("");
+        } else if (v.getId() == R.id.btnQuestions) {
+            CheckLoginUtils.checkLogin(this, () -> {
+                Bundle bundle = new Bundle();
+                bundle.putString(EntranceUtils.KEY_SEARCHKEY, mSearchKey);
+                NormalActivity.startFragment(this, QuestionsEditFragment.class, bundle);
+            });
+        }
+    }
+
+    private void search() {
+        if (mAskSearchFragment != null) {
+            mAskSearchFragment.search(mSearchKey);
+        }
+    }
+}

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

@@ -12,7 +12,6 @@ import android.os.Handler;
 import android.os.Message;
 import android.preference.PreferenceManager;
 import android.support.annotation.NonNull;
-import android.support.v4.content.ContextCompat;
 import android.text.Html;
 import android.view.Gravity;
 import android.view.View;
@@ -28,12 +27,10 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.facebook.drawee.view.SimpleDraweeView;
-import com.gh.base.AppController;
 import com.gh.base.BaseActivity;
 import com.gh.common.util.DialogUtils;
 import com.gh.common.util.DisplayUtils;
 import com.gh.common.util.UserIconUtils;
-import com.lightgame.utils.Utils;
 import com.gh.common.view.RadarView;
 import com.gh.gamecenter.kuaichuan.BaseTransfer;
 import com.gh.gamecenter.kuaichuan.Constant;
@@ -41,7 +38,8 @@ import com.gh.gamecenter.kuaichuan.FileInfo;
 import com.gh.gamecenter.kuaichuan.HotspotManager;
 import com.gh.gamecenter.kuaichuan.WifiMgr;
 import com.gh.gamecenter.kuaichuan.WifiUtils;
-import com.readystatesoftware.systembartint.SystemBarTintManager;
+import com.halo.assistant.HaloApp;
+import com.lightgame.utils.Utils;
 
 import org.json.JSONObject;
 
@@ -57,6 +55,8 @@ import java.util.Map;
 import butterknife.BindView;
 import butterknife.OnClick;
 
+import static com.gh.gamecenter.KcSelectGameActivity.SEND_OVER_REQUEST;
+
 /**
  * Created by khy on 2017/1/20.
  */
@@ -92,8 +92,6 @@ public class ChooseReceiverActivity extends BaseActivity implements View.OnClick
     TextView mScanUser;
     @BindView(R.id.scan_user_des)
     TextView mScanUserDes;
-    @BindView(R.id.reuse_actionbar)
-    RelativeLayout mActionbar;
     @BindView(R.id.scan_hint)
     TextView mScanHint;
     @BindView(R.id.choosereceiver_roket_anim)
@@ -108,11 +106,8 @@ public class ChooseReceiverActivity extends BaseActivity implements View.OnClick
     ImageView mRoketAnimLeft;
     @BindView(R.id.choosereceiver_roket_right)
     ImageView mRoketAnimRight;
-    @BindView(R.id.actionbar_iv_back)
-    ImageView mBackIv;
-    @BindView(R.id.actionbar_tv_title)
-    TextView mTitleTv;
 
+    private static final String KET_SHOWCONNHINTDIALOG = "showConnHintDialog";
 
     private List<ScanResult> mScanResultList;
 
@@ -135,30 +130,19 @@ public class ChooseReceiverActivity extends BaseActivity implements View.OnClick
     @NonNull
     public static Intent getIntent(Context context, boolean showConnHintDialog) {
         Intent intent = new Intent(context, ChooseReceiverActivity.class);
-        intent.putExtra("showConnHintDialog", showConnHintDialog);
+        intent.putExtra(KET_SHOWCONNHINTDIALOG, showConnHintDialog);
         return intent;
     }
 
     @Override
     protected int getLayoutId() {
-        return R.layout.activity_choosereceiver;
-    }
-
-    @Override
-    public void onBackPressed() {
-        super.onBackPressed();
-        closeSocket();
-        AppController.remove("FileInfo");
+        return R.layout.activity_receive_choose;
     }
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        initTitle(getString(R.string.title_choose_activity));
-
-        mTitleTv.setTextColor(Color.WHITE);
-        mBackIv.setImageResource(R.drawable.reuse_kc_back);
-
+        setNavigationTitle(R.string.title_choose_activity, android.R.color.white);
 
         // 添加分享图标
         TextView hintTv = new TextView(this);
@@ -170,17 +154,9 @@ public class ChooseReceiverActivity extends BaseActivity implements View.OnClick
                 ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.MATCH_PARENT);
         params.addRule(RelativeLayout.ALIGN_PARENT_RIGHT);
         params.addRule(RelativeLayout.CENTER_VERTICAL);
-        RelativeLayout reuse_actionbar = (RelativeLayout) mContentView.findViewById(
-                R.id.reuse_actionbar);
+        RelativeLayout reuse_actionbar = (RelativeLayout) findViewById(R.id.reuse_actionbar);
         reuse_actionbar.addView(hintTv, params);
 
-        //修改沉浸栏以及ActionBar 颜色
-        mActionbar.setBackgroundColor(ContextCompat.getColor(getApplicationContext(), R.color.scan_bg));
-        SystemBarTintManager tintManager = getTintManager();
-        if (tintManager != null) {
-            tintManager.setStatusBarTintResource(R.color.scan_bg);
-        }
-
         init();
 
         hintTv.setOnClickListener(new View.OnClickListener() {
@@ -190,11 +166,11 @@ public class ChooseReceiverActivity extends BaseActivity implements View.OnClick
             }
         });
 
-        boolean showConnHintDialog = sp.getBoolean("showConnHintDialog", true);
+        boolean showConnHintDialog = sp.getBoolean(KET_SHOWCONNHINTDIALOG, true);
         if (showConnHintDialog || (getIntent() != null && getIntent().getExtras() != null
-                && getIntent().getExtras().getBoolean("showConnHintDialog"))) {
+                && getIntent().getExtras().getBoolean(KET_SHOWCONNHINTDIALOG))) {
             if (showConnHintDialog) {
-                sp.edit().putBoolean("showConnHintDialog", false).apply();
+                sp.edit().putBoolean(KET_SHOWCONNHINTDIALOG, false).apply();
             }
             showConnHintDialog();
         }
@@ -205,7 +181,7 @@ public class ChooseReceiverActivity extends BaseActivity implements View.OnClick
         conUserIconTag = 1;
         mRadarView.setSearching(true);
 
-        mScanHint.setText(Html.fromHtml("<u>" + "好友还没安装光环助手？请点这里" + "</u>"));
+        mScanHint.setText(Html.fromHtml(getString(R.string.kc_scan_hint)));
 
         isStopScan = false;
         isDestroy = false;
@@ -300,11 +276,11 @@ public class ChooseReceiverActivity extends BaseActivity implements View.OnClick
 
     @Override
     protected void onDestroy() {
-        super.onDestroy();
         mRadarView.setSearching(false);
         isDestroy = true;
         isStopScan = true;
         handler.removeCallbacksAndMessages(null);
+        super.onDestroy();
     }
 
     @Override
@@ -326,7 +302,7 @@ public class ChooseReceiverActivity extends BaseActivity implements View.OnClick
 //                "\n2.点击首页左上角，进入下载管理 \n3.点击“零流量传送”，再点击“我要接收”",
 //                "确定");
 
-        // TODO 关闭扫描？？
+        // TODO 是否需要关闭扫描？？
 
         startActivity(ShareGhActivity.getIntent(this));
     }    //1.连接网络
@@ -374,14 +350,16 @@ public class ChooseReceiverActivity extends BaseActivity implements View.OnClick
         createSendMsgToServerRunnable(WifiMgr.getInstance(this).getIpAddressFromHotspot());
     }
 
-    @OnClick(R.id.actionbar_rl_back)
-    public void onBackListener() {
+    @Override
+    public boolean onHandleBackPressed() {
         closeSocket();
-        AppController.remove("FileInfo");
-    }    //发送UDP通知信息到 文件接收方 开启ServerSocketRunnable
+        HaloApp.remove(KcSelectGameActivity.KEY_FILE_INFO);
+        return false;
+    }
 
+    //发送UDP通知信息到 文件接收方 开启ServerSocketRunnable
     private void createSendMsgToServerRunnable(final String ipAddress) {
-        AppController.MAIN_EXECUTOR.execute(new Runnable() {
+        HaloApp.getInstance().getMainExecutor().execute(new Runnable() {
             @Override
             public void run() {
                 try {
@@ -449,7 +427,7 @@ public class ChooseReceiverActivity extends BaseActivity implements View.OnClick
         byte[] receiveData = new byte[1024];
         byte[] sendData;
         Utils.log("=====ip::" + ipAddress);
-        if (!ipAddress.equals("192.168.43.1")) {
+        if (!"192.168.43.1".equals(ipAddress)) {
             // 连接失败，可能是连接的热点已经关闭， 关闭动画，开启扫描
             isStopScan = false;
             handler.sendEmptyMessage(0);
@@ -490,7 +468,7 @@ public class ChooseReceiverActivity extends BaseActivity implements View.OnClick
                 userMap.put("receiverName", jsonObject.getString(Constant.MSG_FILE_RECEIVER_INIT_SUCCESS));
                 userMap.put("usericon", String.valueOf(conUserIconTag));
 
-                AppController.put("userMap", userMap);
+                HaloApp.put("userMap", userMap);
 
                 handler.post(new Runnable() {
                     @Override
@@ -506,7 +484,7 @@ public class ChooseReceiverActivity extends BaseActivity implements View.OnClick
     }
 
     private void sendFileInfoListToFileReceiverWithUdp(int serverPort, InetAddress ipAddress) {
-        List<FileInfo> fileInfoList = (List<FileInfo>) AppController.get("FileInfo", false);
+        List<FileInfo> fileInfoList = (List<FileInfo>) HaloApp.get(KcSelectGameActivity.KEY_FILE_INFO, false);
         if (fileInfoList == null) {
             return;
         }
@@ -526,7 +504,7 @@ public class ChooseReceiverActivity extends BaseActivity implements View.OnClick
 
     // 连接中-动画
     private void readyAnimView() {
-        mActionbar.setVisibility(View.GONE);
+        getSupportActionBar().hide();
         mRoketRl.setVisibility(View.VISIBLE);
         mRoketRl.animate()
                 .alpha(1f)
@@ -601,7 +579,7 @@ public class ChooseReceiverActivity extends BaseActivity implements View.OnClick
                 closeSocket();
                 Intent resultIntent = new Intent();
                 resultIntent.putExtra("isFinish", true);
-                setResult(0x123, resultIntent);
+                setResult(SEND_OVER_REQUEST, resultIntent);
                 finish();
             }
 
@@ -614,8 +592,8 @@ public class ChooseReceiverActivity extends BaseActivity implements View.OnClick
 
     // 连接失败-动画
     private void connFailedAnimView() {
-        mActionbar.setVisibility(View.VISIBLE);
-        Utils.toast(ChooseReceiverActivity.this, "连接失败");
+        getSupportActionBar().show();
+        toast("连接失败");
         if (mScaleAnimation != null) {
             mScaleAnimation.cancel();
         }

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

@@ -2,242 +2,24 @@ package com.gh.gamecenter;
 
 import android.content.Context;
 import android.content.Intent;
-import android.os.Bundle;
 import android.support.annotation.NonNull;
-import android.support.v4.util.ArrayMap;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.text.Html;
-import android.view.View;
-import android.widget.CheckBox;
-import android.widget.CompoundButton;
-import android.widget.LinearLayout;
-import android.widget.ProgressBar;
-import android.widget.RelativeLayout;
-import android.widget.TextView;
 
-import com.gh.base.BaseActivity;
-import com.gh.common.util.DialogUtils;
-import com.gh.common.util.StringUtils;
-import com.lightgame.utils.Utils;
-import com.gh.common.view.VerticalItemDecoration;
-import com.gh.gamecenter.adapter.CleanApkAdapter;
-import com.gh.gamecenter.entity.InstallGameEntity;
-import com.gh.gamecenter.eventbus.EBSkip;
-
-import org.greenrobot.eventbus.EventBus;
-
-import java.io.File;
-import java.text.DecimalFormat;
-import java.util.List;
-
-import butterknife.BindView;
-import butterknife.OnClick;
+import com.halo.assistant.fragment.ApkCleanerFragment;
 
 /**
  * Created by khy on 2017/1/24.
  */
-public class CleanApkActivity extends BaseActivity implements CleanApkAdapter.OnScanListener {
-
-    @BindView(R.id.apk_count)
-    TextView mApkCount;
-    @BindView(R.id.apk_rv)
-    RecyclerView mApkRv;
-    @BindView(R.id.delete_btn)
-    TextView mApkDeleteBtn;
-    @BindView(R.id.select_game_all)
-    CheckBox mApkSelectAll;
-    @BindView(R.id.scan_pb)
-    ProgressBar mScanPb;
-    @BindView(R.id.reuse_nodata_skip_tv_hint)
-    TextView mNodataSkipTv;
-    @BindView(R.id.reuse_nodata_skip_tv_btn)
-    TextView mNodataSkipBtn;
-    @BindView(R.id.reuse_nodata_skip)
-    LinearLayout mNodataSkipLl;
-    @BindView(R.id.delete_bottom)
-    LinearLayout mDeleteBottom;
-    @BindView(R.id.select_game_installed_ll)
-    RelativeLayout mInstallAllData;
-
-    private CleanApkAdapter mAdapter;
+@Deprecated
+public class CleanApkActivity extends NormalActivity {
 
     @NonNull
     public static Intent getIntent(Context context) {
-        Intent intent = new Intent(context, CleanApkActivity.class);
-        return intent;
+//        Intent intent = new Intent(context, CleanApkActivity.class);
+//        return new IntentFactory.Builder(context)
+//                .setActivity(CleanApkActivity.class)
+//                .setFragment(ApkCleanerFragment.class).build();
+
+        return getIntent(context, ApkCleanerFragment.class);
     }
 
-    @Override
-    protected int getLayoutId() {
-        return R.layout.activity_clean_apk;
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        initTitle(getString(R.string.title_clean_apk));
-
-        mNodataSkipLl.setVisibility(View.GONE);
-
-        mAdapter = new CleanApkAdapter(this, this, mApkDeleteBtn, mApkSelectAll);
-        mApkRv.setLayoutManager(new LinearLayoutManager(this));
-        mApkRv.addItemDecoration(new VerticalItemDecoration(this, 8, true));
-        mApkRv.setAdapter(mAdapter);
-
-        mApkSelectAll.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-            @Override
-            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-                ArrayMap<Integer, Boolean> selectPosition = new ArrayMap<>();
-                ArrayMap<Integer, Boolean> selectPosition1 = mAdapter.getSelectPosition();
-                int itemCount = mAdapter.getItemCount();
-                if (isChecked) {
-                    for (int i = 0; i < itemCount; i++) {
-                        selectPosition.put(i, true);
-                    }
-                } else {
-                    int selectCount = 0;
-                    for (Integer integer : selectPosition1.keySet()) {
-                        if (selectPosition1.get(integer)) {
-                            selectCount++;
-                        }
-                    }
-
-                    if (selectCount != itemCount) {
-                        return;
-                    }
-
-                    for (int i = 0; i < itemCount; i++) {
-                        selectPosition.put(i, false);
-                    }
-                }
-
-                mAdapter.setSelectPosition(selectPosition);
-                mAdapter.notifyItemRangeChanged(0, itemCount);
-                mAdapter.checkBoxControl(isChecked, 0);
-            }
-        });
-
-        mNodataSkipBtn.setText("去首页看看");
-        mNodataSkipTv.setText("安装包已清理干净\n快去发现更多好玩的游戏吧！");
-        mNodataSkipTv.setLineSpacing(0, 1.5f);
-
-    }
-
-    @OnClick({R.id.delete_btn, R.id.reuse_nodata_skip_tv_btn})
-    public void onClick(View view) {
-        switch (view.getId()) {
-            case R.id.delete_btn: {
-                String s = mApkDeleteBtn.getText().toString();
-                if ("停止扫描".equals(s)) {
-                    mAdapter.isStopScan();
-                } else {
-                    if (s.equals("一键删除")) {
-                        Utils.toast(CleanApkActivity.this, "请选择需要删除的安装包");
-                        return;
-                    }
-
-                    final List<InstallGameEntity> apkList = mAdapter.getApkList();
-                    final ArrayMap<Integer, Boolean> selectPosition = mAdapter.getSelectPosition();
-
-                    for (int i = 0; i < apkList.size(); i++) {
-                        if (selectPosition.get(i) && apkList.get(i).getInstallStatus() == 1) {
-                            DialogUtils.showWarningDialog(CleanApkActivity.this, "删除安装包"
-                                    , Html.fromHtml("你选择的安装包中包含 <font color=\"#ff0000\">未安装</font> 的应用，确定删除吗？")
-                                    , "取消 ", "确定"
-                                    , new DialogUtils.ConfirmListener() {
-                                        @Override
-                                        public void onConfirm() {
-                                            deleteApk(apkList, selectPosition);
-                                        }
-                                    }, null);
-                            return;
-                        }
-                    }
-
-                    deleteApk(apkList, selectPosition);
-                }
-                break;
-            }
-            case R.id.reuse_nodata_skip_tv_btn: {
-                Intent intent = MainActivity.getMainIntent(this);
-                startActivity(intent);
-
-                mNodataSkipBtn.postDelayed(new Runnable() {
-                    @Override
-                    public void run() {
-                        EventBus.getDefault().post(new EBSkip(MainActivity.EB_SKIP_GAMEFRAGMENT, 0));
-                    }
-                }, 300);
-                break;
-            }
-        }
-    }
-
-    private void deleteApk(List<InstallGameEntity> apkList, ArrayMap<Integer, Boolean> selectPosition) {
-        long size = 0;
-        for (int i = 0; i < apkList.size(); i++) {
-            if (selectPosition.get(i)) {
-                InstallGameEntity installGameEntity = apkList.get(i);
-                size = size + installGameEntity.getGameSize();
-                File file = new File(installGameEntity.getGamePath());
-                if (file.isFile() && file.exists()) {
-                    file.delete();
-                    mAdapter.deleteApk(i);
-                    i--;
-                }
-            }
-        }
-
-        double allSize = (((float) size / 1024) / 1024);
-        DecimalFormat df = new DecimalFormat("#.00");
-        String sizeName = df.format(allSize) + "MB";
-        Utils.toast(CleanApkActivity.this, "删除成功，已为您节省" + sizeName + "空间");
-        mApkDeleteBtn.setText("一键删除");
-        mAdapter.notifyDataSetChanged(); // 刷新Adapter position
-
-        updateScanData();
-
-        if (apkList.size() == 0) { // 全部删除
-            mNodataSkipLl.setVisibility(View.VISIBLE);
-            mInstallAllData.setVisibility(View.GONE);
-            mDeleteBottom.setVisibility(View.GONE);
-        }
-    }
-
-    private void updateScanData() {
-        long allSize = 0;
-        List<InstallGameEntity> apkList = mAdapter.getApkList();
-        for (InstallGameEntity installGameEntity : apkList) {
-            allSize = allSize + installGameEntity.getGameSize();
-        }
-
-        double size = (((float) allSize / 1024) / 1024);
-        DecimalFormat df = new DecimalFormat("0.00");
-        String sizeName = df.format(size) + "MB";
-
-        mApkCount.setText(Html.fromHtml(StringUtils.buildString("找到", String.valueOf(apkList.size()), "个安装包，占用"
-                , "<font color=\"#ff4147\">", sizeName, "</font>", "空间")));
-    }
-
-    @Override
-    public void onScanOver() {
-        mApkDeleteBtn.setText("立即删除");
-        mApkDeleteBtn.setBackgroundResource(R.drawable.game_item_btn_red_style);
-
-        updateScanData();
-
-        mScanPb.setVisibility(View.GONE);
-        mApkSelectAll.setVisibility(View.VISIBLE);
-        mApkSelectAll.setChecked(true);
-    }
-
-    @Override
-    public void noData() {
-        mNodataSkipBtn.setText("去首页看看");
-        mNodataSkipTv.setText("暂无安装包");
-        mNodataSkipLl.setVisibility(View.VISIBLE);
-        mInstallAllData.setVisibility(View.GONE);
-        mDeleteBottom.setVisibility(View.GONE);
-    }
 }

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

@@ -0,0 +1,27 @@
+package com.gh.gamecenter;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+
+import com.gh.base.fragment.BaseFragment_ViewPager;
+import com.gh.gamecenter.collection.CollectionWrapperFragment;
+
+/**
+ * Created by khy on 18/07/17.
+ */
+@Deprecated
+public class CollectionActivity extends NormalActivity {
+
+    @NonNull
+    public static Intent getCollectionActivity(Context context) {
+        Bundle args = new Bundle();
+        args.putInt(BaseFragment_ViewPager.ARGS_INDEX, CollectionWrapperFragment.INDEX_TOOL);
+//        return new IntentFactory.Builder(context)
+//                .setActivity(CollectionActivity.class)
+//                .setFragment(CollectionWrapperFragment.class).setArgs(args).build();
+        return getIntent(context, CollectionWrapperFragment.class, args);
+    }
+
+}

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

@@ -3,57 +3,23 @@ package com.gh.gamecenter;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
 
-import com.gh.base.BaseActivity;
-import com.gh.gamecenter.adapter.CommentDetailAdapter;
-
-import butterknife.BindView;
+import com.gh.common.util.EntranceUtils;
+import com.halo.assistant.fragment.comment.CommentDetailFragment;
 
 /**
  * Created by khy on 2017/3/22.
  */
-public class CommentDetailActivity extends BaseActivity {
+@Deprecated
+public class CommentDetailActivity extends NormalActivity {
 
-    @BindView(R.id.comment_detail_rv)
-    RecyclerView mRecyclerView;
-
-    private CommentDetailAdapter mAdapter;
-    private LinearLayoutManager mLayoutManager;
-
-    public static Intent getCommentDetailIntent(Context context, String commentId) {
-        Intent intent = new Intent(context, CommentDetailActivity.class);
-        intent.putExtra("commentId", commentId);
-        return intent;
+    public static Intent getIntent(Context context, String commentId) {
+        Bundle args = new Bundle();
+        args.putString(EntranceUtils.KEY_COMMENTID, commentId);
+//        return new IntentFactory.Builder(context)
+//                .setActivity(CommentDetailActivity.class)
+//                .setFragment(CommentDetailFragment.class).setArgs(args).build();
+        return getIntent(context, CommentDetailFragment.class, args);
     }
 
-
-    @Override
-    protected int getLayoutId() {
-        return R.layout.activity_comment_detail;
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        initTitle(getString(R.string.title_comment_detail));
-
-        String commentId = getIntent().getExtras().getString("commentId");
-
-        mAdapter = new CommentDetailAdapter(this, commentId);
-        mLayoutManager = new LinearLayoutManager(this);
-        mRecyclerView.setLayoutManager(mLayoutManager);
-        mRecyclerView.setAdapter(mAdapter);
-
-        mRecyclerView.addOnScrollListener(new RecyclerView.OnScrollListener() {
-            @Override
-            public void onScrollStateChanged(RecyclerView recyclerView, int newState) {
-                super.onScrollStateChanged(recyclerView, newState);
-                if (newState == RecyclerView.SCROLL_STATE_IDLE && !mAdapter.isOver() && !mAdapter.isLoading()) {
-                    mAdapter.loadData(mAdapter.getItemCount());
-                }
-            }
-        });
-    }
 }

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

@@ -1,18 +1,38 @@
 package com.gh.gamecenter;
 
-import com.gh.base.BaseAppCompatToolBarActivity;
+import android.view.MenuItem;
 
-public class CommonActivity extends BaseAppCompatToolBarActivity {
+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_toolbar;
+        return R.layout.layout_wrapper_activity_toolbar;
     }
 
     @Override
     protected boolean onNavigationIconClicked() {
-        finish();
+        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

@@ -4,244 +4,25 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.LinearLayout;
-import android.widget.RelativeLayout;
 
-import com.gh.base.BaseActivity;
-import com.gh.base.OnRequestCallBackListener;
-import com.gh.common.util.ConcernUtils;
 import com.gh.common.util.EntranceUtils;
-import com.gh.common.view.Concern_LinearLayout;
-import com.gh.gamecenter.adapter.ConcernAdapter;
-import com.gh.gamecenter.adapter.ConcernRecommendAdapter;
-import com.gh.gamecenter.db.info.ConcernInfo;
-import com.gh.gamecenter.entity.GameEntity;
-import com.gh.gamecenter.eventbus.EBConcernChanged;
-import com.gh.gamecenter.manager.ConcernManager;
-import com.lightgame.utils.Utils;
+import com.halo.assistant.fragment.myconcern.MyConcernFragment;
 
-import org.greenrobot.eventbus.Subscribe;
-import org.greenrobot.eventbus.ThreadMode;
-import org.json.JSONArray;
-
-import java.util.List;
-
-import butterknife.BindView;
-
-public class ConcernActivity extends BaseActivity implements OnClickListener, OnRequestCallBackListener {
-
-    @BindView(R.id.concern_rv_show)
-    RecyclerView mConcernRv;
-    @BindView(R.id.concern_rv_recommend)
-    RecyclerView mConcernRecommendRv;
-    @BindView(R.id.concern_rl_title)
-    RelativeLayout mConcernTitleRl;
-    @BindView(R.id.reuse_none_data)
-    LinearLayout mNoneData;
-
-    private ConcernAdapter concernAdapter;
-    private ConcernRecommendAdapter concernRecommendAdapter;
-    private ConcernManager concernManager;
-    private boolean isPause = false;
+/**
+ * 我的关注页面
+ */
+@Deprecated
+public class ConcernActivity extends NormalActivity {
 
     @NonNull
     public static Intent getIntent(Context context, String entrance) {
-        Intent intent = new Intent(context, ConcernActivity.class);
-        intent.putExtra(EntranceUtils.KEY_ENTRANCE, entrance);
-        return intent;
+        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 getIntent(context, MyConcernFragment.class, args);
     }
 
-    @Override
-    protected int getLayoutId() {
-        return R.layout.activity_concern;
-    }
 
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        initTitle(getString(R.string.title_concern));
-
-        concernManager = new ConcernManager(getApplicationContext());
-
-        List<ConcernInfo> concernList = concernManager.getConcernGame();
-        if (concernList == null || concernList.isEmpty()) {
-            mNoneData.setVisibility(View.VISIBLE);
-            mConcernRv.setVisibility(View.GONE);
-        }
-
-        mConcernTitleRl.setOnClickListener(this);
-
-        mConcernRv.setHasFixedSize(true);
-        mConcernRv.setLayoutManager(new GridLayoutManager(this, 3));
-        concernAdapter = new ConcernAdapter(this, this, mEntrance);
-        mConcernRv.setAdapter(concernAdapter);
-
-        mConcernRecommendRv.setHasFixedSize(true);
-        mConcernRecommendRv.setLayoutManager(new GridLayoutManager(this, 4));
-
-        concernRecommendAdapter = new ConcernRecommendAdapter(this, this, mEntrance);
-        mConcernRecommendRv.setAdapter(concernRecommendAdapter);
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        JSONArray data = new JSONArray();
-        for (ConcernInfo concernInfo : concernManager.getConcernGame()) {
-            data.put(concernInfo.getId());
-        }
-        ConcernUtils.INSTANCE.updateConcernData(this, data);
-    }
-
-    @Override
-    protected void onPause() {
-        super.onPause();
-        isPause = true;
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        Utils.log("isPause = " + isPause);
-        if (isPause) {
-            List<ConcernInfo> concernList = concernManager.getConcernGame();
-            boolean isChanged = false;
-            if (concernList == null) {
-                if (concernAdapter.getConcernList().size() != 0) {
-                    isChanged = true;
-                }
-            } else {
-                if (concernAdapter.getConcernList() == null
-                        || concernAdapter.getConcernList().isEmpty()
-                        || concernList.size() > concernAdapter.getConcernList().size()
-                        || concernList.size() < concernAdapter.getConcernList().size()) {
-                    isChanged = true;
-                }
-            }
-            Utils.log("isChanged = " + isChanged);
-            if (isChanged) {
-                concernAdapter = new ConcernAdapter(this, this, mEntrance);
-                mConcernRv.setAdapter(concernAdapter);
-            }
-            isPause = false;
-        }
-    }
-
-    @Override
-    public void loadDone() {
-        mConcernTitleRl.setVisibility(View.VISIBLE);
-        mConcernRecommendRv.setVisibility(View.VISIBLE);
-        int size = concernRecommendAdapter.getRecommendGameList().size();
-        mConcernRecommendRv.setLayoutManager(new GridLayoutManager(this, size > 4 ? 4 : size));
-        mConcernRecommendRv.getAdapter().notifyDataSetChanged();
-    }
-
-    @Override
-    public void loadDone(Object obj) {
-
-    }
-
-    @Override
-    public void loadError() {
-
-    }
-
-    @Override
-    public void loadEmpty() {
-        if (concernAdapter.getConcernList() == null
-                || concernAdapter.getConcernList().isEmpty()) {
-            mNoneData.setVisibility(View.VISIBLE);
-            mConcernRv.setVisibility(View.GONE);
-        }
-        if (concernRecommendAdapter.getRecommendGameList() == null
-                || concernRecommendAdapter.getRecommendGameList().isEmpty()) {
-            mConcernTitleRl.setVisibility(View.GONE);
-            mConcernRecommendRv.setVisibility(View.GONE);
-        } else {
-            if (concernRecommendAdapter.getRecommendGameList().size() < 4) {
-                mConcernRecommendRv.setLayoutManager(
-                        new GridLayoutManager(this, concernRecommendAdapter.getRecommendGameList().size()));
-            }
-        }
-    }
-
-    @Override
-    public void onClick(View v) {
-        if (v == mConcernTitleRl) {
-            if (mConcernRecommendRv.getVisibility() == View.VISIBLE) {
-                ((Concern_LinearLayout) mContentView).hideRecyclerView();
-            } else {
-                ((Concern_LinearLayout) mContentView).showRecyclerView();
-            }
-        }
-    }
-
-    // 关注事件
-    @Subscribe(threadMode = ThreadMode.MAIN)
-    public void onEventMainThread(EBConcernChanged changed) {
-        if (!changed.isSingle()) {
-            return;
-        }
-        if (changed.isConcern()) {
-            for (GameEntity gameEntity : concernRecommendAdapter.getGameList()) {
-                if (changed.getGameId().equals(gameEntity.getId())) {
-                    ConcernInfo concernInfo = new ConcernInfo();
-                    concernInfo.setGameName(gameEntity.getName());
-                    concernInfo.setConcern(true);
-                    concernInfo.setIcon(gameEntity.getIcon());
-                    concernInfo.setId(gameEntity.getId());
-                    concernAdapter.getConcernList().add(0, concernInfo);
-                    concernAdapter.getConcernGameList().add(0, gameEntity);
-                    if (mNoneData.getVisibility() == View.VISIBLE) {
-                        mNoneData.setVisibility(View.GONE);
-                        mConcernRv.setVisibility(View.VISIBLE);
-                    }
-                    concernAdapter.notifyDataSetChanged();
-                }
-            }
-            for (int i = 0, size = concernRecommendAdapter.getRecommendGameList().size(); i < size; i++) {
-                if (changed.getGameId().equals(concernRecommendAdapter.getRecommendGameList().get(i).getId())) {
-                    concernRecommendAdapter.getRecommendGameList().remove(i);
-                    concernRecommendAdapter.notifyDataSetChanged();
-                    if (concernRecommendAdapter.getRecommendGameList().isEmpty()) {
-                        mConcernTitleRl.setVisibility(View.GONE);
-                        mConcernRecommendRv.setVisibility(View.GONE);
-                    }
-                    if (concernRecommendAdapter.getRecommendGameList().size() < 4) {
-                        mConcernRecommendRv.setLayoutManager(
-                                new GridLayoutManager(this, concernRecommendAdapter.getRecommendGameList().size()));
-                    } else {
-                        mConcernRecommendRv.setLayoutManager(new GridLayoutManager(this, 4));
-                    }
-                    break;
-                }
-            }
-        } else {
-            concernRecommendAdapter.getRecommendGameList().clear();
-            for (GameEntity gameEntity : concernRecommendAdapter.getGameList()) {
-                if (!concernManager.isConcern(gameEntity.getId())) {
-                    concernRecommendAdapter.getRecommendGameList().add(gameEntity);
-                }
-            }
-            concernRecommendAdapter.notifyDataSetChanged();
-            if (concernRecommendAdapter.getRecommendGameList().isEmpty()) {
-                mConcernTitleRl.setVisibility(View.GONE);
-                mConcernRecommendRv.setVisibility(View.GONE);
-            } else {
-                mConcernTitleRl.setVisibility(View.VISIBLE);
-                mConcernRecommendRv.setVisibility(View.VISIBLE);
-            }
-            if (concernRecommendAdapter.getRecommendGameList().size() < 4) {
-                mConcernRecommendRv.setLayoutManager(
-                        new GridLayoutManager(this, concernRecommendAdapter.getRecommendGameList().size()));
-            } else {
-                mConcernRecommendRv.setLayoutManager(new GridLayoutManager(this, 4));
-            }
-        }
-    }
 }

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

@@ -25,8 +25,8 @@ import com.gh.common.util.BitmapUtils;
 import com.gh.common.util.DialogUtils;
 import com.gh.common.util.DisplayUtils;
 import com.gh.common.util.EntranceUtils;
-import com.gh.common.util.TokenUtils;
 import com.gh.common.view.CropImageCustom;
+import com.gh.gamecenter.manager.UserManager;
 import com.lightgame.download.FileUtils;
 
 import org.json.JSONException;
@@ -54,6 +54,8 @@ public class CropImageActivity extends BaseActivity {
 
     private SharedPreferences sp;
 
+    private UserManager mUserManager;
+
     private Handler handler = new Handler() {
         @Override
         public void handleMessage(Message msg) {
@@ -74,7 +76,7 @@ public class CropImageActivity extends BaseActivity {
     @NonNull
     public static Intent getIntent(Context context, String picturePath, String entrance) {
         Intent intent = new Intent(context, CropImageActivity.class);
-        intent.putExtra("path", picturePath);
+        intent.putExtra(EntranceUtils.KEY_PATH, picturePath);
         intent.putExtra(EntranceUtils.KEY_ENTRANCE, entrance);
         return intent;
     }
@@ -88,10 +90,12 @@ public class CropImageActivity extends BaseActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        initTitle(getString(R.string.title_crop_image));
+        setNavigationTitle(getString(R.string.title_crop_image));
 
         sp = PreferenceManager.getDefaultSharedPreferences(this);
 
+        mUserManager = UserManager.getInstance();
+
         RelativeLayout reuse_actionbar = (RelativeLayout) findViewById(R.id.reuse_actionbar);
 
         TextView confirm = new TextView(this);
@@ -119,13 +123,13 @@ public class CropImageActivity extends BaseActivity {
                             handler.sendEmptyMessage(1);
                             return null;
                         }
-                        return TokenUtils.getToken(CropImageActivity.this, true);
+                        return Observable.just(mUserManager.getToken());
                     }
                 }).flatMap(new Func1<String, Observable<JSONObject>>() {
                     @Override
                     public Observable<JSONObject> call(String token) {
                         if (token != null) {
-                            return Observable.just(FileUtils.uploadFile(Config.USER_HOST + "icon", path, token));
+                            return Observable.just(FileUtils.uploadFile(Config.API_HOST + "support/upload/img?type=icon", path, token));
                         }
                         dialog.dismiss();
                         handler.sendEmptyMessage(1);
@@ -137,13 +141,7 @@ public class CropImageActivity extends BaseActivity {
                         if (result != null) {
                             try {
                                 if (result.getInt("statusCode") == 401) {
-                                    return TokenUtils.getToken(CropImageActivity.this, false)
-                                            .flatMap(new Func1<String, Observable<JSONObject>>() {
-                                                @Override
-                                                public Observable<JSONObject> call(String token) {
-                                                    return Observable.just(FileUtils.uploadFile(Config.USER_HOST + "icon", path, token));
-                                                }
-                                            });
+                                    return Observable.just(FileUtils.uploadFile(Config.API_HOST + "support/upload/img?type=icon", path,mUserManager.getToken()));
                                 }
                             } catch (JSONException e) {
                                 e.printStackTrace();
@@ -190,7 +188,7 @@ public class CropImageActivity extends BaseActivity {
                                             sp.edit().putString("updateIconCount", jsonObject.toString()).apply();
 
                                             Intent data = new Intent();
-                                            data.putExtra("url", result.getString("icon"));
+                                            data.putExtra(EntranceUtils.KEY_URL, result.getString("icon"));
                                             setResult(RESULT_OK, data);
                                             finish();
 
@@ -232,7 +230,7 @@ public class CropImageActivity extends BaseActivity {
         super.onWindowFocusChanged(hasFocus);
         if (hasFocus && (reference == null || reference.get() == null)) {
             ImageView imageView = mCropimageCustom.getCropImageZoomView();
-            Bitmap bitmap = BitmapUtils.getBitmapByFile(getIntent().getStringExtra("path"),
+            Bitmap bitmap = BitmapUtils.getBitmapByFile(getIntent().getStringExtra(EntranceUtils.KEY_PATH),
                     imageView.getWidth(), imageView.getHeight());
             if (bitmap != null) {
                 reference = new SoftReference<>(bitmap);

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

@@ -4,7 +4,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 
-import com.gh.base.BaseActivity;
+import com.gh.base.fragment.BaseFragment_ViewPager;
 import com.gh.common.util.EntranceUtils;
 import com.gh.gamecenter.download.DownloadFragment;
 
@@ -13,7 +13,7 @@ import com.gh.gamecenter.download.DownloadFragment;
  *
  * @author 黄壮华
  */
-public class DownloadManagerActivity extends BaseActivity {
+public class DownloadManagerActivity extends NormalActivity {
 
     public static final int INDEX_DOWNLOAD = 0;
     public static final int INDEX_UPDATE = 1;
@@ -21,40 +21,69 @@ public class DownloadManagerActivity extends BaseActivity {
 
     public static final String TAG = "DownloadManagerActivity";
 
+    @Override
+    protected Intent provideNormalIntent() {
+        return getIntent(this, DownloadFragment.class);
+    }
+
     public static Intent getDownloadMangerIntent(Context context, String url, String entrance) {
-        Intent intent = new Intent(context, DownloadManagerActivity.class);
-        intent.putExtra("url", url);
-        intent.putExtra(EntranceUtils.KEY_ENTRANCE, entrance);
-        return intent;
+//        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);
+        return getIntent(context, DownloadFragment.class, bundle);
     }
 
-    public static void startDownloadManagerActivity(Context context, String url, String entrance) {
-        Intent intent = new Intent(context, DownloadManagerActivity.class);
-        intent.putExtra("url", url);
-        intent.putExtra(EntranceUtils.KEY_ENTRANCE, entrance);
-        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        context.startActivity(intent);
+    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_ViewPager.ARGS_INDEX, position);
+        return getIntent(context, DownloadFragment.class, bundle);
     }
 
-    @Override
-    protected int getLayoutId() {
-        return R.layout.activity_downloadmanager;
-    }
 
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        initTitle(getString(R.string.title_downloadmanager));
-
-        int currentItem = getIntent().getIntExtra("currentItem", 0);
-        if (getIntent().getBundleExtra("data") != null) {
-            currentItem = getIntent().getBundleExtra("data").getInt("currentItem", 0);
-        }
-
-        getSupportFragmentManager().beginTransaction().replace(
-                R.id.layout_fragment_content, DownloadFragment.newInstance(currentItem)).commitAllowingStateLoss();
-
-    }
+//    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);
+//    }
 }

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

@@ -1,7 +1,6 @@
 package com.gh.gamecenter;
 
 import android.Manifest;
-import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
@@ -16,19 +15,17 @@ import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
 import android.view.View;
-import android.view.View.OnClickListener;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.facebook.drawee.view.SimpleDraweeView;
-import com.gh.base.AppController;
 import com.gh.base.BaseActivity;
 import com.gh.common.util.DialogUtils;
 import com.gh.common.util.PackageUtils;
 import com.gh.common.util.StringUtils;
 import com.gh.common.util.UserIconUtils;
-import com.lightgame.utils.Utils;
+import com.gh.common.view.VerticalItemDecoration;
 import com.gh.gamecenter.adapter.FileReceiverAdapter;
 import com.gh.gamecenter.adapter.FileReceiverAdapter.OnReceiverCancelListener;
 import com.gh.gamecenter.eventbus.EBDownloadChanged;
@@ -43,9 +40,11 @@ import com.gh.gamecenter.kuaichuan.IpPortInfo;
 import com.gh.gamecenter.kuaichuan.KuaichuanNotification;
 import com.gh.gamecenter.kuaichuan.WifiMgr;
 import com.gh.gamecenter.manager.DataCollectionManager;
+import com.halo.assistant.HaloApp;
 import com.lightgame.download.DownloadDao;
 import com.lightgame.download.DownloadEntity;
 import com.lightgame.download.DownloadStatus;
+import com.lightgame.utils.Utils;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
@@ -70,7 +69,7 @@ import butterknife.OnClick;
 /**
  * Created by khy on 2017/1/20.
  */
-public class FileReceiverActivity extends BaseActivity implements OnReceiverCancelListener, OnClickListener {
+public class FileReceiverActivity extends BaseActivity implements OnReceiverCancelListener {
 
     @BindView(R.id.sender_rv)
     RecyclerView mReceiverRv;
@@ -125,7 +124,7 @@ public class FileReceiverActivity extends BaseActivity implements OnReceiverCanc
             int index = getCurrentFileInfoIndex();
             if (index == -100) {
                 Utils.toast(FileReceiverActivity.this, "接收失败");
-                colsePage();
+                closePage();
                 return;
             }
 
@@ -184,30 +183,32 @@ public class FileReceiverActivity extends BaseActivity implements OnReceiverCanc
 
     @Override
     protected int getLayoutId() {
-        return R.layout.activity_file_sender;
+        return R.layout.activity_receive_send;
     }
 
     @Override
-    public void onBackPressed() {
+    public boolean onHandleBackPressed() {
+
         backHint();
+        return true;
     }
 
     private void backHint() {
         if (isReceivesOver) {
-            colsePage();
+            closePage();
         } else {
             DialogUtils.showWarningDialog(FileReceiverActivity.this, "退出提示", "退出会中断接收，确定要退出吗？"
                     , "取消", "确定"
                     , new DialogUtils.ConfirmListener() {
                         @Override
                         public void onConfirm() {
-                            colsePage();
+                            closePage();
                         }
                     }, null);
         }
     }
 
-    private void colsePage() {
+    private void closePage() {
 
         if (mDatagramSocket != null) {
 //            mDatagramSocket.disconnect();
@@ -243,14 +244,16 @@ public class FileReceiverActivity extends BaseActivity implements OnReceiverCanc
             }
         }
         List<DownloadEntity> all = DownloadDao.getInstance(this).getAll();
-        EventBus.getDefault().post(new EBDownloadChanged("download", View.VISIBLE, all.size()));
+        if (all.size() > 0) {
+            EventBus.getDefault().post(new EBDownloadChanged("download", View.VISIBLE, all.size()));
+        }
         EventBus.getDefault().post(new EBDownloadStatus("download"));
 
         mReceiverServer.close();
-//        AppController.remove("FileInfo");
+//        HaloApp.remove(KcSelectGameActivity.KEY_FILE_INFO);
         mFileInfos.clear();
 
-        AppController.put("sendData", sendData);
+        HaloApp.put("sendData", sendData);
 
         finish();
     }
@@ -258,11 +261,11 @@ public class FileReceiverActivity extends BaseActivity implements OnReceiverCanc
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        initTitle(getString(R.string.title_file_receive));
+        setNavigationTitle(R.string.title_file_receive, android.R.color.white);
 
         isDestroy = false;
 
-//        mFileInfos = (List<FileInfo>) AppController.get("FileInfo", false);
+//        mFileInfos = (List<FileInfo>) HaloApp.get(KcSelectGameActivity.KEY_FILE_INFO, false);
 
         sendData = new ArrayList<>();
 
@@ -273,9 +276,9 @@ public class FileReceiverActivity extends BaseActivity implements OnReceiverCanc
 
         mFileReceiverAdapter = new FileReceiverAdapter(this, this, mFileInfos);
         mReceiverRv.setLayoutManager(new LinearLayoutManager(this));
+        mReceiverRv.addItemDecoration(new VerticalItemDecoration(this, 8, true));
         mReceiverRv.setAdapter(mFileReceiverAdapter);
 
-
         mKeepReceiverTv.setText("继续接收");
 
         sp = PreferenceManager.getDefaultSharedPreferences(this);
@@ -289,7 +292,6 @@ public class FileReceiverActivity extends BaseActivity implements OnReceiverCanc
             initServer(); //启动接收服务
         }
 
-        findViewById(R.id.actionbar_rl_back).setOnClickListener(this);
     }
 
     private void initUserData() {
@@ -318,9 +320,9 @@ public class FileReceiverActivity extends BaseActivity implements OnReceiverCanc
      */
     private void initServer() {
         mReceiverServer = new ServerRunnable(Constant.DEFAULT_SERVER_PORT);
-        AppController.MAIN_EXECUTOR.execute(mReceiverServer);
+        HaloApp.getInstance().getMainExecutor().execute(mReceiverServer);
 
-        AppController.MAIN_EXECUTOR.execute(new Runnable() {
+        HaloApp.getInstance().getMainExecutor().execute(new Runnable() {
             @Override
             public void run() {
                 try {
@@ -368,7 +370,7 @@ public class FileReceiverActivity extends BaseActivity implements OnReceiverCanc
     }
 
     private void sendMessageToSender(final String sendData) throws Exception {
-        AppController.MAIN_EXECUTOR.execute(new Runnable() {
+        HaloApp.getInstance().getMainExecutor().execute(new Runnable() {
             @Override
             public void run() {
                 try {
@@ -391,12 +393,12 @@ public class FileReceiverActivity extends BaseActivity implements OnReceiverCanc
      * @param msg
      */
     private void parseFileInfo(String msg) {
-//        mFileInfos = (List<FileInfo>) AppController.get("FileInfo", false);  // mFileInfos 数据异常 需要重新获取
+//        mFileInfos = (List<FileInfo>) HaloApp.get(KcSelectGameActivity.KEY_FILE_INFO, false);  // mFileInfos 数据异常 需要重新获取
         FileInfo fileInfo = FileInfo.toObject(msg);
         if (fileInfo != null && fileInfo.getFilePath() != null) {
             mFileInfos.add(fileInfo);
             Utils.log("FileReceiverActivity 添加一条数据：：" + msg);
-//            AppController.put("FileInfo", mFileInfos);
+//            HaloApp.put(KcSelectGameActivity.KEY_FILE_INFO, mFileInfos);
 
         }
     }
@@ -493,12 +495,15 @@ public class FileReceiverActivity extends BaseActivity implements OnReceiverCanc
 
     }
 
-    @OnClick({R.id.actionbar_rl_back, R.id.sender_keep_send, R.id.sender_back})
+    @Override
+    protected boolean onNavigationIconClicked() {
+        backHint();
+        return true;
+    }
+
+    @OnClick({R.id.sender_keep_send, R.id.sender_back})
     public void back(View view) {
         switch (view.getId()) {
-            case R.id.actionbar_rl_back:
-                backHint();
-                break;
             case R.id.sender_back:
                 backHint();
                 break;
@@ -508,22 +513,13 @@ public class FileReceiverActivity extends BaseActivity implements OnReceiverCanc
                     mKeepReceiverTv.setBackgroundResource(R.drawable.game_item_btn_pause_style);
                     Utils.toast(FileReceiverActivity.this, "无需操作，请让对方继续发送即可");
                 } else { // 跳转安装包清理
-                    startActivity(new Intent(this, CleanApkActivity.class));
+                    startActivity(CleanApkActivity.getIntent(this));
                 }
                 break;
 
         }
     }
 
-    @Override
-    public void onClick(View v) {
-        switch (v.getId()) {
-            case R.id.actionbar_rl_back:
-                backHint();
-                break;
-        }
-    }
-
     /**
      * ServerSocket启动线程
      */
@@ -546,7 +542,9 @@ public class FileReceiverActivity extends BaseActivity implements OnReceiverCanc
                 } catch (IOException e) {
                 }
             }
-        }        @Override
+        }
+
+        @Override
         public void run() {
             Utils.log("接收线程：Socket已经开启");
             try {
@@ -647,7 +645,7 @@ public class FileReceiverActivity extends BaseActivity implements OnReceiverCanc
                         }
                     });
 
-                    AppController.MAIN_EXECUTOR.execute(mFileReceiver);
+                    HaloApp.getInstance().getMainExecutor().execute(mFileReceiver);
                 }
             } catch (IOException e) {
                 e.printStackTrace();

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

@@ -18,16 +18,17 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.facebook.drawee.view.SimpleDraweeView;
-import com.gh.base.AppController;
 import com.gh.base.BaseActivity;
 import com.gh.common.util.DialogUtils;
 import com.gh.common.util.UserIconUtils;
-import com.lightgame.utils.Utils;
+import com.gh.common.view.VerticalItemDecoration;
 import com.gh.gamecenter.adapter.FileSenderAdapter;
 import com.gh.gamecenter.kuaichuan.Constant;
 import com.gh.gamecenter.kuaichuan.FileInfo;
 import com.gh.gamecenter.kuaichuan.FileSender;
 import com.gh.gamecenter.kuaichuan.WifiMgr;
+import com.halo.assistant.HaloApp;
+import com.lightgame.utils.Utils;
 
 import org.json.JSONObject;
 
@@ -40,6 +41,8 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
 
 import butterknife.BindView;
 import butterknife.OnClick;
@@ -72,11 +75,16 @@ public class FileSenderActivity extends BaseActivity implements FileSenderAdapte
     private List<Map<String, String>> sendData; // 传送成绩单数据
     private List<FileSender> mFileSenderList;
 
+    public final static int KC_REPEAT_RESULT = 15; // 快传继续发送获取APK信息回调
+
     private boolean isSendOver;
     private boolean isDestroy;
 
     private long mStartTime;
 
+    // 快传文件发送单线程
+    private Executor SINGLE_EXECUTOR = Executors.newSingleThreadExecutor();
+
     private Handler handler = new Handler() {
         @Override
         public void handleMessage(Message msg) {
@@ -114,16 +122,16 @@ public class FileSenderActivity extends BaseActivity implements FileSenderAdapte
 
     @Override
     protected int getLayoutId() {
-        return R.layout.activity_file_sender;
+        return R.layout.activity_receive_send;
     }
 
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
-        if (resultCode == 0x130 && requestCode == 0x178) {
+        if (resultCode == KC_REPEAT_RESULT && requestCode == KC_REPEAT_RESULT) {
             mSenderAdapter.notifyDataSetChanged();
             initUserData();
-            AppController.MAIN_EXECUTOR.execute(new Runnable() {
+            HaloApp.getInstance().getMainExecutor().execute(new Runnable() {
                 @Override
                 public void run() {
                     try {
@@ -163,16 +171,17 @@ public class FileSenderActivity extends BaseActivity implements FileSenderAdapte
     }
 
     @Override
-    public void onBackPressed() {
+    public boolean onHandleBackPressed() {
         backHint();
+        return true;
     }
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        initTitle(getString(R.string.title_file_sender));
+        setNavigationTitle(R.string.title_file_sender, android.R.color.white);
 
-        mFileInfos = (List<FileInfo>) AppController.get("FileInfo", false);
+        mFileInfos = (List<FileInfo>) HaloApp.get(KcSelectGameActivity.KEY_FILE_INFO, false);
 
         isDestroy = false;
 
@@ -180,16 +189,19 @@ public class FileSenderActivity extends BaseActivity implements FileSenderAdapte
         mFileSenderList = new ArrayList<>();
         mSenderAdapter = new FileSenderAdapter(this, this, mFileInfos);
         mSenderRv.setLayoutManager(new LinearLayoutManager(this));
+        mSenderRv.addItemDecoration(new VerticalItemDecoration(this, 8, true));
         mSenderRv.setAdapter(mSenderAdapter);
 
         init();
 
-        findViewById(R.id.actionbar_rl_back).setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                backHint();
-            }
-        });
+    }
+
+    @Override
+    protected boolean onNavigationIconClicked() {
+
+        backHint();
+
+        return true;
     }
 
     private void init() {
@@ -214,27 +226,24 @@ public class FileSenderActivity extends BaseActivity implements FileSenderAdapte
 
     private void backHint() {
         if (!isSendOver) {
-            DialogUtils.showWarningDialog(FileSenderActivity.this, "退出传送", "退出会中断所有游戏的传送，确定要退出吗？"
-                    , "取消", "确定"
-                    , new DialogUtils.ConfirmListener() {
+            DialogUtils.showWarningDialog(FileSenderActivity.this,
+                    "退出传送", "退出会中断所有游戏的传送，确定要退出吗？", "取消", "确定", new DialogUtils.ConfirmListener() {
                         @Override
                         public void onConfirm() {
-                            colsePage();
-
+                            closePage();
                         }
                     }, null);
         } else {
-            colsePage();
+            closePage();
         }
 
-
     }
 
     //初始化用户数据
     private void initUserData() {
         isSendOver = false;
 
-        Map<String, String> map = (Map<String, String>) AppController.get("userMap", false);
+        Map<String, String> map = (Map<String, String>) HaloApp.get("userMap", false);
 
         long allGameSize = 0;
         for (FileInfo mFileInfo : mFileInfos) {
@@ -260,7 +269,7 @@ public class FileSenderActivity extends BaseActivity implements FileSenderAdapte
         Utils.log("====FileSenderActivity传送个数::" + mFileInfos.size());
 
 
-        // TODO: 发送的首个游戏 socket被拒绝的概率较大 延迟0.5秒发送试试
+        //发送的首个游戏 socket被拒绝的概率较大 延迟0.5秒发送试试
         Thread.sleep(500); //test
 
         for (final FileInfo fileInfo : mFileInfos) {
@@ -323,12 +332,12 @@ public class FileSenderActivity extends BaseActivity implements FileSenderAdapte
 
             });
             mFileSenderList.add(fileSender);
-            AppController.FILE_SENDER_EXECUTOR.execute(fileSender);
+            SINGLE_EXECUTOR.execute(fileSender);
         }
     }
 
     private void startReceiver() {
-        AppController.MAIN_EXECUTOR.execute(new Runnable() {
+        HaloApp.getInstance().getMainExecutor().execute(new Runnable() {
             @Override
             public void run() {
                 try {
@@ -340,7 +349,7 @@ public class FileSenderActivity extends BaseActivity implements FileSenderAdapte
         });
     }
 
-    public void colsePage() {
+    public void closePage() {
         if (mDatagramSocket != null) {
 //            mDatagramSocket.disconnect();
             mDatagramSocket.close();
@@ -348,10 +357,10 @@ public class FileSenderActivity extends BaseActivity implements FileSenderAdapte
         }
 
         stopAllFileSendingTask();
-        AppController.remove("FileInfo");
-        AppController.put("sendData", sendData);
+        HaloApp.remove(KcSelectGameActivity.KEY_FILE_INFO);
+        HaloApp.put("sendData", sendData);
 
-        FileSenderActivity.this.finish();
+        finish();
     }
 
     private int getCurrentFileInfoIndex(FileInfo curFileInfo) {
@@ -462,6 +471,7 @@ public class FileSenderActivity extends BaseActivity implements FileSenderAdapte
 
     @Override
     public void OnCancelPosition(int position) {
+        if (position >= mFileSenderList.size()) return;
         FileSender fileSender = mFileSenderList.get(position);
         Utils.log("发送方准备取消发送" + position);
         if (fileSender != null && fileSender.isRunning()) {
@@ -470,15 +480,14 @@ public class FileSenderActivity extends BaseActivity implements FileSenderAdapte
         }
     }
 
-    @OnClick({R.id.actionbar_rl_back, R.id.sender_keep_send, R.id.sender_back})
+    @OnClick({R.id.sender_keep_send, R.id.sender_back})
     public void onClick(View view) {
         switch (view.getId()) {
-            case R.id.actionbar_rl_back:
             case R.id.sender_back:
                 backHint();
                 break;
             case R.id.sender_keep_send:
-                startActivityForResult(KcSelectGameActivity.getIntent(this, true), 0x178);
+                startActivityForResult(KcSelectGameActivity.getIntent(this, true), KC_REPEAT_RESULT);
                 break;
             default:
                 break;

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

@@ -2,544 +2,46 @@ package com.gh.gamecenter;
 
 import android.content.Context;
 import android.content.Intent;
-import android.graphics.Color;
-import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
-import android.support.design.widget.AppBarLayout;
-import android.support.v4.app.Fragment;
-import android.support.v4.view.ViewPager;
-import android.text.TextUtils;
-import android.view.MotionEvent;
-import android.view.View;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-import android.widget.Toast;
 
-import com.facebook.drawee.view.SimpleDraweeView;
-import com.gh.base.BaseActivity;
-import com.gh.base.adapter.FragmentAdapter;
-import com.gh.common.util.ApkActiveUtils;
-import com.gh.common.util.AppDebugConfig;
-import com.gh.common.util.CheckLoginUtils;
-import com.gh.common.util.ConcernUtils;
-import com.gh.common.util.DataCollectionUtils;
-import com.gh.common.util.DataUtils;
-import com.gh.common.util.DetailDownloadUtils;
-import com.gh.common.util.DialogUtils;
 import com.gh.common.util.EntranceUtils;
-import com.gh.common.util.ImageUtils;
-import com.gh.common.util.ShareUtils;
-import com.gh.download.DownloadManager;
-import com.gh.gamecenter.adapter.viewholder.DetailViewHolder;
-import com.gh.gamecenter.entity.ApkEntity;
-import com.gh.gamecenter.entity.GameDetailEntity;
 import com.gh.gamecenter.entity.GameEntity;
-import com.gh.gamecenter.eventbus.EBConcernChanged;
-import com.gh.gamecenter.eventbus.EBDownloadStatus;
-import com.gh.gamecenter.eventbus.EBPackage;
-import com.gh.gamecenter.eventbus.EBReuse;
-import com.gh.gamecenter.gamedetail.FuliFragment;
-import com.gh.gamecenter.gamedetail.XinXiFragment;
-import com.gh.gamecenter.manager.ConcernManager;
-import com.gh.gamecenter.retrofit.Response;
-import com.gh.gamecenter.retrofit.RetrofitManager;
-import com.jakewharton.rxbinding.view.RxView;
-import com.lightgame.download.DataWatcher;
-import com.lightgame.download.DownloadEntity;
-import com.lightgame.utils.Utils;
-import com.lightgame.view.NoScrollableViewPager;
-import com.tencent.tauth.Tencent;
-
-import org.greenrobot.eventbus.Subscribe;
-import org.greenrobot.eventbus.ThreadMode;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-
-import butterknife.BindView;
-import butterknife.OnClick;
-import retrofit2.HttpException;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.functions.Action1;
-import rx.schedulers.Schedulers;
+import com.gh.gamecenter.gamedetail.GameDetailFragment;
 
 /**
  * Created by khy on 2017/3/24.
  * 游戏详情适配器
  */
-public class GameDetailActivity extends BaseActivity {
+public class GameDetailActivity extends NormalActivity {
 
-    public static final String SKIP_XINXI = "skipXinxi";
-    public static final String SKIP_FULI = "skipFuli";
-    public static final String OPEN_APPBAR = "openappbar";
 
-    @BindView(R.id.gamedetail_vp)
-    NoScrollableViewPager mViewPager;
-    @BindView(R.id.reuse_ll_loading)
-    LinearLayout mLoading;
-    @BindView(R.id.reuse_no_connection)
-    LinearLayout mNoConnection;
-    @BindView(R.id.actionbar_tv_title)
-    TextView mTitle;
-    @BindView(R.id.gamedetail_iv_thumb)
-    SimpleDraweeView mGameIcon;
-    @BindView(R.id.gamedetail_tv_name)
-    TextView mGameName;
-    @BindView(R.id.gamedetail_tv_info)
-    TextView mGameInfo;
-    @BindView(R.id.gamedetail_tv_concern)
-    TextView mGameConcern;
-    @BindView(R.id.gamedetail_tabbar)
-    LinearLayout mTabBar;
-    @BindView(R.id.gamedetail_tabbar_fuli_tv)
-    TextView mTanBarFuLiTv;
-    @BindView(R.id.gamedetail_tabbar_xinxi_tv)
-    TextView mTanBarXinXiTv;
-    @BindView(R.id.gamedetail_share)
-    ImageView mShareIv;
-    @BindView(R.id.gamedetail_appbar)
-    AppBarLayout mAppBarLayout;
-
-    private ConcernManager mConcernManager;
-    private String mGameId;
-    private GameEntity mGameEntity;
-    private DownloadEntity mDownloadEntity;
-    private String downloadAddWord;
-    private String downloadOffText;
-    private String name; // 页面位置
-    private String title;  // 页面标题
-    private String shareCode;
-    private boolean mIsTouchScreen = false;
-
-    private DataWatcher dataWatcher = new DataWatcher() {
-        @Override
-        public void onDataChanged(DownloadEntity downloadEntity) {
-            if (mGameEntity != null && mGameEntity.getApk().size() == 1) {
-                String url = mGameEntity.getApk().get(0).getUrl();
-                if (url.equals(downloadEntity.getUrl())) {
-                    if (!"pause".equals(DownloadManager.getInstance(GameDetailActivity.this).
-                            getStatus(downloadEntity.getUrl()))) {
-                        mDownloadEntity = downloadEntity;
-                        DetailDownloadUtils.detailInvalidate(getDetailViewHolder());
-                    }
-                }
-            }
-        }
-    };
-
-    private DetailViewHolder getDetailViewHolder() {
-        // 每次获取需要重新创建, 防止数据刷新
-        return new DetailViewHolder(mContentView, mGameEntity, mDownloadEntity, downloadOffText, downloadAddWord,
-                false, mEntrance, name, title); // 下载按钮ViewHolder
+    @Override
+    protected Intent provideNormalIntent() {
+        return getIntent(this, GameDetailFragment.class);
     }
 
     /**
      * 启动游戏详情页面
      */
     public static void startGameDetailActivity(Context context, GameEntity gameEntity, String entrance) {
-        Intent intent = new Intent(context, GameDetailActivity.class);
-        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        intent.putExtra(EntranceUtils.KEY_ENTRANCE, entrance);
-        intent.putExtra(GameEntity.class.getSimpleName(), gameEntity);
-        context.startActivity(intent);
+        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(getIntent(context, GameDetailFragment.class, bundle));
     }
 
     /**
      * 启动游戏详情页面
      */
     public static void startGameDetailActivity(Context context, String gameId, String entrance) {
-        Intent intent = new Intent(context, GameDetailActivity.class);
-        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        intent.putExtra("gameId", gameId);
-        intent.putExtra(EntranceUtils.KEY_ENTRANCE, entrance);
-        context.startActivity(intent);
-    }
-
-    @Override
-    protected int getLayoutId() {
-        return R.layout.activity_gamedetail;
-    }
-
-    //接收QQ或者QQ空间分享回调
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-
-        if (requestCode == com.tencent.connect.common.Constants.REQUEST_QQ_SHARE
-                || requestCode == com.tencent.connect.common.Constants.REQUEST_QZONE_SHARE) {
-            Tencent.onActivityResultData(requestCode, resultCode, data, ShareUtils.getInstance(this).QqShareListener);
-        }
-
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        initTitle("");
-
-        mViewPager.setScrollable(true);
-
-        mConcernManager = new ConcernManager(this);
-
-        name = "游戏详情";
-
-        mGameId = getIntent().getStringExtra("gameId");
-        mEntrance = getIntent().getStringExtra(EntranceUtils.KEY_ENTRANCE);
-        if (getIntent().getBundleExtra("data") != null) {
-            mGameId = getIntent().getBundleExtra("data").getString("gameId");
-        }
-
-        if (mGameId == null) {
-            mGameEntity = getIntent().getParcelableExtra(GameEntity.class.getSimpleName());
-//            mGameEntity = getIntent().getExtras().getParcelable(GameEntity.class.getSimpleName());
-            if (mGameEntity != null) {
-                mGameId = mGameEntity.getId();
-                mTitle.setText(mGameEntity.getName());
-                title = mGameEntity.getName();
-            }
-        }
-
-        if (AppDebugConfig.IS_DEBUG) {
-            AppDebugConfig.logMethodWithParams(this, getIntent().toUri(Intent.URI_INTENT_SCHEME), mGameId, mGameEntity);
-        }
-
-        if (mGameEntity != null) {
-            getGameDetail();
-        } else if (mGameId != null) {
-            getGameDigest();
-        } else {
-            mLoading.setVisibility(View.GONE);
-            mNoConnection.setVisibility(View.VISIBLE);
-        }
-
-        mViewPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
-            @Override
-            public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
-
-            }
-
-            @Override
-            public void onPageSelected(int position) {
-                if (position == 0) {
-                    mTanBarFuLiTv.setTextColor(Color.WHITE);
-                    mTanBarFuLiTv.setBackgroundResource(R.drawable.gamedetail_tag_select_bg);
-                    mTanBarXinXiTv.setTextColor(Color.BLACK);
-                    mTanBarXinXiTv.setBackgroundDrawable(new ColorDrawable(0));
-                } else {
-                    mTanBarXinXiTv.setTextColor(Color.WHITE);
-                    mTanBarXinXiTv.setBackgroundResource(R.drawable.gamedetail_tag_unselect_bg);
-                    mTanBarFuLiTv.setTextColor(Color.BLACK);
-                    mTanBarFuLiTv.setBackgroundDrawable(new ColorDrawable(0));
-                }
-            }
-
-            @Override
-            public void onPageScrollStateChanged(int state) {
-
-            }
-        });
-
-        mAppBarLayout.addOnOffsetChangedListener(new AppBarLayout.OnOffsetChangedListener() {
-            @Override
-            public void onOffsetChanged(AppBarLayout appBarLayout, int verticalOffset) {
-                int total = appBarLayout.getTotalScrollRange();
-                if (Math.abs(verticalOffset) > total / 2) {
-                    mTitle.setVisibility(View.VISIBLE);
-                } else {
-                    mTitle.setVisibility(View.GONE);
-                }
-            }
-        });
-
-    }
-
-    @Override
-    protected void onPause() {
-        super.onPause();
-        DownloadManager.getInstance(this).removeObserver(dataWatcher);
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        if (mGameEntity != null
-                && mGameEntity.getApk() != null
-                && mGameEntity.getApk().size() == 1) {
-            DetailDownloadUtils.detailInitDownload(getDetailViewHolder(), true);
-        }
-        DownloadManager.getInstance(this).addObserver(dataWatcher);
-    }
-
-    private void initGameDetailTop() {
-
-        mLoading.setVisibility(View.GONE);
-        mAppBarLayout.setVisibility(View.VISIBLE);
-
-        if (mConcernManager.isConcern(mGameEntity.getId())) {
-            mGameConcern.setText("取消关注");
-            mGameConcern.setBackgroundResource(R.drawable.border_red_bg);
-            mGameConcern.setTextColor(Color.parseColor("#ff4147"));
-        } else {
-            mGameConcern.setText("关注");
-            mGameConcern.setBackgroundResource(R.drawable.textview_concern_red_style);
-            mGameConcern.setTextColor(0xffffffff);
-        }
-
-        mGameName.setText(mGameEntity.getName());
-        ImageUtils.Companion.display(mGameIcon, mGameEntity.getIcon());
-        if (mGameEntity.getApk() == null || mGameEntity.getApk().isEmpty()) {
-            mGameInfo.setText("");
-        } else {
-            ApkEntity apkEntity = mGameEntity.getApk().get(0);
-            mGameInfo.setText(String.format("V%s | %s", apkEntity.getVersion(), apkEntity.getSize()));
-        }
-    }
-
-    // 获取游戏摘要
-    private void getGameDigest() {
-        RetrofitManager.getApi().getGameDigest(mGameId)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Response<GameEntity>() {
-                    @Override
-                    public void onResponse(GameEntity response) {
-                        ApkActiveUtils.filterHideApk(response);
-                        mGameEntity = response;
-
-                        mTitle.setText(mGameEntity.getName());
-                        mGameId = response.getId();
-                        title = mGameEntity.getName();
-                        getGameDetail();
-                    }
-
-                    @Override
-                    public void onFailure(HttpException e) {
-                        Utils.log("=======onError::getGameDetail");
-                        mLoading.setVisibility(View.GONE);
-                        mNoConnection.setVisibility(View.VISIBLE);
-                    }
-                });
-    }
-
-    // 获取游戏详情
-    public void getGameDetail() {
-
-        RetrofitManager.getApi().getGameDetail(mGameId)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Response<GameDetailEntity>() {
-                    @Override
-                    public void onError(Throwable e) {
-                        super.onError(e);
-                        mLoading.setVisibility(View.GONE);
-                        mNoConnection.setVisibility(View.VISIBLE);
-                        Utils.log("onError::getGameDetail" + e.toString() + "&&id::" + mGameId);
-                    }
-
-                    @Override
-                    public void onResponse(GameDetailEntity response) {
-                        // 过滤过期公告
-                        if (response.getNotice() != null && response.getNotice().size() > 0) {
-                            long l = System.currentTimeMillis();
-                            for (int i = 0; i < response.getNotice().size(); i++) {
-                                if (l > (response.getNotice().get(i).getOvertime() * 1000)) {
-                                    response.getNotice().remove(i);
-                                    i--;
-                                }
-                            }
-                        }
-
-                        downloadAddWord = response.getDownloadAddWord();
-                        downloadOffText = response.getDownloadOffText();
-                        shareCode = response.getShareCode();
-
-                        Bundle args = new Bundle();
-                        args.putParcelable(GameEntity.class.getSimpleName(), mGameEntity);
-                        args.putParcelable(GameDetailEntity.class.getSimpleName(), response);
-
-                        List<Fragment> list = new ArrayList<>();
-                        FuliFragment fuliFragment = new FuliFragment();
-                        fuliFragment.setArguments(args);
-                        list.add(fuliFragment);
-
-                        XinXiFragment xinXiFragment = new XinXiFragment();
-                        xinXiFragment.setArguments(args);
-                        list.add(xinXiFragment);
-
-                        mViewPager.setAdapter(new FragmentAdapter(getSupportFragmentManager(), list));
-                        initGameDetailTop();
-
-                        DetailDownloadUtils.detailInitDownload(getDetailViewHolder(), true);
-
-                        if (!mConcernManager.isConcern(mGameId)) {
-                            mTanBarXinXiTv.performClick();
-                        }
-                    }
-                });
-    }
-
-    @Override
-    public boolean dispatchTouchEvent(MotionEvent ev) {
-        switch (ev.getAction()) {
-            case MotionEvent.ACTION_DOWN:
-                mIsTouchScreen = true;
-                break;
-            case MotionEvent.ACTION_UP:
-                mIsTouchScreen = false;
-                break;
-        }
-        return super.dispatchTouchEvent(ev);
-    }
-
-
-    @Subscribe(threadMode = ThreadMode.MAIN)
-    public void onEventMainThread(EBReuse reuse) {
-        if (SKIP_XINXI.equals(reuse.getType())) {
-            mViewPager.setCurrentItem(1);
-        } else if (OPEN_APPBAR.equals(reuse.getType()) && !mIsTouchScreen) {
-            mAppBarLayout.setExpanded(true, true);
-        } else if (SKIP_FULI.equals(reuse.getType())) {
-            mViewPager.setCurrentItem(0);
-        }
-    }
-
-    // 接收下载被删除消息
-    @Subscribe(threadMode = ThreadMode.MAIN)
-    public void onEvent(EBDownloadStatus status) {
-        if ("delete".equals(status.getStatus())
-                && mGameEntity != null
-                && mGameEntity.getApk() != null
-                && mGameEntity.getApk().size() == 1) {
-            String url = mGameEntity.getApk().get(0).getUrl();
-            if (url.equals(status.getUrl())) {
-                DetailDownloadUtils.detailInitDownload(getDetailViewHolder(), false);
-            }
-        }
-    }
-
-    // 接受安装、卸载消息
-    @Subscribe(threadMode = ThreadMode.MAIN)
-    public void onEventMainThread(EBPackage busFour) {
-        if (mGameEntity != null
-                && mGameEntity.getApk() != null
-                && mGameEntity.getApk().size() > 0) {
-            for (ApkEntity apkEntity : mGameEntity.getApk()) {
-                String packageName = apkEntity.getPackageName();
-                if (packageName.equals(busFour.getPackageName())) {
-                    ApkActiveUtils.filterHideApk(mGameEntity);
-                    DetailDownloadUtils.detailInitDownload(getDetailViewHolder(), false);
-                }
-            }
-        }
-    }
-
-    // 关注事件
-    @Subscribe(threadMode = ThreadMode.MAIN)
-    public void onEventMainThread(EBConcernChanged changed) {
-        if (mGameEntity != null && changed.isSingle() && changed.getGameId().equals(mGameEntity.getId())) {
-            initGameDetailTop();
-        }
-    }
-
-    @OnClick({R.id.detail_tv_download, R.id.detail_pb_progressbar, R.id.reuse_no_connection
-            , R.id.detail_tv_per, R.id.gamedetail_tabbar_xinxi_tv, R.id.gamedetail_tv_concern
-            , R.id.gamedetail_tabbar_fuli_tv, R.id.gamedetail_share})
-    public void onClick(View v) {
-        switch (v.getId()) {
-            case R.id.gamedetail_tabbar_fuli_tv:
-                mViewPager.setCurrentItem(0);
-                break;
-            case R.id.gamedetail_tabbar_xinxi_tv:
-                mViewPager.setCurrentItem(1);
-                break;
-            case R.id.gamedetail_share:
-                if (TextUtils.isEmpty(shareCode)) return;
-                // 防抖处理
-                RxView.clicks(mShareIv)
-                        .throttleFirst(1, TimeUnit.SECONDS)
-                        .subscribe(new Action1<Void>() {
-                            @Override
-                            public void call(Void aVoid) {
-                                Map<String, Object> kv = new HashMap<>();
-                                kv.put("点击", "分享");
-                                DataUtils.onEvent(GameDetailActivity.this, "插件数据", mGameEntity.getName(), kv);
-
-                                DataCollectionUtils.uploadClick(GameDetailActivity.this, "分享", "游戏详情", mGameEntity.getName());
-
-                                String url = "http://www.ghzs666.com/game/" + shareCode;
-                                showShare(url, mGameEntity.getName(), mGameEntity.getIcon(), null, mGameEntity.getTag(), false);
-                            }
-                        });
-                break;
-            case R.id.reuse_no_connection:
-                mLoading.setVisibility(View.VISIBLE);
-                mNoConnection.setVisibility(View.GONE);
-
-                if (mGameEntity != null) {
-                    getGameDetail();
-                } else if (mGameId != null) {
-                    getGameDigest();
-                }
-                break;
-            case R.id.gamedetail_tv_concern:
-                CheckLoginUtils.checkLogin(GameDetailActivity.this, new CheckLoginUtils.OnLoggenInListener() {
-                    @Override
-                    public void onLoggedIn() {
-                        if ("关注".equals(mGameConcern.getText().toString())) {
-
-                            Map<String, Object> kv = new HashMap<>();
-                            kv.put("状态", "关注");
-                            DataUtils.onEvent(GameDetailActivity.this, "游戏关注", mGameEntity.getName(), kv);
-
-                            Map<String, Object> kv2 = new HashMap<>();
-                            kv2.put("点击", "关注");
-                            DataUtils.onEvent(GameDetailActivity.this, "插件数据", mGameEntity.getName(), kv2);
-
-                            DataCollectionUtils.uploadConcern(GameDetailActivity.this, mGameEntity.getName(), mGameEntity.getId(), "关注");
-
-                            mConcernManager.addByEntity(mGameEntity);
-                            mGameConcern.setText("取消关注");
-                            mGameConcern.setBackgroundResource(R.drawable.border_red_bg);
-                            mGameConcern.setTextColor(Color.parseColor("#ff4147"));
-
-                            Toast.makeText(GameDetailActivity.this, "关注成功", Toast.LENGTH_SHORT).show();
-
-                            // 添加关注
-                            ConcernUtils.INSTANCE.postConcernGameId(GameDetailActivity.this, mGameEntity.getId());
-                        } else {
-                            Map<String, Object> kv2 = new HashMap<>();
-                            kv2.put("点击", "取消关注");
-                            DataUtils.onEvent(GameDetailActivity.this, "插件数据", mGameEntity.getName(), kv2);
-
-                            DialogUtils.showCancelDialog(GameDetailActivity.this, new DialogUtils.ConfirmListener() {
-                                @Override
-                                public void onConfirm() {
-                                    Map<String, Object> kv = new HashMap<>();
-                                    kv.put("状态", "取消关注");
-                                    DataUtils.onEvent(GameDetailActivity.this, "游戏关注", mGameEntity.getName(), kv);
-
-                                    DataCollectionUtils.uploadConcern(GameDetailActivity.this,
-                                            mGameEntity.getName(), mGameEntity.getId(), "取消关注");
-
-                                    mConcernManager.deleteConcern(mGameEntity.getId());
-                                    mGameConcern.setText("关注");
-                                    mGameConcern.setBackgroundResource(R.drawable.textview_concern_red_style);
-                                    mGameConcern.setTextColor(0xffffffff);
-
-                                    // 取消关注
-                                    ConcernUtils.INSTANCE.deleteConcernData(GameDetailActivity.this, mGameEntity.getId());
-                                }
-                            });
-                        }
-                    }
-                });
-                break;
-        }
+        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(getIntent(context, GameDetailFragment.class, bundle));
     }
 
 }

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

@@ -4,216 +4,33 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
-import android.support.v4.util.ArrayMap;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.text.TextUtils;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.RelativeLayout;
-import android.widget.TextView;
 
-import com.gh.base.BaseActivity;
-import com.gh.common.util.DisplayUtils;
 import com.gh.common.util.EntranceUtils;
-import com.gh.gamecenter.adapter.GameNewsAdapter;
-import com.gh.gamecenter.adapter.GameNewsTypeListAdapter;
-import com.gh.gamecenter.eventbus.EBTypeChange;
-import com.gh.gamecenter.retrofit.Response;
-import com.gh.gamecenter.retrofit.RetrofitManager;
-
-import org.greenrobot.eventbus.Subscribe;
-import org.greenrobot.eventbus.ThreadMode;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import butterknife.BindView;
-import retrofit2.HttpException;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
+import com.halo.assistant.fragment.game.GameNewsSearchFragment;
 
 /**
  * Created by LGT on 2016/8/29.
- * 游戏新闻界面
+ * 游戏新闻界面，由于MTA界面统计未重新记录的原因，暂留此傀儡，连名字都不能改，真是可怕
  */
-public class GameNewsActivity extends BaseActivity implements View.OnClickListener {
-
-    @BindView(R.id.game_news_list)
-    RecyclerView mGameNewsRv;
-    @BindView(R.id.game_news_top_type_list)
-    RecyclerView mGameNewsTypeRv;
-    @BindView(R.id.reuse_none_data)
-    LinearLayout mNoDataLl;
-    @BindView(R.id.reuse_tv_none_data)
-    TextView mNoDataTv;
-
-    private GameNewsAdapter adapter;
-    private GameNewsTypeListAdapter typeListAdapter;
-    private LinearLayoutManager layoutManager;
-    private ImageView ivSearch;
-
-    private ArrayMap<String, GameNewsAdapter> adapterMap;
-
-    private List<String> typeList;
-
-    private String gameId;
-
-    private float startY = 0;
+@Deprecated
+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("gameName", gameName);
-        intent.putExtra("gameId", gameId);
-        intent.putExtra(EntranceUtils.KEY_ENTRANCE, entrance);
-        return intent;
+//        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 getIntent(context, GameNewsSearchFragment.class, args);
     }
 
-    @Override
-    protected int getLayoutId() {
-        return R.layout.activity_game_news;
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        ivSearch = new ImageView(this);
-        ivSearch.setImageResource(R.drawable.ic_search_white);
-
-        RelativeLayout.LayoutParams ivSearchParams = new RelativeLayout.LayoutParams(
-                DisplayUtils.dip2px(this, 20), DisplayUtils.dip2px(this, 20));
-        ivSearchParams.addRule(RelativeLayout.CENTER_VERTICAL);
-        ivSearchParams.addRule(RelativeLayout.ALIGN_PARENT_RIGHT);
-        ivSearchParams.setMargins(0, 0, DisplayUtils.dip2px(this, 10), 0);
-
-        RelativeLayout reuse_actionbar = (RelativeLayout) mContentView.findViewById(R.id.reuse_actionbar);
-        reuse_actionbar.addView(ivSearch, ivSearchParams);
-        ivSearch.setOnClickListener(this);
-        ivSearch.setVisibility(View.GONE);
-
-        String gameName = getIntent().getStringExtra("gameName");
-        initTitle(gameName);
-
-        mNoDataTv.setText("暂无内容");
-
-        adapterMap = new ArrayMap<>();
-
-        typeList = new ArrayList<>();
-
-        gameId = getIntent().getStringExtra("gameId");
-
-        mGameNewsRv.setHasFixedSize(true);
-        layoutManager = new LinearLayoutManager(this);
-        mGameNewsRv.setLayoutManager(layoutManager);
-
-        mGameNewsRv.addOnScrollListener(new RecyclerView.OnScrollListener() {
-            @Override
-            public void onScrollStateChanged(RecyclerView recyclerView, int newState) {
-                super.onScrollStateChanged(recyclerView, newState);
-                if (adapter != null && newState == RecyclerView.SCROLL_STATE_IDLE
-                        && layoutManager.findLastVisibleItemPosition() == adapter.getItemCount() - 1) {
-                    if (!adapter.isRemove() && !adapter.isLoading() && !adapter.isNetworkError()) {
-                        adapter.addList(adapter.getNewsList().size());
-                    }
-                }
-            }
-
-            @Override
-            public void onScrolled(RecyclerView recyclerView, int dx, int dy) {
-                super.onScrolled(recyclerView, dx, dy);
-
-                if (layoutManager.findFirstVisibleItemPosition() >= 1) {
-                    mGameNewsTypeRv.setVisibility(View.VISIBLE);
-                    ivSearch.setVisibility(View.VISIBLE);
-                } else {
-                    mGameNewsTypeRv.setVisibility(View.GONE);
-                    ivSearch.setVisibility(View.GONE);
-                }
-
-            }
-        });
-
-        mGameNewsTypeRv.setHasFixedSize(true);
-        mGameNewsTypeRv.setLayoutManager(new GridLayoutManager(this, 5));
-
-        //禁止由于滑动出现的阴影
-        mGameNewsTypeRv.setOnTouchListener(new View.OnTouchListener() {
-            @Override
-            public boolean onTouch(View v, MotionEvent event) {
-                if (event.getAction() == MotionEvent.ACTION_DOWN) {
-                    startY = event.getY();
-                } else if (event.getAction() == MotionEvent.ACTION_MOVE) {
-                    if (Math.abs(startY - event.getY()) > 0) {
-                        return true;
-                    }
-                }
-                return false;
-            }
-        });
-
-        if (!TextUtils.isEmpty(gameId)) {
-            getGameArticleType();
-        }
-    }
-
-    private void getGameArticleType() {
-        RetrofitManager.getApi()
-                .getGameArticleType(gameId)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Response<List<String>>() {
-                    @Override
-                    public void onResponse(List<String> response) {
-                        super.onResponse(response);
-                        typeList = response;
-                        typeList.add(0, "全部");
-                        adapter = new GameNewsAdapter(GameNewsActivity.this, typeList, mGameNewsRv, gameId, "全部", mEntrance, mNoDataLl);
-                        adapterMap.put("全部", adapter);
-                        mGameNewsRv.setAdapter(adapter);
-
-                        typeListAdapter = new GameNewsTypeListAdapter(GameNewsActivity.this, typeList, "全部");
-                        mGameNewsTypeRv.setAdapter(typeListAdapter);
-
-                        ViewGroup.LayoutParams params = mGameNewsTypeRv.getLayoutParams();
-                        params.height = (int) Math.ceil(typeList.size() / 5f) * DisplayUtils.dip2px(GameNewsActivity.this, 35)
-                                + DisplayUtils.dip2px(GameNewsActivity.this, 12);
-                        mGameNewsTypeRv.setLayoutParams(params);
-                    }
-
-                    @Override
-                    public void onFailure(HttpException e) {
-                        super.onFailure(e);
-                    }
-                });
-    }
-
-    @Subscribe(threadMode = ThreadMode.MAIN)
-    public void onEventMainThread(EBTypeChange change) {
-        adapter = adapterMap.get(change.getType());
-        if (adapter == null) {
-            adapter = new GameNewsAdapter(GameNewsActivity.this, typeList, mGameNewsRv, gameId, change.getType(), mEntrance, mNoDataLl);
-            adapterMap.put(change.getType(), adapter);
-        }
-        mGameNewsRv.setAdapter(adapter);
-
-        mGameNewsTypeRv.setVisibility(View.GONE);
-        ivSearch.setVisibility(View.GONE);
-        typeListAdapter.setNewsType(change.getType(), change.getPosition());
-    }
-
-    @Override
-    public void onClick(View v) {
-        if (v == ivSearch) {
-            mGameNewsRv.scrollToPosition(0);
-            mGameNewsTypeRv.setVisibility(View.GONE);
-            ivSearch.setVisibility(View.GONE);
-            adapter.openKeyBoard();
-        }
-    }
 }

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

@@ -17,14 +17,15 @@ import com.gh.common.util.DialogUtils;
 import com.gh.common.util.DownloadItemUtils;
 import com.gh.common.view.SwipeLayout;
 import com.gh.common.view.VerticalItemDecoration;
-import com.lightgame.download.DataWatcher;
-import com.lightgame.download.DownloadEntity;
 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.lightgame.download.DataWatcher;
+import com.lightgame.download.DownloadEntity;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
@@ -36,6 +37,7 @@ import butterknife.BindView;
 
 import static com.gh.gamecenter.R.id.reuse_nodata_skip_tv_btn;
 import static com.gh.gamecenter.R.id.reuse_nodata_skip_tv_hint;
+import static com.gh.gamecenter.download.FileSendFragment.KC_REQUEST;
 
 /**
  * Created by khy on 15/06/17.
@@ -84,7 +86,7 @@ public class InstallActivity extends BaseActivity implements InstallFragmentAdap
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
 
         // 分享成绩单
-        if (requestCode == 0x170 || requestCode == 0x180) {
+        if (requestCode == KC_REQUEST) {
             DialogUtils.showKuaiChuanResult(this, new Handler(), requestCode, "shareKc.jpg");
 
         }
@@ -93,7 +95,7 @@ public class InstallActivity extends BaseActivity implements InstallFragmentAdap
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        initTitle(getString(R.string.personale_mygame));
+        setNavigationTitle(getString(R.string.personale_mygame));
         mNoDataSkip.setVisibility(View.GONE);
         mNoDataSkipHint.setText("暂无游戏");
         mNoDataSkipBtn.setText("查看精品推荐");
@@ -119,6 +121,7 @@ public class InstallActivity extends BaseActivity implements InstallFragmentAdap
 
     @Override
     public void onResume() {
+        super.onResume();
         if (isEverpause) {
             for (GameEntity entity : mAdapter.getGameList()) {
                 entity.setEntryMap(DownloadManager.getInstance(this).getEntryMap(entity.getName()));
@@ -126,7 +129,6 @@ public class InstallActivity extends BaseActivity implements InstallFragmentAdap
             mAdapter.notifyDataSetChanged();
         }
         isEverpause = false;
-        super.onResume();
         DownloadManager.getInstance(this).addObserver(dataWatcher);
     }
 
@@ -178,6 +180,26 @@ public class InstallActivity extends BaseActivity implements InstallFragmentAdap
         }
     }
 
+    //下载被删除事件
+    @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 = mAdapter.getLocationMap().get(status.getPackageName());
+            GameEntity gameEntity;
+            if (locationList != null && locationList.size() != 0) {
+                for (int location : locationList) {
+                    gameEntity = mAdapter.getGameList().get(location);
+                    if (gameEntity != null && gameEntity.getEntryMap() != null) {
+                        gameEntity.getEntryMap().remove(status.getPlatform());
+                    }
+                    mAdapter.notifyItemChanged(location);
+                }
+            }
+        }
+    }
+
     // 滑动item
     @Override
     public void onSmooth() {
@@ -187,4 +209,10 @@ public class InstallActivity extends BaseActivity implements InstallFragmentAdap
         swipeLayout.openAndColse();
 //        swipeLayout.close();
     }
+
+    @Override
+    public void onOpen() {
+        startActivityForResult(ChooseReceiverActivity.getIntent(this, true), KC_REQUEST);
+    }
+
 }