aboutsummaryrefslogtreecommitdiffstats
path: root/app_client_examples/test-cloud-app/app
diff options
context:
space:
mode:
authorAndrey Shamanin <andrei.shamanin@orioninc.com>2020-10-16 11:17:53 +0300
committerAndrey Shamanin <andrei.shamanin@orioninc.com>2020-10-16 11:21:30 +0300
commit87c68a6bc0d655e796484d110fa5336322b171d0 (patch)
tree98891fb8c0090e59f7a9b6904a9d59f04e5b0e02 /app_client_examples/test-cloud-app/app
parent329d8ba3fb46b8afc803ad4a9b286cd26141f2f8 (diff)
Bug-AGL: SPEC-3481 Signed-off-by: Andrey Shamanin <andrei.shamanin@orioninc.com> Change-Id: I071d94a9dc2e1f455119124c1185bf135f4c5b78
Diffstat (limited to 'app_client_examples/test-cloud-app/app')
-rwxr-xr-xapp_client_examples/test-cloud-app/app/app.pri3
-rwxr-xr-xapp_client_examples/test-cloud-app/app/app.pro34
-rwxr-xr-xapp_client_examples/test-cloud-app/app/cloudproxy-client/cloudproxyclient.cpp261
-rwxr-xr-xapp_client_examples/test-cloud-app/app/cloudproxy-client/cloudproxyclient.h74
-rwxr-xr-xapp_client_examples/test-cloud-app/app/cloudproxy-client/hmi-debug.h70
-rwxr-xr-xapp_client_examples/test-cloud-app/app/images/AGL_HMI_Blue_Background_NoCar-01.pngbin698586 -> 0 bytes
-rwxr-xr-xapp_client_examples/test-cloud-app/app/images/images.qrc5
-rwxr-xr-xapp_client_examples/test-cloud-app/app/main.cpp150
-rwxr-xr-xapp_client_examples/test-cloud-app/app/mainwindow.cpp84
-rwxr-xr-xapp_client_examples/test-cloud-app/app/mainwindow.h55
-rwxr-xr-xapp_client_examples/test-cloud-app/app/ui_mainwindow.h94
11 files changed, 0 insertions, 830 deletions
diff --git a/app_client_examples/test-cloud-app/app/app.pri b/app_client_examples/test-cloud-app/app/app.pri
deleted file mode 100755
index 6d710e4..0000000
--- a/app_client_examples/test-cloud-app/app/app.pri
+++ /dev/null
@@ -1,3 +0,0 @@
-TEMPLATE = app
-QMAKE_LFLAGS += "-Wl,--hash-style=gnu -Wl,--as-needed"
-DESTDIR = $${OUT_PWD}/../package/root/bin
diff --git a/app_client_examples/test-cloud-app/app/app.pro b/app_client_examples/test-cloud-app/app/app.pro
deleted file mode 100755
index 4e8ae9a..0000000
--- a/app_client_examples/test-cloud-app/app/app.pro
+++ /dev/null
@@ -1,34 +0,0 @@
-TARGET = testcloudapp
-QT += core gui gui-private
-
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
-
-DEFINES += QT_DEPRECATED_WARNINGS
-DEFINES += APP_INSTANCE_NUM='\\"1\\"'
-
-SOURCES = main.cpp \
- mainwindow.cpp \
- cloudproxy-client/cloudproxyclient.cpp
-
-HEADERS += mainwindow.h \
- ui_mainwindow.h \
- cloudproxy-client/cloudproxyclient.h \
- cloudproxy-client/hmi-debug.h \
-
-CONFIG += link_pkgconfig
-PKGCONFIG += libhomescreen qlibwindowmanager qtappfw-core
-
-CONFIG(release, debug|release) {
- QMAKE_POST_LINK = $(STRIP) --strip-unneeded $(TARGET)
-}
-
-LIBS += -ljson-c -lafbwsc -lsystemd
-
-RESOURCES += \
- images/images.qrc
-
-include(app.pri)
-
-DISTFILES += \
- images/AGL_HMI_Blue_Background_NoCar-01.png
-
diff --git a/app_client_examples/test-cloud-app/app/cloudproxy-client/cloudproxyclient.cpp b/app_client_examples/test-cloud-app/app/cloudproxy-client/cloudproxyclient.cpp
deleted file mode 100755
index cfbf943..0000000
--- a/app_client_examples/test-cloud-app/app/cloudproxy-client/cloudproxyclient.cpp
+++ /dev/null
@@ -1,261 +0,0 @@
-/*
- * Copyright (C) 2020 MERA
- *
- * 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
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <thread>
-#include <algorithm>
-
-#include "cloudproxyclient.h"
-#include "hmi-debug.h"
-
-
-static const char API_name[] = "cloudproxy";
-
-const std::vector<std::string> CloudProxyClient::m_api_list {
- std::string("ping"),
- std::string("createConnection"),
- std::string("sendMessage"),
- std::string("destroyConnection")
- };
-
-const std::vector<std::string> CloudProxyClient::m_event_list {
- std::string("sendMessageConfirmation"),
- std::string("receivedMessage")
- };
-
-static void event_loop_run(sd_event* loop)
-{
- sd_event_loop(loop);
- sd_event_unref(loop);
-}
-
-static void on_hangup(void *closure, afb_wsj1 *wsj)
-{
- HMI_DEBUG("cloudproxyclient", "called");
- (void)closure;
- (void)wsj;
-}
-
-static void on_call(void *closure, const char *api, const char *verb, afb_wsj1_msg *msg)
-{
- HMI_ERROR("cloudproxyclient", "this method should not be called");
- (void)closure;
- (void)api;
- (void)verb;
- (void)msg;
-}
-
-static void on_event(void* closure, const char* event, afb_wsj1_msg *msg)
-{
- HMI_DEBUG("cloudproxyclient", "event [%s]", (event ? event: ""));
- (void)closure;
-
- static_cast<CloudProxyClient*>(closure)->on_event(nullptr, event, msg);
-}
-
-static void on_reply(void *closure, afb_wsj1_msg *msg)
-{
- HMI_DEBUG("cloudproxyclient", "called");
- (void)closure;
- (void)msg;
-}
-
-
-CloudProxyClient::CloudProxyClient()
-{
-}
-
-CloudProxyClient::~CloudProxyClient()
-{
- if(m_websock)
- {
- afb_wsj1_unref(m_websock);
- }
- if(m_loop)
- {
- sd_event_exit(m_loop, 0);
- }
-}
-
-int CloudProxyClient::init(const int port, const std::string& token)
-{
- int ret = 0;
- if(port <= 0 && token.size() == 0)
- {
- HMI_ERROR("cloudproxyclient","port and token should be > 0, Initial port and token uses.");
- return -1;
- }
-
- {
- m_loop = nullptr;
- int ret = sd_event_new(&m_loop);
- if(ret < 0)
- {
- HMI_ERROR("cloudproxyclient","Failed to create event loop");
- return -1;
- }
-
- {
- // enforce context to avoid initialization/goto error
- std::thread th(event_loop_run, m_loop);
- th.detach();
- }
-
- /* Initialize interface from websocket */
- m_itf.on_hangup = ::on_hangup;
- m_itf.on_call = ::on_call;
- m_itf.on_event = ::on_event;
-
- m_uri += "ws://localhost:" + std::to_string(port) + "/api?token=" + token;
-
- m_websock = afb_ws_client_connect_wsj1(m_loop, m_uri.c_str(), &m_itf, this);
- if(!m_websock)
- {
- HMI_ERROR("cloudproxyclient","Failed to create websocket connection");
- return -1;
- }
- }
-
- HMI_DEBUG("cloudproxyclient", "Initialized");
-
- return ret;
-}
-
-
-int CloudProxyClient::call(const std::string& verb, json_object* arg)
-{
- int ret;
- if(!m_websock)
- {
- return -1;
- }
-
- if (verb.empty() || m_api_list.end() == std::find(m_api_list.begin(), m_api_list.end(), verb))
- {
- HMI_ERROR("cloudproxyclient","verb [%s] doesn't exit", verb.c_str());
- return -1;
- }
-
- ret = afb_wsj1_call_j(m_websock, API_name, verb.c_str(), arg, ::on_reply, this);
- if (ret < 0)
- {
- HMI_ERROR("cloudproxyclient", "Failed to call verb:%s", verb.c_str());
- }
-
- return ret;
-}
-
-
-int CloudProxyClient::sendMessage(const std::string& data)
-{
- if(!m_websock)
- return -1;
-
- json_object* j_obj = json_object_new_object();
- json_object_object_add(j_obj, "data", json_object_new_string(data.c_str()));
-
- return this->call("sendMessage", j_obj);
-}
-
-void CloudProxyClient::set_event_handler(enum EventType et, handler_func f)
-{
- if (et > Event_Min && et < Event_Max)
- {
- switch (et)
- {
- case Event_SendMessageConfirmation:
- this->subscribe(CloudProxyClient::m_event_list[0]);
- break;
- case Event_ReceivedMessage:
- this->subscribe(CloudProxyClient::m_event_list[1]);
- break;
- default:
- break;
- }
-
- this->handlers[et] = std::move(f);
- }
-}
-
-int CloudProxyClient::subscribe(const std::string& event_name)
-{
- if(!m_websock)
- return -1;
-
- json_object* j_obj = json_object_new_object();
- json_object_object_add(j_obj, "event", json_object_new_string(event_name.c_str()));
-
- int ret = afb_wsj1_call_j(m_websock, API_name, "subscribe", j_obj, ::on_reply, this);
- if (ret < 0)
- HMI_ERROR("cloudproxyclient", "subscribe filed for '%s'", event_name.c_str());
-
- return ret;
-}
-
-int CloudProxyClient::unsubscribe(const std::string& event_name)
-{
- if(!m_websock)
- return -1;
-
- json_object* j_obj = json_object_new_object();
- json_object_object_add(j_obj, "event", json_object_new_string(event_name.c_str()));
-
- int ret = afb_wsj1_call_j(m_websock, API_name, "unsubscribe", j_obj, ::on_reply, this);
- if (ret < 0)
- HMI_ERROR("cloudproxyclient", "unsubscribe filed for '%s'", event_name.c_str());
-
- return ret;
-}
-
-void CloudProxyClient::on_event(void *closure, const char *event, afb_wsj1_msg *msg)
-{
- HMI_DEBUG("cloudproxyclient", "event: (%s) msg: (%s).", event, afb_wsj1_msg_object_s(msg));
- (void) closure;
-
- if (strstr(event, API_name) == nullptr)
- return;
-
-
- json_object* ev_contents = afb_wsj1_msg_object_j(msg);
- json_object *json_data;
- if(!json_object_object_get_ex(ev_contents, "data", &json_data))
- {
- HMI_ERROR("cloudproxyclient", "got ev_contents error.");
- return;
- }
-
- const char* event_type = nullptr;
- json_object *json_event_type;
- if(!json_object_object_get_ex(json_data, "type", &json_event_type) ||
- (event_type = json_object_get_string(json_event_type)) == nullptr)
- {
- HMI_ERROR("cloudproxyclient", "event_type is null.");
- return;
- }
-
- const std::string et{event_type};
- if (CloudProxyClient::m_event_list[0] == et)
- {
- auto i = this->handlers.find(Event_SendMessageConfirmation);
- if (i != this->handlers.end())
- i->second(json_data);
- }
- else if (CloudProxyClient::m_event_list[1] == et)
- {
- auto i = this->handlers.find(Event_ReceivedMessage);
- if (i != this->handlers.end())
- i->second(json_data);
- }
-}
diff --git a/app_client_examples/test-cloud-app/app/cloudproxy-client/cloudproxyclient.h b/app_client_examples/test-cloud-app/app/cloudproxy-client/cloudproxyclient.h
deleted file mode 100755
index b333a14..0000000
--- a/app_client_examples/test-cloud-app/app/cloudproxy-client/cloudproxyclient.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (C) 2020 MERA
- *
- * 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
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <vector>
-#include <map>
-#include <string>
-#include <functional>
-#include <json-c/json.h>
-#include <systemd/sd-event.h>
-
-extern "C"
-{
-#include <afb/afb-wsj1.h>
-#include <afb/afb-ws-client.h>
-}
-
-class CloudProxyClient
-{
-public:
- using handler_func = std::function<void(json_object*)>;
-
- enum EventType {
- Event_Min,
- Event_SendMessageConfirmation = 1,
- Event_ReceivedMessage,
- Event_Max
- };
-
-
- CloudProxyClient();
- ~CloudProxyClient();
-
- CloudProxyClient(const CloudProxyClient &) = delete;
- CloudProxyClient &operator=(const CloudProxyClient &) = delete;
-
- int init(const int port, const std::string& token);
-
- int sendMessage(const std::string& data);
-
- void set_event_handler(enum EventType et, handler_func f);
-
- void on_event(void *closure, const char *event, struct afb_wsj1_msg *msg);
-
- int subscribe(const std::string& event_name);
- int unsubscribe(const std::string& event_name);
-
-private:
- int call(const std::string& verb, struct json_object* arg);
-
-private:
- static const std::vector<std::string> m_api_list;
- static const std::vector<std::string> m_event_list;
-
- std::map<EventType, handler_func> handlers;
- struct afb_wsj1_itf m_itf;
- struct afb_wsj1* m_websock{nullptr};
- sd_event* m_loop{nullptr};
- std::string m_uri;
-};
diff --git a/app_client_examples/test-cloud-app/app/cloudproxy-client/hmi-debug.h b/app_client_examples/test-cloud-app/app/cloudproxy-client/hmi-debug.h
deleted file mode 100755
index 674f5df..0000000
--- a/app_client_examples/test-cloud-app/app/cloudproxy-client/hmi-debug.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (c) 2018 TOYOTA MOTOR CORPORATION
- *
- * 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
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __HMI_DEBUG_H__
-#define __HMI_DEBUG_H__
-
-#include <time.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <string.h>
-#include <stdlib.h>
-
-enum LOG_LEVEL{
- LOG_LEVEL_NONE = 0,
- LOG_LEVEL_ERROR,
- LOG_LEVEL_WARNING,
- LOG_LEVEL_NOTICE,
- LOG_LEVEL_INFO,
- LOG_LEVEL_DEBUG,
- LOG_LEVEL_MAX = LOG_LEVEL_DEBUG
-};
-
-#define __FILENAME__ (strrchr(__FILE__, '/') ? strrchr(__FILE__, '/') + 1 : __FILE__)
-
-#define HMI_ERROR(prefix, args,...) _HMI_LOG(LOG_LEVEL_ERROR, __FILENAME__, __FUNCTION__, __LINE__, prefix, args, ##__VA_ARGS__)
-#define HMI_WARNING(prefix, args,...) _HMI_LOG(LOG_LEVEL_WARNING, __FILENAME__, __FUNCTION__,__LINE__, prefix, args,##__VA_ARGS__)
-#define HMI_NOTICE(prefix, args,...) _HMI_LOG(LOG_LEVEL_NOTICE, __FILENAME__, __FUNCTION__,__LINE__, prefix, args,##__VA_ARGS__)
-#define HMI_INFO(prefix, args,...) _HMI_LOG(LOG_LEVEL_INFO, __FILENAME__, __FUNCTION__,__LINE__, prefix, args,##__VA_ARGS__)
-#define HMI_DEBUG(prefix, args,...) _HMI_LOG(LOG_LEVEL_DEBUG, __FILENAME__, __FUNCTION__,__LINE__, prefix, args,##__VA_ARGS__)
-
-static char ERROR_FLAG[6][20] = {"NONE", "ERROR", "WARNING", "NOTICE", "INFO", "DEBUG"};
-
-static void _HMI_LOG(enum LOG_LEVEL level, const char* file, const char* func, const int line, const char* prefix, const char* log, ...)
-{
- const int log_level = (getenv("USE_HMI_DEBUG") == NULL)?LOG_LEVEL_ERROR:atoi(getenv("USE_HMI_DEBUG"));
- if(log_level < level)
- {
- return;
- }
-
- char *message;
- struct timespec tp;
- unsigned int time;
-
- clock_gettime(CLOCK_REALTIME, &tp);
- time = (tp.tv_sec * 1000000L) + (tp.tv_nsec / 1000);
-
- va_list args;
- va_start(args, log);
- if (log == NULL || vasprintf(&message, log, args) < 0)
- message = NULL;
- fprintf(stderr, "[%10.3f] [%s %s] [%s, %s(), Line:%d] >>> %s \n", time / 1000.0, prefix, ERROR_FLAG[level], file, func, line, message);
- va_end(args);
- free(message);
-}
-
-#endif //__HMI_DEBUG_H__
diff --git a/app_client_examples/test-cloud-app/app/images/AGL_HMI_Blue_Background_NoCar-01.png b/app_client_examples/test-cloud-app/app/images/AGL_HMI_Blue_Background_NoCar-01.png
deleted file mode 100755
index a76b140..0000000
--- a/app_client_examples/test-cloud-app/app/images/AGL_HMI_Blue_Background_NoCar-01.png
+++ /dev/null
Binary files differ
diff --git a/app_client_examples/test-cloud-app/app/images/images.qrc b/app_client_examples/test-cloud-app/app/images/images.qrc
deleted file mode 100755
index 78d9b77..0000000
--- a/app_client_examples/test-cloud-app/app/images/images.qrc
+++ /dev/null
@@ -1,5 +0,0 @@
-<RCC>
- <qresource prefix="/images">
- <file>AGL_HMI_Blue_Background_NoCar-01.png</file>
- </qresource>
-</RCC>
diff --git a/app_client_examples/test-cloud-app/app/main.cpp b/app_client_examples/test-cloud-app/app/main.cpp
deleted file mode 100755
index 45a877b..0000000
--- a/app_client_examples/test-cloud-app/app/main.cpp
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * Copyright (C) 2020 MERA
- *
- * 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
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <QtCore/QUrlQuery>
-#include <QtGui/QGuiApplication>
-#include <libhomescreen.hpp>
-#include <qlibwindowmanager.h>
-#include <QtCore/QCommandLineParser>
-#include <QScopedPointer>
-
-#include "mainwindow.h"
-#include <QApplication>
-#include <QDebug>
-
-#include "cloudproxy-client/cloudproxyclient.h"
-
-
-CloudProxyClient* g_cloudproxyclient{nullptr};
-
-
-int main(int argc, char *argv[])
-{
- QString graphic_role = QString("cloudapp") + QString(APP_INSTANCE_NUM);
-
- QApplication app(argc, argv);
- QScopedPointer<MainWindow> window;
-
- QCommandLineParser parser;
- 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)
- {
- int port = positionalArguments.takeFirst().toInt();
- QString secret = positionalArguments.takeFirst();
- QUrl bindingAddress;
- bindingAddress.setScheme(QStringLiteral("ws"));
- bindingAddress.setHost(QStringLiteral("localhost"));
- bindingAddress.setPort(port);
- bindingAddress.setPath(QStringLiteral("/api"));
- QUrlQuery query;
- query.addQueryItem(QStringLiteral("token"), secret);
- bindingAddress.setQuery(query);
-
- std::string token = secret.toStdString();
- LibHomeScreen* hs = new LibHomeScreen();
- QLibWindowmanager* qwm = new QLibWindowmanager();
-
- // WindowManager
- if(qwm->init(port,secret) != 0){
- exit(EXIT_FAILURE);
- }
- AGLScreenInfo screenInfo(qwm->get_scale_factor());
- window.reset(new MainWindow(screenInfo.scale_factor()));
-
- // Request a surface as described in layers.json windowmanager’s file
- if (qwm->requestSurface(graphic_role) != 0) {
- exit(EXIT_FAILURE);
- }
- // Create an event callback against an event type. Here a lambda is called when SyncDraw event occurs
- qwm->set_event_handler(QLibWindowmanager::Event_SyncDraw, [qwm, &graphic_role](json_object *object) {
- (void)object;
- qDebug() << "Surface got syncDraw!";
- qwm->endDraw(graphic_role);
- });
-
- // HomeScreen
- hs->init(port, token.c_str());
- // Set the event handler for Event_ShowWindow which will activate the surface for windowmanager
- hs->set_event_handler(LibHomeScreen::Event_ShowWindow, [qwm, &graphic_role](json_object *object){
- (void)object;
- qDebug("Surface %s got showWindow\n", graphic_role.toStdString().c_str());
- qwm->activateWindow(graphic_role);
- });
-
- g_cloudproxyclient = new CloudProxyClient();
- g_cloudproxyclient->init(port, token.c_str());
-
- static int i_confirm_good{0}, i_confirm_bad{0}, i_recv{0};
- g_cloudproxyclient->set_event_handler(CloudProxyClient::Event_SendMessageConfirmation, [&window](json_object* object){
- qDebug("CloudProxyClient::Event_SendMessageConfirmation: object ptr %p", object);
-
- const char* str = object ? json_object_to_json_string_ext(object, JSON_C_TO_STRING_SPACED | JSON_C_TO_STRING_PRETTY) : "<obj_null>";
- if (!str)
- str = "<empty>";
- qDebug("Event_SendMessageConfirmation: %s", str);
-
- json_object *j_result;
- if(!json_object_object_get_ex(object, "result", &j_result))
- {
- qDebug("Can't read confirmation result");
- return;
- }
-
- int result = (int)json_object_get_boolean(j_result);
-
- if (result)
- ++i_confirm_good;
- else
- ++i_confirm_bad;
-
- window->updateStat(i_confirm_good, i_confirm_bad, i_recv, QVariant());
- qDebug("Application received confirmation result [good: %d, bad: %d]: %d", i_confirm_good, i_confirm_bad, result);
- });
- g_cloudproxyclient->set_event_handler(CloudProxyClient::Event_ReceivedMessage, [&window](json_object* object){
- qDebug("CloudProxyClient::Event_ReceivedMessage: object ptr %p", object);
-
- const char* str = object ? json_object_to_json_string_ext(object, JSON_C_TO_STRING_SPACED | JSON_C_TO_STRING_PRETTY) : "<obj_null>";
- if (!str)
- str = "<empty>";
- qDebug("Event_SendMessageConfirmation: %s", str);
-
- json_object *event_data;
- const char* data_str{nullptr};
- if(!json_object_object_get_ex(object, "data", &event_data) ||
- (data_str = json_object_get_string(event_data)) == nullptr)
- {
- qDebug("Can't read event data");
- return;
- }
-
- ++i_recv;
- window->updateStat(i_confirm_good, i_confirm_bad, i_recv, QString(data_str));
- qDebug("Application received data [count: %d, good: %d, bad %d]: %s", i_recv, i_confirm_good, i_confirm_bad, data_str);
- });
-
-
- window->show();
- qwm->slotActivateWindow();
- }
-
- return app.exec();
-}
diff --git a/app_client_examples/test-cloud-app/app/mainwindow.cpp b/app_client_examples/test-cloud-app/app/mainwindow.cpp
deleted file mode 100755
index fda05e7..0000000
--- a/app_client_examples/test-cloud-app/app/mainwindow.cpp
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (C) 2020 MERA
- *
- * 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
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "mainwindow.h"
-#include "ui_mainwindow.h"
-#include <QDebug>
-
-#include <unistd.h>
-#include <sys/stat.h>
-
-
-#include "cloudproxy-client/cloudproxyclient.h"
-extern CloudProxyClient* g_cloudproxyclient;
-
-
-MainWindow::MainWindow(double scale_factor, QWidget *parent) :
- QMainWindow(parent),
- ui(new Ui::MainWindow)
-{
- ui->setupUi(scale_factor, this);
-
- //AGL style
- setWindowFlags(Qt::FramelessWindowHint | Qt::WindowSystemMenuHint);
- this->setStyleSheet(
- "background-image:url(:/images/AGL_HMI_Blue_Background_NoCar-01.png) 0 0 0 0 stretch stretch; background: transparent;" );
-}
-
-void MainWindow::updateStat(int confirm_good, int confirm_bad, int received, QVariant recvMsg)
-{
- confirmGood = confirm_good;
- confirmBad = confirm_bad;
- receivedCount = received;
-
- if (recvMsg.isValid())
- lastReceivedMsg = recvMsg.toString();
-
- updateStat();
-}
-
-void MainWindow::updateStat()
-{
- QString str = QString::asprintf("Sent: OK=%d, NOK=%d\nConfirmed: OK=%d, NOK=%d\nReceived=%d\n\n",
- sendCount, sendErrorCount, confirmGood, confirmBad, receivedCount);
- str.append("Last sent message:\n");
- str.append(lastSentMsg);
- str.append("\n\nLast received message:\n");
- str.append(lastReceivedMsg);
- ui->statLabel->setText(str);
- //QApplication::processEvents();
-}
-
-void MainWindow::sendMsgButtonClick()
-{
- qDebug() << "MainWindow::sendMegButtonClick()";
-
- std::string msg = std::string{"{\"app_key\": \"app_value_"} + std::to_string(sendCount + sendErrorCount) + "\"}";
- int res = g_cloudproxyclient->sendMessage(msg);
- if (res == 0)
- ++sendCount;
- else
- ++sendErrorCount;
-
- lastSentMsg = msg.c_str();
- qDebug() << "cloud sendMessage result: " << res;
-}
-
-
-MainWindow::~MainWindow()
-{
- delete ui;
-}
diff --git a/app_client_examples/test-cloud-app/app/mainwindow.h b/app_client_examples/test-cloud-app/app/mainwindow.h
deleted file mode 100755
index ae66729..0000000
--- a/app_client_examples/test-cloud-app/app/mainwindow.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (C) 2020 MERA
- *
- * 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
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef MAINWINDOW_H
-#define MAINWINDOW_H
-
-#include <QMainWindow>
-#include <QVariant>
-#include <memory>
-
-
-namespace Ui {
- class MainWindow;
-}
-
-class MainWindow : public QMainWindow
-{
- Q_OBJECT
-
-public:
- explicit MainWindow(double scale_factor, QWidget *parent = 0);
- ~MainWindow();
-
-public slots:
- void updateStat(int confirm_good, int confirm_bad, int received, QVariant recvMsg);
-
-private slots:
- void sendMsgButtonClick();
- void updateStat();
-
-private:
- Ui::MainWindow *ui;
- int sendCount{0};
- int sendErrorCount{0};
- int confirmGood{0};
- int confirmBad{0};
- int receivedCount{0};
- QString lastSentMsg;
- QString lastReceivedMsg;
-};
-
-#endif // MAINWINDOW_H
diff --git a/app_client_examples/test-cloud-app/app/ui_mainwindow.h b/app_client_examples/test-cloud-app/app/ui_mainwindow.h
deleted file mode 100755
index 3dac77e..0000000
--- a/app_client_examples/test-cloud-app/app/ui_mainwindow.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright (C) 2020 MERA
- *
- * 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
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef UI_MAINWINDOW_H
-#define UI_MAINWINDOW_H
-
-#include <QtCore/QVariant>
-#include <QtWidgets/QApplication>
-#include <QtWidgets/QLabel>
-#include <QtWidgets/QMainWindow>
-#include <QtWidgets/QPushButton>
-#include <QtWidgets/QLineEdit>
-#include <QtWidgets/QWidget>
-#include <QtWidgets/QFrame>
-#include <QtWidgets/QGroupBox>
-#include <QtWidgets/QRadioButton>
-#include <QtWidgets/QComboBox>
-
-QT_BEGIN_NAMESPACE
-
-class Ui_MainWindow
-{
-public:
- QWidget *centralWidget{nullptr};
- QPushButton *sendMsgButton{nullptr};
- QLabel *appNameLabel{nullptr};
- QLabel *statLabel{nullptr};
-
- void setupUi(double scale_factor, QMainWindow *MainWindow)
- {
- if (MainWindow->objectName().isEmpty())
- MainWindow->setObjectName(QString::fromUtf8("MainWindow"));
- MainWindow->resize(1080*scale_factor, 1400*scale_factor);
- centralWidget = new QWidget(MainWindow);
- centralWidget->setObjectName(QString::fromUtf8("centralWidget"));
-
- //QString style("color: white; font-size: 24px");
- QString style("color: white");
-
- sendMsgButton = new QPushButton(centralWidget);
- sendMsgButton->setObjectName(QString::fromUtf8("sendMsgButton"));
- sendMsgButton->setGeometry(QRect((540-242/2)*scale_factor, 100*scale_factor, 242*scale_factor, 64*scale_factor));
- sendMsgButton->setStyleSheet(style);
-
- appNameLabel = new QLabel(centralWidget);
- appNameLabel->setObjectName(QString::fromUtf8("label"));
- appNameLabel->setGeometry(QRect(40*scale_factor, 20*scale_factor, 1000*scale_factor, 32*scale_factor));
- appNameLabel->setStyleSheet(style);
-
- statLabel = new QLabel(centralWidget);
- statLabel->setObjectName(QString::fromUtf8("label"));
- statLabel->setGeometry(QRect(40*scale_factor, 180*scale_factor, 1000*scale_factor, 420*scale_factor));
- statLabel->setWordWrap(true);
- statLabel->setAlignment(Qt::AlignTop);
- statLabel->setStyleSheet(style);
-
- MainWindow->setCentralWidget(centralWidget);
-
- QObject::connect(sendMsgButton, SIGNAL(clicked()), MainWindow, SLOT(sendMsgButtonClick()));
-
- retranslateUi(MainWindow);
-
- QMetaObject::connectSlotsByName(MainWindow);
- } // setupUi
-
- void retranslateUi(QMainWindow *MainWindow)
- {
- MainWindow->setWindowTitle(QApplication::translate("MainWindow", "MainWindow", nullptr));
- sendMsgButton->setText(QApplication::translate("MainWindow", "Send message", nullptr));
- QString name = QString("Test application ") + APP_INSTANCE_NUM;
- appNameLabel->setText(QApplication::translate("MainWindow", name.toUtf8().constData(), nullptr));
- } // retranslateUi
-};
-
-namespace Ui {
- class MainWindow: public Ui_MainWindow {};
-} // namespace Ui
-
-QT_END_NAMESPACE
-
-#endif // UI_MAINWINDOW_H