sysadmin/ct-dtv-hx0100-002kwos
1
0
Fork 0
Code Issues 5 Pull Requests Actions Packages Projects Releases Wiki Activity

issue #1 console.log대신 에러의 경우, console.error로 변경.

Browse Source
This commit is contained in:
Paul Kim
2023-02-13 21:22:11 +09:00
parent 322ec2c5f7
commit 50ba8a0d1e
3 changed files with 110 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
procentric/application/lib/hoteltv.api.js
View File

@@ -109,11 +109,12 @@ HotelTV.api = (function() {
"put_order_roomservice": __apifxn_get_base_url() + "/api/" + _api_ver + "/assets/" + _dev_familly + "/" + _serial_num + "/requests/roomService/orders",
/* Events */
"update_event": __apifxn_get_base_url() + "/api/" + _api_ver + "/assets/" + _dev_familly + "/" + _serial_num + "/event",
/* Status */
"set_device_status": __apifxn_get_base_url() + "/api/" + _api_ver + "/assets/" + _dev_familly + "/" + _serial_num + "/state",
/*
"get_emergency": __apifxn_get_base_url() + "/api/" + _api_ver + "/settops/" + _serial_num + "/emergency",
"set_message_status": __apifxn_get_base_url() + "/api/" + _api_ver + "/settops/" + _serial_num + "/messages",
"set_device_status": __apifxn_get_base_url() + "/api/" + _api_ver + "/settops/" + _serial_num + "/state",
"set_device_opmode": __apifxn_get_base_url() + "/api/" + _api_ver + "/settops/" + _serial_num + "/bbdoors/opmode",
*/
}
@@ -215,7 +216,7 @@ HotelTV.api = (function() {
__apifxn_init({ 'dev_familly': model, 'serial_num': serial, 'svr_ip': ip, 'svr_port': port, 'api_ver': HotelTV.state.token.version, "license": HotelTV.state.token.license, "apikey": HotelTV.state.token.apikey, "registered": HotelTV.state.token.registered, "exist": HotelTV.state.token.exist, "firstBoot": HotelTV.state.token.firstBoot });
resolve(0);
}).catch(_error => {
console.log(`Failure::>${_error.reason}`);
console.error(`Failure::>${_error.reason}`);
reject(_error.reason);
});
}
@@ -238,7 +239,7 @@ HotelTV.api = (function() {
__apifxn_CallCmsApi("GET", dl_url, "DownloadData", null).then(_result => {
resolve(_result.data);
}).catch(_error => {
console.log(`Failure::>${_error.reason}`);
console.error(`Failure::>${_error.reason}`);
reject(_error.reason);
});
});
@@ -257,7 +258,7 @@ HotelTV.api = (function() {
__apifxn_CallCmsApi("GET", sz_api_url, "GetTranslation", null).then(_result => {
resolve(JSON.parse(_result.data));
}).catch(_error => {
console.log(`Failure::>${_error.reason}`);
console.error(`Failure::>${_error.reason}`);
reject(_error.reason);
});
});
@@ -270,7 +271,7 @@ HotelTV.api = (function() {
//console.log(`Success::>${_result.data}`);
resolve(JSON.parse(_result.data));
}).catch(_error => {
console.log(`Failure::>${_error.reason}`);
console.error(`Failure::>${_error.reason}`);
reject(_error.reason);
});
});
@@ -283,7 +284,7 @@ HotelTV.api = (function() {
//console.log(`Success::>${_result.data}`);
resolve(JSON.parse(_result.data));
}).catch(_error => {
console.log(`Failure::>${_error.reason}`);
console.error(`Failure::>${_error.reason}`);
reject(_error.reason);
});
});
@@ -296,7 +297,7 @@ HotelTV.api = (function() {
///console.log(`Success::>${_result.data}`);
resolve(JSON.parse(_result.data));
}).catch(_error => {
console.log(`Failure::>${_error.reason}`);
console.error(`Failure::>${_error.reason}`);
reject(_error.reason);
});
});
@@ -309,7 +310,7 @@ HotelTV.api = (function() {
//console.log(`Success::>${_result.data}`);
resolve(JSON.parse(_result.data));
}).catch(_error => {
console.log(`Failure::>${_error.reason}`);
console.error(`Failure::>${_error.reason}`);
reject(_error.reason);
});
});
@@ -322,7 +323,7 @@ HotelTV.api = (function() {
//console.log(`Success::>${_result.data}`);
resolve(JSON.parse(_result.data));
}).catch(_error => {
console.log(`Failure::>${_error.reason}`);
console.error(`Failure::>${_error.reason}`);
reject(_error.reason);
});
});
@@ -335,7 +336,7 @@ HotelTV.api = (function() {
//console.log(`Success::>${_result.data}`);
resolve(JSON.parse(_result.data));
}).catch(_error => {
console.log(`Failure::>${_error.reason}`);
console.error(`Failure::>${_error.reason}`);
reject(_error.reason);
});
});
@@ -347,7 +348,7 @@ HotelTV.api = (function() {
__apifxn_CallCmsApi("GET", sz_api_url, "GetFlight", null).then(_result => {
resolve(JSON.parse(_result.data));
}).catch(_error => {
console.log(`Failure::>${_error.reason}`);
console.error(`Failure::>${_error.reason}`);
reject(_error.reason);
});
});
@@ -360,7 +361,7 @@ HotelTV.api = (function() {
//console.log(`Success::>${_result.data}`);
resolve(JSON.parse(_result.data));
}).catch(_error => {
console.log(`Failure::>${_error.reason}`);
console.error(`Failure::>${_error.reason}`);
reject(_error.reason);
});
});
@@ -373,7 +374,7 @@ HotelTV.api = (function() {
//console.log(`Success::>${_result.data}`);
resolve(JSON.parse(_result.data));
}).catch(_error => {
console.log(`Failure::>${_error.reason}`);
console.error(`Failure::>${_error.reason}`);
reject(_error.reason);
});
});
@@ -386,7 +387,7 @@ HotelTV.api = (function() {
//console.log(`Success::>${_result.data}`);
resolve(JSON.parse(_result.data));
}).catch(_error => {
console.log(`Failure::>${_error.reason}`);
console.error(`Failure::>${_error.reason}`);
reject(_error.reason);
});
});
@@ -399,7 +400,7 @@ HotelTV.api = (function() {
//console.log(`Success::>${_result.data}`);
resolve(JSON.parse(_result.data));
}).catch(_error => {
console.log(`Failure::>${_error.reason}`);
console.error(`Failure::>${_error.reason}`);
reject(_error.reason);
});
});
@@ -417,7 +418,7 @@ HotelTV.api = (function() {
resolve(null);
}
}).catch(_error => {
console.log(`Failure::>${_error.reason}`);
console.error(`Failure::>${_error.reason}`);
reject(_error.reason);
});
});
@@ -434,7 +435,7 @@ HotelTV.api = (function() {
//console.log(`Success::>${_result.data}`);
resolve(JSON.parse(_result.data));
}).catch(_error => {
console.log(`Failure::>${_error.reason}`);
console.error(`Failure::>${_error.reason}`);
reject(_error.reason);
});
});
@@ -451,7 +452,7 @@ HotelTV.api = (function() {
//console.log(`Success::>${_result.data}`);
resolve(JSON.parse(_result.data));
}).catch(_error => {
console.log(`Failure::>${_error.reason}`);
console.error(`Failure::>${_error.reason}`);
reject(_error.reason);
});
});
@@ -468,7 +469,7 @@ HotelTV.api = (function() {
//console.log(`Success::>${_result.data}`);
resolve(JSON.parse(_result.data));
}).catch(_error => {
console.log(`Failure::>${_error.reason}`);
console.error(`Failure::>${_error.reason}`);
reject(_error.reason);
});
});
@@ -485,7 +486,7 @@ HotelTV.api = (function() {
//console.log(`Success::>${_result.data}`);
resolve(JSON.parse(_result.data));
}).catch(_error => {
console.log(`Failure::>${_error.reason}`);
console.error(`Failure::>${_error.reason}`);
reject(_error.reason);
});
});
@@ -501,7 +502,7 @@ HotelTV.api = (function() {
__apifxn_CallCmsApi((_item_id) ? "POST" : "GET", sz_api_url, "GetAmenityOrders", _item_id).then(_result => {
resolve(JSON.parse(_result.data));
}).catch(_error => {
console.log(`Failure::>${_error.reason}`);
console.error(`Failure::>${_error.reason}`);
reject(_error.reason);
});
});
@@ -518,7 +519,7 @@ HotelTV.api = (function() {
//console.log(`Success::>${_result.data}`);
resolve(JSON.parse(_result.data));
}).catch(_error => {
console.log(`Failure::>${_error.reason}`);
console.error(`Failure::>${_error.reason}`);
reject(_error.reason);
});
});
@@ -535,7 +536,7 @@ HotelTV.api = (function() {
//console.log(`Success::>${_result.data}`);
resolve(JSON.parse(_result.data));
}).catch(_error => {
console.log(`Failure::>${_error.reason}`);
console.error(`Failure::>${_error.reason}`);
reject(_error.reason);
});
});
@@ -552,7 +553,7 @@ HotelTV.api = (function() {
//console.log(`Success::>${_result.data}`);
resolve(JSON.parse(_result.data));
}).catch(_error => {
console.log(`Failure::>${_error.reason}`);
console.error(`Failure::>${_error.reason}`);
reject(_error.reason);
});
});
@@ -569,7 +570,7 @@ HotelTV.api = (function() {
//console.log(`Success::>${_result.data}`);
resolve(JSON.parse(_result.data));
}).catch(_error => {
console.log(`Failure::>${_error.reason}`);
console.error(`Failure::>${_error.reason}`);
reject(_error.reason);
});
});
@@ -586,7 +587,7 @@ HotelTV.api = (function() {
//console.log(`Success::>${_result.data}`);
resolve(JSON.parse(_result.data));
}).catch(_error => {
console.log(`Failure::>${_error.reason}`);
console.error(`Failure::>${_error.reason}`);
reject(_error.reason);
});
});
@@ -602,7 +603,7 @@ HotelTV.api = (function() {
__apifxn_CallCmsApi((_item_id) ? "POST" : "GET", sz_api_url, "GetRoomserviceOrders", _item_id).then(_result => {
resolve(JSON.parse(_result.data));
}).catch(_error => {
console.log(`Failure::>${_error.reason}`);
console.error(`Failure::>${_error.reason}`);
reject(_error.reason);
});
});
@@ -619,7 +620,7 @@ HotelTV.api = (function() {
//console.log(`Success::>${_result.data}`);
resolve(JSON.parse(_result.data));
}).catch(_error => {
console.log(`Failure::>${_error.reason}`);
console.error(`Failure::>${_error.reason}`);
reject(_error.reason);
});
});
@@ -642,7 +643,7 @@ HotelTV.api = (function() {
__apifxn_CallCmsApi("POST", sz_api_url, "UpdateEvent", _json_event).then(_result => {
console.log(`Success::>${_result.data}`);
}).catch(_error => {
console.log(`Failure::>${_error.reason}`);
console.error(`Failure::>${_error.reason}`);
});
},
@@ -741,10 +742,10 @@ HotelTV.api = (function() {
_json_report.uptime.string = _fxn_sec2Date(_json_report.uptime.second);
let sz_api_url = __apifxn_get_api_url("set_device_status");
__apifxn_CallCmsApi("POST", sz_api_url, "SetDeviceStatus", _json_report).then(_result => {
console.log(`Success::>${_result.data}`);
__apifxn_CallCmsApi("PATCH", sz_api_url, "SetDeviceStatus", _json_report).then(_result => {
//console.log(`Success::>${_result.data}`);
}).catch(_error => {
console.log(`Failure::>${_error.reason}`);
console.error(`Failure::>${_error.reason}`);
});
},
}

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

@@ -238,7 +238,7 @@ HotelTV.Init = async function() {
"timeout": _tmval,
"cb_disp": function() {
_tmval -= 1;
console.log("time..." + _tmval);
//console.log("time..." + _tmval);
if ($('.error #countdown').css("display") == "none") {
$('.error #countdown').fadeIn(1000);
}
@@ -259,7 +259,7 @@ HotelTV.Init = async function() {
"timeout": _tmval,
"cb_disp": function() {
_tmval -= 1;
console.log("time..." + _tmval);
//console.log("time..." + _tmval);
if ($('.error #countdown').css("display") == "none") {
$('.error #countdown').fadeIn(1000);
}
@@ -282,7 +282,7 @@ HotelTV.Init = async function() {
"timeout": _tmval,
"cb_disp": function() {
_tmval -= 1;
console.log("time..." + _tmval);
//console.log("time..." + _tmval);
if ($('.error #countdown').css("display") == "none") {
$('.error #countdown').fadeIn(1000);
}
@@ -305,7 +305,7 @@ HotelTV.Init = async function() {
"timeout": _tmval,
"cb_disp": function() {
_tmval -= 1;
console.log("time..." + _tmval);
//console.log("time..." + _tmval);
if ($('.error #countdown').css("display") == "none") {
$('.error #countdown').fadeIn(1000);
}
@@ -328,7 +328,7 @@ HotelTV.Init = async function() {
"timeout": _tmval,
"cb_disp": function() {
_tmval -= 1;
console.log("time..." + _tmval);
//console.log("time..." + _tmval);
if ($('.error #countdown').css("display") == "none") {
$('.error #countdown').fadeIn(1000);
}
@@ -343,13 +343,13 @@ HotelTV.Init = async function() {
try {
HotelTV.weather = await HotelTV.api.GetWeather();
} catch (_error) {
console.log("Display Error page for get Weather info");
console.error("Display Error page for get Weather info");
}
try {
HotelTV.flight = await HotelTV.api.GetFlight();
} catch (_error) {
console.log("Display Error page for get flight info");
console.error("Display Error page for get flight info");
}
try {
@@ -363,7 +363,7 @@ HotelTV.Init = async function() {
"timeout": _tmval,
"cb_disp": function() {
_tmval -= 1;
console.log("time..." + _tmval);
//console.log("time..." + _tmval);
if ($('.error #countdown').css("display") == "none") {
$('.error #countdown').fadeIn(1000);
}
@@ -378,19 +378,19 @@ HotelTV.Init = async function() {
try {
HotelTV.news = await HotelTV.api.GetNews();
} catch (_error) {
console.log("Display Error page for get news info");
console.error("Display Error page for get news info");
}
try {
HotelTV.message = await HotelTV.api.GetMessage();
} catch (_error) {
console.log("Display Error page for get news info");
console.error("Display Error page for get news info");
}
try {
HotelTV.translation = await HotelTV.api.GetTranslation();
} catch (_error) {
console.log("Display Error page for get translation info");
console.error("Display Error page for get translation info");
}
@@ -422,7 +422,7 @@ HotelTV.Init = async function() {
}
}
} else {
console.log("Display Error page for invalid license type.");
console.error("Display Error page for invalid license type.");
}
console.log("Initialization:: Done");
HotelTV.ui_utils.SetBusy(false);
@@ -445,13 +445,13 @@ HotelTV.LoadWelCome = async function() {
HotelTV.services = await HotelTV.api.GetServiceInfo();
sessionStorage.setItem("services", JSON.stringify(HotelTV.services));
} catch (_error) {
console.log("Display Error page for get service info");
console.error("Display Error page for get service info");
}
//HotelTV.translation = await JSON.parse(sessionStorage.getItem("translation"));
try {
HotelTV.translation = await HotelTV.api.GetTranslation();
} catch (_error) {
console.log("Display Error page for get translation info");
console.error("Display Error page for get translation info");
}
@@ -501,39 +501,39 @@ HotelTV.LoadAppFull = async function() {
try {
HotelTV.epg = await HotelTV.api.GetEpg();
} catch (_error) {
console.log("Display Error page for get epg info");
console.error("Display Error page for get epg info");
}
try {
HotelTV.carts.amenity = await HotelTV.api.GetAmenityCarts(null);
} catch (_error) {
console.log("Display Error page for get amenity carts info");
console.error("Display Error page for get amenity carts info");
}
try {
HotelTV.carts.roomservice = await HotelTV.api.GetRoomserviceCarts();
} catch (_error) {
console.log("Display Error page for get roomservicec carts info");
console.error("Display Error page for get roomservicec carts info");
}
try {
HotelTV.orders.amenity = await HotelTV.api.GetAmenityOrders(null);
} catch (_error) {
console.log("Display Error page for get amenity order info");
console.error("Display Error page for get amenity order info");
}
try {
HotelTV.orders.roomservice = await HotelTV.api.GetRoomserviceOrders(null);
} catch (_error) {
console.log("Display Error page for get roomservice order info");
console.error("Display Error page for get roomservice order info");
}
try {
HotelTV.translation = await HotelTV.api.GetTranslation();
} catch (_error) {
console.log("Display Error page for get translation info");
console.error("Display Error page for get translation info");
}
//HotelTV.translation = await JSON.parse(sessionStorage.getItem("translation"));
@@ -568,7 +568,7 @@ HotelTV.LoadAppFull = async function() {
}
}
} catch (_error) {
console.log("Display Error page for get siApp Auth");
console.error("Display Error page for get siApp Auth");
}
}
}, 5000);
@@ -622,16 +622,16 @@ HotelTV.LoadAppFull = async function() {
// }
// if (recvMsg.event == "update_report") {
// HotelTV.hcap.GetUptime();
// HotelTV.hcap.GetDeviceUsage().then(_usage => {
// console.log(`USAGE::> CPU[${_usage.cpu}%] RAM[${_usage.mem}%]`);
// //HotelTV.api.ReportBrief(HotelTV.devinfo, HotelTV.guestinfo, _usage);
// });
// }
if (recvMsg.event == "update_report") {
HotelTV.hcap.GetUptime();
HotelTV.hcap.GetDeviceUsage().then(_usage => {
//console.log(`USAGE::> CPU[${_usage.cpu}%]`);
HotelTV.api.ReportBrief(HotelTV.devinfo, HotelTV.guestinfo, _usage);
});
}
}
} else {
console.log('Your browser doesn\'t support web workers.')
console.error('Your browser doesn\'t support web workers.')
}
//STEP#07 MQTT Service
@@ -654,7 +654,7 @@ HotelTV.LoadAppFull = async function() {
client.on('connect', function() {
client.subscribe(_mqttSvcInfo.topic, function(err) {
if (err) {
console.log(`Fail to subscribe::TOPIC[${_mqttSvcInfo.topic}]`);
console.error(`Fail to subscribe::TOPIC[${_mqttSvcInfo.topic}]`);
} else {
console.log(`Success to subscribe::TOPIC[${_mqttSvcInfo.topic}]`);
}
@@ -670,7 +670,7 @@ HotelTV.LoadAppFull = async function() {
client.on('error', function(error) {
// message is Buffer
console.log(error.toString());
console.error(error.toString());
//client.end()
})
}

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

@@ -25,6 +25,7 @@ HotelTV.ui_appfull = (function() {
var _hndl_tmrTvChnMngr = null;
var _hndl_tmrUgMngr = null;
var _hndl_tmrCtzThumbAni = null;
var _hndl_tmrCtzBgAni = null;
const _lastTm = {
'tvchannel_changed': null,
'keyevt': null,
@@ -3183,23 +3184,45 @@ HotelTV.ui_appfull = (function() {
let _ctzinfo = _program[_mmIdx].children[_smIdx].children;
_state.menu.main[_mmIdx][_smIdx].cur = Object.keys(_ctzinfo)[event.page.index];
if (_ctzinfo[_state.menu.main[_mmIdx][_smIdx].cur].thumbnails.interval > 0 && _ctzinfo[_state.menu.main[_mmIdx][_smIdx].cur].thumbnails.files[_state.lang].length > 1) {
if (_hndl_tmrCtzThumbAni != null) {
clearInterval(_hndl_tmrCtzThumbAni);
_hndl_tmrCtzThumbAni = null;
console.log("TMR(CTZ ANI)::>Destoried...");
}
_hndl_tmrCtzThumbAni = setInterval(__uifxn_AppFull_Update_CtzThumbnail, Number(_ctzinfo[_state.menu.main[_mmIdx][_smIdx].cur].thumbnails.interval) * 1000);
console.log("TMR::>Created...");
} else {
if (_hndl_tmrCtzThumbAni != null) {
clearInterval(_hndl_tmrCtzThumbAni);
_hndl_tmrCtzThumbAni = null;
console.log("TMR(CTZ ANI)::>Destoried...");
//if (_ctzinfo[_state.menu.main[_mmIdx][_smIdx].cur].thumbnails.autoplay == true )
{
if (_ctzinfo[_state.menu.main[_mmIdx][_smIdx].cur].thumbnails.interval > 0 && _ctzinfo[_state.menu.main[_mmIdx][_smIdx].cur].thumbnails.files[_state.lang].length > 1) {
if (_hndl_tmrCtzThumbAni != null) {
clearInterval(_hndl_tmrCtzThumbAni);
_hndl_tmrCtzThumbAni = null;
console.log("TMR(CTZ ANI)::>Destoried...");
}
_hndl_tmrCtzThumbAni = setInterval(__uifxn_AppFull_Update_CtzThumbnail, Number(_ctzinfo[_state.menu.main[_mmIdx][_smIdx].cur].thumbnails.interval) * 1000);
console.log("TMR::>Created...");
} else {
if (_hndl_tmrCtzThumbAni != null) {
clearInterval(_hndl_tmrCtzThumbAni);
_hndl_tmrCtzThumbAni = null;
console.log("TMR(CTZ ANI)::>Destoried...");
}
}
}
console.log("CTZ(GEN) IDX::>" + _state.menu.main[_mmIdx][_smIdx].cur);
if (_ctzinfo[_state.menu.main[_mmIdx][_smIdx].cur].images.autoplay == true )
{
// if (_ctzinfo[_state.menu.main[_mmIdx][_smIdx].cur].thumbnails.interval > 0 && _ctzinfo[_state.menu.main[_mmIdx][_smIdx].cur].thumbnails.files[_state.lang].length > 1) {
// if (_hndl_tmrCtzThumbAni != null) {
// clearInterval(_hndl_tmrCtzThumbAni);
// _hndl_tmrCtzThumbAni = null;
// console.log("TMR(CTZ ANI)::>Destoried...");
// }
// _hndl_tmrCtzThumbAni = setInterval(__uifxn_AppFull_Update_CtzThumbnail, Number(_ctzinfo[_state.menu.main[_mmIdx][_smIdx].cur].thumbnails.interval) * 1000);
// console.log("TMR::>Created...");
// } else {
// if (_hndl_tmrCtzThumbAni != null) {
// clearInterval(_hndl_tmrCtzThumbAni);
// _hndl_tmrCtzThumbAni = null;
// console.log("TMR(CTZ ANI)::>Destoried...");
// }
// }
}
console.log("CTZ(GEN) IDX::>" + _state.menu.main[_mmIdx][_smIdx].cur);
HotelTV.api.ReportEvent([{'power': true, 'location':{'conId':_ctzinfo[_state.menu.main[_mmIdx][_smIdx].cur].id}}])
});
@@ -3400,11 +3423,18 @@ HotelTV.ui_appfull = (function() {
}
}
} else if (event.keyCode == 461) {
// 컨텐트 폼의 백그라운드 에니메이션용 타이머 제거
if (_hndl_tmrCtzBgAni != null) {
clearInterval(_hndl_tmrCtzBgAni);
_hndl_tmrCtzBgAni = null;
console.log("TMR(CTZ ANI For Background)::>Destoried...");
}
// 컨텐트 폼의 썸네일 에니메이션용 타이머 제거
if (_hndl_tmrCtzThumbAni != null) {
clearInterval(_hndl_tmrCtzThumbAni);
_hndl_tmrCtzThumbAni = null;
console.log("TMR(CTZ ANI)::>Destoried...");
console.log("TMR(CTZ ANI For Thumbnail)::>Destoried...");
}
// 메인 메뉴로 귀환