Remove homescreen api and windowmanager api depependency

in addition, modified the code

Bug-AGL: SPEC-3458

Change-Id: I6d0a6d8e4498464f7fff2c7065fcecfb68cc5227
Signed-off-by: shi ce <shic.fnst@fujitsu.com>

diff --git a/app/app.pro b/app/app.pro
index eeb139c..0083bfc 100644 (file)
--- a/app/app.pro
+++ b/app/app.pro
@@ -1,5 +1,5 @@
 TARGET = videoplayer
-QT = quick aglextras multimedia
+QT = quick websockets multimedia
 
 SOURCES = main.cpp
 

diff --git a/app/main.cpp b/app/main.cpp
index 7fdff20..11b1230 100644 (file)
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -13,14 +13,57 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <QtAGLExtras/AGLApplication>
 #include <QtQml/QQmlApplicationEngine>
+#include <QtGui/QGuiApplication>
+#include <QDebug>
+#include <QUrlQuery>
+#include <QCommandLineParser>
+#include <QtQml/QQmlContext>
+
 
 int main(int argc, char *argv[])
 {
-    AGLApplication app(argc, argv);
-    app.setApplicationName("VideoPlayer");
-    app.setupApplicationRole("Video");
-    app.load(QUrl(QStringLiteral("qrc:/VideoPlayer.qml")));
-    return app.exec();
+       
+       setenv("QT_QPA_PLATFORM", "wayland", 1);
+       int port;
+       QString token;
+       
+       QCommandLineParser parser;
+       QGuiApplication app(argc, argv);
+
+       parser.addPositionalArgument("port",
+               app.translate("main", "port for binding"));
+       parser.addPositionalArgument("secret",
+               app.translate("main", "secret for binding"));
+
+       parser.addHelpOption();
+       parser.addVersionOption();
+       parser.process(app);
+       QStringList positionalArguments = parser.positionalArguments();
+
+       if (positionalArguments.length() == 2) {
+               port = positionalArguments.takeFirst().toInt();
+               token = positionalArguments.takeFirst();
+               qInfo() << "setting port:" << port << ", token:" << token;
+       } else {
+               qInfo() << "Need to specify port and token";
+               exit(EXIT_FAILURE);
+       }
+       
+       QUrl bindingAddress;
+       bindingAddress.setScheme(QStringLiteral("ws"));
+       bindingAddress.setHost(QStringLiteral("localhost"));
+       bindingAddress.setPort(port);
+       bindingAddress.setPath(QStringLiteral("/api"));
+
+       QUrlQuery query;
+       query.addQueryItem(QStringLiteral("token"), token);
+       bindingAddress.setQuery(query);
+
+       QQmlApplicationEngine engine;
+       engine.rootContext()->setContextProperty(QStringLiteral("bindingAddress"), bindingAddress);
+       engine.load(QUrl(QStringLiteral("qrc:/VideoPlayer.qml")));
+
+       return app.exec();
+       
 }

diff --git a/autobuild/agl/autobuild b/autobuild/agl/autobuild
index e87a1c3..bbbc13e 100755 (executable)
--- a/autobuild/agl/autobuild
+++ b/autobuild/agl/autobuild
@@ -1,5 +1,6 @@
 #!/usr/bin/make -f
 # Copyright (C) 2015 - 2018 "IoT.bzh"
+# Copyright (C) 2020 Konsulko Group
 # Author "Romain Forlot" <romain.forlot@iot.bzh>
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,44 +16,95 @@
 # limitations under the License.
 
 THISFILE  := $(lastword $(MAKEFILE_LIST))
-BUILD_DIR := $(abspath $(dir $(THISFILE))/../../build)
-DEST      := ${BUILD_DIR}
+ROOT_DIR := $(abspath $(dir $(THISFILE))/../..)
 
-.PHONY: all clean distclean configure build package help
+# Build directories
+# Note that the debug directory is defined in relation to the release
+# directory (BUILD_DIR), this needs to be kept in mind if over-riding
+# it and building that widget types, the specific widget type variable
+# (e.g. BUILD_DIR_DEBUG) may also need to be specified to yield the
+# desired output hierarchy.
+BUILD_DIR = $(ROOT_DIR)/build
+BUILD_DIR_DEBUG = $(abspath $(BUILD_DIR)/../build-debug)
 
-all: help
+# Output directory variable for use in pattern rules.
+# This is intended for internal use only, hence the explicit override
+# definition.
+override OUTPUT_DIR = $(BUILD_DIR)
+
+# Final install directory for widgets
+DEST = $(OUTPUT_DIR)
+
+# Default build type for release builds
+BUILD_TYPE = release
+
+.PHONY: all help update install distclean
+.PHONY: clean clean-release clean-debug clean-all
+.PHONY: configure configure-release configure-debug
+.PHONY: build build-release build-debug build-all
+.PHONY: package package-release package-debug package-all
 
 help:
        @echo "List of targets available:"
        @echo ""
        @echo "- all"
+       @echo "- help"
        @echo "- clean"
        @echo "- distclean"
        @echo "- configure"
        @echo "- build: compilation, link and prepare files for package into a widget"
        @echo "- package: output a widget file '*.wgt'"
-       @echo "- install: install in your INSTALL_ROOT directory"
+       @echo "- install: install in $(DEST) directory"
        @echo ""
        @echo "Usage: ./autobuild/agl/autobuild package DEST=${HOME}/opt"
        @echo "Don't use your build dir as DEST as wgt file is generated at this location"
 
-clean:
-       @([ -d ${BUILD_DIR} ] && make -C ${BUILD_DIR} ${CLEAN_ARGS} clean) || echo Nothing to clean
+all: package-all
+
+# Target specific variable over-rides so static pattern rules can be
+# used for the various type-specific targets.
+
+configure-debug build-debug package-debug clean-debug: OUTPUT_DIR = $(BUILD_DIR_DEBUG)
+configure-debug build-debug package-debug: BUILD_TYPE = debug
+
+clean-release clean-debug:
+       @if [ -d $(OUTPUT_DIR) ]; then \
+               $(MAKE) -C $(OUTPUT_DIR) $(CLEAN_ARGS) clean; \
+       else \
+               echo Nothing to clean; \
+       fi
+
+clean: clean-release
 
-distclean:
-       @([ -d ${BUILD_DIR} ] && make -C ${BUILD_DIR} distclean) || echo Nothing to distclean
+clean-all: clean-release clean-debug
 
-configure:
-       @[ -d ${BUILD_DIR} ] || mkdir -p ${BUILD_DIR}
-       @[ -f ${BUILD_DIR}/Makefile ] || (cd ${BUILD_DIR} && qmake ${CONFIGURE_ARGS} ..)
+distclean: clean-all
 
-build: configure
-       @make -C ${BUILD_DIR} ${BUILD_ARGS} all
+configure-release configure-debug:
+       @mkdir -p $(OUTPUT_DIR)
+       @if [ ! -f $(OUTPUT_DIR)/Makefile ]; then \
+               (cd $(OUTPUT_DIR) && qmake CONFIG+=$(BUILD_TYPE) $(CONFIGURE_ARGS) $(ROOT_DIR)); \
+       fi
+
+configure: configure-release
+
+build-release build-debug: build-%: configure-%
+       @$(MAKE) -C $(OUTPUT_DIR) $(BUILD_ARGS) all
+
+build: build-release
 
-package: build
-       @if [ "${DEST}" != "${BUILD_DIR}/$@" ]; then \
-               mkdir -p ${DEST} && cp ${BUILD_DIR}/$@/*.wgt ${DEST}; \
+build-all: build-release build-debug
+
+package-release package-debug: package-%: build-%
+       @cp $(OUTPUT_DIR)/package/*.wgt $(OUTPUT_DIR)/
+       @if [ "$(abspath $(DEST))" != "$(abspath $(OUTPUT_DIR))" ]; then \
+               mkdir -p $(DEST) && cp $(OUTPUT_DIR)/*.wgt $(DEST); \
        fi
 
+
+package: package-release
+
+package-all: package-release package-debug
+
 install: build
-       @make -C ${BUILD_DIR} ${INSTALL_ARGS} install
+       @$(MAKE) -C $(BUILD_DIR) $(INSTALL_ARGS) install

diff --git a/autobuild/linux/autobuild b/autobuild/linux/autobuild
index 569d692..bbbc13e 100755 (executable)
--- a/autobuild/linux/autobuild
+++ b/autobuild/linux/autobuild
@@ -1,12 +1,13 @@
 #!/usr/bin/make -f
 # Copyright (C) 2015 - 2018 "IoT.bzh"
+# Copyright (C) 2020 Konsulko Group
 # Author "Romain Forlot" <romain.forlot@iot.bzh>
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#        http://www.apache.org/licenses/LICENSE-2.0
+#       http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,48 +16,95 @@
 # limitations under the License.
 
 THISFILE  := $(lastword $(MAKEFILE_LIST))
-BUILD_DIR := $(abspath $(dir $(THISFILE))/../../build)
-DEST      := ${BUILD_DIR}
+ROOT_DIR := $(abspath $(dir $(THISFILE))/../..)
 
-.PHONY: all clean distclean configure build package help update
+# Build directories
+# Note that the debug directory is defined in relation to the release
+# directory (BUILD_DIR), this needs to be kept in mind if over-riding
+# it and building that widget types, the specific widget type variable
+# (e.g. BUILD_DIR_DEBUG) may also need to be specified to yield the
+# desired output hierarchy.
+BUILD_DIR = $(ROOT_DIR)/build
+BUILD_DIR_DEBUG = $(abspath $(BUILD_DIR)/../build-debug)
 
-all: help
+# Output directory variable for use in pattern rules.
+# This is intended for internal use only, hence the explicit override
+# definition.
+override OUTPUT_DIR = $(BUILD_DIR)
+
+# Final install directory for widgets
+DEST = $(OUTPUT_DIR)
+
+# Default build type for release builds
+BUILD_TYPE = release
+
+.PHONY: all help update install distclean
+.PHONY: clean clean-release clean-debug clean-all
+.PHONY: configure configure-release configure-debug
+.PHONY: build build-release build-debug build-all
+.PHONY: package package-release package-debug package-all
 
 help:
-        @echo "List of targets available:"
-        @echo ""
-        @echo "- all
-        @echo "- clean"
-        @echo "- distclean"
-        @echo "- configure"
-        @echo "- build: compilation, link and prepare files for package into a widget" 
-        @echo "- package: output a widget file '*.wgt'"
-        @echo "- install: install in your defined DEST directory"
-        @echo ""
-        @echo "Usage: ./autobuild/agl/autobuild package DEST=${HOME}/opt"
-        @echo "Don't use your build dir as DEST as wgt file is generated at this location" 
-
- clean:
-        @([ -d ${BUILD_DIR} ] && make -C ${BUILD_DIR} ${CLEAN_ARGS} clean) || echo Nothing to clean
-
-distclean:
-        @[ -d ${DEST} ] && find ${DEST} -name "*.wgt" -delete
-        @([ -d ${BUILD_DIR} ] && make -C ${BUILD_DIR} distclean) || echo Nothing to distclean
-
-configure:
-        @[ -d ${BUILD_DIR} ] || mkdir -p ${BUILD_DIR}
-        @[ -f ${BUILD_DIR}/Makefile ] || (cd ${BUILD_DIR} && qmake ${CONFIGURE_ARGS} ..)
-
-build: configure
-        @make -C ${BUILD_DIR} ${BUILD_ARGS} all
-
-package: build
-        @if [ "${DEST}" != "${BUILD_DIR}/$@" ]; then \
-                mkdir -p ${DEST} && cp ${BUILD_DIR}/$@/*.wgt ${DEST}; \
-        fi
+       @echo "List of targets available:"
+       @echo ""
+       @echo "- all"
+       @echo "- help"
+       @echo "- clean"
+       @echo "- distclean"
+       @echo "- configure"
+       @echo "- build: compilation, link and prepare files for package into a widget"
+       @echo "- package: output a widget file '*.wgt'"
+       @echo "- install: install in $(DEST) directory"
+       @echo ""
+       @echo "Usage: ./autobuild/agl/autobuild package DEST=${HOME}/opt"
+       @echo "Don't use your build dir as DEST as wgt file is generated at this location"
 
-install: build
-        @if [ "${DEST}" != "${BUILD_DIR}" ]; then \
-                mkdir -p ${DEST} && cp -rf ${BUILD_DIR}/package/root/* ${DEST}; \
-        fi
+all: package-all
+
+# Target specific variable over-rides so static pattern rules can be
+# used for the various type-specific targets.
+
+configure-debug build-debug package-debug clean-debug: OUTPUT_DIR = $(BUILD_DIR_DEBUG)
+configure-debug build-debug package-debug: BUILD_TYPE = debug
+
+clean-release clean-debug:
+       @if [ -d $(OUTPUT_DIR) ]; then \
+               $(MAKE) -C $(OUTPUT_DIR) $(CLEAN_ARGS) clean; \
+       else \
+               echo Nothing to clean; \
+       fi
+
+clean: clean-release
+
+clean-all: clean-release clean-debug
+
+distclean: clean-all
 
+configure-release configure-debug:
+       @mkdir -p $(OUTPUT_DIR)
+       @if [ ! -f $(OUTPUT_DIR)/Makefile ]; then \
+               (cd $(OUTPUT_DIR) && qmake CONFIG+=$(BUILD_TYPE) $(CONFIGURE_ARGS) $(ROOT_DIR)); \
+       fi
+
+configure: configure-release
+
+build-release build-debug: build-%: configure-%
+       @$(MAKE) -C $(OUTPUT_DIR) $(BUILD_ARGS) all
+
+build: build-release
+
+build-all: build-release build-debug
+
+package-release package-debug: package-%: build-%
+       @cp $(OUTPUT_DIR)/package/*.wgt $(OUTPUT_DIR)/
+       @if [ "$(abspath $(DEST))" != "$(abspath $(OUTPUT_DIR))" ]; then \
+               mkdir -p $(DEST) && cp $(OUTPUT_DIR)/*.wgt $(DEST); \
+       fi
+
+
+package: package-release
+
+package-all: package-release package-debug
+
+install: build
+       @$(MAKE) -C $(BUILD_DIR) $(INSTALL_ARGS) install

diff --git a/package/config.xml b/package/config.xml
index 65ec50a..ecead3b 100644 (file)
--- a/package/config.xml
+++ b/package/config.xml
@@ -7,8 +7,6 @@
   <author>Tasuku Suzuki &lt;tasuku.suzuki@qt.io&gt;</author>
   <license>APL 2.0</license>
   <feature name="urn:AGL:widget:required-api">
-    <param name="windowmanager" value="ws"/>
-    <param name="homescreen" value="ws"/>
     <param name="mediascanner" value="ws"/>
   </feature>
   <feature name="urn:AGL:widget:required-permission">