fixed issue in restoring state of the feed activity

juanjoserendon13 · May 5, 2018 · 4ca1a86 · 4ca1a86
1 parent cdb8901
commit 4ca1a86
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 6 deletions.
diff --git a/app/src/main/java/com/proter/juanjose/protermico/ConfigActivity.java b/app/src/main/java/com/proter/juanjose/protermico/ConfigActivity.java
@@ -78,6 +78,7 @@ public void onClick(View v) {
             @Override
             public void onClick(View v) {
                 Intent intent = new Intent(getApplicationContext(), FeedActivity.class);
+                intent.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
                 startActivity(intent);
             }
         });

diff --git a/app/src/main/java/com/proter/juanjose/protermico/ConnectionBt.java b/app/src/main/java/com/proter/juanjose/protermico/ConnectionBt.java
@@ -67,7 +67,7 @@ public void run() {
                     String readMessage = new String(buffer, 0, bytes);
                     data = readMessage;
                     if (data != bufferData) {
-                        Log.i("-------------", "dato entrante en singleton: " + data);
+//                        Log.i("-------------", "dato entrante en singleton: " + data);
                         setChanged();
                         notifyObservers();
                         clearChanged();

diff --git a/app/src/main/java/com/proter/juanjose/protermico/FeedActivity.java b/app/src/main/java/com/proter/juanjose/protermico/FeedActivity.java
@@ -61,6 +61,7 @@ public class FeedActivity extends AppCompatActivity implements Observer {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        Log.i("--------------", "onCREATE");
         setContentView(R.layout.activity_feed);
         Intent intent = getIntent();
         Bundle extras = intent.getExtras();
@@ -213,7 +214,7 @@ public void handleMessage(android.os.Message msg) {
                 if (msg.what == handlerState) {          //if message is what we want
                     String readMessage = (String) msg.obj;                                                                // msg.arg1 = bytes from connect thread
                     recDataString.append(readMessage);
-                    Log.i("----------", "llega al handler feed " + recDataString);//keep appending to string until ~
+//                    Log.i("----------", "llega al handler feed " + recDataString);//keep appending to string until ~
                     int endOfLineIndex = recDataString.indexOf("~");                    // determine the end-of-line
                     if (endOfLineIndex > 0) {                                           // make sure there data before ~
                         String dataInPrint = recDataString.substring(0, endOfLineIndex);    // extract string
@@ -226,7 +227,7 @@ public void handleMessage(android.os.Message msg) {
                         }
                         if (recDataString.charAt(0) == '/') {
                             String temp = recDataString.substring(1, endOfLineIndex);
-                            Log.i("----------", "llega al / " + temp);
+//                            Log.i("----------", "llega al / " + temp);
                             systemTemp(temp);
                         }
 
@@ -305,22 +306,32 @@ public void onRestoreInstanceState(Bundle savedInstanceState) {
     @Override
     protected void onStart() {
         super.onStart();
-
+        Log.i("--------------", "onSTART");
     }
 
     protected void onResume() {
+        super.onResume();
+        Log.i("--------------", "onRESUME");
         ConnectionBt.getInstance().addObserver(this);
         homeBtn.setChecked(true);
         statisticBtn.setChecked(false);
         configBtn.setChecked(false);
 
-        super.onResume();
     }
 
     @Override
     protected void onPause() {
-        ConnectionBt.getInstance().deleteObserver(this);
         super.onPause();
+        Log.i("--------------", "onPAUSE");
+        ConnectionBt.getInstance().deleteObserver(this);
+
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        Log.i("--------------", "onDESTROY");
+
     }
 
     private void updateCountDownText() {

diff --git a/app/src/main/java/com/proter/juanjose/protermico/StatisticActivity.java b/app/src/main/java/com/proter/juanjose/protermico/StatisticActivity.java
@@ -39,6 +39,7 @@ public void onClick(View v) {
             @Override
             public void onClick(View v) {
                 Intent intent = new Intent(getApplicationContext(), FeedActivity.class);
+                intent.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
                 startActivity(intent);
             }
         });