gudbjartur22/clinx02-androidpebble
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v2.0.8 - check for errors interpreting settings sent from watch - indicative of incompatible watch app version installed.

Browse Source
This commit is contained in:
Graham Jones
2016-08-24 20:55:03 +01:00
parent 3e46f50c47
commit 2df84341f2
4 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@@ -1,6 +1,10 @@
OpenSeizureDetector Android App - Change Log OpenSeizureDetector Android App - Change Log
============================================ ============================================
V2.0.8 - 24 Aug 2016
- Added checks for correct version of pebble watch app for compatibility with this
Android App.
V2.0.7 - 18 Aug 2016 V2.0.7 - 18 Aug 2016
- Added AnalysisPeriod setting to Pebble Datasource to change - Added AnalysisPeriod setting to Pebble Datasource to change
the period between data analyses (rather than the default 5 seconds the period between data analyses (rather than the default 5 seconds

BIN
app/app-release-2.0.8.apk Normal file
View File

Binary file not shown.

4
app/src/main/AndroidManifest.xml
View File

@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="uk.org.openseizuredetector" package="uk.org.openseizuredetector"
android:versionCode="28" android:versionCode="29"
android:versionName="2.0.7"> android:versionName="2.0.8">
<uses-sdk android:minSdkVersion="14" /> <uses-sdk android:minSdkVersion="14" />

30
app/src/main/java/uk/org/openseizuredetector/SdDataSourcePebble.java
View File

@@ -412,17 +412,25 @@ public class SdDataSourcePebble extends SdDataSource {
if (data.getUnsignedIntegerAsLong(KEY_DATA_TYPE) if (data.getUnsignedIntegerAsLong(KEY_DATA_TYPE)
== DATA_TYPE_SETTINGS) { == DATA_TYPE_SETTINGS) {
Log.v(TAG, "DATA_TYPE = Settings"); Log.v(TAG, "DATA_TYPE = Settings");
mSdData.analysisPeriod = data.getUnsignedIntegerAsLong(KEY_SAMPLE_PERIOD); try {
mSdData.alarmFreqMin = data.getUnsignedIntegerAsLong(KEY_ALARM_FREQ_MIN); mSdData.analysisPeriod = data.getUnsignedIntegerAsLong(KEY_SAMPLE_PERIOD);
mSdData.alarmFreqMax = data.getUnsignedIntegerAsLong(KEY_ALARM_FREQ_MAX); mSdData.alarmFreqMin = data.getUnsignedIntegerAsLong(KEY_ALARM_FREQ_MIN);
mSdData.nMin = data.getUnsignedIntegerAsLong(KEY_NMIN); mSdData.alarmFreqMax = data.getUnsignedIntegerAsLong(KEY_ALARM_FREQ_MAX);
mSdData.nMax = data.getUnsignedIntegerAsLong(KEY_NMAX); mSdData.nMin = data.getUnsignedIntegerAsLong(KEY_NMIN);
mSdData.warnTime = data.getUnsignedIntegerAsLong(KEY_WARN_TIME); mSdData.nMax = data.getUnsignedIntegerAsLong(KEY_NMAX);
mSdData.alarmTime = data.getUnsignedIntegerAsLong(KEY_ALARM_TIME); mSdData.warnTime = data.getUnsignedIntegerAsLong(KEY_WARN_TIME);
mSdData.alarmThresh = data.getUnsignedIntegerAsLong(KEY_ALARM_THRESH); mSdData.alarmTime = data.getUnsignedIntegerAsLong(KEY_ALARM_TIME);
mSdData.alarmRatioThresh = data.getUnsignedIntegerAsLong(KEY_ALARM_RATIO_THRESH); mSdData.alarmThresh = data.getUnsignedIntegerAsLong(KEY_ALARM_THRESH);
mSdData.batteryPc = data.getUnsignedIntegerAsLong(KEY_BATTERY_PC); mSdData.alarmRatioThresh = data.getUnsignedIntegerAsLong(KEY_ALARM_RATIO_THRESH);
mSdData.haveSettings = true; mSdData.batteryPc = data.getUnsignedIntegerAsLong(KEY_BATTERY_PC);
mSdData.haveSettings = true;
} catch (Exception ex) {
mUtil.showToast("*** Error interpreting settings sent from watch - Please check you have "
+ "the latest version of the watch app installed by using the OpenSeizureDetector "
+ "menu to install the Watch App");
mUtil.writeToSysLogFile("Error interpreting settings received from watch - wrong version "
+ "of watch app installed?");
}
} }
if (data.getUnsignedIntegerAsLong(KEY_DATA_TYPE) if (data.getUnsignedIntegerAsLong(KEY_DATA_TYPE)
== DATA_TYPE_RAW) { == DATA_TYPE_RAW) {