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

V2.0.3 - fixed issue with crash during app re-start if warning beep sounding. And added logging of faults to alarm log on sd card.

Browse Source
This commit is contained in:
Graham Jones
2016-04-23 19:20:06 +01:00
parent 5cc6c83048
commit 51c277f691
5 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
app/app-release-2.0.3.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"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="uk.org.openseizuredetector"
android:versionCode="22"
android:versionName="2.0.2" >
android:versionCode="24"
android:versionName="2.0.3" >
<uses-sdk android:minSdkVersion="14" />

11
app/src/main/java/uk/org/openseizuredetector/SdServer.java
View File

@@ -292,6 +292,7 @@ public class SdServer extends Service implements SdDataReceiver {
}
mToneGenerator.release();
mToneGenerator = null;
}
@@ -451,6 +452,7 @@ public class SdServer extends Service implements SdDataReceiver {
// Fault
if ((sdData.alarmState) == 4 || (sdData.alarmState == 7)) {
sdData.alarmPhrase = "FAULT";
writeAlarmToSD();
faultWarningBeep();
} else {
stopFaultTimer();
@@ -477,8 +479,13 @@ public class SdServer extends Service implements SdDataReceiver {
* beep for duration milliseconds, but only if mAudibleAlarm is set.
*/
private void beep(int duration) {
mToneGenerator.startTone(ToneGenerator.TONE_CDMA_ALERT_CALL_GUARD, duration);
Log.v(TAG, "beep()");
if (mToneGenerator!=null) {
mToneGenerator.startTone(ToneGenerator.TONE_CDMA_ALERT_CALL_GUARD, duration);
Log.v(TAG, "beep()");
} else {
mUtil.showToast("Warming mToneGenerator is null - not beeping!!!");
Log.v(TAG, "beep() - Warming mToneGenerator is null - not beeping!!!");
}
}
/*