diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 8ef78708a5..341b34dc4e 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -9,12 +9,14 @@
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
+            <option value="$PROJECT_DIR$/PushSDK" />
             <option value="$PROJECT_DIR$/app" />
           </set>
         </option>
         <option name="myModules">
           <set>
             <option value="$PROJECT_DIR$" />
+            <option value="$PROJECT_DIR$/PushSDK" />
             <option value="$PROJECT_DIR$/app" />
           </set>
         </option>
diff --git a/.idea/modules.xml b/.idea/modules.xml
index fe0d0ade49..b8e6af6e8c 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -3,6 +3,7 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/GH-ASSISTv1.45.iml" filepath="$PROJECT_DIR$/GH-ASSISTv1.45.iml" />
+      <module fileurl="file://$PROJECT_DIR$/PushSDK/PushSDK.iml" filepath="$PROJECT_DIR$/PushSDK/PushSDK.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
     </modules>
   </component>
diff --git a/app/build.gradle b/app/build.gradle
index eb52315985..d50324fb1b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -104,7 +104,7 @@ dependencies {
     // ConverterFactory的Gson依赖包
     compile 'com.squareup.retrofit2:converter-gson:2.0.0-beta4'
     // ConverterFactory的String依赖包
-//    compile 'com.squareup.retrofit2:converter-scalars:2.0.0-beta4'
+    //    compile 'com.squareup.retrofit2:converter-scalars:2.0.0-beta4'
     // ConverterFactory的RxJava依赖包
     compile 'com.squareup.retrofit2:adapter-rxjava:2.0.0-beta4'
     // gson
@@ -122,4 +122,6 @@ dependencies {
     compile 'com.jakewharton.rxbinding:rxbinding:0.3.0'
     //    compile 'com.jakewharton.rxbinding:rxbinding-appcompat-v7:0.3.0'
     //    compile 'com.jakewharton.rxbinding:rxbinding-design:0.3.0'
+    //添加友盟依赖工程
+    compile project(':PushSDK')
 }
\ No newline at end of file
diff --git a/app/libs/MiPush_SDK_Client_2_2_18.jar b/app/libs/MiPush_SDK_Client_2_2_18.jar
deleted file mode 100644
index 837bfff2dd..0000000000
Binary files a/app/libs/MiPush_SDK_Client_2_2_18.jar and /dev/null differ
diff --git a/app/libs/MiPush_SDK_Client_3_1_2.jar b/app/libs/MiPush_SDK_Client_3_1_2.jar
new file mode 100644
index 0000000000..3ed84821e1
Binary files /dev/null and b/app/libs/MiPush_SDK_Client_3_1_2.jar differ
diff --git a/app/libs/MobCommons-2016.0426.1819.jar b/app/libs/MobCommons-2016.0426.1819.jar
deleted file mode 100644
index 0d89338cbd..0000000000
Binary files a/app/libs/MobCommons-2016.0426.1819.jar and /dev/null differ
diff --git a/app/libs/MobTools-2016.0426.1819.jar b/app/libs/MobTools-2016.0426.1819.jar
deleted file mode 100644
index 88e164e813..0000000000
Binary files a/app/libs/MobTools-2016.0426.1819.jar and /dev/null differ
diff --git a/app/libs/utdid4all-1.0.4.jar b/app/libs/utdid4all-1.0.4.jar
deleted file mode 100644
index 34815c3497..0000000000
Binary files a/app/libs/utdid4all-1.0.4.jar and /dev/null differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 019bdd545d..6f69dd5bfb 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -42,6 +42,7 @@
     <permission
         android:name="com.gh.gamecenter.permission.MIPUSH_RECEIVE"
         android:protectionLevel="signature" />
+    <uses-permission android:name="android.permission.VIBRATE" />
 
     <supports-screens
         android:anyDensity="true"
@@ -73,6 +74,15 @@
             android:value="GH_TEST"/>
         <!--android:value="${CHANNEL_VALUE}"-->
 
+        <meta-data
+            android:name="UMENG_APPKEY"
+            android:value="585a29fa8f4a9d327600023e">
+        </meta-data>
+        <meta-data
+            android:name="UMENG_MESSAGE_SECRET"
+            android:value="8bcce6bed547ee624f5c2cc64d39a9e9">
+        </meta-data>
+
         <activity
             android:name="com.gh.gamecenter.SplashScreenActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
@@ -303,6 +313,13 @@
 
         <service
             android:name="com.gh.download.DownloadService" />
+
+        <service
+            android:name="com.xiaomi.push.service.XMJobService"
+            android:enabled="true"
+            android:exported="false"
+            android:permission="android.permission.BIND_JOB_SERVICE"
+            android:process=":pushservice" />
         <service
             android:name="com.xiaomi.push.service.XMPushService"
             android:enabled="true"
diff --git a/app/src/main/java/com/gh/base/AppController.java b/app/src/main/java/com/gh/base/AppController.java
index d0c7287e91..0f33570c0f 100644
--- a/app/src/main/java/com/gh/base/AppController.java
+++ b/app/src/main/java/com/gh/base/AppController.java
@@ -12,7 +12,13 @@ import android.util.Log;
 import com.facebook.drawee.backends.pipeline.Fresco;
 import com.gh.common.util.DataUtils;
 import com.gh.common.util.HttpsUtils;
+import com.gh.common.util.TokenUtils;
 import com.gh.common.util.Utils;
+import com.umeng.message.IUmengRegisterCallback;
+import com.umeng.message.PushAgent;
+import com.umeng.message.UTrack;
+import com.umeng.message.UmengNotificationClickHandler;
+import com.umeng.message.entity.UMessage;
 import com.xiaomi.channel.commonutils.logger.LoggerInterface;
 import com.xiaomi.mipush.sdk.Logger;
 import com.xiaomi.mipush.sdk.MiPushClient;
@@ -74,6 +80,47 @@ public class AppController extends Application {
 		};
 		Logger.setLogger(this, newLogger);
 
+		//友盟推送
+		final PushAgent mPushAgent = PushAgent.getInstance(this);
+
+
+		//注册推送服务，每次调用register方法都会回调该接口
+		mPushAgent.register(new IUmengRegisterCallback() {
+
+			@Override
+			public void onSuccess(String deviceToken) {
+				//注册成功会返回device token
+				Utils.log("deviceToken::" , deviceToken);
+
+				//设置别名
+				mPushAgent.addExclusiveAlias(TokenUtils.getDeviceId(getApplicationContext())
+						, "GHDID", new UTrack.ICallBack() {
+							@Override
+							public void onMessage(boolean b, String s) {
+								Utils.log("ExclusiveAlias::" + b + "==" + s);
+
+							}
+						});
+			}
+
+			@Override
+			public void onFailure(String s, String s1) {
+
+			}
+		});
+
+		//推送数据处理
+		UmengNotificationClickHandler notificationClickHandler = new UmengNotificationClickHandler() {
+
+			//友盟 后续消息处理事件
+			@Override
+			public void launchApp(Context context, UMessage uMessage) {
+				super.launchApp(context, uMessage);
+				String content = uMessage.extra.get("data"); //TODO 推送的数据
+			}
+		};
+		mPushAgent.setNotificationClickHandler(notificationClickHandler);
+
 	}
 
 	public static void put(String key, Object object) {
diff --git a/app/src/main/java/com/gh/base/GHPushMessageReceiver.java b/app/src/main/java/com/gh/base/GHPushMessageReceiver.java
index aa42fe9182..e3438e1e46 100644
--- a/app/src/main/java/com/gh/base/GHPushMessageReceiver.java
+++ b/app/src/main/java/com/gh/base/GHPushMessageReceiver.java
@@ -11,13 +11,17 @@ import android.graphics.BitmapFactory;
 import android.os.Build;
 import android.support.v4.app.NotificationCompat;
 import android.support.v4.util.ArrayMap;
+import android.text.TextUtils;
 import android.util.Log;
 import android.widget.RemoteViews;
 
 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.R;
+import com.xiaomi.mipush.sdk.ErrorCode;
+import com.xiaomi.mipush.sdk.MiPushClient;
 import com.xiaomi.mipush.sdk.MiPushCommandMessage;
 import com.xiaomi.mipush.sdk.MiPushMessage;
 import com.xiaomi.mipush.sdk.PushMessageReceiver;
@@ -56,6 +60,7 @@ import java.util.Locale;
  * @author mayixiang
  */
 public class GHPushMessageReceiver extends PushMessageReceiver {
+	private String mAlias;
 
 	@Override
 	public void onReceivePassThroughMessage(Context context,
@@ -255,6 +260,20 @@ public class GHPushMessageReceiver extends PushMessageReceiver {
 	public void onCommandResult(Context context, MiPushCommandMessage message) {
 		Log.v(AppController.TAG, "onCommandResult is called. "
 				+ message.toString());
+
+		String command = message.getCommand();
+		List<String> arguments = message.getCommandArguments();
+
+		if (MiPushClient.COMMAND_SET_ALIAS.equals(command)) {
+			if (message.getResultCode() == ErrorCode.SUCCESS) {
+				mAlias = arguments.get(0);
+			}
+		}
+
+		if (TextUtils.isEmpty(mAlias)) {
+			//添加别名
+			MiPushClient.setAlias(context, TokenUtils.getDeviceId(context), null);
+		}
 	}
 
 	@Override
diff --git a/app/src/main/java/com/gh/common/util/HttpsUtils.java b/app/src/main/java/com/gh/common/util/HttpsUtils.java
index 1ba3c6677f..3e51ae42bb 100644
--- a/app/src/main/java/com/gh/common/util/HttpsUtils.java
+++ b/app/src/main/java/com/gh/common/util/HttpsUtils.java
@@ -78,8 +78,8 @@ public class HttpsUtils {
             }
             mSSLSocketFactory = sslContext.getSocketFactory();
 
-            HttpsURLConnection.setDefaultSSLSocketFactory(mSSLSocketFactory);
-            HttpsURLConnection.setDefaultHostnameVerifier(mHostnameVerifier);
+//            HttpsURLConnection.setDefaultSSLSocketFactory(mSSLSocketFactory);
+//            HttpsURLConnection.setDefaultHostnameVerifier(mHostnameVerifier);
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -113,24 +113,25 @@ public class HttpsUtils {
     }
 
     public static  HttpsURLConnection getHttpsURLConnection(URL url) throws Exception {
-        if (mSSLSocketFactory == null || mHostnameVerifier == null) {
+        HttpsURLConnection httpsURLConnection = (HttpsURLConnection) url.openConnection();
+        if ("apk2.ghzhushou.com".equals(url.getHost())
+                || "download.ghzhushou.com".equals(url.getHost())) {
+            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);
+        } else {
             SSLContext sslContext = SSLContext.getInstance("TLS");
             sslContext.init(null, TRUST_MANAGERS, null);
-            mSSLSocketFactory = sslContext.getSocketFactory();
-
-            mHostnameVerifier = HOSTNAME_VERIFIER;
-
-            HttpsURLConnection.setDefaultSSLSocketFactory(mSSLSocketFactory);
-            HttpsURLConnection.setDefaultHostnameVerifier(mHostnameVerifier);
-        } else {
-            if (HttpsURLConnection.getDefaultSSLSocketFactory() != mSSLSocketFactory) {
-                HttpsURLConnection.setDefaultSSLSocketFactory(mSSLSocketFactory);
-            }
-            if (HttpsURLConnection.getDefaultHostnameVerifier() != mHostnameVerifier) {
-                HttpsURLConnection.setDefaultHostnameVerifier(mHostnameVerifier);
-            }
+            httpsURLConnection.setSSLSocketFactory(sslContext.getSocketFactory());
+            httpsURLConnection.setHostnameVerifier(HOSTNAME_VERIFIER);
         }
-        return (HttpsURLConnection) url.openConnection();
+        return httpsURLConnection;
     }
 
 }
diff --git a/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java b/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java
index cba1f88c57..bf7b44e0be 100644
--- a/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java
@@ -36,6 +36,8 @@ import com.gh.gamecenter.manager.FilterManager;
 import com.gh.gamecenter.retrofit.JSONObjectResponse;
 import com.gh.gamecenter.retrofit.Response;
 import com.gh.gamecenter.retrofit.RetrofitManager;
+import com.xiaomi.mipush.sdk.MiPushMessage;
+import com.xiaomi.mipush.sdk.PushMessageHelper;
 
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -79,6 +81,12 @@ public class SplashScreenActivity extends BaseActivity {
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 
+		//小米推送 打开app处理
+		MiPushMessage miPushMessage = (MiPushMessage) getIntent().getSerializableExtra(PushMessageHelper.KEY_MESSAGE);
+		if (miPushMessage != null) {
+			String content = miPushMessage.getContent(); //TODO 推送的数据
+		}
+
 		// 处理助手已经在后台运行导致的再次启动助手
 		if ((getIntent().getFlags() & Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT) != 0) {
 			finish();
diff --git a/app/src/main/java/com/gh/gamecenter/WebActivity.java b/app/src/main/java/com/gh/gamecenter/WebActivity.java
index 4ed74535ca..75bcb4f99c 100644
--- a/app/src/main/java/com/gh/gamecenter/WebActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/WebActivity.java
@@ -104,7 +104,9 @@ public class WebActivity extends BaseActivity {
             }
         });
 
-        getNewsCommentNum();
+        if (newsId != null) {
+            getNewsCommentNum();
+        }
     }
 
     @OnClick(R.id.web_comment)
diff --git a/settings.gradle b/settings.gradle
index e7b4def49c..ba77833049 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1 @@
-include ':app'
+include ':app', ':PushSDK'