dorian/dasschmalter
dorian/dasschmalter
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

- major cleanup

Browse source 
- added states for 'connecting' and 'error'
This commit is contained in:
Dorian Zedler 2019-03-16 19:47:04 +01:00
parent ab97b22ac9
commit c227748ff6
2 changed files with 128 additions and 108 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
DasSchmalterApp/Qt-Code/DasSchmalter.pro
View file

@ -16,7 +16,8 @@ SOURCES += \
main.cpp \ main.cpp \
appsettings.cpp appsettings.cpp
RESOURCES += qml.qrc \ RESOURCES += \
qml.qrc \
shared.qrc shared.qrc
# Additional import path used to resolve QML modules in Qt Creator's code model # Additional import path used to resolve QML modules in Qt Creator's code model

213
DasSchmalterApp/Qt-Code/main.qml
View file

@ -10,7 +10,7 @@ Window {
Page { Page {
id: app id: app
state: "OFF" state: "CONNECTING"
anchors.fill: parent anchors.fill: parent
property string ipAdress: _cppAppSettings.loadSetting("ip-adress") property string ipAdress: _cppAppSettings.loadSetting("ip-adress")
@ -164,6 +164,28 @@ Window {
} }
} }
Rectangle {
id: lampCrossLineRa
anchors.centerIn: onOffBt
anchors.verticalCenterOffset: 15
height: onOffBt.height * 0.7
width: onOffBt.width * 0.03
radius: width * 0.2
rotation: 30
opacity: 1
color: Qt.darker("grey", 1.5)
Behavior on opacity {
NumberAnimation {
duration: 200
}
}
}
Button { Button {
id: settingsBt id: settingsBt
anchors { anchors {
@ -211,14 +233,13 @@ Window {
} }
function getState(){ function getState(){
// function to sync the state of the app with the state of the schmalter
sendRequest("http://"+app.ipAdress+"/api/state") sendRequest("http://"+app.ipAdress+"/api/state")
} }
function requestFinished(){
}
function toggleLigth(){ function toggleLigth(){
// function to toggle the remote schmalter
if(app.state == 'OFF'){ if(app.state == 'OFF'){
sendRequest("http://"+app.ipAdress+"/api/on") sendRequest("http://"+app.ipAdress+"/api/on")
} }
@ -228,67 +249,66 @@ Window {
else{ else{
alert("ERROR! " + currentState); alert("ERROR! " + currentState);
} }
// sync state
getState(); getState();
} }
function sendRequest(link){ function sendRequest(link){
// function to send a http request
// create request object
var xmlhttp = new XMLHttpRequest(); var xmlhttp = new XMLHttpRequest();
// define a function to be executed after the request finished
xmlhttp.onreadystatechange = (function(response) { xmlhttp.onreadystatechange = (function(response) {
return function(){ return function(){
if(response.readyState === 4 && response.status === 200){ app.processResponse(response)
console.log(response.responseText) }})(xmlhttp);
if(response.responseText !== ""){
// prepare the request
xmlhttp.open("GET", link);
// send the request
xmlhttp.send();
}
function processResponse(response){
// function to handle sensponses from das schmalter
if(response.readyState === 4){
switch (response.status){
case 200: {
// success
if(response.responseText !== ""){
// if the response was not empty
// get the data out of the json formatted string
var responseObj = JSON.parse(response.responseText); var responseObj = JSON.parse(response.responseText);
if(responseObj["command"] === "state"){ if(responseObj["command"] === "state"){
// if the request was a state check
if(app.state === responseObj["response"]){ if(app.state !== responseObj["response"]){
return; // if the current state of the schmalter doesn't match the current state of the app -> update the app's state
}
console.log("statechanged")
app.state = responseObj["response"] app.state = responseObj["response"]
if(currentState == 'OFF'){
document.getElementById("toggleLightBt").classList.remove("disabled")
document.getElementById("toggleLightBt").innerHTML = "Turn on";
} }
else if(currentState == 'ON'){
document.getElementById("toggleLightBt").classList.remove("disabled")
document.getElementById("toggleLightBt").innerHTML = "Turn off";
} }
}
else{ break
}
document.getElementById("toggleLightBt").classList.add("disabled") default: {
// error
document.getElementById("toggleLightBt").innerHTML = "ERROR"; console.log("ERROR: " + response.status)
// set the app state to ERROR
document.getElementById("toggleLightBt").innerHTML = "Unkwon error while connecting to Das Schmalter"; app.state = "ERROR"
} }
} }
// start the refresh timer
refreshTimer.start()
} }
else if(this.readyState === 4){
document.getElementById("errorDiv").innerHTML = "Error while connecting to Das Schmalter: "+this.status
}
}
}})(xmlhttp);
xmlhttp.open("GET", link);
xmlhttp.send();
console.log("request sent")
} }
function landscape(){ function landscape(){
@ -298,67 +318,66 @@ Window {
Timer { Timer {
id: refreshTimer id: refreshTimer
running: true running: true
interval: 200 repeat: false
interval: 100
onTriggered: { onTriggered: {
// sync state
app.getState(); app.getState();
refreshTimer.start()
} }
} }
states: [ states: [
State { State {
name: "ON" name: "ON"
PropertyChanges { PropertyChanges { target: onOffBt; opacity: 1; enabled: true; }
target: lampOn0
opacity: 1 PropertyChanges { target: lampOn0; opacity: 1; }
} PropertyChanges { target: lampOn1; scale: 1; }
PropertyChanges { PropertyChanges { target: lampOn2; scale: 1; }
target: lampOn1 PropertyChanges { target: lampOn3; scale: 1; }
scale: 1 PropertyChanges { target: lampOn4; scale: 1; }
} PropertyChanges { target: lampOn5; scale: 1; }
PropertyChanges {
target: lampOn2 PropertyChanges { target: lampCrossLineRa; opacity: 0; }
scale: 1
}
PropertyChanges {
target: lampOn3
scale: 1
}
PropertyChanges {
target: lampOn4
scale: 1
}
PropertyChanges {
target: lampOn5
scale: 1
}
}, },
State { State {
name: "OFF" name: "OFF"
PropertyChanges { PropertyChanges { target: onOffBt; opacity: 1; enabled: true; }
target: lampOn0
opacity: 0 PropertyChanges { target: lampOn0; opacity: 0; }
} PropertyChanges { target: lampOn1; scale: 0; }
PropertyChanges { PropertyChanges { target: lampOn2; scale: 0; }
target: lampOn1 PropertyChanges { target: lampOn3; scale: 0; }
scale: 0 PropertyChanges { target: lampOn4; scale: 0; }
} PropertyChanges { target: lampOn5; scale: 0; }
PropertyChanges {
target: lampOn2 PropertyChanges { target: lampCrossLineRa; opacity: 0; }
scale: 0 },
} State {
PropertyChanges { name: "ERROR"
target: lampOn3 PropertyChanges { target: onOffBt; opacity: 0.5; enabled: false; }
scale: 0
} PropertyChanges { target: lampOn0; opacity: 0; }
PropertyChanges { PropertyChanges { target: lampOn1; scale: 0; }
target: lampOn4 PropertyChanges { target: lampOn2; scale: 0; }
scale: 0 PropertyChanges { target: lampOn3; scale: 0; }
} PropertyChanges { target: lampOn4; scale: 0; }
PropertyChanges { PropertyChanges { target: lampOn5; scale: 0; }
target: lampOn5
scale: 0 PropertyChanges { target: lampCrossLineRa; opacity: 1; }
} },
State {
name: "CONNECTING"
PropertyChanges { target: onOffBt; opacity: 0.5; enabled: false; }
PropertyChanges { target: lampOn0; opacity: 0; }
PropertyChanges { target: lampOn1; scale: 0; }
PropertyChanges { target: lampOn2; scale: 0; }
PropertyChanges { target: lampOn3; scale: 0; }
PropertyChanges { target: lampOn4; scale: 0; }
PropertyChanges { target: lampOn5; scale: 0; }
PropertyChanges { target: lampCrossLineRa; opacity: 0; }
} }
] ]
} }