ETM-Schurig
/
nymea-app
mirror of https://github.com/nymea/nymea-app.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix android device controls and connectingpage

pull/616/head
Michael Zanetti 2021-07-06 11:27:04 +02:00
parent 5456384711
commit 08014c7071
4 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
androidservice/java/io/guh/nymeaapp/NymeaAppServiceConnection.java
View File

@ -212,7 +212,7 @@ public class NymeaAppServiceConnection implements ServiceConnection {
m_service.transact(1, parcel, retParcel, 0);
thingsList = retParcel.readString();
} catch (Exception e) {
Log.d(TAG, "Error fetching things from NymeaAppService");
Log.d(TAG, "Error fetching things from NymeaAppService: " + e.toString());
onError();
return;
}

10
androidservice/nymeaappservice/nymeaappservice.cpp
View File

@ -23,10 +23,11 @@ NymeaAppService::NymeaAppService(int argc, char **argv):
AWSClient::instance()->setConfig(settings.value("cloudEnvironment").toString());
discovery->setAwsClient(AWSClient::instance());
for (int i = 0; i < 5; i++) {
settings.beginGroup(QString("tabSettings%1").arg(i));
QUuid lastConnected = settings.value("lastConnectedHost").toUuid();
settings.beginGroup("ConfiguredHosts");
foreach (const QString &childGroup, settings.childGroups()) {
settings.beginGroup(childGroup);
QUuid lastConnected = settings.value("uuid").toUuid();
QString cachedName = settings.value("cachedName").toString();
settings.endGroup();
if (lastConnected.isNull()) {
@ -60,6 +61,7 @@ NymeaAppService::NymeaAppService(int argc, char **argv):
sendNotification("ReadyStateChanged", params);
});
}
settings.endGroup();
qDebug() << "NymeaAppService started.";

2
nymea-app/ui/Nymea.qml
View File

@ -570,6 +570,6 @@ ApplicationWindow {
antialiasing: true
smooth: true
sourceSize.width: Math.max(width, height)
sourceSize.height: sourceSize.width
sourceSize.height: Math.max(width, height)
}
}

34
nymea-app/ui/connection/ConnectingPage.qml
View File

@ -41,18 +41,18 @@ Page {
signal cancel()
ColorIcon {
anchors { top: parent.top; right: parent.right; margins: app.margins }
height: Style.iconSize
width: height
name: "../images/logs.svg"
ProgressButton {
anchors { top: parent.top; left: parent.left; margins: Style.margins }
imageSource: "/ui/images/navigation-menu.svg"
longpressEnabled: false
onClicked: mainMenu.open()
}
ProgressButton {
anchors { top: parent.top; right: parent.right; margins: Style.margins }
imageSource: "/ui/images/logs.svg"
visible: settings.showHiddenOptions && AppLogController.enabled
MouseArea {
anchors.fill: parent
onClicked: {
onClicked: pageStack.push(Qt.resolvedUrl("../appsettings/AppLogPage.qml"))
}
}
onClicked: pageStack.push(Qt.resolvedUrl("../appsettings/AppLogPage.qml"))
}
ColumnLayout {
@ -125,10 +125,10 @@ Page {
}
}
Button {
text: qsTr("Cancel")
anchors { left: parent.left; bottom: parent.bottom; right: parent.right }
anchors.margins: app.margins
onClicked: root.cancel()
}
// Button {
// text: qsTr("Cancel")
// anchors { left: parent.left; bottom: parent.bottom; right: parent.right }
// anchors.margins: app.margins
// onClicked: root.cancel()
// }
}