1

app/src/main/java/com/xplora/xplauncher/activity/MainActivity.java

@@ -47,6 +47,7 @@ public class MainActivity extends BaseActivity {
     private ViewPager mViewPager = null;
     private ViewPagerAdapter mViewPagerAdapter = null;
     private TimeBroadcastReceiver mTimeReceiver = null;
+    private SimStateReceiver mSimListener = null;
 
     private ContactContentObserver mContactObserver = null;
     private RecentContentObserver mRecentObserver = null;
@@ -68,7 +69,6 @@ public class MainActivity extends BaseActivity {
             initData();
             initView();
         }
-        DataManager.setFromOnboarding(0);
     }
 
     protected void initData() {
@@ -402,11 +402,11 @@ public class MainActivity extends BaseActivity {
 
     private void initSimStateBroadcast() {
         //sim 卡状态变化
-        SimStateReceiver listener = new SimStateReceiver();
+        mSimListener = new SimStateReceiver();
         IntentFilter intentFilter = new IntentFilter(SimStateReceiver.ACTION_SIM_STATE_CHANGED);
-        registerReceiver(listener, intentFilter);
+        registerReceiver(mSimListener, intentFilter);
 
-        listener.setOnSimStateListener(new SimStateReceiver.OnSimStateChangeListener() {
+        mSimListener.setOnSimStateListener(new SimStateReceiver.OnSimStateChangeListener() {
             @Override
             public void onReceiveSimStateChangeBroadcast(int status) {
                 String content = status >= 1 ? getString(ResUtils.getStringId("sim_status_", status)) : "";
@@ -455,6 +455,7 @@ public class MainActivity extends BaseActivity {
 
     @Override
     protected void onDestroyBase() {
+        Log.d(TAG, "onDestroyBase");
         super.onDestroyBase();
         // 注销广播
         if (mTimeReceiver != null) {
@@ -462,6 +463,11 @@ public class MainActivity extends BaseActivity {
             mTimeReceiver = null;
         }
 
+        if (mSimListener != null) {
+            unregisterReceiver(mSimListener);
+            mSimListener = null;
+        }
+
         if (mPagerViews.size() > 1) {
             HomePager homeView = (HomePager) mPagerViews.get(1);
             homeView.destroyView();