From 87c68a6bc0d655e796484d110fa5336322b171d0 Mon Sep 17 00:00:00 2001 From: Andrey Shamanin Date: Fri, 16 Oct 2020 11:17:53 +0300 Subject: Add AWS cloud support to agl-service-cloudproxy. Bug-AGL: SPEC-3481 Signed-off-by: Andrey Shamanin Change-Id: I071d94a9dc2e1f455119124c1185bf135f4c5b78 --- .../telemetry-cloud-app/app/TelemetryWorker.cpp | 116 --------- .../telemetry-cloud-app/app/TelemetryWorker.h | 48 ---- .../telemetry-cloud-app/app/app.pri | 3 - .../telemetry-cloud-app/app/app.pro | 35 --- .../app/cloudproxy-client/cloudproxyclient.cpp | 261 --------------------- .../app/cloudproxy-client/cloudproxyclient.h | 74 ------ .../app/cloudproxy-client/hmi-debug.h | 70 ------ .../images/AGL_HMI_Blue_Background_NoCar-01.png | Bin 698586 -> 0 bytes .../telemetry-cloud-app/app/images/images.qrc | 5 - .../telemetry-cloud-app/app/main.cpp | 122 ---------- .../telemetry-cloud-app/app/mainwindow.cpp | 100 -------- .../telemetry-cloud-app/app/mainwindow.h | 52 ---- .../telemetry-cloud-app/app/ui_mainwindow.h | 86 ------- 13 files changed, 972 deletions(-) delete mode 100755 app_client_examples/telemetry-cloud-app/app/TelemetryWorker.cpp delete mode 100755 app_client_examples/telemetry-cloud-app/app/TelemetryWorker.h delete mode 100755 app_client_examples/telemetry-cloud-app/app/app.pri delete mode 100755 app_client_examples/telemetry-cloud-app/app/app.pro delete mode 100755 app_client_examples/telemetry-cloud-app/app/cloudproxy-client/cloudproxyclient.cpp delete mode 100755 app_client_examples/telemetry-cloud-app/app/cloudproxy-client/cloudproxyclient.h delete mode 100755 app_client_examples/telemetry-cloud-app/app/cloudproxy-client/hmi-debug.h delete mode 100755 app_client_examples/telemetry-cloud-app/app/images/AGL_HMI_Blue_Background_NoCar-01.png delete mode 100755 app_client_examples/telemetry-cloud-app/app/images/images.qrc delete mode 100755 app_client_examples/telemetry-cloud-app/app/main.cpp delete mode 100755 app_client_examples/telemetry-cloud-app/app/mainwindow.cpp delete mode 100755 app_client_examples/telemetry-cloud-app/app/mainwindow.h delete mode 100755 app_client_examples/telemetry-cloud-app/app/ui_mainwindow.h (limited to 'app_client_examples/telemetry-cloud-app/app') diff --git a/app_client_examples/telemetry-cloud-app/app/TelemetryWorker.cpp b/app_client_examples/telemetry-cloud-app/app/TelemetryWorker.cpp deleted file mode 100755 index 2fb2a15..0000000 --- a/app_client_examples/telemetry-cloud-app/app/TelemetryWorker.cpp +++ /dev/null @@ -1,116 +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 "TelemetryWorker.h" -#include -#include -#include -#include - -#include "cloudproxy-client/cloudproxyclient.h" - -/* -left up: 56.327 43.981 -right up: 56.327 44.03 -right bottom: 56.3 44.03 -left bottom: 56.3 43.981 - -start: 56.321674 44.006383 -top: 56.329702 44.021352 - -diff -0.008028 -0.014969 -coeff lon/lat = 1,8646 - - -https://gps-coordinates.org/distance-between-coordinates.php -*/ - - -static double drand(double min, double max) -{ - double f = (double)rand() / RAND_MAX; - return min + f * (max - min); -} - - -void TelemetryWorker::send() -{ - const double lat_top{56.329702}; - const double lon_lat_coef{1.8646}; - const double lat_step{0.001}, lon_step{lat_step*lon_lat_coef}; - - if (direction == 0 && lat >= lat_top) - { - direction = 1; - qDebug() << "Change direction to " << direction; - } - else if (direction == 1 && lat <= init_lat) - { - direction = 2; - qDebug() << "Change direction to " << direction; - } - else if (direction == 2 && lat <= (init_lat - (lat_top - init_lat))) - { - direction = 3; - qDebug() << "Change direction to " << direction; - } - else if (direction == 3 && lat >= init_lat) - { - direction = 0; - qDebug() << "Change direction to " << direction; - } - - - if (direction == 0) - { - lat += lat_step; - lon += lon_step; - } - else if (direction == 1) - { - lat -= lat_step; - lon += lon_step; - } - else if (direction == 2) - { - lat -= lat_step; - lon -= lon_step; - } - else if (direction == 3) - { - lat += lat_step; - lon -= lon_step; - } - - nlohmann::json jmsg{ - {"tele_ver", "1.0"}, - {"lat", lat}, - {"lon", lon}, - {"alt", (size_t)(alt + drand(0, 10))}, - {"speed", (size_t)(speed + drand(20, 30))}, - {"ts", time(nullptr)} - }; - - { - //WARN: remove - const auto& msg{jmsg.dump()}; - qDebug() << "TelemetryWorker: " << msg.c_str(); - } - - if (cloudproxyclient) - qDebug() << "TelemetryWorker: cloud sendMessage result: " << cloudproxyclient->sendMessage(jmsg.dump()); - -} diff --git a/app_client_examples/telemetry-cloud-app/app/TelemetryWorker.h b/app_client_examples/telemetry-cloud-app/app/TelemetryWorker.h deleted file mode 100755 index 11210cb..0000000 --- a/app_client_examples/telemetry-cloud-app/app/TelemetryWorker.h +++ /dev/null @@ -1,48 +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 - -class CloudProxyClient; - -class TelemetryWorker : public QTimer -{ - Q_OBJECT -public: - TelemetryWorker(CloudProxyClient* cloudproxy, QObject* parent = nullptr) - : QTimer(parent), - cloudproxyclient{cloudproxy} - { - } - -public slots: - void send(); - -private: - CloudProxyClient* cloudproxyclient{nullptr}; - - int direction{0}; - const double init_lat{56.306}; - const double init_lon{44.070}; - double lat{init_lat}; - double lon{init_lon}; - double alt{300.0}; - double speed{500.0}; - uint32_t engine_rpm{3000}; - int32_t engine_temp{97}; -}; diff --git a/app_client_examples/telemetry-cloud-app/app/app.pri b/app_client_examples/telemetry-cloud-app/app/app.pri deleted file mode 100755 index 6d710e4..0000000 --- a/app_client_examples/telemetry-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/telemetry-cloud-app/app/app.pro b/app_client_examples/telemetry-cloud-app/app/app.pro deleted file mode 100755 index 351d89d..0000000 --- a/app_client_examples/telemetry-cloud-app/app/app.pro +++ /dev/null @@ -1,35 +0,0 @@ -TARGET = telemetrycloudapp -QT += core gui gui-private - -greaterThan(QT_MAJOR_VERSION, 4): QT += widgets - -DEFINES += QT_DEPRECATED_WARNINGS - -SOURCES = main.cpp \ - mainwindow.cpp \ - TelemetryWorker.cpp \ - cloudproxy-client/cloudproxyclient.cpp - -HEADERS += mainwindow.h \ - ui_mainwindow.h \ - TelemetryWorker.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/telemetry-cloud-app/app/cloudproxy-client/cloudproxyclient.cpp b/app_client_examples/telemetry-cloud-app/app/cloudproxy-client/cloudproxyclient.cpp deleted file mode 100755 index 0a30446..0000000 --- a/app_client_examples/telemetry-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 -#include - -#include "cloudproxyclient.h" -#include "hmi-debug.h" - - -static const char API_name[] = "cloudproxy"; - -const std::vector CloudProxyClient::m_api_list { - std::string("ping"), - std::string("createConnection"), - std::string("sendMessage"), - std::string("destroyConnection") - }; - -const std::vector 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(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/telemetry-cloud-app/app/cloudproxy-client/cloudproxyclient.h b/app_client_examples/telemetry-cloud-app/app/cloudproxy-client/cloudproxyclient.h deleted file mode 100755 index b333a14..0000000 --- a/app_client_examples/telemetry-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 -#include -#include -#include -#include -#include - -extern "C" -{ -#include -#include -} - -class CloudProxyClient -{ -public: - using handler_func = std::function; - - 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 m_api_list; - static const std::vector m_event_list; - - std::map 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/telemetry-cloud-app/app/cloudproxy-client/hmi-debug.h b/app_client_examples/telemetry-cloud-app/app/cloudproxy-client/hmi-debug.h deleted file mode 100755 index 674f5df..0000000 --- a/app_client_examples/telemetry-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 -#include -#include -#include -#include - -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/telemetry-cloud-app/app/images/AGL_HMI_Blue_Background_NoCar-01.png b/app_client_examples/telemetry-cloud-app/app/images/AGL_HMI_Blue_Background_NoCar-01.png deleted file mode 100755 index a76b140..0000000 Binary files a/app_client_examples/telemetry-cloud-app/app/images/AGL_HMI_Blue_Background_NoCar-01.png and /dev/null differ diff --git a/app_client_examples/telemetry-cloud-app/app/images/images.qrc b/app_client_examples/telemetry-cloud-app/app/images/images.qrc deleted file mode 100755 index 78d9b77..0000000 --- a/app_client_examples/telemetry-cloud-app/app/images/images.qrc +++ /dev/null @@ -1,5 +0,0 @@ - - - AGL_HMI_Blue_Background_NoCar-01.png - - diff --git a/app_client_examples/telemetry-cloud-app/app/main.cpp b/app_client_examples/telemetry-cloud-app/app/main.cpp deleted file mode 100755 index e0551fe..0000000 --- a/app_client_examples/telemetry-cloud-app/app/main.cpp +++ /dev/null @@ -1,122 +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 -#include -#include -#include -#include -#include - -#include "mainwindow.h" -#include -#include - -#include "cloudproxy-client/cloudproxyclient.h" - - -CloudProxyClient* g_cloudproxyclient{nullptr}; - - -int main(int argc, char *argv[]) -{ - QString graphic_role = QString("telemetrycloud"); - - QApplication app(argc, argv); - QScopedPointer 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()); - - 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) : ""; - if (!str) - str = ""; - 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; - } - - window->updateState(QString(data_str)); - qDebug("Application received data: %s", data_str); - }); - - window->show(); - qwm->slotActivateWindow(); - } - - return app.exec(); -} diff --git a/app_client_examples/telemetry-cloud-app/app/mainwindow.cpp b/app_client_examples/telemetry-cloud-app/app/mainwindow.cpp deleted file mode 100755 index aecabc0..0000000 --- a/app_client_examples/telemetry-cloud-app/app/mainwindow.cpp +++ /dev/null @@ -1,100 +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 - -#include -#include -#include - - -#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::updateState(QVariant recvMsg) -{ - if (!recvMsg.isValid()) - return; - - // expected format: {"message": "bla-bla"} - std::string cloud_msg; - try - { - const std::string& msg = recvMsg.toString().toStdString(); - if (msg.empty()) - { - qDebug() << "Received message is empty"; - } - else - { - const nlohmann::json& jmsg = nlohmann::json::parse(msg); - cloud_msg = jmsg["message"].get(); - } - } - catch (std::exception& ex) - { - qDebug() << "Can't parse incomming message: " << ex.what(); - } - - QString str = QString::asprintf("Cloud info: %s", cloud_msg.c_str()); - ui->stateLabel->setText(str); -} - -void MainWindow::startMsgButtonClick() -{ - qDebug() << "MainWindow::startMsgButtonClick()"; - - if (started) - ui->startMsgButton->setText("Start"); - else - ui->startMsgButton->setText("Stop"); - started = !started; - - if (worker) - { - worker->stop(); - worker.reset(); - qDebug() << "Worker destroyed"; - } - - if (started) - { - worker.reset(new TelemetryWorker(g_cloudproxyclient, this)); - connect(worker.get(), SIGNAL(timeout()), worker.get(), SLOT(send())); - worker->start(1001); - } -} - - -MainWindow::~MainWindow() -{ - delete ui; -} diff --git a/app_client_examples/telemetry-cloud-app/app/mainwindow.h b/app_client_examples/telemetry-cloud-app/app/mainwindow.h deleted file mode 100755 index ce21845..0000000 --- a/app_client_examples/telemetry-cloud-app/app/mainwindow.h +++ /dev/null @@ -1,52 +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 -#include -#include -#include - -#include "TelemetryWorker.h" - - -namespace Ui { - class MainWindow; -} - -class MainWindow : public QMainWindow -{ - Q_OBJECT - -public: - explicit MainWindow(double scale_factor, QWidget *parent = 0); - ~MainWindow(); - -public slots: - void updateState(QVariant recvMsg); - -private slots: - void startMsgButtonClick(); - -private: - Ui::MainWindow *ui; - bool started{false}; - QScopedPointer worker; -}; - -#endif // MAINWINDOW_H diff --git a/app_client_examples/telemetry-cloud-app/app/ui_mainwindow.h b/app_client_examples/telemetry-cloud-app/app/ui_mainwindow.h deleted file mode 100755 index 5dbcbd5..0000000 --- a/app_client_examples/telemetry-cloud-app/app/ui_mainwindow.h +++ /dev/null @@ -1,86 +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 -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -QT_BEGIN_NAMESPACE - -class Ui_MainWindow -{ -public: - QWidget *centralWidget{nullptr}; - QPushButton *startMsgButton{nullptr}; - QLabel *stateLabel{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"); - - startMsgButton = new QPushButton(centralWidget); - startMsgButton->setObjectName(QString::fromUtf8("startMsgButton")); - startMsgButton->setGeometry(QRect((540-242/2)*scale_factor, 20*scale_factor, 242*scale_factor, 64*scale_factor)); - startMsgButton->setStyleSheet(style); - - stateLabel = new QLabel(centralWidget); - stateLabel->setObjectName(QString::fromUtf8("label")); - stateLabel->setGeometry(QRect(40*scale_factor, 180*scale_factor, 1000*scale_factor, 420*scale_factor)); - stateLabel->setWordWrap(true); - stateLabel->setAlignment(Qt::AlignTop); - stateLabel->setStyleSheet(style); - - MainWindow->setCentralWidget(centralWidget); - - QObject::connect(startMsgButton, SIGNAL(clicked()), MainWindow, SLOT(startMsgButtonClick())); - - retranslateUi(MainWindow); - - QMetaObject::connectSlotsByName(MainWindow); - } // setupUi - - void retranslateUi(QMainWindow *MainWindow) - { - MainWindow->setWindowTitle(QApplication::translate("MainWindow", "MainWindow", nullptr)); - startMsgButton->setText(QApplication::translate("MainWindow", "Start", nullptr)); - } // retranslateUi -}; - -namespace Ui { - class MainWindow: public Ui_MainWindow {}; -} // namespace Ui - -QT_END_NAMESPACE - -#endif // UI_MAINWINDOW_H -- cgit 1.2.3-korg