diff --git a/app/build.gradle b/app/build.gradle
index 2a0dfe7445..d94d9000f5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -236,7 +236,6 @@ dependencies {
     implementation 'com.google.android:flexbox:0.2.2'
 
     implementation project(':libraries:LGLibrary')
-    implementation project(':libraries:MiPush')
     implementation project(':libraries:MTA')
     implementation project(':libraries:QQShare')
     implementation project(':libraries:TalkingData')
diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/FuLiAdapter.java b/app/src/main/java/com/gh/gamecenter/gamedetail/FuLiAdapter.java
index 235eacf419..cd8c7ff66e 100644
--- a/app/src/main/java/com/gh/gamecenter/gamedetail/FuLiAdapter.java
+++ b/app/src/main/java/com/gh/gamecenter/gamedetail/FuLiAdapter.java
@@ -48,11 +48,6 @@ import com.lightgame.adapter.BaseRecyclerAdapter;
 import org.greenrobot.eventbus.EventBus;
 
 import java.util.ArrayList;
-<<<<<<< HEAD
-import java.util.HashMap;
-=======
-import java.util.Calendar;
->>>>>>> origin/3.1
 import java.util.List;
 import java.util.Timer;
 import java.util.TimerTask;
diff --git a/dependencies.gradle b/dependencies.gradle
index a3fdc39cdd..973972ba85 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -1,6 +1,6 @@
 ext {
     //Android
-    buildToolsVersion = "27.0.1"
+    buildToolsVersion = "27.0.2"
     compileSdkVersion = 26
     minSdkVersion = 14
     // TODO fix permission/ target 23 will cause permission issues
diff --git a/gradle.properties b/gradle.properties
index c9f6b145c9..cfaf4cf91a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -12,48 +12,61 @@
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
-#Fri Dec 15 09:51:15 CST 2017
+#Wed Jul 19 10:16:09 CST 2017
+org.gradle.jvmargs=-Xmx2048m -XX\:MaxPermSize\=512m -XX\:+HeapDumpOnOutOfMemoryError -Dfile.encoding\=UTF-8
+org.gradle.parallel=true
+
+# channel packages
+channel_file=channel.txt
+
+# tinker patch version_name
+PATCH_VERSION_NAME=3.0.2
+
+# Third-party keys
+DEBUG_UMENG_APPKEY=58e5b0b9c62dca35a00005e6
+DEBUG_UMENG_MESSAGE_SECRET=ca08596492f8a7fde2ab48dceab8c1f3
+DEBUG_MIPUSH_APPID=2882303761517564447
+DEBUG_MIPUSH_APPKEY=5761756481447
+DEBUG_BUGLY_APPID=43104840f8
+
+MIPUSH_APPID=2882303761517352993
+MIPUSH_APPKEY=5451735292993
+WECHAT_APPID=wx3ffd0785fad18396
+WECHAT_SECRET=368b49e8471857575a033b206218f9fb
 TD_APPID=81DB144D555386A38A70B833537EC256
 TENCENT_APPID=1104659243
-WEIBO_APPKEY=1723629218
-USERSEA_APP_ID=2017101012
-DEBUG_UMENG_APPKEY=58e5b0b9c62dca35a00005e6
-DEBUG_MIPUSH_APPID=2882303761517564447
-UMENG_APPKEY=585a29fa8f4a9d327600023e
-BUGLY_APPID=d5de44c594
-MIPUSH_APPID=2882303761517352993
-org.gradle.parallel=true
-WECHAT_APPID=wx3ffd0785fad18396
-USERSEA_APP_SECRET=597aa2b463f5770013146675
-DEV_LIBAO_HOST=https\://dev.api.ghzs666.com/v3d1/
-DATA_HOST=http\://data.ghzs666.com/
-DEBUG_MIPUSH_APPKEY=5761756481447
-DEV_DATA_HOST=http\://data.ghzs666.com/
-DEBUG_UMENG_MESSAGE_SECRET=ca08596492f8a7fde2ab48dceab8c1f3
-DEBUG_BUGLY_APPID=43104840f8
-API_HOST=https\://api.ghzs.com/v3d0/
-DEV_MESSAGE_HOST=https\://dev.api.ghzs666.com/v3d1/
-systemProp.http.proxyPort=8888
-LIBAO_HOST=https\://api.ghzs.com/v3d0/
-WECHAT_SECRET=368b49e8471857575a033b206218f9fb
 MTA_APPKEY=APV567FTBS7J
-MIPUSH_APPKEY=5451735292993
-UMENG_MESSAGE_SECRET=8bcce6bed547ee624f5c2cc64d39a9e9
-DEV_API_HOST=https\://dev.api.ghzs666.com/v3d1/
-MESSAGE_HOST=https\://api.ghzs.com/v3d0/
-TINKER_ID=82fea044
-USER_HOST=https\://api.ghzs.com/v3d0/
-DEV_COMMENT_HOST=https\://dev.api.ghzs666.com/v3d1/
-TINKER_ENABLE=
-PATCH_VERSION_NAME=3.0.2
-DEV_USER_HOST=https\://dev.api.ghzs666.com/v3d1/
-org.gradle.jvmargs=-Xmx2048m -XX\:MaxPermSize\=512m -XX\:+HeapDumpOnOutOfMemoryError -Dfile.encoding\=UTF-8
-channel_file=channel.txt
-COMMENT_HOST=https\://api.ghzs.com/v3d0/
-systemProp.http.proxyHost=127.0.0.1
-DEV_USERSEA_APP_SECRET=597aa2b463f5770013146675
 MTA_APP_SCHEME=mtaautotrack.46f88906bee9811365708f419397abf3
-DEV_USERSEA_HOST=https\://dev.usersea.ghzs666.com/v1d1/
-USERSEA_HOST=https\://usersea.ghzs.com/v1d0/
-TINKER_BASE_APK_DIR=app-1114-14-55-39_82fea044
+WEIBO_APPKEY=1723629218
+UMENG_APPKEY=585a29fa8f4a9d327600023e
+UMENG_MESSAGE_SECRET=8bcce6bed547ee624f5c2cc64d39a9e9
+BUGLY_APPID=d5de44c594
+
+# usersea
 DEV_USERSEA_APP_ID=3111120926
+DEV_USERSEA_APP_SECRET=597aa2b463f5770013146675
+
+USERSEA_APP_ID=2017101012
+USERSEA_APP_SECRET=597aa2b463f5770013146675
+
+# hosts
+DEV_API_HOST=https\://dev.api.ghzs666.com/v3d1/
+DEV_LIBAO_HOST=https\://dev.api.ghzs666.com/v3d1/
+DEV_MESSAGE_HOST=https\://dev.api.ghzs666.com/v3d1/
+DEV_USER_HOST=https\://dev.api.ghzs666.com/v3d1/
+DEV_COMMENT_HOST=https\://dev.api.ghzs666.com/v3d1/
+DEV_DATA_HOST=http\://data.ghzs666.com/
+DEV_USERSEA_HOST=https\://dev.usersea.ghzs666.com/v1d1/
+
+API_HOST=https\://api.ghzs.com/v3d0/
+LIBAO_HOST=https\://api.ghzs.com/v3d0/
+MESSAGE_HOST=https\://api.ghzs.com/v3d0/
+USER_HOST=https\://api.ghzs.com/v3d0/
+COMMENT_HOST=https\://api.ghzs.com/v3d0/
+DATA_HOST=http\://data.ghzs666.com/
+USERSEA_HOST=https\://usersea.ghzs.com/v1d0/
+
+# 请不要手动改动下面的值，除非你明确需要以某个apk作为基准包，需要打包请以scripts/tinker*.sh为准
+TINKER_ENABLE=
+TINKER_ID=82fea044
+TINKER_BASE_APK_DIR=app-1114-14-55-39_82fea044
diff --git a/libraries/LGLibrary b/libraries/LGLibrary
index 4d028785e7..e48845fad9 160000
--- a/libraries/LGLibrary
+++ b/libraries/LGLibrary
@@ -1 +1 @@
-Subproject commit 4d028785e7e956c5b5dca33a757f033ea8a9830d
+Subproject commit e48845fad916c6bd2b58bf3a3330d1eefcb92d8c
diff --git a/libraries/MiPush/build.gradle b/libraries/MiPush/build.gradle
deleted file mode 100644
index 3a1cb0fac0..0000000000
--- a/libraries/MiPush/build.gradle
+++ /dev/null
@@ -1,11 +0,0 @@
-apply plugin: 'com.android.library'
-
-dependencies {
-    api fileTree(dir: 'libs', exclude: 'android-support-*.jar', include: '*.jar')
-}
-
-android {
-    defaultConfig {
-        consumerProguardFiles 'proguard-library.txt'
-    }
-}
\ No newline at end of file