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

Sorted issue with startupActivity showing data recieved when it had not been, and disabled (non-functioning) ip camera settings.

Browse Source
This commit is contained in:
Graham Jones
2016-03-30 20:15:20 +01:00
parent 06f6f8262c
commit 8944cbc6d3
6 changed files with 99 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

174
app/src/main/java/uk/org/openseizuredetector/SdData.java
View File

@@ -28,9 +28,11 @@ import android.os.Parcelable;
import android.os.Parcel;
import android.text.format.Time;
import android.util.Log;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Locale;
import org.json.JSONObject;
import org.json.JSONArray;
@@ -40,6 +42,7 @@ public class SdData implements Parcelable {
private final static String TAG = "SdData";
/* Analysis settings */
public boolean haveSettings = false; // flag to say if we have received settings or not.
public boolean haveData = false; // flag to say we have received data.
public long alarmFreqMin;
public long alarmFreqMax;
public long nMin;
@@ -51,9 +54,9 @@ public class SdData implements Parcelable {
public long batteryPc;
/* Analysis results */
public Time dataTime;
public Time dataTime = null;
public long alarmState;
public boolean alarmStanding = false;
public boolean alarmStanding = false;
public boolean fallAlarmStanding = false;
public long maxVal;
public long maxFreq;
@@ -66,117 +69,118 @@ public class SdData implements Parcelable {
public boolean serverOK = false;
public SdData() {
simpleSpec = new int[10];
dataTime = new Time(Time.getCurrentTimezone());
simpleSpec = new int[10];
dataTime = new Time(Time.getCurrentTimezone());
}
/*
* Intialise this SdData object from a JSON String
*/
public boolean fromJSON(String jsonStr) {
Log.v(TAG,"fromJSON() - parsing jsonString - "+jsonStr);
try {
JSONObject jo = new JSONObject(jsonStr);
Log.v(TAG,"fromJSON(): jo = "+jo.toString());
Log.v(TAG,"fromJSON(): dataTimeStr="+jo.optString("dataTimeStr"));
//Calendar cal = Calendar.getInstance();
//SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddTHHmmss", Locale.UK);
//cal.setTime(sdf.parse(jo.optString("dataTimeStr")));
//dataTime = cal.getTime();
// FIXME - this doesn't work!!!
dataTime.setToNow();
Log.v(TAG, "fromJSON(): dataTime = " + dataTime.toString());
maxVal = jo.optInt("maxVal");
maxFreq = jo.optInt("maxFreq");
specPower = jo.optInt("specPower");
roiPower = jo.optInt("roiPower");
batteryPc = jo.optInt("batteryPc");
pebbleConnected = jo.optBoolean("pebbleConnected");
pebbleAppRunning = jo.optBoolean("pebbleAppRunning");
alarmState = jo.optInt("alarmState");
alarmPhrase = jo.optString("alarmPhrase");
alarmThresh = jo.optInt("alarmThresh");
alarmRatioThresh = jo.optInt("alarmRatioThresh");
JSONArray specArr = jo.optJSONArray("simpleSpec");
for (int i=0;i<specArr.length();i++) {
simpleSpec[i] = specArr.optInt(i);
}
return true;
} catch (Exception e) {
Log.v(TAG,"fromJSON() - error parsing result");
return false;
}
Log.v(TAG, "fromJSON() - parsing jsonString - " + jsonStr);
try {
JSONObject jo = new JSONObject(jsonStr);
Log.v(TAG, "fromJSON(): jo = " + jo.toString());
Log.v(TAG, "fromJSON(): dataTimeStr=" + jo.optString("dataTimeStr"));
//Calendar cal = Calendar.getInstance();
//SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddTHHmmss", Locale.UK);
//cal.setTime(sdf.parse(jo.optString("dataTimeStr")));
//dataTime = cal.getTime();
// FIXME - this doesn't work!!!
dataTime.setToNow();
Log.v(TAG, "fromJSON(): dataTime = " + dataTime.toString());
maxVal = jo.optInt("maxVal");
maxFreq = jo.optInt("maxFreq");
specPower = jo.optInt("specPower");
roiPower = jo.optInt("roiPower");
batteryPc = jo.optInt("batteryPc");
pebbleConnected = jo.optBoolean("pebbleConnected");
pebbleAppRunning = jo.optBoolean("pebbleAppRunning");
alarmState = jo.optInt("alarmState");
alarmPhrase = jo.optString("alarmPhrase");
alarmThresh = jo.optInt("alarmThresh");
alarmRatioThresh = jo.optInt("alarmRatioThresh");
JSONArray specArr = jo.optJSONArray("simpleSpec");
for (int i = 0; i < specArr.length(); i++) {
simpleSpec[i] = specArr.optInt(i);
}
haveData = true;
return true;
} catch (Exception e) {
Log.v(TAG, "fromJSON() - error parsing result");
haveData = false;
return false;
}
}
public String toString() {
return toDataString();
return toDataString();
}
public String toDataString() {
String retval;
retval = "SdData.toDataString() Output";
try {
JSONObject jsonObj = new JSONObject();
if (dataTime != null) {
jsonObj.put("dataTime",dataTime.format("%d-%m-%Y %H:%M:%S"));
jsonObj.put("dataTimeStr",dataTime.format("%Y%m%dT%H%M%S"));
} else {
jsonObj.put("dataTimeStr","00000000T000000");
jsonObj.put("dataTime","00-00-00 00:00:00");
}
Log.v(TAG,"mSdData.dataTime = " + dataTime);
jsonObj.put("maxVal", maxVal);
jsonObj.put("maxFreq",maxFreq);
jsonObj.put("specPower",specPower);
jsonObj.put("roiPower",roiPower);
jsonObj.put("batteryPc",batteryPc);
jsonObj.put("pebbleConnected",pebbleConnected);
jsonObj.put("pebbleAppRunning",pebbleAppRunning);
jsonObj.put("haveSettings",haveSettings);
jsonObj.put("alarmState",alarmState);
jsonObj.put("alarmPhrase",alarmPhrase);
jsonObj.put("alarmThresh",alarmThresh);
jsonObj.put("alarmRatioThresh",alarmRatioThresh);
JSONArray arr = new JSONArray();
for (int i=0;i<simpleSpec.length;i++) {
arr.put(simpleSpec[i]);
}
String retval;
retval = "SdData.toDataString() Output";
try {
JSONObject jsonObj = new JSONObject();
if (dataTime != null) {
jsonObj.put("dataTime", dataTime.format("%d-%m-%Y %H:%M:%S"));
jsonObj.put("dataTimeStr", dataTime.format("%Y%m%dT%H%M%S"));
}else{
jsonObj.put("dataTimeStr", "00000000T000000");
jsonObj.put("dataTime", "00-00-00 00:00:00");
}
Log.v(TAG, "mSdData.dataTime = " + dataTime);
jsonObj.put("maxVal", maxVal);
jsonObj.put("maxFreq", maxFreq);
jsonObj.put("specPower", specPower);
jsonObj.put("roiPower", roiPower);
jsonObj.put("batteryPc", batteryPc);
jsonObj.put("pebbleConnected", pebbleConnected);
jsonObj.put("pebbleAppRunning", pebbleAppRunning);
jsonObj.put("haveSettings", haveSettings);
jsonObj.put("alarmState", alarmState);
jsonObj.put("alarmPhrase", alarmPhrase);
jsonObj.put("alarmThresh", alarmThresh);
jsonObj.put("alarmRatioThresh", alarmRatioThresh);
JSONArray arr = new JSONArray();
for (int i = 0; i < simpleSpec.length; i++) {
arr.put(simpleSpec[i]);
}
jsonObj.put("simpleSpec",arr);
jsonObj.put("simpleSpec", arr);
retval = jsonObj.toString();
} catch (Exception ex) {
Log.v(TAG,"Error Creating Data Object - "+ex.toString());
retval = "Error Creating Data Object - "+ex.toString();
}
retval = jsonObj.toString();
} catch (Exception ex) {
Log.v(TAG, "Error Creating Data Object - " + ex.toString());
retval = "Error Creating Data Object - " + ex.toString();
}
return(retval);
return (retval);
}
public int describeContents() {
return 0;
return 0;
}
public void writeToParcel(Parcel outParcel, int flags) {
//outParcel.writeInt(fMin);
//outParcel.writeInt(fMax);
//outParcel.writeInt(fMin);
//outParcel.writeInt(fMax);
}
private SdData(Parcel in) {
//fMin = in.readInt();
//fMax = in.readInt();
//fMin = in.readInt();
//fMax = in.readInt();
}
public static final Parcelable.Creator<SdData> CREATOR = new Parcelable.Creator<SdData>() {
public SdData createFromParcel(Parcel in) {
return new SdData(in);
}
public SdData[] newArray(int size) {
return new SdData[size];
}
public SdData createFromParcel(Parcel in) {
return new SdData(in);
}
public SdData[] newArray(int size) {
return new SdData[size];
}
};
}

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

@@ -338,6 +338,7 @@ public class SdDataSourcePebble extends SdDataSource {
mSdData.specPower = data.getUnsignedIntegerAsLong(KEY_SPECPOWER);
mSdData.roiPower = data.getUnsignedIntegerAsLong(KEY_ROIPOWER);
mSdData.alarmPhrase = "Unknown";
mSdData.haveData = true;
mSdDataReceiver.onSdDataReceived(mSdData);
}
@@ -465,6 +466,7 @@ public class SdDataSourcePebble extends SdDataSource {
mSdData.pebbleAppRunning = false;
Log.v(TAG, "getPebbleStatus() - Pebble App Not Running - Attempting to Re-Start");
startWatchApp();
mPebbleStatusTime = tnow; // set status time to now so we do not re-start app repeatedly.
getPebbleSdSettings();
// Only make audible warning beep if we have not received data for more than mFaultTimerPeriod seconds.
if (tdiff > (mDataPeriod+mFaultTimerPeriod) * 1000) {

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

@@ -95,7 +95,7 @@ public class SdServer extends Service implements SdDataReceiver {
private HandlerThread thread;
private WakeLock mWakeLock = null;
public SdDataSource mSdDataSource;
public SdData mSdData;
public SdData mSdData = null;
public String mSdDataSourceName = "undefined"; // The name of the data soruce specified in the preferences.
private boolean mLatchAlarms = false;
private boolean mCancelAudible = false;

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

@@ -73,7 +73,7 @@ public class SdServiceConnection implements ServiceConnection {
public boolean hasSdData() {
if (mSdServer!=null) {
if (mSdServer.mSdData!=null) {
return true;
return mSdServer.mSdData.haveData;
}
}
return false;

4
app/src/main/res/xml/general_prefs.xml
View File

@@ -31,7 +31,9 @@
android:defaultValue="true"
android:key="UseIpCamera"
android:summary="Use IP Camera to View Images"
android:title="Enable IP Camera" />
android:title="Enable IP Camera"
android:enabled="False"
/>
</PreferenceScreen>

4
app/src/main/res/xml/preference_headers.xml
View File

@@ -25,7 +25,9 @@
<header android:fragment="uk.org.openseizuredetector.PrefActivity$CameraPrefsFragment"
android:icon="@drawable/icon_24x24"
android:title="Camera Settings"
android:summary="IP Camera Preferences" />
android:summary="IP Camera Preferences"
android:enabled="false"
/>
</preference-headers>