wrong commit ...

fesch · Dec 5, 2015 · cbb20c9 · cbb20c9
1 parent 741707d
commit cbb20c9
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 5 deletions.
diff --git a/app/src/main/java/lu/fisch/canze/activities/MainActivity.java b/app/src/main/java/lu/fisch/canze/activities/MainActivity.java
@@ -745,7 +745,7 @@ public void saveFields()
     protected void onDestroy() {
         debug("MainActivity: onDestroy");
 
-        dataLogger.onDestroy(); // clean up
+        dataLogger.destroy(); // clean up
 
         if(device!=null) {
             // stop the device nicely

diff --git a/app/src/main/java/lu/fisch/canze/classes/DataLogger.java b/app/src/main/java/lu/fisch/canze/classes/DataLogger.java
@@ -92,7 +92,7 @@ public boolean isCreated()
 
     public boolean activate ( boolean state ) {
         boolean result = state;
-        debug ( "DataLogger: activate req " + state );
+        debug ( "DataLogger: activate > request = " + state );
 
         if ( activated != state) {
             if (state) { // now need to activate, open file, start timer
@@ -105,7 +105,7 @@ public boolean activate ( boolean state ) {
                 // debug("DataLogger: stop ");
             }
         }
-        debug ( "DataLogger: activate return " + result );
+        debug ( "DataLogger: activate > return " + result );
        return result;
     }
 
@@ -236,16 +236,19 @@ public boolean stop() {
         return result;
     }
 
+    // Bob: Useless
+    /*
     // @Override
     // protected void onCreate(Bundle savedInstanceState) {
     //    super.onCreate(savedInstanceState);
-    public void onCreate() {
+    public void create() {
         // start timer in 400ms
         boolean result = start();
         // handler.postDelayed(runnable, 400 );
     }
+    */
 
-    public void onDestroy() {
+    public void destroy() {
         handler.removeCallbacks(runnable);
         boolean result = stop();
     }
@@ -354,13 +357,19 @@ public void onFieldUpdateEvent(final Field field) {
 
     }
 
+    // Bob: This is no activity ...
+    /*
     public void onPause() {
         onDestroy();
     }
+    */
 
+    // Bob: This is no activity ...
+    /*
     public void onResume() {
         onCreate();
     }
+    */
 
 
     // only for test and trace purposes - delete later on

diff --git a/app/src/main/java/lu/fisch/canze/devices/Device.java b/app/src/main/java/lu/fisch/canze/devices/Device.java
@@ -254,6 +254,7 @@ public int compare(Field lhs, Field rhs) {
                 // return it's index in the global registered field array
                 if(field.isDue(referenceTime)) {
                     //MainActivity.debug(Calendar.getInstance().getTimeInMillis()/1000.+" > Chosing: "+field.getSID());
+                    MainActivity.debug("Device: getNextField > applicationFields");
                     return field;
                 }
             }
@@ -273,12 +274,14 @@ public int compare(Field lhs, Field rhs) {
                 // return it's index in the global registered field array
                 if(field.isDue(referenceTime)) {
                     //MainActivity.debug(Calendar.getInstance().getTimeInMillis()/1000.+" > Chosing: "+field.getSID());
+                    MainActivity.debug("Device: getNextField > activityFieldsScheduled");
                     return field;
                 }
             }
             if(activityFieldsAsFastAsPossible.size()>0)
             {
                 activityFieldIndex = (activityFieldIndex + 1) % activityFieldsAsFastAsPossible.size();
+                MainActivity.debug("Device: getNextField > activityFieldsAsFastAsPossible");
                 return activityFieldsAsFastAsPossible.get(activityFieldIndex);
             }
 
@@ -349,6 +352,7 @@ public void clearFields()
         MainActivity.debug("Device: clearFields");
         synchronized (fields) {
             activityFieldsScheduled.clear();
+            activityFieldsAsFastAsPossible.clear();
             fields.clear();
             fields.addAll(applicationFields);
             //MainActivity.debug("cleared");