消息中心优化, 求版本功能完善(敏感词toast还要确认), 修复搜索游戏失败时无法重试问题

登录无网络处理

.gitignore

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

.gitmodules

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

CHANGELOG.md

@@ -0,0 +1,8 @@
+### Ver 3.0
+* x
+
+### Ver 2.6
+* xx
+
+### Ver 2.5
+* 此处写本次更新所做的业务和代码修改

README.md

@@ -1,9 +1,11 @@
 # 光环助手Android客户端
 
+### Sourceset/debug/release
+* https://developer.android.com/studio/build/build-variants.html#sourcesets
+
 ### 多渠道打包配置
 * 使用[ApkChannelPackage](https://github.com/ltlovezh/ApkChannelPackage)的方案
-
-* 正式打包命令：请使用./gradlew channelRelease打包渠道包
+* 正式打包命令：请使用./gradlew channelPubRelease打包渠道包
 
 ### 混淆配置
 * 配置文件：Android默认配置+proguard-rules.txt等
@@ -19,5 +21,20 @@
 * 修改``gradle.properties``文件将各种key填入其中，实现统一管理
 * 通过gradle文件内的resValue/buildConfigField/manifestPlaceHolder方式实现编译期间修改，具体情况请参考``./build.gradle``和``./app/build.gradle``配置
 
-### Ver 2.5
-* 此处写本次更新所做的业务和代码修改
+### 拉取代码步骤
+1. 拉取主项目代码: `git clone -b dev git@gitlab.ghzhushou.com:halo/assistant-android.git`
+2. 初始化公用类库: `bash ./scripts/init_submodules.sh`
+
+### submodule管理方式(只拉取master)
+* 提交代码，需要cd到submodule文件夹去做修改
+
+
+
+### TODO
+* GSON 序列化用统一的一个, GsonUtil fromJson
+* CleanApkAdapter 转化字符串size工具函数 比如SpeedUtils
+* getString 解决 字符串hardcode问题
+* Adapter 里面clicklistener 用接口传参将点击操作委托给controller
+* Adapter ViewHolder的功能，部分重写到ViewHolder类本身
+
+* activity 统一入口未完成(外部入口相关)

app/build.gradle

@@ -1,13 +1,12 @@
 apply plugin: 'com.android.application'
 
-apply plugin: 'com.neenbedankt.android-apt'
-
-//tinker插件
-//apply plugin: 'com.tencent.tinker.patch'
+apply plugin: 'kotlin-android' // kotlin
 
 // apkChannelPackage
 apply plugin: 'channel'
 
+apply from: 'tinker-support.gradle'
+
 android {
 
     compileOptions {
@@ -21,9 +20,10 @@ android {
 
     defaultConfig {
 
+        multiDexEnabled true
         javaCompileOptions {
             annotationProcessorOptions {
-                arguments = [ eventBusIndex : 'com.bandeng.MyEventBusIndex' ]
+                arguments = [eventBusIndex: 'com.gh.EventBusIndex']
             }
         }
 
@@ -40,35 +40,24 @@ 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'
 
         /**
          * All third-party appid/appkey
          */
         buildConfigField "String", "WECHAT_APPID", "\"${WECHAT_APPID}\""
+        buildConfigField "String", "WECHAT_SECRET", "\"${WECHAT_SECRET}\""
         buildConfigField "String", "TENCENT_APPID", "\"${TENCENT_APPID}\""
         buildConfigField "String", "WEIBO_APPKEY", "\"${WEIBO_APPKEY}\""
-        buildConfigField "String", "MIPUSH_APPID", "\"${MIPUSH_APPID}\""
-        buildConfigField "String", "MIPUSH_APPKEY", "\"${MIPUSH_APPKEY}\""
         buildConfigField "String", "MTA_APPKEY", "\"${MTA_APPKEY}\""
         buildConfigField "String", "TD_APPID", "\"${TD_APPID}\""
-        buildConfigField "String", "UMENG_APPKEY", "\"${UMENG_APPKEY}\""
-        buildConfigField "String", "UMENG_MESSAGE_SECRET", "\"${UMENG_MESSAGE_SECRET}\""
-
-        buildConfigField "String", "DEBUG_UMENG_APPKEY", "\"${DEBUG_UMENG_APPKEY}\""
-        buildConfigField "String", "DEBUG_UMENG_MESSAGE_SECRET", "\"${DEBUG_UMENG_MESSAGE_SECRET}\""
-        buildConfigField "String", "DEBUG_MIPUSH_APPID", "\"${DEBUG_MIPUSH_APPID}\""
-        buildConfigField "String", "DEBUG_MIPUSH_APPKEY", "\"${DEBUG_MIPUSH_APPKEY}\""
+        buildConfigField "String", "PATCH_VERSION_NAME", "\"${PATCH_VERSION_NAME}\""
 
     }
 
@@ -90,6 +79,12 @@ 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}\""
+            buildConfigField "String", "MIPUSH_APPID", "\"${DEBUG_MIPUSH_APPID}\""
+            buildConfigField "String", "MIPUSH_APPKEY", "\"${DEBUG_MIPUSH_APPKEY}\""
         }
         release {
             debuggable false
@@ -97,45 +92,50 @@ android {
             zipAlignEnabled true
             shrinkResources true
             signingConfig signingConfigs.release
+
+            buildConfigField "String", "UMENG_APPKEY", "\"${UMENG_APPKEY}\""
+            buildConfigField "String", "UMENG_MESSAGE_SECRET", "\"${UMENG_MESSAGE_SECRET}\""
+            buildConfigField "String", "MIPUSH_APPID", "\"${MIPUSH_APPID}\""
+            buildConfigField "String", "MIPUSH_APPKEY", "\"${MIPUSH_APPKEY}\""
         }
     }
 
     /**
-     * 多渠道打包，所有渠道值均通过java code设置
+     * 多渠道打包，渠道请参考"channel.txt"文件，所有渠道值均通过java code设置
      */
-//    productFlavors {
-//        GH_100 {}
-//        GH_101 {}
-//        GH_102 {}
-//        GH_103 {}
-//        GH_104 {}
-//        GH_106 {}
-//        GH_107 {}
-//        GH_108 {}
-//        GH_109 {}
-//        GH_110 {}
-//        GH_111 {}
-//        GH_113 {}
-//        GH_114 {}
-//        GH_115 {}
-//        GH_116 {}
-//        GH_117 {}
-//        GH_118 {}
-//        GH_119 {}
-//        GH_120 {}
-//        GH_121 {}
-//        GH_123 {}
-//        GH_127 {}
-//        GH_200 {}
-//        GH_201 {}
-//        GH_202 {}
-//        GH_203 {}
-//        GH_204 {}
-//        GH_205 {}
-//        GH_222 {}
-//        GH_307 {}
-//        GH_TEST {}
-//    }
+    productFlavors {
+        // publish release host
+        publish {
+            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 test dev host
+        internal {
+            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}\""
+        }
+    }
+
 //    productFlavors.all { flavor ->
 //        flavor.manifestPlaceholders = [CHANNEL_VALUE: name]//命令 gradlew assembleRelease
 //    }
@@ -150,12 +150,6 @@ channel {
     apkNameFormat = '${appName}-${versionName}-${versionCode}-${flavorName}-${buildType}'
 }
 
-apt {
-    arguments {
-        eventBusIndex "com.bandeng.MyEventBusIndex"
-    }
-}
-
 rebuildChannel {
 //    baseDebugApk = 已有Debug APK
 //    baseReleaseApk = 已有Release APK
@@ -166,66 +160,76 @@ 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
+    debugCompile "com.squareup.leakcanary:leakcanary-android:${leakcanary}"
+    debugCompile "com.facebook.stetho:stetho:${stetho}"
+    debugCompile "com.facebook.stetho:stetho-okhttp3:${stetho}"
+    debugCompile "com.squareup.okhttp3:logging-interceptor:${okHttp}"
 
-    compile libs.systemBarTint
+    compile "com.android.support:multidex:${multidex}"
+    compile "com.android.support:design:${androidSupport}"
+    compile "com.android.support:support-v4:${androidSupport}"
+    compile "com.android.support:appcompat-v7:${androidSupport}"
+    compile "com.android.support:support-annotations:${androidSupport}"
+    compile "com.android.support:percent:${androidSupport}"
 
-    compile libs.fresco
-    compile libs.frescoAnimatedGif
+    compile "com.kyleduo.switchbutton:library:${switchButton}"
+    compile "com.readystatesoftware.systembartint:systembartint:${systemBarTint}"
 
-    compile libs.okHttp
-    compile libs.okHttpLogInterceptor
+    compile "com.facebook.fresco:fresco:${fresco}"
+    compile "com.facebook.fresco:animated-gif:${fresco}"
 
-    compile libs.apkChannelPackage
+    compile "com.squareup.okhttp3:okhttp:${okHttp}"
 
-//    debugCompile libs.stetho
-//    debugCompile libs.stethoWithOkHttp
+    compile "com.leon.channel:helper:${apkChannelPackage}"
 
-    compile libs.retrofit
-    compile libs.retrofitWithGson   // include gson 2.7
-    compile libs.retrofitWithRxJava
-//    compile libs.gson
+    compile "com.squareup.retrofit2:retrofit:${retrofit}"
+    compile "com.squareup.retrofit2:converter-gson:${retrofit}"   // include gson 2.7
+    compile "com.squareup.retrofit2:adapter-rxjava:${retrofit}"
+//    compile "com.google.code.gson:gson:${gson}"
 
-    compile libs.ormliteAndroid
-    compile libs.ormliteCore
+    compile "com.j256.ormlite:ormlite-android:${ormlite}"
+    compile "com.j256.ormlite:ormlite-core:${ormlite}"
 
-    compile libs.butterKnife
-    apt libs.butterKnifeApt
+    compile "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
+    compile "org.greenrobot:eventbus:${eventbus}"
+    annotationProcessor "org.greenrobot:eventbus-annotation-processor:${eventbusApt}"
 
-    compile libs.swipeLayout
-    compile(libs.autoScrollViewPager) {
+    compile "io.reactivex:rxjava:${rxJava}"
+    compile "io.reactivex:rxandroid:${rxAndroid}"
+    compile "com.jakewharton.rxbinding:rxbinding:${rxBinding}"
+
+    //TODO update to rx 2.x
+//    compile "io.reactivex.rxjava2:rxjava:${rxJava2}"
+//    compile "io.reactivex.rxjava2:rxandroid:${rxAndroid2}"
+//    compile "com.jakewharton.rxbinding2:rxbinding:${rxBinding2}"
+
+    compile "com.google.zxing:core:${zxing}"
+    compile "com.google.zxing:android-core:${zxing}"
+
+    compile "com.daimajia.swipelayout:library:${swipeLayout}"
+    compile("cn.trinea.android.view.autoscrollviewpager:android-auto-scroll-view-pager:${autoScrollViewPager}") {
         exclude module: 'support-v4'
     }
 
-    //  tinker
-//    provided libs.tinker_anno
-//    compile libs.tinker_lib
+    compile "com.sina.weibo.sdk:core:${weiboSDK}"
 
-    compile libs.eventbus
-    apt libs.eventbusApt
-//    compile project(':libraries:EventBus')
+    // bugly with tinker support
+    compile "com.tencent.bugly:crashreport_upgrade:${buglyTinkerSupport}"
+
+    compile "pub.devrel:easypermissions:${easypermissions}"
+
+    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:WeiboShare')
     compile project(':libraries:iosched')
 
 }
@@ -237,12 +241,13 @@ if (propFile.exists()) {
     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.**
@@ -117,6 +131,10 @@
     <init>(java.lang.Throwable);
 }
 
+# weiboSdk
+-keep class com.sina.weibo.sdk.** { *; }
+-dontwarn android.webkit.WebView
+-dontwarn android.webkit.WebViewClient
 
 # app models
 -keep class com.gh.common.view.** {*;}
@@ -157,4 +175,13 @@
 
 -keepclassmembers enum * { *; }
 
-##---------------End: proguard configuration for Gson  ----------
+##---------------End: proguard configuration for Gson  ----------
+
+# ------ bugly ---------
+-dontwarn com.tencent.bugly.**
+-keep public class com.tencent.bugly.**{*;}
+
+# 重命名文件为SourceFile，再配合mapping符号表，可以拿到真实的类名
+-renamesourcefileattribute SourceFile
+# 保留源文件行号
+-keepattributes SourceFile,LineNumberTable

app/src/androidTest/java/com/gh/gamecenter/ApplicationTest.java

@@ -1,13 +0,0 @@
-package com.gh.gamecenter;
-
-import android.app.Application;
-import android.test.ApplicationTestCase;
-
-/**
- * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
- */
-public class ApplicationTest extends ApplicationTestCase<Application> {
-    public ApplicationTest() {
-        super(Application.class);
-    }
-}

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

@@ -0,0 +1,69 @@
+package com.gh.gamecenter;
+
+import android.app.Application;
+
+import com.facebook.stetho.Stetho;
+import com.facebook.stetho.okhttp3.StethoInterceptor;
+import com.lightgame.utils.Utils;
+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() {
+        HttpLoggingInterceptor loggingInterceptor = new HttpLoggingInterceptor(new HttpLoggingInterceptor.Logger() {
+
+            @Override
+            public void log(String message) {
+                //分段打印retrofit日志
+                if (message.startsWith("{") || message.startsWith("["))
+                    if (message.length() > 4000) {
+                        for (int i = 0; i < message.length(); i += 4000) {
+                            if (i + 4000 < message.length())
+                                Utils.log("OkHttp_Body::" + i, message.substring(i, i + 4000));
+                            else
+                                Utils.log("OkHttp_Body::" + i, message.substring(i, message.length()));
+                        }
+                    } else
+                        Utils.log("OkHttp_Body::", message);
+            }
+        });
+        loggingInterceptor.setLevel(HttpLoggingInterceptor.Level.BODY);
+
+        OkHttpClient.Builder builder = new OkHttpClient.Builder();
+        HttpLoggingInterceptor interceptor = new HttpLoggingInterceptor();
+        interceptor.setLevel(HttpLoggingInterceptor.Level.BASIC);
+        builder.addNetworkInterceptor(interceptor);
+        builder.addNetworkInterceptor(new StethoInterceptor());
+        if (BuildConfig.DEBUG) {
+            builder.addNetworkInterceptor(loggingInterceptor);
+        }
+        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,32 +56,37 @@
 
     <!--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"
-        android:theme = "@style/AppCompatTheme" >
+        android:theme = "@style/AppCompatTheme.APP" >
 
+        <!--android:launchMode = "singleTask"-->
         <activity
             android:name = "com.gh.gamecenter.SplashScreenActivity"
             android:configChanges = "keyboardHidden|orientation|screenSize"
+            android:noHistory = "true"
             android:screenOrientation = "portrait"
-            android:theme = "@style/AppGuideTheme"
-            android:uiOptions = "splitActionBarWhenNarrow" >
+            android:theme = "@style/AppGuideTheme" >
             <intent-filter >
                 <action android:name = "android.intent.action.MAIN" />
 
                 <category android:name = "android.intent.category.LAUNCHER" />
             </intent-filter >
         </activity >
+
         <activity
             android:name = "com.gh.gamecenter.MainActivity"
-            android:launchMode = "singleTop"
+            android:launchMode = "singleTask"
             android:screenOrientation = "portrait"
             android:windowSoftInputMode = "stateAlwaysHidden|adjustResize" />
+
         <activity
             android:name = "com.gh.gamecenter.DownloadManagerActivity"
+            android:launchMode = "singleTask"
             android:screenOrientation = "portrait" />
+
         <activity
             android:name = "com.gh.gamecenter.ViewImageActivity"
             android:theme = "@android:style/Theme.Black.NoTitleBar.Fullscreen" />
@@ -99,7 +112,7 @@
         <activity
             android:name = "com.gh.gamecenter.NewsSearchActivity"
             android:screenOrientation = "portrait"
-            android:windowSoftInputMode="stateHidden"/>
+            android:windowSoftInputMode = "stateHidden" />
         <activity
             android:name = "com.gh.gamecenter.GameNewsActivity"
             android:screenOrientation = "portrait" />
@@ -121,7 +134,7 @@
         <activity
             android:name = "com.gh.gamecenter.LibaoActivity"
             android:screenOrientation = "portrait"
-            android:windowSoftInputMode="stateHidden"/>
+            android:windowSoftInputMode = "stateHidden" />
         <activity
             android:name = "com.gh.gamecenter.LibaoDetailActivity"
             android:screenOrientation = "portrait" />
@@ -155,9 +168,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" />
@@ -169,8 +179,7 @@
             android:screenOrientation = "portrait" />
         <activity
             android:name = "com.gh.gamecenter.SuggestionActivity"
-            android:screenOrientation = "portrait"
-            android:windowSoftInputMode = "stateHidden|adjustResize" />
+            android:screenOrientation = "portrait" />
         <activity
             android:name = "com.gh.gamecenter.VoteActivity"
             android:screenOrientation = "portrait"
@@ -178,7 +187,48 @@
         <activity
             android:name = "com.gh.gamecenter.ToolBoxActivity"
             android:screenOrientation = "portrait"
-            android:windowSoftInputMode="stateHidden"/>
+            android:windowSoftInputMode = "stateHidden" />
+
+        <activity
+            android:name = "com.gh.gamecenter.WeiBoShareActivity"
+            android:screenOrientation = "portrait"
+            android:windowSoftInputMode = "stateHidden" />
+
+        <activity
+            android:name = "com.gh.gamecenter.InstallActivity"
+            android:screenOrientation = "portrait" />
+        <activity
+            android:name = "com.gh.gamecenter.LoginActivity"
+            android:screenOrientation = "portrait"
+            android:windowSoftInputMode = "stateHidden" />
+
+        <activity
+            android:name = "com.gh.gamecenter.UserInfoActivity"
+            android:screenOrientation = "portrait" />
+
+        <activity
+            android:name = "com.gh.gamecenter.UserRegionActivity"
+            android:screenOrientation = "portrait" />
+
+        <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.SkipActivity"
             android:theme = "@style/Theme.AppCompat.Light.Fullscreen.Transparent" >
@@ -191,6 +241,10 @@
             </intent-filter >
         </activity >
 
+        <activity
+            android:name = ".CommonActivity"
+            android:screenOrientation = "portrait" />
+
         <receiver android:name = "com.gh.gamecenter.receiver.InstallAndUninstallReceiver" >
             <intent-filter >
                 <action android:name = "android.intent.action.PACKAGE_ADDED" />
@@ -235,9 +289,7 @@
             </intent-filter >
         </receiver >
 
-        <service android:name = "com.gh.download.DownloadService" />
-
-        <service android:name = "com.gh.gamecenter.statistics.AppStaticService" />
+        <!--<service android:name = "com.gh.gamecenter.statistics.AppStaticService" />-->
 
     </application >
 

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

@@ -1,242 +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.bandeng.MyEventBusIndex;
-import com.facebook.drawee.backends.pipeline.Fresco;
-import com.gh.common.constant.Config;
-import com.gh.common.util.DataUtils;
-import com.gh.common.util.HttpsUtils;
-import com.gh.common.util.StringUtils;
-import com.gh.common.util.TokenUtils;
-import com.gh.common.util.Utils;
-import com.gh.gamecenter.BuildConfig;
-import com.leon.channel.helper.ChannelReaderUtil;
-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 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;
-    }
-
-    public static synchronized AppController getInstance() {
-        return mInstance;
-    }
-
-    public String getChannel() {
-        return mChannel;
-    }
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-
-        MultiDex.install(this);
-        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");
-//        }
-
-        HttpsUtils.initHttpsUrlConnection(this);
-
-//        if (BuildConfig.DEBUG) {
-//            Stetho.initializeWithDefaults(this);
-//        }
-
-        /**
-         * 注册push服务，注册成功后会向{@link GHPushMessageReceiver}发送广播
-         * 可以从{@link GHPushMessageReceiver#onCommandResult(Context, MiPushCommandMessage)}
-         * 的{@link MiPushCommandMessage} 对象参数中获取注册信息
-         */
-        if (shouldInit()) {
-            MiPushClient.registerPush(this, Config.MIPUSH_APPID, Config.MIPUSH_APPKEY);
-            if (BuildConfig.DEBUG) {
-                MiPushClient.registerPush(this, Config.DEBUG_MIPUSH_APPID, Config.DEBUG_MIPUSH_APPKEY);
-            }
-
-        }
-
-        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);
-        }
-
-        //友盟推送
-        final PushAgent pushAgent = PushAgent.getInstance(this);
-        pushAgent.setAppkeyAndSecret(Config.UMENG_APPKEY, Config.UMENG_MESSAGE_SECRET);
-        if (BuildConfig.DEBUG) {
-            // 设置debug的key，覆盖掉原值，非debug build这个if分支会被去掉
-            pushAgent.setAppkeyAndSecret(Config.DEBUG_UMENG_APPKEY, Config.DEBUG_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());
-
-//        // 监听屏幕状态广播
-//		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 MyEventBusIndex()).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;
-    }
-
-}

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

@@ -1,51 +0,0 @@
-//package com.gh.base;
-//
-//
-//import android.annotation.TargetApi;
-//import android.app.Application;
-//import android.content.Context;
-//import android.content.Intent;
-//import android.os.Build;
-//import android.support.multidex.MultiDex;
-//
-//import com.tencent.tinker.lib.listener.DefaultPatchListener;
-//import com.tencent.tinker.lib.listener.PatchListener;
-//import com.tencent.tinker.lib.patch.AbstractPatch;
-//import com.tencent.tinker.lib.patch.UpgradePatch;
-//import com.tencent.tinker.lib.reporter.DefaultLoadReporter;
-//import com.tencent.tinker.lib.reporter.DefaultPatchReporter;
-//import com.tencent.tinker.lib.reporter.LoadReporter;
-//import com.tencent.tinker.lib.reporter.PatchReporter;
-//import com.tencent.tinker.lib.tinker.TinkerInstaller;
-//import com.tencent.tinker.loader.app.DefaultApplicationLike;
-//
-//public class AppControllerLike extends DefaultApplicationLike {
-//
-//	public AppControllerLike(Application application, int tinkerFlags, boolean tinkerLoadVerifyFlag,
-//	                         long applicationStartElapsedTime, long applicationStartMillisTime,
-//	                         Intent tinkerResultIntent) {
-//		super(application, tinkerFlags, tinkerLoadVerifyFlag, applicationStartElapsedTime,
-//				applicationStartMillisTime, tinkerResultIntent);
-//	}
-//
-//	@Override
-//	public void onBaseContextAttached(Context base) {
-//		super.onBaseContextAttached(base);
-//		MultiDex.install(base);
-//
-//		LoadReporter loadReporter = new DefaultLoadReporter(getApplication());
-//		PatchReporter patchReporter = new DefaultPatchReporter(getApplication());
-//		PatchListener patchListener = new DefaultPatchListener(getApplication());
-//		AbstractPatch upgradePatchProcessor = new UpgradePatch();
-//
-//		TinkerInstaller.install(this, loadReporter, patchReporter, patchListener,
-//				AppTinkerResultService.class, upgradePatchProcessor);
-////		TinkerInstaller.install(this);
-//	}
-//
-//	@TargetApi(Build.VERSION_CODES.ICE_CREAM_SANDWICH)
-//	public void registerActivityLifecycleCallbacks(Application.ActivityLifecycleCallbacks callback) {
-//		getApplication().registerActivityLifecycleCallbacks(callback);
-//	}
-//
-//}

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

@@ -1,29 +0,0 @@
-//package com.gh.base;
-//
-//import com.gh.common.util.Utils;
-//import com.tencent.tinker.lib.service.DefaultTinkerResultService;
-//import com.tencent.tinker.lib.service.PatchResult;
-//import com.tencent.tinker.lib.util.TinkerServiceInternals;
-//
-//import java.io.File;
-//
-//
-//public class AppTinkerResultService extends DefaultTinkerResultService {
-//
-//	@Override
-//	public void onPatchResult(PatchResult result) {
-//		if (result == null) {
-//			return;
-//		}
-//		Utils.log(result);
-//
-//		//first, we want to kill the recover process
-//		TinkerServiceInternals.killTinkerPatchServiceProcess(getApplicationContext());
-//
-//		if (result.isSuccess) {
-//			Utils.log("Tinkder Success");
-//			deleteRawPatchFile(new File(result.rawPatchFilePath));
-//		}
-//	}
-//
-//}

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

@@ -6,15 +6,18 @@ 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.AppManager;
 import com.gh.common.util.DataCollectionUtils;
-import com.gh.common.util.FileUtils;
 import com.gh.gamecenter.SplashScreenActivity;
+import com.lightgame.config.CommonDebug;
+import com.lightgame.download.FileUtils;
+import com.lightgame.utils.AppManager;
+import com.lightgame.utils.Utils;
 import com.tencent.stat.StatService;
+import com.tendcloud.tenddata.TCAgent;
 
 import java.io.File;
 import java.io.FileWriter;
@@ -26,84 +29,58 @@ import java.util.Locale;
 
 public class AppUncaughtHandler implements UncaughtExceptionHandler {
 
-    private UncaughtExceptionHandler mDefaultHandler;
-    private AppController mAppController;
+    private Context mContext;
 
-    public AppUncaughtHandler(AppController appController) {
+    public AppUncaughtHandler(Context context) {
         // 获取系统默认的UncaughtException处理器
-        mDefaultHandler = Thread.getDefaultUncaughtExceptionHandler();
-        mAppController = appController;
+        mContext = context;
     }
 
     @Override
     public void uncaughtException(Thread thread, Throwable ex) {
-        if (!handleException(ex) && mDefaultHandler != null) {
-            // 如果用户没有处理则让系统默认的异常处理器来处理
-            mDefaultHandler.uncaughtException(thread, ex);
-        } else {
-            AppController.MAIN_EXECUTOR.execute(new Runnable() {
-                @Override
-                public void run() {
-                    Looper.prepare();
-                    Toast.makeText(mAppController.getApplicationContext(),
-                            "\"光环助手\"发生错误", Toast.LENGTH_SHORT).show();
-                    Looper.loop();
-                }
-            });
-            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 = mAppController.getApplicationContext().getSharedPreferences(
-                    Config.PREFERENCE, Context.MODE_PRIVATE);
-            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(mAppController.getApplicationContext(), SplashScreenActivity.class);
-                intent.setAction(Intent.ACTION_MAIN);
-                intent.addCategory(Intent.CATEGORY_LAUNCHER);
-                PendingIntent restartIntent = PendingIntent.getActivity(
-                        mAppController.getApplicationContext(), 0, intent,
-                        PendingIntent.FLAG_UPDATE_CURRENT);
-                // 退出程序并重启
-                AlarmManager mgr = (AlarmManager) mAppController.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(mAppController.getApplicationContext(), errorMsg);
-        StatService.reportException(mAppController, ex);
-
-        // 上传错误数据
-        DataCollectionUtils.uploadError(mAppController, errorMsg);
+        Config.setExceptionMsg(context, errorMsg);
 
         // 保存到本地
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd-HH-mm-ss", Locale.getDefault());
-        File file = new File(FileUtils.getLogPath(mAppController.getApplicationContext(),
+        File file = new File(FileUtils.getLogPath(context.getApplicationContext(),
                 format.format(new Date()) + "_gh_assist" + ".log"));
         FileWriter writer = null;
         try {
@@ -124,4 +101,41 @@ 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) {
+        }
+
+        // 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/main/java/com/gh/base/BaseActivity.java

@@ -1,42 +1,41 @@
 package com.gh.base;
 
-import android.content.Context;
-import android.os.Build;
 import android.os.Bundle;
+import android.support.annotation.NonNull;
 import android.view.View;
 import android.view.View.OnClickListener;
-import android.view.ViewGroup.LayoutParams;
-import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.gh.common.constant.Config;
-import com.gh.common.util.AppManager;
 import com.gh.common.util.DataUtils;
 import com.gh.common.util.DialogUtils;
-import com.gh.common.util.DisplayUtils;
-import com.gh.common.util.FileUtils;
 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.LoginActivity;
 import com.gh.gamecenter.R;
 import com.gh.gamecenter.eventbus.EBShowDialog;
-import com.gh.gamecenter.listener.OnCallBackListener;
-import com.readystatesoftware.systembartint.SystemBarTintManager.SystemBarConfig;
+import com.lightgame.download.FileUtils;
+import com.lightgame.utils.AppManager;
+import com.lightgame.utils.Utils;
 
 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.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 implements OnCallBackListener {
+public abstract class BaseActivity extends BaseAppCompatToolBarActivity implements EasyPermissions.PermissionCallbacks{
 
     protected String mEntrance;
     private boolean mIsPause;
@@ -59,39 +58,28 @@ public abstract class BaseActivity extends BaseAppCompatToolBarActivity implemen
     }
 
     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 reuse_actionbar = findViewById(R.id.reuse_actionbar);
-        if (reuse_actionbar != null) {
-            int actionbar_height = getSharedPreferences(Config.PREFERENCE, Context.MODE_PRIVATE)
-                    .getInt("actionbar_height", DisplayUtils.dip2px(getApplicationContext(), 55));
-            LinearLayout.LayoutParams lparams = new LinearLayout.LayoutParams(LayoutParams.MATCH_PARENT, actionbar_height);
-            reuse_actionbar.setLayoutParams(lparams);
-
-            findViewById(R.id.actionbar_rl_back).setOnClickListener(
-                    new OnClickListener() {
-                        @Override
-                        public void onClick(View v) {
-                            finish();
-                        }
-                    });
-        }
+        View back = findViewById(R.id.actionbar_rl_back);
+        if (back != null)
+            back.setOnClickListener(new OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    finish();
+                }
+            });
     }
 
-    protected void init(String title) {
+    protected void initTitle(String title) {
         TextView actionbar_tv_title = (TextView) findViewById(R.id.actionbar_tv_title);
         actionbar_tv_title.setText(title);
 //        setNavigationTitle(title);
     }
 
     public void toast(String msg) {
-        Toast.makeText(this, msg, Toast.LENGTH_SHORT).show();
+        Utils.toast(this, msg);
     }
 
     public void toast(int msg) {
@@ -123,20 +111,41 @@ public abstract class BaseActivity extends BaseAppCompatToolBarActivity implemen
 
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onEventMainThread(final EBShowDialog showDialog) {
+        //TODO 改为缓存到UI可见时才调用，参考beier-assist
         if (!mIsPause && this.getClass().getName().equals(RunningUtils.getTopActivity(this))) {
             if ("hijack".equals(showDialog.getType())) {
-                DialogUtils.showQqSessionDialog(this, null);// 建议用户联系客服
+                DialogUtils.showQqSessionDialog(this, "2586716223");// 建议用户联系客服
             } else if ("plugin".equals(showDialog.getType())) {
                 DialogUtils.showPluginDialog(this, new DialogUtils.ConfirmListener() {
                     @Override
                     public void onConfirm() {
                         if (FileUtils.isEmptyFile(showDialog.getPath())) {
-                            Toast.makeText(BaseActivity.this, "解析包出错（可能被误删了），请重新下载", Toast.LENGTH_SHORT).show();
+                            Utils.toast(BaseActivity.this, getString(R.string.install_failure_hint));
                         } else {
                             startActivity(PackageUtils.getUninstallIntent(BaseActivity.this, showDialog.getPath()));
                         }
                     }
                 });
+            } else if ("loginException".equals(showDialog.getType())) {
+                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, new DialogUtils.CancelListener() {
+                                @Override
+                                public void onCancel() {
+                                   startActivity(LoginActivity.getIntent(BaseActivity.this, false));
+                                }
+                            });
+                } catch (JSONException e) {
+                    e.printStackTrace();
+                }
+
+
             }
         }
     }
@@ -151,36 +160,31 @@ public abstract class BaseActivity extends BaseAppCompatToolBarActivity implemen
     @Override
     protected void onPause() {
         super.onPause();
-        DataUtils.onPause(this);
+//        DataUtils.onPause(this);
         mIsPause = true;
     }
 
     @Override
     protected void onResume() {
         super.onResume();
-        DataUtils.onResume(this);
+//        DataUtils.onResume(this);
         mIsPause = false;
-        DownloadManager.getInstance(this).initGameMap();
+//        DownloadManager.getInstance(this).initGameMap();
     }
 
     @Override
-    public void loadDone() {
+    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 loadDone(Object obj) {
+    public void onPermissionsGranted(int requestCode, List<String> perms) {
 
     }
-
-    @Override
-    public void loadError() {
-
-    }
-
-    @Override
-    public void loadEmpty() {
-
-    }
-
 }

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

@@ -1,325 +0,0 @@
-package com.gh.base;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
-import android.view.View;
-
-import com.gh.common.util.AppDebugConfig;
-import com.gh.common.util.AppManager;
-import com.gh.common.util.Util_System_Keyboard;
-import com.gh.gamecenter.R;
-
-
-/**
- * @author CsHeng
- */
-public abstract class BaseAppCompatActivity extends BaseAppCompatActivityLog implements FragmentNavigationDelegate,
-        OnBackPressedListener {
-
-    protected static final String ARGS_FRAGMENT_NAME = "frgName";
-    protected static final String ARGS_FRAGMENT_BUNDLE = "frgBundle";
-    protected View mContentView;
-
-    protected static Intent clearTop(Context context, Class<? extends Activity> cls) {
-        final Intent intent = getReorderToFrontIntent(context, cls);
-        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-        return intent;
-    }
-
-    protected static Intent getReorderToFrontIntent(Context context, Class<? extends Activity> cls) {
-        final Intent intent = new Intent(context, cls);
-        intent.addFlags(Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT);
-        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        return intent;
-    }
-
-    protected static void showActivity(Context context, Class<? extends Activity> cls) {
-        final Intent intent = getReorderToFrontIntent(context, cls);
-        context.startActivity(intent);
-    }
-
-    protected static void startFragmentForResult(Context context, Class<? extends Activity> activity,
-                                                 Class<? extends Fragment> fragment, Bundle bundle, int requestCode) {
-        if (context instanceof Activity) {
-            ((Activity) context).startActivityForResult(getFragmentIntent(context, activity, fragment, bundle),
-                    requestCode);
-        }
-    }
-
-    /**
-     * 根据传进来的fragment class和bundle extra来决定跳转到哪一个fragment
-     *
-     * @param context
-     * @param fragment fragment.getCanonicalName()
-     * @param bundle   fragment的构造参数
-     * @return
-     */
-    protected static Intent getFragmentIntent(Context context, Class<? extends Activity> activity,
-                                              Class<? extends Fragment> fragment, Bundle bundle) {
-        final Intent intent = getReorderToFrontIntent(context, activity);
-        intent.putExtra(ARGS_FRAGMENT_NAME, fragment.getCanonicalName());
-        intent.putExtra(ARGS_FRAGMENT_BUNDLE, bundle);
-        return intent;
-    }
-
-    protected static void startFragment(Context context, Class<? extends Activity> activity,
-                                        Class<? extends Fragment> fragment) {
-        startFragment(context, activity, fragment, null);
-    }
-
-    /**
-     * 启动Fragment
-     *
-     * @param context
-     * @param fragment
-     * @param bundle
-     */
-    protected static void startFragment(Context context, Class<? extends Activity> activity,
-                                        Class<? extends Fragment> fragment, Bundle bundle) {
-        context.startActivity(getFragmentIntent(context, activity, fragment, bundle));
-    }
-
-    private void handleRedirectFromUri(Uri uri) {
-        try {
-            if (AppDebugConfig.IS_DEBUG) {
-                AppDebugConfig.logMethodWithParams(this, uri, uri.getHost(), uri.getPath(), uri.getEncodedQuery());
-            }
-//			switch (uri.getPath()) {
-//				case SchemeConstants.PATH_OPEN_GAME: {
-//					/**
-//					 * 对于联运游戏：传入的game_id为0，game_url为对应的游戏链接，aid传联运游戏的aid
-//					 * 对于非联运游戏：传入非联运游戏的game_id，game_url不传，aid传0
-//					 */
-//					GameModel game = new GameModel();
-//					int gameId = Integer.parseInt(uri.getQueryParameter(SchemeConstants.PARAMS_GAMEID));
-//					game.setId(gameId);
-////					if (AppDebugConfig.IS_DEBUG) {
-////						int debugId = 1049;
-////						game.setId(debugId);
-////					}
-//					if (gameId == 0) {
-//						// cooperate
-//						int aid = Integer.parseInt(uri.getQueryParameter(SchemeConstants.PARAMS_AID));
-//						game.setAid(aid);
-//						String gameUrl = uri.getQueryParameter(SchemeConstants.PARAMS_GAMEURL);
-//						game.setUrl(gameUrl);
-//					}
-//					ApiRequester.requestGameDetail(this, game);
-//
-//					break;
-//				}
-//				case SchemeConstants.PATH_OPEN_ARTICLE: {
-//
-//					String url = uri.getQueryParameter(SchemeConstants.PARAMS_ARTICLE_URL);
-//					String title = uri.getQueryParameter(SchemeConstants.PARAMS_ARTICLE_TITLE);
-//
-//					if (!TextUtils.isEmpty(url) && !TextUtils.isEmpty(title)) {
-//						Bundle args = new Bundle();
-//						args.putString(Fragment_Browser_Web.ARGS_URL, url);
-//						args.putString(Fragment_Browser_Web.ARGS_TITLE, getString(R.string.title_article_detail));
-//						CommonActivity.startFragment(this, Fragment_Browser_Web.class, args);
-//					}
-//
-//					break;
-//				}
-//				default:
-//					break;
-//			}
-        } catch (Exception e) {
-            if (AppDebugConfig.IS_DEBUG) {
-//				Debug_SDK.e(e);
-            }
-        }
-    }
-
-    @Override
-    public boolean onHandleBackPressed() {
-        onBackPressed();
-        return true;
-    }
-
-    protected boolean handleBackPressed() {
-        if (AppDebugConfig.IS_DEBUG) {
-            AppDebugConfig.logMethodWithParams(this);
-        }
-        final Fragment curFragment = getTopFragment();
-        if (curFragment instanceof OnBackPressedListener &&
-                ((OnBackPressedListener) curFragment).onHandleBackPressed()) {
-            return true;
-        }
-        if (popFragment()) {
-            return true;
-        }
-        return false;
-    }
-
-    public Fragment getTopFragment() {
-        return getSupportFragmentManager().findFragmentById(R.id.layout_activity_content);
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        final int layoutId = getLayoutId();
-        if (layoutId != 0) {
-            mContentView = getLayoutInflater().inflate(layoutId, null);
-            setContentView(mContentView);
-        }
-        if (savedInstanceState == null) {
-            handleRedirectIntent(getIntent());
-        }
-        AppManager.getInstance().addActivity(this);
-    }
-
-    protected abstract int getLayoutId();
-
-    /**
-     * 1、判断当前是否存在某Fragment，例如下载管理器已经在栈中，则不重新启动，而将其带到最上层  (FindFragmentWithTag)
-     * 2、支持URI调用？
-     * 是否需要重新导向到其他Activity
-     */
-    protected void handleRedirectIntent(Intent intent) {
-        try {
-            if (AppDebugConfig.IS_DEBUG) {
-                AppDebugConfig.logMethodWithParams(this, intent.toUri(Intent.URI_INTENT_SCHEME));
-            }
-
-            // 1、根据从网页抓取到的Intent跳转进来，处理custom uri
-//			final Uri uri = intent.getData();
-//			if (uri != null && SchemeConstants.SCHEME_FFSS.equals(uri.getScheme())) {
-//				handleRedirectFromUri(uri);
-//				return;
-//			}
-//
-//			// 2、根据序列化的数据来重新构建Fragment实例，若没有，则是旧的形式来决定传参
-//			final String fragmentName = intent.getStringExtra(ARGS_FRAGMENT_NAME);
-//			if (AppDebugConfig.IS_DEBUG) {
-//				AppDebugConfig.logMethodWithParams(this, fragmentName);
-//			}
-//			if (!TextUtils.isEmpty(fragmentName)) {
-//				final Bundle args = intent.getBundleExtra(ARGS_FRAGMENT_BUNDLE);
-//				final Fragment fragment = Fragment.instantiate(this, fragmentName, args);
-//				if (fragment instanceof DialogFragment) {
-//					((DialogFragment) fragment).show(getSupportFragmentManager(), fragmentName);
-//				} else {
-//					getSupportFragmentManager().beginTransaction().replace(R.id.layout_activity_content, fragment)
-//							.commitAllowingStateLoss();
-//				}
-//			}
-        } catch (Throwable e) {
-            if (AppDebugConfig.IS_DEBUG) {
-                AppDebugConfig.logMethodWithParams(this, e);
-            }
-        }
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        AppManager.getInstance().finishActivity(this);
-    }
-
-    @Override
-    public void addFragment(Fragment fragment) {
-        getSupportFragmentManager().beginTransaction().add(R.id.layout_activity_content, fragment)
-                .addToBackStack(fragment.toString()).commitAllowingStateLoss();
-        Util_System_Keyboard.hideSoftKeyboard(this);
-    }
-
-    @Override
-    public void replaceFragment(Fragment toReplace) {
-        final FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
-        ft.replace(R.id.layout_activity_content, toReplace).addToBackStack(toReplace.toString());
-        ft.commitAllowingStateLoss();
-        Util_System_Keyboard.hideSoftKeyboard(this);
-    }
-
-    @Override
-    public void removeFragment(Fragment toRemove) {
-        final FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
-        ft.replace(R.id.layout_activity_content, toRemove).addToBackStack(toRemove.toString());
-        ft.commitAllowingStateLoss();
-        Util_System_Keyboard.hideSoftKeyboard(this);
-    }
-
-    @Override
-    public void showFragment(Fragment toShow) {
-        final FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
-        ft.show(toShow).addToBackStack(toShow.toString());
-        ft.commitAllowingStateLoss();
-        Util_System_Keyboard.hideSoftKeyboard(this);
-    }
-
-    @Override
-    public void hideFragment(Fragment toHide) {
-        final FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
-        ft.show(toHide).addToBackStack(toHide.toString());
-        ft.commitAllowingStateLoss();
-        Util_System_Keyboard.hideSoftKeyboard(this);
-    }
-
-    @Override
-    public boolean popFragment() {
-        if (AppDebugConfig.IS_DEBUG) {
-            AppDebugConfig.logMethodWithParams(this, getSupportFragmentManager().getBackStackEntryCount());
-        }
-        final int backStackCount = getSupportFragmentManager().getBackStackEntryCount();
-        if (backStackCount > 0) {
-            Util_System_Keyboard.hideSoftKeyboard(this);
-            getSupportFragmentManager().popBackStack();
-            return true;
-        }
-        return false;
-    }
-
-    @Override
-    public void popFragmentToBase() {
-        getSupportFragmentManager().popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE);
-    }
-
-    /**
-     * forward ActivityResultListener to fragments this activity hosts
-     *
-     * @param requestCode
-     * @param resultCode
-     * @param data
-     */
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-        if (AppDebugConfig.IS_DEBUG) {
-            AppDebugConfig.logMethodWithParams(this, requestCode, resultCode, data);
-        }
-        final Fragment fragment = getTopFragment();
-        if (fragment != null) {
-            fragment.onActivityResult(requestCode, resultCode, data);
-        }
-    }
-
-    @Override
-    public void onBackPressed() {
-        if (AppDebugConfig.IS_DEBUG) {
-            AppDebugConfig.logMethodWithParams(this);
-        }
-        if (handleBackPressed()) {
-            return;
-        }
-        // default finish activity
-        Util_System_Keyboard.hideSoftKeyboard(this);
-        finish();
-    }
-
-    @Override
-    protected void onNewIntent(Intent intent) {
-        super.onNewIntent(intent);
-        setIntent(intent);
-        handleRedirectIntent(intent);
-    }
-
-}

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

@@ -1,94 +0,0 @@
-package com.gh.base;
-
-import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
-
-import com.gh.common.util.AppDebugConfig;
-
-
-/**
- * @author: CsHeng (csheng1204[at]gmail[dot]com)
- * Date: 13-7-25
- * Time: 下午8:42
- */
-public class BaseAppCompatActivityLog extends AppCompatActivity {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        if (AppDebugConfig.IS_DEBUG) {
-            AppDebugConfig.logMethodName(this);
-        }
-    }
-
-    @Override
-    protected void onStop() {
-        super.onStop();
-        if (AppDebugConfig.IS_DEBUG) {
-            AppDebugConfig.logMethodName(this);
-        }
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        if (AppDebugConfig.IS_DEBUG) {
-            AppDebugConfig.logMethodName(this);
-        }
-    }
-
-    @Override
-    protected void onSaveInstanceState(Bundle outState) {
-        super.onSaveInstanceState(outState);
-        if (AppDebugConfig.IS_DEBUG) {
-            AppDebugConfig.logMethodName(this);
-        }
-    }
-
-    @Override
-    public void onLowMemory() {
-        super.onLowMemory();
-        if (AppDebugConfig.IS_DEBUG) {
-            AppDebugConfig.logMethodName(this);
-        }
-    }
-
-    @Override
-    protected void onPause() {
-        super.onPause();
-        try {
-            if (AppDebugConfig.IS_DEBUG) {
-                AppDebugConfig.logMethodName(this);
-            }
-        } catch (Throwable e) {
-        }
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        try {
-            if (AppDebugConfig.IS_DEBUG) {
-                AppDebugConfig.logMethodName(this);
-            }
-        } catch (Throwable e) {
-        }
-    }
-
-    @Override
-    protected void onStart() {
-        super.onStart();
-        if (AppDebugConfig.IS_DEBUG) {
-            AppDebugConfig.logMethodName(this);
-        }
-    }
-
-    @Override
-    protected void onRestoreInstanceState(Bundle savedInstanceState) {
-        super.onRestoreInstanceState(savedInstanceState);
-        if (AppDebugConfig.IS_DEBUG) {
-            AppDebugConfig.logMethodName(this);
-        }
-    }
-
-}

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

@@ -1,114 +1,37 @@
 package com.gh.base;
 
-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.Window;
-import android.view.WindowManager;
+import android.view.View;
 
 import com.gh.gamecenter.R;
-import com.readystatesoftware.systembartint.SystemBarTintManager;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
+import com.lightgame.BaseAppCompatActivity;
 
 /**
  * Created by csheng on 15-10-12.
  */
-public abstract class BaseAppCompatToolBarActivity extends BaseAppCompatActivity implements ToolbarController {
+
+public abstract class BaseAppCompatToolBarActivity extends BaseAppCompatActivity {
 
     private Toolbar mToolbar;
-    private SystemBarTintManager mTintManager;
 
-    // TODO 获取沉浸栏管理，要进行版本判断或者判断是否为空
-    protected 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);
         }
     }
 
-    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;
-
-            }
-        }
-    }
-
-    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()) {
@@ -120,19 +43,4 @@ public abstract class BaseAppCompatToolBarActivity extends BaseAppCompatActivity
 
     protected abstract boolean onNavigationIconClicked();
 
-    @Override
-    public void setNavigationTitle(int res) {
-        mToolbar.setTitle(res);
-    }
-
-    @Override
-    public void setNavigationTitle(CharSequence res) {
-        mToolbar.setTitle(res);
-    }
-
-    @Override
-    public Toolbar getToolBar() {
-        return mToolbar;
-    }
-
 }

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

@@ -1,394 +0,0 @@
-package com.gh.base;
-
-import android.content.Intent;
-import android.os.Bundle;
-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.FileUtils;
-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.DataWatcher;
-import com.gh.download.DownloadEntity;
-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.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);
-
-//        View contentView = View.inflate(this, R.layout.activity_detail, null);
-
-        // 添加分享图标
-        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);
-
-//        init(contentView);
-
-        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);
-                if ("插件化".equals(status)) {
-                    detail_tv_download.setBackgroundResource(R.drawable.game_item_btn_plugin_style);
-                } else if ("打开".equals(status)) {
-                    detail_tv_download.setBackgroundResource(R.drawable.game_item_btn_launch_style);
-                } else {
-                    detail_tv_download.setBackgroundResource(R.drawable.game_item_btn_download_style);
-                }
-
-                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(getResources().getDrawable(R.drawable.progressbar_plugin_radius_style));
-                } else {
-                    detail_pb_progressbar.setProgressDrawable(getResources().getDrawable(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);
-            }
-        }
-    }
-
-}

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

@@ -1,100 +0,0 @@
-package com.gh.base;
-
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Toast;
-
-import com.gh.common.util.EntranceUtils;
-import com.gh.gamecenter.listener.OnCallBackListener;
-
-import org.greenrobot.eventbus.EventBus;
-
-import butterknife.ButterKnife;
-
-/**
- * Created by LGT on 2016/9/4.
- * Fragment 基类
- */
-public class BaseFragment extends Fragment implements OnCallBackListener {
-
-    protected View view;
-
-    protected boolean isEverpause;
-
-    protected String mEntrance;
-
-    protected void init(int layout) {
-        view = View.inflate(getActivity(), layout, null);
-
-        ButterKnife.bind(this, view);
-    }
-
-    @Override
-    public void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        mEntrance = getActivity().getIntent().getStringExtra(EntranceUtils.KEY_ENTRANCE);
-        isEverpause = false;
-        EventBus.getDefault().register(this);
-    }
-
-    @Nullable
-    @Override
-    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
-                             @Nullable Bundle savedInstanceState) {
-        if (container != null) {
-            container.removeView(view);
-        }
-        return view;
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        isEverpause = false;
-    }
-
-    @Override
-    public void onPause() {
-        super.onPause();
-        isEverpause = true;
-    }
-
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-        EventBus.getDefault().unregister(this);
-    }
-
-    public void toast(String msg) {
-        Toast.makeText(getContext(), msg, Toast.LENGTH_SHORT).show();
-    }
-
-    public boolean isEverpause() {
-        return isEverpause;
-    }
-
-    @Override
-    public void loadDone() {
-
-    }
-
-    @Override
-    public void loadDone(Object obj) {
-
-    }
-
-    @Override
-    public void loadError() {
-
-    }
-
-    @Override
-    public void loadEmpty() {
-
-    }
-
-}

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

@@ -1,206 +0,0 @@
-//package com.gh.base;
-//
-//import android.annotation.TargetApi;
-//import android.content.Context;
-//import android.graphics.Color;
-//import android.os.Build;
-//import android.os.Bundle;
-//import android.support.v4.app.FragmentActivity;
-//import android.view.*;
-//import android.view.View.OnClickListener;
-//import android.view.ViewGroup.LayoutParams;
-//import android.widget.*;
-//import butterknife.ButterKnife;
-//import com.gh.common.constant.Config;
-//import com.gh.common.util.*;
-//import com.gh.download.DownloadManager;
-//import com.gh.gamecenter.R;
-//import com.gh.gamecenter.eventbus.EBShowDialog;
-//import com.readystatesoftware.systembartint.SystemBarTintManager;
-//import com.readystatesoftware.systembartint.SystemBarTintManager.SystemBarConfig;
-//import de.greenrobot.event.EventBus;
-//
-//import java.lang.reflect.Field;
-//import java.lang.reflect.Method;
-//import java.util.ArrayList;
-//
-//public class BaseFragmentActivity extends FragmentActivity {
-//
-//    protected String mEntrance;
-//
-//    private boolean isPause;
-//
-//    @Override
-//    protected void onCreate(Bundle savedInstanceState) {
-//        super.onCreate(savedInstanceState);
-//        AppManager.getInstance().addActivity(this);
-//        EventBus.getDefault().register(this);
-//        mEntrance = getIntent().getStringExtra("mEntrance");
-//        if (getIntent().getBundleExtra("data") != null) {
-//            mEntrance = getIntent().getBundleExtra("data").getString("mEntrance");
-//        }
-//    }
-//
-//    public void init(View contentView, String title) {
-//        init(contentView);
-//        TextView actionbar_tv_title = (TextView) findViewById(R.id.actionbar_tv_title);
-//        actionbar_tv_title.setText(title);
-//    }
-//
-//    public void init(View contentView) {
-//        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-//            setTheme(R.style.AppTheme);
-//            setTranslucentStatus(true);
-//            SystemBarTintManager tintManager = new SystemBarTintManager(this);
-//            tintManager.setStatusBarTintEnabled(true);
-//            if (Build.MANUFACTURER.equals("Meizu") || Build.MANUFACTURER.equals("Xiaomi")) {
-//                tintManager.setStatusBarTintColor(Color.WHITE);
-//            } else {
-//                tintManager.setStatusBarTintColor(Color.BLACK);
-//            }
-//            SystemBarConfig config = tintManager.getConfig();
-//            contentView.setPadding(0, config.getPixelInsetTop(false), 0,
-//                    config.getPixelInsetBottom());
-//
-//            if (Build.MANUFACTURER.equals("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();
-//                }
-//            } else if (Build.MANUFACTURER.equals("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();
-//                }
-//            }
-//        }
-//
-//        setContentView(contentView);
-//
-//        ButterKnife.bind(this);
-//
-//        int actionbar_height = getSharedPreferences(Config.PREFERENCE,
-//                Context.MODE_PRIVATE).getInt("actionbar_height",
-//                DisplayUtils.dip2px(getApplicationContext(), 48));
-//
-//        RelativeLayout reuse_actionbar = (RelativeLayout) findViewById(R.id.reuse_actionbar);
-//        LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(
-//                LayoutParams.MATCH_PARENT, actionbar_height);
-//        reuse_actionbar.setLayoutParams(params);
-//
-//        findViewById(R.id.actionbar_rl_back).setOnClickListener(
-//                new OnClickListener() {
-//                    @Override
-//                    public void onClick(View v) {
-//                        finish();
-//                    }
-//                });
-//    }
-//
-//    public void toast(String msg) {
-//        Toast.makeText(this, msg, Toast.LENGTH_SHORT).show();
-//    }
-//
-//    public void toast(int msg) {
-//        Toast.makeText(this, msg, Toast.LENGTH_SHORT).show();
-//    }
-//
-//    @TargetApi(19)
-//    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);
-//    }
-//
-//    //如果是游戏分享，newsTitle默认为空
-//    public void showShare(String url, String gameName, String icon, String newsTitle, ArrayList<String> tag) {
-//
-//        //判断是否是官方版
-//        boolean isPlugin = false;
-//        if (tag != null) {
-//            for (String s : tag) {
-//                if (!"官方版".equals(s)) {
-//                    isPlugin = true;
-//                }
-//            }
-//        }
-//
-//        ShareUtils.getInstance(this).showShareWindows(new View(this), url, gameName, icon, newsTitle, isPlugin, true);
-//
-//        if (newsTitle == null) {
-//            DataUtils.onEvent(this, "内容分享", gameName);
-//        } else {
-//            DataUtils.onEvent(this, "内容分享", newsTitle);
-//        }
-//    }
-//
-//    public void onEventMainThread(final EBShowDialog showDialog) {
-//        if (!isPause && this.getClass().getName().equals(RunningUtils.getTopActivity(this))) {
-//            if ("hijack".equals(showDialog.getType())) {
-//                DialogUtils.showQqSessionDialog(this, null);// 建议用户联系客服
-//            } else if ("plugin".equals(showDialog.getType())) {
-//                DialogUtils.showPluginDialog(this, new DialogUtils.ConfirmListener() {
-//                    @Override
-//                    public void onConfirm() {
-//                        if (FileUtils.isEmptyFile(showDialog.getPath())) {
-//                            Toast.makeText(BaseFragmentActivity.this, "解析包出错（可能被误删了），请重新下载", Toast.LENGTH_SHORT).show();
-//                        } else {
-//                            startActivity(PackageUtils.getUninstallIntent(BaseFragmentActivity.this, showDialog.getPath()));
-//                        }
-//                    }
-//                });
-//            }
-//        }
-//    }
-//
-//    @Override
-//    protected void onDestroy() {
-//        super.onDestroy();
-//        EventBus.getDefault().unregister(this);
-//        AppManager.getInstance().finishActivity(this);
-//    }
-//
-//    @Override
-//    protected void onPause() {
-//        super.onPause();
-//        DataUtils.onPause(this);
-//        isPause = true;
-//    }
-//
-//    @Override
-//    protected void onResume() {
-//        super.onResume();
-//        DataUtils.onResume(this);
-//        isPause = false;
-//        DownloadManager.getInstance(this).initGameMap();
-//    }
-//
-//}

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

@@ -0,0 +1,43 @@
+package com.gh.base;
+
+import android.support.v7.widget.RecyclerView;
+import android.view.View;
+
+import butterknife.ButterKnife;
+
+/**
+ * 目前仅提供butterknife bind方法
+ *
+ * @author CsHeng
+ * @Date 16/06/2017
+ * @Time 9:55 AM
+ */
+
+public abstract class BaseRecyclerViewHolder<T> extends RecyclerView.ViewHolder implements View.OnClickListener {
+
+    private T data;
+    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.data = data;
+        this.mListClickListener = listClickListener;
+    }
+
+    @Override
+    public void onClick(View view) {
+        mListClickListener.onListClick(view, getAdapterPosition(), data);
+    }
+
+}

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

@@ -1,26 +0,0 @@
-package com.gh.base;
-
-import android.support.v4.app.Fragment;
-
-/**
- * @author CsHeng
- * @Date 15-9-29
- * @Time 上午10:24
- */
-public interface FragmentNavigationDelegate {
-
-    void addFragment(Fragment toAdd);
-
-    void replaceFragment(Fragment toReplace);
-
-    void removeFragment(Fragment toRemove);
-
-    void showFragment(Fragment toShow);
-
-    void hideFragment(Fragment toHide);
-
-    boolean popFragment();
-
-    void popFragmentToBase();
-
-}

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

@@ -4,6 +4,9 @@ import android.app.Activity;
 import android.app.Application.ActivityLifecycleCallbacks;
 import android.os.Bundle;
 
+import com.gh.common.util.DataUtils;
+import com.gh.download.DownloadManager;
+
 /**
  * 1、写点针对生命周期的统计代码
  * 2、写点通用的逻辑
@@ -29,11 +32,18 @@ public class GHActivityLifecycleCallbacksImpl implements ActivityLifecycleCallba
     @Override
     public void onActivityResumed(Activity activity) {
 
+        DataUtils.onResume(activity);
+        try {
+            // 初始化gameMap
+            DownloadManager.getInstance(activity).initGameMap();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
 
     @Override
     public void onActivityPaused(Activity activity) {
-
+        DataUtils.onPause(activity);
     }
 
     @Override

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

@@ -17,12 +17,13 @@ import android.widget.RemoteViews;
 
 import com.gh.common.util.AppDebugConfig;
 import com.gh.common.util.EntranceUtils;
-import com.gh.common.util.FileUtils;
 import com.gh.common.util.PackageUtils;
 import com.gh.common.util.TokenUtils;
-import com.gh.common.util.Utils;
 import com.gh.gamecenter.BuildConfig;
 import com.gh.gamecenter.R;
+import com.halo.assistant.HaloApp;
+import com.lightgame.download.FileUtils;
+import com.lightgame.utils.Utils;
 import com.xiaomi.mipush.sdk.ErrorCode;
 import com.xiaomi.mipush.sdk.MiPushClient;
 import com.xiaomi.mipush.sdk.MiPushCommandMessage;
@@ -44,7 +45,7 @@ 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.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;
@@ -95,54 +96,62 @@ public class GHPushMessageReceiver extends PushMessageReceiver {
                 Utils.log("channel = " + channel);
 
                 // 1判断渠道号是否一致或是否为ALL
-                String packageChannel = AppController.getInstance().getChannel();
+                String packageChannel = HaloApp.getInstance().getChannel();
                 if ("ALL".equals(channel) || channel.equalsIgnoreCase(packageChannel)) {
                     String type = jsonObject.getString(KEY_TYPE);
                     Utils.log("type = " + type);
-                    if ("NEWS".equals(type)) {
-                        // 新闻推送
-                        JSONArray jsonArray = jsonObject.getJSONArray("package");
-                        ArrayMap<String, Boolean> 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;
+                    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;
+                                }
                             }
-                        }
-                    } else if ("PLUGIN_UPDATE".equals(type)) {
-                        // 插件更新推送
-                        JSONArray jsonArray = jsonObject.getJSONArray("apk");
-                        ArrayMap<String, Boolean> 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;
+                            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;
                                 }
-                                // 显示推送的消息
-                                showNotification(context, jsonObject, 1);
-                                break;
                             }
-                        }
-                    } else if ("NEW_GAME".equals(type)) {
-                        // 新游推送
-                        showNotification(context, jsonObject, 2);
+                            break;
+                        case "NEW_GAME":
+                            // 新游推送
+                            showNotification(context, jsonObject, 2);
+                            break;
+                        default:
+                            break;
                     }
                 }
             }
@@ -169,13 +178,6 @@ public class GHPushMessageReceiver extends PushMessageReceiver {
 
         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") &&
@@ -202,6 +204,14 @@ public class GHPushMessageReceiver extends PushMessageReceiver {
             path = null;
         }
 
+        final NotificationCompat.Builder builder = new NotificationCompat.Builder(context)
+                .setTicker(jsonObject.getString("pushTitle"))
+                .setContentTitle(jsonObject.getString("pushTitle"))
+                .setContentText(jsonObject.getString("pushDesc"))
+                .setContentIntent(pendingIntent)
+                .setDefaults(Notification.DEFAULT_SOUND)    // 添加系统默认声音
+                .setAutoCancel(true);                      // FLAG_AUTO_CANCEL表明当通知被用户点击时，通知将被清除。
+
         if (remoteViews != null) {
             if (path == null) {
                 remoteViews.setImageViewBitmap(R.id.icon, BitmapFactory.decodeResource(context.getResources(), R.drawable.logo));
@@ -210,25 +220,20 @@ public class GHPushMessageReceiver extends PushMessageReceiver {
             }
             remoteViews.setTextViewText(R.id.title, jsonObject.getString("pushTitle"));
             remoteViews.setTextViewText(R.id.intro, jsonObject.getString("pushDesc"));
-            notification.contentView = remoteViews;
+
+            builder.setSmallIcon(R.drawable.logo);
+            builder.setCustomContentView(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);
+            builder.setSmallIcon(R.drawable.logo_black);
             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哪里增加一个提示
+        nManager.notify(((int) System.currentTimeMillis() / 1000), builder.build());// 通过通知管理器来发起通知。如果id不同，则每click，在status哪里增加一个提示
     }
 
     private ArrayList<String> getAllPackageName(Context context) {
@@ -254,18 +259,24 @@ public class GHPushMessageReceiver extends PushMessageReceiver {
             bundle.putString(KEY_ENTRANCE, ENTRANCE_MIPUSH);
             String type = response.getString(KEY_TYPE);
             String target = response.getString(KEY_TARGET);
-            if (HOST_ARTICLE.equals(type)) {
-                bundle.putString(KEY_TO, "NewsDetailActivity");
-                bundle.putString(KEY_NEWSID, target);
-            } else if (HOST_GAME.equals(type)) {
-                bundle.putString(KEY_TO, "GameDetailActivity");
-                bundle.putString(KEY_GAMEID, target);
-            } else if (HOSt_COLUMN.equals(type)) {
-                bundle.putString(KEY_TO, "SubjectActivity");
-                bundle.putString(KEY_ID, target);
-            } else if (HOST_WEB.equals(type)) {
-                bundle.putString(KEY_TO, "WebActivity");
-                bundle.putString(KEY_URL, 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) {
@@ -274,8 +285,7 @@ public class GHPushMessageReceiver extends PushMessageReceiver {
     }
 
     @Override
-    public void onNotificationMessageArrived(Context context,
-                                             MiPushMessage message) {
+    public void onNotificationMessageArrived(Context context, MiPushMessage message) {
         if (BuildConfig.DEBUG) {
             AppDebugConfig.logMethodWithParams(this, message);
         }

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

@@ -24,18 +24,23 @@ public class GHUmengNotificationClickHandler extends UmengNotificationClickHandl
             bundle.putString(EntranceUtils.KEY_ENTRANCE, EntranceUtils.ENTRANCE_UMENG);
             String type = response.getString(EntranceUtils.KEY_TYPE);
             String target = response.getString(EntranceUtils.KEY_TARGET);
-            if (EntranceUtils.HOST_ARTICLE.equals(type)) {
-                bundle.putString(EntranceUtils.KEY_TO, "NewsDetailActivity");
-                bundle.putString(EntranceUtils.KEY_NEWSID, target);
-            } else if (EntranceUtils.HOST_GAME.equals(type)) {
-                bundle.putString(EntranceUtils.KEY_TO, "GameDetailActivity");
-                bundle.putString(EntranceUtils.KEY_GAMEID, target);
-            } else if (EntranceUtils.HOSt_COLUMN.equals(type)) {
-                bundle.putString(EntranceUtils.KEY_TO, "SubjectActivity");
-                bundle.putString(EntranceUtils.KEY_ID, target);
-            } else if (EntranceUtils.HOST_WEB.equals(type)) {
-                bundle.putString(EntranceUtils.KEY_TO, "WebActivity");
-                bundle.putString(EntranceUtils.KEY_URL, target);
+            switch (type) {
+                case EntranceUtils.HOST_ARTICLE:
+                    bundle.putString(EntranceUtils.KEY_TO, "NewsDetailActivity");
+                    bundle.putString(EntranceUtils.KEY_NEWSID, target);
+                    break;
+                case EntranceUtils.HOST_GAME:
+                    bundle.putString(EntranceUtils.KEY_TO, "GameDetailActivity");
+                    bundle.putString(EntranceUtils.KEY_GAMEID, target);
+                    break;
+                case EntranceUtils.HOST_COLUMN:
+                    bundle.putString(EntranceUtils.KEY_TO, "SubjectActivity");
+                    bundle.putString(EntranceUtils.KEY_ID, target);
+                    break;
+                case EntranceUtils.HOST_WEB:
+                    bundle.putString(EntranceUtils.KEY_TO, "WebActivity");
+                    bundle.putString(EntranceUtils.KEY_URL, target);
+                    break;
             }
             EntranceUtils.jumpActivity(context, bundle);
         } catch (JSONException e) {

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

@@ -1,275 +0,0 @@
-package com.gh.base;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.animation.AlphaAnimation;
-import android.view.animation.Animation;
-import android.view.animation.ScaleAnimation;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import com.gh.common.constant.Config;
-import com.gh.common.util.DataCollectionUtils;
-import com.gh.common.util.DataUtils;
-import com.gh.common.util.DisplayUtils;
-import com.gh.common.util.EntranceUtils;
-import com.gh.download.DownloadManager;
-import com.gh.gamecenter.ConcernActivity;
-import com.gh.gamecenter.DownloadManagerActivity;
-import com.gh.gamecenter.R;
-import com.gh.gamecenter.SearchActivity;
-import com.gh.gamecenter.eventbus.EBDownloadStatus;
-import com.gh.gamecenter.eventbus.EBReuse;
-import com.gh.gamecenter.manager.PackageManager;
-
-import org.greenrobot.eventbus.EventBus;
-import org.greenrobot.eventbus.Subscribe;
-import org.greenrobot.eventbus.ThreadMode;
-
-import java.util.ArrayList;
-
-
-/**
- * Created by LGT on 2016/9/9.
- * 工具栏 搜索控制
- */
-public class HomeFragment extends Fragment implements View.OnClickListener, SearchBarHint {
-
-    protected View view;
-
-    private TextView downloadHint;
-    private TextView searchHint;
-
-    private AlphaAnimation mAlphaAnimation;
-
-    private ArrayList<String> hintList;
-    private int hintIndex;
-
-    @Override
-    public void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        if (savedInstanceState != null) {
-            hintList = savedInstanceState.getStringArrayList("hint");
-        }
-
-        hintIndex = 0;
-
-        view = View.inflate(getActivity(), R.layout.fragment_home, null);
-
-//        SharedPreferences sp = getActivity().getSharedPreferences(
-//                Config.PREFERENCE, Context.MODE_PRIVATE);
-        LinearLayout home_actionbar = (LinearLayout) view.findViewById(R.id.home_actionbar);
-        LinearLayout.LayoutParams lparams = new LinearLayout.LayoutParams(
-                LinearLayout.LayoutParams.MATCH_PARENT, DisplayUtils.dip2px(getActivity(), 55));
-
-//		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-//			int top = DisplayUtils.getStatusBarHeight(getResources());
-//			home_actionbar.setPadding(0, top, 0, 0);
-//			lparams.height += top;
-//		}
-        home_actionbar.setLayoutParams(lparams);
-
-        initActionBar();
-
-        final ScaleAnimation scaleAnimation = new ScaleAnimation(0.4f, 1.0f, 0.4f, 1.0f
-                , Animation.RELATIVE_TO_SELF, 0.5f, Animation.RELATIVE_TO_SELF, 0.5f);
-        scaleAnimation.setDuration(500);
-
-        mAlphaAnimation = new AlphaAnimation(1f, 0.2f);
-        mAlphaAnimation.setDuration(300);
-        mAlphaAnimation.setStartOffset(5000);
-
-        scaleAnimation.setAnimationListener(new Animation.AnimationListener() {
-            @Override
-            public void onAnimationStart(Animation animation) {
-
-            }
-
-            @Override
-            public void onAnimationEnd(Animation animation) {
-                if (mAlphaAnimation != null) {
-                    searchHint.setAnimation(mAlphaAnimation);
-                    mAlphaAnimation.start();
-                }
-            }
-
-            @Override
-            public void onAnimationRepeat(Animation animation) {
-
-            }
-        });
-
-        mAlphaAnimation.setAnimationListener(new Animation.AnimationListener() {
-            @Override
-            public void onAnimationStart(Animation animation) {
-
-            }
-
-            @Override
-            public void onAnimationEnd(Animation animation) {
-                // 切换数据
-                if (hintIndex > hintList.size() - 1) {
-                    hintIndex = 0;
-                }
-                searchHint.setHint(hintList.get(hintIndex));
-                hintIndex++;
-
-                if (scaleAnimation != null) {
-                    searchHint.setAnimation(scaleAnimation);
-                    scaleAnimation.start();
-                }
-            }
-
-            @Override
-            public void onAnimationRepeat(Animation animation) {
-
-            }
-        });
-
-        if (hintList != null && hintList.size() > 0) {
-            if (hintList.size() > 1) {
-                searchHint.setAnimation(mAlphaAnimation);
-            } else {
-                String hint = hintList.get(0);
-                searchHint.setHint(hint);
-            }
-        }
-
-        EventBus.getDefault().register(this);
-    }
-
-    @Nullable
-    @Override
-    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
-                             @Nullable Bundle savedInstanceState) {
-        if (container != null) {
-            container.removeView(view);
-        }
-        return view;
-    }
-
-    @Override
-    public void onSaveInstanceState(Bundle outState) {
-        super.onSaveInstanceState(outState);
-        if (hintList != null && !hintList.isEmpty()) {
-            outState.putStringArrayList("hint", hintList);
-        }
-    }
-
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-        EventBus.getDefault().unregister(this);
-    }
-
-    private void initActionBar() {
-        view.findViewById(R.id.actionbar_rl_download).setOnClickListener(this);
-        view.findViewById(R.id.actionbar_iv_search).setOnClickListener(this);
-        view.findViewById(R.id.actionbar_notification).setOnClickListener(this);
-        view.findViewById(R.id.actionbar_search_rl).setOnClickListener(this);
-
-        if (Config.isShow(getActivity())) {
-            view.findViewById(R.id.actionbar_rl_download).setVisibility(View.VISIBLE);
-        } else {
-            view.findViewById(R.id.actionbar_rl_download).setVisibility(View.GONE);
-        }
-
-        downloadHint = (TextView) view.findViewById(R.id.action_tip);
-        int updateSize = PackageManager.getUpdateListSize();
-        int downloadSize = DownloadManager.getInstance(getActivity()).getAll().size();
-        if (downloadSize != 0) {
-            downloadHint.setVisibility(View.VISIBLE);
-            downloadHint.setText(String.valueOf(downloadSize));
-        } else if (updateSize != 0) {
-            downloadHint.setVisibility(View.VISIBLE);
-            downloadHint.setText(String.valueOf(updateSize));
-        } else {
-            downloadHint.setVisibility(View.GONE);
-        }
-
-        searchHint = (TextView) view.findViewById(R.id.actionbar_search_input);
-        searchHint.setOnClickListener(this);
-    }
-
-    @Override
-    public void onClick(View v) {
-        final int id = v.getId();
-        if (id == R.id.actionbar_rl_download) {
-            DataUtils.onEvent(getActivity(), "主页", "下载图标");
-            DataCollectionUtils.uploadClick(getActivity(), "下载图标", "主页");
-
-            DownloadManagerActivity.startDownloadManagerActivity(getContext(), null, "(工具栏)");
-        } else if (id == R.id.actionbar_iv_search) {
-            DataUtils.onEvent(getActivity(), "主页", "搜索图标");
-            DataCollectionUtils.uploadClick(getActivity(), "搜索图标", "主页");
-
-            Intent intent = new Intent(getActivity(), SearchActivity.class);
-            intent.putExtra("clicked", true);
-            intent.putExtra("hint", searchHint.getHint().toString());
-            intent.putExtra(EntranceUtils.KEY_ENTRANCE, "(工具栏)");
-            startActivity(intent);
-        } else if (id == R.id.actionbar_search_input || id == R.id.actionbar_search_rl) {
-            DataUtils.onEvent(getActivity(), "主页", "搜索框");
-            DataCollectionUtils.uploadClick(getActivity(), "搜索框", "主页");
-
-            Intent intent = new Intent(getActivity(), SearchActivity.class);
-            intent.putExtra("clicked", false);
-            intent.putExtra("hint", searchHint.getHint().toString());
-            intent.putExtra(EntranceUtils.KEY_ENTRANCE, "(工具栏)");
-            startActivity(intent);
-        } else if (id == R.id.actionbar_notification) {
-            DataUtils.onEvent(getActivity(), "主页", "关注图标");
-            DataCollectionUtils.uploadClick(getActivity(), "关注图标", "主页");
-
-            Intent intent = new Intent(getActivity(), ConcernActivity.class);
-            intent.putExtra(EntranceUtils.KEY_ENTRANCE, "(工具栏)");
-            startActivity(intent);
-        }
-    }
-
-    // 打开下载按钮事件
-    @Subscribe(threadMode = ThreadMode.MAIN)
-    public void onEventMainThread(EBReuse reuse) {
-        if ("Refresh".equals(reuse.getType())) {
-            if (Config.isShow(getActivity())) {
-                view.findViewById(R.id.actionbar_rl_download).setVisibility(View.VISIBLE);
-            } else {
-                view.findViewById(R.id.actionbar_rl_download).setVisibility(View.GONE);
-            }
-        }
-    }
-
-    @Subscribe(threadMode = ThreadMode.MAIN)
-    public void onEventMainThread(EBDownloadStatus status) {
-        int updateSize = PackageManager.getUpdateListSize();
-        int downloadSize = DownloadManager.getInstance(getActivity()).getAll().size();
-        if (downloadSize != 0) {
-            downloadHint.setVisibility(View.VISIBLE);
-            downloadHint.setText(String.valueOf(downloadSize));
-        } else if (updateSize != 0) {
-            downloadHint.setVisibility(View.VISIBLE);
-            downloadHint.setText(String.valueOf(updateSize));
-        } else {
-            downloadHint.setVisibility(View.GONE);
-        }
-    }
-
-    @Override
-    public void setHint(ArrayList<String> hint) {
-        if (hint != null && hint.size() > 0) {
-            hintList = hint;
-            if (hint.size() == 1 && searchHint != null) {
-                searchHint.setHint(hintList.get(0));
-            } else if (mAlphaAnimation != null && searchHint != null) {
-                searchHint.setAnimation(mAlphaAnimation);
-            }
-        }
-    }
-
-}

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

@@ -1,9 +0,0 @@
-package com.gh.base;
-
-/**
- * Forward activity onBackPressed() events to fragment
- * (If nested fragments need this, just forward again)
- */
-public interface OnBackPressedListener {
-    public boolean onHandleBackPressed();
-}

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

@@ -1,13 +1,13 @@
-package com.gh.gamecenter.listener;
+package com.gh.base;
 
 /**
  * Created by Administrator on 2016/9/8.
  */
-public interface OnCallBackListener {
+public interface OnRequestCallBackListener<T> {
 
     void loadDone();
 
-    void loadDone(Object obj);
+    void loadDone(T obj);
 
     void loadError();
 

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

@@ -1,48 +1,48 @@
-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;
-    }
-
-}
+//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/FragmentAdapter.java

@@ -1,4 +1,4 @@
-package com.gh.gamecenter.adapter;
+package com.gh.base.adapter;
 
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;

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

@@ -0,0 +1,152 @@
+package com.gh.base.fragment;
+
+import android.os.Bundle;
+import android.support.annotation.LayoutRes;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+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.utils.RuntimeUtils;
+import com.lightgame.utils.Utils;
+
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
+
+import butterknife.ButterKnife;
+import rx.Observable;
+import rx.android.schedulers.AndroidSchedulers;
+import rx.schedulers.Schedulers;
+
+/**
+ * Created by LGT on 2016/9/4.
+ * Fragment 基类
+ */
+public abstract class BaseFragment<T> extends Fragment implements OnRequestCallBackListener<T>,
+        View.OnClickListener, OnListClickListener{
+
+    // TODO private view
+    protected View view;
+
+    protected boolean isEverPause;
+
+    protected String mEntrance;
+
+    @LayoutRes
+    protected abstract int getLayoutId();
+
+    /**
+     * 责任链，谁处理了就返回true，否则返回super.handleOnClick(View view)
+     *
+     * @return
+     */
+    protected boolean handleOnClick(View view) {
+        return true;
+    }
+
+    @Override
+    public void onClick(View v) {
+        handleOnClick(v);
+    }
+
+    protected void initView(View view) {
+    }
+
+    protected void postRunnable(Runnable runnable) {
+        RuntimeUtils.getInstance().runOnUiThread(runnable);
+    }
+
+    // 定时任务全部改用这个方法, 在onDestroy做统一取消定时
+    protected void postDelayedRunnable(Runnable runnable, long delayMillis) {
+        RuntimeUtils.getInstance().runOnUiThread(runnable, delayMillis);
+    }
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        mEntrance = getActivity().getIntent().getStringExtra(EntranceUtils.KEY_ENTRANCE);
+        isEverPause = false;
+        EventBus.getDefault().register(this);
+        view = View.inflate(getContext(), getLayoutId(), null);
+        ButterKnife.bind(this, view);
+        initView(view);
+    }
+
+    //TODO 尴尬，必须的有subscribe才能register
+    @Subscribe(threadMode = ThreadMode.BACKGROUND)
+    public void onDummyEvent(EBMiPush push) {
+        //
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        if (container != null) {
+            container.removeView(view);
+        }
+        return view;
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        isEverPause = false;
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        isEverPause = true;
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        RuntimeUtils.getInstance().removeRunnable();
+        EventBus.getDefault().unregister(this);
+    }
+
+    public void toast(String msg) {
+        Utils.toast(getContext(), msg);
+    }
+
+    public boolean isEverPause() {
+        return isEverPause;
+    }
+
+    @Override
+    public void loadDone() {
+
+    }
+
+    @Override
+    public void loadDone(Object obj) {
+
+    }
+
+    @Override
+    public void loadError() {
+
+    }
+
+    @Override
+    public void loadEmpty() {
+
+    }
+
+    @Override
+    public <T> void onListClick(View view, int position, T data) {
+
+    }
+
+    protected <K> Observable<K> asyncCall(Observable<K> observable) {
+        return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread());
+    }
+
+}

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

@@ -0,0 +1,125 @@
+/**
+ * project: OPlay
+ * <p/>
+ * <p/>
+ * ========================================================================
+ * amend date			amend user			amend reason
+ * 2013-3-6			    CsHeng
+ */
+
+package com.gh.base.fragment;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.annotation.IdRes;
+import android.support.annotation.LayoutRes;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.support.v4.view.PagerAdapter;
+import android.support.v4.view.ViewPager;
+import android.view.View;
+
+import com.lightgame.adapter.BaseFragmentPagerAdapter;
+import com.lightgame.config.CommonDebug;
+import com.lightgame.view.DoubleTapTextView;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * ViewPager 配合RadioGroup实现双切换<br/>
+ * 记得自己控制onCreateView返回和radioGroup里面radiobutton个数,Viewpager的布局<br/>
+ *
+ * @author CsHeng
+ * @date 2013-3-6
+ */
+public abstract class BaseFragment_ViewPager extends BaseFragment implements DoubleTapTextView.OnDoubleTapListener {
+
+    protected static final String ARGS_INDEX = "index";
+    protected int mCheckedIndex = 0;
+    protected PagerAdapter mAdapter;
+    protected List<Fragment> mFragmentsList;
+    protected ViewPager mViewPager;
+
+    @LayoutRes
+    protected abstract int getLayoutId();
+
+    @IdRes
+    protected abstract int getViewPagerId();
+
+    protected abstract void initFragmentList(List<Fragment> fragments);
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        mFragmentsList = new ArrayList<>();
+        initFragmentList(mFragmentsList);
+        mAdapter = BaseFragmentPagerAdapter.newInstance(getChildFragmentManager(), mFragmentsList);
+        final Bundle args = getArguments();
+        if (args != null) {
+            mCheckedIndex = args.getInt(ARGS_INDEX);
+        }
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        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);
+        }
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        if (getArguments() != null) {
+            getArguments().putInt(ARGS_INDEX, mCheckedIndex);
+        }
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        if (mViewPager != null) {
+            mViewPager.setAdapter(null);
+        }
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        if (mFragmentsList != null) {
+            mFragmentsList.clear();
+        }
+    }
+
+    @Override
+    public boolean onDoubleTap() {
+        final Fragment fragment = mFragmentsList.get(mViewPager.getCurrentItem());
+        return fragment instanceof DoubleTapTextView.OnDoubleTapListener && ((DoubleTapTextView.OnDoubleTapListener)
+                fragment).onDoubleTap();
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (CommonDebug.IS_DEBUG) {
+            CommonDebug.logMethodWithParams(this, requestCode, resultCode, data);
+        }
+        List<Fragment> fragments = getChildFragmentManager().getFragments();
+        if (fragments != null) {
+            Fragment curFragment = fragments.get(mViewPager.getCurrentItem());
+            curFragment.onActivityResult(requestCode, resultCode, data);
+        }
+
+    }
+
+}

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

@@ -0,0 +1,109 @@
+/**
+ * project: OPlay
+ * <p/>
+ * <p/>
+ * ========================================================================
+ * amend date			amend user			amend reason
+ * 2013-3-6			    CsHeng
+ */
+
+package com.gh.base.fragment;
+
+import android.os.Bundle;
+import android.support.annotation.IdRes;
+import android.support.annotation.Nullable;
+import android.support.v4.view.ViewPager;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Checkable;
+
+
+/**
+ * ViewPager 配合ViewGroup Checkable实现双切换<br/>
+ * 记得自己控制onCreateView返回和ViewGroup里面Checkable个数,ViewPager的布局<br/>
+ *
+ * @author CsHeng
+ * @date 2013-3-6
+ * @update 2014-09-29
+ */
+public abstract class BaseFragment_ViewPager_Checkable extends BaseFragment_ViewPager implements
+        ViewPager.OnPageChangeListener {
+
+    protected ViewGroup mCheckableGroup;
+
+    @IdRes
+    protected abstract int getCheckableGroupId();
+
+    protected boolean getSmoothScroll() {
+        return false;
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        mCheckableGroup = (ViewGroup) view.findViewById(getCheckableGroupId());
+        for (int i = 0, size = mCheckableGroup.getChildCount(); i < size; i++) {
+            mCheckableGroup.getChildAt(i).setOnClickListener(this);
+        }
+        mViewPager.addOnPageChangeListener(this);
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        mViewPager.removeOnPageChangeListener(this);
+    }
+
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+        checkIndex(mCheckedIndex);
+    }
+
+    @Override
+    public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
+
+    }
+
+    @Override
+    public void onPageSelected(int index) {
+        onPageChanged(index);
+    }
+
+    @Override
+    public void onPageScrollStateChanged(int state) {
+
+    }
+
+    @Override
+    protected boolean handleOnClick(View view) {
+        final int toCheck = mCheckableGroup.indexOfChild(view);
+        if (toCheck != -1) {
+            mViewPager.setCurrentItem(toCheck, getSmoothScroll());
+            return true;
+        }
+        return super.handleOnClick(view);
+    }
+
+    protected void checkIndex(int index) {
+        final int childCount = mCheckableGroup.getChildCount();
+        if (index < childCount && mCheckedIndex < childCount) {
+            final View toChecked = mCheckableGroup.getChildAt(index);
+            if (toChecked instanceof Checkable) {
+                ((Checkable) toChecked).setChecked(true);
+            }
+            if (index != mCheckedIndex) {
+                final View checkedChild = mCheckableGroup.getChildAt(mCheckedIndex);
+                if (checkedChild instanceof Checkable) {
+                    ((Checkable) checkedChild).setChecked(false);
+                }
+            }
+            mCheckedIndex = index;
+        }
+    }
+
+    protected void onPageChanged(int index) {
+        checkIndex(index);
+    }
+
+}

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

@@ -3,39 +3,57 @@ package com.gh.common.constant;
 
 import android.content.Context;
 import android.content.SharedPreferences;
+import android.preference.PreferenceManager;
 
 import com.gh.gamecenter.BuildConfig;
 
 public class Config {
 
-    public static final String HOST = "http://api2.ghzhushou.com/v2d6/";
-    public static final String USER_HOST = "http://user2.ghzhushou.com/v1d2/";
-    public static final String COMMENT_HOST = "http://comment2.ghzhushou.com/v1d2/";
-    public static final String DATA_HOST = "http://data.ghzhushou.com/";
-    public static final String LIBAO_HOST = "http://libao2.ghzhushou.com/v1d2/";
-    public static final String MESSAGE_HOST = "http://message.ghzhushou.com/v1d0/"; // TODO TEST v1d1
-    public static final String PREFERENCE = "ghzhushou";
+    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)}
+     */
+//    @Deprecated
+//    public static final String PREFERENCE = "ghzhushou";
 
     // Third-Party confs
     public static final String WECHAT_APPID = BuildConfig.WECHAT_APPID;
+    public static final String WECHAT_SECRET = BuildConfig.WECHAT_SECRET;
     public static final String TENCENT_APPID = BuildConfig.TENCENT_APPID;
     public static final String WEIBO_APPKEY = BuildConfig.WEIBO_APPKEY;
     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 DEBUG_MIPUSH_APPID = BuildConfig.DEBUG_MIPUSH_APPID;
-    public static final String DEBUG_MIPUSH_APPKEY = BuildConfig.DEBUG_MIPUSH_APPKEY;
-    public static final String DEBUG_UMENG_APPKEY = BuildConfig.DEBUG_UMENG_APPKEY;
-    public static final String DEBUG_UMENG_MESSAGE_SECRET = BuildConfig.DEBUG_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 = context.getSharedPreferences(Config.PREFERENCE, Context.MODE_PRIVATE);
+        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

@@ -2,18 +2,13 @@ package com.gh.common.constant;
 
 public class Constants {
 
-    public static final int CONTINUE_DOWNLOAD_TASK = 0x123;
-    public static final int PAUSE_DOWNLOAD_TASK = 0x124;
-    public static final int DOWNLOAD_ROLL = 0x125;
     public static final int SEND_NEWS_FEEDBACK = 0x126;
     public static final int SEND_COMMENT_FEEDBACK = 0x127;
 
-    public static final String KEY_DOWNLOAD_ENTRY = "key_download_entry";
-    public static final String KEY_DOWNLOAD_ACTION = "key_download_action";
+    public final static int LIST_FOOTER_ITEM = 1;
+    public final static int LIST_HEAD_ITEM = 1;
 
-    public static final int MAX_DOWNLOAD_THREAD_SIZE = 3;
-    public static final int MAX_DOWNLOADING_SIZE = 3;
-    public static final long SPEED_CHECK_INTERVAL = 1000;//速度监测频率
+    public final static int NOT_NETWORK_CODE = 504; // 没有网络的状态码(应该是这个吧!)
 
     //手机号码匹配规则
     public static final String REGEX_MOBILE = "^((13[0-9])|(15[^4,\\D])|(18[0,5-9]))\\d{8}$";

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

@@ -21,6 +21,7 @@ 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;     // 游戏插件模块
 
 }

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

@@ -1,143 +0,0 @@
-package com.gh.common.util;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Stack;
-
-/**
- * 应用程序Activity管理类：用于Activity和Intent相关的管理
- *
- * @author CsHeng
- * @version 1.0
- */
-public class AppManager {
-
-    private static AppManager mInstance;
-    private Stack<Activity> mActivityStack;
-
-    private AppManager() {
-        mActivityStack = new Stack<>();
-    }
-
-    /**
-     * 单一实例
-     */
-    public static AppManager getInstance() {
-        if (mInstance == null) {
-            mInstance = new AppManager();
-        }
-        return mInstance;
-    }
-
-    public boolean isEmpty() {
-        return mActivityStack.isEmpty();
-    }
-
-    /**
-     * 添加Activity到堆栈
-     */
-    public void addActivity(Activity activity) {
-        mActivityStack.add(activity);
-    }
-
-    /**
-     * 获取当前Activity（堆栈中最后一个压入的）
-     */
-    public Activity currentActivity() {
-        return mActivityStack.lastElement();
-    }
-
-    /**
-     * 结束当前Activity（堆栈中最后一个压入的）
-     */
-    public void finishActivity() {
-        final Activity activity = mActivityStack.lastElement();
-        finishActivity(activity);
-    }
-
-    /**
-     * 结束指定的Activity
-     */
-    public void finishActivity(Activity activity) {
-        if (activity != null) {
-            mActivityStack.remove(activity);
-            activity.finish();
-        }
-    }
-
-    /**
-     * 结束指定类名的Activity
-     */
-    public void finishActivity(Class<?> cls) {
-        for (Activity activity : mActivityStack) {
-            if (activity.getClass().equals(cls)) {
-                finishActivity(activity);
-            }
-        }
-    }
-
-    public boolean isOnStack(Activity activity) {
-        return mActivityStack.contains(activity);
-    }
-
-    public Intent[] getStartIntents(Intent... intent) {
-        List<Intent> intentList = getCurrentIntents();
-        if (intentList != null) {
-            Collections.addAll(intentList, intent);
-            return intentList.toArray(new Intent[intentList.size()]);
-        }
-        return intent;
-    }
-
-    public List<Intent> getCurrentIntents() {
-        List<Intent> intentList = new ArrayList<>();
-        for (Activity activity : mActivityStack) {
-            intentList.add(activity.getIntent());
-        }
-        return intentList;
-    }
-
-    /**
-     * 退出应用程序
-     */
-    public void appExit(Context context) {
-        try {
-            finishAllActivity();
-            /* Need Permission */
-            // ActivityManager activityMgr= (ActivityManager)
-            // context.getSystemService(Context.ACTIVITY_SERVICE);
-            // activityMgr.restartPackage(context.getPackageName());
-            // activityMgr.killBackgroundProcesses(context.getPackageName());
-
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    /**
-     * 结束所有Activity
-     */
-    public void finishAllActivity() {
-        for (Activity activity : mActivityStack) {
-            activity.finish();
-        }
-        mActivityStack.clear();
-        try {
-            android.os.Process.killProcess(android.os.Process.myPid());
-        } catch (Exception e) {
-        }
-    }
-
-    public void destroy() {
-        if (mActivityStack != null) {
-            mActivityStack.clear();
-        }
-        mInstance = null;
-    }
-
-}

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

@@ -0,0 +1,35 @@
+package com.gh.common.util;
+
+import android.content.Context;
+import android.content.Intent;
+import android.text.TextUtils;
+
+import com.gh.gamecenter.LoginActivity;
+
+/**
+ * Created by khy on 28/06/17.
+ */
+
+public class CheckLoginUtils {
+
+    public static void checkLogin(final Context context, OnLoggenInListener listener) {
+        String token = LoginUtils.getToken(context);
+        if (TextUtils.isEmpty(token)) {
+            DialogUtils.showWarningDialog(context, "登录提示", "需要登录才能使用该功能喔！", "取消", "快速登录",
+                    new DialogUtils.ConfirmListener() {
+                        @Override
+                        public void onConfirm() {
+                            Intent intent = LoginActivity.getIntent(context, false);
+                            context.startActivity(intent);
+                        }
+                    }, null);
+        } else {
+            listener.onLoggedIn();
+        }
+    }
+
+
+    public interface OnLoggenInListener {
+        void onLoggedIn();
+    }
+}

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

@@ -0,0 +1,103 @@
+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
+    }
+
+    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)
+        }
+        postCollection
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(object : Response<ResponseBody>() {
+                    override fun onResponse(response: ResponseBody?) {
+                        super.onResponse(response)
+                        listener.onSuccess()
+                        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)
+        }
+        postCollection
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(object : Response<ResponseBody>() {
+                    override fun onResponse(response: ResponseBody?) {
+                        super.onResponse(response)
+                        listener.onSuccess()
+                        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)
+        }
+        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

@@ -5,19 +5,21 @@ import android.content.Context;
 import android.graphics.Color;
 import android.support.v4.content.ContextCompat;
 import android.text.TextUtils;
-import android.view.Gravity;
 import android.view.View;
-import android.view.ViewGroup;
 import android.view.Window;
+import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.gh.gamecenter.CommentDetailActivity;
 import com.gh.gamecenter.MessageDetailActivity;
 import com.gh.gamecenter.R;
-import com.gh.gamecenter.adapter.MessageDetailAdapter;
-import com.gh.gamecenter.db.CommentDao;
+import com.gh.gamecenter.adapter.OnCommentCallBackListener;
+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.lightgame.utils.Utils;
 
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -29,6 +31,8 @@ import java.util.Date;
 import java.util.List;
 import java.util.Locale;
 
+import retrofit2.HttpException;
+
 /**
  * Created by khy on 2017/3/22.
  */
@@ -65,21 +69,19 @@ public class CommentUtils {
         }
     }
 
-    public static void showReportDialog(final CommentEntity commentEntity, final Context mContext
-            , final MessageDetailAdapter.OnCommentCallBackListener mCallBackListener, final String newsId) {
+    public static void showReportDialog(final CommentEntity commentEntity, final Context context,
+                                        final OnCommentCallBackListener listener, final String newsId) {
 
-        CommentDao commentDao = new CommentDao(mContext);
+        final Dialog dialog = new Dialog(context);
 
-        final Dialog dialog = new Dialog(mContext);
-
-        LinearLayout container = new LinearLayout(mContext);
+        LinearLayout container = new LinearLayout(context);
         container.setOrientation(LinearLayout.VERTICAL);
         container.setBackgroundColor(Color.WHITE);
-        container.setPadding(0, DisplayUtils.dip2px(mContext, 12), 0, DisplayUtils.dip2px(mContext, 12));
+        container.setPadding(0, DisplayUtils.dip2px(context, 12), 0, DisplayUtils.dip2px(context, 12));
 
         List<String> dialogType = new ArrayList<>();
 
-        if (!commentDao.isMyComment(commentEntity.getId())) {
+        if (commentEntity.getUserData() == null || !commentEntity.getUserData().isCommentOwn()) {
             dialogType.add("回复");
         }
 
@@ -91,16 +93,16 @@ public class CommentUtils {
         }
 
         for (String s : dialogType) {
-            final TextView reportTv = new TextView(mContext);
+            final TextView reportTv = new TextView(context);
             reportTv.setText(s);
             reportTv.setTextSize(17);
-            reportTv.setTextColor(ContextCompat.getColor(mContext, R.color.title));
+            reportTv.setTextColor(ContextCompat.getColor(context, R.color.title));
             reportTv.setBackgroundResource(R.drawable.textview_white_style);
-            int widthPixels = mContext.getResources().getDisplayMetrics().widthPixels;
+            int widthPixels = context.getResources().getDisplayMetrics().widthPixels;
             reportTv.setLayoutParams(new LinearLayout.LayoutParams((widthPixels * 9) / 10,
                     LinearLayout.LayoutParams.WRAP_CONTENT));
-            reportTv.setPadding(DisplayUtils.dip2px(mContext, 20), DisplayUtils.dip2px(mContext, 12),
-                    0, DisplayUtils.dip2px(mContext, 12));
+            reportTv.setPadding(DisplayUtils.dip2px(context, 20), DisplayUtils.dip2px(context, 12),
+                    0, DisplayUtils.dip2px(context, 12));
             container.addView(reportTv);
 
             reportTv.setOnClickListener(new View.OnClickListener() {
@@ -109,23 +111,33 @@ public class CommentUtils {
                     dialog.cancel();
                     switch (reportTv.getText().toString()) {
                         case "回复":
-                            if (mCallBackListener != null) {
-                                mCallBackListener.showSoftInput(commentEntity);
-                            } else if (!TextUtils.isEmpty(newsId)) {
-                                mContext.startActivity(MessageDetailActivity.getMessageDetailIntent(mContext, commentEntity, newsId));
-                            } else {
-                                Utils.toast(mContext, "缺少关键属性");
-                            }
-
+                            CheckLoginUtils.checkLogin(context, new CheckLoginUtils.OnLoggenInListener() {
+                                @Override
+                                public void onLoggedIn() {
+                                    if (listener != null) {
+                                        listener.onCommentCallback(commentEntity);
+                                    } else if (!TextUtils.isEmpty(newsId)) {
+                                        context.startActivity(MessageDetailActivity.getMessageDetailIntent(context, commentEntity, newsId));
+                                    } else {
+                                        Utils.toast(context, "缺少关键属性");
+                                    }
+                                }
+                            });
                             break;
                         case "复制":
-                            LibaoUtils.copyLink(commentEntity.getContent(), mContext);
+                            LibaoUtils.copyLink(commentEntity.getContent(), context);
                             break;
                         case "举报":
-                            showReportTypeDialog(commentEntity, mContext);
+                            CheckLoginUtils.checkLogin(context, new CheckLoginUtils.OnLoggenInListener() {
+                                @Override
+                                public void onLoggedIn() {
+                                    showReportTypeDialog(commentEntity, context);
+                                }
+                            });
+
                             break;
                         case "查看对话":
-                            mContext.startActivity(CommentDetailActivity.getCommentDetailIntent(mContext, commentEntity.getId()));
+                            context.startActivity(CommentDetailActivity.getCommentDetailIntent(context, commentEntity.getId()));
                             break;
                     }
                 }
@@ -172,7 +184,7 @@ public class CommentUtils {
                         e.printStackTrace();
                     }
 
-                    PostCommentUtils.addReportData(mContext, jsonObject.toString(), true,
+                    PostCommentUtils.addReportData(mContext, jsonObject.toString(),
                             new PostCommentUtils.PostCommentListener() {
                                 @Override
                                 public void postSuccess(JSONObject response) {
@@ -194,5 +206,98 @@ public class CommentUtils {
         reportTypeDialog.show();
     }
 
+    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
+            public void onLoggedIn() {
+                if (commentLikeCountTv.getCurrentTextColor() == ContextCompat.getColor(context, R.color.theme)) {
+                    Utils.toast(context, "已经点过赞啦！");
+                    return;
+                }
+                commentEntity.setVote(commentEntity.getVote() + 1);
+                commentLikeCountTv.setTextColor(ContextCompat.getColor(context, R.color.theme));
+                commentLikeIv.setImageResource(R.drawable.ic_like_select);
+                commentLikeCountTv.setText(String.valueOf(commentEntity.getVote()));
+                commentLikeCountTv.setVisibility(View.VISIBLE);
 
+                PostCommentUtils.addCommentVoto(context, commentEntity.getId(),
+                        new PostCommentUtils.PostCommentListener() {
+                            @Override
+                            public void postSuccess(JSONObject response) {
+                                if (listener != null) {
+                                    listener.onVote();
+                                }
+                            }
+
+                            @Override
+                            public void postFailed(Throwable e) {
+
+                                commentEntity.setVote(commentEntity.getVote() - 1);
+                                commentLikeCountTv.setTextColor(ContextCompat.getColor(context, R.color.hint));
+                                commentLikeIv.setImageResource(R.drawable.ic_like_unselect);
+                                commentLikeCountTv.setText(String.valueOf(commentEntity.getVote()));
+                                if (commentEntity.getVote() == 0) {
+                                    commentLikeCountTv.setVisibility(View.GONE);
+                                } else {
+                                    commentLikeCountTv.setVisibility(View.VISIBLE);
+                                }
+
+                                if (e instanceof HttpException) {
+                                    HttpException exception = (HttpException) e;
+                                    if (exception.code() == 403) {
+                                        try {
+                                            String detail = new JSONObject(exception.response().errorBody().string()).getString("detail");
+                                            if ("voted".equals(detail)) {
+                                                Utils.toast(context, "已经点过赞啦！");
+                                            }
+                                        } catch (Exception ex) {
+                                            ex.printStackTrace();
+                                        }
+                                        return;
+                                    }
+                                }
+                                Utils.toast(context, "网络异常，点赞失败");
+                            }
+                        });
+            }
+        });
+    }
+
+
+    // 设置评论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 = LoginUtils.getUserInfo(mContext);
+        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/ConcernContentUtils.java

@@ -25,28 +25,33 @@ public class ConcernContentUtils {
         int index = 0;
         for (int i = 0, size = (int) Math.ceil(list.size() / 3.0f); i < size; i++) {
             int type = count % 3;
-            if (type == 0) {
-                LinearLayout ll = new LinearLayout(context);
-                ll.setOrientation(LinearLayout.HORIZONTAL);
-                for (int j = 0; j < 3; j++) {
-                    ll.addView(getImageView(context, list, entrance, index, width, 0));
+            LinearLayout ll;
+            switch (type) {
+                case 0:
+                    ll = new LinearLayout(context);
+                    ll.setOrientation(LinearLayout.HORIZONTAL);
+                    for (int j = 0; j < 3; j++) {
+                        ll.addView(getImageView(context, list, entrance, index, width, 0));
+                        index += 1;
+                    }
+                    linearLayout.addView(ll);
+                    count -= 3;
+                    break;
+                case 1:
+                    linearLayout.addView(getImageView(context, list, entrance, index, width, 1));
+                    count -= 1;
                     index += 1;
-                }
-                linearLayout.addView(ll);
-                count -= 3;
-            } else if (type == 1) {
-                linearLayout.addView(getImageView(context, list, entrance, index, width, 1));
-                count -= 1;
-                index += 1;
-            } else if (type == 2) {
-                LinearLayout ll = new LinearLayout(context);
-                ll.setOrientation(LinearLayout.HORIZONTAL);
-                for (int j = 0; j < 2; j++) {
-                    ll.addView(getImageView(context, list, entrance, index, width, 2));
-                    index += 1;
-                }
-                linearLayout.addView(ll);
-                count -= 2;
+                    break;
+                case 2:
+                    ll = new LinearLayout(context);
+                    ll.setOrientation(LinearLayout.HORIZONTAL);
+                    for (int j = 0; j < 2; j++) {
+                        ll.addView(getImageView(context, list, entrance, index, width, 2));
+                        index += 1;
+                    }
+                    linearLayout.addView(ll);
+                    count -= 2;
+                    break;
             }
         }
     }
@@ -54,34 +59,39 @@ public class ConcernContentUtils {
     private static SimpleDraweeView getImageView(final Context context, final List<String> list, final String entrance,
                                                  final int position, int width, int type) {
         SimpleDraweeView imageView;
-        if (type == 0) {
-            imageView = new SimpleDraweeView(context);
-            LinearLayout.LayoutParams lparams = new LinearLayout.LayoutParams(
-                    0, width / 3 - DisplayUtils.dip2px(context, 4));
-            lparams.setMargins(DisplayUtils.dip2px(context, 2), 0,
-                    DisplayUtils.dip2px(context, 2), DisplayUtils.dip2px(context, 4));
-            lparams.weight = 1;
-            imageView.setLayoutParams(lparams);
-            ImageUtils.getInstance().display(context.getResources(), imageView,
-                    ScalingUtils.ScaleType.CENTER_CROP, list.get(position));
-        } else if (type == 1) {
-            imageView = new SimpleDraweeView(context);
-            LinearLayout.LayoutParams lparams = new LinearLayout.LayoutParams(width, width / 2);
-            lparams.setMargins(DisplayUtils.dip2px(context, 2), 0,
-                    DisplayUtils.dip2px(context, 2), DisplayUtils.dip2px(context, 4));
-            imageView.setLayoutParams(lparams);
-            ImageUtils.getInstance().display(context.getResources(), imageView,
-                    ScalingUtils.ScaleType.CENTER_CROP, list.get(position));
-        } else {
-            imageView = new SimpleDraweeView(context);
-            LinearLayout.LayoutParams lparams = new LinearLayout.LayoutParams(
-                    0, width / 2 - DisplayUtils.dip2px(context, 4));
-            lparams.setMargins(DisplayUtils.dip2px(context, 2), 0,
-                    DisplayUtils.dip2px(context, 2), DisplayUtils.dip2px(context, 4));
-            lparams.weight = 1;
-            imageView.setLayoutParams(lparams);
-            ImageUtils.getInstance().display(context.getResources(), imageView,
-                    ScalingUtils.ScaleType.CENTER_CROP, list.get(position));
+        LinearLayout.LayoutParams lparams;
+        switch (type) {
+            case 0:
+                imageView = new SimpleDraweeView(context);
+                lparams = new LinearLayout.LayoutParams(
+                        0, width / 3 - DisplayUtils.dip2px(context, 4));
+                lparams.setMargins(DisplayUtils.dip2px(context, 2), 0,
+                        DisplayUtils.dip2px(context, 2), DisplayUtils.dip2px(context, 4));
+                lparams.weight = 1;
+                imageView.setLayoutParams(lparams);
+                ImageUtils.Companion.getInstance().display(context.getResources(), imageView,
+                        ScalingUtils.ScaleType.CENTER_CROP, list.get(position));
+                break;
+            case 1:
+                imageView = new SimpleDraweeView(context);
+                lparams = new LinearLayout.LayoutParams(width, width / 2);
+                lparams.setMargins(DisplayUtils.dip2px(context, 2), 0,
+                        DisplayUtils.dip2px(context, 2), DisplayUtils.dip2px(context, 4));
+                imageView.setLayoutParams(lparams);
+                ImageUtils.Companion.getInstance().display(context.getResources(), imageView,
+                        ScalingUtils.ScaleType.CENTER_CROP, list.get(position));
+                break;
+            default:
+                imageView = new SimpleDraweeView(context);
+                lparams = new LinearLayout.LayoutParams(
+                        0, width / 2 - DisplayUtils.dip2px(context, 4));
+                lparams.setMargins(DisplayUtils.dip2px(context, 2), 0,
+                        DisplayUtils.dip2px(context, 2), DisplayUtils.dip2px(context, 4));
+                lparams.weight = 1;
+                imageView.setLayoutParams(lparams);
+                ImageUtils.Companion.getInstance().display(context.getResources(), imageView,
+                        ScalingUtils.ScaleType.CENTER_CROP, list.get(position));
+                break;
         }
         imageView.setOnClickListener(new View.OnClickListener() {
             @Override

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

@@ -1,81 +0,0 @@
-package com.gh.common.util;
-
-import android.content.Context;
-
-import com.gh.gamecenter.eventbus.EBReuse;
-import com.gh.gamecenter.retrofit.Response;
-import com.gh.gamecenter.retrofit.RetrofitManager;
-
-import org.greenrobot.eventbus.EventBus;
-import org.json.JSONArray;
-
-import okhttp3.MediaType;
-import okhttp3.RequestBody;
-import okhttp3.ResponseBody;
-import retrofit2.HttpException;
-import rx.Observable;
-import rx.functions.Func1;
-import rx.schedulers.Schedulers;
-
-/**
- * Created by khy on 2016/8/24.
- * croncern 工具类
- */
-public class ConcernUtils {
-
-    public static void postConcernGameId(final Context context, final String gameId) {
-        TokenUtils.getToken(context, true)
-                .flatMap(new Func1<String, Observable<ResponseBody>>() {
-                    @Override
-                    public Observable<ResponseBody> call(String token) {
-                        JSONArray params = new JSONArray();
-                        params.put(gameId);
-                        RequestBody body = RequestBody.create(MediaType.parse("application/json"), params.toString());
-                        return RetrofitManager.getUser().postConcern(token, body);
-                    }
-                }).subscribeOn(Schedulers.io())
-                .observeOn(Schedulers.io())
-                .subscribe(new Response<ResponseBody>());
-    }
-
-    public static void deleteConcernData(final Context context, final String gameId) {
-        TokenUtils.getToken(context, true)
-                .flatMap(new Func1<String, Observable<ResponseBody>>() {
-                    @Override
-                    public Observable<ResponseBody> call(String token) {
-                        return RetrofitManager.getUser().deleteConcern(token, gameId);
-                    }
-                }).subscribeOn(Schedulers.io())
-                .observeOn(Schedulers.io())
-                .subscribe(new Response<ResponseBody>());
-    }
-
-    public static void updateConcernData(final Context context, final JSONArray data) {
-        TokenUtils.getToken(context, true)
-                .flatMap(new Func1<String, Observable<ResponseBody>>() {
-                    @Override
-                    public Observable<ResponseBody> call(String token) {
-                        RequestBody body = RequestBody.create(MediaType.parse("application/json"),
-                                data.toString());
-                        return RetrofitManager.getUser().putConcern(token, body);
-                    }
-                })
-                .subscribeOn(Schedulers.io())
-                .observeOn(Schedulers.io())
-                .subscribe(new Response<ResponseBody>() {
-                    @Override
-                    public void onResponse(ResponseBody response) {
-                        super.onResponse(response);
-                        EventBus.getDefault().post(new EBReuse("UpdateConcernSuccess"));
-                    }
-
-                    @Override
-                    public void onFailure(HttpException e) {
-                        super.onFailure(e);
-                        EventBus.getDefault().post(new EBReuse("UpdateConcernFailure"));
-                    }
-                });
-    }
-
-}
-

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

@@ -0,0 +1,85 @@
+package com.gh.common.util
+
+import android.content.Context
+import com.gh.gamecenter.eventbus.EBConcernChanged
+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.JSONArray
+import retrofit2.HttpException
+import rx.android.schedulers.AndroidSchedulers
+import rx.schedulers.Schedulers
+
+/**
+ * Created by khy on 2016/8/24.
+ * croncern 工具类
+ */
+object ConcernUtils {
+
+    fun postConcernGameId(context: Context, gameId: String, listener: onConcernListener?) {
+        val params = JSONArray()
+        params.put(gameId)
+        val body = RequestBody.create(MediaType.parse("application/json"), params.toString())
+        RetrofitManager.getInstance(context).getApi()
+                .postConcern(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, 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) {
+        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(EBConcernChanged())
+                    }
+                })
+    }
+
+
+    interface onConcernListener {
+        fun onSuccess()
+        fun onError()
+    }
+
+}
+

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

@@ -3,7 +3,7 @@ package com.gh.common.util;
 import android.content.Context;
 import android.os.Build;
 
-import com.gh.download.DownloadEntity;
+import com.lightgame.download.DownloadEntity;
 import com.gh.gamecenter.db.info.ConcernInfo;
 import com.gh.gamecenter.entity.GameEntity;
 import com.gh.gamecenter.entity.NewsDetailEntity;
@@ -19,7 +19,7 @@ import java.util.Map;
 
 /**
  * Created by LGT on 2016/12/9.
- * 数据收集 工具类（data.ghzhushou.com）
+ * 数据收集 工具类（data.ghzs666.com）
  */
 public class DataCollectionUtils {
 

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

@@ -2,10 +2,11 @@ package com.gh.common.util;
 
 import android.content.Context;
 
-import com.gh.base.AppController;
-import com.gh.download.DownloadEntity;
+import com.halo.assistant.HaloApp;
+import com.lightgame.download.DownloadEntity;
 import com.gh.gamecenter.retrofit.Response;
 import com.gh.gamecenter.retrofit.RetrofitManager;
+import com.lightgame.utils.Utils;
 
 import org.json.JSONObject;
 
@@ -36,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));
@@ -52,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/DataUtils.java

@@ -5,11 +5,15 @@ import android.app.Application;
 import android.content.Context;
 
 import com.gh.common.constant.Config;
+import com.halo.assistant.TinkerApp;
+import com.tencent.bugly.beta.tinker.TinkerManager;
+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.tencent.tinker.lib.tinker.Tinker;
 import com.tendcloud.tenddata.TCAgent;
 
 import java.util.HashMap;
@@ -29,52 +33,70 @@ public class DataUtils {
      * @param debug   是否debug模式
      * @param channel
      */
-    public static void init(Application context, final boolean debug, String channel) {
+    public static void init(final Application context, final boolean debug, String channel) {
 
         //TalkingData
-        TCAgent.LOG_ON = debug;
-        if (!debug) {
-            TCAgent.init(context, Config.TD_APPID, channel);
-            //TODO 去除为了测试MTA的问题，这个版本不启用
-//            TCAgent.setReportUncaughtExceptions(true);
+        try {
+            TCAgent.LOG_ON = debug;
+            TCAgent.init(context, Config.TALKINGDATA_APPID, channel);
+            /**
+             *
+             * 不要启用！！！！不要启用，全部由{@link com.gh.base.AppUncaughtHandler}处理
+             */
+            TCAgent.setReportUncaughtExceptions(false);
+        } catch (Exception e) {
+            e.printStackTrace();
         }
 
-        // 打开debug开关，可查看mta上报日志或错误
-        // debug true release false
-        StatConfig.setDebugEnable(debug);
-
         //MTA
-        if (!debug) {
+        try {
+            /**
+             *
+             * 不要启用！！！！全部由{@link com.gh.base.AppUncaughtHandler}处理
+             */
+            StatConfig.setAutoExceptionCaught(false);
 
-            //TODO 加入账号之后设置用户
-//            StatConfig.setCustomUserId(context, "userid");
+            StatCrashReporter crashReporter = StatCrashReporter.getStatCrashReporter(context);
+            crashReporter.setJavaCrashHandlerStatus(false);
+//            crashReporter.setEnableInstantReporting(true);
 
-            // 收集未处理的异常
-            StatConfig.setAutoExceptionCaught(true);
-
-            StatConfig.setAntoActivityLifecycleStat(true);
+            StatConfig.setDebugEnable(debug);
 
             // 设置数据上报策略
-            StatConfig.setStatSendStrategy(StatReportStrategy.PERIOD);
-            StatConfig.setSendPeriodMinutes(5);
+            if (debug) {
+                StatConfig.setStatSendStrategy(StatReportStrategy.INSTANT);
+            } else {
+                StatConfig.setStatSendStrategy(StatReportStrategy.PERIOD);
+                StatConfig.setSendPeriodMinutes(5);
+            }
 
             StatConfig.init(context);
             StatConfig.setInstallChannel(channel);
+            StatConfig.setAntoActivityLifecycleStat(true);
+            StatConfig.setAppVersion(PackageUtils.getPatchVersionName());
+
             StatService.setContext(context);
             StatService.registerActivityLifecycleCallbacks(context);
+            // 开启收集服务
+            StatService.startStatService(context, Config.MTA_APPKEY, com.tencent.stat.common.StatConstants.VERSION);
+        } catch (MtaSDkException e) {
+            e.printStackTrace();
+        }
 
-            StatCrashReporter crashReporter = StatCrashReporter.getStatCrashReporter(context);
-            // 开启异常时的实时上报
-            crashReporter.setEnableInstantReporting(true);
-            // 开启java异常捕获
-            crashReporter.setJavaCrashHandlerStatus(true);
+        // init bugly
+        try {
+            CrashReport.setIsDevelopmentDevice(context, debug);
 
-            try {
-                // 开启收集服务
-                StatService.startStatService(context, Config.MTA_APPKEY, com.tencent.stat.common.StatConstants.VERSION);
-            } catch (MtaSDkException e) {
-                e.printStackTrace();
-            }
+            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();
         }
 
     }
@@ -85,12 +107,12 @@ public class DataUtils {
     }
 
     public static void onPause(Activity var0) {
-        TCAgent.onPause(var0);
+        TCAgent.onPageEnd(var0, var0.getClass().getSimpleName());
         StatService.onPause(var0);
     }
 
     public static void onResume(Activity var0) {
-        TCAgent.onResume(var0);
+        TCAgent.onPageStart(var0, var0.getClass().getSimpleName());
         StatService.onResume(var0);
     }
 

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

@@ -0,0 +1,261 @@
+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.
+ * 详情下载工具类
+ */
+
+public class DetailDownloadUtils {
+
+    public static void detailInitDownload(DetailViewHolder viewHolder, boolean isCheck) {
+        if (Config.isShow(viewHolder.context)) {
+            viewHolder.downloadBottom.setVisibility(View.VISIBLE);
+        } else {
+            viewHolder.downloadBottom.setVisibility(View.GONE);
+        }
+        if (viewHolder.gameEntity != null && "光环助手".equals(viewHolder.gameEntity.getName())) {
+            viewHolder.downloadBottom.setVisibility(View.GONE);
+        } else if (viewHolder.gameEntity == null || viewHolder.gameEntity.getApk().isEmpty()) {
+            viewHolder.downloadTv.setVisibility(View.VISIBLE);
+            viewHolder.downloadPb.setVisibility(View.GONE);
+            viewHolder.downloadPer.setVisibility(View.GONE);
+            if (TextUtils.isEmpty(viewHolder.downloadOffText)) {
+                viewHolder.downloadTv.setText("暂无下载");
+            } else {
+                viewHolder.downloadTv.setText(viewHolder.downloadOffText);
+            }
+            viewHolder.downloadTv.setBackgroundResource(R.drawable.game_item_btn_pause_style);
+            viewHolder.downloadTv.setTextColor(0xFF999999);
+            viewHolder.downloadTv.setClickable(false);
+        } else {
+            viewHolder.downloadTv.setVisibility(View.VISIBLE);
+            viewHolder.downloadPb.setVisibility(View.GONE);
+            viewHolder.downloadPer.setVisibility(View.GONE);
+            boolean isInstalled = false;
+            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(R.string.update);
+                    } else if (TextUtils.isEmpty(viewHolder.downloadAddWord)) {
+                        viewHolder.downloadTv.setText(String.format("更新《%s》",
+                                viewHolder.gameEntity.getName()));
+                    } else {
+                        viewHolder.downloadTv.setText(String.format("更新《%s》%s",
+                                viewHolder.gameEntity.getName(), viewHolder.downloadAddWord));
+                    }
+                    viewHolder.downloadTv.setBackgroundResource(
+                            R.drawable.game_item_btn_download_style);
+                } else {
+                    if (viewHolder.gameEntity.getTag() != null && viewHolder.gameEntity.getTag().size() != 0
+                            && !TextUtils.isEmpty(viewHolder.gameEntity.getApk().get(0).getGhVersion())
+                            && !PackageUtils.isSignature(viewHolder.context, viewHolder.gameEntity.getApk().get(0).getPackageName())) {
+                        if (viewHolder.isNewsDetail) {
+                            viewHolder.downloadTv.setText(R.string.pluggable);
+                        } else if (TextUtils.isEmpty(viewHolder.downloadAddWord)) {
+                            viewHolder.downloadTv.setText(String.format("插件化《%s》",
+                                    viewHolder.gameEntity.getName()));
+                        } else {
+                            viewHolder.downloadTv.setText(String.format("插件化《%s》%s",
+                                    viewHolder.gameEntity.getName(), viewHolder.downloadAddWord));
+                        }
+                        viewHolder.downloadTv.setBackgroundResource(
+                                R.drawable.game_item_btn_plugin_style);
+                    } else {
+                        if (viewHolder.isNewsDetail) {
+                            viewHolder.downloadTv.setText(R.string.launch);
+                        } else if (TextUtils.isEmpty(viewHolder.downloadAddWord)) {
+                            viewHolder.downloadTv.setText(String.format("启动《%s》",
+                                    viewHolder.gameEntity.getName()));
+                        } else {
+                            viewHolder.downloadTv.setText(String.format("启动《%s》%s",
+                                    viewHolder.gameEntity.getName(), viewHolder.downloadAddWord));
+                        }
+                        viewHolder.downloadTv.setBackgroundResource(
+                                R.drawable.game_item_btn_launch_style);
+                    }
+                }
+            } else {
+                String status = GameUtils.getDownloadBtnText(viewHolder.context, viewHolder.gameEntity);
+                switch (status) {
+                    case "插件化":
+                        viewHolder.downloadTv.setBackgroundResource(R.drawable.game_item_btn_plugin_style);
+                        break;
+                    case "打开":
+                        viewHolder.downloadTv.setBackgroundResource(R.drawable.game_item_btn_launch_style);
+                        break;
+                    default:
+                        viewHolder.downloadTv.setBackgroundResource(R.drawable.game_item_btn_download_style);
+                        break;
+                }
+
+                if (viewHolder.isNewsDetail) {
+                    viewHolder.downloadTv.setText(status);
+                } else if (TextUtils.isEmpty(viewHolder.downloadAddWord)) {
+                    viewHolder.downloadTv.setText(String.format(status + "《%s》",
+                            viewHolder.gameEntity.getName()));
+                } else {
+                    viewHolder.downloadTv.setText(String.format(status + "《%s》%s",
+                            viewHolder.gameEntity.getName(), viewHolder.downloadAddWord));
+                }
+            }
+        }
+        if (isCheck && viewHolder.gameEntity != null
+                && viewHolder.gameEntity.getApk().size() == 1) {
+            String url = viewHolder.gameEntity.getApk().get(0).getUrl();
+            DownloadEntity downloadEntity = DownloadManager.getInstance(viewHolder.context).getDownloadEntityByUrl(url);
+            if (downloadEntity != null) {
+                viewHolder.downloadEntity = downloadEntity;
+                viewHolder.downloadTv.setVisibility(View.GONE);
+                viewHolder.downloadPb.setVisibility(View.VISIBLE);
+                viewHolder.downloadPer.setVisibility(View.VISIBLE);
+                detailInvalidate(viewHolder);
+            }
+        }
+    }
+
+    public static void detailInvalidate(DetailViewHolder viewHolder) {
+        viewHolder.downloadPb.setProgress((int) (viewHolder.downloadEntity.getPercent() * 10));
+        viewHolder.downloadPer.setTextColor(0xFFFFFFFF);
+        DownloadEntity downloadEntity = viewHolder.downloadEntity;
+        switch (downloadEntity.getStatus()) {
+            case downloading:
+            case pause:
+            case timeout:
+            case neterror:
+            case waiting:
+                viewHolder.downloadPer.setText(R.string.downloading);
+                break;
+            case done:
+                viewHolder.downloadPer.setText("安装");
+                if (downloadEntity.isPluggable()
+                        && PackageManager.isInstalled(downloadEntity.getPackageName())) {
+                    viewHolder.downloadPb.setProgressDrawable(ContextCompat.getDrawable(viewHolder.context, R.drawable.progressbar_plugin_radius_style));
+                } else {
+                    viewHolder.downloadPb.setProgressDrawable(ContextCompat.getDrawable(viewHolder.context, R.drawable.progressbar_normal_radius_style));
+                }
+                break;
+            case cancel:
+            case hijack:
+            case notfound:
+                detailInitDownload(viewHolder, false);
+                break;
+            default:
+                break;
+        }
+    }
+
+    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, StringUtils.buildString(mEntrance, "+(", mName, "[", mTitle, "])"), 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(), StringUtils.buildString(mEntrance, "+(", mName, "[", mTitle, "])"));
+                    mViewHolder.context.startActivity(intent);
+                } else if ("安装".equals(str)) {
+                    if (mDownloadEntity == null) {
+                        mDownloadEntity = DownloadManager.getInstance(mViewHolder.context).getDownloadEntityByUrl( mGameEntity.getApk().get(0).getUrl());
+                    }
+
+                    if (mDownloadEntity != null) {
+                        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 = mViewHolder.context.getString(R.string.download);
+                }
+                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(), StringUtils.buildString(mEntrance, "+(", mName, "[", mTitle, "])"), "下载开始");
+
+                    DownloadManager.createDownload(mViewHolder.context, apkEntity, mGameEntity, method, StringUtils.buildString(mEntrance, "+(", mName, "[", mTitle, "])"), 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,197 @@
+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.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 (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();
+    }
+
+
+    private 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

@@ -8,19 +8,25 @@ import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageInfo;
 import android.graphics.Bitmap;
 import android.os.Handler;
+import android.support.v4.content.ContextCompat;
+import android.support.v7.app.AlertDialog;
 import android.text.Html;
 import android.text.Spanned;
+import android.text.TextPaint;
 import android.view.Display;
+import android.view.Gravity;
+import android.view.LayoutInflater;
 import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
+import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.gh.base.AppController;
 import com.gh.gamecenter.R;
 import com.gh.gamecenter.kuaichuan.WifiMgr;
+import com.halo.assistant.HaloApp;
 
 import java.io.File;
 import java.text.DecimalFormat;
@@ -49,9 +55,9 @@ public class DialogUtils {
     // 快传成绩单
     public static void showKuaiChuanResult(final Activity activity, Handler handler, int requestCode, final String picName) {
 
-        AppController.remove("FileInfo");
+        HaloApp.remove("FileInfo");
 
-        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
@@ -325,59 +331,7 @@ public class DialogUtils {
     public static void showWarningDialog(Context context, String title, CharSequence msg, String cancel, String confirm,
                                          final ConfirmListener cmListener, final CancelListener clListener) {
 
-        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();
+        showAlertDialog(context, title, msg, confirm, cancel, cmListener, clListener);
     }
 
     // 网络劫持时 打开QQ客户端，创建临时会话
@@ -392,15 +346,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) {
         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) {
@@ -434,6 +390,413 @@ public class DialogUtils {
         disclaimerDialog.show();
     }
 
+    /**
+     * Material Design 风格弹窗
+     *
+     * @param context
+     * @param title      标题
+     * @param message    内容
+     * @param positive   确认按钮文本
+     * @param negative   取消按钮文本
+     * @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();
+//
+//        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);
+//
+//        positiveBtn.setTextSize(14);
+//        positiveBtn.setTextColor(ContextCompat.getColor(context, R.color.theme));
+//        negativeBtn.setTextSize(14);
+//        negativeBtn.setTextColor(ContextCompat.getColor(context, R.color.theme));
+//        if (mesage != null) {
+//            mesage.setTextSize(14);
+//            mesage.setTextColor(ContextCompat.getColor(context, R.color.system_bar));
+//            mesage.setLineSpacing(1.0f, 1.3f);
+//        }
+
+        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.show();
+
+    }
+
+    /**
+     * 取消按钮灰色
+     *
+     * @param context
+     * @param title
+     * @param message
+     * @param positive
+     * @param negative
+     * @param cmListener
+     */
+
+    // TODO: 8/10/17 将下面几个弹窗整理在一起
+    public static void showAlertDialog(Context context, String title, CharSequence message
+            , String positive, String negative, final ConfirmListener cmListener) {
+
+//        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, null)
+//                .create();
+//        alertDialog.show();
+//
+//        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);
+//
+//        positiveBtn.setTextSize(14);
+//        positiveBtn.setTextColor(ContextCompat.getColor(context, R.color.theme));
+//        negativeBtn.setTextSize(14);
+//        negativeBtn.setTextColor(ContextCompat.getColor(context, R.color.hint));
+//        if (mesage != null) {
+//            mesage.setTextSize(14);
+//            mesage.setTextColor(ContextCompat.getColor(context, R.color.system_bar));
+//            mesage.setLineSpacing(1.0f, 1.3f);
+//        }
+
+        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) {
+                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) {
+
+//        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();
+//                        }
+//                    }
+//                })
+//                .setOnCancelListener(new DialogInterface.OnCancelListener() {
+//                    @Override
+//                    public void onCancel(DialogInterface dialogInterface) {
+//                        clListener.onCancel();
+//                    }
+//                })
+//                .create();
+//
+//        alertDialog.show();
+//
+//        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);
+//
+//        positiveBtn.setTextSize(14);
+//        positiveBtn.setTextColor(ContextCompat.getColor(context, R.color.theme));
+//        negativeBtn.setTextSize(14);
+//        negativeBtn.setTextColor(ContextCompat.getColor(context, R.color.hint));
+//        if (mesage != null) {
+//            mesage.setTextSize(14);
+//            mesage.setTextColor(ContextCompat.getColor(context, R.color.system_bar));
+//            mesage.setLineSpacing(1.0f, 1.3f);
+//        }
+
+        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();
+    }
+
+    /**
+     * 特殊：验证手机号码
+     */
+
+    public static void checkPhoneNumDialog(Context context, CharSequence message, final ConfirmListener cmListener) {
+        String s = message.toString();
+        String sub1 = s.substring(0, 3);
+        String sub2 = s.substring(3, 7);
+        String sub3 = s.substring(7, 11);
+        String phoneNum = StringUtils.buildString(sub1, " - ", sub2, " - ", sub3);
+
+        AlertDialog alertDialog = new AlertDialog.Builder(context, R.style.GhAlertDialog)
+                .setTitle("请确定手机号：")
+                .setMessage(phoneNum)
+                .setPositiveButton("确认", new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        if (cmListener != null) {
+                            cmListener.onConfirm();
+                        }
+                    }
+                })
+                .setNegativeButton("取消", null)
+                .create();
+        alertDialog.show();
+
+        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);
+
+        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.setGravity(Gravity.CENTER);
+            mesage.setTextSize(24);
+            mesage.setTextColor(ContextCompat.getColor(context, R.color.title));
+            TextPaint tp = mesage.getPaint();
+            tp.setFakeBoldText(true);
+        }
+
+    }
+
     public interface ConfirmListener {
         void onConfirm();
     }

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

@@ -3,24 +3,27 @@ package com.gh.common.util;
 import android.content.Context;
 import android.graphics.Color;
 import android.os.Message;
+import android.support.v4.content.ContextCompat;
 import android.support.v4.util.ArrayMap;
 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.constant.Constants;
 import com.gh.common.view.DownloadDialog;
-import com.gh.download.DownloadEntity;
 import com.gh.download.DownloadManager;
-import com.gh.download.DownloadStatus;
 import com.gh.gamecenter.DownloadManagerActivity;
 import com.gh.gamecenter.R;
 import com.gh.gamecenter.adapter.viewholder.GameViewHolder;
+import com.gh.gamecenter.entity.ApkEntity;
 import com.gh.gamecenter.entity.GameEntity;
 import com.gh.gamecenter.manager.PackageManager;
+import com.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;
 
@@ -63,10 +66,15 @@ public class DownloadItemUtils {
         } else {
             if (!queue.contains(platform)) {
                 queue.offer(platform);
+                if (AppDebugConfig.IS_DEBUG) {
+                    AppDebugConfig.logMethodWithParams(DownloadItemUtils.class, queue.size(), gameEntity.getBrief(), downloadEntity.getPlatform(), index);
+                }
+                // 有两个平台同时下载的时候启用
                 if (queue.size() == 2) {
+                    //TODO fuck this
                     Message msg = Message.obtain();
                     msg.obj = downloadEntity.getName();
-                    msg.what = Constants.DOWNLOAD_ROLL;
+                    msg.what = DownloadConfig.DOWNLOAD_ROLL;
                     DownloadManager.getInstance(context).sendMessageDelayed(msg, 3000);
                 }
             }
@@ -86,7 +94,7 @@ public class DownloadItemUtils {
     public static void updateItem(Context context, GameEntity gameEntity, GameViewHolder holder, boolean isShowPlatform) {
 
         // 控制是否显示下载按钮
-        if (!Config.isShow(context) || "光环助手".equals(gameEntity.getName())) {
+        if (!Config.isShow(context) || context.getString(R.string.app_name).equals(gameEntity.getName())) {
             holder.gameDownloadBtn.setVisibility(View.GONE);
         } else {
             holder.gameDownloadBtn.setVisibility(View.VISIBLE);
@@ -98,13 +106,6 @@ public class DownloadItemUtils {
             holder.gameLibaoIcon.setVisibility(View.GONE);
         }
 
-//		LibaoDao libaoDao = new LibaoDao(context);
-//		if (libaoDao.isExist(gameEntity.getId())) {
-//			holder.gameLibaoIcon.setVisibility(View.VISIBLE);
-//		} else {
-//
-//		}
-
         if (gameEntity.getApk() == null || gameEntity.getApk().isEmpty()) {
             holder.gameDes.setVisibility(View.VISIBLE);
             holder.gameProgressbar.setVisibility(View.GONE);
@@ -115,18 +116,21 @@ public class DownloadItemUtils {
         } else if (gameEntity.getApk().size() == 1) {
             updateNormalItem(context, holder, gameEntity, isShowPlatform);
         } else {
+//            updateNormalItem(context, holder, gameEntity, isShowPlatform);
             updatePluginItem(context, holder, gameEntity, isShowPlatform);
         }
 
     }
 
     // 更新正常的条目，只有一个apk包
-    public static void updateNormalItem(Context context, GameViewHolder holder, GameEntity gameEntity,
-                                        boolean isShowPlatform) {
+    static void updateNormalItem(Context context, GameViewHolder holder, GameEntity gameEntity,
+                                 boolean isShowPlatform) {
+
+        final ArrayMap<String, DownloadEntity> entryMap = gameEntity.getEntryMap();
+        final ApkEntity apkEntity = gameEntity.getApk().get(0);
 
-        ArrayMap<String, DownloadEntity> entryMap = gameEntity.getEntryMap();
         if (entryMap != null && !entryMap.isEmpty()) {
-            DownloadEntity downloadEntity = entryMap.get(gameEntity.getApk().get(0).getPlatform());
+            DownloadEntity downloadEntity = entryMap.get(apkEntity.getPlatform());
             if (downloadEntity != null) {
                 // 更改进度条和提示文本的状态
                 changeStatus(context, holder, downloadEntity, isShowPlatform, true);
@@ -139,51 +143,55 @@ public class DownloadItemUtils {
         holder.gameInfo.setVisibility(View.GONE);
 
         holder.gameDownloadBtn.setTextColor(Color.WHITE);
+
+        final String packageName = apkEntity.getPackageName();
+
         if (gameEntity.isPluggable()) {
-            holder.gameDownloadBtn.setText("插件化");
-            DownloadEntity downloadEntity = DownloadManager.getInstance(context).getByPackage(
-                    gameEntity.getApk().get(0).getPackageName());
-            if (downloadEntity == null
-                    || downloadEntity.getUrl().equals(gameEntity.getApk().get(0).getUrl())) {
-                holder.gameDownloadBtn.setClickable(true);
-                holder.gameDownloadBtn.setBackgroundResource(R.drawable.game_item_btn_plugin_style);
-            } else {
-                holder.gameDownloadBtn.setClickable(false);
-                holder.gameDownloadBtn.setBackgroundResource(R.drawable.game_item_btn_pause_up);
-            }
-        } else if (PackageManager.isInstalled(gameEntity.getApk().get(0).getPackageName())) {
-            if (PackageManager.isCanUpdate(gameEntity.getId(), gameEntity.getApk().get(0).getPackageName())) {
-                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(R.string.update);
                 holder.gameDownloadBtn.setBackgroundResource(R.drawable.game_item_btn_download_style);
             } else {
                 if (gameEntity.getTag() != null && gameEntity.getTag().size() != 0
-                        && !TextUtils.isEmpty(gameEntity.getApk().get(0).getGhVersion())
-                        && !PackageUtils.isSignature(context, gameEntity.getApk().get(0).getPackageName())) {
-                    holder.gameDownloadBtn.setText("插件化");
-                    DownloadEntity downloadEntity = DownloadManager.getInstance(context).getByPackage(
-                            gameEntity.getApk().get(0).getPackageName());
-                    if (downloadEntity == null
-                            || downloadEntity.getUrl().equals(gameEntity.getApk().get(0).getUrl())) {
-                        holder.gameDownloadBtn.setClickable(true);
-                        holder.gameDownloadBtn.setBackgroundResource(R.drawable.game_item_btn_plugin_style);
-                    } else {
-                        holder.gameDownloadBtn.setClickable(false);
-                        holder.gameDownloadBtn.setBackgroundResource(R.drawable.game_item_btn_pause_up);
-                    }
+                        && !TextUtils.isEmpty(apkEntity.getGhVersion())
+                        && !PackageUtils.isSignature(context, packageName)) {
+                    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);
         }
     }
 
+    /**
+     * 这个干什么鬼?
+     *
+     * @param context
+     * @param holder
+     * @param apkEntity
+     * @param packageName
+     */
+    public static void setwhat(Context context, GameViewHolder holder, ApkEntity apkEntity, String packageName) {
+        DownloadEntity downloadEntity = DownloadManager.getInstance(context).getDownloadEntityByPackageName(packageName);
+        if (downloadEntity == null || downloadEntity.getUrl().equals(apkEntity.getUrl())) {
+            holder.gameDownloadBtn.setClickable(true);
+            holder.gameDownloadBtn.setBackgroundResource(R.drawable.game_item_btn_plugin_style);
+        } else {
+            holder.gameDownloadBtn.setClickable(false);
+            holder.gameDownloadBtn.setBackgroundResource(R.drawable.game_item_btn_pause_up);
+        }
+    }
+
     // 更新插件的条目，有多个apk包
-    public static void updatePluginItem(Context context, GameViewHolder holder, GameEntity gameEntity,
-                                        boolean isShowPlatform) {
+    static void updatePluginItem(Context context, GameViewHolder holder, GameEntity gameEntity,
+                                 boolean isShowPlatform) {
 
         GameUtils.setDownloadBtnStatus(context, gameEntity, holder.gameDownloadBtn);
 
@@ -218,8 +226,7 @@ public class DownloadItemUtils {
         holder.gameProgressbar.setVisibility(View.VISIBLE);
         holder.gameInfo.setVisibility(View.VISIBLE);
 
-        String platform = PlatformUtils.getInstance(context)
-                .getPlatformName(downloadEntity.getPlatform());
+        String platform = PlatformUtils.getInstance(context).getPlatformName(downloadEntity.getPlatform());
 
         DownloadStatus status = downloadEntity.getStatus();
         if (status.equals(DownloadStatus.downloading)) {
@@ -237,9 +244,9 @@ 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(context.getResources().getColorStateList(R.color.text_downloading_style));
+                holder.gameDownloadBtn.setTextColor(ContextCompat.getColorStateList(context, R.color.text_downloading_style));
             }
         } else if (status.equals(DownloadStatus.waiting)) {
             holder.gameProgressbar.setProgress((int) (downloadEntity.getPercent() * 10));
@@ -251,9 +258,9 @@ 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(context.getResources().getColorStateList(R.color.text_downloading_style));
+                holder.gameDownloadBtn.setTextColor(ContextCompat.getColorStateList(context, R.color.text_downloading_style));
             }
         } else if (status.equals(DownloadStatus.pause)
                 || status.equals(DownloadStatus.timeout)
@@ -267,9 +274,9 @@ 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(context.getResources().getColorStateList(R.color.text_downloading_style));
+                holder.gameDownloadBtn.setTextColor(ContextCompat.getColorStateList(context, R.color.text_downloading_style));
             }
         } else if (status.equals(DownloadStatus.done)) {
             holder.gameProgressbar.setProgress(1000);
@@ -328,48 +335,55 @@ public class DownloadItemUtils {
                                      final String location) {
 
         String str = downloadBtn.getText().toString();
-        if ("下载".equals(str)) {
-            if (NetworkUtils.isWifiConnected(context)) {
-                download(context, gameEntity, downloadBtn, entrance, location);
-            } else {
-                DialogUtils.showDownloadDialog(context, new DialogUtils.ConfirmListener() {
-                    @Override
-                    public void onConfirm() {
-                        download(context, gameEntity, downloadBtn, entrance, location);
-                    }
-                });
-            }
-        } else if ("插件化".equals(str)) {
-            if (NetworkUtils.isWifiConnected(context)) {
-                plugin(context, gameEntity, downloadBtn, entrance, location);
-            } else {
-                DialogUtils.showDownloadDialog(context, new DialogUtils.ConfirmListener() {
-                    @Override
-                    public void onConfirm() {
-                        plugin(context, gameEntity, downloadBtn, entrance, location);
-                    }
-                });
-            }
-        } else if ("安装".equals(str)) {
-            install(context, gameEntity, position, adapter);
-        } else if ("启动".equals(str)) {
-            DataUtils.onGameLaunchEvent(context, gameEntity.getName(), gameEntity.getApk().get(0).getPlatform(), location);
+        switch (str) {
+            case "下载":
+                if (NetworkUtils.isWifiConnected(context)) {
+                    download(context, gameEntity, downloadBtn, entrance, location);
+                } else {
+                    DialogUtils.showDownloadDialog(context, new DialogUtils.ConfirmListener() {
+                        @Override
+                        public void onConfirm() {
+                            download(context, gameEntity, downloadBtn, entrance, location);
+                        }
+                    });
+                }
+                break;
+            case "插件化":
+                if (NetworkUtils.isWifiConnected(context)) {
+                    plugin(context, gameEntity, downloadBtn, entrance, location);
+                } else {
+                    DialogUtils.showDownloadDialog(context, new DialogUtils.ConfirmListener() {
+                        @Override
+                        public void onConfirm() {
+                            plugin(context, gameEntity, downloadBtn, entrance, location);
+                        }
+                    });
+                }
+                break;
+            case "安装":
+                install(context, gameEntity, position, adapter);
+                break;
+            case "启动":
+                DataUtils.onGameLaunchEvent(context, gameEntity.getName(), gameEntity.getApk().get(0).getPlatform(), location);
 
-            PackageUtils.launchApplicationByPackageName(context, gameEntity.getApk().get(0).getPackageName());
-        } else if ("下载中".equals(str)) {
-            context.startActivity(
-                    DownloadManagerActivity.getDownloadMangerIntent(context, gameEntity.getApk().get(0).getUrl(), entrance + "+(" + location.split(":")[0] + ")"));
-        } else if ("更新".equals(str)) {
-            if (NetworkUtils.isWifiConnected(context)) {
-                update(context, gameEntity, entrance, location);
-            } else {
-                DialogUtils.showDownloadDialog(context, new DialogUtils.ConfirmListener() {
-                    @Override
-                    public void onConfirm() {
-                        update(context, gameEntity, entrance, location);
-                    }
-                });
-            }
+                PackageUtils.launchApplicationByPackageName(context, gameEntity.getApk().get(0).getPackageName());
+                break;
+            case "下载中":
+                context.startActivity(
+                        DownloadManagerActivity.getDownloadMangerIntent(context, gameEntity.getApk().get(0).getUrl(), entrance + "+(" + location.split(":")[0] + ")"));
+                break;
+            case "更新":
+                if (NetworkUtils.isWifiConnected(context)) {
+                    update(context, gameEntity, entrance, location);
+                } else {
+                    DialogUtils.showDownloadDialog(context, new DialogUtils.ConfirmListener() {
+                        @Override
+                        public void onConfirm() {
+                            update(context, gameEntity, entrance, location);
+                        }
+                    });
+                }
+                break;
         }
     }
 
@@ -383,55 +397,51 @@ 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(context.getResources().getColorStateList(R.color.text_downloading_style));
+            downloadBtn.setTextColor(ContextCompat.getColorStateList(context, R.color.text_downloading_style));
 
-            DownloadManager.getInstance(context).putStatus(gameEntity.getApk().get(0).getUrl(), "downloading");
+//            DownloadManager.getInstance(context).putStatus(gameEntity.getApk().get(0).getUrl(), "downloading");
         } else {
-            Toast.makeText(context, msg, Toast.LENGTH_SHORT).show();
+            Utils.toast(context, msg);
         }
     }
 
     //插件化
-    private static void plugin(Context context,
-                               GameEntity gameEntity,
-                               TextView downloadBtn,
-                               String entrance,
+    private static void plugin(Context context, GameEntity gameEntity, TextView downloadBtn, String entrance,
                                String location) {
         String msg = FileUtils.isCanDownload(context, gameEntity.getApk().get(0).getSize());
         if (TextUtils.isEmpty(msg)) {
             DataUtils.onGameDownloadEvent(context, gameEntity.getName(), gameEntity.getApk().get(0).getPlatform(), entrance, "下载开始");
 
             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(context.getResources().getColorStateList(R.color.text_downloading_style));
+            downloadBtn.setTextColor(ContextCompat.getColorStateList(context, R.color.text_downloading_style));
 
-            DownloadManager.getInstance(context).putStatus(gameEntity.getApk().get(0).getUrl(), "downloading");
+//            DownloadManager.getInstance(context).putStatus(gameEntity.getApk().get(0).getUrl(), "downloading");
         } else {
-            Toast.makeText(context, msg, Toast.LENGTH_SHORT).show();
+            Utils.toast(context, msg);
         }
     }
 
     //安装
-    private static void install(final Context context,
-                                GameEntity gameEntity,
-                                int position,
+    private static void install(final Context context, GameEntity gameEntity, int position,
                                 RecyclerView.Adapter<? extends RecyclerView.ViewHolder> adapter) {
-        DownloadEntity downloadEntity = DownloadManager.getInstance(context).get(gameEntity.getApk().get(0).getUrl());
+        ApkEntity apkEntity = gameEntity.getApk().get(0);
+        DownloadEntity downloadEntity = DownloadManager.getInstance(context).getDownloadEntityByUrl(apkEntity.getUrl());
         if (downloadEntity != null) {
             final String path = downloadEntity.getPath();
             if (FileUtils.isEmptyFile(path)) {
-                Toast.makeText(context, "解析包出错（可能被误删了），请重新下载", Toast.LENGTH_SHORT).show();
+                Utils.toast(context, context.getString(R.string.install_failure_hint));
                 DownloadManager.getInstance(context).cancel(downloadEntity.getUrl());
                 if (gameEntity.getEntryMap() != null) {
-                    gameEntity.getEntryMap().remove(gameEntity.getApk().get(0).getPlatform());
+                    gameEntity.getEntryMap().remove(apkEntity.getPlatform());
                 }
                 adapter.notifyItemChanged(position);
             } else {
@@ -441,10 +451,7 @@ public class DownloadItemUtils {
     }
 
     //更新
-    private static void update(Context context,
-                               GameEntity gameEntity,
-                               String entrance,
-                               String location) {
+    private static void update(Context context, GameEntity gameEntity, String entrance, String location) {
         DataUtils.onGameUpdateEvent(context, gameEntity.getName(), gameEntity.getApk().get(0).getPlatform(), "下载开始");
         DownloadManager.createDownload(context, gameEntity, "更新", entrance, location);
     }

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

@@ -21,9 +21,10 @@ 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";
@@ -43,7 +44,18 @@ 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 void jumpActivity(Context context, Bundle bundle) {
 

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

@@ -1,383 +0,0 @@
-package com.gh.common.util;
-
-import android.content.Context;
-import android.os.Environment;
-import android.os.StatFs;
-import android.os.StrictMode;
-
-import org.json.JSONObject;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.util.UUID;
-
-/**
- * @author guanchao wen
- * @email shuwoom.wgc@gmail.com
- * @modify hzh 2016/03/16
- * @update 2015-7-29下午2:26:02
- */
-public class FileUtils {
-
-    private final static String TEST_FILE_NAME = System.currentTimeMillis() + ".log";
-
-    public static String getDownloadPath(Context context, String name) {
-        return getDownloadDir(context) + File.separator + name;
-    }
-
-    public static String getDownloadDir(Context context) {
-        String dir = null;
-        if (isMounted()) {
-            String baseDir = Environment.getExternalStorageDirectory().getAbsolutePath();
-            dir = checkDir(baseDir + File.separator + "gh-download");
-            File file = new File(dir + File.separator + TEST_FILE_NAME);
-            if (!file.exists()) {
-                try {
-                    if (!file.createNewFile()) {
-                        // cannot create file
-                        Utils.log("cannot create file");
-                        dir = null;
-                    }
-                } catch (IOException e) {
-                    e.printStackTrace();
-                    // cannot create file
-                    Utils.log("cannot create file");
-                    dir = null;
-                }
-            }
-        }
-        if (dir == null) {
-            String baseDir = context.getFilesDir().getAbsolutePath();
-            dir = checkDir(baseDir + File.separator + "gh-download");
-            try {
-                Runtime.getRuntime().exec("chmod 755 " + dir);
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-        return dir;
-    }
-
-    public static boolean isMounted() {
-        return Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED);
-    }
-
-    private static String checkDir(String dir) {
-        File directory = new File(dir);
-        if (directory.exists() && !directory.isDirectory()) {
-            directory.delete();
-        }
-        if (!directory.exists()) {
-            directory.mkdirs();
-        }
-        return dir;
-    }
-
-    public static String getLogPath(Context context, String name) {
-        return checkDir(getDir(context, "log")) + File.separator + name;
-    }
-
-    public static String getDir(Context context, String dir) {
-        if (isMounted()) {
-            // /storage/emulated/0/Android/data/包名/files
-            File file = context.getExternalFilesDir(null);
-            if (file != null) {
-                return file.getAbsolutePath() + File.separator + dir;
-            }
-        }
-        // /data/data/包名/files
-        return context.getFilesDir().getAbsolutePath() + File.separator + dir;
-    }
-
-    public static String getPlatformPicDir(Context context) {
-        return checkDir(getDir(context, "PlatformPic"));
-    }
-
-    public static void deleteFile(String savePath) {
-        File file = new File(savePath);
-        if (file.exists()) {
-            file.delete();
-        }
-    }
-
-    public static void deleteFolder(File folder) {
-        if (folder != null) {
-            if (folder.isDirectory()) {
-                for (File file : folder.listFiles()) {
-                    if (file.isDirectory()) {
-                        deleteFolder(file);
-                    } else {
-                        file.delete();
-                    }
-                }
-            }
-            folder.delete();
-        }
-    }
-
-    public static boolean isEmptyFile(String path) {
-        File file = new File(path);
-        return !(file.exists() && file.length() != 0);
-    }
-
-    public static String isCanDownload(Context context, String size) {
-        String msg = null;
-        String packageSizeStr = "";
-        for (int i = 0; i < size.length(); i++) {
-            if ((size.charAt(i) >= 48 && size.charAt(i) <= 57) || size.charAt(i) == 46) {
-                packageSizeStr += size.charAt(i);
-            }
-        }
-        float packageSize = 0;
-        if (packageSizeStr.length() != 0) {
-            packageSize = Float.valueOf(packageSizeStr);
-        }
-        float freeSpace = getFreeSpaceByPath(getDownloadDir(context));
-        if (freeSpace < packageSize) {
-            msg = "手机存储空间不足，无法进行下载！";
-        }
-        return msg;
-    }
-
-    // 返回剩余空间 单位MB
-    @SuppressWarnings("deprecation")
-    public static float getFreeSpaceByPath(String path) {
-        StatFs statfs = new StatFs(path);
-        long blockSize = statfs.getBlockSize();
-        long availableBlocks = statfs.getAvailableBlocks();
-
-        return availableBlocks * blockSize / 1024f / 1024f;
-    }
-
-    // 下载文件
-    public static int downloadFile(String url, String savePath) {
-        DataInputStream dis = null;
-        FileOutputStream fos = null;
-        try {
-            HttpURLConnection connection = (HttpURLConnection) new URL(url).openConnection();
-            connection.setRequestMethod("GET");
-            connection.setConnectTimeout(5 * 1000);
-            connection.setReadTimeout(5 * 1000);
-            connection.connect();
-            int code = connection.getResponseCode();
-            if (code == 200) {
-                dis = new DataInputStream(connection.getInputStream());
-                File file = new File(savePath);
-                if (file.exists()) {
-                    file.delete();
-                }
-                file.createNewFile();
-                fos = new FileOutputStream(file);
-                byte[] buffer = new byte[1024];
-                int len;
-                while ((len = dis.read(buffer)) != -1) {
-                    fos.write(buffer, 0, len);
-                }
-                fos.flush();
-            }
-            return code;
-        } catch (IOException e) {
-            e.printStackTrace();
-        } finally {
-            if (fos != null) {
-                try {
-                    fos.close();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-            if (dis != null) {
-                try {
-                    dis.close();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-        return -1;
-    }
-
-    // 上传文件
-    public static JSONObject uploadFile(String url, String filePath, String token) {
-        String end = "\r\n";
-        String twoHyphens = "--";
-        String boundary = UUID.randomUUID().toString().replaceAll("-", "").substring(0, 16);
-        try {
-            HttpURLConnection connection = (HttpURLConnection) new URL(url).openConnection();
-            /*
-             * Output to the connection. Default is false, set to true because
-			 * post method must write something to the connection
-			 */
-            connection.setDoOutput(true);
-            // Read from the connection. Default is true.
-            connection.setDoInput(true);
-            // Post cannot use caches
-            connection.setUseCaches(false);
-            // Set the post method. Default is GET
-            connection.setRequestMethod("POST");
-            connection.setConnectTimeout(5 * 1000);
-            connection.setReadTimeout(5 * 1000);
-            // 设置请求属性
-            connection.setRequestProperty("Connection", "Keep-Alive");
-            connection.setRequestProperty("Charset", "UTF-8");
-            connection.setRequestProperty("Content-Type", "multipart/form-data;boundary=" + boundary);
-            if (token != null) {
-                connection.setRequestProperty("TOKEN", token);
-            }
-            // 设置StrictMode 否则HTTPURLConnection连接失败，因为这是在主进程中进行网络连接
-            StrictMode.setThreadPolicy(new StrictMode.ThreadPolicy.Builder()
-                    .detectDiskReads().detectDiskWrites().detectNetwork()
-                    .penaltyLog().build());
-            File file = new File(filePath);
-            if (file.exists()) {
-                Utils.log("name = " + file.getName());
-                Utils.log("length = " + file.length());
-            }
-            // 设置DataOutputStream，getOutputStream中默认调用connect()
-            DataOutputStream dos = new DataOutputStream(connection.getOutputStream()); // output
-            // to the connection
-            dos.writeBytes(twoHyphens + boundary + end);
-            dos.writeBytes("Content-Disposition: form-data; "
-                    + "name=\"Filedata\";filename=\"" + file.getName() + "\"" + end);
-            dos.writeBytes(end);
-            // 取得文件的FileInputStream
-            FileInputStream fStream = new FileInputStream(file);
-            // 设置每次写入8192bytes
-            int bufferSize = 8192;
-            byte[] buffer = new byte[bufferSize]; // 8k
-            int length;
-            // 从文件读取数据至缓冲区
-            while ((length = fStream.read(buffer)) != -1) {
-                // 将资料写入DataOutputStream中
-                dos.write(buffer, 0, length);
-            }
-            dos.writeBytes(end);
-            dos.writeBytes(twoHyphens + boundary + twoHyphens + end);
-            // 关闭流，写入的东西自动生成Http正文
-            fStream.close();
-            // 关闭DataOutputStream
-            dos.flush();
-            dos.close();
-
-            InputStream inputStream;
-            try {
-                inputStream = connection.getInputStream();
-            } catch (IOException ioe) {
-                inputStream = connection.getErrorStream();
-            }
-            int ch;
-            StringBuffer b = new StringBuffer();
-            while ((ch = inputStream.read()) != -1) {
-                b.append((char) ch);
-            }
-            // 显示网页响应内容
-            Utils.log("content = " + b.toString().trim());
-
-            int statusCode = connection.getResponseCode();
-            Utils.log("statusCode = " + statusCode);
-            if (statusCode == 200) {
-                // {"icon":"http:\/\/gh-test-1.oss-cn-qingdao.aliyuncs.com\/pic\/57e4f4d58a3200042d29492f.jpg"}
-                JSONObject response = new JSONObject(b.toString().trim());
-                response.put("statusCode", 200);
-                return response;
-            } else if (statusCode == 403) {
-                JSONObject response = new JSONObject(b.toString().trim());
-                response.put("statusCode", 403);
-                return response;
-            } else if (statusCode == 401) {
-                JSONObject response = new JSONObject();
-                response.put("statusCode", 401);
-                return response;
-            }
-        } catch (Exception e) {
-            // 显示异常信息
-            e.printStackTrace();
-            Utils.log("Fail:" + e);
-        }
-        return null;
-    }
-
-    // 读取文件，返回byte[]
-    public static byte[] readFile(File file) {
-        if (file == null) {
-            return null;
-        }
-        FileInputStream fis = null;
-        ByteArrayOutputStream bos = null;
-        try {
-            fis = new FileInputStream(file);
-            bos = new ByteArrayOutputStream();
-            byte[] buffer = new byte[2048];
-            int len;
-            while ((len = fis.read(buffer)) != -1) {
-                bos.write(buffer, 0, len);
-            }
-            bos.flush();
-            return bos.toByteArray();
-        } catch (IOException e) {
-            e.printStackTrace();
-        } finally {
-            if (fis != null) {
-                try {
-                    fis.close();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-            if (bos != null) {
-                try {
-                    bos.close();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-        return null;
-    }
-
-    // 根据byte[]，保存文件
-    public static void saveFile(File file, byte[] data) {
-        if (file == null || data == null) {
-            return;
-        }
-        ByteArrayInputStream bis = null;
-        FileOutputStream fos = null;
-        try {
-            bis = new ByteArrayInputStream(data);
-            fos = new FileOutputStream(file);
-            byte[] buffer = new byte[2048];
-            int len;
-            while ((len = bis.read(buffer)) != -1) {
-                fos.write(buffer, 0, len);
-            }
-            fos.flush();
-        } catch (IOException e) {
-            e.printStackTrace();
-        } finally {
-            if (bis != null) {
-                try {
-                    bis.close();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-            if (fos != null) {
-                try {
-                    fos.close();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-    }
-
-}

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

@@ -2,16 +2,17 @@ package com.gh.common.util;
 
 import android.content.Context;
 import android.graphics.Color;
+import android.text.TextUtils;
 import android.widget.TextView;
 
-import com.gh.download.DownloadEntity;
 import com.gh.download.DownloadManager;
-import com.gh.download.DownloadStatus;
 import com.gh.gamecenter.R;
 import com.gh.gamecenter.entity.ApkEntity;
 import com.gh.gamecenter.entity.GameEntity;
 import com.gh.gamecenter.entity.GameUpdateEntity;
 import com.gh.gamecenter.manager.PackageManager;
+import com.lightgame.download.DownloadEntity;
+import com.lightgame.download.DownloadStatus;
 
 import java.util.List;
 
@@ -67,7 +68,7 @@ public class GameUtils {
         DownloadEntity downloadEntity;
         Object gh_id;
         for (ApkEntity apkEntity : gameEntity.getApk()) {
-            downloadEntity = DownloadManager.getInstance(context).get(apkEntity.getUrl());
+            downloadEntity = DownloadManager.getInstance(context).getDownloadEntityByUrl(apkEntity.getUrl());
             if (downloadEntity != null) {
                 if (downloadEntity.getStatus().equals(DownloadStatus.done)) {
                     doneCount++;
@@ -82,7 +83,9 @@ public class GameUtils {
             }
             if (PackageManager.isInstalled(apkEntity.getPackageName())) {
                 gh_id = PackageUtils.getMetaData(context, apkEntity.getPackageName(), "gh_id");
-                if (!PackageUtils.isSignature(context, apkEntity.getPackageName())) { // TODO 外层判断插件化逻辑与多平台弹窗不一致
+                if (gameEntity.getTag() != null && gameEntity.getTag().size() != 0
+                        && !TextUtils.isEmpty(apkEntity.getGhVersion())
+                        && !PackageUtils.isSignature(context, apkEntity.getPackageName())) {
                     pluginCount++;
                 } else if (gh_id == null || gh_id.equals(gameEntity.getId())) {
                     installCount++;

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

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

@@ -1,125 +0,0 @@
-package com.gh.common.util;
-
-import android.content.Context;
-
-import com.gh.gamecenter.R;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.security.KeyStore;
-import java.security.cert.Certificate;
-import java.security.cert.CertificateException;
-import java.security.cert.CertificateFactory;
-import java.security.cert.X509Certificate;
-
-import javax.net.ssl.HostnameVerifier;
-import javax.net.ssl.HttpsURLConnection;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLSession;
-import javax.net.ssl.SSLSocketFactory;
-import javax.net.ssl.TrustManager;
-import javax.net.ssl.TrustManagerFactory;
-import javax.net.ssl.X509TrustManager;
-
-import okhttp3.internal.tls.OkHostnameVerifier;
-
-/**
- * Created by khy on 2016/10/8.
- */
-public class HttpsUtils {
-
-    private static final TrustManager[] TRUST_MANAGERS = new TrustManager[]{
-            new X509TrustManager() {
-                @Override
-                public void checkClientTrusted(X509Certificate[] chain, String authType) throws CertificateException {
-
-                }
-
-                @Override
-                public void checkServerTrusted(X509Certificate[] chain, String authType) throws CertificateException {
-
-                }
-
-                @Override
-                public X509Certificate[] getAcceptedIssuers() {
-                    return new X509Certificate[0];
-                }
-            }
-    };
-
-    private static final HostnameVerifier HOSTNAME_VERIFIER = new HostnameVerifier() {
-        @Override
-        public boolean verify(String hostname, SSLSession session) {
-            return true;
-        }
-    };
-
-    private static SSLSocketFactory mSSLSocketFactory;
-    private static HostnameVerifier mHostnameVerifier;
-
-    public static void initHttpsUrlConnection(Context context) {
-        try {
-            SSLContext sslContext = SSLContext.getInstance("TLS");
-
-            KeyStore keyStore = getHttpsKeyStore(context);
-            if (keyStore != null) {
-                String algorithm = TrustManagerFactory.getDefaultAlgorithm();
-                TrustManagerFactory tmf = TrustManagerFactory.getInstance(algorithm);
-                tmf.init(keyStore);
-                sslContext.init(null, tmf.getTrustManagers(), null);
-
-                mHostnameVerifier = OkHostnameVerifier.INSTANCE;
-            } else {
-                sslContext.init(null, TRUST_MANAGERS, null);
-
-                mHostnameVerifier = HOSTNAME_VERIFIER;
-            }
-            mSSLSocketFactory = sslContext.getSocketFactory();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    private static KeyStore getHttpsKeyStore(Context context) {
-        InputStream is = null;
-        try {
-            is = context.getResources().openRawResource(R.raw.cacert);
-            //读取证书
-            CertificateFactory certificateFactory = CertificateFactory.getInstance("X.509");
-            certificateFactory.generateCertificate(is);
-            Certificate certificate = certificateFactory.generateCertificate(is);
-            //创建一个证书库，并将证书导入证书库
-            KeyStore keyStore = KeyStore.getInstance(KeyStore.getDefaultType());
-            keyStore.load(null, null);
-            keyStore.setCertificateEntry("trust", certificate);
-            return keyStore;
-        } catch (Exception e) {
-            e.printStackTrace();
-        } finally {
-            if (is != null) {
-                try {
-                    is.close();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-        return null;
-    }
-
-    public static HttpsURLConnection getHttpsURLConnection(URL url) throws Exception {
-        HttpsURLConnection httpsURLConnection = (HttpsURLConnection) url.openConnection();
-        if (mSSLSocketFactory == null || mHostnameVerifier == null) {
-            SSLContext sslContext = SSLContext.getInstance("TLS");
-            sslContext.init(null, TRUST_MANAGERS, null);
-            mSSLSocketFactory = sslContext.getSocketFactory();
-
-            mHostnameVerifier = HOSTNAME_VERIFIER;
-        }
-        httpsURLConnection.setSSLSocketFactory(mSSLSocketFactory);
-        httpsURLConnection.setHostnameVerifier(mHostnameVerifier);
-        return httpsURLConnection;
-    }
-
-}

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

@@ -1,117 +0,0 @@
-package com.gh.common.util;
-
-import android.content.Context;
-import android.content.res.Resources;
-import android.graphics.drawable.Animatable;
-import android.graphics.drawable.ColorDrawable;
-import android.net.Uri;
-import android.support.v4.content.ContextCompat;
-import android.view.ViewGroup;
-
-import com.facebook.common.executors.CallerThreadExecutor;
-import com.facebook.drawee.backends.pipeline.Fresco;
-import com.facebook.drawee.controller.BaseControllerListener;
-import com.facebook.drawee.controller.ControllerListener;
-import com.facebook.drawee.drawable.ScalingUtils;
-import com.facebook.drawee.generic.GenericDraweeHierarchyBuilder;
-import com.facebook.drawee.view.SimpleDraweeView;
-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.gamecenter.R;
-
-public class ImageUtils {
-
-    private static ImageUtils singleton;
-
-    public static ImageUtils getInstance() {
-        if (singleton == null) {
-            synchronized (ImageUtils.class) {
-                if (singleton == null) {
-                    singleton = new ImageUtils();
-                    return singleton;
-                }
-            }
-        }
-        return singleton;
-    }
-
-    // 自适应图片宽高
-    public void display(final SimpleDraweeView simpleDraweeView, String url, final int width) {
-        ControllerListener<ImageInfo> listener = new BaseControllerListener<ImageInfo>() {
-            @Override
-            public void onFinalImageSet(String id, ImageInfo imageInfo, Animatable animatable) {
-                if (imageInfo == null) {
-                    return;
-                }
-                ViewGroup.LayoutParams layoutParams = simpleDraweeView.getLayoutParams();
-                float scale = (float) imageInfo.getHeight() / (float) imageInfo.getWidth();
-                layoutParams.height = (int) (width * scale);
-                simpleDraweeView.setLayoutParams(layoutParams);
-            }
-        };
-        simpleDraweeView.setController(Fresco.newDraweeControllerBuilder()
-                .setUri(url)
-                .setControllerListener(listener)
-                .build());
-    }
-
-    // 设置缩放类型，设置按压状态下的叠加图
-    public void display(Resources resources, SimpleDraweeView simpleDraweeView,
-                        ScalingUtils.ScaleType scaleType, String url) {
-        final Context context = simpleDraweeView.getContext();
-        simpleDraweeView.setHierarchy(new GenericDraweeHierarchyBuilder(resources)
-                .setFadeDuration(500)
-                .setPressedStateOverlay(new ColorDrawable(ContextCompat.getColor(context, R.color.pressed_bg)))
-                .setPlaceholderImage(R.drawable.ocupy2, ScalingUtils.ScaleType.CENTER)
-                .setBackground(new ColorDrawable(ContextCompat.getColor(context, R.color.placeholder_bg)))
-                .setActualImageScaleType(scaleType)
-                .build());
-//		simpleDraweeView.setImageURI(url);
-        display(simpleDraweeView, url);
-    }
-
-    public static void display(SimpleDraweeView simpleDraweeView, String url) {
-//		if (url.startsWith("http://image.ghzhushou.com") && url.endsWith(".jpg")) {
-//			url = url + "?x-oss-process=image/format,webp";
-//		}
-        simpleDraweeView.setImageURI(url);
-    }
-
-    // 设置占位符
-    public void display(Resources resources, SimpleDraweeView simpleDraweeView, String url, int placeholderImage) {
-        final Context context = simpleDraweeView.getContext();
-        simpleDraweeView.setHierarchy(new GenericDraweeHierarchyBuilder(resources)
-                .setFadeDuration(500)
-                .setPressedStateOverlay(new ColorDrawable(ContextCompat.getColor(context, R.color.pressed_bg)))
-                .setBackground(new ColorDrawable(ContextCompat.getColor(context, R.color.placeholder_bg)))
-                .setPlaceholderImage(placeholderImage)
-                .build());
-//		simpleDraweeView.setImageURI(url);
-        display(simpleDraweeView, url);
-    }
-
-    // 图片下载监听和设置低高分辨率图片
-    public void display(SimpleDraweeView simpleDraweeView, String url, String lowUrl,
-                        ControllerListener<? super ImageInfo> listener) {
-        simpleDraweeView.setController(Fresco.newDraweeControllerBuilder()
-                .setImageRequest(ImageRequest.fromUri(url))
-                .setControllerListener(listener)
-                .setLowResImageRequest(ImageRequest.fromUri(lowUrl)) // 低分辨率图片
-                .build());
-    }
-
-    // 获取bitmap
-    public void display(Context context, String url, BaseBitmapDataSubscriber dataSubscriber) {
-        ImageRequest imageRequest = ImageRequestBuilder
-                .newBuilderWithSource(Uri.parse(url))
-                .setProgressiveRenderingEnabled(true)
-                .build();
-
-        Fresco.getImagePipeline()
-                .fetchDecodedImage(imageRequest, context)
-                .subscribe(dataSubscriber, CallerThreadExecutor.getInstance());
-    }
-
-}

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

@@ -0,0 +1,116 @@
+package com.gh.common.util
+
+import android.content.Context
+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 com.facebook.common.executors.CallerThreadExecutor
+import com.facebook.drawee.backends.pipeline.Fresco
+import com.facebook.drawee.controller.BaseControllerListener
+import com.facebook.drawee.controller.ControllerListener
+import com.facebook.drawee.drawable.ScalingUtils
+import com.facebook.drawee.generic.GenericDraweeHierarchyBuilder
+import com.facebook.drawee.view.SimpleDraweeView
+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.gamecenter.R
+
+class ImageUtils private constructor() {
+
+    // 自适应图片宽高
+    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 scale = imageInfo.height.toFloat() / imageInfo.width.toFloat()
+                layoutParams.height = (width * scale).toInt()
+                simpleDraweeView.layoutParams = layoutParams
+            }
+        }
+        simpleDraweeView.controller = Fresco.newDraweeControllerBuilder()
+                .setUri(url)
+                .setControllerListener(listener)
+                .build()
+    }
+
+    // 设置缩放类型，设置按压状态下的叠加图
+    fun display(resources: Resources, simpleDraweeView: SimpleDraweeView,
+                scaleType: ScalingUtils.ScaleType, url: String) {
+        val context = simpleDraweeView.context
+        simpleDraweeView.hierarchy = GenericDraweeHierarchyBuilder(resources)
+                .setFadeDuration(500)
+                .setPressedStateOverlay(ColorDrawable(ContextCompat.getColor(context, R.color.pressed_bg)))
+                .setPlaceholderImage(R.drawable.occupy2, ScalingUtils.ScaleType.CENTER)
+                .setBackground(ColorDrawable(ContextCompat.getColor(context, R.color.placeholder_bg)))
+                .setActualImageScaleType(scaleType)
+                .build()
+        //		simpleDraweeView.setImageURI(url);
+        display(simpleDraweeView, url)
+    }
+
+    // 设置占位符
+    fun display(resources: Resources, simpleDraweeView: SimpleDraweeView, url: String, placeholderImage: Int) {
+        val context = simpleDraweeView.context
+        simpleDraweeView.hierarchy = GenericDraweeHierarchyBuilder(resources)
+                .setFadeDuration(500)
+                .setPressedStateOverlay(ColorDrawable(ContextCompat.getColor(context, R.color.pressed_bg)))
+                .setBackground(ColorDrawable(ContextCompat.getColor(context, R.color.placeholder_bg)))
+                .setPlaceholderImage(placeholderImage)
+                .build()
+        //		simpleDraweeView.setImageURI(url);
+        display(simpleDraweeView, url)
+    }
+
+    // 图片下载监听和设置低高分辨率图片
+    fun display(simpleDraweeView: SimpleDraweeView, url: String, lowUrl: String,
+                listener: ControllerListener<in ImageInfo>) {
+        simpleDraweeView.controller = Fresco.newDraweeControllerBuilder()
+                .setImageRequest(ImageRequest.fromUri(url))
+                .setControllerListener(listener)
+                .setLowResImageRequest(ImageRequest.fromUri(lowUrl)) // 低分辨率图片
+                .build()
+    }
+
+    // 获取bitmap
+    fun display(context: Context, url: String, dataSubscriber: BaseBitmapDataSubscriber) {
+        val imageRequest = ImageRequestBuilder
+                .newBuilderWithSource(Uri.parse(url))
+                .setProgressiveRenderingEnabled(true)
+                .build()
+
+        Fresco.getImagePipeline()
+                .fetchDecodedImage(imageRequest, context)
+                .subscribe(dataSubscriber, CallerThreadExecutor.getInstance())
+    }
+
+    companion object {
+
+        fun getInstance(): ImageUtils {
+            return Inner.anotherSingle
+        }
+
+        private object Inner {
+            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";
+            //		}
+            simpleDraweeView.setImageURI(url)
+        }
+
+        fun display(draweeView: SimpleDraweeView, @DrawableRes res: Int) {
+            draweeView.setImageURI("res:///" + res)
+        }
+    }
+
+}

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

@@ -25,6 +25,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 +43,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) {
@@ -82,7 +83,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 +119,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/Installation.java

@@ -4,6 +4,8 @@ import android.content.Context;
 import android.provider.Settings;
 import android.text.TextUtils;
 
+import com.lightgame.utils.Util_System_Phone_State;
+
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;

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

@@ -50,7 +50,7 @@ public class IntentUtils {
                 "\n" +
                 "光环助手官网地址：\n" +
                 "\n" +
-                "http://www.ghzhushou.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,12 +1,12 @@
 package com.gh.common.util;
 
-import android.app.Activity;
+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;
@@ -18,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;
@@ -29,6 +29,7 @@ import com.gh.gamecenter.geetest.GeetestUtils;
 import com.gh.gamecenter.retrofit.JSONObjectResponse;
 import com.gh.gamecenter.retrofit.Response;
 import com.gh.gamecenter.retrofit.RetrofitManager;
+import com.lightgame.utils.Utils;
 
 import org.greenrobot.eventbus.EventBus;
 import org.json.JSONException;
@@ -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,234 +151,272 @@ public class LibaoUtils {
                 });
     }
 
-    public static void initLibaoBtn(final Activity activity, 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() {
             @Override
             public void onClick(View v) {
-                // 领取限制
-                if ("领取".equals(libaoBtn.getText().toString()) || "淘号".equals(libaoBtn.getText().toString())) {
-                    if (isInstallRequired && !isAppInstalled(libaoBtn.getContext(), libaoEntity.getPackageName())) {
-                        String platform;
-                        if (TextUtils.isEmpty(libaoEntity.getPlatform())) {
-                            platform = "";
-                        } else {
-                            platform = PlatformUtils.getInstance(libaoBtn.getContext())
-                                    .getPlatformName(libaoEntity.getPlatform()) + "版";
-                        }
-
-                        DialogUtils.showWarningDialog(libaoBtn.getContext(), "条件不符",
-                                Html.fromHtml("请先" + "<font color=\"#06D0A8\">"
-                                        + "安装《" + libaoEntity.getGame().getName() + "》 "
-                                        + platform + "</font>"), "关闭", "立即安装"
-                                , new DialogUtils.ConfirmListener() {
-                                    @Override
-                                    public void onConfirm() {
-                                        adapter.openDownload();
-                                    }
-                                }, null);
-                        return;
-                    }
-                }
-
-                switch (libaoBtn.getText().toString()) {
-                    case "未开始":
-                        Utils.toast(libaoBtn.getContext(), "还没到开始领取时间");
-                        break;
-                    case "查看":
-                        Intent intent = LibaoDetailActivity.getLibaoDetailIntent(libaoEntity, libaoBtn, entrance);
-                        libaoBtn.getContext().startActivity(intent);
-                        break;
-                    case "领取":
-                        libaoLing(activity, libaoBtn, libaoEntity, adapter, isInstallRequired, libaoDao, null, entrance);
-                        break;
-                    case "淘号":
-                        postLibaoTao(libaoBtn.getContext(), libaoEntity.getId(), true, new PostLibaoListener() {
-                            @Override
-                            public void postSucced(Object response) {
-
-                                JSONObject responseBody = (JSONObject) response;
-                                Utils.log("postLibaoTao=====" + responseBody);
-                                String libaoCode = null;
-                                try {
-                                    libaoCode = responseBody.getString("code");
-                                } catch (JSONException e) {
-                                    e.printStackTrace();
+                CheckLoginUtils.checkLogin(context, new CheckLoginUtils.OnLoggenInListener() {
+                    @Override
+                    public void onLoggedIn() {
+                        // 领取限制
+                        if ("领取".equals(libaoBtn.getText().toString()) || "淘号".equals(libaoBtn.getText().toString())) {
+                            if (isInstallRequired && !isAppInstalled(context, libaoEntity.getPackageName())) {
+                                String platform;
+                                if (TextUtils.isEmpty(libaoEntity.getPlatform())) {
+                                    platform = "";
+                                } else {
+                                    platform = PlatformUtils.getInstance(context)
+                                            .getPlatformName(libaoEntity.getPlatform()) + "版";
                                 }
 
-                                if (TextUtils.isEmpty(libaoCode)) {
-                                    try {
-                                        String detail = responseBody.getString("detail");
-                                        if ("maintaining".equals(detail)) {
-                                            Utils.toast(libaoBtn.getContext(), "网络状态异常，请稍后再试");
-                                        } else if ("fail to compete".equals(detail)) {
-                                            Utils.toast(libaoBtn.getContext(), "淘号失败，稍后重试");
-                                        } else {
-                                            Utils.toast(libaoBtn.getContext(), "淘号异常");
-                                        }
-                                    } catch (JSONException e) {
-                                        e.printStackTrace();
-                                    }
-                                    return;
-                                }
-
-                                Utils.toast(libaoBtn.getContext(), "淘号成功");
-
-                                libaoEntity.setStatus("taoed");
-
-                                LibaoInfo libaoInfo = LibaoInfo.createLibaoInfo(libaoEntity);
-                                libaoInfo.setCode(libaoCode);
-                                libaoInfo.setTime(Utils.getTime(libaoBtn.getContext()));
-                                libaoDao.add(libaoInfo);
-
-                                EventBus.getDefault().post(new EBReuse("libaoChanged"));
-
-                                adapter.initLibaoDao();
-                                adapter.notifyDataSetChanged();
-
-                                final String finalLibaoCode = libaoCode;
-                                DialogUtils.showWarningDialog(libaoBtn.getContext(), "淘号成功", Html.fromHtml("礼包码："
-                                                + "<font color=\"#ffb13c\">" + libaoCode + "</font>" +
-                                                "<br/>淘号礼包不保证可用，请尽快进入游戏尝试兑换")
-                                        , "关闭", " 复制礼包码"
+                                String dialogContent = context.getString(R.string.ling_rules_dialog, libaoEntity.getGame().getName(), platform);
+                                DialogUtils.showWarningDialog(context, "条件不符",
+                                        Html.fromHtml(dialogContent), "关闭", "立即安装"
                                         , new DialogUtils.ConfirmListener() {
                                             @Override
                                             public void onConfirm() {
-                                                copyLink(finalLibaoCode, libaoBtn.getContext());
-
-                                                if (isInstallRequired) {
-                                                    libaoBtn.postDelayed(new Runnable() {
-                                                        @Override
-                                                        public void run() {
-                                                            lunningAppDialog(libaoBtn.getContext()
-                                                                    , Html.fromHtml("礼包码："
-                                                                            + "<font color=\"#ffb13c\">" + finalLibaoCode + "</font>"
-                                                                            + " 复制成功"
-                                                                            + "<br/>淘号礼包不保证可用，请尽快进入游戏尝试兑换"), libaoEntity);
-                                                        }
-                                                    }, 300);
-                                                }
+                                                adapter.openDownload();
                                             }
                                         }, null);
+                                return;
                             }
+                        }
 
-                            @Override
-                            public void postFailed(Throwable error) {
-                                Utils.log("---" + error.toString());
-
-                                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(libaoBtn.getContext(), "返回::" + detail);
-                                            if ("coming".equals(detail)) {
-                                                Utils.toast(libaoBtn.getContext(), "礼包领取时间未开始");
-                                            } else if ("finish".equals(detail)) {
-                                                Utils.toast(libaoBtn.getContext(), "礼包领取时间已结束");
-                                            } else if ("fetched".equals(detail)) {
-                                                Utils.toast(libaoBtn.getContext(), "你已领过这个礼包了");
-                                                getCunHaoXiang(libaoBtn.getContext(), true);
-
-                                                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);
-                                                libaoEntity.setStatus("taoed");
-                                            } else if ("try tao".equals(detail) || "used up".equals(detail)) {
-                                                DialogUtils.showHintDialog(libaoBtn.getContext(), "礼包已领光"
-                                                        , "手速不够快，礼包已经被抢光了，十分抱歉", "知道了");
-                                            } else if ("maintaining".equals(detail)) {
-                                                Utils.toast(libaoBtn.getContext(), "网络状态异常，请稍后再试");
-                                            } else if ("fail to compete".equals(detail)) {
-                                                Utils.toast(libaoBtn.getContext(), "淘号失败，稍后重试");
-                                            } else {
-                                                Utils.toast(libaoBtn.getContext(), "操作失败");
-                                            }
-                                        } catch (Exception ex) {
-                                            ex.printStackTrace();
-                                            Utils.toast(libaoBtn.getContext(), "礼包处理异常" + ex.toString());
-                                        }
-                                        return;
-                                    }
+                        switch (libaoBtn.getText().toString()) {
+                            case "未开始":
+                                Utils.toast(context, "还没到开始领取时间");
+                                break;
+                            case "查看":
+                                Intent intent = LibaoDetailActivity.getIntent(context, libaoEntity, entrance);
+                                context.startActivity(intent);
+                                break;
+                            case "再领一个":
+                            case "领取":
+                                if ("repeatLing".equals(status)) {
+                                    DialogUtils.showWarningDialog(context, "礼包刷新提醒"
+                                            , "礼包每天0点刷新，换新区或者换新角色需要继续领取礼包的童鞋，请于明天0点之后回来即可[再领一个]"
+                                            , null, "知道了", null, null);
+                                } else {
+                                    libaoLing(context, libaoBtn, libaoEntity, adapter, isInstallRequired, null, entrance);
                                 }
-                                Utils.toast(libaoBtn.getContext(), "发生异常");
-                            }
-                        });
-                        break;
-                }
+                                break;
+                            case "再淘一个":
+                            case "淘号":
+                                if ("repeatTao".equals(status)) {
+                                    Utils.toast(context, "没到重复淘号时间, 礼包每天0点刷新");
+                                    return;
+                                }
+                                final Dialog loadingDialog = DialogUtils.showWaitDialog(context, "淘号中...");
+                                postLibaoTao(context, libaoEntity.getId(), new PostLibaoListener() {
+                                    @Override
+                                    public void postSucced(Object response) {
+
+                                        if (loadingDialog != null) loadingDialog.dismiss();
+
+                                        JSONObject responseBody = (JSONObject) response;
+                                        Utils.log("postLibaoTao=====" + responseBody);
+                                        String libaoCode = null;
+                                        try {
+                                            libaoCode = responseBody.getString("code");
+                                        } catch (JSONException e) {
+                                            e.printStackTrace();
+                                        }
+
+                                        if (TextUtils.isEmpty(libaoCode)) {
+                                            try {
+                                                String detail = responseBody.getString("detail");
+                                                switch (detail) {
+                                                    case "maintaining":
+                                                        Utils.toast(context, "网络状态异常，请稍后再试");
+                                                        break;
+                                                    case "fail to compete":
+                                                        Utils.toast(context, "淘号失败，稍后重试");
+                                                        break;
+                                                    default:
+                                                        Utils.toast(context, "淘号异常");
+                                                        break;
+                                                }
+                                            } catch (JSONException e) {
+                                                e.printStackTrace();
+                                            }
+                                            return;
+                                        }
+
+                                        Utils.toast(context, "淘号成功");
+
+                                        libaoEntity.setStatus("taoed");
+
+                                        EventBus.getDefault().post(new EBReuse("libaoChanged"));
+
+                                        adapter.initLibaoCode(new UserDataLibaoEntity(libaoCode, "tao", Utils.getTime(context)));
+
+                                        final String finalLibaoCode = libaoCode;
+
+                                        DialogUtils.showWarningDialog(context, "淘号成功"
+                                                , Html.fromHtml(context.getString(R.string.taoed_dialog, libaoCode))
+                                                , "关闭", " 复制礼包码"
+                                                , new DialogUtils.ConfirmListener() {
+                                                    @Override
+                                                    public void onConfirm() {
+                                                        copyLink(finalLibaoCode, context);
+                                                        if (isInstallRequired) {
+                                                            libaoBtn.postDelayed(new Runnable() {
+                                                                @Override
+                                                                public void run() {
+                                                                    Spanned msg = Html.fromHtml(
+                                                                            context.getString(R.string.taoed_copy_dialog
+                                                                                    , finalLibaoCode));
+                                                                    lunningAppDialog(context
+                                                                            , msg, libaoEntity);
+                                                                }
+                                                            }, 300);
+                                                        }
+                                                    }
+                                                }, null);
+                                    }
+
+                                    @Override
+                                    public void postFailed(Throwable error) {
+                                        Utils.log("---" + error.toString());
+
+                                        if (loadingDialog != null) loadingDialog.dismiss();
+
+                                        if (error instanceof HttpException) {
+                                            HttpException exception = (HttpException) error;
+                                            if (exception.code() == 403) {
+                                                try {
+                                                    JSONObject errorJson = new JSONObject(exception.response().errorBody().string());
+                                                    String detail = errorJson.getString("detail");
+//                                                    Utils.toast(context, "返回::" + detail);
+                                                    switch (detail) {
+                                                        case "coming":
+                                                            Utils.toast(context, "礼包领取时间未开始");
+                                                            break;
+                                                        case "finish":
+                                                            Utils.toast(context, "礼包领取时间已结束");
+                                                            break;
+                                                        case "fetched":
+                                                            Utils.toast(context, "你今天已领过这个礼包了, 不能再淘号");
+
+                                                            libaoBtn.setText("已淘号");
+                                                            libaoBtn.setBackgroundResource(R.drawable.libao_taoed_style);
+                                                            libaoBtn.setTextColor(ContextCompat.getColorStateList(context, R.color.libao_taoed_selector));
+                                                            libaoEntity.setStatus("taoed");
+                                                            break;
+                                                        case "try tao":
+                                                        case "used up":
+                                                            DialogUtils.showHintDialog(context, "礼包已领光"
+                                                                    , "手速不够快，礼包已经被抢光了，十分抱歉", "知道了");
+                                                            break;
+                                                        case "maintaining":
+                                                            Utils.toast(context, "网络状态异常，请稍后再试");
+                                                            break;
+                                                        case "fail to compete":
+                                                            Utils.toast(context, "淘号失败，稍后重试");
+                                                            break;
+                                                        default:
+                                                            Utils.toast(context, "操作失败");
+                                                            break;
+
+                                                    }
+                                                } catch (Exception ex) {
+                                                    ex.printStackTrace();
+                                                    Utils.toast(context, "礼包处理异常" + ex.toString());
+                                                }
+                                                return;
+                                            }
+                                        }
+                                        Utils.toast(context, "发生异常");
+                                    }
+                                });
+                                break;
+                        }
+                    }
+                });
             }
         });
     }
 
-    private static void libaoLing(final Activity activity, final TextView libaoBtn, final LibaoEntity libaoEntity, final LibaoDetailAdapter adapter,
-                                  final boolean isInstallRequired, final LibaoDao libaoDao, String captchaCode, final String entrance) {
+    private static void libaoLing(final Context context, final TextView libaoBtn, final LibaoEntity libaoEntity, final LibaoDetailAdapter adapter,
+                                  final boolean isInstallRequired, String captchaCode, final String entrance) {
 
-        postLibaoLing(libaoBtn.getContext(), libaoEntity.getId(), true, new PostLibaoListener() {
+        if (BuildConfig.DEBUG) {
+            Log.e("LIBAO", "context? " + context + libaoBtn.getContext());
+        }
+
+        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);
@@ -454,40 +428,32 @@ public class LibaoUtils {
                 }
 
                 if (TextUtils.isEmpty(libaoCode)) {
-                    Utils.toast(libaoBtn.getContext(), "领取异常");
+                    Utils.toast(context, "领取异常");
                     return;
                 }
                 libaoEntity.setAvailable(libaoEntity.getAvailable() - 1);
 
                 libaoEntity.setStatus("linged");
 
-                LibaoInfo libaoInfo = LibaoInfo.createLibaoInfo(libaoEntity);
-                libaoInfo.setTime(Utils.getTime(libaoBtn.getContext()));
-                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(libaoBtn.getContext(), "领取成功", 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
                             public void onConfirm() {
-                                copyLink(finalLibaoCode, libaoBtn.getContext());
+                                copyLink(finalLibaoCode, context);
                                 if (isInstallRequired) {
                                     libaoBtn.postDelayed(new Runnable() {
                                         @Override
                                         public void run() {
-                                            lunningAppDialog(libaoBtn.getContext()
-                                                    , Html.fromHtml("礼包码："
-                                                            + "<font color=\"#00B7FA\">" + finalLibaoCode + "</font>"
-                                                            + " 复制成功" + "<br/>请尽快进入游戏兑换"), libaoEntity);
+                                            Spanned msg = Html.fromHtml(context.getString(R.string.linged_copy_dialog, finalLibaoCode));
+                                            lunningAppDialog(context
+                                                    , msg, libaoEntity);
                                         }
                                     }, 300);
                                 }
@@ -497,7 +463,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;
@@ -506,67 +472,61 @@ public class LibaoUtils {
                             String string = exception.response().errorBody().string();
                             JSONObject errorJson = new JSONObject(string);
                             String detail = errorJson.getString("detail");
+                            Utils.log("=======detail ::" + errorJson.toString());
+                            switch (detail) {
+                                case "coming":
+                                    Utils.toast(context, "礼包领取时间未开始");
+                                    break;
+                                case "finish":
+                                    Utils.toast(context, "礼包领取时间已结束");
+                                    break;
+                                case "fetched":
+                                    Utils.toast(context, "你已领过这个礼包了");
+                                    int countdown = 0;
+                                    if (errorJson.toString().contains("countdown")) {
+                                        countdown = errorJson.getInt("countdown");
+                                    }
+                                    if (countdown > 0 && countdown < 60 * 10) {
+                                        EventBus.getDefault().post(new EBUISwitch(REFRESH_LIBAO_TIME, countdown));
+                                    }
 
-                            if ("coming".equals(detail)) {
-                                Utils.toast(libaoBtn.getContext(), "礼包领取时间未开始");
-                            } else if ("finish".equals(detail)) {
-                                Utils.toast(libaoBtn.getContext(), "礼包领取时间已结束");
-                            } else if ("fetched".equals(detail)) {
-                                Utils.toast(libaoBtn.getContext(), "你已领过这个礼包了");
-                                int countdown = 0;
-                                if (errorJson.toString().contains("countdown")) {
-                                    countdown = errorJson.getInt("countdown");
-                                }
-                                if (countdown > 0 && countdown < 60 * 10) {
-                                    EventBus.getDefault().post(new EBUISwitch(REFRESH_LIBAO_TIME, countdown));
-                                } else {
-                                    getCunHaoXiang(libaoBtn.getContext(), true);
-                                }
+                                    libaoBtn.setText(R.string.libao_linged);
+                                    libaoBtn.setBackgroundResource(R.drawable.libao_linged_style);
+                                    libaoBtn.setTextColor(ContextCompat.getColorStateList(context, R.color.libao_linged_selector));
 
-                                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.setBackgroundResource(R.drawable.libao_linged_style);
-                                libaoBtn.setTextColor(sl);
-
-                                libaoEntity.setStatus("linged");
-                            } else if ("try tao".equals(detail) || "used up".equals(detail)) {
-                                DialogUtils.showHintDialog(libaoBtn.getContext(), "礼包已领光"
-                                        , "手速不够快，礼包已经被抢光了，十分抱歉", "知道了");
-                                libaoEntity.setStatus("used_up");
-                                initLibaoBtn(activity, libaoBtn, libaoEntity, libaoDao, isInstallRequired, adapter, entrance);
-
-                            } else if ("maintaining".equals(detail)) {
-                                Utils.toast(libaoBtn.getContext(), "网络状态异常，请稍后再试");
-                            } else {
-                                Utils.toast(libaoBtn.getContext(), "操作失败");
+                                    libaoEntity.setStatus("linged");
+                                    break;
+                                case "try tao":
+                                case "used up":
+                                    DialogUtils.showHintDialog(context, "礼包已领光"
+                                            , "手速不够快，礼包已经被抢光了，十分抱歉", "知道了");
+                                    libaoEntity.setStatus("used_up");
+                                    initLibaoBtn(context, libaoBtn, libaoEntity, isInstallRequired, adapter, entrance);
+                                    break;
+                                case "maintaining":
+                                    Utils.toast(context, "网络状态异常，请稍后再试");
+                                    break;
+                                default:
+                                    Utils.toast(context, "操作失败");
+                                    break;
                             }
                         } catch (Exception ex) {
                             ex.printStackTrace();
-                            Utils.toast(libaoBtn.getContext(), "礼包处理异常");
+                            Utils.toast(context, "礼包处理异常");
                         }
                         return;
                     } else if (exception.code() == 412) {
                         // 需要验证
-
-                        if (BuildConfig.DEBUG) {
-                            Log.e("LIBAO", "context? " + libaoBtn.getContext() + activity);
-                        }
-
-                        GeetestUtils.getInstance().showDialog(activity, new GeetestListener() {
+                        GeetestUtils.getInstance().showDialog(context, new GeetestListener() {
                             @Override
                             public void onVerified(String captcha) {
-                                libaoLing(activity, libaoBtn, libaoEntity, adapter, isInstallRequired, libaoDao, captcha, entrance);
+                                libaoLing(context, libaoBtn, libaoEntity, adapter, isInstallRequired, captcha, entrance);
                             }
                         });
                         return;
                     }
                 }
-                Utils.toast(libaoBtn.getContext(), "发生异常");
+                Utils.toast(context, "发生异常");
             }
         }, captchaCode);
     }
@@ -611,63 +571,58 @@ public class LibaoUtils {
     }
 
 
-    // 合并List<LibaoStatusEntity> 和 List<LibaoEntity> 并检查重复领取的礼包
-    public static void initLiBaoEntity(LibaoDao libaoDao, List<LibaoStatusEntity> statusList
-            , List<LibaoEntity> mLibaoList, Context mContext) {
+    // 合并List<LibaoStatusEntity> 和 List<LibaoEntity>
+    public static void initLiBaoEntity(List<LibaoStatusEntity> statusList,
+                                       List<LibaoEntity> libaoEntities) {
 
-        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");
-                    }
-                }
-            }
-        }
-
-        for (LibaoEntity libaoEntity : mLibaoList) {
+        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

@@ -0,0 +1,687 @@
+package com.gh.common.util;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.os.Looper;
+import android.preference.PreferenceManager;
+import android.text.TextUtils;
+
+import com.gh.common.constant.Constants;
+import com.gh.gamecenter.R;
+import com.gh.gamecenter.entity.LoginResponseEntity;
+import com.gh.gamecenter.entity.UserInfoEntity;
+import com.gh.gamecenter.eventbus.EBReuse;
+import com.gh.gamecenter.kuaichuan.Constant;
+import com.gh.gamecenter.manager.RefreshTokenManager;
+import com.gh.gamecenter.personal.PersonalFragment;
+import com.gh.gamecenter.retrofit.JSONObjectResponse;
+import com.gh.gamecenter.retrofit.Response;
+import com.gh.gamecenter.retrofit.RetrofitManager;
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
+import com.lightgame.utils.Utils;
+
+import org.greenrobot.eventbus.EventBus;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.IOException;
+import java.lang.reflect.Type;
+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.Scheduler;
+import rx.android.schedulers.AndroidSchedulers;
+import rx.schedulers.Schedulers;
+
+/**
+ * Created by khy on 7/07/17.
+ */
+
+public class LoginUtils {
+
+    public enum LoginTag {
+        qq, wechat, weibo, phone, refresh, oldUserPhone
+    }
+
+    public static void checkPhoneNum(final Context context, final String phoneName, final onCaptchaCallBackListener listener) { // 老用户登录检查手机是否登录过
+        RetrofitManager.getInstance(context).getApi()
+                .checkPhoneNum(phoneName)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Response<ResponseBody>() {
+                    @Override
+                    public void onResponse(ResponseBody response) {
+                        super.onResponse(response);
+                        try {
+                            JSONObject content = new JSONObject(response.string());
+                            String status = content.getString("status");
+                            if ("ok".equals(status)) {
+                                getPhoneCaptcha(context, phoneName, listener);
+                            } else {
+                                DialogUtils.showWarningDialog(context, null, "手机号已存在，请使用未登录过的手机号，以保证数据正常同步到新账号上"
+                                        , null, "我知道了", null, null);
+                            }
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                        }
+                    }
+
+                    @Override
+                    public void onFailure(HttpException e) {
+                        super.onFailure(e);
+                        if (e == null) {
+                            Utils.toast(context, "请检查网络是否可用");
+                            return;
+                        }
+                        try {
+                            ResponseBody responseBody = e.response().errorBody();
+                            String string = responseBody.string();
+                            JSONObject content = new JSONObject(string);
+                            int code = content.getInt("code");
+                            outputErrorHint(context, code);
+                        } catch (Exception e1) {
+                            e1.printStackTrace();
+                        }
+                    }
+                });
+
+    }
+
+    // 获取验证码
+    public static void getPhoneCaptcha(final Context context, String phoneNum, final onCaptchaCallBackListener listener) {
+        JSONObject content = new JSONObject();
+        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())
+                .subscribe(new JSONObjectResponse() {
+                    @Override
+                    public void onResponse(JSONObject response) {
+                        super.onResponse(response);
+                        try {
+                            listener.onCaptcha(response.getString("service_id"));
+                        } catch (JSONException 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();
+                            Utils.toast(context, "无法获取验证码，请检查你的网络状态");
+                        }
+                    }
+                });
+    }
+
+
+    // 登录前，做好body判断
+    public static void login(final Context context, final JSONObject content, final LoginTag loginTag,
+                             final onLoginCallBackListener listener) {
+
+        Observable<LoginResponseEntity> observable = null;
+        String userToken = null;
+
+        try {
+            JSONObject device = DeviceUtils.getLoginDevice(context.getApplicationContext());
+            content.put("device", device);
+            RequestBody body = RequestBody.create(MediaType.parse("application/json"), content.toString());
+
+            if (loginTag == LoginTag.weibo) {
+                userToken = content.getString("uid");
+                observable = RetrofitManager.getInstance(context).getUsersea().loginByWeibo(body);
+            } else if (loginTag == LoginTag.qq) {
+                userToken = content.getString("openid");
+                observable = RetrofitManager.getInstance(context).getUsersea().loginByQQ(body);
+            } else if (loginTag == LoginTag.wechat) {
+                userToken = content.getString("openid");
+                observable = RetrofitManager.getInstance(context).getUsersea().loginByWechat(body);
+            } else if (loginTag == LoginTag.phone || loginTag == LoginTag.oldUserPhone) {
+                userToken = content.getString("mobile");
+                observable = RetrofitManager.getInstance(context).getUsersea().loginByMobile(body);
+            } else {
+                return;
+            }
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+
+        if (observable == null) return;
+
+        final String finalUserToken = userToken;
+        observable
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Response<LoginResponseEntity>() {
+                    @Override
+                    public void onResponse(LoginResponseEntity response) {
+                        super.onResponse(response);
+                        if (loginTag.equals(LoginTag.phone) || loginTag.equals(LoginTag.oldUserPhone)) {
+                            try {
+                                response.setLoginType(content.getString("mobile"));
+                            } catch (JSONException e) {
+                                e.printStackTrace();
+                            }
+                        } else {
+                            response.setLoginType(loginTag.name());
+                        }
+                        response.setUserToken(finalUserToken);
+                        saveLoginToken(context, response);
+
+                        SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(context);
+                        String syncDeviceID = sp.getString("syncDeviceID", null);
+                        if (!TextUtils.isEmpty(syncDeviceID)) {
+                            syncUserData(context, syncDeviceID, listener, loginTag);
+                            sp.edit().putString("syncDeviceID", null).apply(); // 清空
+                        } else {
+                            getUserData(context, false, listener, loginTag);
+                        }
+                    }
+
+                    @Override
+                    public void onFailure(HttpException e) {
+                        super.onFailure(e);
+                        if (listener != null) {
+                            listener.onLoginFailure();
+                        }
+                        try {
+                            ResponseBody responseBody = e.response().errorBody();
+                            String string = responseBody.string();
+                            JSONObject content = new JSONObject(string);
+                            int code = content.getInt("code");
+
+                            if (loginTag.equals(LoginTag.phone)) {
+                                outputErrorHint(context, code);
+                            } else {
+                                if (loginTag.equals(LoginTag.qq)) {
+                                    GetLoginDataUtils.getInstance(context).QQLogout();
+                                }
+                                Utils.toast(context, context.getString(R.string.login_failure_hint));
+                            }
+                        } catch (Exception e1) {
+                            Utils.toast(context, context.getString(R.string.login_failure_hint));
+                            e1.printStackTrace();
+                        }
+                    }
+                });
+    }
+
+    private static void syncUserData(final Context context, String syncDeviceID,
+                                     final onLoginCallBackListener listener,
+                                     final LoginTag loginTag) {
+
+        String loginType;
+        if (LoginTag.phone.equals(loginTag)) {
+            loginType = "mobile";
+        } else {
+            loginType = loginTag.toString();
+        }
+
+        HashMap<String, String> map = new HashMap<>();
+        map.put("device_id", syncDeviceID);
+        map.put("login_type", loginType);
+        RequestBody body = RequestBody.create(MediaType.parse("application/json"), new JSONObject(map).toString());
+        RetrofitManager.getInstance(context).getApi().syncUserData(body)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(userInfoResponse(context, loginTag, listener));
+    }
+
+    // 注销登录
+    public static void logout(final Context context, final OnLogoutListener listener) {
+
+        RetrofitManager.getInstance(context)
+                .getUsersea()
+                .logout()
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Response<ResponseBody>() {
+
+                    @Override
+                    public void onResponse(ResponseBody response) {
+                        super.onResponse(response);
+                        listener.onCompleted();
+                    }
+
+                    @Override
+                    public void onFailure(HttpException e) {
+                        super.onFailure(e);
+                        listener.onCompleted();
+                    }
+                });
+    }
+
+    //　清除本地用户相关信息
+    public static void cleanUserData(Context context) {
+        SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(context);
+        SharedPreferences.Editor edit = sp.edit();
+        edit.putString("user_info", null);
+        edit.putString("login_token", null);
+        edit.apply();
+
+        GetLoginDataUtils.getInstance(context).QQLogout();
+
+        EventBus.getDefault().post(new EBReuse(PersonalFragment.LOGOUT_TAG));
+    }
+
+    // 检查本地是否有缓存token,有则马上登录
+    public static void checkLogin(Context context, onLoginCallBackListener listener) {
+        LoginResponseEntity loginToken = getLoginToken(context);
+
+        if (loginToken != null && loginToken.getAccessToken() != null) {
+            LoginResponseEntity.AccessToken accessToken = loginToken.getAccessToken();
+            Long accessExpire = accessToken.getExpire();
+            if (false && accessExpire != null && accessExpire > Utils.getTime(context)) {
+                getUserData(context, false, listener, null);
+            } else {
+                LoginResponseEntity.RefreshToken refreshToken = loginToken.getRefreshToken();
+                Long refreshExpire = refreshToken.getExpire();
+                if (refreshExpire != null && refreshExpire > Utils.getTime(context)) {
+                    Map<String, String> params = new HashMap<>();
+                    params.put("refresh_token", refreshToken.getValue());
+                    RefreshTokenManager.getInstance().refreshToken(context, false, new JSONObject(params), listener);
+                } else {
+                    // 重新登录
+                    cleanUserData(context);
+                }
+            }
+        }
+    }
+
+    private static Response<UserInfoEntity> userInfoResponse(final Context context,
+                                                             final LoginTag loginTag,
+                                                             final onLoginCallBackListener listener) {
+        return new Response<UserInfoEntity>() {
+            @Override
+            public void onResponse(UserInfoEntity response) {
+                super.onResponse(response);
+
+                saveUserInfo(context, response);
+                if (listener != null) {
+                    listener.onLogin(response, loginTag);
+                }
+
+                if (loginTag != null && !LoginTag.refresh.equals(loginTag)) {
+                    Utils.toast(context, "登录成功");
+                }
+            }
+
+            @Override
+            public void onError(Throwable e) {
+                super.onError(e);
+                Utils.log("=====eeee::" + e.toString());
+            }
+
+            @Override
+            public void onFailure(HttpException e) {
+                super.onFailure(e);
+                if (listener != null) {
+                    listener.onLoginFailure();
+                }
+                if (loginTag != null) {
+                    Utils.toast(context, context.getString(R.string.login_failure_hint));
+                }
+                if (loginTag != null && loginTag.equals(LoginTag.qq)) {
+                    GetLoginDataUtils.getInstance(context).QQLogout();
+                }
+            }
+        };
+    }
+
+    // 获取用户信息
+    public static void getUserData(final Context context, boolean isRunMainThread, final onLoginCallBackListener listener, final LoginTag loginTag) {
+
+        Observable<UserInfoEntity> observable;
+        if (isRunMainThread) {
+            observable = RetrofitManager.getInstance(context)
+                    .getApi()
+                    .getUserInfo();
+        } else {
+            observable = RetrofitManager.getInstance(context)
+                    .getApi()
+                    .getUserInfo()
+                    .subscribeOn(Schedulers.io())
+                    .observeOn(AndroidSchedulers.mainThread());
+        }
+        observable.subscribe(userInfoResponse(context, loginTag, listener));
+    }
+
+    // 获取本地缓存用户信息
+    public static UserInfoEntity getUserInfo(Context context) {
+        SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(context);
+        String loginData = sp.getString("user_info", null);
+        if (!TextUtils.isEmpty(loginData)) {
+            Type listType = new TypeToken<UserInfoEntity>() {
+            }.getType();
+            return new Gson().fromJson(loginData, listType);
+        }
+        return null;
+    }
+
+
+    // 在本地缓存用户信息
+    public static void saveUserInfo(Context context, UserInfoEntity entity) {
+        if (entity != null) {
+            String region = entity.getRegion();
+            if (region != null && region.contains("中国")) { // 转换地区格式
+                String replace = region.replace("中国 ", "");
+                entity.setRegion(replace);
+            }
+
+            String s = new Gson().toJson(entity);
+            SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(context);
+            SharedPreferences.Editor edit = sp.edit();
+            edit.putString("user_info", s);
+            edit.apply();
+        }
+    }
+
+    //获取本地缓存用户token
+    public static LoginResponseEntity getLoginToken(Context context) {
+        SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(context);
+        String loginData = sp.getString("login_token", null);
+        if (!TextUtils.isEmpty(loginData)) {
+            Type listType = new TypeToken<LoginResponseEntity>() {
+            }.getType();
+            return new Gson().fromJson(loginData, listType);
+        }
+        return null;
+    }
+
+    //获取本地缓存用户token
+    public static String getToken(Context context) {
+        SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(context);
+        String loginData = sp.getString("login_token", null);
+        if (!TextUtils.isEmpty(loginData)) {
+            Type listType = new TypeToken<LoginResponseEntity>() {
+            }.getType();
+            LoginResponseEntity entity = new Gson().fromJson(loginData, listType);
+            if (entity != null && entity.getAccessToken() != null) {
+                return entity.getAccessToken().getValue();
+            }
+        }
+        return null;
+    }
+
+    // 在本地缓存用户token
+    public static void saveLoginToken(Context context, LoginResponseEntity entity) {
+        if (entity != null) {
+            if (TextUtils.isEmpty(entity.getLoginType())) {
+                LoginResponseEntity loginToken = getLoginToken(context);
+                if (loginToken != null) {
+                    entity.setLoginType(loginToken.getLoginType());
+                }
+            }
+
+            String s = new Gson().toJson(entity);
+            SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(context);
+            SharedPreferences.Editor edit = sp.edit();
+            edit.putString("login_token", s);
+            edit.apply();
+        }
+    }
+
+    //更改用户信息
+    public static void changeUserInfo(final onChangeUserInfoListener listener, final Context context,
+                                      final String content, final String editType) {
+        final UserInfoEntity entity = getUserInfo(context);
+        if (entity == null) {
+            return;
+        }
+        Map<String, String> map = new HashMap<>();
+        map.put(editType, content);
+
+        final Dialog loadingDialog = DialogUtils.showWaitDialog(context, "正在修改信息...");
+
+        RequestBody body = RequestBody.create(MediaType.parse("application/json"),
+                new JSONObject(map).toString());
+        RetrofitManager.getInstance(context)
+                .getUsersea()
+                .changeUserInfo(body)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Response<ResponseBody>() {
+                    @Override
+                    public void onResponse(ResponseBody response) {
+                        super.onResponse(response);
+                        if (loadingDialog != null) {
+                            loadingDialog.dismiss();
+                        }
+                        switch (editType) {
+                            case "name":
+                                entity.setName(content);
+                                break;
+                            case "contact":
+                                entity.setContact(content);
+                                break;
+                            case "gender":
+                                entity.setGender(content);
+                                break;
+                            case "region":
+                                entity.setRegion(content);
+                                break;
+                            case "icon":
+                                entity.setIcon(content);
+                                break;
+                            default:
+                                return;
+                        }
+
+                        saveUserInfo(context, entity);
+
+
+                        listener.onChange();
+
+                    }
+
+                    @Override
+                    public void onFailure(HttpException e) {
+                        super.onFailure(e);
+                        if (loadingDialog != null) {
+                            loadingDialog.dismiss();
+                        }
+                        Utils.toast(context, "修改失败");
+
+                        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();
+                        }
+                    }
+                });
+    }
+
+    private 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;
+            default:
+                Utils.toast(context, "未知错误");
+                break;
+        }
+
+    }
+
+    //　更改用户信息回调
+    public interface OnLogoutListener {
+        void onCompleted();
+    }
+
+    //　更改用户信息回调
+    public interface onChangeUserInfoListener {
+        void onChange();
+    }
+
+    //　获取验证码回调
+    public interface onCaptchaCallBackListener {
+        void onCaptcha(String serviceId);
+    }
+
+    //　登录回调
+    public interface onLoginCallBackListener {
+        void onLogin(UserInfoEntity entity, LoginTag loginTag);
+
+        void onLoginFailure();
+    }
+}

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

@@ -1,66 +0,0 @@
-package com.gh.common.util;
-
-import android.content.Context;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.view.View;
-import android.view.ViewGroup;
-
-/**
- * Created by khy on 2016/8/22.
- * RecyclerView 自适应高度
- */
-public class MeasureHeightLayoutManager extends LinearLayoutManager {
-
-    private int[] mMeasuredDimension = new int[1];
-
-    public MeasureHeightLayoutManager(Context context) {
-        super(context);
-    }
-
-    @Override
-    public void onMeasure(RecyclerView.Recycler recycler, RecyclerView.State state,
-                          int widthSpec, int heightSpec) {
-
-        final int heightSize = View.MeasureSpec.getSize(heightSpec);
-
-        int height = 0;
-        for (int i = 0; i < getItemCount(); i++) {
-            try {
-                measureScrapChild(recycler, i,
-                        View.MeasureSpec.makeMeasureSpec(i, View.MeasureSpec.UNSPECIFIED),
-                        View.MeasureSpec.makeMeasureSpec(i, View.MeasureSpec.UNSPECIFIED),
-                        mMeasuredDimension);
-                height = height + mMeasuredDimension[0];
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-        if (height > heightSize) {
-            super.onMeasure(recycler, state, widthSpec, heightSpec);
-        } else {
-            setMeasuredDimension(View.MeasureSpec.getSize(widthSpec), height);
-        }
-
-    }
-
-    private void measureScrapChild(RecyclerView.Recycler recycler, int position, int widthSpec,
-                                   int heightSpec, int[] measuredDimension) throws Exception {
-        View view = recycler.getViewForPosition(position);
-        if (view.getVisibility() == View.GONE) {
-            measuredDimension[0] = 0;
-            return;
-        }
-        super.measureChildWithMargins(view, 0, 0);
-        RecyclerView.LayoutParams p = (RecyclerView.LayoutParams) view.getLayoutParams();
-        int childHeightSpec = ViewGroup.getChildMeasureSpec(
-                heightSpec,
-                getPaddingTop() + getPaddingBottom() + getDecoratedTop(view) + getDecoratedBottom(view),
-                p.height);
-
-        view.measure(0, childHeightSpec);
-        measuredDimension[0] = getDecoratedMeasuredHeight(view) + p.bottomMargin + p.topMargin;
-        recycler.recycleView(view);
-    }
-
-}

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

@@ -26,6 +26,7 @@ import android.widget.TextView;
 
 import com.gh.common.constant.Config;
 import com.gh.gamecenter.R;
+import com.lightgame.utils.Utils;
 import com.tencent.connect.share.QQShare;
 import com.tencent.mm.sdk.openapi.IWXAPI;
 import com.tencent.mm.sdk.openapi.SendMessageToWX;
@@ -122,7 +123,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;
                 }
             }

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;
 
@@ -24,24 +25,28 @@ public class NewsUtils {
      * 根据新闻类型获取标签背景资源
      */
     public static int getDrawableIdByType(String type) {
-        if ("活动".equals(type) || "高阶".equals(type)) {
-            return R.drawable.textview_red_up;
-        } else if ("公告".equals(type) || "中期".equals(type)) {
-            return R.drawable.textview_orange_up;
-        } else if ("新游".equals(type)) {
-            return R.drawable.textview_green_up;
-        } else if ("热门".equals(type) || "置顶".equals(type)) {
-            return R.drawable.textview_all_red_up;
-        } else {
-            return R.drawable.textview_blue_up;
+        switch (type) {
+            case "活动":
+            case "高阶":
+                return R.drawable.textview_red_up;
+            case "公告":
+            case "中期":
+                return R.drawable.textview_orange_up;
+            case "新游":
+                return R.drawable.textview_green_up;
+            case "热门":
+            case "置顶":
+                return R.drawable.textview_all_red_up;
+            default:
+                return R.drawable.textview_blue_up;
         }
     }
 
     /**
      * 统计阅读量
      */
-    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>());
@@ -75,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;
@@ -86,18 +91,25 @@ public class NewsUtils {
         }
 
         textView.setTextColor(Color.WHITE);
-        if ("活动".equals(type)) {
-            textView.setBackgroundResource(R.drawable.textview_orange_style);
-        } else if ("公告".equals(type)) {
-            textView.setBackgroundResource(R.drawable.textview_red_style);
-        } else if ("评测".equals(type)) {
-            textView.setBackgroundResource(R.drawable.textview_red_style);
-        } else if ("杂谈".equals(type)) {
-            textView.setBackgroundResource(R.drawable.textview_orange_style);
-        } else if ("专题".equals(type)) {
-            textView.setBackgroundResource(R.drawable.textview_blue_style);
-        } else {
-            textView.setBackgroundResource(R.drawable.textview_blue_style);
+        switch (type) {
+            case "活动":
+                textView.setBackgroundResource(R.drawable.textview_orange_style);
+                break;
+            case "公告":
+                textView.setBackgroundResource(R.drawable.textview_red_style);
+                break;
+            case "评测":
+                textView.setBackgroundResource(R.drawable.textview_red_style);
+                break;
+            case "杂谈":
+                textView.setBackgroundResource(R.drawable.textview_orange_style);
+                break;
+            case "专题":
+                textView.setBackgroundResource(R.drawable.textview_blue_style);
+                break;
+            default:
+                textView.setBackgroundResource(R.drawable.textview_blue_style);
+                break;
         }
     }
 

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

@@ -1,116 +0,0 @@
-package com.gh.common.util;
-
-import android.app.Notification;
-import android.app.NotificationManager;
-import android.app.PendingIntent;
-import android.content.Context;
-import android.content.Intent;
-import android.support.v4.app.NotificationCompat;
-
-import com.gh.download.DownloadEntity;
-import com.gh.download.DownloadManager;
-import com.gh.download.DownloadStatus;
-import com.gh.gamecenter.R;
-
-import java.util.List;
-
-/**
- * Created by LGT on 2016/10/10.
- */
-public class NotificationUtils {
-
-    public static final String ACTION_INSTALL = "com.gh.gamecenter.INSTALL";
-    public static final String ACTION_DOWNLOAD = "com.gh.gamecenter.DOWNLOAD";
-
-    // 快传传输完成消息
-    public static void showKuaiChuanDoneNotification(Context context, String apkPath, String apkName, String packName) {
-        NotificationManager manager = getNotificationManager(context);
-        Intent intent = new Intent();
-        intent.putExtra("path", apkPath);
-        intent.setAction(ACTION_INSTALL);
-        PendingIntent pendingIntent = PendingIntent.getBroadcast(context, 0x321,
-                intent, PendingIntent.FLAG_UPDATE_CURRENT);
-        String title = "接收完成，点击立即安装";
-        String text = apkName;
-
-        Notification notification = new NotificationCompat.Builder(context)
-                .setSmallIcon(R.drawable.logo)
-                .setTicker(title)
-                .setContentTitle(text)
-                .setContentText(title)
-                .setContentIntent(pendingIntent).build();
-        notification.flags |= Notification.FLAG_AUTO_CANCEL; // // FLAG_AUTO_CANCEL表明当通知被用户点击时，通知将被清除。
-        manager.notify(packName, 0x321, notification);
-    }
-
-    private static NotificationManager getNotificationManager(Context context) {
-        return (NotificationManager) context.getApplicationContext().getSystemService(Context.NOTIFICATION_SERVICE);
-    }
-
-    public static void showDownloadDoneNotification(Context context, DownloadEntity downloadEntity, int flag) {
-        NotificationManager manager = getNotificationManager(context);
-        Intent intent = new Intent();
-        intent.putExtra("path", downloadEntity.getPath());
-        intent.setAction(ACTION_INSTALL);
-        PendingIntent pendingIntent = PendingIntent.getBroadcast(context, flag,
-                intent, PendingIntent.FLAG_UPDATE_CURRENT);
-        String text;
-        String title;
-        if (downloadEntity.isPluggable()) {
-            title = "下载完成，点击继续插件化";
-            text = downloadEntity.getName() + " - "
-                    + PlatformUtils.getInstance(context).getPlatformName(downloadEntity.getPlatform());
-        } else {
-            if (downloadEntity.isPlugin()) {
-                text = downloadEntity.getName()
-                        + " - " + PlatformUtils.getInstance(context).getPlatformName(downloadEntity.getPlatform());
-            } else {
-                text = downloadEntity.getName();
-            }
-            title = "下载完成，点击立即安装";
-        }
-        Notification notification = new NotificationCompat.Builder(context)
-                .setSmallIcon(R.drawable.logo)
-                .setTicker(title)
-                .setContentTitle(text)
-                .setContentText(title)
-                .setContentIntent(pendingIntent).build();
-//		notification.defaults = Notification.DEFAULT_SOUND;// 添加系统默认声音
-        notification.flags |= Notification.FLAG_AUTO_CANCEL; // // FLAG_AUTO_CANCEL表明当通知被用户点击时，通知将被清除。
-        manager.notify(flag, notification);
-    }
-
-    public static void showDownloadingNotification(Context context) {
-        NotificationManager manager = getNotificationManager(context);
-        int downloadingSize = 0;
-        List<DownloadEntity> all = DownloadManager.getInstance(context).getAll();
-        if (all != null) {
-            for (DownloadEntity entity : all) {
-                if (entity.getStatus().equals(DownloadStatus.downloading)
-                        || entity.getStatus().equals(DownloadStatus.waiting)
-                        || entity.getStatus().equals(DownloadStatus.pause)
-                        || entity.getStatus().equals(DownloadStatus.timeout)
-                        || entity.getStatus().equals(DownloadStatus.neterror)) {
-                    downloadingSize++;
-                }
-            }
-        }
-        if (downloadingSize == 0) {
-            manager.cancel(0x123);
-        } else {
-            Intent intent = new Intent();
-            intent.setAction(ACTION_DOWNLOAD);
-            PendingIntent pendingIntent = PendingIntent.getBroadcast(context, 0x123, intent, PendingIntent.FLAG_UPDATE_CURRENT);
-            Notification notification = new NotificationCompat.Builder(context)
-                    .setSmallIcon(R.drawable.logo)
-                    .setTicker("点击查看详情")
-                    .setContentTitle("你有" + downloadingSize + "个游戏正在下载中")
-                    .setContentText("点击查看详情")
-                    .setContentIntent(pendingIntent).build();
-//			notification.defaults = Notification.DEFAULT_SOUND;// 添加系统默认声音
-            notification.flags |= Notification.FLAG_NO_CLEAR; // 通知无法手动清除
-            manager.notify(0x123, notification);
-        }
-    }
-
-}

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;
@@ -57,7 +59,7 @@ public class PackageUtils {
                 return metaDate.get(name);
             }
         } catch (NameNotFoundException e) {
-            e.printStackTrace();
+//            e.printStackTrace();
         }
         return null;
     }
@@ -91,12 +93,10 @@ public class PackageUtils {
     private static String[] parseSignature(byte[] signature) {
         String[] ret = null;
         try {
-            CertificateFactory certFactory = CertificateFactory
-                    .getInstance("X.509");
-            X509Certificate cert = (X509Certificate) certFactory
-                    .generateCertificate(new ByteArrayInputStream(signature));
-            ret = new String[]{cert.getPublicKey().toString(),
-                    cert.getSerialNumber().toString()};
+            CertificateFactory certFactory = CertificateFactory.getInstance("X.509");
+            X509Certificate cert = (X509Certificate) certFactory.generateCertificate(
+                    new ByteArrayInputStream(signature));
+            ret = new String[]{cert.getPublicKey().toString(), cert.getSerialNumber().toString()};
         } catch (CertificateException e) {
             e.printStackTrace();
         }
@@ -159,8 +159,8 @@ public class PackageUtils {
      */
     public static Intent getUninstallIntent(Context context, String path) {
         Intent uninstallIntent = new Intent();
-        uninstallIntent.setAction("android.intent.action.DELETE");
-        uninstallIntent.addCategory("android.intent.category.DEFAULT");
+        uninstallIntent.setAction(Intent.ACTION_DELETE);
+        uninstallIntent.addCategory(Intent.CATEGORY_DEFAULT);
         String packageName = getPackageNameByPath(context, path);
         uninstallIntent.setData(Uri.parse("package:" + packageName));
         InstallUtils.getInstance(context).addUninstall(packageName);
@@ -172,8 +172,7 @@ public class PackageUtils {
      */
     public static String getPackageNameByPath(Context context, String path) {
         PackageManager packageManager = context.getApplicationContext().getPackageManager();
-        PackageInfo info = packageManager.getPackageArchiveInfo(path,
-                PackageManager.GET_ACTIVITIES);
+        PackageInfo info = packageManager.getPackageArchiveInfo(path, PackageManager.GET_ACTIVITIES);
         if (info != null) {
             ApplicationInfo appInfo = info.applicationInfo;
             return appInfo.packageName;
@@ -203,6 +202,16 @@ public class PackageUtils {
         return 0;
     }
 
+    /**
+     * 数据统计或反馈用PatchVersionName
+     * 判断助手是否是第一次启动或版本更新提交的版本号用AppVersionName{@link PackageUtils#getVersionName(Context)}
+     *
+     * @return 补丁包版本号
+     */
+    public static String getPatchVersionName() {
+        return Config.PATCH_VERSION_NAME;
+    }
+
     /*
      * 返回光环助手的版本信息
      */
@@ -289,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/PatternUtils.java

@@ -28,5 +28,10 @@ public class PatternUtils {
         return matcher.matches();
     }
 
+    public static boolean isPhoneNum(String phone) {
+        Matcher matcher = Patterns.PHONE.matcher(phone);
+        return matcher.matches();
+    }
+
 
 }

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

@@ -7,12 +7,14 @@ import android.os.Handler;
 import android.support.v4.util.ArrayMap;
 import android.text.TextUtils;
 
-import com.gh.base.AppController;
+import com.halo.assistant.HaloApp;
+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.lightgame.utils.Utils;
 
 import org.greenrobot.eventbus.EventBus;
 
@@ -127,7 +129,7 @@ public class PlatformUtils {
                 }
             }
             if (urls.size() != 0) {
-                checkPlatformPic(urls);
+//                checkPlatformPic(urls);
             }
         }
 
@@ -151,7 +153,7 @@ public class PlatformUtils {
             }
         }
         if (urls.size() != 0) {
-            AppController.MAIN_EXECUTOR.execute(new Runnable() {
+            HaloApp.MAIN_EXECUTOR.execute(new Runnable() {
                 @Override
                 public void run() {
                     int success = 0;
@@ -220,29 +222,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) {
@@ -261,7 +242,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

@@ -6,6 +6,7 @@ import com.gh.gamecenter.entity.CommentEntity;
 import com.gh.gamecenter.retrofit.JSONObjectResponse;
 import com.gh.gamecenter.retrofit.Response;
 import com.gh.gamecenter.retrofit.RetrofitManager;
+import com.lightgame.utils.Utils;
 
 import org.json.JSONObject;
 
@@ -15,7 +16,6 @@ import okhttp3.ResponseBody;
 import retrofit2.HttpException;
 import rx.Observable;
 import rx.android.schedulers.AndroidSchedulers;
-import rx.functions.Func1;
 import rx.schedulers.Schedulers;
 
 /**
@@ -24,22 +24,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
@@ -53,18 +47,8 @@ public class PostCommentUtils {
                         }
                     }
 
-                    @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);
                         }
@@ -72,15 +56,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>() {
@@ -93,10 +72,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);
                         }
@@ -104,16 +79,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>() {
@@ -124,10 +94,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

@@ -5,6 +5,9 @@ import android.content.Intent;
 import android.net.Uri;
 import android.text.TextUtils;
 
+import com.lightgame.utils.Util_System_ClipboardManager;
+import com.lightgame.utils.Utils;
+
 /**
  * Created by khy on 2017/3/30.
  */

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

@@ -12,6 +12,7 @@ import com.google.zxing.WriterException;
 import com.google.zxing.common.BitMatrix;
 import com.google.zxing.qrcode.QRCodeWriter;
 import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
+import com.lightgame.utils.Utils;
 
 import java.io.File;
 import java.io.FileOutputStream;

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

@@ -1,11 +1,12 @@
 package com.gh.common.util;
 
+import android.Manifest;
 import android.app.ActivityManager;
 import android.app.ActivityManager.RunningAppProcessInfo;
 import android.app.ActivityManager.RunningTaskInfo;
 import android.content.ComponentName;
 import android.content.Context;
-import android.os.Looper;
+import android.support.annotation.RequiresPermission;
 
 import java.util.List;
 
@@ -14,9 +15,9 @@ public class RunningUtils {
     /**
      * 判断当前应用程序处于前台还是后台
      */
+    @RequiresPermission(Manifest.permission.GET_TASKS)
     public static boolean isApplicationBroughtToBackground(Context context) {
-        ActivityManager am = (ActivityManager) context
-                .getSystemService(Context.ACTIVITY_SERVICE);
+        ActivityManager am = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
         List<RunningTaskInfo> tasks = am.getRunningTasks(1);
         if (!tasks.isEmpty()) {
             ComponentName topActivity = tasks.get(0).topActivity;
@@ -32,10 +33,8 @@ public class RunningUtils {
      * 判断当前应用程序处于前台还是后台
      */
     public static boolean isBackground(Context context) {
-        ActivityManager activityManager = (ActivityManager) context
-                .getSystemService(Context.ACTIVITY_SERVICE);
-        List<RunningAppProcessInfo> appProcesses = activityManager
-                .getRunningAppProcesses();
+        ActivityManager activityManager = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
+        List<RunningAppProcessInfo> appProcesses = activityManager.getRunningAppProcesses();
         for (RunningAppProcessInfo appProcess : appProcesses) {
             if (appProcess.processName.equals(context.getPackageName())) {
                 if (appProcess.importance == RunningAppProcessInfo.IMPORTANCE_BACKGROUND) {
@@ -51,6 +50,7 @@ public class RunningUtils {
     /**
      * 判断当前topactivity是否与传入的相同
      */
+    @RequiresPermission(Manifest.permission.GET_TASKS)
     public static boolean isEqualsTop(Context context, String activityName) {
         ActivityManager activityManager = (ActivityManager) context
                 .getSystemService(Context.ACTIVITY_SERVICE);
@@ -66,6 +66,7 @@ public class RunningUtils {
     /**
      * 判断当前baseActivity是否与传入的相同
      */
+    @RequiresPermission(Manifest.permission.GET_TASKS)
     public static boolean isEqualsBase(Context context, String activityName) {
         ActivityManager activityManager = (ActivityManager) context
                 .getSystemService(Context.ACTIVITY_SERVICE);
@@ -81,6 +82,7 @@ public class RunningUtils {
     /**
      * 判断应用是否正在运行
      */
+    @RequiresPermission(Manifest.permission.GET_TASKS)
     public static boolean isRunning(Context context) {
         ActivityManager activityManager = (ActivityManager) context
                 .getSystemService(Context.ACTIVITY_SERVICE);
@@ -97,6 +99,7 @@ public class RunningUtils {
     /**
      * 获取当前baseActivity
      */
+    @RequiresPermission(Manifest.permission.GET_TASKS)
     public static String getBaseActivity(Context context) {
         ActivityManager activityManager = (ActivityManager) context
                 .getSystemService(Context.ACTIVITY_SERVICE);
@@ -112,6 +115,7 @@ public class RunningUtils {
     /**
      * 获取当前topActivity
      */
+    @RequiresPermission(Manifest.permission.GET_TASKS)
     public static String getTopActivity(Context context) {
         ActivityManager activityManager = (ActivityManager) context
                 .getSystemService(Context.ACTIVITY_SERVICE);
@@ -125,17 +129,4 @@ public class RunningUtils {
         return null;
     }
 
-    //TODO 未经测试代码
-    public static void runOnUI(Context context, Runnable runnable) {
-        if (isInUiThread()) {
-            Looper.prepare();
-            runnable.run();
-            Looper.loop();
-        }
-    }
-
-    public static boolean isInUiThread() {
-        return Looper.myLooper() == Looper.getMainLooper();
-    }
-
 }

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

@@ -1,81 +0,0 @@
-package com.gh.common.util;
-
-import android.content.Context;
-import android.os.Handler;
-import android.os.Looper;
-import android.widget.Toast;
-
-/**
- * @author CsHeng
- * @Date 31/05/2017
- * @Time 9:58 AM
- */
-
-public class RuntimeUtils {
-
-    private static final byte[] LOCK = new byte[0];
-
-    private static RuntimeUtils sInstance;
-
-    private Handler mHandler;
-
-    private RuntimeUtils() {
-        mHandler = new Handler(Looper.getMainLooper());
-    }
-
-    public static RuntimeUtils getInstance() {
-        if (sInstance == null) {
-            synchronized (LOCK) {
-                if (sInstance == null) {
-                    sInstance = new RuntimeUtils();
-                }
-            }
-        }
-        return sInstance;
-    }
-
-    public static boolean isOnUIThread() {
-        return Looper.myLooper() == Looper.getMainLooper();
-    }
-
-    public void runOnUiThread(Runnable runnable) {
-        if (runnable == null) {
-            throw new IllegalArgumentException("Runnable should not be null");
-        }
-        mHandler.post(runnable);
-    }
-
-    public void runOnUiThread(Runnable runnable, long delayMillis) {
-        if (runnable == null || delayMillis < 0) {
-            throw new IllegalArgumentException("Runnable should not be null and Delaymillis should not be negative");
-        }
-        mHandler.postDelayed(runnable, delayMillis);
-    }
-
-    public void toast(final Context context, final CharSequence message) {
-        runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                Toast.makeText(context, message, Toast.LENGTH_SHORT).show();
-            }
-        });
-    }
-
-    public void toastLong(final Context context, final CharSequence message) {
-        runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                Toast.makeText(context, message, Toast.LENGTH_LONG).show();
-            }
-        });
-    }
-
-    public Handler getHandler() {
-        return mHandler;
-    }
-
-    public void removeRunnable() {
-        mHandler.removeCallbacksAndMessages(null);
-    }
-
-}

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

@@ -31,6 +31,9 @@ import com.facebook.imagepipeline.image.CloseableImage;
 import com.gh.common.constant.Config;
 import com.gh.gamecenter.R;
 import com.gh.gamecenter.WeiBoShareActivity;
+import com.lightgame.utils.Utils;
+import com.sina.weibo.sdk.WbSdk;
+import com.sina.weibo.sdk.auth.AuthInfo;
 import com.tencent.connect.share.QQShare;
 import com.tencent.connect.share.QzoneShare;
 import com.tencent.mm.sdk.openapi.IWXAPI;
@@ -47,6 +50,8 @@ import java.io.ByteArrayOutputStream;
 import java.util.ArrayList;
 import java.util.List;
 
+import static com.gh.common.util.GetLoginDataUtils.SCOPE;
+
 /**
  * Created by khy on 2016/9/4.
  */
@@ -82,23 +87,25 @@ public class ShareUtils {
     public IUiListener QqShareListener = new IUiListener() {
         @Override
         public void onComplete(Object o) {
-            Utils.toast(mContext, "分享成功");
+            Utils.toast(mContext, mContext.getString(R.string.share_success_hint));
         }
 
         @Override
         public void onError(UiError uiError) {
-            Utils.toast(mContext, "分享失败");
+            Utils.toast(mContext, mContext.getString(R.string.share_fail_hint));
         }
 
         @Override
         public void onCancel() {
-            Utils.toast(mContext, "分享已取消");
+            Utils.toast(mContext, mContext.getString(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));
+        // FIXME 此处严重泄露，把Activity Context 存为static？？？？？
         mContext = context;
     }
 
@@ -116,7 +123,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;
                 }
             }
@@ -204,7 +211,7 @@ public class ShareUtils {
 
     //QQ分享
     private void qqSahre() {
-        Utils.toast(mContext, "分享跳转中...");
+        Utils.toast(mContext, mContext.getString(R.string.share_skip));
         Bundle params = new Bundle();
 
         String title;
@@ -246,7 +253,7 @@ public class ShareUtils {
 
     //微信好友分享
     private void wechatSahre() {
-        Utils.toast(mContext, "分享跳转中...");
+        Utils.toast(mContext, mContext.getString(R.string.share_skip));
         WXWebpageObject webpage = new WXWebpageObject();
         WXMediaMessage msg = new WXMediaMessage(webpage);
         webpage.webpageUrl = shareUrl;
@@ -293,7 +300,7 @@ public class ShareUtils {
     }
 
     private void loadBitMap(final String iconUrl, final WXMediaMessage msg, final SendMessageToWX.Req req) {
-        ImageUtils.getInstance().display(mContext, iconUrl, new BaseBitmapDataSubscriber() {
+        ImageUtils.Companion.getInstance().display(mContext, iconUrl, new BaseBitmapDataSubscriber() {
             @Override
             protected void onNewResultImpl(Bitmap bitmap) {
                 Bitmap compressBp = compressBitmap(bitmap);
@@ -358,7 +365,7 @@ public class ShareUtils {
 
     //QQ空间分享
     private void qZoneSahre() {
-        Utils.toast(mContext, "分享跳转中...");
+        Utils.toast(mContext, mContext.getString(R.string.share_skip));
         Bundle params = new Bundle();
 
         String title;
@@ -404,7 +411,7 @@ public class ShareUtils {
 
     //微信朋友圈分享
     private void wechatMomentsSahre() {
-        Utils.toast(mContext, "分享跳转中...");
+        Utils.toast(mContext, mContext.getString(R.string.share_skip));
         WXWebpageObject webpage = new WXWebpageObject();
         WXMediaMessage msg = new WXMediaMessage(webpage);
 

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

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

app/src/main/java/com/gh/common/util/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,78 +23,78 @@ 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);
     }
 
     /*
@@ -160,6 +160,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,90 +3,74 @@ 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.provider.Settings;
-import android.text.TextUtils;
+import android.preference.PreferenceManager;
 
-import com.gh.common.constant.Config;
 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.tencent.stat.StatConfig;
-
-import org.json.JSONException;
-import org.json.JSONObject;
+import com.lightgame.utils.Utils;
 
 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 = context.getSharedPreferences(Config.PREFERENCE, Context.MODE_PRIVATE);
-            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 = context.getSharedPreferences(Config.PREFERENCE, Context.MODE_PRIVATE);
-            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 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.getInstance(context).getApi().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);
@@ -98,7 +82,7 @@ public class TokenUtils {
 
     //将uuid存到sp
     private static void saveSharedPreferences(Context context, String device_id) {
-        SharedPreferences sp = context.getSharedPreferences(Config.PREFERENCE, Context.MODE_PRIVATE);
+        SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(context);
         SharedPreferences.Editor edit = sp.edit();
         edit.putString("uuid", device_id);
         edit.apply();
@@ -150,58 +134,63 @@ public class TokenUtils {
 
     }
 
-    // 获取用户token
-    public static synchronized Observable<String> getToken(final Context context, boolean isCheck) {
-        String token = null;
-        if (isCheck) {
-            SharedPreferences sp = context.getSharedPreferences(Config.PREFERENCE, Context.MODE_PRIVATE);
-            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 = context.getSharedPreferences(Config.PREFERENCE, Context.MODE_PRIVATE);
-                                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);
-    }
+//    // 获取用户token
+//    public static synchronized Observable<String> getToken(final Context context, boolean isCheck) {
+//
+//        if (true) { // TODO TEST
+//            return Observable.just(LoginUtils.getToken(context));
+//        }
+//
+//        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.getInstance(context).getApi()
+//                    .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);
+//    }
 
     public static synchronized String getDeviceId(Context context) {
         return loadSharedPreferences(context, false);
@@ -209,8 +198,8 @@ public class TokenUtils {
 
     // 获取服务器时间
     public static synchronized void getTime(Context context) {
-        final SharedPreferences sp = context.getSharedPreferences(Config.PREFERENCE, Context.MODE_PRIVATE);
-        RetrofitManager.getApi().getTime()
+        final SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(context);
+        RetrofitManager.getInstance(context).getApi().getTime()
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new StringResponse() {
@@ -232,7 +221,7 @@ public class TokenUtils {
 
     //读取SharedPreferences的uuid
     private static String loadSharedPreferences(Context context, boolean isCheck) {
-        SharedPreferences sp = context.getSharedPreferences(Config.PREFERENCE, Context.MODE_PRIVATE);
+        SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(context);
         String uuid = sp.getString("uuid", null);
         if (isCheck) {
             return uuid;
@@ -302,46 +291,46 @@ public class TokenUtils {
         return null;
     }
 
-    // 检查设备信息是否已经上传完整
-    public static synchronized void checkDeviceInfo(Context context, String token) {
-        final SharedPreferences sp = context.getSharedPreferences(Config.PREFERENCE, Context.MODE_PRIVATE);
-        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();
-                        }
-                    });
-        }
-    }
+//    // 检查设备信息是否已经上传完整
+//    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.getInstance(context).getApi().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/util/UserIconUtils.java

@@ -38,23 +38,23 @@ public class UserIconUtils {
     public static String getUserIconUrl(int i) {
         switch (i) {
             case 1:
-                return "http://image.ghzhushou.com/pic/default_icon_1.png";
+                return "http://image.ghzs666.com/pic/default_icon_1.png";
             case 2:
-                return "http://image.ghzhushou.com/pic/default_icon_2.png";
+                return "http://image.ghzs666.com/pic/default_icon_2.png";
             case 3:
-                return "http://image.ghzhushou.com/pic/default_icon_3.png";
+                return "http://image.ghzs666.com/pic/default_icon_3.png";
             case 4:
-                return "http://image.ghzhushou.com/pic/default_icon_4.png";
+                return "http://image.ghzs666.com/pic/default_icon_4.png";
             case 5:
-                return "http://image.ghzhushou.com/pic/default_icon_5.png";
+                return "http://image.ghzs666.com/pic/default_icon_5.png";
             case 6:
-                return "http://image.ghzhushou.com/pic/default_icon_6.png";
+                return "http://image.ghzs666.com/pic/default_icon_6.png";
             case 7:
-                return "http://image.ghzhushou.com/pic/default_icon_7.png";
+                return "http://image.ghzs666.com/pic/default_icon_7.png";
             case 8:
-                return "http://image.ghzhushou.com/pic/default_icon_8.png";
+                return "http://image.ghzs666.com/pic/default_icon_8.png";
             default:
-                return "http://image.ghzhushou.com/pic/default_icon_1.png";
+                return "http://image.ghzs666.com/pic/default_icon_1.png";
         }
     }
 }

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

@@ -1,123 +0,0 @@
-package com.gh.common.util;
-
-import android.content.ClipData;
-import android.content.ClipDescription;
-import android.content.ClipboardManager;
-import android.content.Context;
-import android.os.Build;
-
-/**
- * 剪切板使用（暂时只支持文字剪切）
- */
-public class Util_System_ClipboardManager {
-
-    /**
-     * 保存文字到剪切板中
-     *
-     * @param str
-     * @return
-     */
-    public static boolean setText(Context context, String str) {
-
-        if (context == null) {
-            return false;
-        }
-        Context appliactionContext = null;
-        try {
-            appliactionContext = context.getApplicationContext();
-        } catch (Exception e) {
-        }
-        if (appliactionContext == null) {
-            return false;
-        }
-
-        // 如果当前设备的android-sdk 版本号小于11
-        if (Build.VERSION.SDK_INT < 11) {
-            try {
-                android.text.ClipboardManager clipManager = (android.text.ClipboardManager) appliactionContext
-                        .getSystemService(Context.CLIPBOARD_SERVICE);
-                clipManager.setText(str);
-                return true;
-            } catch (Exception e) {
-            }
-            return false;
-        }
-
-        // 如果当前设备的android-sdk 版本号大于等于11
-        else {
-            try {
-                ClipboardManager clipManager = (ClipboardManager) appliactionContext
-                        .getSystemService(Context.CLIPBOARD_SERVICE);
-                ClipData clip = ClipData.newPlainText("simple text", str);
-                clipManager.setPrimaryClip(clip);
-                return true;
-            } catch (Exception e) {
-            }
-            return false;
-        }
-    }
-
-    /**
-     * 获取剪切版中的文字，如果有的话
-     *
-     * @param context
-     * @return
-     */
-    public static String getText(Context context) {
-        if (context == null) {
-            return null;
-        }
-        Context appliactionContext = null;
-        try {
-            appliactionContext = context.getApplicationContext();
-        } catch (Exception e) {
-        }
-        if (appliactionContext == null) {
-            return null;
-        }
-
-        // 如果当前设备的android-sdk 版本号小于11
-        if (Build.VERSION.SDK_INT < 11) {
-            try {
-                android.text.ClipboardManager clipManager = (android.text.ClipboardManager) appliactionContext
-                        .getSystemService(Context.CLIPBOARD_SERVICE);
-                if (clipManager.hasText()) {
-                    return clipManager.getText().toString();
-                }
-            } catch (Exception e) {
-            }
-            return null;
-        }
-
-        // 如果当前设备的android-sdk 版本号大于等于11
-        else {
-            try {
-                ClipboardManager clipManager = (ClipboardManager) appliactionContext
-                        .getSystemService(Context.CLIPBOARD_SERVICE);
-
-                if (clipManager.hasPrimaryClip()) {
-
-                    // 如果剪切版中的是文字
-                    if (clipManager.getPrimaryClipDescription().hasMimeType(ClipDescription.MIMETYPE_TEXT_PLAIN)) {
-                        StringBuilder sb = new StringBuilder();
-                        ClipData clipData = clipManager.getPrimaryClip();
-                        for (int i = 0; i < clipData.getItemCount(); ++i) {
-                            sb.append(clipData.getItemAt(i).getText());
-
-                            // ClipData.Item item = clipData.getItemAt(i);
-                            // CharSequence str = item.coerceToText(MainActivity.this);
-                            // resultString += str;
-                        }
-                        if (sb != null) {
-                            return sb.toString();
-                        }
-                    }
-                }
-            } catch (Exception e) {
-            }
-            return null;
-        }
-
-    }
-
-}

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

@@ -1,73 +0,0 @@
-package com.gh.common.util;
-
-import android.app.Activity;
-import android.content.Context;
-import android.os.IBinder;
-import android.view.View;
-import android.view.inputmethod.InputMethodManager;
-import android.widget.EditText;
-
-/**
- * @author: CsHeng (csheng1204[at]gmail[dot]com)
- * Date: 13-5-28
- * Time: 上午11:04
- */
-public class Util_System_Keyboard {
-
-    /**
-     * 显示键盘，使用postDelayed效果更加～
-     *
-     * @param context
-     * @param edt
-     */
-    public static void showSoftKeyboard(Context context, EditText edt) {
-        if (context == null || edt == null) return;
-        final InputMethodManager imm = (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
-        imm.showSoftInput(edt, 0);
-    }
-
-    /**
-     * 隐藏键盘
-     *
-     * @param context
-     * @param edt
-     */
-    public static void hideSoftKeyboard(Context context, EditText edt) {
-        if (context == null || edt == null) return;
-        final InputMethodManager imm = (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
-        imm.hideSoftInputFromWindow(edt.getWindowToken(), 0);
-    }
-
-    /**
-     * 隐藏键盘，使用Ibinder
-     *
-     * @param context
-     * @param binder
-     */
-    public static void hideSoftKeyboardByIBinder(Context context, IBinder binder) {
-        if (context == null || binder == null) {
-            return;
-        }
-        final InputMethodManager imm = (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
-        imm.hideSoftInputFromWindow(binder, 0);
-    }
-
-    /**
-     * 利用Activity获取到当前界面focus，利用IBinder隐藏键盘
-     *
-     * @param activity
-     */
-    public static void hideSoftKeyboard(Activity activity) {
-        if (activity != null) {
-            final View view = activity.getCurrentFocus();
-            if (view != null) {
-                final IBinder binder = view.getWindowToken();
-                if (binder != null) {
-                    final InputMethodManager imm = (InputMethodManager) activity.getApplicationContext()
-                            .getSystemService(Context.INPUT_METHOD_SERVICE);
-                    imm.hideSoftInputFromWindow(binder, 0);
-                }
-            }
-        }
-    }
-}

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

@@ -1,154 +0,0 @@
-package com.gh.common.util;
-
-import android.Manifest;
-import android.content.Context;
-import android.content.pm.PackageManager;
-import android.os.Build;
-import android.os.Build.VERSION_CODES;
-
-/**
- * 权限工具
- *
- * @author CsHeng
- */
-public class Util_System_Permission {
-
-    /**
-     * 检查是否具有写入外部存储卡的权限
-     *
-     * @param context
-     * @return
-     */
-    public static boolean isWith_WRITE_EXTERNAL_STORAGE_Permission(Context context) {
-        try {
-
-            // Util_SDK_Compatibility.getSDKLevel();
-            int sdkLevel = Build.VERSION.SDK_INT;
-
-            if (sdkLevel < VERSION_CODES.DONUT) {
-                return true;
-            }
-
-            return isWithPermission(context, Manifest.permission.WRITE_EXTERNAL_STORAGE);
-        } catch (Throwable e) {
-        }
-        return false;
-    }
-
-    /**
-     * 是否具有相应权限
-     *
-     * @param context
-     * @param permissionName
-     * @return
-     */
-    public static boolean isWithPermission(Context context, String permissionName) {
-        try {
-            if (context.checkCallingOrSelfPermission(permissionName) == PackageManager.PERMISSION_DENIED) {
-                return false;
-            }
-        } catch (Throwable e) {
-        }
-        return true;
-    }
-
-    /**
-     * 检查是否具有联网INTERNET权限
-     *
-     * @param context
-     * @return
-     */
-    public static boolean isWith_INTERNET_Permission(Context context) {
-        return isWithPermission(context, Manifest.permission.INTERNET);
-    }
-
-    /**
-     * 检查是否具有获取手机信息READ_PHONE_STATE权限
-     *
-     * @param context
-     * @return
-     */
-    public static boolean isWith_READ_PHONE_STATE_Permission(Context context) {
-        return isWithPermission(context, Manifest.permission.READ_PHONE_STATE);
-    }
-
-    /**
-     * 检查是否具有ACCESS_NETWORK_STATE权限
-     *
-     * @param context
-     * @return
-     */
-    public static boolean isWith_ACCESS_NETWORK_STATE_Permission(Context context) {
-        return isWithPermission(context, Manifest.permission.ACCESS_NETWORK_STATE);
-    }
-
-    /**
-     * 检查是否具有ACCESS_FINE_LOCATION权限
-     *
-     * @param context
-     * @return
-     */
-    public static boolean isWith_ACCESS_FINE_LOCATION_Permission(Context context) {
-        return isWithPermission(context, Manifest.permission.ACCESS_FINE_LOCATION);
-    }
-
-    /**
-     * 检查是否具有ACCESS_COARSE_LOCATION权限
-     *
-     * @param context
-     * @return
-     */
-    public static boolean isWith_ACCESS_COARSE_LOCATION_Permission(Context context) {
-        return isWithPermission(context, Manifest.permission.ACCESS_COARSE_LOCATION);
-    }
-
-    /**
-     * 检查是否具有ACCESS_WIFI_STATE权限
-     *
-     * @param context
-     * @return
-     */
-    public static boolean isWith_ACCESS_WIFI_STATE_Permission(Context context) {
-        return isWithPermission(context, Manifest.permission.ACCESS_WIFI_STATE);
-    }
-
-    /**
-     * 检查是否具有创建快捷方式的权限。
-     *
-     * @param context
-     * @return
-     */
-    public static boolean isWith_INSTALL_SHORTCUT_Permission(Context context) {
-        return isWithPermission(context, "com.android.launcher.permission.INSTALL_SHORTCUT");
-    }
-
-    /**
-     * 检查是否具有添加系统浏览器书签的权限
-     *
-     * @param context
-     * @return
-     */
-    public static boolean isWith_WRITE_HISTORY_BOOKMARKS(Context context) {
-        return isWithPermission(context, "com.android.browser.permission.WRITE_HISTORY_BOOKMARKS");
-    }
-
-    /**
-     * 检查是否具有SYSTEM_ALERT_WINDOW方法
-     *
-     * @param context
-     * @return
-     */
-    public static boolean isWith_SYSTEM_ALERT_WINDOW_Permission(Context context) {
-        return isWithPermission(context, Manifest.permission.SYSTEM_ALERT_WINDOW);
-    }
-
-    /**
-     * 检查是否具有GET_TASK方法
-     *
-     * @param context
-     * @return
-     */
-    public static boolean isWith_GET_TASK_Permission(Context context) {
-        return isWithPermission(context, Manifest.permission.GET_TASKS);
-    }
-}

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

@@ -1,183 +0,0 @@
-/**
- * project: CompanyPortalApp
- * <p/>
- * <p/>
- * ========================================================================
- * amend date			amend user			amend reason
- * 2012-2-14			    CsHeng
- */
-
-package com.gh.common.util;
-
-import android.content.Context;
-import android.content.pm.PackageManager.NameNotFoundException;
-import android.net.ConnectivityManager;
-import android.net.NetworkInfo;
-import android.net.wifi.WifiInfo;
-import android.net.wifi.WifiManager;
-import android.os.Build;
-import android.telephony.TelephonyManager;
-import android.text.format.Formatter;
-import android.util.Log;
-
-import java.net.InetAddress;
-import java.net.NetworkInterface;
-import java.net.SocketException;
-import java.util.Enumeration;
-import java.util.Locale;
-
-/**
- * 读取手机信息工具类
- *
- * @author CsHeng
- * @date 2012-2-14
- * @date 2015-9-6 update by yxf getImei
- */
-public class Util_System_Phone_State {
-
-    public static String getMac(Context context) {
-        try {
-            if (Util_System_Permission.isWith_ACCESS_WIFI_STATE_Permission(context)) {
-                WifiManager wifi = (WifiManager) context.getApplicationContext().getSystemService(Context.WIFI_SERVICE);
-                WifiInfo info = wifi.getConnectionInfo();
-                String str = info.getMacAddress();
-                if (str != null) {
-                    str = str.trim();
-                    return str;
-                }
-            }
-        } catch (Throwable e) {
-        }
-        return "";
-    }
-
-    public static String getLocalIpAddress() {
-        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()) {
-                        return inetAddress.getHostAddress();
-                    }
-                }
-            }
-        } catch (SocketException ex) {
-        }
-        return null;
-    }
-
-    public static String getss(Context context) {
-        String ipString = null;
-        try {
-            WifiManager wifiManager = (WifiManager) context.getApplicationContext().getSystemService(Context.WIFI_SERVICE);
-            WifiInfo wifiInfo = wifiManager.getConnectionInfo();
-            int ipAddress = wifiInfo.getIpAddress();
-            ipString = String.format(Locale.getDefault(),
-                    "%d.%d.%d.%d",
-                    (ipAddress & 0xff),
-                    (ipAddress >> 8 & 0xff),
-                    (ipAddress >> 16 & 0xff),
-                    (ipAddress >> 24 & 0xff));
-        } catch (Exception e) {
-        }
-        return ipString;
-    }
-
-    public static String getLocalIpAddressNum() {
-        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()) {
-                        String ip = Formatter.formatIpAddress(inetAddress.hashCode());
-                        if (AppDebugConfig.IS_DEBUG) {
-                            Log.i(Util_System_Phone_State.class.getSimpleName(), "***** IP=" + ip);
-                        }
-                        return ip;
-                    }
-                }
-            }
-        } catch (SocketException ex) {
-            if (AppDebugConfig.IS_DEBUG) {
-                Log.e(Util_System_Phone_State.class.getSimpleName(), ex.toString());
-            }
-        }
-        return null;
-    }
-
-    //这里如果IMEI返回为NULL，我们用15个0代替
-    public static String getImei(Context c) {
-        final String original = getTelephonyManager(c).getDeviceId();
-        return original == null ? "000000000000000" : original;
-    }
-
-    private static TelephonyManager getTelephonyManager(Context context) {
-        return (TelephonyManager) context.getApplicationContext().getSystemService(Context.TELEPHONY_SERVICE);
-    }
-
-    public static String getImsi(Context c) {
-        final String imsi = getTelephonyManager(c).getSubscriberId();
-        return imsi == null ? "" : imsi;
-    }
-
-    public static String getSIMId(Context c) {
-        return getTelephonyManager(c).getSimSerialNumber();
-    }
-
-    public static String getDeviceId(Context c) {
-        return getTelephonyManager(c).getDeviceId();
-    }
-
-    public static String getDeviceName() {
-        final String deviceName = android.os.Build.MODEL + ","
-                + android.os.Build.VERSION.SDK_INT + ","
-                + android.os.Build.VERSION.RELEASE;
-        return deviceName;
-    }
-
-    public static int getAppVersionCode(Context c) {
-        try {
-            return c.getPackageManager().getPackageInfo(c.getPackageName(), 0).versionCode;
-        } catch (NameNotFoundException e) {
-            e.printStackTrace();
-            return -1;
-        }
-    }
-
-    public static String getAppVersionName(Context c) {
-        try {
-            return c.getPackageManager().getPackageInfo(c.getPackageName(), 0).versionName;
-        } catch (NameNotFoundException e) {
-            e.printStackTrace();
-            return null;
-        }
-    }
-
-    public static String getPackageVersionName(Context ctx, String pn) {
-        try {
-            return ctx.getPackageManager().getPackageInfo(pn, 0).versionName;
-        } catch (NameNotFoundException e) {
-            return "";
-        }
-    }
-
-    public static String getDevideInfo() {
-        return Build.MANUFACTURER + " " + Build.MODEL + " " + Build.VERSION.RELEASE;
-    }
-
-    public static boolean isNetworkConnected(Context context) {
-        try {
-            final ConnectivityManager connectivityManager = (ConnectivityManager)
-                    context.getSystemService(Context.CONNECTIVITY_SERVICE);
-            final NetworkInfo activeNetworkInfo = connectivityManager.getActiveNetworkInfo();
-            return activeNetworkInfo != null;
-        } catch (Exception e) {
-        }
-        return false;
-    }
-
-}

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

@@ -1,99 +0,0 @@
-package com.gh.common.util;
-
-import android.graphics.PixelFormat;
-import android.os.Build;
-import android.view.View;
-import android.view.Window;
-import android.view.WindowManager;
-
-/**
- * Created by csheng on 15-10-14.
- */
-public class Util_Window {
-
-    /**
-     * set status bar color
-     * //TODO View的两个标识会导致输入法无法resize，找解决方案
-     * 解决方案：xml配置根视图要加android:fitsSystemWindows = "true"
-     *
-     * @param window
-     * @param color
-     */
-    public static void initStatusBarColor(Window window, int color) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            // clear FLAG_TRANSLUCENT_STATUS flag:
-            window.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
-            // add FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS flag to the window
-            window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
-            // finally change the color
-            window.setStatusBarColor(color);
-
-            window.getDecorView()
-                    .setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_STABLE | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN);
-        }
-    }
-
-    public static void enableAutoWakelock(Window window) {
-        // auto handle wake lock
-        window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
-
-        // 网页中的视频，上屏幕的时候，可能出现闪烁的情况，需要如下设置：Activity在onCreate时需要设置:
-        window.setFormat(PixelFormat.TRANSLUCENT);
-    }
-
-    public static void enableHardware(Window window) {
-        // open hardware accelerate
-        try {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
-                window.setFlags(WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED,
-                        WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED);
-            }
-        } catch (Exception e) {
-        }
-    }
-
-    /**
-     * Detects and toggles immersive mode (also known as "hidey bar" mode).
-     */
-    public static void toggleHideYBar(Window window) {
-
-        // The UI options currently enabled are represented by a bitfield.
-        // getSystemUiVisibility() gives us that bitfield.
-        int uiOptions = 0;
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
-            uiOptions = window.getDecorView().getSystemUiVisibility();
-        }
-        int newUiOptions = uiOptions;
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-            boolean isImmersiveModeEnabled =
-                    ((uiOptions | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY) == uiOptions);
-        }
-
-        // Navigation bar hiding:  Backwards compatible to ICS.
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
-            newUiOptions ^= View.SYSTEM_UI_FLAG_HIDE_NAVIGATION;
-        }
-
-        // Status bar hiding: Backwards compatible to Jellybean
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
-            newUiOptions ^= View.SYSTEM_UI_FLAG_FULLSCREEN;
-        }
-
-        // Immersive mode: Backward compatible to KitKat.
-        // Note that this flag doesn't do anything by itself, it only augments the behavior
-        // of HIDE_NAVIGATION and FLAG_FULLSCREEN.  For the purposes of this sample
-        // all three flags are being toggled together.
-        // Note that there are two immersive mode UI flags, one of which is referred to as "sticky".
-        // Sticky immersive mode differs in that it makes the navigation and status bars
-        // semi-transparent, and the UI flag does not get cleared when the user interacts with
-        // the screen.
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-            newUiOptions ^= View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY;
-        }
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
-            window.getDecorView().setSystemUiVisibility(newUiOptions);
-        }
-    }
-
-}

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

@@ -1,97 +0,0 @@
-package com.gh.common.util;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.util.Log;
-import android.view.View;
-import android.view.inputmethod.InputMethodManager;
-import android.widget.EditText;
-
-import com.gh.common.constant.Config;
-import com.gh.gamecenter.R;
-
-import java.lang.reflect.Field;
-
-public class Utils {
-
-    private static final boolean DEBUG = true;
-    private final static String TAG = "result";
-
-    public static void log(String msg) {
-        log(TAG, msg);
-    }
-
-    public static void log(String tag, String msg) {
-        log(Log.ERROR, tag, msg);
-    }
-
-    private static void log(int priority, String tag, String msg) {
-        if (DEBUG) {
-            Log.println(priority, tag, msg);
-        }
-    }
-
-    public static void log(Object obj) {
-        log(TAG, obj.getClass().getSimpleName() + ":" + obj.toString());
-    }
-
-    public static void log(String tag, Object obj) {
-        log(Log.ERROR, tag, obj.getClass().getSimpleName() + ":" + obj.toString());
-    }
-
-    private static void log(int priority, String tag, Object obj) {
-        if (DEBUG) {
-            Log.println(priority, tag, obj.getClass().getSimpleName() + ":" + obj.toString());
-        }
-    }
-
-    public static void toast(Context context, String text) {
-        RuntimeUtils.getInstance().toast(context, text);
-    }
-
-    /*
-     * 获取服务器时间
-     */
-    public static long getTime(Context context) {
-        SharedPreferences sp = context.getSharedPreferences(Config.PREFERENCE, Context.MODE_PRIVATE);
-        long serverTime = sp.getLong("server_time", 0);
-        long clientTime = sp.getLong("client_time", 0);
-        if (serverTime == 0 || clientTime == 0) {
-            return System.currentTimeMillis() / 1000;
-        } else {
-            return serverTime + (System.currentTimeMillis() / 1000 - clientTime);
-        }
-    }
-
-    public static void hideSoftInput(Context context, EditText editText) {
-        InputMethodManager imm = (InputMethodManager) context
-                .getSystemService(Context.INPUT_METHOD_SERVICE);
-        imm.hideSoftInputFromWindow(editText.getWindowToken(), 0);
-    }
-
-    public static void showSoftInput(Context context, EditText editText) {
-        InputMethodManager imm = (InputMethodManager) context
-                .getSystemService(Context.INPUT_METHOD_SERVICE);
-        imm.showSoftInput(editText, InputMethodManager.SHOW_FORCED);
-    }
-
-    @SuppressWarnings("unchecked")
-    public static <T extends View> T getView(View view, int id) {
-        return (T) view.findViewById(id);
-    }
-
-    public static int getId(String name) {
-        try {
-            Class<?> arrayClass = R.id.class;
-            for (Field field : arrayClass.getFields()) {
-                if (field.getName().equals(name)) {
-                    return field.getInt(name);
-                }
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return -1;
-    }
-
-}

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

@@ -4,6 +4,7 @@ import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Canvas;
 import android.graphics.drawable.Drawable;
+import android.support.v4.content.ContextCompat;
 import android.util.AttributeSet;
 import android.widget.RelativeLayout;
 
@@ -47,25 +48,25 @@ public class CardRelativeLayout extends RelativeLayout {
         }
 
         if (isTran) {
-            mLeftDrawable = getResources().getDrawable(R.drawable.frame_tran_left);
-            topDrawable = getResources().getDrawable(R.drawable.frame_tran_top);
-            mRightDrawable = getResources().getDrawable(R.drawable.frame_tran_right);
-            bottomDrawable = getResources().getDrawable(R.drawable.frame_tran_bottom);
+            mLeftDrawable = ContextCompat.getDrawable(context, R.drawable.frame_tran_left);
+            topDrawable = ContextCompat.getDrawable(context, R.drawable.frame_tran_top);
+            mRightDrawable = ContextCompat.getDrawable(context, R.drawable.frame_tran_right);
+            bottomDrawable = ContextCompat.getDrawable(context, R.drawable.frame_tran_bottom);
 
-            leftTopDrawable = getResources().getDrawable(R.drawable.frame_tran_left_top_square);
-            rightTopDrawable = getResources().getDrawable(R.drawable.frame_tran_right_top_square);
-            leftBottomDrawable = getResources().getDrawable(R.drawable.frame_tran_left_bottom_square);
-            rightBottomDrawable = getResources().getDrawable(R.drawable.frame_tran_right_bottom_square);
+            leftTopDrawable = ContextCompat.getDrawable(context, R.drawable.frame_tran_left_top_square);
+            rightTopDrawable = ContextCompat.getDrawable(context, R.drawable.frame_tran_right_top_square);
+            leftBottomDrawable = ContextCompat.getDrawable(context, R.drawable.frame_tran_left_bottom_square);
+            rightBottomDrawable = ContextCompat.getDrawable(context, R.drawable.frame_tran_right_bottom_square);
         } else {
-            mLeftDrawable = getResources().getDrawable(R.drawable.frame_left);
-            topDrawable = getResources().getDrawable(R.drawable.frame_top);
-            mRightDrawable = getResources().getDrawable(R.drawable.frame_right);
-            bottomDrawable = getResources().getDrawable(R.drawable.frame_bottom);
+            mLeftDrawable = ContextCompat.getDrawable(context, R.drawable.frame_left);
+            topDrawable = ContextCompat.getDrawable(context, R.drawable.frame_top);
+            mRightDrawable = ContextCompat.getDrawable(context, R.drawable.frame_right);
+            bottomDrawable = ContextCompat.getDrawable(context, R.drawable.frame_bottom);
 
-            leftTopDrawable = getResources().getDrawable(R.drawable.frame_left_top_square);
-            rightTopDrawable = getResources().getDrawable(R.drawable.frame_right_top_square);
-            leftBottomDrawable = getResources().getDrawable(R.drawable.frame_left_bottom_square);
-            rightBottomDrawable = getResources().getDrawable(R.drawable.frame_right_bottom_square);
+            leftTopDrawable = ContextCompat.getDrawable(context, R.drawable.frame_left_top_square);
+            rightTopDrawable = ContextCompat.getDrawable(context, R.drawable.frame_right_top_square);
+            leftBottomDrawable = ContextCompat.getDrawable(context, R.drawable.frame_left_bottom_square);
+            rightBottomDrawable = ContextCompat.getDrawable(context, R.drawable.frame_right_bottom_square);
         }
     }
 

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

@@ -2,6 +2,7 @@ package com.gh.common.view;
 
 import android.content.Context;
 import android.content.SharedPreferences;
+import android.preference.PreferenceManager;
 import android.support.v4.view.ViewPager;
 import android.support.v4.view.ViewPager.OnPageChangeListener;
 import android.view.Gravity;
@@ -15,16 +16,12 @@ import android.widget.LinearLayout.LayoutParams;
 import android.widget.PopupWindow;
 import android.widget.TextView;
 
-import com.gh.common.constant.Config;
 import com.gh.common.util.DisplayUtils;
 import com.gh.common.util.PackageUtils;
 import com.gh.common.util.PlatformUtils;
-import com.gh.common.util.Utils;
-import com.gh.download.DataWatcher;
-import com.gh.download.DownloadEntity;
 import com.gh.download.DownloadManager;
-import com.gh.download.DownloadStatus;
 import com.gh.gamecenter.R;
+import com.gh.gamecenter.adapter.OnCollectionCallBackListener;
 import com.gh.gamecenter.adapter.PlatformPagerAdapter;
 import com.gh.gamecenter.entity.ApkEntity;
 import com.gh.gamecenter.entity.GameCollectionEntity;
@@ -32,8 +29,11 @@ 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.listener.OnCollectionCallBackListener;
 import com.gh.gamecenter.manager.PackageManager;
+import com.lightgame.download.DataWatcher;
+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;
@@ -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;
     }
 
@@ -119,7 +116,7 @@ public class DownloadDialog implements OnCollectionCallBackListener {
         this.entrance = entrance;
         this.location = location;
 
-        SharedPreferences sp = mContext.getSharedPreferences(Config.PREFERENCE, Context.MODE_PRIVATE);
+        SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(mContext);
         row = sp.getInt("download_box_row", 3);
         column = sp.getInt("download_box_column", 3);
 
@@ -213,7 +210,7 @@ public class DownloadDialog implements OnCollectionCallBackListener {
         String packageName;
         Object gh_id;
         for (ApkEntity apkEntity : apkList) {
-            downloadEntity = DownloadManager.getInstance(mContext).get(apkEntity.getUrl());
+            downloadEntity = DownloadManager.getInstance(mContext).getDownloadEntityByUrl(apkEntity.getUrl());
             if (downloadEntity == null) {
                 packageName = apkEntity.getPackageName();
                 if (PackageManager.isInstalled(packageName)) {
@@ -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);
                     }
@@ -334,11 +331,11 @@ public class DownloadDialog implements OnCollectionCallBackListener {
         int count = apkList.size();
         int vpHeight;
         if (count <= 3) {
-            vpHeight = 88;
+            vpHeight = 90;
         } else if (count <= 6) {
-            vpHeight = 148;
+            vpHeight = 150;
         } else {
-            vpHeight = 208;
+            vpHeight = 210;
         }
         ViewGroup.LayoutParams layoutParams = viewPager.getLayoutParams();
         layoutParams.height = DisplayUtils.dip2px(mContext, vpHeight);
@@ -399,7 +396,7 @@ public class DownloadDialog implements OnCollectionCallBackListener {
             if (collectionAdapter != null) {
                 collectionAdapter.removeDownloadEntityByUrl(url);
             }
-            DownloadManager.getInstance(mContext).putStatus(url, "delete");
+//            DownloadManager.getInstance(mContext).putStatus(url, "delete");
         }
     }
 
@@ -421,11 +418,11 @@ public class DownloadDialog implements OnCollectionCallBackListener {
         int count = gameCollectionEntity.getSaveApkEntity().size();
         int vpHeight;
         if (count <= 3) {
-            vpHeight = 80;
+            vpHeight = 82;
         } else if (count <= 6) {
-            vpHeight = 140;
+            vpHeight = 142;
         } else {
-            vpHeight = 200;
+            vpHeight = 202;
         }
 
         ViewGroup.LayoutParams layoutParams = collectionViewPager.getLayoutParams();

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

@@ -1,62 +1,62 @@
-package com.gh.common.view;
-
-import android.content.Context;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.view.View;
-import android.view.ViewGroup;
-
-/**
- * Created by khy on 2017/3/30.
- */
-public class MeasureLinearLayoutManager extends LinearLayoutManager {
-    int height;
-    private int[] mMeasuredDimension = new int[1];
-
-    public MeasureLinearLayoutManager(Context context) {
-        super(context);
-    }
-
-    @Override
-    public void onMeasure(RecyclerView.Recycler recycler, RecyclerView.State state,
-                          int widthSpec, int heightSpec) {
-        super.onMeasure(recycler, state, widthSpec, heightSpec);
-        height = 0;
-
-        try {
-            for (int i = 0; i < getItemCount(); i++) {
-                measureScrapChild(recycler, i,
-                        View.MeasureSpec.makeMeasureSpec(i, View.MeasureSpec.UNSPECIFIED),
-                        View.MeasureSpec.makeMeasureSpec(i, View.MeasureSpec.UNSPECIFIED),
-                        mMeasuredDimension);
-                height = height + mMeasuredDimension[0];
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-    }
-
-    private void measureScrapChild(RecyclerView.Recycler recycler, int position, int widthSpec,
-                                   int heightSpec, int[] measuredDimension) throws Exception {
-        View view = recycler.getViewForPosition(position);
-        if (view.getVisibility() == View.GONE) {
-            measuredDimension[0] = 0;
-            return;
-        }
-        super.measureChildWithMargins(view, 0, 0);
-        RecyclerView.LayoutParams p = (RecyclerView.LayoutParams) view.getLayoutParams();
-        int childHeightSpec = ViewGroup.getChildMeasureSpec(
-                heightSpec,
-                getPaddingTop() + getPaddingBottom() + getDecoratedTop(view) + getDecoratedBottom(view),
-                p.height);
-
-        view.measure(0, childHeightSpec);
-        measuredDimension[0] = getDecoratedMeasuredHeight(view) + p.bottomMargin + p.topMargin;
-        recycler.recycleView(view);
-    }
-
-    public int getRvHeight() {
-        return height;
-    }
-}
+//package com.gh.common.view;
+//
+//import android.content.Context;
+//import android.support.v7.widget.LinearLayoutManager;
+//import android.support.v7.widget.RecyclerView;
+//import android.view.View;
+//import android.view.ViewGroup;
+//
+///**
+// * Created by khy on 2017/3/30.
+// */
+//public class MeasureLinearLayoutManager extends LinearLayoutManager {
+//    int height;
+//    private int[] mMeasuredDimension = new int[1];
+//
+//    public MeasureLinearLayoutManager(Context context) {
+//        super(context);
+//    }
+//
+//    @Override
+//    public void onMeasure(RecyclerView.Recycler recycler, RecyclerView.State state,
+//                          int widthSpec, int heightSpec) {
+//        super.onMeasure(recycler, state, widthSpec, heightSpec);
+//        height = 0;
+//
+//        try {
+//            for (int i = 0; i < getItemCount(); i++) {
+//                measureScrapChild(recycler, i,
+//                        View.MeasureSpec.makeMeasureSpec(i, View.MeasureSpec.UNSPECIFIED),
+//                        View.MeasureSpec.makeMeasureSpec(i, View.MeasureSpec.UNSPECIFIED),
+//                        mMeasuredDimension);
+//                height = height + mMeasuredDimension[0];
+//            }
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//
+//    }
+//
+//    private void measureScrapChild(RecyclerView.Recycler recycler, int position, int widthSpec,
+//                                   int heightSpec, int[] measuredDimension) throws Exception {
+//        View view = recycler.getViewForPosition(position);
+//        if (view.getVisibility() == View.GONE) {
+//            measuredDimension[0] = 0;
+//            return;
+//        }
+//        super.measureChildWithMargins(view, 0, 0);
+//        RecyclerView.LayoutParams p = (RecyclerView.LayoutParams) view.getLayoutParams();
+//        int childHeightSpec = ViewGroup.getChildMeasureSpec(
+//                heightSpec,
+//                getPaddingTop() + getPaddingBottom() + getDecoratedTop(view) + getDecoratedBottom(view),
+//                p.height);
+//
+//        view.measure(0, childHeightSpec);
+//        measuredDimension[0] = getDecoratedMeasuredHeight(view) + p.bottomMargin + p.topMargin;
+//        recycler.recycleView(view);
+//    }
+//
+//    public int getRvHeight() {
+//        return height;
+//    }
+//}

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

@@ -1,40 +0,0 @@
-package com.gh.common.view;
-
-import android.content.Context;
-import android.support.v4.view.ViewPager;
-import android.util.AttributeSet;
-import android.view.MotionEvent;
-
-/**
- * Created by khy on 2017/2/24.
- * 控制是否可以左右滑动
- */
-public class NoScrollableViewPager extends ViewPager {
-
-    private boolean isScrollable;
-
-    public NoScrollableViewPager(Context context) {
-        super(context);
-        isScrollable = true;
-    }
-
-    public NoScrollableViewPager(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        isScrollable = true;
-
-    }
-
-    @Override
-    public boolean onInterceptTouchEvent(MotionEvent ev) {
-        return isScrollable && super.onInterceptTouchEvent(ev);
-    }
-
-    @Override
-    public boolean onTouchEvent(MotionEvent ev) {
-        return isScrollable && super.onTouchEvent(ev);
-    }
-
-    public void setScrollable(boolean scrollable) {
-        isScrollable = scrollable;
-    }
-}

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

@@ -0,0 +1,164 @@
+package com.gh.common.view;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.util.AttributeSet;
+import android.view.View;
+
+import com.gh.gamecenter.R;
+
+/**
+ * Created by khy on 22/06/17.
+ *
+ * 光环快传-扫描雷达动画
+ */
+
+public class RadarView extends View {
+
+    private Context mContext;
+    private boolean isSearching = false;// 标识是否处于扫描状态,默认为不在扫描状态
+    private Paint mPaint;// 画笔
+    private Bitmap mScanBmp;// 执行扫描运动的图片
+    private int mOffsetArgs = 0;// 扫描运动偏移量参数
+    private int mWidth, mHeight;// 宽高
+    int mCx, mCy;// x、y轴中心点
+    int mOutsideRadius, mInsideRadius;// 外、内圆半径
+
+    public RadarView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init(context);
+    }
+
+    public RadarView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        init(context);
+    }
+
+    public RadarView(Context context) {
+        super(context);
+        init(context);
+    }
+
+    /**
+     * TODO<提前初始化好需要使用的对象,避免在绘制过程中多次初始化>
+     *
+     * @return void
+     */
+    private void init(Context context) {
+        mPaint = new Paint();
+        this.mContext = context;
+    }
+
+    /**
+     * 测量视图及其内容,以确定所测量的宽度和高度(测量获取控件尺寸).
+     */
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        // TODO Auto-generated method stub
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+
+        // 获取控件区域宽高
+        if (mWidth == 0 || mHeight == 0) {
+            final int minimumWidth = getSuggestedMinimumWidth();
+            final int minimumHeight = getSuggestedMinimumHeight();
+            mWidth = resolveMeasured(widthMeasureSpec, minimumWidth);
+            mHeight = resolveMeasured(heightMeasureSpec, minimumHeight);
+            mScanBmp = Bitmap.createScaledBitmap(BitmapFactory.decodeResource(
+                    mContext.getResources(), R.drawable.radar_scan_img), mWidth, mWidth, false);
+
+            // 获取x/y轴中心点
+            mCx = mWidth / 2;
+            mCy = mHeight / 2;
+
+            // 计算内、外半径
+            mOutsideRadius = mWidth / 2;// 外圆的半径
+            mInsideRadius = mWidth / 4 / 2;// 内圆的半径,除最外层,其它圆的半径=层数*insideRadius
+        }
+    }
+
+    /**
+     * 绘制视图--从外部向内部绘制
+     */
+    @Override
+    protected void onDraw(Canvas canvas) {
+        super.onDraw(canvas);
+        // 开始绘制最外层的圆
+        mPaint.setAntiAlias(true);// 设置抗锯齿
+        mPaint.setStyle(Paint.Style.FILL);// 设置填充样式
+        mPaint.setColor(0xff327BD7);// 设置画笔颜色
+        // 1.开始绘制圆形
+        canvas.drawCircle(mCx, mCy, mOutsideRadius, mPaint);
+
+        // 开始绘制内3圆
+        mPaint.setStyle(Paint.Style.STROKE);
+        mPaint.setColor(Color.WHITE);
+        canvas.drawCircle(mCx, mCy, mInsideRadius * 3, mPaint);
+
+        // 开始绘制内2圆
+        canvas.drawCircle(mCx, mCy, mInsideRadius * 2, mPaint);
+
+        // 开始绘制内1圆
+        canvas.drawCircle(mCx, mCy, mInsideRadius * 1, mPaint);
+
+        // 2.开始绘制对角线
+        canvas.drawLine(0, mCy, mWidth, mCy, mPaint);// 绘制0°~180°对角线
+        canvas.drawLine(mCx, mHeight , mCx, 0,
+                mPaint);// 绘制90°~270°对角线
+
+        // 3.绘制扫描扇形图
+        canvas.save();// 用来保存Canvas的状态.save之后，可以调用Canvas的平移、放缩、旋转、错切、裁剪等操作.
+
+        if (isSearching) {// 判断是否处于扫描
+            canvas.rotate(mOffsetArgs, mCx, mCy);// 绘制旋转角度,参数一：角度;参数二：x中心;参数三：y中心.
+            canvas.drawBitmap(mScanBmp, mCx - mScanBmp.getWidth() / 2, mCy
+                    - mScanBmp.getHeight() / 2, null);// 绘制Bitmap扫描图片效果
+            mOffsetArgs += 3;
+        } else {
+            canvas.drawBitmap(mScanBmp, mCx - mScanBmp.getWidth() / 2, mCy
+                    - mScanBmp.getHeight() / 2, null);
+        }
+
+        mPaint.setStyle(Paint.Style.FILL);
+        mPaint.setColor(Color.WHITE);
+        canvas.drawCircle(mCx, mCy, mInsideRadius/4, mPaint);
+
+        if (isSearching)
+            this.invalidate();
+    }
+
+    /**
+     * TODO<设置扫描状态>
+     *
+     * @return void
+     */
+    public void setSearching(boolean status) {
+        this.isSearching = status;
+        this.invalidate();
+    }
+
+    /**
+     * TODO<解析获取控件宽高>
+     *
+     * @return int
+     */
+    private int resolveMeasured(int measureSpec, int desired) {
+        int result = 0;
+        int specSize = MeasureSpec.getSize(measureSpec);
+        switch (MeasureSpec.getMode(measureSpec)) {
+            case MeasureSpec.UNSPECIFIED:
+                result = desired;
+                break;
+            case MeasureSpec.AT_MOST:
+                result = Math.min(specSize, desired);
+                break;
+            case MeasureSpec.EXACTLY:
+            default:
+                result = specSize;
+        }
+        return result;
+    }
+}