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

Added notification of NDA logging to main app screen.

Browse Source
This commit is contained in:
Graham Jones
2022-10-24 22:33:48 +01:00
parent 86a7ba83bb
commit cc58c0995a
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -503,16 +503,23 @@ public class MainActivity extends AppCompatActivity {
TextView tv; TextView tv;
if (mUtil.isServerRunning()) { if (mUtil.isServerRunning()) {
tv = (TextView) findViewById(R.id.serverStatusTv); tv = (TextView) findViewById(R.id.serverStatusTv);
if (mConnection.mBound) if (mConnection.mBound) {
if (mConnection.mSdServer.mSdDataSourceName.equals("Phone")) { if (mConnection.mSdServer.mSdDataSourceName.equals("Phone")) {
if (mConnection.mSdServer.mLogNDA)
tv.setText(getString(R.string.ServerRunningOK) + getString(R.string.DataSource) + " = " + "Phone" + "\n" + "(Demo Mode)"+"\nNDA Logging");
else
tv.setText(getString(R.string.ServerRunningOK) + getString(R.string.DataSource) + " = " + "Phone" + "\n" + "(Demo Mode)"); tv.setText(getString(R.string.ServerRunningOK) + getString(R.string.DataSource) + " = " + "Phone" + "\n" + "(Demo Mode)");
tv.setBackgroundColor(warnColour); tv.setBackgroundColor(warnColour);
tv.setTextColor(warnTextColour); tv.setTextColor(warnTextColour);
} else { } else {
if (mConnection.mSdServer.mLogNDA)
tv.setText(getString(R.string.ServerRunningOK) + getString(R.string.DataSource) + " = " + mConnection.mSdServer.mSdDataSourceName+"\nNDA Logging");
else
tv.setText(getString(R.string.ServerRunningOK) + getString(R.string.DataSource) + " = " + mConnection.mSdServer.mSdDataSourceName); tv.setText(getString(R.string.ServerRunningOK) + getString(R.string.DataSource) + " = " + mConnection.mSdServer.mSdDataSourceName);
tv.setBackgroundColor(okColour); tv.setBackgroundColor(okColour);
tv.setTextColor(okTextColour); tv.setTextColor(okTextColour);
} }
}
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://"
+ mUtil.getLocalIpAddress() + mUtil.getLocalIpAddress()

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

@@ -564,7 +564,6 @@ public class SdServer extends Service implements SdDataReceiver {
SdData sdData = mSdData; SdData sdData = mSdData;
sdData.alarmState = 5; sdData.alarmState = 5;
onSdDataReceived(sdData); onSdDataReceived(sdData);
mLm.updateSdData(sdData); // Make sure the data time is up to date in the log manager - only relevant for NDA logging.
} }
/** /**
@@ -769,6 +768,7 @@ public class SdServer extends Service implements SdDataReceiver {
if (webServer != null) webServer.setSdData(mSdData); if (webServer != null) webServer.setSdData(mSdData);
Log.v(TAG, "onSdDataReceived() - setting mSdData to " + mSdData.toString()); Log.v(TAG, "onSdDataReceived() - setting mSdData to " + mSdData.toString());
mLm.updateSdData(mSdData);
logData(); logData();
} }

2
app/src/main/res/xml/logging_prefs.xml
View File

@@ -11,7 +11,7 @@
android:summary="@string/log_data_summary" android:summary="@string/log_data_summary"
android:title="@string/log_data_title" /> --> android:title="@string/log_data_title" /> -->
<EditTextPreference <EditTextPreference
android:defaultValue="150" android:defaultValue="180"
android:key="EventDurationSec" android:key="EventDurationSec"
android:summary="@string/eventDurationSummary" android:summary="@string/eventDurationSummary"
android:title="@string/eventDurationTitle" /> android:title="@string/eventDurationTitle" />