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

Tidied up final settings screen, and called it V2.0 for publication.

Browse Source
This commit is contained in:
Graham Jones
2016-03-30 23:09:15 +01:00
parent 02d22359b3
commit 9eee2b0471
4 changed files with 4 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/AndroidManifest.xml
View File

@@ -2,7 +2,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="uk.org.openseizuredetector"
android:versionCode="19"
android:versionName="2.0g" >
android:versionName="2.0" >
<uses-sdk android:minSdkVersion="14" />

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

@@ -444,7 +444,7 @@ public class SdServer extends Service implements SdDataReceiver {
}
// Fault
if ((sdData.alarmState == 4)) {
if ((sdData.alarmState) == 4 || (sdData.alarmState == 7)) {
sdData.alarmPhrase = "FAULT";
faultWarningBeep();
} else {

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

@@ -28,11 +28,11 @@
android:summary="Display update period in miliseconds."
android:title="Display Update Period (ms)." />
<CheckBoxPreference
android:defaultValue="true"
android:defaultValue="false"
android:key="UseIpCamera"
android:summary="Use IP Camera to View Images"
android:title="Enable IP Camera"
android:enabled="False"
android:enabled="false"
/>

32
app/src/main/res/xml/network_datasource_prefs.xml
View File

@@ -5,38 +5,6 @@
android:key="ServerIP"
android:summary="IP Address of OpenSeizureDetector Server (e.g. 192.168.1.175)."
android:title="Server IP Address." />
<CheckBoxPreference
android:defaultValue="true"
android:key="UseIpCamera"
android:summary=""
android:title="Use IP Camera to show images" />
<EditTextPreference
android:defaultValue="192.168.1.25"
android:key="CameraIp"
android:summary="IP Address of the IP Camera (e.g. 192.168.1.175)."
android:title="Camera IP Address." />
<EditTextPreference
android:defaultValue="0"
android:key="CameraCmdSet"
android:numeric="integer"
android:summary="Camera Command Set Number (0=mjpeg,1=h264)"
android:title="Camera Command Set Number" />
<EditTextPreference
android:defaultValue="guest"
android:key="CameraUname"
android:summary=""
android:title="Camera User Name" />
<EditTextPreference
android:defaultValue="guest"
android:key="CameraPasswd"
android:summary=""
android:title="Camera User Password" />
<EditTextPreference
android:defaultValue="2000"
android:key="UiUpdatePeriod"
android:numeric="integer"
android:summary="Update period for User Interface in miliseconds."
android:title="UI Update Period (ms)" />
<EditTextPreference
android:defaultValue="2000"
android:key="DataUpdatePeriod"