diff --git a/procentric/application/hoteltv.welcome.css b/procentric/application/hoteltv.welcome.css
deleted file mode 100755
index c69ab23..0000000
--- a/procentric/application/hoteltv.welcome.css
+++ /dev/null
@@ -1,179 +0,0 @@
-body {
- overflow: hidden;
-}
-
-.welcome {
- position: absolute;
- top: 0px;
- left: 0px;
- width: 1920px;
- height: 1080px;
- padding: 0px;
- display: none;
- z-index: 1;
-}
-
-.welcome .frame {
- position: absolute;
- top: 0px;
- left: 0px;
- width: 100%;
- height: 100%;
- padding: 0px;
- background-color: rgba(0, 0, 0, 1);
- background-image: none;
- background-size: cover;
- background-repeat: no-repeat;
- display: none;
-}
-
-.welcome .frame .msgwin {
- position: absolute;
- top: 98px;
- left: 519px;
- width: 884px;
- height: 648px;
- padding: 0px;
- /* 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));
-}
-
-.welcome .frame .msgwin #hotellogo {
- position: absolute;
- top: 108px;
- left: 135px;
- width: 634px;
- height: 270px;
- padding: 0px;
- background-image: none;
- background-size: contain;
- background-repeat: no-repeat;
- /* background-position: center; */
- background-position: top;
-}
-
-.welcome .frame .msgwin #guestname {
- position: absolute;
- top: 424px;
- left: 0px;
- width: 804px;
- height: 65px;
- 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;
- color: rgb(235, 235, 235);
- line-height: 65px;
- max-width: 864px;
- display: none;
-}
-
-.welcome .frame .msgwin #welcomemsg {
- position: absolute;
- top: 516px;
- left: 0px;
- width: 804px;
- height: 44px;
- /* padding: 0px; */
- margin: 0px 40px 0px 40px;
- background-image: none;
- background-size: contain;
- background-repeat: no-repeat;
- background-position: center;
- font-size: 33px;
- justify-content: center;
- text-align: center;
- color: rgb(235, 235, 235);
- line-height: 33px;
- max-width: 864px;
- display: none;
-}
-
-.welcome .frame .guide#langsel {
- position: absolute;
- top: 1037px;
- left: 0px;
- width: 1920px;
- height: 54px;
- background-color: rgba(0, 0, 0, 0.8);
- display: inline-block;
- color: rgba(200, 200, 200, 1);
- font-size: 32px;
- line-height: 43px;
- text-align: center;
- border-top: solid rgb(128, 128, 128);
-}
-
-.welcome #lst_langsel {
- position: absolute;
- top: 962px;
- left: 0;
- height: 76px;
- line-height: 76px;
- margin: 0;
- padding: 0;
- overflow: hidden;
- display: none;
-}
-
-.welcome #lst_langsel .item {
- color: rgba(200, 200, 200, 1);
- font-size: 44px;
- text-align: center;
- background-repeat: no-repeat;
- background-size: cover;
-}
-
-.welcome #lst_langsel .owl-item.active.center div {
- background-image: var(--btn_focus);
-}
-
-.welcome #lst_langsel .owl-item.active div {
- background-image: var(--btn_unfocus);
-}
-
-.control .skip_video {
- z-index: 10000;
- position: absolute;
- z-index: 10000;
- top: 927px;
- left: 1579px;
- width: 246px;
- height: 68px;
- padding: 0px;
- background-color: rgba(0, 0, 0, 0.0);
- background-image: none;
- background-size: contain;
- background-repeat: no-repeat;
- display: none;
-}
-
-#debugwin {
- z-index: 10000;
- position: absolute;
- top: 11px;
- bottom: 22px;
- right: 11px;
- font-size: 12px;
- background-color: rgba(18, 18, 18, 0.3);
- text-align: left;
- color: rgb(235, 235, 235);
- line-height: 24px;
- padding-left: 5px;
- padding-top: 5px;
- display: inline-flex;
- max-width: 500px;
- overflow-wrap: break-word;
- word-wrap: break-word;
- display: none;
-}
\ No newline at end of file
diff --git a/procentric/application/lib/hoteltv.api.js b/procentric/application/lib/hoteltv.api.js
index 599fb09..3ee924e 100755
--- a/procentric/application/lib/hoteltv.api.js
+++ b/procentric/application/lib/hoteltv.api.js
@@ -812,7 +812,7 @@ HotelTV.api = (function() {
"second": 344632,
"string": "03d23h43m52s"
},
- "api_ver": "v1"
+ "api_ver": "v3"
};
const _fxn_cvtDateFmt1 = function(_date) {
diff --git a/procentric/application/lib/hoteltv.js b/procentric/application/lib/hoteltv.js
index dc01f3b..02914d3 100755
--- a/procentric/application/lib/hoteltv.js
+++ b/procentric/application/lib/hoteltv.js
@@ -120,9 +120,9 @@ HotelTV.namespace = function(ns_string) {
* @param {string} sz_key property key name.
* @param {callback} callback is callback object
*/
-function __fxn_Set_DebugOpt() {
- HotelTV.dbginfo['en'] = true;
- HotelTV.dbginfo['output'] = 'native';
+function __fxn_Set_DebugOpt(_enable, _out_option, _init) {
+ HotelTV.dbginfo['en'] = _enable;
+ HotelTV.dbginfo['output'] = _out_option;
HotelTV.hcap.Init();
@@ -142,9 +142,9 @@ function __fxn_Set_DebugOpt() {
if (HotelTV.dbginfo['output'] == 'osd') {
if (HotelTV.dbginfo['en'] == true) {
- (function() {
- var old = console.log;
- var logger = document.getElementById('debugwin');
+ var logger = document.getElementById('debugwin');
+ if ( logger!=null )
+ {
var dateNow = new Date();
var hours = dateNow.getHours();
var minutes = dateNow.getMinutes();
@@ -158,6 +158,11 @@ function __fxn_Set_DebugOpt() {
if (seconds < 10) {
seconds = "0" + seconds;
}
+
+ if(logger.style.display!='block'){
+ logger.style.display = 'block';
+ }
+
console.log = function(logmsg) {
var _dispMsg = hours + ":" + minutes + ":" + seconds + "-> ";
if (typeof logmsg == 'object') {
@@ -166,18 +171,20 @@ function __fxn_Set_DebugOpt() {
_dispMsg += logmsg + '
';
}
_dispMsg += logger.innerHTML;
-
logger.innerHTML = _dispMsg;
}
- })();
+ }
}
} else {
/** Set HCAP Debug Options */
if (HotelTV.dbginfo['emulator'] == false) {
//Enable/Disable browser debug mode
HotelTV.hcap.SetBrowserDebug(HotelTV.dbginfo['hcap_ipc'], HotelTV.dbginfo['en']);
- } else {
- //Below for Non WebOS
+ }
+
+ if (HotelTV.dbginfo['en'] != true) {
+ console.log = function(logmsg) {
+ }
}
}
};
@@ -192,7 +199,7 @@ HotelTV.Init = async function() {
HotelTV.hcap.ChannelShutDown();
//SETP#02::> Set Debug Options
- __fxn_Set_DebugOpt();
+ __fxn_Set_DebugOpt(false, 'osd', false);
//STEP#03::> Get Device Info
HotelTV.ui_utils.SetBusy(true);
@@ -200,7 +207,7 @@ HotelTV.Init = async function() {
await HotelTV.hcap.GetDevInfo();
//await HotelTV.hcap.ShowDevInfo();
} catch (_error) {
- let _tmval = 10;
+ let _tmval = 50;
HotelTV.ui_utils.ShowErrMsg(true,
"system.error.get-devinfo",
"SYSTEM ERROR",
@@ -392,6 +399,7 @@ HotelTV.Init = async function() {
try {
HotelTV.widget = await HotelTV.api.GetWidgetCtz();
} catch (_error) {
+ let _tmval = 50;
//console.log("Display Error page for get widget info");
HotelTV.ui_utils.ShowErrMsg(true,
"system.error.get-widget",
@@ -415,6 +423,7 @@ HotelTV.Init = async function() {
try {
HotelTV.tvguide = await HotelTV.api.GetProgramCtz();
} catch (_error) {
+ let _tmval = 50;
//console.log("Display Error page for get tvguide info");
HotelTV.ui_utils.ShowErrMsg(true,
"system.error.get-tvguideinfo",
@@ -484,7 +493,25 @@ HotelTV.Init = async function() {
}
}
} else {
- console.error("Display Error page for invalid license type.");
+ let _tmval = 30;
+ HotelTV.ui_utils.ShowErrMsg(true,
+ "system.error.unregistered-device",
+ "SYSTEM ERROR",
+ "This device is not a registered device or is an invalid licensed device.\r\nplease contact your system administrator.",
+ {
+ "timeout": _tmval,
+ "cb_disp": function() {
+ _tmval -= 1;
+ $('.error #countdown #message').text(`The Device ID is ${HotelTV.devinfo.serial_number}.\r\n\r\nSystem need to be reboot`);
+ if ($('.error #countdown').css("display") == "none") {
+ $('.error #countdown').fadeIn(1000);
+ }
+ },
+ "cb_eoe": function() {
+ $('.error #countdown #message').text(`The Device ID is ${HotelTV.devinfo.serial_number}.\r\n\r\nPlease reboot the device by manualy(using remote contoller)`);
+ }
+ }
+ );
}
console.log("Initialization:: Done");
HotelTV.ui_utils.SetBusy(false);
@@ -497,6 +524,9 @@ HotelTV.LoadWelCome = async function() {
extDisableHcapConsoleLog = true;
HotelTV.dbginfo = await JSON.parse(sessionStorage.getItem("dbginfo"));
+ //SETP#02::> Set Debug Options
+ __fxn_Set_DebugOpt(true, 'osd', true);
+
HotelTV.devinfo = await JSON.parse(sessionStorage.getItem("devinfo"));
HotelTV.svrinfo = await JSON.parse(sessionStorage.getItem("svrinfo"));
//STEP#03:API Module INIT
@@ -630,6 +660,9 @@ HotelTV.LoadAppFull = async function() {
//STEP#01: Load session info
HotelTV.dbginfo = await JSON.parse(sessionStorage.getItem("dbginfo"));
+ //SETP#02::> Set Debug Options
+ __fxn_Set_DebugOpt(false, 'native', true);
+
HotelTV.devinfo = await JSON.parse(sessionStorage.getItem("devinfo"));
HotelTV.svrinfo = await JSON.parse(sessionStorage.getItem("svrinfo"));
HotelTV.services = await JSON.parse(sessionStorage.getItem("services"));
diff --git a/procentric/application/lib/hoteltv.ui_appfull.js b/procentric/application/lib/hoteltv.ui_appfull.js
index 20f8d1f..65acf66 100755
--- a/procentric/application/lib/hoteltv.ui_appfull.js
+++ b/procentric/application/lib/hoteltv.ui_appfull.js
@@ -65,7 +65,7 @@ HotelTV.ui_appfull = (function() {
var _hndl_tmrCtzBgAni = null;
var _hndl_tmrAmenityThumbAni = null;
var _hndl_tmrRoomserviceThumbAni = null;
- const _lastTm = {
+ const _tmrEvt = {
'tvchannel_changed': null,
'keyevt': {
'tv_num' :null,
@@ -300,13 +300,13 @@ HotelTV.ui_appfull = (function() {
let _cur_date = new Date();
if ( __uifxn_Utils_CheckKeyisNumber(_evt.keyCode)==true ){
- _lastTm.keyevt.tv_num = _cur_date;
+ _tmrEvt.keyevt.tv_num = _cur_date;
} else if ( _evt.keyCode == gRmtKey.up || _evt.keyCode == gRmtKey.down ||
_evt.keyCode == gRmtKey.left || _evt.keyCode == gRmtKey.right ||
_evt.keyCode == gRmtKey.chup || _evt.keyCode == gRmtKey.chdown ) {
- _lastTm.keyevt.tv_ctrl = _cur_date;
+ _tmrEvt.keyevt.tv_ctrl = _cur_date;
}
- _lastTm.keyevt.last = _cur_date;
+ _tmrEvt.keyevt.last = _cur_date;
}
@@ -3926,14 +3926,14 @@ HotelTV.ui_appfull = (function() {
let _state = HotelTV.state;
let _tm_diff_ms_tvctrl = 0;
- if (_lastTm.keyevt.tv_ctrl == null) {
+ if (_tmrEvt.keyevt.tv_ctrl == null) {
return;
}
let _tm_cur = new Date();
- _tm_diff_ms_tvctrl = Math.floor(_tm_cur.getTime() - _lastTm.keyevt.tv_ctrl.getTime());
+ _tm_diff_ms_tvctrl = Math.floor(_tm_cur.getTime() - _tmrEvt.keyevt.tv_ctrl.getTime());
//마지막 KEY 이벤트 수신 시간 갱신
- //console.log(`KeyDn Event Recoreded::> ${_lastTm.keyevt.tv_ctrl} TMDiff::> ${_tm_diff_ms}`);
+ //console.log(`KeyDn Event Recoreded::> ${_tmrEvt.keyevt.tv_ctrl} TMDiff::> ${_tm_diff_ms}`);
// TV Channel UI 지속 시간 2초
if ( _state.menu.stage.cur=="tvShortcut" )
@@ -4567,14 +4567,14 @@ HotelTV.ui_appfull = (function() {
let _need_to_changeTVChannel = false;
let _tm_diff_ms = 0;
- if (_lastTm.tvchannel_changed == null) {
- _lastTm.tvchannel_changed = new Date();
+ if (_tmrEvt.tvchannel_changed == null) {
+ _tmrEvt.tvchannel_changed = new Date();
_need_to_changeTVChannel = true;
} else {
let _tm_cur = new Date();
- _tm_diff_ms = Math.floor(_tm_cur.getTime() - _lastTm.tvchannel_changed.getTime());
+ _tm_diff_ms = Math.floor(_tm_cur.getTime() - _tmrEvt.tvchannel_changed.getTime());
//마지막 TV채널 변경 시간 갱신
- _lastTm.tvchannel_changed = _tm_cur;
+ _tmrEvt.tvchannel_changed = _tm_cur;
if (_tm_diff_ms > 200) {
_need_to_changeTVChannel = true;
@@ -5580,8 +5580,8 @@ HotelTV.ui_appfull = (function() {
}
// 초기 채널 카테고리 슬라이더 표시 시간 증가
- _lastTm.keyevt.tv_ctrl = new Date();
- _lastTm.keyevt.tv_ctrl.setSeconds(_lastTm.keyevt.tv_ctrl.getSeconds() + 3);
+ _tmrEvt.keyevt.tv_ctrl = new Date();
+ _tmrEvt.keyevt.tv_ctrl.setSeconds(_tmrEvt.keyevt.tv_ctrl.getSeconds() + 3);
if (!(_mmIdx in _state.menu.main)) {
_state.menu.main[_mmIdx] = {
@@ -5791,8 +5791,8 @@ HotelTV.ui_appfull = (function() {
_state.menu.stage.cur = _state.menu.stage.prev;
_state.menu.stage.prev = null;
- _lastTm.keyevt.tv_ctrl = new Date();
- _lastTm.keyevt.tv_ctrl.setSeconds(_lastTm.keyevt.tv_ctrl.getSeconds() - 3);
+ _tmrEvt.keyevt.tv_ctrl = new Date();
+ _tmrEvt.keyevt.tv_ctrl.setSeconds(_tmrEvt.keyevt.tv_ctrl.getSeconds() - 3);
} else {
__uifxn_AppFull_TVDrawShortCutList(true, "move", event.keyCode);
console.log("TVSHORTCUT CHNUM: " + _state.tv.shortkey.ch_item_idx);
@@ -5849,16 +5849,16 @@ HotelTV.ui_appfull = (function() {
let _tm_diff_ms = 0;
- if (_lastTm.keyevt.last == null) {
- _lastTm.keyevt.last = new Date();
+ if (_tmrEvt.keyevt.last == null) {
+ _tmrEvt.keyevt.last = new Date();
console.log("keyevt.last is NULL");
return;
}
let _tm_cur = new Date();
- _tm_diff_ms = Math.floor(_tm_cur.getTime() - _lastTm.keyevt.last.getTime());
+ _tm_diff_ms = Math.floor(_tm_cur.getTime() - _tmrEvt.keyevt.last.getTime());
//마지막 KEY 이벤트 수신 시간 갱신
- //console.log(`KeyDn Event Recoreded::> ${_lastTm.keyevt.last} TMDiff::> ${_tm_diff_ms}`);
+ //console.log(`KeyDn Event Recoreded::> ${_tmrEvt.keyevt.last} TMDiff::> ${_tm_diff_ms}`);
if (_state.menu.stage.cur == "mypage_popup_message_card") {
//HIDE NEWS and USER GUIDE TIPS
diff --git a/procentric/application/theme/HIM00001/hoteltv.welcome.css b/procentric/application/theme/HIM00001/hoteltv.welcome.css
index 334e089..99e3393 100755
--- a/procentric/application/theme/HIM00001/hoteltv.welcome.css
+++ b/procentric/application/theme/HIM00001/hoteltv.welcome.css
@@ -157,23 +157,3 @@ body {
background-repeat: no-repeat;
display: none;
}
-
-#debugwin {
- z-index: 10000;
- position: absolute;
- top: 11px;
- bottom: 22px;
- right: 11px;
- font-size: 12px;
- background-color: rgba(18, 18, 18, 0.3);
- text-align: left;
- color: rgb(235, 235, 235);
- line-height: 24px;
- padding-left: 5px;
- padding-top: 5px;
- display: inline-flex;
- max-width: 500px;
- overflow-wrap: break-word;
- word-wrap: break-word;
- display: none;
-}
\ No newline at end of file
diff --git a/procentric/application/theme/HIN00001/hoteltv.welcome.css b/procentric/application/theme/HIN00001/hoteltv.welcome.css
index c69ab23..9dd4fff 100755
--- a/procentric/application/theme/HIN00001/hoteltv.welcome.css
+++ b/procentric/application/theme/HIN00001/hoteltv.welcome.css
@@ -157,23 +157,3 @@ body {
background-repeat: no-repeat;
display: none;
}
-
-#debugwin {
- z-index: 10000;
- position: absolute;
- top: 11px;
- bottom: 22px;
- right: 11px;
- font-size: 12px;
- background-color: rgba(18, 18, 18, 0.3);
- text-align: left;
- color: rgb(235, 235, 235);
- line-height: 24px;
- padding-left: 5px;
- padding-top: 5px;
- display: inline-flex;
- max-width: 500px;
- overflow-wrap: break-word;
- word-wrap: break-word;
- display: none;
-}
\ No newline at end of file
diff --git a/procentric/application/theme/HJS00001/hoteltv.welcome.css b/procentric/application/theme/HJS00001/hoteltv.welcome.css
index c69ab23..9dd4fff 100755
--- a/procentric/application/theme/HJS00001/hoteltv.welcome.css
+++ b/procentric/application/theme/HJS00001/hoteltv.welcome.css
@@ -157,23 +157,3 @@ body {
background-repeat: no-repeat;
display: none;
}
-
-#debugwin {
- z-index: 10000;
- position: absolute;
- top: 11px;
- bottom: 22px;
- right: 11px;
- font-size: 12px;
- background-color: rgba(18, 18, 18, 0.3);
- text-align: left;
- color: rgb(235, 235, 235);
- line-height: 24px;
- padding-left: 5px;
- padding-top: 5px;
- display: inline-flex;
- max-width: 500px;
- overflow-wrap: break-word;
- word-wrap: break-word;
- display: none;
-}
\ No newline at end of file
diff --git a/procentric/application/theme/hoteltv.ui_utils.css b/procentric/application/theme/hoteltv.ui_utils.css
index 891ee80..91a3e19 100755
--- a/procentric/application/theme/hoteltv.ui_utils.css
+++ b/procentric/application/theme/hoteltv.ui_utils.css
@@ -118,4 +118,26 @@
100% {
opacity: 0;
}
+}
+
+
+
+#debugwin {
+ z-index: 10000;
+ position: absolute;
+ top: 11px;
+ bottom: 22px;
+ right: 11px;
+ font-size: 12px;
+ background-color: rgba(18, 18, 18, 0.3);
+ text-align: left;
+ color: rgb(235, 235, 235);
+ line-height: 24px;
+ padding-left: 5px;
+ padding-top: 5px;
+ display: inline-flex;
+ max-width: 500px;
+ overflow-wrap: break-word;
+ word-wrap: break-word;
+ display: none;
}
\ No newline at end of file
diff --git a/procentric/application/wellcome.html b/procentric/application/wellcome.html
index 8cfd75b..5f39b59 100755
--- a/procentric/application/wellcome.html
+++ b/procentric/application/wellcome.html
@@ -60,6 +60,9 @@