2 Commits

Author SHA1 Message Date
Paul Kim
f79dc7e06b issue #11 Adjust ui font size. 2024-03-21 12:19:23 +09:00
Paul Kim
93dae53e28 issue #11 Fix amenity&room seervice order popup shows up when those are disabled. 2024-03-19 12:32:04 +09:00
2 changed files with 37 additions and 26 deletions

View File

@@ -607,12 +607,21 @@ HotelTV.ui_appfull = (function() {
let _amenity = null; let _amenity = null;
let _roomservice = null; let _roomservice = null;
let _elAmPupOoderRoot = $('.popup .amenity').children('.order');
if ( _elAmPupOoderRoot.css('display')!="none" ){
_elAmPupOoderRoot.hide();
}
let _elRsPupOoderRoot = $('.popup .roomservice').children('.order');
if ( _elRsPupOoderRoot.css('display')!="none" ){
_elRsPupOoderRoot.hide();
}
if (!_opening.amenity) { if (!_opening.amenity) {
return; return;
} }
_amenity = _opening.amenity; _amenity = _opening.amenity;
// HOTKEY정보를 state에 기록 // HOTKEY정보를 state에 기록
if (!(_amenity.button in _state.hotkey.mm)) { if (!(_amenity.button in _state.hotkey.mm)) {
_state.hotkey.mm[_amenity.button] = { _state.hotkey.mm[_amenity.button] = {
@@ -631,10 +640,7 @@ HotelTV.ui_appfull = (function() {
}; };
} }
let _elAmPupOoderRoot = $('.popup .amenity').children('.order');
if ( _elAmPupOoderRoot.css('display')!="none" ){
_elAmPupOoderRoot.hide();
}
@@ -642,7 +648,6 @@ HotelTV.ui_appfull = (function() {
return; return;
} }
_roomservice = _opening.roomService; _roomservice = _opening.roomService;
// HOTKEY정보를 state에 기록 // HOTKEY정보를 state에 기록
if (!(_roomservice.button in _state.hotkey.mm)) { if (!(_roomservice.button in _state.hotkey.mm)) {
_state.hotkey.mm[_roomservice.button] = { _state.hotkey.mm[_roomservice.button] = {
@@ -661,10 +666,6 @@ HotelTV.ui_appfull = (function() {
}; };
} }
let _elRsPupOoderRoot = $('.popup .roomservice').children('.order');
if ( _elRsPupOoderRoot.css('display')!="none" ){
_elRsPupOoderRoot.hide();
}
return; return;
} }
@@ -2064,6 +2065,7 @@ HotelTV.ui_appfull = (function() {
$('.main').addClass("depth_mm"); $('.main').addClass("depth_mm");
__uifxn_AppFull_HotKey_ShowBtnOnMM(true); __uifxn_AppFull_HotKey_ShowBtnOnMM(true);
__uifxn_AppFull_TopWidjetShow(true); __uifxn_AppFull_TopWidjetShow(true);
_state.menu.stage.prev = null;
}); });
}, 500); }, 500);
} }
@@ -2114,6 +2116,7 @@ HotelTV.ui_appfull = (function() {
$('.main').addClass("depth_mm"); $('.main').addClass("depth_mm");
__uifxn_AppFull_HotKey_ShowBtnOnMM(true); __uifxn_AppFull_HotKey_ShowBtnOnMM(true);
__uifxn_AppFull_TopWidjetShow(true); __uifxn_AppFull_TopWidjetShow(true);
_state.menu.stage.prev = null;
}); });
}, 500); }, 500);
} }
@@ -2136,7 +2139,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.system.ott_service_not_ready[_state.lang], 5); HotelTV.ui_utils.ShowNotificationMsgBalloon(_trTbl.ui.amenity.message.invalidCategory[_state.lang], 5);
} }
} }
} else if (_state.menu.stage.cur == "amenity_ctgy_item_cart") { } else if (_state.menu.stage.cur == "amenity_ctgy_item_cart") {
@@ -3597,6 +3600,7 @@ HotelTV.ui_appfull = (function() {
$('.main').addClass("depth_mm"); $('.main').addClass("depth_mm");
__uifxn_AppFull_HotKey_ShowBtnOnMM(true); __uifxn_AppFull_HotKey_ShowBtnOnMM(true);
__uifxn_AppFull_TopWidjetShow(true); __uifxn_AppFull_TopWidjetShow(true);
_state.menu.stage.prev = null;
}); });
}, 500); }, 500);
} }
@@ -3646,6 +3650,7 @@ HotelTV.ui_appfull = (function() {
$('.main').addClass("depth_mm"); $('.main').addClass("depth_mm");
__uifxn_AppFull_HotKey_ShowBtnOnMM(true); __uifxn_AppFull_HotKey_ShowBtnOnMM(true);
__uifxn_AppFull_TopWidjetShow(true); __uifxn_AppFull_TopWidjetShow(true);
_state.menu.stage.prev = null;
}); });
}, 500); }, 500);
} }
@@ -3668,7 +3673,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.system.ott_service_not_ready[_state.lang], 5); HotelTV.ui_utils.ShowNotificationMsgBalloon(_trTbl.ui.roomservice.message.invalidCategory[_state.lang], 5);
} }
} }
} else if (_state.menu.stage.cur == "roomservice_ctgy_item_cart") { } else if (_state.menu.stage.cur == "roomservice_ctgy_item_cart") {
@@ -6723,6 +6728,7 @@ HotelTV.ui_appfull = (function() {
} }
} else if (_evt.keyCode == gRmtKey.yellow) { } else if (_evt.keyCode == gRmtKey.yellow) {
// YELLOW BUTTON // YELLOW BUTTON
console.log("YELLOW::>");
if ("yellow" in _state.hotkey.mm) { if ("yellow" in _state.hotkey.mm) {
$('.guide>.tips').stop().animate({ backgroundColor: "rgba(0,0,0,0.8)" }, 500, function() { $('.guide>.tips').stop().animate({ backgroundColor: "rgba(0,0,0,0.8)" }, 500, function() {
if (_state.hotkey.mm.yellow.type == "brochure") { if (_state.hotkey.mm.yellow.type == "brochure") {
@@ -6733,10 +6739,12 @@ HotelTV.ui_appfull = (function() {
}); });
} else if (_state.hotkey.mm.yellow.type == "amenity") { } else if (_state.hotkey.mm.yellow.type == "amenity") {
if (_opening.amenity) { if (_opening.amenity) {
console.log("YELLOW::>AMENITY");
__uifxn_AppFull_BuildAmenity(); __uifxn_AppFull_BuildAmenity();
} }
} else if (_state.hotkey.mm.yellow.type == "roomservice") { } else if (_state.hotkey.mm.yellow.type == "roomservice") {
if (_opening.roomService) { if (_opening.roomService) {
console.log("YELLOW::>ROOMSERVICEC");
__uifxn_AppFull_BuildRoomservice(); __uifxn_AppFull_BuildRoomservice();
} }
} }
@@ -6744,6 +6752,7 @@ HotelTV.ui_appfull = (function() {
HotelTV.api.ReportEvent([{'power': true, 'location':{'conId':_state.hotkey.mm['yellow'].id}}]) HotelTV.api.ReportEvent([{'power': true, 'location':{'conId':_state.hotkey.mm['yellow'].id}}])
} }
} else if (_evt.keyCode == gRmtKey.blue) { } else if (_evt.keyCode == gRmtKey.blue) {
console.log("BLUE::>");
// BLUE BUTTON // BLUE BUTTON
if ("blue" in _state.hotkey.mm) { if ("blue" in _state.hotkey.mm) {
$('.guide>.tips').stop().animate({ backgroundColor: "rgba(0,0,0,0.8)" }, 500, function() { $('.guide>.tips').stop().animate({ backgroundColor: "rgba(0,0,0,0.8)" }, 500, function() {
@@ -6755,10 +6764,12 @@ HotelTV.ui_appfull = (function() {
}); });
} else if (_state.hotkey.mm.blue.type == "amenity") { } else if (_state.hotkey.mm.blue.type == "amenity") {
if (_opening.amenity) { if (_opening.amenity) {
console.log("BLUE::>AMENITY");
__uifxn_AppFull_BuildAmenity(); __uifxn_AppFull_BuildAmenity();
} }
} else if (_state.hotkey.mm.blue.type == "roomservice") { } else if (_state.hotkey.mm.blue.type == "roomservice") {
if (_opening.roomService) { if (_opening.roomService) {
console.log("BLUE::>ROOMSERVICE");
__uifxn_AppFull_BuildRoomservice(); __uifxn_AppFull_BuildRoomservice();
} }
} }

View File

@@ -828,7 +828,7 @@
line-height: 137px; line-height: 137px;
width: 50%; width: 50%;
height: 60%; height: 60%;
font-size: 52px; font-size: 40px;
text-align: center; text-align: center;
color: rgba(218,165,32,1.0); color: rgba(218,165,32,1.0);
background-image: url(./images/quantity_edit_arrow.png); background-image: url(./images/quantity_edit_arrow.png);
@@ -849,7 +849,7 @@
line-height: 91px; line-height: 91px;
width: 50%; width: 50%;
height: 40%; height: 40%;
font-size: 52px; font-size: 40px;
text-align: center; text-align: center;
color: rgba(218,165,32,1.0); color: rgba(218,165,32,1.0);
} }
@@ -892,7 +892,7 @@
padding: 0px 30px 0px 30px; padding: 0px 30px 0px 30px;
overflow: hidden; overflow: hidden;
text-align: center; text-align: center;
font-size: 32px; font-size: 38px;
color: rgba(51,51,51,1.0); color: rgba(51,51,51,1.0);
} }
@@ -1109,7 +1109,7 @@
height: 65px; height: 65px;
width: 96%; width: 96%;
margin: 12px 2% 0px 2%; margin: 12px 2% 0px 2%;
padding: 4px 2% 0px 2%; padding: 18px 2% 0px 2%;
display: flex; display: flex;
float: left; float: left;
flex-direction: row; flex-direction: row;
@@ -1120,7 +1120,7 @@
.popup .amenity .bg .owl-carousel .owl-stage .am_item_sel_cart_win .winright>.summary>#label{ .popup .amenity .bg .owl-carousel .owl-stage .am_item_sel_cart_win .winright>.summary>#label{
line-height: 65px; line-height: 40px;
width: 50%; width: 50%;
height: 100px; height: 100px;
font-size: 48px; font-size: 48px;
@@ -1128,7 +1128,7 @@
} }
.popup .amenity .bg .owl-carousel .owl-stage .am_item_sel_cart_win .winright>.summary>#value{ .popup .amenity .bg .owl-carousel .owl-stage .am_item_sel_cart_win .winright>.summary>#value{
line-height: 65px; line-height: 40px;
width: 50%; width: 50%;
height: 100%; height: 100%;
font-size: 52px; font-size: 52px;
@@ -1290,7 +1290,7 @@
width: 100%; width: 100%;
height: 132px; height: 132px;
margin: 0; margin: 0;
padding: 0px 20px 0px 20px; padding: 0px 20px 0px 48px;
color: rgb(245,245,245); color: rgb(245,245,245);
line-height: 32px; line-height: 32px;
font-size: 32px; font-size: 32px;
@@ -1539,7 +1539,7 @@
height: 65px; height: 65px;
width: 96%; width: 96%;
margin: 12px 2% 0px 2%; margin: 12px 2% 0px 2%;
padding: 4px 2% 0px 2%; padding: 18px 2% 0px 2%;
display: flex; display: flex;
float: left; float: left;
flex-direction: row; flex-direction: row;
@@ -1550,7 +1550,7 @@
.popup .amenity .order .winleft>.summary>#label{ .popup .amenity .order .winleft>.summary>#label{
line-height: 65px; line-height: 40px;
width: 50%; width: 50%;
height: 100px; height: 100px;
font-size: 48px; font-size: 48px;
@@ -1558,7 +1558,7 @@
} }
.popup .amenity .order .winleft>.summary>#value{ .popup .amenity .order .winleft>.summary>#value{
line-height: 65px; line-height: 40px;
width: 50%; width: 50%;
height: 100%; height: 100%;
font-size: 52px; font-size: 52px;
@@ -1978,7 +1978,7 @@
line-height: 137px; line-height: 137px;
width: 50%; width: 50%;
height: 60%; height: 60%;
font-size: 52px; font-size: 40px;
text-align: center; text-align: center;
color: rgba(218,165,32,1.0); color: rgba(218,165,32,1.0);
background-image: url(./images/quantity_edit_arrow.png); background-image: url(./images/quantity_edit_arrow.png);
@@ -1999,7 +1999,7 @@
line-height: 91px; line-height: 91px;
width: 50%; width: 50%;
height: 40%; height: 40%;
font-size: 52px; font-size: 40px;
text-align: center; text-align: center;
color: rgba(218,165,32,1.0); color: rgba(218,165,32,1.0);
} }
@@ -2042,7 +2042,7 @@
padding: 0px 30px 0px 30px; padding: 0px 30px 0px 30px;
overflow: hidden; overflow: hidden;
text-align: center; text-align: center;
font-size: 32px; font-size: 38px;
color: rgba(51,51,51,1.0); color: rgba(51,51,51,1.0);
} }
@@ -2440,7 +2440,7 @@
width: 100%; width: 100%;
height: 132px; height: 132px;
margin: 0; margin: 0;
padding: 0px 20px 0px 20px; padding: 0px 20px 0px 48px;
color: rgb(245,245,245); color: rgb(245,245,245);
line-height: 32px; line-height: 32px;
font-size: 32px; font-size: 32px;