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

Removed fall detection from main screen algorithms display. Fixes #94

Browse Source
This commit is contained in:
Graham Jones
2023-06-10 20:17:48 +01:00
parent d11b0c2beb
commit bfe02682e8
4 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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="119" android:versionCode="120"
android:versionName="4.1.5"> android:versionName="4.1.6">
<!-- 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" />

7
app/src/main/java/uk/org/openseizuredetector/MainActivity.java
View File

@@ -530,6 +530,10 @@ public class MainActivity extends AppCompatActivity {
tv.setBackgroundColor(okColour); tv.setBackgroundColor(okColour);
tv.setTextColor(okTextColour); tv.setTextColor(okTextColour);
} }
tv = (TextView) findViewById(R.id.algsTv);
tv.setText("Algorithms");
tv.setBackgroundColor(okColour);
tv.setTextColor(okTextColour);
tv = (TextView) findViewById(R.id.osdAlgTv); tv = (TextView) findViewById(R.id.osdAlgTv);
tv.setText("OSD "); tv.setText("OSD ");
if (mConnection.mSdServer.mSdData.mOsdAlarmActive) { if (mConnection.mSdServer.mSdData.mOsdAlarmActive) {
@@ -574,7 +578,7 @@ public class MainActivity extends AppCompatActivity {
tv.setTextColor(okTextColour); tv.setTextColor(okTextColour);
tv.setPaintFlags(tv.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG); tv.setPaintFlags(tv.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG);
} }
tv = (TextView) findViewById(R.id.fallAlgTv); /* tv = (TextView) findViewById(R.id.fallAlgTv);
tv.setText("Fall "); tv.setText("Fall ");
if (mConnection.mSdServer.mSdData.mFallActive) { if (mConnection.mSdServer.mSdData.mFallActive) {
tv.setBackgroundColor(okColour); tv.setBackgroundColor(okColour);
@@ -585,6 +589,7 @@ public class MainActivity extends AppCompatActivity {
tv.setTextColor(okTextColour); tv.setTextColor(okTextColour);
tv.setPaintFlags(tv.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG); tv.setPaintFlags(tv.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG);
} }
*/
} }
tv = (TextView) findViewById(R.id.serverIpTv); tv = (TextView) findViewById(R.id.serverIpTv);
tv.setText(getString(R.string.AccessServerAt) + " http://" tv.setText(getString(R.string.AccessServerAt) + " http://"

11
app/src/main/res/layout/main.xml
View File

@@ -33,6 +33,11 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="10dp" android:padding="10dp"
android:orientation="vertical"> android:orientation="vertical">
<TextView
android:id="@+id/algsTv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Algorithms" />
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
@@ -69,11 +74,13 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="---" /> android:text="---" />
<TextView <!--<TextView
android:id="@+id/fallAlgTv" android:id="@+id/fallAlgTv"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="---" /> android:text=""
android:visibility="gone"/>
-->
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

8
app/src/main/res/values/strings.xml
View File

@@ -3,10 +3,10 @@
<string name="app_name">OpenSeizureDetector</string> <string name="app_name">OpenSeizureDetector</string>
<string name="changelog"> <string name="changelog">
"\n "\n
\nV4.1.5 - Added progress notification to data export, added header to exported .csv file, fixed another notification bug. \nV4.1.x - Added Machine Learning (Artificial Intelligence) Detection Algorithm Option (CNN V0.24).
\nV4.1.4 - Fixed bug in notifications on Android 12, added an Export Data function to save heart rate and accelerometer data to a file. Added Polish Translations by Jacek Błoniarz-Łuczak.
\nV4.1.3 - Fixed display of O2 Saturation in Network Data Source, and added Polish Translations by Jacek Błoniarz-Łuczak. Fixed crash when displaying main activity during alarm on some devices. Added adaptive Heart Rate alarms Added an Export Data function to save data to a file.
\nV4.1.2 - Added Machine Learning (Artificial Intelligence) Detection Algorithm Option (CNN V0.24) and 'Normal Daily Activity (NDA) logging function Added adaptive heart rate alarms.
"</string> "</string>
<string name="UpgradeMsg"> <string name="UpgradeMsg">
Please enable the new &lt;b>Data Sharing&lt;/b> feature to help improve OpenSeizureDetector!&lt;br/> Please enable the new &lt;b>Data Sharing&lt;/b> feature to help improve OpenSeizureDetector!&lt;br/>