From 6c56e77a718d16c94ffcd1ef4cf476452be9e8d5 Mon Sep 17 00:00:00 2001 From: Paul Kim Date: Mon, 18 Dec 2023 13:37:41 +0900 Subject: [PATCH] issue #11 Prevent HDMI input detection when TV watching. --- .../application/lib/hoteltv.ui_appfull.js | 87 +++++++++++-------- 1 file changed, 51 insertions(+), 36 deletions(-) diff --git a/procentric/application/lib/hoteltv.ui_appfull.js b/procentric/application/lib/hoteltv.ui_appfull.js index c6d1be3..2926398 100755 --- a/procentric/application/lib/hoteltv.ui_appfull.js +++ b/procentric/application/lib/hoteltv.ui_appfull.js @@ -289,19 +289,32 @@ HotelTV.ui_appfull = (function() { "HDMI-" + _evt.index + " : " + "connected = " + _evt.connected ); - if ( _evt.connected==true ){ - _state.menu.stage.prev = _state.menu.stage.cur; - _state.menu.stage.cur = "external_av_hdmi"; - setTimeout(function(){ - $('body,html').fadeOut(500, function(){ - HotelTV.hcap.SetExternalInput("HDMI", Number(_evt.index)-1); - }); - }, 1000); - HotelTV.ui_utils.ShowNotificationMsgBalloon(_trTbl.system.notice.event.external_input.hdmi_connected[_state.lang], 5); - }else{ - $('body,html').fadeIn(500); - _state.menu.stage.cur = _state.menu.stage.prev; - _state.menu.stage.prev = null; + if ( _state.menu.stage.cur=="tvCtgShow" || + _state.menu.stage.cur=="tvCtgHide" || + _state.menu.stage.cur=="tvShortcut" || + _state.menu.stage.cur=="tvPreparing" ) + { + console.warn("HDMI input doesn't work tv mode"); + //신규 메시지 볼룬팝업 + HotelTV.ui_utils.ShowNotificationMsgBalloon(_trTbl.system.notice.event.external_input.hdmi_unavailable[_state.lang], 5); + return; + } + else + { + if ( _evt.connected==true ){ + _state.menu.stage.prev = _state.menu.stage.cur; + _state.menu.stage.cur = "external_av_hdmi"; + setTimeout(function(){ + $('body,html').fadeOut(500, function(){ + HotelTV.hcap.SetExternalInput("HDMI", Number(_evt.index)-1); + }); + }, 1000); + HotelTV.ui_utils.ShowNotificationMsgBalloon(_trTbl.system.notice.event.external_input.hdmi_connected[_state.lang], 5); + }else{ + $('body,html').fadeIn(500); + _state.menu.stage.cur = _state.menu.stage.prev; + _state.menu.stage.prev = null; + } } } @@ -2906,27 +2919,29 @@ HotelTV.ui_appfull = (function() { let _cur_msgdesc = _msginf[_cur_msgnum]; // Message card 구성 - switch (_state.lang) { - case 'ko-KR': - $('.popup>.mypage>.message').css('font-family', 'Nanum Pen Script'); - $('.popup>.mypage>.message>#msg_ctz').css('font-size', '34px'); - $('.popup>.mypage>.message>#title').css('font-size', '50px'); - break; - case 'zh-CN': - $('.popup>.mypage>.message').css('font-family', 'Ma Shan Zheng'); - $('.popup>.mypage>.message>#msg_ctz').css('font-size', '34px'); - $('.popup>.mypage>.message>#title').css('font-size', '50px'); - break; - case 'zh-TW': - $('.popup>.mypage>.message').css('font-family', 'Ma Shan Zheng'); - $('.popup>.mypage>.message>#msg_ctz').css('font-size', '34px'); - $('.popup>.mypage>.message>#title').css('font-size', '50px'); - break; - default: - $('.popup>.mypage>.message').css('font-family', 'Parisienne'); - $('.popup>.mypage>.message>#msg_ctz').css('font-size', '32px'); - break; - } + $('.popup>.mypage>.message>#msg_ctz').css('font-size', '34px'); + $('.popup>.mypage>.message>#title').css('font-size', '50px'); + // switch (_state.lang) { + // case 'ko-KR': + // $('.popup>.mypage>.message').css('font-family', 'Nanum Pen Script'); + // $('.popup>.mypage>.message>#msg_ctz').css('font-size', '34px'); + // $('.popup>.mypage>.message>#title').css('font-size', '50px'); + // break; + // case 'zh-CN': + // $('.popup>.mypage>.message').css('font-family', 'Ma Shan Zheng'); + // $('.popup>.mypage>.message>#msg_ctz').css('font-size', '34px'); + // $('.popup>.mypage>.message>#title').css('font-size', '50px'); + // break; + // case 'zh-TW': + // $('.popup>.mypage>.message').css('font-family', 'Ma Shan Zheng'); + // $('.popup>.mypage>.message>#msg_ctz').css('font-size', '34px'); + // $('.popup>.mypage>.message>#title').css('font-size', '50px'); + // break; + // default: + // $('.popup>.mypage>.message').css('font-family', 'Parisienne'); + // $('.popup>.mypage>.message>#msg_ctz').css('font-size', '32px'); + // break; + // } $('.popup>.mypage>.message>#title').text(_cur_msgdesc.from); if (_cur_msgdesc.multilanguage == true) { $('.popup>.mypage>.message>#msg_ctz').html(_cur_msgdesc.content[_state.lang].replace(/(?:\r\n|\r|\n)/g, '
')); @@ -3306,7 +3321,7 @@ HotelTV.ui_appfull = (function() { // 채널 번호 var _elDiv_ChItmesRecChNum = document.createElement('div'); _elDiv_ChItmesRecChNum.setAttribute("id", "num"); - _elDiv_ChItmesRecChNum.textContent = Number(__fxn_getChItemValue(_ChItem, "number")); + _elDiv_ChItmesRecChNum.textContent = __fxn_getChItemValue(_ChItem, "number"); _elDiv_ChItmesRec.appendChild(_elDiv_ChItmesRecChNum); var _elDiv_ChItmesRecName = document.createElement('div'); @@ -4105,7 +4120,7 @@ HotelTV.ui_appfull = (function() { $('.main .tv .shortcut').hide(); // 초기 메인 메뉴 KEY설정 - _state.menu.stage.cur = "preparing_tv"; + _state.menu.stage.cur = "tvPreparing"; if (_state.menu.main[_mmIdx].cur == null) { _state.menu.main[_mmIdx].cur = Object.keys(_tvProg)[0];