Merge branch '2.1' of https://git.oschina.net/dreamhua/GH-ASSISTv1.45 into 2.1

Conflicts:
	app/src/main/java/com/gh/common/util/DialogUtils.java
	app/src/main/java/com/gh/gamecenter/news/News4Fragment.java

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

@@ -100,10 +100,10 @@ public class DialogUtils {
 				});
 	}
 
-	// 打开QQ客户端，创建临时会话
+	// 网络劫持时 打开QQ客户端，创建临时会话
 	public static void showQqSessionDialog(final Context context, String qq) {
 		if (qq == null) {
-			qq = "2586716223";
+			qq = "2586716223";// 默认客服QQ
 		}
 		final String finalQq = qq;
 		showWarningDialog(context, "警告", "您当前网络环境异常，下载地址可能被运营商恶意替换（网络劫持）" +