1、将所有Activity统一到一个base(主题AppCompatTheme),layout和contentView统一处理
2、MainActivity tab切换方式的重构 3、下一步更改toolbar实现方式,然后再是尽量用fragment替换
This commit is contained in:
@ -46,6 +46,10 @@ public class SplashScreenActivity extends BaseActivity {
|
||||
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
|
||||
sp = getSharedPreferences(Config.PREFERENCE, Context.MODE_PRIVATE);
|
||||
isNewFirstLaunch = sp.getBoolean("isNewFirstLaunchV" + PackageUtils.getVersionName(getApplicationContext()), true);
|
||||
|
||||
super.onCreate(savedInstanceState);
|
||||
|
||||
// 处理助手已经在后台运行导致的再次启动助手
|
||||
@ -60,9 +64,6 @@ public class SplashScreenActivity extends BaseActivity {
|
||||
|
||||
isFirst = true;
|
||||
|
||||
sp = getSharedPreferences(Config.PREFERENCE, Context.MODE_PRIVATE);
|
||||
isNewFirstLaunch = sp.getBoolean("isNewFirstLaunchV" + PackageUtils.getVersionName(getApplicationContext()), true);
|
||||
|
||||
if (isNewFirstLaunch || sp.getInt("actionbar_height", 0) != 0) {
|
||||
setTheme(R.style.AppGuideTheme);
|
||||
} else {
|
||||
@ -80,12 +81,23 @@ public class SplashScreenActivity extends BaseActivity {
|
||||
}
|
||||
|
||||
if (isNewFirstLaunch) {
|
||||
setContentView(R.layout.activity_splash_intro);
|
||||
ViewPager guideLayout = (ViewPager) findViewById(R.id.splash_intro_vp_guide);
|
||||
guideLayout.setAdapter(new GuidePagerAdapter());
|
||||
} else {
|
||||
setContentView(R.layout.activity_splash_normal);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
protected int getLayoutId() {
|
||||
|
||||
final int layoutId;
|
||||
if (isNewFirstLaunch) {
|
||||
layoutId = R.layout.activity_splash_intro;
|
||||
} else {
|
||||
layoutId = R.layout.activity_splash_normal;
|
||||
}
|
||||
|
||||
return layoutId;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in New Issue
Block a user