Code Review
/
apps
/
onscreenapp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
sample/app: Allow to hang off data when activating the app
[apps/onscreenapp.git]
/
app
/
eventhandler.cpp
diff --git
a/app/eventhandler.cpp
b/app/eventhandler.cpp
index
c33022a
..
dfa0a12
100644
(file)
--- a/
app/eventhandler.cpp
+++ b/
app/eventhandler.cpp
@@
-29,6
+29,7
@@
const char _myrole[] = "on_screen";
const char _parameter[] = "parameter";
const char _replyto[] = "replyto";
const char _myrole[] = "on_screen";
const char _parameter[] = "parameter";
const char _replyto[] = "replyto";
+const char _onscreen_title[] = "onscreenTitle";
const char _button_name[] = "buttonName";
const char _drawing_name[] = "drawing_name";
const char _application_id[] = "application_id";
const char _button_name[] = "buttonName";
const char _drawing_name[] = "drawing_name";
const char _application_id[] = "application_id";
@@
-38,24
+39,19
@@
void* EventHandler::myThis = 0;
EventHandler::EventHandler(QObject *parent) :
QObject(parent),
EventHandler::EventHandler(QObject *parent) :
QObject(parent),
- mp_hs(nullptr),
- mp_wm(nullptr),
m_dsp_sts(false)
{
}
EventHandler::~EventHandler()
{
m_dsp_sts(false)
{
}
EventHandler::~EventHandler()
{
- if (mp_hs != nullptr) {
- delete mp_hs;
- }
- if (mp_wm != nullptr) {
- delete mp_wm;
- }
}
void EventHandler::init(int port, const char *token)
{
}
void EventHandler::init(int port, const char *token)
{
+ (void) port;
+ (void) token;
+#if 0
myThis = this;
mp_wm = new QLibWindowmanager();
mp_wm->init(port, token);
myThis = this;
mp_wm = new QLibWindowmanager();
mp_wm->init(port, token);
@@
-146,8
+142,10
@@
void EventHandler::init(int port, const char *token)
});
HMI_DEBUG(APP_ID, "LayoutHander::init() finished.");
});
HMI_DEBUG(APP_ID, "LayoutHander::init() finished.");
+#endif
}
}
+#if 0
void EventHandler::onRep_static(struct json_object* reply_contents)
{
static_cast<EventHandler*>(EventHandler::myThis)->onRep(reply_contents);
void EventHandler::onRep_static(struct json_object* reply_contents)
{
static_cast<EventHandler*>(EventHandler::myThis)->onRep(reply_contents);
@@
-158,15
+156,21
@@
void EventHandler::onRep(struct json_object* reply_contents)
const char* str = json_object_to_json_string(reply_contents);
HMI_DEBUG(APP_ID, "EventHandler::onReply %s", str);
}
const char* str = json_object_to_json_string(reply_contents);
HMI_DEBUG(APP_ID, "EventHandler::onReply %s", str);
}
+#endif
void EventHandler::activateWindow(const char *role, const char *area)
{
void EventHandler::activateWindow(const char *role, const char *area)
{
+#if 0
HMI_DEBUG(APP_ID, "EventHandler::activateWindow()");
mp_wm->activateWindow(role, area);
HMI_DEBUG(APP_ID, "EventHandler::activateWindow()");
mp_wm->activateWindow(role, area);
+#endif
+ fprintf(stderr, "EventHandler::activateWindow() role %s, area %s\n",
+ role, area);
}
void EventHandler::deactivateWindow()
{
}
void EventHandler::deactivateWindow()
{
+#if 0
HMI_DEBUG(APP_ID, "EventHandler::deactivateWindow()");
if(getDisplayStatus() == SWAPPING) {
setDisplayStatus(SHOWING);
HMI_DEBUG(APP_ID, "EventHandler::deactivateWindow()");
if(getDisplayStatus() == SWAPPING) {
setDisplayStatus(SHOWING);
@@
-178,14
+182,23
@@
void EventHandler::deactivateWindow()
this->setDisplayStatus(HIDING);
mp_wm->deactivateWindow(_myrole);
}
this->setDisplayStatus(HIDING);
mp_wm->deactivateWindow(_myrole);
}
+#endif
+ int display_status = getDisplayStatus();
+ fprintf(stderr, "EventHandler::deactivateWindow(), "
+ "display_status %d\n", display_status);
}
}
-void EventHandler::onScreenReply(const QString &btn_name)
+void EventHandler::onScreenReply(const QString &
ons_title, const QString &
btn_name)
{
{
-
HMI_DEBUG(APP_ID, "EventHandler::onScreenReply(),btn_name=%s"
, btn_name.toStdString().c_str());
+
fprintf(stderr, "ons_title=%s btn_name=%s\n", ons_title.toStdString().c_str()
, btn_name.toStdString().c_str());
emit this->hideOnScreen();
emit this->hideOnScreen();
+#if 0
struct json_object* j_param = json_object_new_object();
struct json_object* j_param = json_object_new_object();
+ json_object_object_add(j_param, _onscreen_title, json_object_new_string(ons_title.toStdString().c_str()));
json_object_object_add(j_param, _button_name, json_object_new_string(btn_name.toStdString().c_str()));
mp_hs->replyShowWindow(m_dsp.first.toStdString().c_str(), j_param);
json_object_object_add(j_param, _button_name, json_object_new_string(btn_name.toStdString().c_str()));
mp_hs->replyShowWindow(m_dsp.first.toStdString().c_str(), j_param);
+#endif
+ fprintf(stderr, "EventHandler::onScreenReply with ons_title %s, btn_name %s\n",
+ ons_title.toStdString().c_str(), btn_name.toStdString().c_str());
}
}