summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwang_zhiqiang <wang_zhiqiang@dl.cn.nexty-ele.com>2018-12-06 17:03:23 +0800
committerwang_zhiqiang <wang_zhiqiang@dl.cn.nexty-ele.com>2018-12-06 17:03:23 +0800
commitfe3d069d19d4c11c9d905da1d4412a77295a438d (patch)
treecbd0cf819a1f688e035f752c4aeda213a9ddab9f
parentf42ae47fe425b8ef353ec72ff9edaff451206cb8 (diff)
modify onscreen qml file directorysandbox/wangzhiqiang/ons_dev
-rw-r--r--app/eventhandler.cpp10
-rw-r--r--doc/parts/showOnscreen.svg74
-rw-r--r--doc/readme.md12
-rw-r--r--sample/app/main.qml2
4 files changed, 88 insertions, 10 deletions
diff --git a/app/eventhandler.cpp b/app/eventhandler.cpp
index 39db933..d76fcbe 100644
--- a/app/eventhandler.cpp
+++ b/app/eventhandler.cpp
@@ -37,6 +37,7 @@ const char _button_press_mode[] = "buttonPressMode";
const char _button_press_state[] = "buttonPressState";
const char _drawing_name[] = "drawing_name";
const char _application_id[] = "application_id";
+const char _onscreen_directory[] = "/usr/lib/qt5/qml/AGL/OnScreen/";
void* EventHandler::myThis = 0;
@@ -89,8 +90,9 @@ void EventHandler::init(int port, const char *token)
return;
}
- QFileInfo file_info(file);
- if(!file_info.isFile() || !QString(file).contains(QString(_suffix), Qt::CaseSensitive)) {
+ QString qml_file = QString(_onscreen_directory) + file;
+ QFileInfo file_info(qml_file);
+ if(!file_info.isFile() || !qml_file.contains(QString(_suffix), Qt::CaseSensitive)) {
HMI_DEBUG(APP_ID, "received qml file error! file=%s.", file);
return;
}
@@ -116,10 +118,10 @@ void EventHandler::init(int port, const char *token)
m_dspreq = QString(replyto);
if(m_req.contains(m_dspreq)) {
- m_req[m_dspreq] = qMakePair(QString(file), QString(data));
+ m_req[m_dspreq] = qMakePair(qml_file, QString(data));
}
else
- m_req.insert(QString(m_dspreq), qMakePair(QString(file), QString(data)));
+ m_req.insert(QString(m_dspreq), qMakePair(qml_file, QString(data)));
if(area == nullptr)
this->activateWindow(ROLE_NAME);
diff --git a/doc/parts/showOnscreen.svg b/doc/parts/showOnscreen.svg
new file mode 100644
index 0000000..9a0447e
--- /dev/null
+++ b/doc/parts/showOnscreen.svg
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="1218px" preserveAspectRatio="none" style="width:1046px;height:1218px;" version="1.1" viewBox="0 0 1046 1218" width="1046px" zoomAndPan="magnify"><defs><filter height="300%" id="f1b9tedqunoeu5" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviation="2.0"/><feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/><feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/><feBlend in="SourceGraphic" in2="blurOut3" mode="normal"/></filter></defs><g><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="190" x="423.5" y="24.5332">show/hide onscreen phase</text><rect fill="#FFFFFF" filter="url(#f1b9tedqunoeu5)" height="178.5938" style="stroke: #000000; stroke-width: 2.0;" width="582" x="442" y="524.1406"/><rect fill="#FFFFFF" height="56.1875" style="stroke: none; stroke-width: 1.0;" width="582" x="442" y="646.5469"/><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="94" x2="94" y1="119.2188" y2="1129.9531"/><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="188" x2="188" y1="119.2188" y2="1129.9531"/><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="384" x2="384" y1="119.2188" y2="1129.9531"/><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="498.5" x2="498.5" y1="119.2188" y2="1129.9531"/><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="785.5" x2="785.5" y1="119.2188" y2="1129.9531"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="28" x="77" y="116.1426">user</text><ellipse cx="94" cy="44.6094" fill="#FEFECE" filter="url(#f1b9tedqunoeu5)" rx="8" ry="8" style="stroke: #A80036; stroke-width: 2.0;"/><path d="M94,52.6094 L94,79.6094 M81,60.6094 L107,60.6094 M94,79.6094 L81,94.6094 M94,79.6094 L107,94.6094 " fill="none" filter="url(#f1b9tedqunoeu5)" style="stroke: #A80036; stroke-width: 2.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="28" x="77" y="1143.4863">user</text><ellipse cx="94" cy="1156.5625" fill="#FEFECE" filter="url(#f1b9tedqunoeu5)" rx="8" ry="8" style="stroke: #A80036; stroke-width: 2.0;"/><path d="M94,1164.5625 L94,1191.5625 M81,1172.5625 L107,1172.5625 M94,1191.5625 L81,1206.5625 M94,1191.5625 L107,1206.5625 " fill="none" filter="url(#f1b9tedqunoeu5)" style="stroke: #A80036; stroke-width: 2.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="128" x="121" y="116.1426">homescreen-service</text><ellipse cx="188" cy="85.6094" fill="#FEFECE" filter="url(#f1b9tedqunoeu5)" rx="12" ry="12" style="stroke: #A80036; stroke-width: 2.0;"/><line style="stroke: #A80036; stroke-width: 2.0;" x1="176" x2="200" y1="99.6094" y2="99.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="128" x="121" y="1143.4863">homescreen-service</text><ellipse cx="188" cy="1162.5625" fill="#FEFECE" filter="url(#f1b9tedqunoeu5)" rx="12" ry="12" style="stroke: #A80036; stroke-width: 2.0;"/><line style="stroke: #A80036; stroke-width: 2.0;" x1="176" x2="200" y1="1176.5625" y2="1176.5625"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="25" x="368.5" y="116.1426">App</text><ellipse cx="384" cy="85.6094" fill="#FEFECE" filter="url(#f1b9tedqunoeu5)" rx="12" ry="12" style="stroke: #A80036; stroke-width: 2.0;"/><line style="stroke: #A80036; stroke-width: 2.0;" x1="372" x2="396" y1="99.6094" y2="99.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="25" x="368.5" y="1143.4863">App</text><ellipse cx="384" cy="1162.5625" fill="#FEFECE" filter="url(#f1b9tedqunoeu5)" rx="12" ry="12" style="stroke: #A80036; stroke-width: 2.0;"/><line style="stroke: #A80036; stroke-width: 2.0;" x1="372" x2="396" y1="1176.5625" y2="1176.5625"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="83" x="454.5" y="116.1426">onscreenapp</text><ellipse cx="499" cy="85.6094" fill="#FEFECE" filter="url(#f1b9tedqunoeu5)" rx="12" ry="12" style="stroke: #A80036; stroke-width: 2.0;"/><line style="stroke: #A80036; stroke-width: 2.0;" x1="487" x2="511" y1="99.6094" y2="99.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="83" x="454.5" y="1143.4863">onscreenapp</text><ellipse cx="499" cy="1162.5625" fill="#FEFECE" filter="url(#f1b9tedqunoeu5)" rx="12" ry="12" style="stroke: #A80036; stroke-width: 2.0;"/><line style="stroke: #A80036; stroke-width: 2.0;" x1="487" x2="511" y1="1176.5625" y2="1176.5625"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="101" x="732.5" y="116.1426">windowmanager</text><ellipse cx="786" cy="85.6094" fill="#FEFECE" filter="url(#f1b9tedqunoeu5)" rx="12" ry="12" style="stroke: #A80036; stroke-width: 2.0;"/><line style="stroke: #A80036; stroke-width: 2.0;" x1="774" x2="798" y1="99.6094" y2="99.6094"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="101" x="732.5" y="1143.4863">windowmanager</text><ellipse cx="786" cy="1162.5625" fill="#FEFECE" filter="url(#f1b9tedqunoeu5)" rx="12" ry="12" style="stroke: #A80036; stroke-width: 2.0;"/><line style="stroke: #A80036; stroke-width: 2.0;" x1="774" x2="798" y1="1176.5625" y2="1176.5625"/><rect fill="#EEEEEE" filter="url(#f1b9tedqunoeu5)" height="3" style="stroke: #EEEEEE; stroke-width: 1.0;" width="1031" x="3" y="150.3945"/><line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="1034" y1="150.3945" y2="150.3945"/><line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="1034" y1="153.3945" y2="153.3945"/><rect fill="#EEEEEE" filter="url(#f1b9tedqunoeu5)" height="24.3516" style="stroke: #000000; stroke-width: 2.0;" width="113" x="462" y="139.2188"/><text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="95" x="468" y="156.7139">show onscreen</text><polygon fill="#A80036" points="372,191.5703,382,195.5703,372,199.5703,376,195.5703" style="stroke: #A80036; stroke-width: 1.0;"/><line style="stroke: #A80036; stroke-width: 1.0;" x1="94" x2="378" y1="195.5703" y2="195.5703"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="179" x="101" y="191.0654">the operation request onscreen</text><polygon fill="#A80036" points="199,221.9219,189,225.9219,199,229.9219,195,225.9219" style="stroke: #A80036; stroke-width: 1.0;"/><line style="stroke: #A80036; stroke-width: 1.0;" x1="193" x2="383" y1="225.9219" y2="225.9219"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="84" x="205" y="221.417">showWindow()</text><path d="M55,239.2734 L55,298.2734 L513,298.2734 L513,249.2734 L503,239.2734 L55,239.2734 " fill="#FBFB77" filter="url(#f1b9tedqunoeu5)" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M503,239.2734 L503,249.2734 L513,249.2734 L503,239.2734 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="185" x="61" y="257.7686">{"application_id":"onscreenapp",</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="433" x="61" y="274.1201">"parameter":{"area":"display area", "file":"qml file path liked appid/xxx.qml",</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="216" x="61" y="290.4717">"data":{"the datas to onscreen qml"}}}</text><polygon fill="#A80036" points="487,325.3281,497,329.3281,487,333.3281,491,329.3281" style="stroke: #A80036; stroke-width: 1.0;"/><line style="stroke: #A80036; stroke-width: 1.0;" x1="188" x2="493" y1="329.3281" y2="329.3281"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="142" x="195" y="324.8232">push showWindow event</text><path d="M112,342.6797 L112,433.6797 L570,433.6797 L570,352.6797 L560,342.6797 L112,342.6797 " fill="#FBFB77" filter="url(#f1b9tedqunoeu5)" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M560,342.6797 L560,352.6797 L570,352.6797 L560,342.6797 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="185" x="118" y="361.1748">{"application_id":"onscreenapp",</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="433" x="118" y="377.5264">"parameter":{"area":"display area", "file":"qml file path liked appid/xxx.qml",</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="212" x="118" y="393.8779">"data":{"the datas to onscreen qml"},</text><text fill="#FF0000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="174" x="118" y="410.2295">"replyto":"caller application id"</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="8" x="118" y="426.5811">}}</text><line style="stroke: #A80036; stroke-width: 1.0;" x1="499" x2="541" y1="465.7891" y2="465.7891"/><line style="stroke: #A80036; stroke-width: 1.0;" x1="541" x2="541" y1="465.7891" y2="478.7891"/><line style="stroke: #A80036; stroke-width: 1.0;" x1="500" x2="541" y1="478.7891" y2="478.7891"/><polygon fill="#A80036" points="510,474.7891,500,478.7891,510,482.7891,506,478.7891" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="142" x="506" y="460.9326">get and save parameters</text><polygon fill="#A80036" points="774,504.7891,784,508.7891,774,512.7891,778,508.7891" style="stroke: #A80036; stroke-width: 1.0;"/><line style="stroke: #A80036; stroke-width: 1.0;" x1="499" x2="780" y1="508.7891" y2="508.7891"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="263" x="506" y="504.2842">activateWindow("onscreeapp", "display area")</text><path d="M442,524.1406 L503,524.1406 L503,532.1406 L493,542.1406 L442,542.1406 L442,524.1406 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/><rect fill="none" height="178.5938" style="stroke: #000000; stroke-width: 2.0;" width="582" x="442" y="524.1406"/><text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="16" x="457" y="538.6357">alt</text><text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="61" x="518" y="537.5596">[can show]</text><polygon fill="#A80036" points="510,560.4922,500,564.4922,510,568.4922,506,564.4922" style="stroke: #A80036; stroke-width: 1.0;"/><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="504" x2="785" y1="564.4922" y2="564.4922"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="123" x="516" y="559.9873">push syncDraw event</text><polygon fill="#A80036" points="774,590.8438,784,594.8438,774,598.8438,778,594.8438" style="stroke: #A80036; stroke-width: 1.0;"/><line style="stroke: #A80036; stroke-width: 1.0;" x1="499" x2="780" y1="594.8438" y2="594.8438"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="135" x="506" y="590.3389">endDraw("onscreeapp")</text><line style="stroke: #A80036; stroke-width: 1.0;" x1="499" x2="541" y1="625.5469" y2="625.5469"/><line style="stroke: #A80036; stroke-width: 1.0;" x1="541" x2="541" y1="625.5469" y2="638.5469"/><line style="stroke: #A80036; stroke-width: 1.0;" x1="500" x2="541" y1="638.5469" y2="638.5469"/><polygon fill="#A80036" points="510,634.5469,500,638.5469,510,642.5469,506,638.5469" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="139" x="506" y="620.6904">load and display qml file</text><path d="M657,609.6953 L657,635.6953 L1005,635.6953 L1005,619.6953 L995,609.6953 L657,609.6953 " fill="#FBFB77" filter="url(#f1b9tedqunoeu5)" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M995,609.6953 L995,619.6953 L1005,619.6953 L995,609.6953 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="327" x="663" y="628.1904">qml path "/usr/lib/qt5/qml/AGL/OnScreen/appid/xxx.qml"</text><line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="442" x2="1024" y1="647.5469" y2="647.5469"/><text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="68" x="447" y="658.9658">[can't show]</text><path d="M452,667.3828 L452,693.3828 L832,693.3828 L832,677.3828 L822,667.3828 L452,667.3828 " fill="#FBFB77" filter="url(#f1b9tedqunoeu5)" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M822,667.3828 L822,677.3828 L832,677.3828 L822,667.3828 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="60" x="605.5" y="685.8779">do nothing</text><rect fill="#EEEEEE" filter="url(#f1b9tedqunoeu5)" height="3" style="stroke: #EEEEEE; stroke-width: 1.0;" width="1031" x="3" y="730.9102"/><line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="1034" y1="730.9102" y2="730.9102"/><line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="1034" y1="733.9102" y2="733.9102"/><rect fill="#EEEEEE" filter="url(#f1b9tedqunoeu5)" height="24.3516" style="stroke: #000000; stroke-width: 2.0;" width="108" x="464.5" y="719.7344"/><text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="90" x="470.5" y="737.2295">hide onscreen</text><polygon fill="#A80036" points="487,772.0859,497,776.0859,487,780.0859,491,776.0859" style="stroke: #A80036; stroke-width: 1.0;"/><line style="stroke: #A80036; stroke-width: 1.0;" x1="94" x2="493" y1="776.0859" y2="776.0859"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="124" x="101" y="771.5811">tap onscreen's button</text><polygon fill="#A80036" points="199,802.4375,189,806.4375,199,810.4375,195,806.4375" style="stroke: #A80036; stroke-width: 1.0;"/><line style="stroke: #A80036; stroke-width: 1.0;" x1="193" x2="498" y1="806.4375" y2="806.4375"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="114" x="205" y="801.9326">replyShowWindow()</text><path d="M8,819.7891 L8,861.7891 L675,861.7891 L675,829.7891 L665,819.7891 L8,819.7891 " fill="#FBFB77" filter="url(#f1b9tedqunoeu5)" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M665,819.7891 L665,829.7891 L675,829.7891 L665,819.7891 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="352" x="14" y="838.2842">{"application_id":"the application id who called onscreenapp",</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="646" x="14" y="854.6357">"parameter": {"buttonName": "VOLUME_UP", "buttonPressMode": "shortPress", "buttonPressState": "release"}}</text><polygon fill="#A80036" points="372,889.4922,382,893.4922,372,897.4922,376,893.4922" style="stroke: #A80036; stroke-width: 1.0;"/><line style="stroke: #A80036; stroke-width: 1.0;" x1="188" x2="378" y1="893.4922" y2="893.4922"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="172" x="195" y="888.9873">push replyShowWindow event</text><line style="stroke: #A80036; stroke-width: 1.0;" x1="384" x2="426" y1="924.1953" y2="924.1953"/><line style="stroke: #A80036; stroke-width: 1.0;" x1="426" x2="426" y1="924.1953" y2="937.1953"/><line style="stroke: #A80036; stroke-width: 1.0;" x1="385" x2="426" y1="937.1953" y2="937.1953"/><polygon fill="#A80036" points="395,933.1953,385,937.1953,395,941.1953,391,937.1953" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="101" x="391" y="919.3389">call reply function</text><polygon fill="#A80036" points="199,963.1953,189,967.1953,199,971.1953,195,967.1953" style="stroke: #A80036; stroke-width: 1.0;"/><line style="stroke: #A80036; stroke-width: 1.0;" x1="193" x2="383" y1="967.1953" y2="967.1953"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="162" x="205" y="962.6904">hideWindow("onscreenapp")</text><polygon fill="#A80036" points="487,993.5469,497,997.5469,487,1001.5469,491,997.5469" style="stroke: #A80036; stroke-width: 1.0;"/><line style="stroke: #A80036; stroke-width: 1.0;" x1="188" x2="493" y1="997.5469" y2="997.5469"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="136" x="195" y="993.042">push hideWindow event</text><path d="M134,1010.8984 L134,1036.8984 L551,1036.8984 L551,1020.8984 L541,1010.8984 L134,1010.8984 " fill="#FBFB77" filter="url(#f1b9tedqunoeu5)" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M541,1010.8984 L541,1020.8984 L551,1020.8984 L541,1010.8984 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="308" x="182.25" y="1029.3936">{"application_id":"request hideWindow application id"}</text><polygon fill="#A80036" points="774,1064.25,784,1068.25,774,1072.25,778,1068.25" style="stroke: #A80036; stroke-width: 1.0;"/><line style="stroke: #A80036; stroke-width: 1.0;" x1="499" x2="780" y1="1068.25" y2="1068.25"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="200" x="506" y="1063.7451">deactivateWindow("onscreenapp");</text><line style="stroke: #A80036; stroke-width: 1.0;" x1="499" x2="541" y1="1098.9531" y2="1098.9531"/><line style="stroke: #A80036; stroke-width: 1.0;" x1="541" x2="541" y1="1098.9531" y2="1111.9531"/><line style="stroke: #A80036; stroke-width: 1.0;" x1="500" x2="541" y1="1111.9531" y2="1111.9531"/><polygon fill="#A80036" points="510,1107.9531,500,1111.9531,510,1115.9531,506,1111.9531" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="70" x="506" y="1094.0967">hide window</text><!--
+@startuml
+
+title show/hide onscreen phase
+
+actor user
+entity "homescreen-service" as hss
+entity App
+entity onscreenapp
+entity windowmanager as wm
+
+== show onscreen ==
+user->App: the operation request onscreen
+App->hss: showWindow()
+note over App,hss
+{"application_id":"onscreenapp",
+"parameter":{"area":"display area", "file":"qml file path liked appid/xxx.qml",
+"data":{"the datas to onscreen qml"}}}
+end note
+
+hss->onscreenapp: push showWindow event
+note over hss,onscreenapp
+{"application_id":"onscreenapp",
+"parameter":{"area":"display area", "file":"qml file path liked appid/xxx.qml",
+"data":{"the datas to onscreen qml"},
+<font color=red >"replyto":"caller application id"
+}}
+end note
+
+onscreenapp->onscreenapp: get and save parameters
+onscreenapp->wm: activateWindow("onscreeapp", "display area")
+alt can show
+wm- ->onscreenapp: push syncDraw event
+onscreenapp->wm: endDraw("onscreeapp")
+onscreenapp->onscreenapp: load and display qml file
+note right: qml path "/usr/lib/qt5/qml/AGL/OnScreen/appid/xxx.qml"
+
+else can't show
+note over onscreenapp,wm
+do nothing
+end note
+end
+
+== hide onscreen ==
+
+user->onscreenapp: tap onscreen's button
+onscreenapp->hss: replyShowWindow()
+note over onscreenapp,hss
+{"application_id":"the application id who called onscreenapp",
+"parameter": {"buttonName": "VOLUME_UP", "buttonPressMode": "shortPress", "buttonPressState": "release"}}
+end note
+hss->App: push replyShowWindow event
+App->App: call reply function
+App->hss: hideWindow("onscreenapp")
+hss->onscreenapp: push hideWindow event
+note over hss,onscreenapp
+{"application_id":"request hideWindow application id"}
+end note
+onscreenapp->wm: deactivateWindow("onscreenapp");
+onscreenapp->onscreenapp: hide window
+
+@enduml
+
+PlantUML version 1.2018.01(Mon Jan 29 02:08:22 CST 2018)
+(GPL source distribution)
+Java Runtime: Java(TM) SE Runtime Environment
+JVM: Java HotSpot(TM) 64-Bit Server VM
+Java Version: 1.8.0_45-b15
+Operating System: Windows 7
+OS Version: 6.1
+Default Encoding: MS932
+Language: ja
+Country: JP
+--></g></svg> \ No newline at end of file
diff --git a/doc/readme.md b/doc/readme.md
index 0b6ba93..025dfa3 100644
--- a/doc/readme.md
+++ b/doc/readme.md
@@ -4,10 +4,12 @@ usage of onscreenapp
## dependence
-Onscreenapp depend on libhomescreen add agl-service-homescreen as below:
-- libhomescreen must have 'showWindow/hideWindow/replyShowWindow' event
- and 'showWindow/hideWindow/replyShowWindow' interface.
-- agl-service-homescreen must have 'showWindow/hideWindow/replyShowWindow' verbs.
+- Onscreenapp depend on libhomescreen add agl-service-homescreen as below:
+ - libhomescreen must have 'showWindow/hideWindow/replyShowWindow' event
+ and 'showWindow/hideWindow/replyShowWindow' interface.
+ - agl-service-homescreen must have 'showWindow/hideWindow/replyShowWindow' verbs.
+
+- Application need to deploy their onscreen qml file to "/usr/lib/qt5/qml/AGL/OnScreen/appid/" folder.
## sequence
@@ -26,7 +28,7 @@ onstestapp is a sample to use onscreenapp.
### onstestapp usage
-Before start onstestapp you must copy all files in "qml" folder to "$HOME/app-data/OnScreen/onstestapp/" on your board(R-car M3 etc.),
+Before start onstestapp you must copy all files in "qml" folder to "/usr/lib/qt5/qml/AGL/OnScreen/onstestapp/" on your board(R-car M3 etc.),
then do as below:
1. start onstestapp in launcher
diff --git a/sample/app/main.qml b/sample/app/main.qml
index 5a70102..3225dcd 100644
--- a/sample/app/main.qml
+++ b/sample/app/main.qml
@@ -12,7 +12,7 @@ ApplicationWindow {
height: 1487
property string onsId: qsTr("onscreenapp")
- property string pri_path: qsTr("/home/0/app-data/OnScreen/onstestapp/")
+ property string pri_path: qsTr("onstestapp/")
property string filepath: pri_path + qsTr("vics.qml")
property string msgdata: ""
property string postmsg: ""