issue #11 Fix brochure navigation dot not show issue.

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;

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);
+                if ( $('body,html').css('display')=="none" ){
-                _state.menu.stage.cur = _state.menu.stage.prev;
+                    $('body,html').fadeIn(500);
-                _state.menu.stage.prev = null;
+
+                    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
@@ -2024,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{
@@ -2220,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";
@@ -3025,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
@@ -3566,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{
@@ -3761,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";
@@ -5882,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];
+                            ___ifxn_updateGuideMsg(_trTbl.ui.guide.navi_brochure[_state.lang]);
-                            if ($('.guide>.tips').text() != sz_msg) {
-                                $('.guide>.tips').text(sz_msg);
-                            }
                             break;
                         case "hotkey_mm_green":
-                            sz_msg = _trTbl.ui.guide.navi_brochure[_state.lang];
+                            ___ifxn_updateGuideMsg(_trTbl.ui.guide.navi_brochure[_state.lang]);
-                            if ($('.guide>.tips').text() != sz_msg) {
-                                $('.guide>.tips').text(sz_msg);
-                            }
                             break;
                         case "hotkey_mm_yellow":
-                            sz_msg = _trTbl.ui.guide.navi_brochure[_state.lang];
+                            ___ifxn_updateGuideMsg(_trTbl.ui.guide.navi_brochure[_state.lang]);
-                            if ($('.guide>.tips').text() != sz_msg) {
-                                $('.guide>.tips').text(sz_msg);
-                            }
                             break;
                         case "hotkey_mm_blue":
-                            sz_msg = _trTbl.ui.guide.navi_brochure[_state.lang];
+                            ___ifxn_updateGuideMsg(_trTbl.ui.guide.navi_brochure[_state.lang]);
-                            if ($('.guide>.tips').text() != sz_msg) {
-                                $('.guide>.tips').text(sz_msg);
-                            }
                             break;
                         case "main":
-                            //sz_msg = _trTbl.ui.guide.navi_menu[_state.lang] || "";
+                            ___ifxn_updateGuideMsg(_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);
-                            }
                             break;
                         case "sub":
-                            sz_msg = _trTbl.ui.guide.navi_menu[_state.lang];
+                            ___ifxn_updateGuideMsg(_trTbl.ui.guide.navi_menu[_state.lang]);
-                            if ($('.guide>.tips').text() != sz_msg) {
-                                $('.guide>.tips').text(sz_msg);
-                            }
                             break;
                         case "ctzgen":
-                            sz_msg = _trTbl.ui.guide.navi_ctz[_state.lang];
+                            ___ifxn_updateGuideMsg(_trTbl.ui.guide.navi_ctz[_state.lang]);
-                            if ($('.guide>.tips').text() != sz_msg) {
-                                $('.guide>.tips').text(sz_msg);
-                            }
                             break;
                         case "tvCtgShow":
                         case "tvCtgHide":
-                            sz_msg = _trTbl.ui.guide.navi_tvchannel[_state.lang];
+                            ___ifxn_updateGuideMsg(_trTbl.ui.guide.navi_tvchannel[_state.lang]);
-                            if ($('.guide>.tips').text() != sz_msg) {
-                                $('.guide>.tips').text(sz_msg);
-                            }
                             break;
                     }
 
@@ -7149,9 +7128,9 @@ HotelTV.ui_appfull = (function() {
                             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;
@@ -7174,9 +7153,9 @@ HotelTV.ui_appfull = (function() {
                             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;

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);
+        console.log("network_event_received = " + _evt['eventType']);
-        let _typeNetEvt = _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'] = "media_ctrl_event";
-                            _evt.command_id = "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}])
                         }
                     });

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;
 }
@@ -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;

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>