|
@@ -56,26 +56,18 @@ public class MainActivity extends BaseActivity {
|
|
|
|
|
|
@Override
|
|
|
protected void onCreateBase() {
|
|
|
- //判断是否从Onboarding返回 0:不是 1:从Onboarding返回
|
|
|
- int appFrom = getIntent().getIntExtra("inent_from", 0);
|
|
|
- //判断是否激活
|
|
|
- int isActivated = DataManager.getIsWatchActivated();
|
|
|
- Log.d(TAG, "onCreate: isActivated: " + isActivated + " appFrom: " + appFrom);
|
|
|
- if (appFrom == 0 && isActivated == 0) {
|
|
|
- //启动引导
|
|
|
- startOnboarding();
|
|
|
- } else {
|
|
|
- setContentView(R.layout.activity_main);
|
|
|
- initData();
|
|
|
- initView();
|
|
|
- }
|
|
|
+ setContentView(R.layout.activity_main);
|
|
|
}
|
|
|
|
|
|
- protected void initData() {
|
|
|
+ @Override
|
|
|
+ protected void initDataBase() {
|
|
|
+ super.initDataBase();
|
|
|
mAppNameType = DataManager.getAppNameType();
|
|
|
}
|
|
|
|
|
|
- protected void initView() {
|
|
|
+ @Override
|
|
|
+ protected void initViewBase() {
|
|
|
+ super.initViewBase();
|
|
|
initViewPager();
|
|
|
initTimeChangeBroadcast();
|
|
|
initSimStateBroadcast();
|