From 69152b57cd176682fa56bb2fd427ed3375f10910 Mon Sep 17 00:00:00 2001 From: paul kim Date: Tue, 18 Jun 2024 18:04:29 +0900 Subject: [PATCH] issue #10 #11 Release Ver 1.3.6. Done new TV channel handling UI. --- procentric/application/lib/hoteltv.hcap.js | 4 +- .../application/lib/hoteltv.ui_appfull.js | 51 ++++++++++++------- .../theme/HIM00001/hoteltv.app.full.tv.css | 2 +- .../theme/HJS00001/hoteltv.app.full.tv.css | 2 +- .../theme/HTL00001/hoteltv.app.full.tv.css | 2 +- 5 files changed, 39 insertions(+), 22 deletions(-) diff --git a/procentric/application/lib/hoteltv.hcap.js b/procentric/application/lib/hoteltv.hcap.js index c0f7486..5572e39 100755 --- a/procentric/application/lib/hoteltv.hcap.js +++ b/procentric/application/lib/hoteltv.hcap.js @@ -855,9 +855,9 @@ HotelTV.hcap = (function() { { "_keyCode": 0x847900ff, "_virCode": hcap.key.Code.DOWN }, //DOWN -> DOWN KEY { "_keyCode": 0x84791ae5, "_virCode": hcap.key.Code.BACK }, //BACK -> BACK KEY { "_keyCode": 0x8479EA15, "_virCode": hcap.key.Code.PORTAL }, //HOME -> PORTAL KEY - { "_keyCode": 0x84790FF0, "_virCode": hcap.key.Code.CH_UP }, //CHUP -> CH_UP KEY + { "_keyCode": 0x84791DE2, "_virCode": hcap.key.Code.CH_UP }, //CHUP -> CH_UP KEY { "_keyCode": 0x847928D7, "_virCode": hcap.key.Code.CH_DOWN }, //CHDN -> CH_DOWN KEY - { "_keyCode": 0x8479DA25, "_virCode": hcap.key.Code.Q_MENU }, //MENU -> CH_DOWN KEY + { "_keyCode": 0x8479DA25, "_virCode": hcap.key.Code.Q_MENU }, //MENU -> MENU KEY // VOLUME { "_keyCode": 0x847910ef, "_virCode": hcap.key.Code.VOL_UP }, //VOL UP -> VOL UP KEY { "_keyCode": 0x84790ff0, "_virCode": hcap.key.Code.VOL_DOWN }, //VOL DOWN -> VOL DOWN KEY diff --git a/procentric/application/lib/hoteltv.ui_appfull.js b/procentric/application/lib/hoteltv.ui_appfull.js index 574811b..29b6b9a 100755 --- a/procentric/application/lib/hoteltv.ui_appfull.js +++ b/procentric/application/lib/hoteltv.ui_appfull.js @@ -85,7 +85,7 @@ HotelTV.ui_appfull = (function() { 'keyevt': { 'tv_numBtn' :null, 'tv_ctrl' :null, - 'last' :null, + 'last_uibar' :null, }, }; @@ -324,7 +324,7 @@ HotelTV.ui_appfull = (function() { _evt.keyCode == gRmtKey.chup || _evt.keyCode == gRmtKey.chdown ) { _tmrEvt.keyevt.tv_ctrl = _cur_date; } - _tmrEvt.keyevt.last = _cur_date; + _tmrEvt.keyevt.last_uibar = _cur_date; } @@ -5962,10 +5962,10 @@ HotelTV.ui_appfull = (function() { //$('#lst_tvCtgyFrm').trigger('next.owl', [1000]) } else if (event.keyCode == gRmtKey.up || event.keyCode == gRmtKey.chup) { // 채널 리스트 아이탬 이동(UP) - __ifxn_moveTvChannel(_tvCtgyInfoAll, "ch_up"); + __ifxn_moveTvChannel(_tvCtgyInfoAll, "ch_down"); } else if (event.keyCode == gRmtKey.down || event.keyCode == gRmtKey.chdown) { // 채널 리스트 아이탬 이동(DOWN) - __ifxn_moveTvChannel(_tvCtgyInfoAll, "ch_down"); + __ifxn_moveTvChannel(_tvCtgyInfoAll, "ch_up"); } else if (event.keyCode == gRmtKey.enter) { // TV채널 플레이 } else if (event.keyCode == gRmtKey.back) { @@ -5985,15 +5985,15 @@ HotelTV.ui_appfull = (function() { } } else if (_state.menu.stage.cur == "tvCtgHide") { if (event.keyCode == gRmtKey.left) { - $('#lst_tvCtgyFrm').trigger('prev.owl', [1000]) + //$('#lst_tvCtgyFrm').trigger('prev.owl', [1000]) } else if (event.keyCode == gRmtKey.right) { - $('#lst_tvCtgyFrm').trigger('next.owl', [1000]) + //$('#lst_tvCtgyFrm').trigger('next.owl', [1000]) } else if (event.keyCode == gRmtKey.up || event.keyCode == gRmtKey.chup) { // 채널 리스트 아이탬 이동(CHUP) - __ifxn_moveTvChannel(_tvCtgyInfoAll, "ch_up"); + __ifxn_moveTvChannel(_tvCtgyInfoAll, "ch_down"); } else if (event.keyCode == gRmtKey.down || event.keyCode == gRmtKey.chdown) { // 채널 리스트 아이탬 이동(CHDOWN) - __ifxn_moveTvChannel(_tvCtgyInfoAll, "ch_down"); + __ifxn_moveTvChannel(_tvCtgyInfoAll, "ch_up"); } else if (event.keyCode == gRmtKey.back) { // TV 메뉴를 종료하고 메인 메뉴로 이동 __ifxn_exitTvMenu(); @@ -6175,6 +6175,26 @@ HotelTV.ui_appfull = (function() { const __ifxn_sendNextLangUsrData = async function(_nextLang, __cbFxnFailure=null, __cbFxn_Success=null) { try { + let found_dev_locale = false; + // SET PLATFORM LANGUAGE + // HotelTV.hcap.SetPlatformLanguage(_state.lang); + if ( 'getLocaleList' in HotelTV.devinfo ) + { + for( let _localeIdx in HotelTV.devinfo.getLocaleList ) + { + if ( HotelTV.devinfo.getLocaleList[_localeIdx].specifier== _nextLang ){ + found_dev_locale = true; + break; + } + } + } + if ( found_dev_locale==true ){ + HotelTV.hcap.SetDeviceLocale(_nextLang); + }else{ + console.log("Set Default device locale set to en-US"); + HotelTV.hcap.SetDeviceLocale('en-US'); + } + let _usrDataJson = { 'next_lang': _nextLang, }; @@ -6218,16 +6238,10 @@ HotelTV.ui_appfull = (function() { let _tm_diff_ms_guibar = 0; - 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_guibar = Math.floor(_tm_cur.getTime() - _tmrEvt.keyevt.last.getTime()); + _tm_diff_ms_guibar = Math.floor(_tm_cur.getTime() - _tmrEvt.keyevt.last_uibar); //마지막 KEY 이벤트 수신 시간 갱신 - //console.log(`KeyDn Event Recoreded::> ${_tmrEvt.keyevt.last} TMDiff::> ${_tm_diff_ms_guibar}`); + //console.log(`KeyDn Event Recoreded::> ${_tmrEvt.keyevt.last_uibar} TMDiff::> ${_tm_diff_ms_guibar}`); if (_state.menu.stage.cur == "mypage_popup_message_card") { //HIDE NEWS and USER GUIDE TIPS @@ -6249,7 +6263,8 @@ HotelTV.ui_appfull = (function() { { //KEY이벤트 발생이 8초 이내인경우 //SHOW USER GUIDE TIPS - let show_stages = ["hotkey_mm_red", "hotkey_mm_green", "hotkey_mm_yellow", "hotkey_mm_blue", "main", "sub", "ctzgen", "tvCtgShow", "tvCtgHide", "mypage_select_menu"]; + //let show_stages = ["hotkey_mm_red", "hotkey_mm_green", "hotkey_mm_yellow", "hotkey_mm_blue", "main", "sub", "ctzgen", "tvCtgShow", "tvCtgHide", "mypage_select_menu"]; + let show_stages = ["hotkey_mm_red", "hotkey_mm_green", "hotkey_mm_yellow", "hotkey_mm_blue", "main", "sub", "ctzgen", "mypage_select_menu"]; // Check needed shows up bottom user guide, update user guide sentance. if (show_stages.includes(_state.menu.stage.cur) == true) { const ___ifxn_updateGuideMsg = function(_szMsg) { @@ -6511,6 +6526,8 @@ HotelTV.ui_appfull = (function() { return _msg_unread_cnt; } + _tmrEvt.keyevt.last_uibar = new Date().getTime(); + _msgCnt = __ifxn_get_unread_msgCnt(HotelTV.message); if (_msgCnt > 0) { $('.widjet .top .message #unread_cnt').text(_msgCnt.toString()); diff --git a/procentric/application/theme/HIM00001/hoteltv.app.full.tv.css b/procentric/application/theme/HIM00001/hoteltv.app.full.tv.css index ba68b6d..be42fac 100755 --- a/procentric/application/theme/HIM00001/hoteltv.app.full.tv.css +++ b/procentric/application/theme/HIM00001/hoteltv.app.full.tv.css @@ -239,7 +239,7 @@ /************************************************************/ .main .tv .shortcut_mode0 { position: absolute; - top: 1%; + top: 3%; left: 87%; width: 12%; height: 72px; diff --git a/procentric/application/theme/HJS00001/hoteltv.app.full.tv.css b/procentric/application/theme/HJS00001/hoteltv.app.full.tv.css index ba68b6d..be42fac 100755 --- a/procentric/application/theme/HJS00001/hoteltv.app.full.tv.css +++ b/procentric/application/theme/HJS00001/hoteltv.app.full.tv.css @@ -239,7 +239,7 @@ /************************************************************/ .main .tv .shortcut_mode0 { position: absolute; - top: 1%; + top: 3%; left: 87%; width: 12%; height: 72px; diff --git a/procentric/application/theme/HTL00001/hoteltv.app.full.tv.css b/procentric/application/theme/HTL00001/hoteltv.app.full.tv.css index ba68b6d..be42fac 100755 --- a/procentric/application/theme/HTL00001/hoteltv.app.full.tv.css +++ b/procentric/application/theme/HTL00001/hoteltv.app.full.tv.css @@ -239,7 +239,7 @@ /************************************************************/ .main .tv .shortcut_mode0 { position: absolute; - top: 1%; + top: 3%; left: 87%; width: 12%; height: 72px;