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.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
...
compare: sysadmin:Ver1.2.5
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

1 Commits
Ver1.2.4 ... Ver1.2.5

Author SHA1 Message Date
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
5 changed files with 31 additions and 71 deletions
Expand all files Collapse all files

13
procentric/application/hoteltv.welcome.css
View File

@@ -13,19 +13,6 @@ body {
z-index: 1; 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 { .welcome .frame {
position: absolute; position: absolute;
top: 0px; top: 0px;

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

@@ -1485,7 +1485,6 @@ HotelTV.ui_appfull = (function() {
case "enter": { case "enter": {
if ( _str_curBtnID=='btn_ordernow' ){ if ( _str_curBtnID=='btn_ordernow' ){
console.log("TODO::>> ORDERING NOW...");
__ifxn_processAmCartOrder( __ifxn_processAmCartOrder(
function() { function() {
//Return to menu //Return to menu
@@ -2024,7 +2023,6 @@ HotelTV.ui_appfull = (function() {
if ( _aminfo_ctgy[__status_am_specific.category_sel.cur].name == "CARTS" ){ if ( _aminfo_ctgy[__status_am_specific.category_sel.cur].name == "CARTS" ){
console.log("TODO::> NOTIFY cannot enter item sel on CARTS"); console.log("TODO::> NOTIFY cannot enter item sel on CARTS");
}else if ( _aminfo_ctgy[__status_am_specific.category_sel.cur].name == "ORDER" ){ }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)); 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); HotelTV.ui_utils.ShowNotificationMsgBalloon(__str_notify_msg, 5);
}else{ }else{
@@ -2220,7 +2218,6 @@ HotelTV.ui_appfull = (function() {
if ( _aminfo_ctgy[__status_am_specific.category_sel.cur].name == "CARTS" ){ if ( _aminfo_ctgy[__status_am_specific.category_sel.cur].name == "CARTS" ){
console.log("TODO::> Draw Carts"); console.log("TODO::> Draw Carts");
}else if ( _aminfo_ctgy[__status_am_specific.category_sel.cur].name == "ORDER" ){ }else if ( _aminfo_ctgy[__status_am_specific.category_sel.cur].name == "ORDER" ){
console.log("TODO::> Draw Order");
__uifxn_AppFull_DrawAmOrderList('build'); __uifxn_AppFull_DrawAmOrderList('build');
_state.menu.stage.prev = _state.menu.stage.cur; _state.menu.stage.prev = _state.menu.stage.cur;
_state.menu.stage.cur = "amenity_ctgy_orderlists"; _state.menu.stage.cur = "amenity_ctgy_orderlists";
@@ -3025,7 +3022,6 @@ HotelTV.ui_appfull = (function() {
case "enter": { case "enter": {
if ( _str_curBtnID=='btn_ordernow' ){ if ( _str_curBtnID=='btn_ordernow' ){
console.log("TODO::>> ORDERING NOW...");
__ifxn_processRsCartOrder( __ifxn_processRsCartOrder(
function() { function() {
//Return to menu //Return to menu
@@ -3566,7 +3562,6 @@ HotelTV.ui_appfull = (function() {
if ( _rsinfo_ctgy[__status_rs_specific.category_sel.cur].name == "CARTS" ){ if ( _rsinfo_ctgy[__status_rs_specific.category_sel.cur].name == "CARTS" ){
console.log("TODO::> NOTIFY cannot enter item sel on CARTS"); console.log("TODO::> NOTIFY cannot enter item sel on CARTS");
}else if ( _rsinfo_ctgy[__status_rs_specific.category_sel.cur].name == "ORDER" ){ }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)); 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); HotelTV.ui_utils.ShowNotificationMsgBalloon(__str_notify_msg, 5);
}else{ }else{
@@ -3761,7 +3756,6 @@ HotelTV.ui_appfull = (function() {
if ( _rsinfo_ctgy[__status_rs_specific.category_sel.cur].name == "CARTS" ){ if ( _rsinfo_ctgy[__status_rs_specific.category_sel.cur].name == "CARTS" ){
console.log("TODO::> Draw Carts"); console.log("TODO::> Draw Carts");
}else if ( _rsinfo_ctgy[__status_rs_specific.category_sel.cur].name == "ORDER" ){ }else if ( _rsinfo_ctgy[__status_rs_specific.category_sel.cur].name == "ORDER" ){
console.log("TODO::> Draw Order");
__uifxn_AppFull_DrawRsOrderList('build'); __uifxn_AppFull_DrawRsOrderList('build');
_state.menu.stage.prev = _state.menu.stage.cur; _state.menu.stage.prev = _state.menu.stage.cur;
_state.menu.stage.cur = "roomservice_ctgy_orderlists"; _state.menu.stage.cur = "roomservice_ctgy_orderlists";
@@ -5882,58 +5876,38 @@ HotelTV.ui_appfull = (function() {
//KEY이벤트 발생이 8초 이내인경우 //KEY이벤트 발생이 8초 이내인경우
//SHOW USER GUIDE TIPS //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 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) { 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) { switch (_state.menu.stage.cur) {
case "hotkey_mm_red": 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; break;
case "hotkey_mm_green": 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; break;
case "hotkey_mm_yellow": 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; break;
case "hotkey_mm_blue": 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; break;
case "main": 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; break;
case "sub": 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; break;
case "ctzgen": 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; break;
case "tvCtgShow": case "tvCtgShow":
case "tvCtgHide": 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; break;
} }
@@ -7149,9 +7123,9 @@ HotelTV.ui_appfull = (function() {
HotelTV.api.ReportEvent([{'power': false, 'location':null}]) 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 _tmval = 30;
let _state = HotelTV.state; let _state = HotelTV.state;
let _trTbl = HotelTV.translation; let _trTbl = HotelTV.translation;
@@ -7174,9 +7148,9 @@ HotelTV.ui_appfull = (function() {
HotelTV.api.ReportEvent([{'power': false, 'location':null}]) 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 _tmval = 30;
let _state = HotelTV.state; let _state = HotelTV.state;
let _trTbl = HotelTV.translation; let _trTbl = HotelTV.translation;

18
procentric/application/lib/hoteltv.ui_welcome.js
View File

@@ -147,8 +147,8 @@ HotelTV.ui_welcome = (function() {
*/ */
function __uifxn_WC_OnNetEvt(_evt) { function __uifxn_WC_OnNetEvt(_evt) {
let _state = HotelTV.state; 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) { switch (_typeNetEvt) {
case hcap.network.NetworkEventType.ABLE_REACH_DNS: case hcap.network.NetworkEventType.ABLE_REACH_DNS:
@@ -385,13 +385,13 @@ HotelTV.ui_welcome = (function() {
} }
} }
} else if (_state.menu.stage.cur == "playWelcomeMovie") { } else if (_state.menu.stage.cur == "playWelcomeMovie") {
if (_evt.keyCode == 413) { if (_evt.keyCode == gRmtKey.stop) {
// STOP KEY Event // STOP KEY Event
if (_media_status == 'playing') { if (_media_status == 'playing') {
_media_status = 'preparing_stop_playing'; _media_status = 'preparing_stop_playing';
var _evt = new Event('media_event_received'); 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); document.dispatchEvent(_evt);
} }
} else { } else {
@@ -404,7 +404,7 @@ HotelTV.ui_welcome = (function() {
}, 3000); }, 3000);
} else { } else {
const _evt = new Event('media_event_received'); const _evt = new Event('media_event_received');
_evt['command_id'] = "media_event_received"; _evt['command_id'] = "media_ctrl_event";
_evt['eventType'] = "play_stop_requtested"; _evt['eventType'] = "play_stop_requtested";
document.dispatchEvent(_evt); document.dispatchEvent(_evt);
} }
@@ -479,7 +479,7 @@ HotelTV.ui_welcome = (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}])
} }
}); });
@@ -504,7 +504,7 @@ HotelTV.ui_welcome = (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}])
} }
}); });
@@ -529,7 +529,7 @@ HotelTV.ui_welcome = (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}])
} }
}); });

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

@@ -535,7 +535,7 @@
} }
.popup .amenity .bg .am_item_sel_win .winleft>.tbl_header tbody tr>#title { .popup .amenity .bg .am_item_sel_win .winleft>.tbl_header tbody tr>#title {
width: 45%; width: 42%;
float: left; float: left;
/* text-align: left; */ /* text-align: left; */
padding: 0 0px 0 20px; padding: 0 0px 0 20px;
@@ -547,7 +547,7 @@
} }
.popup .amenity .bg .am_item_sel_win .winleft>.tbl_header tbody tr>#status { .popup .amenity .bg .am_item_sel_win .winleft>.tbl_header tbody tr>#status {
width: 35%; width: 38%;
float: left; float: left;
padding: 0px 30px 0 0px; padding: 0px 30px 0 0px;
} }
@@ -610,7 +610,7 @@
} }
.popup .amenity .bg .am_item_sel_win .winleft>.tbl_record tbody tr>.amctgyItem>#title { .popup .amenity .bg .am_item_sel_win .winleft>.tbl_record tbody tr>.amctgyItem>#title {
width: 45%; width: 42%;
float: left; float: left;
padding: 0px 0px 0px 20px; padding: 0px 0px 0px 20px;
text-overflow: ellipsis; text-overflow: ellipsis;
@@ -624,7 +624,7 @@
} }
.popup .amenity .bg .am_item_sel_win .winleft>.tbl_record tbody tr>.amctgyItem>#status { .popup .amenity .bg .am_item_sel_win .winleft>.tbl_record tbody tr>.amctgyItem>#status {
width: 35%; width: 38%;
float: left; float: left;
/* text-align: right; */ /* text-align: right; */
padding: 0px 30px 0 0px; padding: 0px 30px 0 0px;

1
procentric/application/wellcome.html
View File

@@ -7,7 +7,6 @@
<link rel="stylesheet" href="/procentric/application/css/owlcarousel/owl.theme.default.min.css"> <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.ui_utils.css">
<link rel="stylesheet" href="/procentric/application/theme/hoteltv.error.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> <title>CENTIRM LG-PROCENTRIC HOTEL SERVICE</title>
</head> </head>