QT = qml quick dbus websockets
CONFIG += c++11 link_pkgconfig
DESTDIR = $${OUT_PWD}/../package/root/bin
-PKGCONFIG += qlibwindowmanager qtappfw
+PKGCONFIG += libwindowmanager qtappfw
-LIBS += -lhomescreen
+LIBS += -lhomescreen -lwindowmanager
include(../interfaces/interfaces.pri)
<file>menubar_full_background.png</file>
<file>fullscreen.png</file>
<file>normal.png</file>
+ <file>split_switch.png</file>
+ <file>split_switch_disable.png</file>
</qresource>
</RCC>
}
}
-
-
-
-
Item {
id: switchBtn
- width: 110
- height: 110
+ width: 61
+ height: 61
anchors.right: parent.right
+ anchors.rightMargin: 17
anchors.top: parent.top
+ anchors.topMargin: 2
z: 1
Image {
id: image
width: 55
height: 55
- anchors.right: parent.right
- anchors.rightMargin: 20
- anchors.top: parent.top
- anchors.topMargin: 5
+ anchors.centerIn: parent
source: './images/normal.png'
}
}
}
}
+
+ Item {
+ id: splitSwitchBtn
+ width: 61
+ height: 61
+ anchors.right: switchBtn.left
+ anchors.top: parent.top
+ anchors.topMargin: 2
+ z: 1
+ property bool enableSplitSwitchBtn: false
+ Image {
+ id: splitSwitchImage
+ width: 55
+ height: 55
+ anchors.centerIn: parent
+ source: './images/split_switch_disable.png'
+ }
+
+ MouseArea {
+ property bool changed : false
+ anchors.fill: parent
+ onClicked: {
+ if (splitSwitchBtn.enableSplitSwitchBtn) {
+ if(changed) {
+ switchSplitArea(0)
+ changed = false
+ }
+ else {
+ switchSplitArea(1)
+ changed = true
+ }
+ }
+ }
+ }
+ }
+
+
function turnToFullscreen() {
image.source = './images/fullscreen.png'
container.state = 'fullscreen'
container.opacity = 0.0
touchArea.switchArea(1)
}
+
function turnToNormal() {
image.source = './images/normal.png'
container.state = 'normal'
container.opacity = 1.0
touchArea.switchArea(0)
}
+
+ function enableSplitSwitchBtn() {
+ splitSwitchImage.source = './images/split_switch.png'
+ splitSwitchBtn.enableSplitSwitchBtn = true
+ }
+
+ function disableSplitSwitchBtn() {
+ splitSwitchImage.source = './images/split_switch_disable.png'
+ splitSwitchBtn.enableSplitSwitchBtn = false;
+ }
+
+ function switchSplitArea(val) {
+ homescreenHandler.changeLayout(val);
+ }
}
#include "homescreenhandler.h"
#include <functional>
+#include <QQmlApplicationEngine>
+#include <QtQuick/QQuickWindow>
#include "hmi-debug.h"
void* HomescreenHandler::myThis = 0;
HomescreenHandler::HomescreenHandler(QObject *parent) :
QObject(parent),
- mp_hs(NULL)
+ mp_hs(NULL), mp_wm(NULL), m_role()
{
}
if (mp_hs != NULL) {
delete mp_hs;
}
+ if (mp_wm != NULL) {
+ delete mp_wm;
+ }
}
-void HomescreenHandler::init(int port, const char *token)
+void HomescreenHandler::init(const char* role, int port, const char *token)
{
+ this->m_role = role;
+
+ // LibWindowManager initialize
+ mp_wm = new LibWindowmanager();
+ if(mp_wm->init(port,token) != 0){
+ exit(EXIT_FAILURE);
+ }
+
+ int surface = mp_wm->requestSurface(m_role.c_str());
+ if (surface < 0) {
+ exit(EXIT_FAILURE);
+ }
+ std::string ivi_id = std::to_string(surface);
+ setenv("QT_IVI_SURFACE_ID", ivi_id.c_str(), true);
+
+ // LibHomeScreen initialize
mp_hs = new LibHomeScreen();
mp_hs->init(port, token);
});
}
+void HomescreenHandler::setWMHandler(WMHandler& h) {
+ h.on_sync_draw = [&](const char* role, const char* area, Rect r) {
+ this->mp_wm->endDraw(this->m_role.c_str());
+ };
+ mp_wm->setEventHandler(h);
+}
+
+void HomescreenHandler::disconnect_frame_swapped(void)
+{
+ qDebug("Let's start homescreen");
+ QObject::disconnect(this->loading);
+ mp_wm->activateWindow(m_role.c_str(), "fullscreen");
+}
+
+void HomescreenHandler::attach(QQmlApplicationEngine* engine)
+{
+ QQuickWindow *window = qobject_cast<QQuickWindow *>(engine->rootObjects().first());
+ this->loading = QObject::connect(window, SIGNAL(frameSwapped()), this, SLOT(disconnect_frame_swapped()));
+}
+
+void HomescreenHandler::changeLayout(int pattern)
+{
+ HMI_NOTICE("HomeScreen", "Pressed %d, %s", pattern,
+ (pattern == P_LEFT_METER_RIGHT_MAP) ? "left:meter, right:map": "left:map, right:meter");
+ ChangeAreaReq req;
+ std::unordered_map<std::string, Rect> map_list;
+ switch(pattern) {
+ case P_LEFT_METER_RIGHT_MAP:
+ map_list["split.main"] = Rect(0, 0, 1280, 720);
+ map_list["split.sub"] = Rect(1280, 0, 640, 720);
+ break;
+ case P_LEFT_MAP_RIGHT_METER:
+ map_list["split.main"] = Rect(640, 0, 1280, 720);
+ map_list["split.sub"] = Rect(0, 0, 640, 720);
+ break;
+ default:
+ break;
+ }
+ if(map_list.size() != 0)
+ {
+ req.setAreaReq(map_list);
+ HMI_NOTICE("Homescreen", "Change layout");
+ mp_wm->changeAreaSize(req);
+ }
+}
+
void HomescreenHandler::tapShortcut(QString application_name)
{
HMI_DEBUG("HomeScreen","tapShortcut %s", application_name.toStdString().c_str());
#include <QObject>
#include <libhomescreen.hpp>
+#include <libwindowmanager.h>
#include <string>
using namespace std;
+class QQmlApplicationEngine;
+
class HomescreenHandler : public QObject
{
Q_OBJECT
public:
+ enum CHANGE_LAYOUT_PATTERN {
+ P_LEFT_METER_RIGHT_MAP = 0,
+ P_LEFT_MAP_RIGHT_METER
+ };
+ Q_ENUMS(CHANGE_LAYOUT_PATTERN)
explicit HomescreenHandler(QObject *parent = 0);
~HomescreenHandler();
- void init(int port, const char* token);
+ void init(const char* role, int port, const char* token);
+ void attach(QQmlApplicationEngine* engine);
+ void setWMHandler(WMHandler &handler);
Q_INVOKABLE void tapShortcut(QString application_name);
+ Q_INVOKABLE void changeLayout(int pattern);
void onRep(struct json_object* reply_contents);
void onEv(const string& event, struct json_object* event_contents);
void notification(QString id, QString icon, QString text);
void information(QString text);
+private Q_SLOTS:
+ void disconnect_frame_swapped(void);
+
private:
LibHomeScreen *mp_hs;
+ LibWindowmanager *mp_wm;
+ std::string m_role;
+ QMetaObject::Connection loading;
};
#endif // HOMESCREENHANDLER_H
#include <QQuickWindow>
#include <QThread>
-#include <qlibwindowmanager.h>
#include <weather.h>
#include <bluetooth.h>
#include "applicationlauncher.h"
int main(int argc, char *argv[])
{
QGuiApplication a(argc, argv);
+ const char* graphic_role = "homescreen";
// use launch process
QScopedPointer<org::AGL::afm::user, Cleanup> afm_user_daemon_proxy(new org::AGL::afm::user("org.AGL.afm.user",
ApplicationLauncher *launcher = new ApplicationLauncher();
HomescreenHandler* homescreenHandler = new HomescreenHandler();
- homescreenHandler->init(port, token.toStdString().c_str());
-
- QLibWindowmanager* layoutHandler = new QLibWindowmanager();
- if(layoutHandler->init(port,token) != 0){
- exit(EXIT_FAILURE);
- }
-
- if (layoutHandler->requestSurface(QString("homescreen")) != 0) {
- exit(EXIT_FAILURE);
- }
+ homescreenHandler->init(graphic_role, port, token.toStdString().c_str());
QUrl bindingAddress;
bindingAddress.setScheme(QStringLiteral("ws"));
// mail.qml loading
QQmlApplicationEngine engine;
-// engine.rootContext()->setContextProperty("layoutHandler", layoutHandler);
engine.rootContext()->setContextProperty("homescreenHandler", homescreenHandler);
engine.rootContext()->setContextProperty("touchArea", touchArea);
engine.rootContext()->setContextProperty("launcher", launcher);
QObject *root = engine.rootObjects().first();
- layoutHandler->set_event_handler(QLibWindowmanager::Event_SyncDraw, [layoutHandler](json_object *object) {
- layoutHandler->endDraw(QString("homescreen"));
- });
-
- layoutHandler->set_event_handler(QLibWindowmanager::Event_ScreenUpdated, [layoutHandler, launcher, root](json_object *object) {
- json_object *jarray = json_object_object_get(object, "ids");
- int arrLen = json_object_array_length(jarray);
+ WMHandler wmh;
+ wmh.on_screen_updated = [launcher, root](std::vector<std::string> list) {
+ for(const auto& i : list) {
+ HMI_DEBUG("HomeScreen", "ids=%s", i.c_str());
+ }
+ int arrLen = list.size();
+ QString label = QString("");
for( int idx = 0; idx < arrLen; idx++)
{
- QString label = QString(json_object_get_string( json_object_array_get_idx(jarray, idx) ));
+ label = list[idx].c_str();
HMI_DEBUG("HomeScreen","Event_ScreenUpdated application: %s.", label.toStdString().c_str());
QMetaObject::invokeMethod(launcher, "setCurrent", Qt::QueuedConnection, Q_ARG(QString, label));
if(label == "launcher") {
QMetaObject::invokeMethod(root, "turnToNormal");
-// homescreenHandler->emitTurnToFullscreen(false);
} else {
QMetaObject::invokeMethod(root, "turnToFullscreen");
-// homescreenHandler->emitTurnToFullscreen(true);
+ }
+ if((arrLen == 1) && (QString("restriction") != label)) {
+ QMetaObject::invokeMethod(root, "disableSplitSwitchBtn");
+ } else {
+ QMetaObject::invokeMethod(root, "enableSplitSwitchBtn");
}
}
- });
+ };
+ homescreenHandler->setWMHandler(wmh);
+ homescreenHandler->attach(&engine);
QQuickWindow *window = qobject_cast<QQuickWindow *>(root);
StatusBarModel *statusBar = sobjs.first()->findChild<StatusBarModel *>("statusBar");
statusBar->init(bindingAddress, engine.rootContext());
- QObject::connect(window, SIGNAL(frameSwapped()), layoutHandler, SLOT(slotActivateSurface()));
-
return a.exec();
}
Code Review / apps / homescreen.git / commitdiff
