Leaf-WAI/assistant-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
huangzhuanghua
2016-09-21 18:48:44 +08:00
parent 6cd2397b27 d053fc9fea
commit da87e974f4
7 changed files with 60 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/com/gh/gamecenter/MainActivity.java
View File

@ -149,6 +149,8 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene
private TextView app_btn_cancel;
private AppEntity appEntity;
public static MainActivity mainActivity = null;
// 黄壮华 添加观察者 修改2015/8/15
private DataWatcher dataWatcher = new DataWatcher() {
@Override
@ -393,6 +395,8 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene
// 初始化gameMap
DownloadManager.getInstance(this).initGameMap();
mainActivity = this;
if (savedInstanceState != null) {
currentTab = savedInstanceState.getInt("currentTab");
} else {
@ -428,10 +432,10 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene
if (isNewFirstLaunch) {
getPluginUpdate();
sp.edit().putBoolean("isNewFirstLaunch", false).apply();
} else {
handler.postDelayed(runnable, 500);
}
handler.postDelayed(runnable, 500);
getDisclaimer(isNewFirstLaunch);
// 初始化PlatformUtils