update support for power-down mode in android app; update API version…

… and docs
voroshkov · Jul 4, 2019 · 1bce858 · 1bce858
1 parent d9d042b
commit 1bce858
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 15 deletions.
diff --git a/Android/ChorusRFLaptimer/app/build.gradle b/Android/ChorusRFLaptimer/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "app.andrey_voroshkov.chorus_laptimer"
         minSdkVersion 16
         targetSdkVersion 26
-        versionCode 24
-        versionName "0.7.12"
+        versionCode 25
+        versionName "0.7.14"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         archivesBaseName = "ChorusRFLaptimer"
     }

diff --git a/...orusRFLaptimer/app/src/main/java/app/andrey_voroshkov/chorus_laptimer/AppPreferences.java b/...orusRFLaptimer/app/src/main/java/app/andrey_voroshkov/chorus_laptimer/AppPreferences.java
@@ -195,18 +195,7 @@ public static void applyInAppPreferences() {
             }
         }
 
-        if (app.deviceStates != null) {
-            String statuses = app.preferences.getString(DEVICE_ENABLED, "");
-            if (!statuses.equals("")) {
-                String[] statusesArray = TextUtils.split(statuses, STRING_ITEMS_DELIMITER);
-                int statusesCount = statusesArray.length;
-                for(int i = 0; i < app.deviceStates.size(); i++) {
-                    if (i < statusesCount) {
-                        app.changeDeviceEnabled(i, Boolean.parseBoolean(statusesArray[i]));
-                    }
-                }
-            }
-        }
+
     }
 
     public static void applyDeviceDependentPreferences() {
@@ -282,6 +271,19 @@ public static void applyDeviceDependentPreferences() {
                 }
             }
 
+            String enabledStatuses = app.preferences.getString(DEVICE_ENABLED, "");
+            if (!enabledStatuses.equals("")) {
+                String[] enabledStatusesArray = TextUtils.split(enabledStatuses, STRING_ITEMS_DELIMITER);
+                int statusesCount = enabledStatusesArray.length;
+                for(int i = 0; i < app.deviceStates.size(); i++) {
+                    if (i < statusesCount) {
+                        boolean prefEnabledStatus = Boolean.parseBoolean(enabledStatusesArray[i]);
+                        app.changeDeviceEnabled(i, prefEnabledStatus);
+                        app.sendBtCommand("R" +  String.format("%X", i) + "A" + (prefEnabledStatus ? "1" : "0"));
+                    }
+                }
+            }
+
         }
     }
 

diff --git a/Arduino/chorus_rf_laptimer/chorus_rf_laptimer.ino b/Arduino/chorus_rf_laptimer/chorus_rf_laptimer.ino
@@ -38,7 +38,7 @@ TODO: there's possible optimization in send queue:
     remove already existing items from queue
 */
 
-#define API_VERSION 5 // version number to be increased with each API change (int16)
+#define API_VERSION 6 // version number to be increased with each API change (int16)
 
 #define EXPERIMENTAL_FEATURES_AVAILABLE // comment out if current code version doesn't contain any experimental features
 

diff --git a/docs/ChorusAPI.xlsx b/docs/ChorusAPI.xlsx