V4.1.10 built for Android Play Store
This commit is contained in:
Binary file not shown.
@@ -2,7 +2,7 @@
|
|||||||
<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="124"
|
android:versionCode="124"
|
||||||
android:versionName="4.1.10a">
|
android:versionName="4.1.10">
|
||||||
<!-- 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" />
|
||||||
|
|||||||
@@ -651,16 +651,16 @@ public class MainActivity extends AppCompatActivity {
|
|||||||
tv = (TextView) findViewById(R.id.pebbleTv);
|
tv = (TextView) findViewById(R.id.pebbleTv);
|
||||||
//if (mConnection.mSdServer.mSdData.mHRAlarmActive) {
|
//if (mConnection.mSdServer.mSdData.mHRAlarmActive) {
|
||||||
if (mConnection.mSdServer.mSdData.mO2Sat > 0) {
|
if (mConnection.mSdServer.mSdData.mO2Sat > 0) {
|
||||||
tv.setText(getString(R.string.HR_Equals) + Math.round(mConnection.mSdServer.mSdData.mHR) + " bpm\n"
|
tv.setText(getString(R.string.HR_Equals) + " " + Math.round(mConnection.mSdServer.mSdData.mHR) + " bpm\n"
|
||||||
+"(av="
|
+"(av = "
|
||||||
+Math.round(mConnection.mSdServer.mSdData.mAdaptiveHrAverage)+","
|
+Math.round(mConnection.mSdServer.mSdData.mAdaptiveHrAverage)+", "
|
||||||
+Math.round(mConnection.mSdServer.mSdData.mAverageHrAverage)+") bpm\n"
|
+Math.round(mConnection.mSdServer.mSdData.mAverageHrAverage)+" bpm)\n"
|
||||||
+ getString(R.string.SpO2)+" = " + Math.round(mConnection.mSdServer.mSdData.mO2Sat) + "%");
|
+ getString(R.string.SpO2)+" = " + Math.round(mConnection.mSdServer.mSdData.mO2Sat) + "%");
|
||||||
} else {
|
} else {
|
||||||
tv.setText(getString(R.string.HR_Equals) + Math.round(mConnection.mSdServer.mSdData.mHR) + " bpm\n"
|
tv.setText(getString(R.string.HR_Equals) + " " + Math.round(mConnection.mSdServer.mSdData.mHR) + " bpm\n"
|
||||||
+"(av="
|
+"(av = "
|
||||||
+Math.round(mConnection.mSdServer.mSdData.mAdaptiveHrAverage)+","
|
+Math.round(mConnection.mSdServer.mSdData.mAdaptiveHrAverage)+", "
|
||||||
+Math.round(mConnection.mSdServer.mSdData.mAverageHrAverage)+") bpm\n"
|
+Math.round(mConnection.mSdServer.mSdData.mAverageHrAverage)+" bpm)\n"
|
||||||
+ getString(R.string.SpO2)+" = ---%");
|
+ getString(R.string.SpO2)+" = ---%");
|
||||||
}
|
}
|
||||||
if (mConnection.mSdServer.mSdData.mHRAlarmStanding
|
if (mConnection.mSdServer.mSdData.mHRAlarmStanding
|
||||||
|
|||||||
Reference in New Issue
Block a user