From 02d22359b3f94c1ca125ec1210476c55dfd9b6b0 Mon Sep 17 00:00:00 2001 From: Graham Jones Date: Wed, 30 Mar 2016 21:20:56 +0100 Subject: [PATCH] Modified network datasource to distinguish between network faults and faults on the main device connected to the Pebble --- .../main/java/uk/org/openseizuredetector/MainActivity.java | 5 +++++ .../uk/org/openseizuredetector/SdDataSourceNetwork.java | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/uk/org/openseizuredetector/MainActivity.java b/app/src/main/java/uk/org/openseizuredetector/MainActivity.java index 162ce7b..7a8cc45 100644 --- a/app/src/main/java/uk/org/openseizuredetector/MainActivity.java +++ b/app/src/main/java/uk/org/openseizuredetector/MainActivity.java @@ -347,6 +347,11 @@ public class MainActivity extends Activity { tv.setBackgroundColor(warnColour); tv.setTextColor(warnTextColour); } + if (mConnection.mSdServer.mSdData.alarmState == 7) { + tv.setText("NET FAULT"); + tv.setBackgroundColor(warnColour); + tv.setTextColor(warnTextColour); + } if (mConnection.mSdServer.mSdData.alarmStanding) { tv.setText("**ALARM**"); tv.setBackgroundColor(alarmColour); diff --git a/app/src/main/java/uk/org/openseizuredetector/SdDataSourceNetwork.java b/app/src/main/java/uk/org/openseizuredetector/SdDataSourceNetwork.java index 22317d6..bb124d6 100644 --- a/app/src/main/java/uk/org/openseizuredetector/SdDataSourceNetwork.java +++ b/app/src/main/java/uk/org/openseizuredetector/SdDataSourceNetwork.java @@ -29,6 +29,8 @@ public class SdDataSourceNetwork extends SdDataSource { private int mDataUpdatePeriod = 2000; private String mServerIP = "unknown"; + private int ALARM_STATE_NETFAULT = 7; + public SdDataSourceNetwork(Context context, SdDataReceiver sdDataReceiver) { super(context,sdDataReceiver); @@ -116,7 +118,7 @@ public class SdDataSourceNetwork extends SdDataSource { sdData.serverOK = false; sdData.pebbleConnected = false; sdData.pebbleAppRunning = false; - sdData.alarmState = 4; + sdData.alarmState = ALARM_STATE_NETFAULT; sdData.alarmPhrase = "Warning - No Connection to Server"; Log.v(TAG,"doInBackground(): No Connection to Server - sdData = "+sdData.toString()); } else { @@ -135,7 +137,7 @@ public class SdDataSourceNetwork extends SdDataSource { sdData.serverOK = false; sdData.pebbleConnected = false; sdData.pebbleAppRunning = false; - sdData.alarmState = 4; + sdData.alarmState = ALARM_STATE_NETFAULT; sdData.alarmPhrase = "Warning - No Connection to Server"; Log.v(TAG,"doInBackground(): IOException - "+e.toString()); return sdData;