issue #11 Remove carts when loading app full.

issue #11 Fix text overflow issue on amenity item selection order lists.
issue #11 Fix brochure navigation dot not show issue.
2024-03-29 18:01:10 +09:00 · 2024-03-29 17:53:39 +09:00 · 2024-03-29 16:48:16 +09:00 · 2024-03-29 14:06:21 +09:00 · 2024-03-27 20:20:03 +09:00 · 2024-03-26 18:52:12 +09:00
7 changed files with 103 additions and 115 deletions
--- a/procentric/application/hoteltv.welcome.css
+++ b/procentric/application/hoteltv.welcome.css
@@ -13,19 +13,6 @@ body {
    z-index: 1;
 }

-.startup {
-    top: 0px;
-    left: 0px;
-    position: absolute;
-    width: 100%;
-    height: 100%;
-    padding: 0px;
-    /* background-image: url(./images/hoteltv_service_preparing.png); */
-    background-image: url(./images/hoteltv_service_preparing_joson.jpg);
-    background-size: cover;
-    background-repeat: no-repeat;
-}
-
 .welcome .frame {
    position: absolute;
    top: 0px;
--- a/procentric/application/lib/hoteltv.api.js
+++ b/procentric/application/lib/hoteltv.api.js
@@ -802,7 +802,7 @@ HotelTV.api = (function() {
                "mac_wifi": "",
                "mac_bt": "",
                "speed": 0,
-                "manufacture": "LG",
+                "manufacture": _dev_inf['manufacture'],
                "model": "",
                "hw_ver": "1.00",
                "sw_ver": "1.1.5",
--- a/procentric/application/lib/hoteltv.js
+++ b/procentric/application/lib/hoteltv.js
@@ -130,6 +130,12 @@ function __fxn_Set_DebugOpt() {
    console.log("OPT" + navigator.appVersion);
    if (navigator.appVersion.includes("Web0S") == true) {
        HotelTV.dbginfo['emulator'] = false;
+        HotelTV.devinfo['manufacture'] = "LG";
+        HotelTV.devinfo['tvOS'] = "Web0S";
+    } else if (navigator.appVersion.includes("Tizen") == true) {
+        HotelTV.dbginfo['emulator'] = false;
+        HotelTV.devinfo['manufacture'] = "SAMSUNG";
+        HotelTV.devinfo['tvOS'] = "Tizen";
    } else {
        HotelTV.dbginfo['emulator'] = true;
    }
@@ -209,7 +215,7 @@ HotelTV.Init = async function() {
                    $('.error #countdown #message').text(`System will be reboot in ${_tmval} second...`);
                },
                "cb_eoe": function() {
-                    setTimeout(HotelTV.hcap.Reboot(), 500);
+                    setTimeout(HotelTV.hcap.Reboot, 500);
                }
            });
    }
@@ -236,7 +242,7 @@ HotelTV.Init = async function() {
                    $('.error #countdown #message').text(`The Device ID is ${HotelTV.devinfo.serial_number}.\r\n\r\nSystem will be reboot in ${_tmval} second...`);
                },
                "cb_eoe": function() {
-                    setTimeout(HotelTV.hcap.Reboot(), 500);
+                    setTimeout(HotelTV.hcap.Reboot, 500);
                }
            });
    }
@@ -270,7 +276,7 @@ HotelTV.Init = async function() {
                            $('.error #countdown #message').text(`System will be reboot in ${_tmval} second...`);
                        },
                        "cb_eoe": function() {
-                            setTimeout(HotelTV.hcap.Reboot(), 500);
+                            setTimeout(HotelTV.hcap.Reboot, 500);
                        }
                    });
                return;
@@ -291,7 +297,7 @@ HotelTV.Init = async function() {
                        $('.error #countdown #message').text(`The Device ID is ${HotelTV.devinfo.serial_number}.\r\n\r\nSystem will be reboot in ${_tmval} second...`);
                    },
                    "cb_eoe": function() {
-                        setTimeout(HotelTV.hcap.Reboot(), 500);
+                        setTimeout(HotelTV.hcap.Reboot, 500);
                    }
                });
        }
@@ -314,7 +320,7 @@ HotelTV.Init = async function() {
                        $('.error #countdown #message').text(`The Device ID is ${HotelTV.devinfo.serial_number}.\r\n\r\nSystem will be reboot in ${_tmval} second...`);
                    },
                    "cb_eoe": function() {
-                        setTimeout(HotelTV.hcap.Reboot(), 500);
+                        setTimeout(HotelTV.hcap.Reboot, 500);
                    }
                });
        }
@@ -343,7 +349,7 @@ HotelTV.Init = async function() {
                        $('.error #countdown #message').text(`The Device ID is ${HotelTV.devinfo.serial_number}.\r\n\r\nSystem will be reboot in ${_tmval} second...`);
                    },
                    "cb_eoe": function() {
-                        setTimeout(HotelTV.hcap.Reboot(), 500);
+                        setTimeout(HotelTV.hcap.Reboot, 500);
                    }
                });
        }
@@ -366,7 +372,7 @@ HotelTV.Init = async function() {
                        $('.error #countdown #message').text(`The Device ID is ${HotelTV.devinfo.serial_number}.\r\n\r\nSystem will be reboot in ${_tmval} second...`);
                    },
                    "cb_eoe": function() {
-                        setTimeout(HotelTV.hcap.Reboot(), 500);
+                        setTimeout(HotelTV.hcap.Reboot, 500);
                    }
                });
        }
@@ -401,7 +407,7 @@ HotelTV.Init = async function() {
                        $('.error #countdown #message').text(`The Device ID is ${HotelTV.devinfo.serial_number}.\r\n\r\nSystem will be reboot in ${_tmval} second...`);
                    },
                    "cb_eoe": function() {
-                        setTimeout(HotelTV.hcap.Reboot(), 500);
+                        setTimeout(HotelTV.hcap.Reboot, 500);
                    }
                });
        }
@@ -424,7 +430,7 @@ HotelTV.Init = async function() {
                        $('.error #countdown #message').text(`The Device ID is ${HotelTV.devinfo.serial_number}.\r\n\r\nSystem will be reboot in ${_tmval} second...`);
                    },
                    "cb_eoe": function() {
-                        setTimeout(HotelTV.hcap.Reboot(), 500);
+                        setTimeout(HotelTV.hcap.Reboot, 500);
                    }
                });
        }
@@ -493,7 +499,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 +633,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);
@@ -650,13 +654,15 @@ HotelTV.LoadAppFull = async function() {
    }

    try {
+        let _result = await HotelTV.api.DeleteAmenityCarts(null);
        HotelTV.carts.amenity = await HotelTV.api.GetAmenityCarts(null);
    } catch (_error) {
        console.error("Display Error page for get amenity carts info");
    }

-    HotelTV.carts.roomservice = await HotelTV.api.GetRoomserviceCarts();
    try {
+        let _result = await HotelTV.api.DeleteRoomserviceCarts(null);
+        HotelTV.carts.roomservice = await HotelTV.api.GetRoomserviceCarts();
    } catch (_error) {
        console.error("Display Error page for get roomservicec carts info");
    }
--- a/procentric/application/lib/hoteltv.ui_appfull.js
+++ b/procentric/application/lib/hoteltv.ui_appfull.js
@@ -492,9 +492,14 @@ HotelTV.ui_appfull = (function() {
                }, 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 ( $('body,html').css('display')=="none" ){
+                    $('body,html').fadeIn(500);
+
+                    if ( _state.menu.stage.prev!=null ){
+                        _state.menu.stage.cur = _state.menu.stage.prev;
+                        _state.menu.stage.prev = null;
+                    }
+                }
            }
        }
    }
@@ -1485,7 +1490,6 @@ HotelTV.ui_appfull = (function() {

                case "enter": {
                    if ( _str_curBtnID=='btn_ordernow' ){
-                        console.log("TODO::>> ORDERING NOW...");
                        __ifxn_processAmCartOrder(
                            function() {
                                //Return to menu
@@ -1630,6 +1634,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;

@@ -1653,10 +1660,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 ){
@@ -1683,10 +1692,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 ){
@@ -2018,7 +2028,6 @@ HotelTV.ui_appfull = (function() {
                                    if ( _aminfo_ctgy[__status_am_specific.category_sel.cur].name == "CARTS" ){
                                        console.log("TODO::> NOTIFY cannot enter item sel on CARTS");
                                    }else if ( _aminfo_ctgy[__status_am_specific.category_sel.cur].name == "ORDER" ){
-                                        console.log("TODO::> NOTIFY cannot enter item sel on ORDER");
                                        let __str_notify_msg = _trTbl.ui.amenity.message.invalidCategory[_state.lang].replace('__MENU__', __uifxn_AppFull_getOrderMenuName(_aminfo_ctgy));
                                        HotelTV.ui_utils.ShowNotificationMsgBalloon(__str_notify_msg, 5);
                                    }else{
@@ -2139,7 +2148,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.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") {
@@ -2214,7 +2223,6 @@ HotelTV.ui_appfull = (function() {
                if ( _aminfo_ctgy[__status_am_specific.category_sel.cur].name == "CARTS" ){
                    console.log("TODO::> Draw Carts");
                }else if ( _aminfo_ctgy[__status_am_specific.category_sel.cur].name == "ORDER" ){
-                    console.log("TODO::> Draw Order");
                    __uifxn_AppFull_DrawAmOrderList('build');
                    _state.menu.stage.prev = _state.menu.stage.cur;
                    _state.menu.stage.cur = "amenity_ctgy_orderlists";
@@ -3019,7 +3027,6 @@ HotelTV.ui_appfull = (function() {

                case "enter": {
                    if ( _str_curBtnID=='btn_ordernow' ){
-                        console.log("TODO::>> ORDERING NOW...");
                        __ifxn_processRsCartOrder(
                            function() {
                                //Return to menu
@@ -3164,6 +3171,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;

@@ -3187,10 +3198,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 ){
@@ -3217,10 +3230,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 ){
@@ -3553,7 +3567,6 @@ HotelTV.ui_appfull = (function() {
                                    if ( _rsinfo_ctgy[__status_rs_specific.category_sel.cur].name == "CARTS" ){
                                        console.log("TODO::> NOTIFY cannot enter item sel on CARTS");
                                    }else if ( _rsinfo_ctgy[__status_rs_specific.category_sel.cur].name == "ORDER" ){
-                                        console.log("TODO::> NOTIFY cannot enter item sel on ORDER");
                                        let __str_notify_msg = _trTbl.ui.roomservice.message.invalidCategory[_state.lang].replace('__MENU__', __uifxn_AppFull_getOrderMenuName(_rsinfo_ctgy));
                                        HotelTV.ui_utils.ShowNotificationMsgBalloon(__str_notify_msg, 5);
                                    }else{
@@ -3673,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.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") {
@@ -3748,7 +3761,6 @@ HotelTV.ui_appfull = (function() {
                if ( _rsinfo_ctgy[__status_rs_specific.category_sel.cur].name == "CARTS" ){
                    console.log("TODO::> Draw Carts");
                }else if ( _rsinfo_ctgy[__status_rs_specific.category_sel.cur].name == "ORDER" ){
-                    console.log("TODO::> Draw Order");
                    __uifxn_AppFull_DrawRsOrderList('build');
                    _state.menu.stage.prev = _state.menu.stage.cur;
                    _state.menu.stage.cur = "roomservice_ctgy_orderlists";
@@ -4415,7 +4427,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,
                                        "",
@@ -5869,58 +5881,38 @@ 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 sz_msg = null;
                if (show_stages.includes(_state.menu.stage.cur) == true) {
+                    const ___ifxn_updateGuideMsg = function(_szMsg) {
+                        if ($('.guide>.tips').attr("value") != _szMsg) {
+                            $('.guide>.tips').attr("value", _szMsg);
+                            $('.guide>.tips').html(_szMsg);
+                        }
+                    }
                    switch (_state.menu.stage.cur) {
                        case "hotkey_mm_red":
-                            sz_msg = _trTbl.ui.guide.navi_brochure[_state.lang];
-                            if ($('.guide>.tips').text() != sz_msg) {
-                                $('.guide>.tips').text(sz_msg);
-                            }
+                            ___ifxn_updateGuideMsg(_trTbl.ui.guide.navi_brochure[_state.lang]);
                            break;
                        case "hotkey_mm_green":
-                            sz_msg = _trTbl.ui.guide.navi_brochure[_state.lang];
-                            if ($('.guide>.tips').text() != sz_msg) {
-                                $('.guide>.tips').text(sz_msg);
-                            }
+                            ___ifxn_updateGuideMsg(_trTbl.ui.guide.navi_brochure[_state.lang]);
                            break;
                        case "hotkey_mm_yellow":
-                            sz_msg = _trTbl.ui.guide.navi_brochure[_state.lang];
-                            if ($('.guide>.tips').text() != sz_msg) {
-                                $('.guide>.tips').text(sz_msg);
-                            }
+                            ___ifxn_updateGuideMsg(_trTbl.ui.guide.navi_brochure[_state.lang]);
                            break;
                        case "hotkey_mm_blue":
-                            sz_msg = _trTbl.ui.guide.navi_brochure[_state.lang];
-                            if ($('.guide>.tips').text() != sz_msg) {
-                                $('.guide>.tips').text(sz_msg);
-                            }
+                            ___ifxn_updateGuideMsg(_trTbl.ui.guide.navi_brochure[_state.lang]);
                            break;
                        case "main":
-                            //sz_msg = _trTbl.ui.guide.navi_menu[_state.lang] || "";
-                            sz_msg = _trTbl.ui.guide.navi_menu[_state.lang];
-                            if ($('.guide>.tips').text() != sz_msg) {
-                                $('.guide>.tips').text(sz_msg);
-                            }
+                            ___ifxn_updateGuideMsg(_trTbl.ui.guide.navi_menu[_state.lang]);
                            break;
                        case "sub":
-                            sz_msg = _trTbl.ui.guide.navi_menu[_state.lang];
-                            if ($('.guide>.tips').text() != sz_msg) {
-                                $('.guide>.tips').text(sz_msg);
-                            }
+                            ___ifxn_updateGuideMsg(_trTbl.ui.guide.navi_menu[_state.lang]);
                            break;
                        case "ctzgen":
-                            sz_msg = _trTbl.ui.guide.navi_ctz[_state.lang];
-                            if ($('.guide>.tips').text() != sz_msg) {
-                                $('.guide>.tips').text(sz_msg);
-                            }
+                            ___ifxn_updateGuideMsg(_trTbl.ui.guide.navi_ctz[_state.lang]);
                            break;
                        case "tvCtgShow":
                        case "tvCtgHide":
-                            sz_msg = _trTbl.ui.guide.navi_tvchannel[_state.lang];
-                            if ($('.guide>.tips').text() != sz_msg) {
-                                $('.guide>.tips').text(sz_msg);
-                            }
+                            ___ifxn_updateGuideMsg(_trTbl.ui.guide.navi_tvchannel[_state.lang]);
                            break;
                    }

@@ -7132,13 +7124,13 @@ 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}])
                        }
                    });
-            } else if (_evt == "GUEST-CHECKIN") {
+            } else if (_evt == "COMMAND-GUEST-CHECKIN") {

-            } else if (_evt == "GUEST-CHECKOUT") {
+            } else if (_evt == "COMMAND-GUEST-CHECKOUT") {
                let _tmval = 30;
                let _state = HotelTV.state;
                let _trTbl = HotelTV.translation;
@@ -7157,13 +7149,13 @@ 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}])
                        }
                    });
-            } else if (_evt == "GUEST-UPDATE") {
+            } else if (_evt == "COMMAND-GUEST-UPDATE") {

-            } else if (_evt == "GUEST-ROOMCHANGE") {
+            } else if (_evt == "COMMAND-GUEST-ROOMCHANGE") {
                let _tmval = 30;
                let _state = HotelTV.state;
                let _trTbl = HotelTV.translation;
@@ -7182,7 +7174,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}])
                        }
                    });
--- a/procentric/application/lib/hoteltv.ui_welcome.js
+++ b/procentric/application/lib/hoteltv.ui_welcome.js
@@ -147,8 +147,8 @@ HotelTV.ui_welcome = (function() {
     */
    function __uifxn_WC_OnNetEvt(_evt) {
        let _state = HotelTV.state;
-        console.log("network_event_received = " + _evt.eventType);
-        let _typeNetEvt = _evt.eventType;
+        console.log("network_event_received = " + _evt['eventType']);
+        let _typeNetEvt = _evt['eventType'];

        switch (_typeNetEvt) {
            case hcap.network.NetworkEventType.ABLE_REACH_DNS:
@@ -385,13 +385,13 @@ HotelTV.ui_welcome = (function() {
                        }
                    }
                } else if (_state.menu.stage.cur == "playWelcomeMovie") {
-                    if (_evt.keyCode == 413) {
+                    if (_evt.keyCode == gRmtKey.stop) {
                        // STOP KEY Event
                        if (_media_status == 'playing') {
                            _media_status = 'preparing_stop_playing';
                            var _evt = new Event('media_event_received');
-                            _evt.eventType = "play_end_need_destory";
-                            _evt.command_id = "event";
+                            _evt['command_id'] = "media_ctrl_event";
+                            _evt['eventType'] = "play_end_need_destory";
                            document.dispatchEvent(_evt);
                        }
                    } else {
@@ -404,7 +404,7 @@ HotelTV.ui_welcome = (function() {
                                }, 3000);
                            } else {
                                const _evt = new Event('media_event_received');
-                                _evt['command_id'] = "media_event_received";
+                                _evt['command_id'] = "media_ctrl_event";
                                _evt['eventType'] = "play_stop_requtested";
                                document.dispatchEvent(_evt);
                            }
@@ -479,7 +479,7 @@ HotelTV.ui_welcome = (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}])
                        }
                    });
@@ -504,7 +504,7 @@ HotelTV.ui_welcome = (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}])
                        }
                    });
@@ -529,7 +529,7 @@ HotelTV.ui_welcome = (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}])
                        }
                    });
--- a/procentric/application/theme/HJS00001/hoteltv.app.full.popup.css
+++ b/procentric/application/theme/HJS00001/hoteltv.app.full.popup.css
@@ -125,7 +125,7 @@
    width: 15px;
    border: 2px solid rgba(80, 80, 80, 0.8);
    filter: drop-shadow(0 1px 2px rgb(0, 0, 0));
-    background: none;
+    /* background: none; */
 }


@@ -225,7 +225,7 @@
    width: 15px;
    border: 2px solid rgba(80, 80, 80, 0.8);
    filter: drop-shadow(0 1px 2px rgb(0, 0, 0));
-    background: none;
+    /* background: none; */
 }


@@ -325,7 +325,7 @@
    width: 15px;
    border: 2px solid rgba(80, 80, 80, 0.8);
    filter: drop-shadow(0 1px 2px rgb(0, 0, 0));
-    background: none;
+    /* background: none; */
 }


@@ -425,7 +425,7 @@
    width: 15px;
    border: 2px solid rgba(80, 80, 80, 0.8);
    filter: drop-shadow(0 1px 2px rgb(0, 0, 0));
-    background: none;
+    /* background: none; */
 }


@@ -535,7 +535,7 @@
 }

 .popup .amenity .bg .am_item_sel_win .winleft>.tbl_header tbody tr>#title {
-    width: 45%;
+    width: 42%;
    float: left;
    /* text-align: left; */
    padding: 0 0px 0 20px;
@@ -547,7 +547,7 @@
 }

 .popup .amenity .bg .am_item_sel_win .winleft>.tbl_header tbody tr>#status {
-    width: 35%;
+    width: 38%;
    float: left;
    padding: 0px 30px 0 0px;
 }
@@ -564,7 +564,7 @@
 }

 .popup .amenity .bg .am_item_sel_win .winleft>.tbl_record tbody {
-    /* height: 285px; */
+    height: 670px;
    overflow-y: auto;
    display: block;
 }
@@ -610,7 +610,7 @@
 }

 .popup .amenity .bg .am_item_sel_win .winleft>.tbl_record tbody tr>.amctgyItem>#title {
-    width: 45%;
+    width: 42%;
    float: left;
    padding: 0px 0px 0px 20px;
    text-overflow: ellipsis;
@@ -624,7 +624,7 @@
 }

 .popup .amenity .bg .am_item_sel_win .winleft>.tbl_record tbody tr>.amctgyItem>#status {
-    width: 35%;
+    width: 38%;
    float: left;
    /* text-align: right; */
    padding: 0px 30px 0 0px;
@@ -1055,6 +1055,8 @@
    width: 50%;
    float: left;
    padding: 0px 0px 0px 20px;
+    text-overflow: ellipsis;
+    overflow: hidden;
 }

 .popup .amenity .bg .owl-carousel .owl-stage .am_item_sel_cart_win .winright>.cart_table>.tbl_record tbody tr>.cartItem>#quantity {
@@ -1291,7 +1293,8 @@
    height: 132px;
    margin: 0;
    padding: 0px 20px 0px 48px;
-    color: rgb(245,245,245);
+    /* color: rgb(245,245,245); */
+    color: rgb(181, 218, 16);
    line-height: 32px;
    font-size: 32px;
    z-index: 1;
@@ -1714,7 +1717,7 @@
 }

 .popup .roomservice .bg .rs_item_sel_win .winleft>.tbl_record tbody {
-    /* height: 285px; */
+    height: 670px;
    overflow-y: auto;
    display: block;
 }
@@ -2441,7 +2444,8 @@
    height: 132px;
    margin: 0;
    padding: 0px 20px 0px 48px;
-    color: rgb(245,245,245);
+    /* color: rgb(245,245,245); */
+    color: rgb(181, 218, 16);
    line-height: 32px;
    font-size: 32px;
    z-index: 1;
--- a/procentric/application/wellcome.html
+++ b/procentric/application/wellcome.html
@@ -7,7 +7,6 @@
    <link rel="stylesheet" href="/procentric/application/css/owlcarousel/owl.theme.default.min.css">
    <link rel="stylesheet" href="/procentric/application/theme/hoteltv.ui_utils.css">
    <link rel="stylesheet" href="/procentric/application/theme/hoteltv.error.css">
-    <!-- <link rel="stylesheet" href="hoteltv.welcome.css"> -->
    <title>CENTIRM LG-PROCENTRIC HOTEL SERVICE</title>
 </head>
Author	SHA1	Message	Date
Paul Kim	fe71eb5561	issue #11 Remove carts when loading app full.	2024-03-29 18:01:10 +09:00
Paul Kim	d7a6748ff8	issue #11 Fix text overflow issue on amenity item selection order lists.	2024-03-29 17:53:39 +09:00
Paul Kim	9da17b7835	issue #11 Fix brochure navigation dot not show issue.	2024-03-29 16:48:16 +09:00
Paul Kim	6979da71d4	issue #11 Fix wrong action when hdmi unplaged.	2024-03-29 14:06:21 +09:00
Paul Kim	8b847aaea2	issue #11 #10 Fix MQTT routine bug on app full. Adjust amenity item selection title.	2024-03-27 20:20:03 +09:00
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