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

Modified network datasource to distinguish between network faults and faults on the main device connected to the Pebble

Browse Source
This commit is contained in:
Graham Jones
2016-03-30 21:20:56 +01:00
parent dc311ae079
commit 02d22359b3
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -347,6 +347,11 @@ public class MainActivity extends Activity {
tv.setBackgroundColor(warnColour); tv.setBackgroundColor(warnColour);
tv.setTextColor(warnTextColour); tv.setTextColor(warnTextColour);
} }
if (mConnection.mSdServer.mSdData.alarmState == 7) {
tv.setText("NET FAULT");
tv.setBackgroundColor(warnColour);
tv.setTextColor(warnTextColour);
}
if (mConnection.mSdServer.mSdData.alarmStanding) { if (mConnection.mSdServer.mSdData.alarmStanding) {
tv.setText("**ALARM**"); tv.setText("**ALARM**");
tv.setBackgroundColor(alarmColour); tv.setBackgroundColor(alarmColour);

6
app/src/main/java/uk/org/openseizuredetector/SdDataSourceNetwork.java
View File

@@ -29,6 +29,8 @@ public class SdDataSourceNetwork extends SdDataSource {
private int mDataUpdatePeriod = 2000; private int mDataUpdatePeriod = 2000;
private String mServerIP = "unknown"; private String mServerIP = "unknown";
private int ALARM_STATE_NETFAULT = 7;
public SdDataSourceNetwork(Context context, SdDataReceiver sdDataReceiver) { public SdDataSourceNetwork(Context context, SdDataReceiver sdDataReceiver) {
super(context,sdDataReceiver); super(context,sdDataReceiver);
@@ -116,7 +118,7 @@ public class SdDataSourceNetwork extends SdDataSource {
sdData.serverOK = false; sdData.serverOK = false;
sdData.pebbleConnected = false; sdData.pebbleConnected = false;
sdData.pebbleAppRunning = false; sdData.pebbleAppRunning = false;
sdData.alarmState = 4; sdData.alarmState = ALARM_STATE_NETFAULT;
sdData.alarmPhrase = "Warning - No Connection to Server"; sdData.alarmPhrase = "Warning - No Connection to Server";
Log.v(TAG,"doInBackground(): No Connection to Server - sdData = "+sdData.toString()); Log.v(TAG,"doInBackground(): No Connection to Server - sdData = "+sdData.toString());
} else { } else {
@@ -135,7 +137,7 @@ public class SdDataSourceNetwork extends SdDataSource {
sdData.serverOK = false; sdData.serverOK = false;
sdData.pebbleConnected = false; sdData.pebbleConnected = false;
sdData.pebbleAppRunning = false; sdData.pebbleAppRunning = false;
sdData.alarmState = 4; sdData.alarmState = ALARM_STATE_NETFAULT;
sdData.alarmPhrase = "Warning - No Connection to Server"; sdData.alarmPhrase = "Warning - No Connection to Server";
Log.v(TAG,"doInBackground(): IOException - "+e.toString()); Log.v(TAG,"doInBackground(): IOException - "+e.toString());
return sdData; return sdData;