issue #1 Fix amenity&room service item list scroll issue. change user guide text color.

procentric/application/lib/hoteltv.js

@@ -493,7 +493,6 @@ HotelTV.LoadWelCome = async function() {
     HotelTV.dbginfo = await JSON.parse(sessionStorage.getItem("dbginfo"));
     HotelTV.devinfo = await JSON.parse(sessionStorage.getItem("devinfo"));
     HotelTV.svrinfo = await JSON.parse(sessionStorage.getItem("svrinfo"));
-    //HotelTV.state = await JSON.parse(sessionStorage.getItem("state"));
     //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);
     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.svrinfo = await JSON.parse(sessionStorage.getItem("svrinfo"));
     HotelTV.services = await JSON.parse(sessionStorage.getItem("services"));
-    //HotelTV.state = await JSON.parse(sessionStorage.getItem("state"));
 
     //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);

procentric/application/lib/hoteltv.ui_appfull.js

@@ -607,12 +607,21 @@ HotelTV.ui_appfull = (function() {
         let _amenity = 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) {
             return;
         }
         _amenity = _opening.amenity;
-
         // HOTKEY정보를 state에 기록
         if (!(_amenity.button in _state.hotkey.mm)) {
             _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;
         }
         _roomservice = _opening.roomService;
-
         // HOTKEY정보를 state에 기록
         if (!(_roomservice.button in _state.hotkey.mm)) {
             _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;
     }
 
@@ -1629,6 +1630,9 @@ HotelTV.ui_appfull = (function() {
             {
                 case "enter": {
                     _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);
                 } break;
 
@@ -1652,10 +1656,12 @@ HotelTV.ui_appfull = (function() {
 
                         // 테이블 ROW인덱스와 스크롤 OFFSET계산
                         __amctgyItemStatus.idx = _elTblTr_AmItemNext.prop('rowIndex');
-                        __amctgyItemStatus.scroll_TOfset += _elTblTr_AmItemNext.prop('scrollHeight');
 
-                        //스크롤 에니메이션 수행
-                        _elTbl_AmItem.children('#record').animate({ scrollTop: __amctgyItemStatus.scroll_TOfset }, 200);
+                        if ( _elTbl_AmItem.children('#record').find('tr').first().position().top<0 ){
+                            __amctgyItemStatus.scroll_TOfset -= _elTblTr_AmItemNext.prop('scrollHeight');
+                            //스크롤 에니메이션 수행
+                            _elTbl_AmItem.children('#record').animate({ scrollTop: __amctgyItemStatus.scroll_TOfset }, 200);
+                        }
 
                         __ifxn_updateAmItemDesc(__amctgyItemStatus.idx, function() {
                             if ( _isNeedSoldOutMask==true ){
@@ -1682,10 +1688,11 @@ HotelTV.ui_appfull = (function() {
 
                         // 테이블 ROW인덱스와 스크롤 OFFSET계산
                         __amctgyItemStatus.idx = _elTblTr_AmItemNext.prop('rowIndex');
-                        __amctgyItemStatus.scroll_TOfset += _elTblTr_AmItemNext.prop('scrollHeight');
-
-                        //스크롤 에니메이션 수행
-                        _elTbl_AmItem.children('#record').animate({ scrollTop: __amctgyItemStatus.scroll_TOfset }, 200);
+                        if ( __amctgyItemStatus.idx>=12 ){
+                            __amctgyItemStatus.scroll_TOfset += _elTblTr_AmItemNext.prop('scrollHeight');
+                            //스크롤 에니메이션 수행
+                            _elTbl_AmItem.children('#record').animate({ scrollTop: __amctgyItemStatus.scroll_TOfset }, 200);
+                        }
 
                         __ifxn_updateAmItemDesc(__amctgyItemStatus.idx, function() {
                             if ( _isNeedSoldOutMask==true ){
@@ -2064,6 +2071,7 @@ HotelTV.ui_appfull = (function() {
                                         $('.main').addClass("depth_mm");
                                         __uifxn_AppFull_HotKey_ShowBtnOnMM(true);
                                         __uifxn_AppFull_TopWidjetShow(true);
+                                        _state.menu.stage.prev = null;
                                     });
                                 }, 500);
                             }
@@ -2114,6 +2122,7 @@ HotelTV.ui_appfull = (function() {
                                         $('.main').addClass("depth_mm");
                                         __uifxn_AppFull_HotKey_ShowBtnOnMM(true);
                                         __uifxn_AppFull_TopWidjetShow(true);
+                                        _state.menu.stage.prev = null;
                                     });
                                 }, 500);
                             }
@@ -2136,7 +2145,7 @@ HotelTV.ui_appfull = (function() {
                                     _state.menu.stage.cur = "amenity_ctgy_item_cart";
                                     __uifxn_AppFull_DrawAmUserGuide("amenity_ctgy_item_cart");
                                 } else {
-                                    HotelTV.ui_utils.ShowNotificationMsgBalloon(_trTbl.system.ott_service_not_ready[_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") {
@@ -3161,6 +3170,10 @@ HotelTV.ui_appfull = (function() {
             {
                 case "enter": {
                     _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);
                 } break;
 
@@ -3184,10 +3197,12 @@ HotelTV.ui_appfull = (function() {
 
                         // 테이블 ROW인덱스와 스크롤 OFFSET계산
                         __rsctgyItemStatus.idx = _elTblTr_RsItemNext.prop('rowIndex');
-                        __rsctgyItemStatus.scroll_TOfset += _elTblTr_RsItemNext.prop('scrollHeight');
 
-                        //스크롤 에니메이션 수행
-                        _elTbl_RsItem.children('#record').animate({ scrollTop: __rsctgyItemStatus.scroll_TOfset }, 200);
+                        if ( _elTbl_RsItem.children('#record').find('tr').first().position().top<0 ){
+                            __rsctgyItemStatus.scroll_TOfset -= _elTblTr_RsItemNext.prop('scrollHeight');
+                            //스크롤 에니메이션 수행
+                            _elTbl_RsItem.children('#record').animate({ scrollTop: __rsctgyItemStatus.scroll_TOfset }, 200);
+                        }
 
                         __ifxn_updateRsItemDesc(__rsctgyItemStatus.idx, function() {
                             if ( _isNeedSoldOutMask==true ){
@@ -3214,10 +3229,11 @@ HotelTV.ui_appfull = (function() {
 
                         // 테이블 ROW인덱스와 스크롤 OFFSET계산
                         __rsctgyItemStatus.idx = _elTblTr_RsItemNext.prop('rowIndex');
-                        __rsctgyItemStatus.scroll_TOfset += _elTblTr_RsItemNext.prop('scrollHeight');
-
-                        //스크롤 에니메이션 수행
-                        _elTbl_RsItem.children('#record').animate({ scrollTop: __rsctgyItemStatus.scroll_TOfset }, 200);
+                        if ( __rsctgyItemStatus.idx>=12 ){
+                            __rsctgyItemStatus.scroll_TOfset += _elTblTr_RsItemNext.prop('scrollHeight');
+                            //스크롤 에니메이션 수행
+                            _elTbl_RsItem.children('#record').animate({ scrollTop: __rsctgyItemStatus.scroll_TOfset }, 200);
+                        }
 
                         __ifxn_updateRsItemDesc(__rsctgyItemStatus.idx, function() {
                             if ( _isNeedSoldOutMask==true ){
@@ -3597,6 +3613,7 @@ HotelTV.ui_appfull = (function() {
                                         $('.main').addClass("depth_mm");
                                         __uifxn_AppFull_HotKey_ShowBtnOnMM(true);
                                         __uifxn_AppFull_TopWidjetShow(true);
+                                        _state.menu.stage.prev = null;
                                     });
                                 }, 500);
                             }
@@ -3646,6 +3663,7 @@ HotelTV.ui_appfull = (function() {
                                         $('.main').addClass("depth_mm");
                                         __uifxn_AppFull_HotKey_ShowBtnOnMM(true);
                                         __uifxn_AppFull_TopWidjetShow(true);
+                                        _state.menu.stage.prev = null;
                                     });
                                 }, 500);
                             }
@@ -3668,7 +3686,7 @@ HotelTV.ui_appfull = (function() {
                                     _state.menu.stage.cur = "roomservice_ctgy_item_cart";
                                     __uifxn_AppFull_DrawRsUserGuide("roomservice_ctgy_item_cart");
                                 } else {
-                                    HotelTV.ui_utils.ShowNotificationMsgBalloon(_trTbl.system.ott_service_not_ready[_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") {
@@ -4410,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');
                                 if (uri_video != null) {
                                     _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(
                                         uri_video,
                                         "",
@@ -6723,6 +6741,7 @@ HotelTV.ui_appfull = (function() {
                     }
                 } else if (_evt.keyCode == gRmtKey.yellow) {
                     // YELLOW BUTTON
+                    console.log("YELLOW::>");
                     if ("yellow" in _state.hotkey.mm) {
                         $('.guide>.tips').stop().animate({ backgroundColor: "rgba(0,0,0,0.8)" }, 500, function() {
                             if (_state.hotkey.mm.yellow.type == "brochure") {
@@ -6733,10 +6752,12 @@ HotelTV.ui_appfull = (function() {
                                 });
                             } else if (_state.hotkey.mm.yellow.type == "amenity") {
                                 if (_opening.amenity) {
+                                    console.log("YELLOW::>AMENITY");
                                     __uifxn_AppFull_BuildAmenity();
                                 }
                             } else if (_state.hotkey.mm.yellow.type == "roomservice") {
                                 if (_opening.roomService) {
+                                    console.log("YELLOW::>ROOMSERVICEC");
                                     __uifxn_AppFull_BuildRoomservice();
                                 }
                             }
@@ -6744,6 +6765,7 @@ HotelTV.ui_appfull = (function() {
                         HotelTV.api.ReportEvent([{'power': true, 'location':{'conId':_state.hotkey.mm['yellow'].id}}])
                     }
                 } else if (_evt.keyCode == gRmtKey.blue) {
+                    console.log("BLUE::>");
                     // BLUE BUTTON
                     if ("blue" in _state.hotkey.mm) {
                         $('.guide>.tips').stop().animate({ backgroundColor: "rgba(0,0,0,0.8)" }, 500, function() {
@@ -6755,10 +6777,12 @@ HotelTV.ui_appfull = (function() {
                                 });
                             } else if (_state.hotkey.mm.blue.type == "amenity") {
                                 if (_opening.amenity) {
+                                    console.log("BLUE::>AMENITY");
                                     __uifxn_AppFull_BuildAmenity();
                                 }
                             } else if (_state.hotkey.mm.blue.type == "roomservice") {
                                 if (_opening.roomService) {
+                                    console.log("BLUE::>ROOMSERVICE");
                                     __uifxn_AppFull_BuildRoomservice();
                                 }
                             }
@@ -7121,7 +7145,7 @@ HotelTV.ui_appfull = (function() {
                             $('.error #countdown #message').text(`System will be shutdown in ${_tmval} second...`);
                         },
                         "cb_eoe": function() {
-                            setTimeout(HotelTV.hcap.PwrOff(), 500);
+                            setTimeout(HotelTV.hcap.PwrOff, 500);
                             HotelTV.api.ReportEvent([{'power': false, 'location':null}])
                         }
                     });
@@ -7146,7 +7170,7 @@ HotelTV.ui_appfull = (function() {
                             $('.error #countdown #message').text(`System will be shutdown in ${_tmval} second...`);
                         },
                         "cb_eoe": function() {
-                            setTimeout(HotelTV.hcap.PwrOff(), 500);
+                            setTimeout(HotelTV.hcap.PwrOff, 500);
                             HotelTV.api.ReportEvent([{'power': false, 'location':null}])
                         }
                     });
@@ -7171,7 +7195,7 @@ HotelTV.ui_appfull = (function() {
                             $('.error #countdown #message').text(`System will be shutdown in ${_tmval} second...`);
                         },
                         "cb_eoe": function() {
-                            setTimeout(HotelTV.hcap.PwrOff(), 500);
+                            setTimeout(HotelTV.hcap.PwrOff, 500);
                             HotelTV.api.ReportEvent([{'power': false, 'location':null}])
                         }
                     });

procentric/application/theme/HJS00001/hoteltv.app.full.popup.css

@@ -564,7 +564,7 @@
 }
 
 .popup .amenity .bg .am_item_sel_win .winleft>.tbl_record tbody {
-    /* height: 285px; */
+    height: 670px;
     overflow-y: auto;
     display: block;
 }
@@ -828,7 +828,7 @@
     line-height: 137px;
     width: 50%;
     height: 60%;
-    font-size: 52px;
+    font-size: 40px;
     text-align: center;
     color: rgba(218,165,32,1.0);
     background-image: url(./images/quantity_edit_arrow.png);
@@ -849,7 +849,7 @@
     line-height: 91px;
     width: 50%;
     height: 40%;
-    font-size: 52px;
+    font-size: 40px;
     text-align: center;
     color: rgba(218,165,32,1.0);
 }
@@ -892,7 +892,7 @@
     padding: 0px 30px 0px 30px;
     overflow: hidden;
     text-align: center;
-    font-size: 32px;
+    font-size: 38px;
     color: rgba(51,51,51,1.0);
 }
 
@@ -1109,7 +1109,7 @@
     height: 65px;
     width: 96%;
     margin: 12px 2% 0px 2%;
-    padding: 4px 2% 0px 2%;
+    padding: 18px 2% 0px 2%;
     display: flex;
     float: left;
     flex-direction: row;
@@ -1120,7 +1120,7 @@
 
 
 .popup .amenity .bg .owl-carousel .owl-stage .am_item_sel_cart_win .winright>.summary>#label{
-    line-height: 65px;
+    line-height: 40px;
     width: 50%;
     height: 100px;
     font-size: 48px;
@@ -1128,7 +1128,7 @@
 }
 
 .popup .amenity .bg .owl-carousel .owl-stage .am_item_sel_cart_win .winright>.summary>#value{
-    line-height: 65px;
+    line-height: 40px;
     width: 50%;
     height: 100%;
     font-size: 52px;
@@ -1290,8 +1290,9 @@
     width: 100%;
     height: 132px;
     margin: 0;
-    padding: 0px 20px 0px 20px;
-    color: rgb(245,245,245);
+    padding: 0px 20px 0px 48px;
+    /* color: rgb(245,245,245); */
+    color: rgb(181, 218, 16);
     line-height: 32px;
     font-size: 32px;
     z-index: 1;
@@ -1539,7 +1540,7 @@
     height: 65px;
     width: 96%;
     margin: 12px 2% 0px 2%;
-    padding: 4px 2% 0px 2%;
+    padding: 18px 2% 0px 2%;
     display: flex;
     float: left;
     flex-direction: row;
@@ -1550,7 +1551,7 @@
 
 
 .popup .amenity .order .winleft>.summary>#label{
-    line-height: 65px;
+    line-height: 40px;
     width: 50%;
     height: 100px;
     font-size: 48px;
@@ -1558,7 +1559,7 @@
 }
 
 .popup .amenity .order .winleft>.summary>#value{
-    line-height: 65px;
+    line-height: 40px;
     width: 50%;
     height: 100%;
     font-size: 52px;
@@ -1714,7 +1715,7 @@
 }
 
 .popup .roomservice .bg .rs_item_sel_win .winleft>.tbl_record tbody {
-    /* height: 285px; */
+    height: 670px;
     overflow-y: auto;
     display: block;
 }
@@ -1978,7 +1979,7 @@
     line-height: 137px;
     width: 50%;
     height: 60%;
-    font-size: 52px;
+    font-size: 40px;
     text-align: center;
     color: rgba(218,165,32,1.0);
     background-image: url(./images/quantity_edit_arrow.png);
@@ -1999,7 +2000,7 @@
     line-height: 91px;
     width: 50%;
     height: 40%;
-    font-size: 52px;
+    font-size: 40px;
     text-align: center;
     color: rgba(218,165,32,1.0);
 }
@@ -2042,7 +2043,7 @@
     padding: 0px 30px 0px 30px;
     overflow: hidden;
     text-align: center;
-    font-size: 32px;
+    font-size: 38px;
     color: rgba(51,51,51,1.0);
 }
 
@@ -2440,8 +2441,9 @@
     width: 100%;
     height: 132px;
     margin: 0;
-    padding: 0px 20px 0px 20px;
-    color: rgb(245,245,245);
+    padding: 0px 20px 0px 48px;
+    /* color: rgb(245,245,245); */
+    color: rgb(181, 218, 16);
     line-height: 32px;
     font-size: 32px;
     z-index: 1;