From 08dda21fcd7d492fcb279d14ace35bb5dc704958 Mon Sep 17 00:00:00 2001 From: Paul Kim Date: Tue, 30 Aug 2022 00:38:43 +0900 Subject: [PATCH] issue #2 Done room service feature. --- .gitignore | 5 ++ procentric/application/.vscode/bookmarks.json | 14 ----- .../application/hoteltv.app.full.popup.css | 7 ++- procentric/application/hoteltv.welcome.css | 25 +++++--- procentric/application/lib/hoteltv.js | 62 +++++++++---------- .../application/lib/hoteltv.ui_appfull.js | 8 ++- 6 files changed, 61 insertions(+), 60 deletions(-) create mode 100644 .gitignore delete mode 100755 procentric/application/.vscode/bookmarks.json diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..2711de1 --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +procentric/application/.vscode/bookmarks.json +procentric/.vscode/ +procentric/system/*.epk + + diff --git a/procentric/application/.vscode/bookmarks.json b/procentric/application/.vscode/bookmarks.json deleted file mode 100755 index 0289477..0000000 --- a/procentric/application/.vscode/bookmarks.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "files": [ - { - "path": "lib/hoteltv.ui_appfull.js", - "bookmarks": [ - { - "line": 538, - "column": 22, - "label": "" - } - ] - } - ] -} \ No newline at end of file diff --git a/procentric/application/hoteltv.app.full.popup.css b/procentric/application/hoteltv.app.full.popup.css index 0081fb4..eca875d 100755 --- a/procentric/application/hoteltv.app.full.popup.css +++ b/procentric/application/hoteltv.app.full.popup.css @@ -683,9 +683,9 @@ .popup .roomservice .description>#comment { width: 100%; height: 89px; - line-height: 22px; + line-height: 24px; overflow: hidden; - font-size: 18px; + font-size: 22px; padding: 5px 10px 5px 15px; white-space: pre-line; } @@ -1178,6 +1178,7 @@ width: 100%; height: 100%; background-color: rgb(36, 44, 56); + border: 1px solid rgb(255, 255, 255); } .popup .roomservice .alert>div#order-complete>div#title { @@ -1192,7 +1193,7 @@ } .popup .roomservice .alert>div#order-complete>div#message { - width: 100%; + width: 95%; float: left; margin: 40px 20px 5px 20px; font-size: 22px; diff --git a/procentric/application/hoteltv.welcome.css b/procentric/application/hoteltv.welcome.css index ff73ce0..c4c7922 100755 --- a/procentric/application/hoteltv.welcome.css +++ b/procentric/application/hoteltv.welcome.css @@ -34,7 +34,7 @@ body { padding: 0px; background-color: rgba(0, 0, 0, 1); background-image: none; - background-size: contain; + background-size: cover; background-repeat: no-repeat; display: none; } @@ -46,9 +46,10 @@ body { width: 884px; height: 648px; padding: 0px; - background-image: url(./images/bg_language_welcome_box.png); - background-size: cover; + /* background-image: url(./images/bg_language_welcome_box.png); + background-size: cover; */ background-repeat: no-repeat; + background: linear-gradient(rgba(45,45,45,0.6),rgba(16,16,16,0.7)); border-radius: 11px; filter: drop-shadow(0 0 20px rgba(0, 0, 0, 0.5)); } @@ -63,20 +64,23 @@ body { background-image: none; background-size: contain; background-repeat: no-repeat; - background-position: center; + /* background-position: center; */ + background-position: top; } .welcome .frame .msgwin #guestname { position: absolute; - top: 486px; + top: 424px; left: 0px; - width: 884px; + width: 804px; height: 65px; - padding: 0px; + padding: 0px 0px 5px 0px; + margin: 0px 40px 0px 40px; background-image: none; background-size: contain; background-repeat: no-repeat; background-position: center; + border-bottom: solid rgb(192,192,192) 3px; font-size: 65px; justify-content: center; text-align: center; @@ -88,11 +92,12 @@ body { .welcome .frame .msgwin #welcomemsg { position: absolute; - top: 584px; + top: 516px; left: 0px; - width: 884px; + width: 804px; height: 44px; - padding: 0px; + /* padding: 0px; */ + margin: 0px 40px 0px 40px; background-image: none; background-size: contain; background-repeat: no-repeat; diff --git a/procentric/application/lib/hoteltv.js b/procentric/application/lib/hoteltv.js index 21508a4..b649a5d 100755 --- a/procentric/application/lib/hoteltv.js +++ b/procentric/application/lib/hoteltv.js @@ -539,39 +539,39 @@ HotelTV.LoadAppFull = async function() { //STEP#03: INIT HCAP for HotelTV FullAPP - // let tmrAppAuth = setInterval(async function() { - // let _foundNetflix = false; - // let _hcapAppInfo = await HotelTV.hcap.PreAppGetInfo(false); - // HotelTV.state['hcap_app'] = _hcapAppInfo.applist; - // for (_i = 0; _i < HotelTV.state['hcap_app'].length; _i++) { - // if (HotelTV.state['hcap_app'][_i].title == "Netflix") { - // console.log("Found out netflix among of pre hcap app-list.") - // clearInterval(tmrAppAuth); - // } - // } + let tmrAppAuth = setInterval(async function() { + let _foundNetflix = false; + let _hcapAppInfo = await HotelTV.hcap.PreAppGetInfo(false); + HotelTV.state['hcap_app'] = _hcapAppInfo.applist; + for (_i = 0; _i < HotelTV.state['hcap_app'].length; _i++) { + if (HotelTV.state['hcap_app'][_i].title == "Netflix") { + console.log("Found out netflix among of pre hcap app-list.") + clearInterval(tmrAppAuth); + } + } - // if (_foundNetflix == false) { - // try { - // let siAppToken = null; - // let siAppName = null; - // // siApp Token Authentication - // let _progam = HotelTV.tvguide.program; - // for (let _i = 1; _i <= _progam.length; _i++) { - // if (_progam[_i].type == "application" && _progam[_i].service == "netflix") { - // siAppToken = await HotelTV.api.DownloadData(_progam[_i].license.file.download); - // siAppName = _progam[_i].service; - // //siAppToken = _progam[_i].service; + if (_foundNetflix == false) { + try { + let siAppToken = null; + let siAppName = null; + // siApp Token Authentication + let _progam = HotelTV.tvguide.program; + for (let _i = 1; _i <= _progam.length; _i++) { + if (_progam[_i].type == "application" && _progam[_i].service == "netflix") { + siAppToken = await HotelTV.api.DownloadData(_progam[_i].license.file.download); + siAppName = _progam[_i].service; + //siAppToken = _progam[_i].service; - // if (siAppName && siAppToken) { - // HotelTV.hcap.siAppAuth(siAppName, siAppToken, false); - // } - // } - // } - // } catch (_error) { - // console.log("Display Error page for get siApp Auth"); - // } - // } - // }, 5000); + if (siAppName && siAppToken) { + HotelTV.hcap.siAppAuth(siAppName, siAppToken, false); + } + } + } + } catch (_error) { + console.log("Display Error page for get siApp Auth"); + } + } + }, 5000); //STEP#05: Set Display size diff --git a/procentric/application/lib/hoteltv.ui_appfull.js b/procentric/application/lib/hoteltv.ui_appfull.js index 6275215..73952c3 100755 --- a/procentric/application/lib/hoteltv.ui_appfull.js +++ b/procentric/application/lib/hoteltv.ui_appfull.js @@ -495,7 +495,7 @@ HotelTV.ui_appfull = (function() { _elDiv_OdItmesRec.className = "oditem"; var _elDiv_OdItmesRecName = document.createElement('div'); _elDiv_OdItmesRecName.setAttribute("id", "name"); - _elDiv_OdItmesRecName.textContent = __fxn_getRsItemValue(_roomservice.children, "title", + _elDiv_OdItmesRecName.textContent =`[${_j}] ` + __fxn_getRsItemValue(_roomservice.children, "title", _OdItem.itemId)[_state.lang]; _elDiv_OdItmesRec.appendChild(_elDiv_OdItmesRecName); @@ -860,6 +860,9 @@ HotelTV.ui_appfull = (function() { } const __fxn_close_RsPopup = function(_fxn_post_process) { + // 아이템 디스크립션(메뉴 오른쪽) 하이드 + __uifxn_AppFull_DrawRoomservceItemDescription(false); + _elRsPupRoot.animate({ top: 96, left: -560 }, 500, () => { // 아이탬 테이블 스크롤 맨 위로 이동 _elRsMnItmTbl.animate({ scrollTop: 0 }, 200); @@ -942,6 +945,7 @@ HotelTV.ui_appfull = (function() { _state.hotkey.mm[_roomservice.button].status.button.idx = null; _state.hotkey.mm[_roomservice.button].status.focus = "menu"; _elRsMnItmTbl.children('tr').eq(_state.hotkey.mm[_roomservice.button].status.menu.idx).addClass('active'); + __uifxn_AppFull_DrawRoomservceItemDescription(true); } } else { _state.hotkey.mm[_roomservice.button].status.button.idx = null; @@ -1157,7 +1161,7 @@ HotelTV.ui_appfull = (function() { let _elRsMnItemTblHdr = _elRsMnItems.children('.tbl_header').children('tbody'); let _elRsMnItemTblRec = _elRsMnItems.children('.tbl_record').children('tbody'); // Drawing Item Table Headers - _elRsMnItemTblHdr.children('tr').children('th#type').text(`${_trTbl.ui.roomservice.title.item[_state.lang]}[${_roomservice.children.length}]`); + _elRsMnItemTblHdr.children('tr').children('th#type').text(`${_trTbl.ui.roomservice.title.item[_state.lang]} [${_roomservice.children.length}]`); _elRsMnItemTblHdr.children('tr').children('th#quantity').text(_trTbl.ui.roomservice.title.quantity[_state.lang]); // Delete elements under room service item table