diff --git a/app/release/app-release-4.1.10a.apk b/app/release/app-release-4.1.10.apk similarity index 89% rename from app/release/app-release-4.1.10a.apk rename to app/release/app-release-4.1.10.apk index 67e2574..90b6420 100644 Binary files a/app/release/app-release-4.1.10a.apk and b/app/release/app-release-4.1.10.apk differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index a157c57..c11cd9e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -2,7 +2,7 @@ + android:versionName="4.1.10"> diff --git a/app/src/main/java/uk/org/openseizuredetector/MainActivity.java b/app/src/main/java/uk/org/openseizuredetector/MainActivity.java index 71cf9a7..9ec8093 100644 --- a/app/src/main/java/uk/org/openseizuredetector/MainActivity.java +++ b/app/src/main/java/uk/org/openseizuredetector/MainActivity.java @@ -651,16 +651,16 @@ public class MainActivity extends AppCompatActivity { tv = (TextView) findViewById(R.id.pebbleTv); //if (mConnection.mSdServer.mSdData.mHRAlarmActive) { if (mConnection.mSdServer.mSdData.mO2Sat > 0) { - tv.setText(getString(R.string.HR_Equals) + Math.round(mConnection.mSdServer.mSdData.mHR) + " bpm\n" - +"(av=" - +Math.round(mConnection.mSdServer.mSdData.mAdaptiveHrAverage)+"," - +Math.round(mConnection.mSdServer.mSdData.mAverageHrAverage)+") bpm\n" + tv.setText(getString(R.string.HR_Equals) + " " + Math.round(mConnection.mSdServer.mSdData.mHR) + " bpm\n" + +"(av = " + +Math.round(mConnection.mSdServer.mSdData.mAdaptiveHrAverage)+", " + +Math.round(mConnection.mSdServer.mSdData.mAverageHrAverage)+" bpm)\n" + getString(R.string.SpO2)+" = " + Math.round(mConnection.mSdServer.mSdData.mO2Sat) + "%"); } else { - tv.setText(getString(R.string.HR_Equals) + Math.round(mConnection.mSdServer.mSdData.mHR) + " bpm\n" - +"(av=" - +Math.round(mConnection.mSdServer.mSdData.mAdaptiveHrAverage)+"," - +Math.round(mConnection.mSdServer.mSdData.mAverageHrAverage)+") bpm\n" + tv.setText(getString(R.string.HR_Equals) + " " + Math.round(mConnection.mSdServer.mSdData.mHR) + " bpm\n" + +"(av = " + +Math.round(mConnection.mSdServer.mSdData.mAdaptiveHrAverage)+", " + +Math.round(mConnection.mSdServer.mSdData.mAverageHrAverage)+" bpm)\n" + getString(R.string.SpO2)+" = ---%"); } if (mConnection.mSdServer.mSdData.mHRAlarmStanding