diff --git a/guh-control/android/AndroidManifest.xml b/guh-control/android/AndroidManifest.xml new file mode 100644 index 00000000..b13db7df --- /dev/null +++ b/guh-control/android/AndroidManifest.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/guh-control/android/build.gradle b/guh-control/android/build.gradle new file mode 100644 index 00000000..ef416b0b --- /dev/null +++ b/guh-control/android/build.gradle @@ -0,0 +1,57 @@ +buildscript { + repositories { + jcenter() + } + + dependencies { + classpath 'com.android.tools.build:gradle:1.1.0' + } +} + +allprojects { + repositories { + jcenter() + } +} + +apply plugin: 'com.android.application' + +dependencies { + compile fileTree(dir: 'libs', include: ['*.jar']) +} + +android { + /******************************************************* + * The following variables: + * - androidBuildToolsVersion, + * - androidCompileSdkVersion + * - qt5AndroidDir - holds the path to qt android files + * needed to build any Qt application + * on Android. + * + * are defined in gradle.properties file. This file is + * updated by QtCreator and androiddeployqt tools. + * Changing them manually might break the compilation! + *******************************************************/ + + compileSdkVersion androidCompileSdkVersion.toInteger() + + buildToolsVersion androidBuildToolsVersion + + sourceSets { + main { + manifest.srcFile 'AndroidManifest.xml' + java.srcDirs = [qt5AndroidDir + '/src', 'src', 'java'] + aidl.srcDirs = [qt5AndroidDir + '/src', 'src', 'aidl'] + res.srcDirs = [qt5AndroidDir + '/res', 'res'] + resources.srcDirs = ['src'] + renderscript.srcDirs = ['src'] + assets.srcDirs = ['assets'] + jniLibs.srcDirs = ['libs'] + } + } + + lintOptions { + abortOnError false + } +} diff --git a/guh-control/android/gradle.properties b/guh-control/android/gradle.properties new file mode 100644 index 00000000..ffb43466 --- /dev/null +++ b/guh-control/android/gradle.properties @@ -0,0 +1,9 @@ +## This file is automatically generated by QtCreator. +# +# This file must *NOT* be checked into Version Control Systems, +# as it contains information specific to your local configuration. + +androidBuildToolsVersion=26.0.1 +androidCompileSdkVersion=26 +buildDir=.build +qt5AndroidDir=/home/micha/Develop/Qt/5.8/android_armv7/src/android/java diff --git a/guh-control/android/gradle/wrapper/gradle-wrapper.jar b/guh-control/android/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 00000000..8c0fb64a Binary files /dev/null and b/guh-control/android/gradle/wrapper/gradle-wrapper.jar differ diff --git a/guh-control/android/gradle/wrapper/gradle-wrapper.properties b/guh-control/android/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..0c71e760 --- /dev/null +++ b/guh-control/android/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Wed Apr 10 15:27:10 PDT 2013 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip diff --git a/guh-control/android/gradlew b/guh-control/android/gradlew new file mode 100755 index 00000000..91a7e269 --- /dev/null +++ b/guh-control/android/gradlew @@ -0,0 +1,164 @@ +#!/usr/bin/env bash + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn ( ) { + echo "$*" +} + +die ( ) { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; +esac + +# For Cygwin, ensure paths are in UNIX format before anything is touched. +if $cygwin ; then + [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` +fi + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >&- +APP_HOME="`pwd -P`" +cd "$SAVED" >&- + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules +function splitJvmOpts() { + JVM_OPTS=("$@") +} +eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS +JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" + +exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/guh-control/android/gradlew.bat b/guh-control/android/gradlew.bat new file mode 100644 index 00000000..aec99730 --- /dev/null +++ b/guh-control/android/gradlew.bat @@ -0,0 +1,90 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windowz variants + +if not "%OS%" == "Windows_NT" goto win9xME_args +if "%@eval[2+2]" == "4" goto 4NT_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* +goto execute + +:4NT_args +@rem Get arguments from the 4NT Shell from JP Software +set CMD_LINE_ARGS=%$ + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/guh-control/android/local.properties b/guh-control/android/local.properties new file mode 100644 index 00000000..361330da --- /dev/null +++ b/guh-control/android/local.properties @@ -0,0 +1,6 @@ +## This file is automatically generated by QtCreator. +# +# This file must *NOT* be checked into Version Control Systems, +# as it contains information specific to your local configuration. + +sdk.dir=/home/micha/Develop/Android/Sdk diff --git a/guh-control/android/res/drawable-mdpi/icon.png b/guh-control/android/res/drawable-mdpi/icon.png new file mode 100644 index 00000000..8aa39bf7 Binary files /dev/null and b/guh-control/android/res/drawable-mdpi/icon.png differ diff --git a/guh-control/android/res/values/libs.xml b/guh-control/android/res/values/libs.xml new file mode 100644 index 00000000..77f422cf --- /dev/null +++ b/guh-control/android/res/values/libs.xml @@ -0,0 +1,25 @@ + + + + https://download.qt.io/ministro/android/qt5/qt-5.8 + + + + + + + + + + + + + + + + + + + + diff --git a/guh-control/guh-control.pro b/guh-control/guh-control.pro new file mode 100644 index 00000000..4bdf0d04 --- /dev/null +++ b/guh-control/guh-control.pro @@ -0,0 +1,123 @@ +TEMPLATE=app +TARGET=guh-control +include(../guh-control.pri) + + +QT += qml quick quickcontrols2 websockets svg + +INCLUDEPATH += $$top_srcdir/libguh-common +LIBS += -L$$top_builddir/libguh-common/ -lguh-common + +HEADERS += engine.h \ + guhinterface.h \ + devicemanager.h \ + websocketinterface.h \ + jsonrpc/jsontypes.h \ + jsonrpc/jsonrpcclient.h \ + jsonrpc/jsonhandler.h \ + discovery/guhhost.h \ + discovery/guhhosts.h \ + discovery/upnpdiscovery.h \ + devices.h \ + devicesproxy.h \ + deviceclasses.h \ + deviceclassesproxy.h \ + devicediscovery.h \ + vendorsproxy.h \ + pluginsproxy.h \ + tcpsocketinterface.h \ + guhconnection.h \ + interfacesmodel.h \ + discovery/zeroconfdiscovery.h \ + discovery/discoverydevice.h \ + discovery/discoverymodel.h \ + rulemanager.h \ + models/rulesfiltermodel.h \ + models/logsmodel.h \ + models/valuelogsproxymodel.h + + +SOURCES += main.cpp \ + engine.cpp \ + guhinterface.cpp \ + devicemanager.cpp \ + websocketinterface.cpp \ + jsonrpc/jsontypes.cpp \ + jsonrpc/jsonrpcclient.cpp \ + jsonrpc/jsonhandler.cpp \ + discovery/guhhost.cpp \ + discovery/guhhosts.cpp \ + discovery/upnpdiscovery.cpp \ + devices.cpp \ + devicesproxy.cpp \ + deviceclasses.cpp \ + deviceclassesproxy.cpp \ + devicediscovery.cpp \ + vendorsproxy.cpp \ + pluginsproxy.cpp \ + tcpsocketinterface.cpp \ + guhconnection.cpp \ + interfacesmodel.cpp \ + discovery/zeroconfdiscovery.cpp \ + discovery/discoverydevice.cpp \ + discovery/discoverymodel.cpp \ + rulemanager.cpp \ + models/rulesfiltermodel.cpp \ + models/logsmodel.cpp \ + models/valuelogsproxymodel.cpp + +withavahi { +DEFINES += WITH_AVAHI + +LIBS += -lavahi-client -lavahi-common + +HEADERS += discovery/avahi/avahiserviceentry.h \ + discovery/avahi/qt-watch.h \ + discovery/avahi/qtavahiclient.h \ + discovery/avahi/qtavahiservice_p.h \ + discovery/avahi/qtavahiservice.h \ + discovery/avahi/qtavahiservicebrowser_p.h \ + discovery/avahi/qtavahiservicebrowser.h \ + +SOURCES += discovery/avahi/avahiserviceentry.cpp \ + discovery/avahi/qt-watch.cpp \ + discovery/avahi/qtavahiclient.cpp \ + discovery/avahi/qtavahiservice_p.cpp \ + discovery/avahi/qtavahiservice.cpp \ + discovery/avahi/qtavahiservicebrowser_p.cpp \ + discovery/avahi/qtavahiservicebrowser.cpp \ + +} + +RESOURCES += \ + resources.qrc + +#DISTFILES += \ +# android/AndroidManifest.xml \ +# android/gradle/wrapper/gradle-wrapper.jar \ +# android/gradlew \ +# android/res/values/libs.xml \ +# android/build.gradle \ +# android/gradle/wrapper/gradle-wrapper.properties \ +# android/gradlew.bat + +#ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android + +contains(ANDROID_TARGET_ARCH,armeabi-v7a) { + ANDROID_EXTRA_LIBS = \ + $$PWD/../../android-openssl/prebuilt/armeabi-v7a/libcrypto.so \ + $$PWD/../../android-openssl/prebuilt/armeabi-v7a/libssl.so +} + +DISTFILES += \ + android/AndroidManifest.xml \ + android/gradle/wrapper/gradle-wrapper.jar \ + android/gradlew \ + android/res/values/libs.xml \ + android/build.gradle \ + android/gradle/wrapper/gradle-wrapper.properties \ + android/gradlew.bat + +ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android + + diff --git a/guh-control/guh-logo-256x256.png b/guh-control/guh-logo-256x256.png new file mode 100644 index 00000000..8aa39bf7 Binary files /dev/null and b/guh-control/guh-logo-256x256.png differ diff --git a/guh-control/guh-logo.svg b/guh-control/guh-logo.svg new file mode 100644 index 00000000..17065d0b --- /dev/null +++ b/guh-control/guh-logo.svg @@ -0,0 +1,602 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/guh-control/jsonrpc/actionhandler.cpp b/guh-control/jsonrpc/actionhandler.cpp new file mode 100644 index 00000000..a5615e82 --- /dev/null +++ b/guh-control/jsonrpc/actionhandler.cpp @@ -0,0 +1,40 @@ +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * * + * Copyright (C) 2017 Simon Stuerz * + * * + * This file is part of guh-control. * + * * + * guh-control is free software: you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation, version 3 of the License. * + * * + * guh-control is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with guh-control. If not, see . * + * * + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + +#include "actionhandler.h" + +#include + +ActionHandler::ActionHandler(QObject *parent) : + JsonHandler(parent) +{ +} + +QString ActionHandler::nameSpace() const +{ + return "Actions"; +} + +void ActionHandler::processExecuteAction(const QVariantMap ¶ms) +{ + // response handled in the ui + Q_UNUSED(params); +} +