implement onRestoreInstanceState method

fightyz · Jul 29, 2016 · c1282c8 · c1282c8
1 parent a2c9b1d
commit c1282c8
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 4 deletions.
diff --git a/app/src/main/java/org/esec/mcg/bleinsight/ScanDeviceActivity.java b/app/src/main/java/org/esec/mcg/bleinsight/ScanDeviceActivity.java
@@ -3,6 +3,7 @@
 import android.Manifest;
 import android.app.Activity;
 import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothDevice;
 import android.bluetooth.le.ScanResult;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -29,6 +30,8 @@
 
 import org.esec.mcg.library.logger.LogUtils;
 
+import java.util.ArrayList;
+
 public class ScanDeviceActivity extends Activity implements ScanDeviceUiCallbacks {
     private static final int PERMISSION_REQUEST_COARSE_LOCATION = 1;
 
@@ -43,15 +46,14 @@ public class ScanDeviceActivity extends Activity implements ScanDeviceUiCallback
 
 //    private boolean isConfigurationChanged = false;
     private boolean isRestart = false;
+    private boolean isRestore = false;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         LogUtils.e("onCreate");
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_device_scan);
 
-        isRestart = false;
-
         mScanDeviceAdapter = new ScanDeviceAdapter(this);
 
         mRecyclerView = (RecyclerView) findViewById(R.id.device_list_view);
@@ -149,8 +151,15 @@ protected void onResume() {
             finish();
         }
 
-        if (!isRestart) {
+        Log.e("isRestore", "" + isRestore);
+        Log.e("list", "" + mScanDeviceAdapter.getItemCount());
+        if (!isRestart && !isRestore) {
             startScanningInit();
+        } else {
+            mScanDeviceAdapter.notifyDataSetChanged();
+            scanToggle.setText("SCAN");
+            findViewById(R.id.toolbar_progress_bar).setVisibility(View.INVISIBLE);
+            mScanning = false;
         }
     }
 
@@ -166,19 +175,26 @@ protected void onPause() {
     @Override
     protected void onDestroy() {
         LogUtils.e("onDestroy");
+        isRestart = false;
         super.onDestroy();
     }
 
     @Override
     protected void onSaveInstanceState(Bundle outState) {
         LogUtils.e("onSaveInstanceState");
         super.onSaveInstanceState(outState);
+        outState.putBoolean("isRestore", true);
+
+        outState.putParcelableArrayList("devices",mScanDeviceAdapter.getmDevices());
     }
 
     @Override
     protected void onRestoreInstanceState(Bundle savedInstanceState) {
         LogUtils.e("onRestoreInstanceState");
         super.onRestoreInstanceState(savedInstanceState);
+        isRestore = savedInstanceState.getBoolean("isRestore");
+        ArrayList<BluetoothDevice> devices = savedInstanceState.getParcelableArrayList("devices");
+        mScanDeviceAdapter.setmDevices(devices);
     }
 
     @Override

diff --git a/app/src/main/java/org/esec/mcg/bleinsight/adapter/ScanDeviceAdapter.java b/app/src/main/java/org/esec/mcg/bleinsight/adapter/ScanDeviceAdapter.java
@@ -32,7 +32,6 @@ public class ScanDeviceAdapter extends RecyclerView.Adapter<ScanDeviceAdapter.Li
 
     private RecyclerView mRecyclerView;
     private ItemSlideHelper mOnItemTouchListener;
-
     private ArrayList<BluetoothDevice> mDevices;
     private ArrayList<ScanRecord> mRecords;
     private ArrayList<Integer> mRssis;
@@ -44,6 +43,14 @@ public class ScanDeviceAdapter extends RecyclerView.Adapter<ScanDeviceAdapter.Li
 
     private Handler rssiUpdateHandler = new Handler();
 
+    public ArrayList<BluetoothDevice> getmDevices() {
+        return mDevices;
+    }
+
+    public void setmDevices(ArrayList<BluetoothDevice> mDevices) {
+        this.mDevices = mDevices;
+    }
+
     public ScanDeviceAdapter(Activity parent) {
         super();
         mDevices    = new ArrayList<BluetoothDevice>();