diff options
Diffstat (limited to 'sample/test-cloud-app')
| -rwxr-xr-x | sample/test-cloud-app/app/main.cpp | 31 | ||||
| -rwxr-xr-x | sample/test-cloud-app/app/main.cpp.save | 148 | ||||
| -rwxr-xr-x | sample/test-cloud-app/app/mainwindow.cpp | 4 |
3 files changed, 27 insertions, 156 deletions
diff --git a/sample/test-cloud-app/app/main.cpp b/sample/test-cloud-app/app/main.cpp index 6918e97..829d593 100755 --- a/sample/test-cloud-app/app/main.cpp +++ b/sample/test-cloud-app/app/main.cpp @@ -72,14 +72,23 @@ int main(int argc, char *argv[]) str = "<empty>"; qDebug("Event_SendMessageConfirmation: %s", str); - json_object *j_result; - if(!json_object_object_get_ex(object, "result", &j_result)) + json_object *j_obj; + + const char* cloud_type{nullptr}; + if(!json_object_object_get_ex(object, "cloud_type", &j_obj) || + (cloud_type = json_object_get_string(j_obj)) == nullptr) + { + qDebug("Can't read cloud_type"); + return; + } + + if(!json_object_object_get_ex(object, "result", &j_obj)) { qDebug("Can't read confirmation result"); return; } - int result = (int)json_object_get_boolean(j_result); + int result = (int)json_object_get_boolean(j_obj); if (result) ++i_confirm_good; @@ -87,15 +96,25 @@ int main(int argc, char *argv[]) ++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); + qDebug("Application received confirmation result from %s [good: %d, bad: %d]: %d", cloud_type, 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); + qDebug("Event_ReceivedMessage: %s", str); + + json_object *j_obj; + const char* cloud_type{nullptr}; + if(!json_object_object_get_ex(object, "cloud_type", &j_obj) || + (cloud_type = json_object_get_string(j_obj)) == nullptr) + { + qDebug("Can't read cloud_type"); + return; + } json_object *event_data; const char* data_str{nullptr}; @@ -108,7 +127,7 @@ int main(int argc, char *argv[]) ++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); + qDebug("Application received data from %s [count: %d, good: %d, bad %d]: %s", cloud_type, i_recv, i_confirm_good, i_confirm_bad, data_str); }); diff --git a/sample/test-cloud-app/app/main.cpp.save b/sample/test-cloud-app/app/main.cpp.save deleted file mode 100755 index 8236ada..0000000 --- a/sample/test-cloud-app/app/main.cpp.save +++ /dev/null @@ -1,148 +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 <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); - app.setDesktopFileName(graphic_role); - 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/sample/test-cloud-app/app/mainwindow.cpp b/sample/test-cloud-app/app/mainwindow.cpp index 355847c..1fcf50c 100755 --- a/sample/test-cloud-app/app/mainwindow.cpp +++ b/sample/test-cloud-app/app/mainwindow.cpp @@ -58,7 +58,6 @@ void MainWindow::updateStat() str.append("\n\nLast received message:\n"); str.append(lastReceivedMsg); ui->statLabel->setText(str); - //QApplication::processEvents(); } void MainWindow::sendMsgButtonClick() @@ -66,7 +65,8 @@ 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); + static int i{0}; + int res = g_cloudproxyclient->sendMessage((++i%2 ? CloudType::Azure : CloudType::Aws), msg); if (res == 0) ++sendCount; else |