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

Minor Update to V4.1.x to fix silent crash issue #135 in production version

Browse Source
This commit is contained in:
Graham Jones
2024-01-28 08:29:27 +00:00
parent 0d74ddfb5d
commit 09f33ee16f
4 changed files with 96 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
app/release/app-release-4.1.10.apk
View File

Binary file not shown.

BIN
app/release/app-release-4.1.12.apk
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"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:versionCode="127" android:versionCode="131"
android:versionName="4.1.12"> android:versionName="4.1.13">
<!-- android:allowBackup="false" --> <!-- android:allowBackup="false" -->
<uses-permission android:name="android.permission.BLUETOOTH" /> <uses-permission android:name="android.permission.BLUETOOTH" />
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" /> <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />

168
app/src/main/java/uk/org/openseizuredetector/SdDataSource.java
View File

@@ -757,98 +757,118 @@ public abstract class SdDataSource {
* and sets class variables for use by other functions. * and sets class variables for use by other functions.
*/ */
public void getStatus() { public void getStatus() {
Time tnow = new Time(Time.getCurrentTimezone()); try {
long tdiff; Time tnow = new Time(Time.getCurrentTimezone());
tnow.setToNow(); long tdiff;
// get time since the last data was received from the Pebble watch. tnow.setToNow();
tdiff = (tnow.toMillis(false) - mDataStatusTime.toMillis(false)); // get time since the last data was received from the Pebble watch.
Log.v(TAG, "getStatus() - mWatchAppRunningCheck=" + mWatchAppRunningCheck + " tdiff=" + tdiff); tdiff = (tnow.toMillis(false) - mDataStatusTime.toMillis(false));
Log.v(TAG, "getStatus() - tdiff=" + tdiff + ", mDataUpatePeriod=" + mDataUpdatePeriod + ", mAppRestartTimeout=" + mAppRestartTimeout); Log.v(TAG, "getStatus() - mWatchAppRunningCheck=" + mWatchAppRunningCheck + " tdiff=" + tdiff);
Log.v(TAG, "getStatus() - tdiff=" + tdiff + ", mDataUpatePeriod=" + mDataUpdatePeriod + ", mAppRestartTimeout=" + mAppRestartTimeout);
mSdData.watchConnected = true; // We can't check connection for passive network connection, so set it to true to avoid errors. mSdData.watchConnected = true; // We can't check connection for passive network connection, so set it to true to avoid errors.
// And is the watch app running? // And is the watch app running?
// set mWatchAppRunningCheck has been false for more than 10 seconds // set mWatchAppRunningCheck has been false for more than 10 seconds
// the app is not talking to us // the app is not talking to us
// mWatchAppRunningCheck is set to true in the receiveData handler. // mWatchAppRunningCheck is set to true in the receiveData handler.
if (!mWatchAppRunningCheck && if (!mWatchAppRunningCheck &&
(tdiff > (mDataUpdatePeriod + mAppRestartTimeout) * 1000)) { (tdiff > (mDataUpdatePeriod + mAppRestartTimeout) * 1000)) {
Log.v(TAG, "getStatus() - tdiff = " + tdiff); Log.v(TAG, "getStatus() - tdiff = " + tdiff);
mSdData.watchAppRunning = false; mSdData.watchAppRunning = false;
// Only make audible warning beep if we have not received data for more than mFaultTimerPeriod seconds. // Only make audible warning beep if we have not received data for more than mFaultTimerPeriod seconds.
if (tdiff > (mDataUpdatePeriod + mFaultTimerPeriod) * 1000) { if (tdiff > (mDataUpdatePeriod + mFaultTimerPeriod) * 1000) {
Log.v(TAG, "getStatus() - Watch App Not Running"); Log.v(TAG, "getStatus() - Watch App Not Running");
mUtil.writeToSysLogFile("SDDataSource.getStatus() - Watch App not Running"); mUtil.writeToSysLogFile("SDDataSource.getStatus() - Watch App not Running");
//mDataStatusTime.setToNow(); //mDataStatusTime.setToNow();
mSdData.roiPower = -1; mSdData.roiPower = -1;
mSdData.specPower = -1; mSdData.specPower = -1;
mSdDataReceiver.onSdDataFault(mSdData); mSdDataReceiver.onSdDataFault(mSdData);
} else {
Log.v(TAG, "getStatus() - Waiting for mFaultTimerPeriod before issuing audible warning...");
}
} else {
mSdData.watchAppRunning = true;
// Check we have seen a fidget within the required period, or else assume a fault because watch is not being worn
if (mFidgetDetectorEnabled) {
if (mLastFidget == null) mLastFidget = tnow; // Initialise last fidget time on startup.
double accStd = calcRawDataStd(mSdData);
if (accStd > mFidgetThreshold) {
mLastFidget = tnow;
} else { } else {
Log.d(TAG,"onStatus() - Fidget Detector - low movement - is watch being worn?"); Log.v(TAG, "getStatus() - Waiting for mFaultTimerPeriod before issuing audible warning...");
tdiff = (tnow.toMillis(false) - mLastFidget.toMillis(false)); }
if (tdiff > (mFidgetPeriod) * 60 * 1000) { } else {
Log.e(TAG, "onStatus() - Fidget Not Detected - is watch being worn?"); mSdData.watchAppRunning = true;
mSdDataReceiver.onSdDataFault(mSdData);
// Check we have seen a fidget within the required period, or else assume a fault because watch is not being worn
if (mFidgetDetectorEnabled) {
if (mLastFidget == null)
mLastFidget = tnow; // Initialise last fidget time on startup.
double accStd = calcRawDataStd(mSdData);
if (accStd > mFidgetThreshold) {
mLastFidget = tnow;
} else {
Log.d(TAG, "onStatus() - Fidget Detector - low movement - is watch being worn?");
tdiff = (tnow.toMillis(false) - mLastFidget.toMillis(false));
if (tdiff > (mFidgetPeriod) * 60 * 1000) {
Log.e(TAG, "onStatus() - Fidget Not Detected - is watch being worn?");
mSdDataReceiver.onSdDataFault(mSdData);
}
} }
} }
} }
// if we have confirmation that the app is running, reset the
// status time to now and initiate another check.
if (mWatchAppRunningCheck) {
mWatchAppRunningCheck = false;
mDataStatusTime.setToNow();
}
if (!mSdData.haveSettings) {
Log.v(TAG, "getStatus() - no settings received yet");
}
} catch(Exception e) {
Log.e(TAG,"getStatus - Exception: "+e.toString());
Log.e(TAG,e.getMessage());
mSdData.watchAppRunning = false;
mSdData.roiPower = -1;
mSdData.specPower = -1;
mSdDataReceiver.onSdDataFault(mSdData);
} }
// if we have confirmation that the app is running, reset the
// status time to now and initiate another check.
if (mWatchAppRunningCheck) {
mWatchAppRunningCheck = false;
mDataStatusTime.setToNow();
}
if (!mSdData.haveSettings) {
Log.v(TAG, "getStatus() - no settings received yet");
}
} }
/** /**
* faultCheck - determines alarm state based on seizure detector data SdData. Called every second. * faultCheck - determines alarm state based on seizure detector data SdData. Called every second.
*/ */
private void faultCheck() { private void faultCheck() {
Time tnow = new Time(Time.getCurrentTimezone()); try {
long tdiff; Time tnow = new Time(Time.getCurrentTimezone());
tnow.setToNow(); long tdiff;
tnow.setToNow();
// get time since the last data was received from the watch. // get time since the last data was received from the watch.
tdiff = (tnow.toMillis(false) - mDataStatusTime.toMillis(false)); tdiff = (tnow.toMillis(false) - mDataStatusTime.toMillis(false));
//Log.v(TAG, "faultCheck() - tdiff=" + tdiff + ", mDataUpatePeriod=" + mDataUpdatePeriod + ", mAppRestartTimeout=" + mAppRestartTimeout //Log.v(TAG, "faultCheck() - tdiff=" + tdiff + ", mDataUpatePeriod=" + mDataUpdatePeriod + ", mAppRestartTimeout=" + mAppRestartTimeout
// + ", combined = " + (mDataUpdatePeriod + mAppRestartTimeout) * 1000); // + ", combined = " + (mDataUpdatePeriod + mAppRestartTimeout) * 1000);
if (!mWatchAppRunningCheck && if (!mWatchAppRunningCheck &&
(tdiff > (mDataUpdatePeriod + mAppRestartTimeout) * 1000)) { (tdiff > (mDataUpdatePeriod + mAppRestartTimeout) * 1000)) {
//Log.v(TAG, "faultCheck() - watch app not running so not doing anything"); //Log.v(TAG, "faultCheck() - watch app not running so not doing anything");
mAlarmCount = 0; mAlarmCount = 0;
} }
if (mSdData.mHRAlarmActive && mHrFrozenAlarm) { if (mSdData.mHRAlarmActive && mHrFrozenAlarm) {
if (mSdData.mHR != mLastHrValue) { if (mSdData.mHR != mLastHrValue) {
mLastHrValue = mSdData.mHR; mLastHrValue = mSdData.mHR;
mHrStatusTime = tnow; mHrStatusTime = tnow;
mSdData.mHrFrozenFaultStanding = false;
} else {
tdiff = (tnow.toMillis(false) - mHrStatusTime.toMillis(false));
if (tdiff > mHrFrozenPeriod *1000.) {
mSdData.mHrFrozenFaultStanding = true;
} else {
mSdData.mHrFrozenFaultStanding = false; mSdData.mHrFrozenFaultStanding = false;
} else {
tdiff = (tnow.toMillis(false) - mHrStatusTime.toMillis(false));
if (tdiff > mHrFrozenPeriod * 1000.) {
mSdData.mHrFrozenFaultStanding = true;
} else {
mSdData.mHrFrozenFaultStanding = false;
}
} }
} }
} catch(Exception e) {
Log.e(TAG,"faultCheck - Exception: "+e.toString());
Log.e(TAG,e.getMessage());
mSdData.watchAppRunning = false;
mSdData.roiPower = -1;
mSdData.specPower = -1;
mSdDataReceiver.onSdDataFault(mSdData);
} }
} }