ETM-Schurig/powersync-app
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto-fill in parameters for push notifications thing (Android)

Browse Source
This commit is contained in:
Michael Zanetti 2020-12-12 13:49:48 +01:00
parent 61a923253c
commit ae26b505b1
2 changed files with 42 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libnymea-app/libnymea-app-core.h
View File

@ -200,8 +200,11 @@ void registerQmlTypes() {
qmlRegisterUncreatableType<DeviceClasses>(uri, 1, 0, "DeviceClasses", "Can't create this in QML. Get it from the DeviceManager."); qmlRegisterUncreatableType<DeviceClasses>(uri, 1, 0, "DeviceClasses", "Can't create this in QML. Get it from the DeviceManager.");
qmlRegisterType<DeviceClassesProxy>(uri, 1, 0, "DeviceClassesProxy"); qmlRegisterType<DeviceClassesProxy>(uri, 1, 0, "DeviceClassesProxy");
qmlRegisterType<DeviceDiscovery>(uri, 1, 0, "DeviceDiscovery"); qmlRegisterType<DeviceDiscovery>(uri, 1, 0, "DeviceDiscovery");
qmlRegisterType<DeviceDiscovery>(uri, 1, 0, "ThingDiscovery");
qmlRegisterType<DeviceDiscoveryProxy>(uri, 1, 0, "DeviceDiscoveryProxy"); qmlRegisterType<DeviceDiscoveryProxy>(uri, 1, 0, "DeviceDiscoveryProxy");
qmlRegisterType<DeviceDiscoveryProxy>(uri, 1, 0, "ThingDiscoveryProxy");
qmlRegisterUncreatableType<DeviceDescriptor>(uri, 1, 0, "DeviceDescriptor", "Get it from DeviceDiscovery"); qmlRegisterUncreatableType<DeviceDescriptor>(uri, 1, 0, "DeviceDescriptor", "Get it from DeviceDiscovery");
qmlRegisterUncreatableType<DeviceDescriptor>(uri, 1, 0, "ThingDescriptor", "Get it from ThingDiscovery");
qmlRegisterType<DeviceModel>(uri, 1, 0, "DeviceModel"); qmlRegisterType<DeviceModel>(uri, 1, 0, "DeviceModel");

48
nymea-app/ui/thingconfiguration/SetupWizard.qml
View File

@ -40,10 +40,12 @@ import "../delegates"
Page { Page {
id: root id: root
property DeviceClass deviceClass: device ? device.deviceClass : null property ThingClass thingClass: thing ? thing.thingClass : null
property alias deviceClass: root.thingClass
// Optional: If set, it will be reconfigred, otherwise a new one will be created // Optional: If set, it will be reconfigred, otherwise a new one will be created
property Device device: null property Thing thing: null
property alias device: root.thing // Transitional, use thing instead
signal done(); signal done();
@ -66,7 +68,8 @@ Page {
QtObject { QtObject {
id: d id: d
property var vendorId: null property var vendorId: null
property DeviceDescriptor deviceDescriptor: null property ThingDescriptor thingDescriptor: null
property alias deviceDescriptor: d.thingDescriptor
property var discoveryParams: [] property var discoveryParams: []
property string deviceName: "" property string deviceName: ""
property int pairRequestId: 0 property int pairRequestId: 0
@ -89,8 +92,8 @@ Page {
} else if (root.deviceClass.createMethods.indexOf("CreateMethodUser") !== -1) { } else if (root.deviceClass.createMethods.indexOf("CreateMethodUser") !== -1) {
print("CreateMethodUser") print("CreateMethodUser")
// Setting up a new device // Setting up a new device
if (!root.device) { if (!root.thing) {
print("New device. Opening params page") print("New thing setup")
internalPageStack.push(paramsPage) internalPageStack.push(paramsPage)
// Reconfigure // Reconfigure
@ -367,7 +370,8 @@ Page {
} }
TextField { TextField {
id: nameTextField id: nameTextField
text: d.deviceName ? d.deviceName : root.deviceClass.displayName text: (d.deviceName ? d.deviceName : root.deviceClass.displayName)
+ (root.thingClass.id.toString().match(/\{?f0dd4c03-0aca-42cc-8f34-9902457b05de\}?/) ? " (" + PlatformHelper.machineHostname + ")" : "")
Layout.fillWidth: true Layout.fillWidth: true
Layout.leftMargin: app.margins Layout.leftMargin: app.margins
Layout.rightMargin: app.margins Layout.rightMargin: app.margins
@ -386,9 +390,35 @@ Page {
Layout.fillWidth: true Layout.fillWidth: true
enabled: !model.readOnly enabled: !model.readOnly
paramType: root.deviceClass.paramTypes.get(index) paramType: root.deviceClass.paramTypes.get(index)
value: d.deviceDescriptor && d.deviceDescriptor.params.getParam(paramType.id) ? visible: root.thingClass.id.toString().match(/\{?f0dd4c03-0aca-42cc-8f34-9902457b05de\}?/) === null
d.deviceDescriptor.params.getParam(paramType.id).value : value: {
root.deviceClass.paramTypes.get(index).defaultValue // Discovery, use params from discovered descriptor
if (d.thingDescriptor && d.thingDescriptor.params.getParam(paramType.id)) {
return d.thingDescriptor.params.getParam(paramType.id).value
}
// Special hook for push notifications as we need to provide the token implicitly
print("Setting up params for thing class:", root.thingClass.id, root.thingClass.name)
if (root.thingClass.id.toString().match(/\{?f0dd4c03-0aca-42cc-8f34-9902457b05de\}?/)) {
print("It's push notifications. Token is:", PushNotifications.token, "Platform is:", Qt.platform.os);
if (paramType.id.toString().match(/\{?3cb8e30e-2ec5-4b4b-8c8c-03eaf7876839\}?/)) {
if (Qt.platform.os == "android") {
return "GCM";
} else {
print("Unsupported platform for push notifications!")
}
}
if (paramType.id.toString().match(/\{?12ec06b2-44e7-486a-9169-31c684b91c8f\}?/)) {
return PushNotifications.token;
}
if (paramType.id.toString().match(/\{?d76da367-64e3-4b7d-aa84-c96b3acfb65e\}?/)) {
return PlatformHelper.deviceSerial + "+io.guh.nymeaapp" + (appBranding.length > 0 ? "-" + appBranding : "");
}
}
// Manual setup, use default value from thing class
return root.thingClass.paramTypes.get(index).defaultValue
}
} }
} }