代码合并

2017-03-02 11:23:19 +08:00
parent eae0414cb4 7b203bedfc
commit 75695812ee
150 changed files with 12278 additions and 302 deletions
--- a/app/src/main/java/com/gh/gamecenter/MainActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/MainActivity.java
@ -345,7 +345,7 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene

 		if (!isNewFirstLaunch && sp.getBoolean("autoupdate", true)) {
 			// 检查助手更新
-			UpdateManager.getInstance(this).checkUpdate(true);
+			UpdateManager.getInstance(this).checkUpdate(true, null);
 		}
 		if (isNewFirstLaunch) {
 			getPluginUpdate();