sysadmin/ct-dtv-hx0100-002kwos
1
0
Fork 0
Code Issues 5 Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: sysadmin:Ver1.2.3
Branches Tags
sysadmin:master
sysadmin:Ver1.4.2 sysadmin:Ver1.4.1 sysadmin:1.4.0 sysadmin:Ver1.3.10 sysadmin:Ver1.3.9 sysadmin:Ver1.3.8 sysadmin:Ver1.3.7 sysadmin:Ver1.3.6 sysadmin:Ver1.3.5 sysadmin:Ver1.3.1 sysadmin:Ver1.3.0 sysadmin:Ver1.2.9 sysadmin:Ver1.2.8 sysadmin:Ver1.2.7 sysadmin:Ver1.2.6 sysadmin:Ver1.2.5 sysadmin:Ver1.2.4 sysadmin:Ver1.2.3 sysadmin:Ver1.2.2 sysadmin:Ver1.2.1 sysadmin:Ver1.2 sysadmin:Ver1.1
...
compare: sysadmin:Ver1.2.4
Branches Tags
sysadmin:master
sysadmin:Ver1.4.2 sysadmin:Ver1.4.1 sysadmin:1.4.0 sysadmin:Ver1.3.10 sysadmin:Ver1.3.9 sysadmin:Ver1.3.8 sysadmin:Ver1.3.7 sysadmin:Ver1.3.6 sysadmin:Ver1.3.5 sysadmin:Ver1.3.1 sysadmin:Ver1.3.0 sysadmin:Ver1.2.9 sysadmin:Ver1.2.8 sysadmin:Ver1.2.7 sysadmin:Ver1.2.6 sysadmin:Ver1.2.5 sysadmin:Ver1.2.4 sysadmin:Ver1.2.3 sysadmin:Ver1.2.2 sysadmin:Ver1.2.1 sysadmin:Ver1.2 sysadmin:Ver1.1

2 Commits
Ver1.2.3 ... Ver1.2.4

Author SHA1 Message Date
Paul Kim
5c5f58defc issue #1 Fix amenity&room service item list scroll issue. change user guide text color. 2024-03-26 18:52:12 +09:00
Paul Kim
0589fe80ab issue #11 Fix amenity&roomservice item selection bug. 2024-03-23 18:22:31 +09:00
3 changed files with 39 additions and 26 deletions
Expand all files Collapse all files

2
procentric/application/lib/hoteltv.js
View File

@@ -493,7 +493,6 @@ HotelTV.LoadWelCome = async function() {
HotelTV.dbginfo = await JSON.parse(sessionStorage.getItem("dbginfo")); HotelTV.dbginfo = await JSON.parse(sessionStorage.getItem("dbginfo"));
HotelTV.devinfo = await JSON.parse(sessionStorage.getItem("devinfo")); HotelTV.devinfo = await JSON.parse(sessionStorage.getItem("devinfo"));
HotelTV.svrinfo = await JSON.parse(sessionStorage.getItem("svrinfo")); HotelTV.svrinfo = await JSON.parse(sessionStorage.getItem("svrinfo"));
//HotelTV.state = await JSON.parse(sessionStorage.getItem("state"));
//STEP#03:API Module INIT //STEP#03:API Module INIT
await HotelTV.api.Init(HotelTV.svrinfo.ipaddr, HotelTV.svrinfo.port, HotelTV.devinfo.model_name.substring(2, HotelTV.devinfo.model_name.length - 1), HotelTV.devinfo.serial_number); await HotelTV.api.Init(HotelTV.svrinfo.ipaddr, HotelTV.svrinfo.port, HotelTV.devinfo.model_name.substring(2, HotelTV.devinfo.model_name.length - 1), HotelTV.devinfo.serial_number);
HotelTV.settings = await JSON.parse(sessionStorage.getItem("settings")); HotelTV.settings = await JSON.parse(sessionStorage.getItem("settings"));
@@ -628,7 +627,6 @@ HotelTV.LoadAppFull = async function() {
HotelTV.devinfo = await JSON.parse(sessionStorage.getItem("devinfo")); HotelTV.devinfo = await JSON.parse(sessionStorage.getItem("devinfo"));
HotelTV.svrinfo = await JSON.parse(sessionStorage.getItem("svrinfo")); HotelTV.svrinfo = await JSON.parse(sessionStorage.getItem("svrinfo"));
HotelTV.services = await JSON.parse(sessionStorage.getItem("services")); HotelTV.services = await JSON.parse(sessionStorage.getItem("services"));
//HotelTV.state = await JSON.parse(sessionStorage.getItem("state"));
//STEP#02: Init HotelTV API //STEP#02: Init HotelTV API
await HotelTV.api.Init(HotelTV.svrinfo.ipaddr, HotelTV.svrinfo.port, HotelTV.devinfo.model_name.substring(2, HotelTV.devinfo.model_name.length - 1), HotelTV.devinfo.serial_number); await HotelTV.api.Init(HotelTV.svrinfo.ipaddr, HotelTV.svrinfo.port, HotelTV.devinfo.model_name.substring(2, HotelTV.devinfo.model_name.length - 1), HotelTV.devinfo.serial_number);

53
procentric/application/lib/hoteltv.ui_appfull.js
View File

@@ -1630,6 +1630,9 @@ HotelTV.ui_appfull = (function() {
{ {
case "enter": { case "enter": {
_elAmCtgyBgMenuItemWin.find('.amctgyItem').first().addClass("focus"); _elAmCtgyBgMenuItemWin.find('.amctgyItem').first().addClass("focus");
__amctgyItemStatus.idx = 0;
__amctgyItemStatus.scroll_TOfset = 0;
_elAmCtgyBgMenuItemWin.find('.tbl_record').children('#record').animate({ scrollTop: 0 }, 200);
__ifxn_updateAmItemDesc(__amctgyItemStatus.idx); __ifxn_updateAmItemDesc(__amctgyItemStatus.idx);
} break; } break;
@@ -1653,10 +1656,12 @@ HotelTV.ui_appfull = (function() {
// 테이블 ROW인덱스와 스크롤 OFFSET계산 // 테이블 ROW인덱스와 스크롤 OFFSET계산
__amctgyItemStatus.idx = _elTblTr_AmItemNext.prop('rowIndex'); __amctgyItemStatus.idx = _elTblTr_AmItemNext.prop('rowIndex');
__amctgyItemStatus.scroll_TOfset += _elTblTr_AmItemNext.prop('scrollHeight');
//스크롤 에니메이션 수행 if ( _elTbl_AmItem.children('#record').find('tr').first().position().top<0 ){
_elTbl_AmItem.children('#record').animate({ scrollTop: __amctgyItemStatus.scroll_TOfset }, 200); __amctgyItemStatus.scroll_TOfset -= _elTblTr_AmItemNext.prop('scrollHeight');
//스크롤 에니메이션 수행
_elTbl_AmItem.children('#record').animate({ scrollTop: __amctgyItemStatus.scroll_TOfset }, 200);
}
__ifxn_updateAmItemDesc(__amctgyItemStatus.idx, function() { __ifxn_updateAmItemDesc(__amctgyItemStatus.idx, function() {
if ( _isNeedSoldOutMask==true ){ if ( _isNeedSoldOutMask==true ){
@@ -1683,10 +1688,11 @@ HotelTV.ui_appfull = (function() {
// 테이블 ROW인덱스와 스크롤 OFFSET계산 // 테이블 ROW인덱스와 스크롤 OFFSET계산
__amctgyItemStatus.idx = _elTblTr_AmItemNext.prop('rowIndex'); __amctgyItemStatus.idx = _elTblTr_AmItemNext.prop('rowIndex');
__amctgyItemStatus.scroll_TOfset += _elTblTr_AmItemNext.prop('scrollHeight'); if ( __amctgyItemStatus.idx>=12 ){
__amctgyItemStatus.scroll_TOfset += _elTblTr_AmItemNext.prop('scrollHeight');
//스크롤 에니메이션 수행 //스크롤 에니메이션 수행
_elTbl_AmItem.children('#record').animate({ scrollTop: __amctgyItemStatus.scroll_TOfset }, 200); _elTbl_AmItem.children('#record').animate({ scrollTop: __amctgyItemStatus.scroll_TOfset }, 200);
}
__ifxn_updateAmItemDesc(__amctgyItemStatus.idx, function() { __ifxn_updateAmItemDesc(__amctgyItemStatus.idx, function() {
if ( _isNeedSoldOutMask==true ){ if ( _isNeedSoldOutMask==true ){
@@ -2139,7 +2145,7 @@ HotelTV.ui_appfull = (function() {
_state.menu.stage.cur = "amenity_ctgy_item_cart"; _state.menu.stage.cur = "amenity_ctgy_item_cart";
__uifxn_AppFull_DrawAmUserGuide("amenity_ctgy_item_cart"); __uifxn_AppFull_DrawAmUserGuide("amenity_ctgy_item_cart");
} else { } else {
HotelTV.ui_utils.ShowNotificationMsgBalloon(_trTbl.ui.amenity.message.invalidCategory[_state.lang], 5); HotelTV.ui_utils.ShowNotificationMsgBalloon(_trTbl.ui.amenity.message.notinservice[_state.lang], 5);
} }
} }
} else if (_state.menu.stage.cur == "amenity_ctgy_item_cart") { } else if (_state.menu.stage.cur == "amenity_ctgy_item_cart") {
@@ -3164,6 +3170,10 @@ HotelTV.ui_appfull = (function() {
{ {
case "enter": { case "enter": {
_elRsCtgyBgMenuItemWin.find('.rsctgyItem').first().addClass("focus"); _elRsCtgyBgMenuItemWin.find('.rsctgyItem').first().addClass("focus");
//인덱스 및 스크롤 초기화
__rsctgyItemStatus.idx = 0;
__rsctgyItemStatus.scroll_TOfset = 0;
_elRsCtgyBgMenuItemWin.find('.tbl_record').children('#record').animate({ scrollTop: 0 }, 200);
__ifxn_updateRsItemDesc(__rsctgyItemStatus.idx); __ifxn_updateRsItemDesc(__rsctgyItemStatus.idx);
} break; } break;
@@ -3187,10 +3197,12 @@ HotelTV.ui_appfull = (function() {
// 테이블 ROW인덱스와 스크롤 OFFSET계산 // 테이블 ROW인덱스와 스크롤 OFFSET계산
__rsctgyItemStatus.idx = _elTblTr_RsItemNext.prop('rowIndex'); __rsctgyItemStatus.idx = _elTblTr_RsItemNext.prop('rowIndex');
__rsctgyItemStatus.scroll_TOfset += _elTblTr_RsItemNext.prop('scrollHeight');
//스크롤 에니메이션 수행 if ( _elTbl_RsItem.children('#record').find('tr').first().position().top<0 ){
_elTbl_RsItem.children('#record').animate({ scrollTop: __rsctgyItemStatus.scroll_TOfset }, 200); __rsctgyItemStatus.scroll_TOfset -= _elTblTr_RsItemNext.prop('scrollHeight');
//스크롤 에니메이션 수행
_elTbl_RsItem.children('#record').animate({ scrollTop: __rsctgyItemStatus.scroll_TOfset }, 200);
}
__ifxn_updateRsItemDesc(__rsctgyItemStatus.idx, function() { __ifxn_updateRsItemDesc(__rsctgyItemStatus.idx, function() {
if ( _isNeedSoldOutMask==true ){ if ( _isNeedSoldOutMask==true ){
@@ -3217,10 +3229,11 @@ HotelTV.ui_appfull = (function() {
// 테이블 ROW인덱스와 스크롤 OFFSET계산 // 테이블 ROW인덱스와 스크롤 OFFSET계산
__rsctgyItemStatus.idx = _elTblTr_RsItemNext.prop('rowIndex'); __rsctgyItemStatus.idx = _elTblTr_RsItemNext.prop('rowIndex');
__rsctgyItemStatus.scroll_TOfset += _elTblTr_RsItemNext.prop('scrollHeight'); if ( __rsctgyItemStatus.idx>=12 ){
__rsctgyItemStatus.scroll_TOfset += _elTblTr_RsItemNext.prop('scrollHeight');
//스크롤 에니메이션 수행 //스크롤 에니메이션 수행
_elTbl_RsItem.children('#record').animate({ scrollTop: __rsctgyItemStatus.scroll_TOfset }, 200); _elTbl_RsItem.children('#record').animate({ scrollTop: __rsctgyItemStatus.scroll_TOfset }, 200);
}
__ifxn_updateRsItemDesc(__rsctgyItemStatus.idx, function() { __ifxn_updateRsItemDesc(__rsctgyItemStatus.idx, function() {
if ( _isNeedSoldOutMask==true ){ if ( _isNeedSoldOutMask==true ){
@@ -3673,7 +3686,7 @@ HotelTV.ui_appfull = (function() {
_state.menu.stage.cur = "roomservice_ctgy_item_cart"; _state.menu.stage.cur = "roomservice_ctgy_item_cart";
__uifxn_AppFull_DrawRsUserGuide("roomservice_ctgy_item_cart"); __uifxn_AppFull_DrawRsUserGuide("roomservice_ctgy_item_cart");
} else { } else {
HotelTV.ui_utils.ShowNotificationMsgBalloon(_trTbl.ui.roomservice.message.invalidCategory[_state.lang], 5); HotelTV.ui_utils.ShowNotificationMsgBalloon(_trTbl.ui.roomservice.message.notinservice[_state.lang], 5);
} }
} }
} else if (_state.menu.stage.cur == "roomservice_ctgy_item_cart") { } else if (_state.menu.stage.cur == "roomservice_ctgy_item_cart") {
@@ -4415,7 +4428,7 @@ HotelTV.ui_appfull = (function() {
let uri_video = $($('.main .mypage .bg .owl-carousel .owl-item.active .ctz_mv_ctrl')[0]).attr('video_url'); let uri_video = $($('.main .mypage .bg .owl-carousel .owl-item.active .ctz_mv_ctrl')[0]).attr('video_url');
if (uri_video != null) { if (uri_video != null) {
_state.menu.stage.prev = _state.menu.stage.cur; _state.menu.stage.prev = _state.menu.stage.cur;
_state.menu.stage.cur = "mypage_replay_welcome_vod" _state.menu.stage.cur = "mypage_replay_welcome_vod";
HotelTV.hcap.MediaPlay( HotelTV.hcap.MediaPlay(
uri_video, uri_video,
"", "",
@@ -7132,7 +7145,7 @@ HotelTV.ui_appfull = (function() {
$('.error #countdown #message').text(`System will be shutdown in ${_tmval} second...`); $('.error #countdown #message').text(`System will be shutdown in ${_tmval} second...`);
}, },
"cb_eoe": function() { "cb_eoe": function() {
setTimeout(HotelTV.hcap.PwrOff(), 500); setTimeout(HotelTV.hcap.PwrOff, 500);
HotelTV.api.ReportEvent([{'power': false, 'location':null}]) HotelTV.api.ReportEvent([{'power': false, 'location':null}])
} }
}); });
@@ -7157,7 +7170,7 @@ HotelTV.ui_appfull = (function() {
$('.error #countdown #message').text(`System will be shutdown in ${_tmval} second...`); $('.error #countdown #message').text(`System will be shutdown in ${_tmval} second...`);
}, },
"cb_eoe": function() { "cb_eoe": function() {
setTimeout(HotelTV.hcap.PwrOff(), 500); setTimeout(HotelTV.hcap.PwrOff, 500);
HotelTV.api.ReportEvent([{'power': false, 'location':null}]) HotelTV.api.ReportEvent([{'power': false, 'location':null}])
} }
}); });
@@ -7182,7 +7195,7 @@ HotelTV.ui_appfull = (function() {
$('.error #countdown #message').text(`System will be shutdown in ${_tmval} second...`); $('.error #countdown #message').text(`System will be shutdown in ${_tmval} second...`);
}, },
"cb_eoe": function() { "cb_eoe": function() {
setTimeout(HotelTV.hcap.PwrOff(), 500); setTimeout(HotelTV.hcap.PwrOff, 500);
HotelTV.api.ReportEvent([{'power': false, 'location':null}]) HotelTV.api.ReportEvent([{'power': false, 'location':null}])
} }
}); });

10
procentric/application/theme/HJS00001/hoteltv.app.full.popup.css
View File

@@ -564,7 +564,7 @@
} }
.popup .amenity .bg .am_item_sel_win .winleft>.tbl_record tbody { .popup .amenity .bg .am_item_sel_win .winleft>.tbl_record tbody {
/* height: 285px; */ height: 670px;
overflow-y: auto; overflow-y: auto;
display: block; display: block;
} }
@@ -1291,7 +1291,8 @@
height: 132px; height: 132px;
margin: 0; margin: 0;
padding: 0px 20px 0px 48px; padding: 0px 20px 0px 48px;
color: rgb(245,245,245); /* color: rgb(245,245,245); */
color: rgb(181, 218, 16);
line-height: 32px; line-height: 32px;
font-size: 32px; font-size: 32px;
z-index: 1; z-index: 1;
@@ -1714,7 +1715,7 @@
} }
.popup .roomservice .bg .rs_item_sel_win .winleft>.tbl_record tbody { .popup .roomservice .bg .rs_item_sel_win .winleft>.tbl_record tbody {
/* height: 285px; */ height: 670px;
overflow-y: auto; overflow-y: auto;
display: block; display: block;
} }
@@ -2441,7 +2442,8 @@
height: 132px; height: 132px;
margin: 0; margin: 0;
padding: 0px 20px 0px 48px; padding: 0px 20px 0px 48px;
color: rgb(245,245,245); /* color: rgb(245,245,245); */
color: rgb(181, 218, 16);
line-height: 32px; line-height: 32px;
font-size: 32px; font-size: 32px;
z-index: 1; z-index: 1;