From 9930cd3c5ed65dba93bcb7de48e8535dd79ddb40 Mon Sep 17 00:00:00 2001 From: Edwin Jakobs Date: Wed, 13 May 2020 15:15:31 +0200 Subject: [PATCH] Fix port by using staticFilesPort in orx-rabbit --- orx-rabbit-control/src/main/kotlin/RabbitControlServer.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/orx-rabbit-control/src/main/kotlin/RabbitControlServer.kt b/orx-rabbit-control/src/main/kotlin/RabbitControlServer.kt index 156745a3..520f2fe8 100644 --- a/orx-rabbit-control/src/main/kotlin/RabbitControlServer.kt +++ b/orx-rabbit-control/src/main/kotlin/RabbitControlServer.kt @@ -80,7 +80,7 @@ class RabbitControlServer(private val showQRUntilClientConnects: Boolean = true, val socket = Socket() socket.connect(InetSocketAddress("google.com", 80)) val ip = socket.localAddress.toString().replace("/", "") - val clientUrlWithHash = "http://$ip:8080/rabbit-client/index.html/#$ip:$rcpPort" + val clientUrlWithHash = "http://$ip:$staticFilesPort/rabbit-client/index.html/#$ip:$rcpPort" qrCodeImage = getQRCodeImage(barcodeText = clientUrlWithHash) println("RabbitControl Web Client: $clientUrlWithHash") @@ -159,6 +159,7 @@ class RabbitControlServer(private val showQRUntilClientConnects: Boolean = true, } + @Suppress("UNCHECKED_CAST") fun add(objectWithParameters: Any) { val parameters = objectWithParameters.listParameters() @@ -215,7 +216,6 @@ class RabbitControlServer(private val showQRUntilClientConnects: Boolean = true, param.value = org.rabbitcontrol.rcp.model.types.Vector4(v4.x.toFloat(), v4.y.toFloat(), v4.z.toFloat(), v4.w.toFloat()) param } - else -> rabbitServer.createBangParameter(it.label) } @@ -262,5 +262,6 @@ class RabbitControlServer(private val showQRUntilClientConnects: Boolean = true, } fun KMutableProperty1?.qset(obj: Any, value: T) { + @Suppress("UNCHECKED_CAST") return (this as KMutableProperty1).set(obj, value) }