issue #10 #11 #12 Fix EPG info time issue.

issue #10 #11 #12 Apply system reboot feature on instant_power mode set as 2. Change language popup titile and usage displaying method.
issue #10 #11 Add xait reference configuration.
2024-09-05 19:25:01 +09:00 · 2024-09-05 12:35:44 +09:00 · 2024-07-04 16:26:14 +09:00
7 changed files with 11265 additions and 58 deletions
--- a/procentric/application/lib/hoteltv.hcap.js
+++ b/procentric/application/lib/hoteltv.hcap.js
@@ -46,6 +46,11 @@ HotelTV.hal = (function() {
        'end_of_item'
    ];

+    let hcap_property_installer_menuItem_key = [
+        hcap.property.InstallerMenuItem.POWER_MANAGE,
+        hcap.property.InstallerMenuItem.MAX_VOLUME
+    ];
+


    const g_media = {
@@ -113,7 +118,7 @@ HotelTV.hal = (function() {
    };

    /**
-     * HCAP Wrapper Function::> Get Device Properties(Realted HCAP API:hcap.property.setProperty)
+     * HCAP Wrapper Function::> Set Device Properties(Realted HCAP API:hcap.property.setProperty)
     * @param {string} sz_key property key name.
     * @param {object} value is object to setting property
     */
@@ -129,6 +134,39 @@ HotelTV.hal = (function() {
        });
    };

+    /**
+     * HCAP Wrapper Function::> Get Installer Menu Item(Realted HCAP API:hcap.property.getInstallerMenuItem)
+     * @param {string} sz_key installer menu item key name.
+     */
+    function __hcapfxn_get_installer_menuItem(sz_key) {
+        return new Promise((resolve, reject) => {
+            let param = {
+                "key": sz_key,
+                "onSuccess": function(s) { resolve({ "key": sz_key, "value": s.value }) },
+                //"onFailure": function(f) { reject({ "key": sz_key, "value": "unknown" }) }
+                "onFailure": function(f) { resolve({ "key": sz_key, "value": "unknown" }) }
+            };
+            hcap.property.getInstallerMenuItem(param);
+        });
+    };
+
+    /**
+     * HCAP Wrapper Function::> Set Installer Menu Item(Realted HCAP API:hcap.property.setInstallerMenuItem)
+     * @param {string} sz_key installer menu item key name.
+     * @param {object} value is object to setting installer menu item
+     */
+    function __hcapfxn_set_installer_menuItem(sz_key, value) {
+        return new Promise((resolve, reject) => {
+            let param = {
+                "key": sz_key,
+                "value": value.toString(),
+                "onSuccess": function(s) { resolve({ "key": sz_key, "value": value }) },
+                "onFailure": function(f) { resolve({ "key": sz_key, "value": "unknown" }) }
+            };
+            hcap.property.setInstallerMenuItem(param);
+        });
+    };
+
    /**
     * IDCAP Wrapper Function::> Get Device Configuration(Properties)(Realted IDCAP API:idcap://configuration/property/get)
     * @param {string} sz_key property key name.
@@ -955,10 +993,39 @@ HotelTV.hal = (function() {
                    let _instant_pwr_target_mode = Number(_devconfig.system.misc.instantPower);
                    if (_devinfo["instant_power"] != _instant_pwr_target_mode) {
                        _pmFxnArProperty.push(__hcapfxn_set_property('instant_power', _instant_pwr_target_mode));
+
+                        // hcap.property.InstallerMenuItem.POWER_MANAGE 설정
+                        if ( _instant_pwr_target_mode==2 ) {
+                            //
+                            hcap.property.setInstallerMenuItem({
+                                "key" : hcap.property.InstallerMenuItem.POWER_MANAGE,
+                                "value" : 8,
+                                "onSuccess" : function() {
+                                    console.log("onSuccess");
+                                },
+                                "onFailure" : function(f) {
+                                    console.log("onFailure : errorMessage = " + f.errorMessage);
+                                }
+                            });
+                        } else {
+                            // Sets number of hours of no activity before automatic shut off. (0 ~ 7)
+                            hcap.property.setInstallerMenuItem({
+                                "key" : hcap.property.InstallerMenuItem.POWER_MANAGE,
+                                "value" : 0,
+                                "onSuccess" : function() {
+                                    console.log("onSuccess");
+                                },
+                                "onFailure" : function(f) {
+                                    console.log("onFailure : errorMessage = " + f.errorMessage);
+                                }
+                            });
+                        }
                    }

                    if ( _instant_pwr_target_mode==2 || _instant_pwr_target_mode==1 ){
-                        _pmFxnArProperty.push(__hcapfxn_set_powermode('power_mode', hcap.power.PowerMode.WARM));
+                        if (_devinfo["power_mode"] != hcap.power.PowerMode.WARM) {
+                            _pmFxnArProperty.push(__hcapfxn_set_powermode('power_mode', hcap.power.PowerMode.WARM));
+                        }
                    }
                }

--- a/procentric/application/lib/hoteltv.ui_appfull.js
+++ b/procentric/application/lib/hoteltv.ui_appfull.js
@@ -501,10 +501,10 @@ HotelTV.ui_appfull = (function() {
                _state.menu.stage.prev = _state.menu.stage.cur;
                _state.menu.stage.cur = "external_av_hdmi";
                _state.external_input.connected = true;
-                _state.external_input.last_input.index = Number(_evt.index)-1;
+                _state.external_input.last_input.index = Number(_evt.index);
                setTimeout(function(){
                    $('body,html').fadeOut(500, function(){
-                        let __retSuccess = HotelTV.hal.SetExternalInput("HDMI", Number(_evt.index)-1);
+                        let __retSuccess = HotelTV.hal.SetExternalInput("HDMI", Number(_evt.index));
                        if ( __retSuccess==false ){
                            _state.external_input.connected = false;
                            _state.external_input.last_input.index = 0;
@@ -4032,32 +4032,42 @@ HotelTV.ui_appfull = (function() {

            let _rtn_epg = null;
            for (_j=0; _j<_epg_prom_info.length; _j++) {
-                let _schTmPrev = new Date();
+                let _schTmNext = new Date();
                let _schTmCur = new Date();
                let _epgProgInf_Cur = _epg_prom_info[_j];
-                let _epgProgInf_Prev = null;
+                let _epgProgInf_Next = null;

                if (_epgProgInf_Cur.time.length != 5) {
                    console.log("EPG Schedule org time is NULL");
                } else {
+                    let __str_playingTime = null;
+
                    _schTmCur.setHours(Number(_epgProgInf_Cur.time.charAt(0) + _epgProgInf_Cur.time.charAt(1)));
                    _schTmCur.setMinutes(Number(_epgProgInf_Cur.time.charAt(3) + _epgProgInf_Cur.time.charAt(4)));

                    // EPG shedule정보는 인덱스 0부터 시작
-                    if ( _j>0 ){
-                        _epgProgInf_Prev = _epg_prom_info[_j-1];
-                        _schTmPrev.setHours(Number(_epgProgInf_Prev.time.charAt(0) + _epgProgInf_Prev.time.charAt(1)));
-                        _schTmPrev.setMinutes(Number(_epgProgInf_Prev.time.charAt(3) + _epgProgInf_Prev.time.charAt(4)));
+                    if ( _j<(_epg_prom_info.length-1) ){
+                        _epgProgInf_Next = _epg_prom_info[_j+1];
+                        _schTmNext.setHours(Number(_epgProgInf_Next.time.charAt(0) + _epgProgInf_Next.time.charAt(1)));
+                        _schTmNext.setMinutes(Number(_epgProgInf_Next.time.charAt(3) + _epgProgInf_Next.time.charAt(4)));
+
+                        __str_playingTime = `${_epgProgInf_Cur.time}~${_epgProgInf_Next.time}`;
+                    } else {
+                        //
+                        _schTmNext.setMinutes(Number(0));
+                        _schTmNext.setHours(Number(24));
+
+                        __str_playingTime = `${_epgProgInf_Cur.time}~`;
                    }

-                    let _t_playTotal = Math.round((_schTmCur - _schTmPrev) / 60000); //Total play time in minuate
-                    let _t_playRemain = Math.round((_schTmCur - _tm_cur) / 60000); //Remain play time in minuate
+                    let _t_playTotal = Math.round((_schTmNext - _schTmCur) / 60000); //Total play time in minuate
+                    let _t_playRemain = Math.round((_schTmNext - _tm_cur) / 60000); //Remain play time in minuate

                    _rtn_epg = _epgProgInf_Cur;
                    if (_t_playRemain >= 0) {
                        //console.log("CHNAME::>" + _ch_name + " Remaining::> " + _t_playRemain);
                        _rtn_epg["progress_pcent"] = parseInt(((_t_playTotal-_t_playRemain)*100)/_t_playTotal, 10);
-                        _rtn_epg["playing_time"] = `${_epgProgInf_Prev.time}~${_epgProgInf_Cur.time}`;
+                        _rtn_epg["playing_time"] = __str_playingTime;
                        break;
                    }
                }
@@ -6151,6 +6161,19 @@ HotelTV.ui_appfull = (function() {
        let _elLangSelUsageDiv = _elLangSelCtrlDiv.children('.usage');
        let _elLangSelButtonsDiv = _elLangSelCtrlDiv.children('.buttons');

+        const ___ifxn_updateLangSelTitleAndUsages = function() {
+            let __focusedLang = "en-US";
+            if ( _elLangSelButtonsDiv.find('.focus').length ) {
+                __focusedLang = _elLangSelButtonsDiv.find('.focus').attr('id');
+            }
+
+            // Title
+            _elLangSelTitleDiv.text(_trTbl.system.szsellanguage[__focusedLang]);
+
+            // Usages
+            _elLangSelUsageDiv.html(_trTbl.system.lang_sel_usage[__focusedLang]);
+        }
+

        const ___ifxn_moveLangButton = function(_direction) {
            let selectedBtnItemCur = _elLangSelButtonsDiv.find('.focus');
@@ -6173,6 +6196,8 @@ HotelTV.ui_appfull = (function() {
                    _elLangSelButtonsDiv.find('.langBtn').last().addClass("focus");
                }
            }
+
+            ___ifxn_updateLangSelTitleAndUsages();
        }

        const __ifxn_sendNextLangUsrData = async function(_nextLang, __cbFxnFailure=null, __cbFxn_Success=null) {
--- a/procentric/application/xait.xml
+++ b/procentric/application/xait.xml
@@ -1,5 +1,5 @@
 <XAIT>
-   <versionNumber>4</versionNumber>
+   <versionNumber>27</versionNumber>
   <AbstractService>
      <svcName>Pro:Centric App</svcName>
      <svcId>0x1204</svcId>
@@ -16,10 +16,15 @@
               <controlCode>AUTOSTART</controlCode>
               <visibility>NOT_VISIBLE_USERS</visibility>
               <priority>255</priority>
-               <version>7</version>
+               <version>27</version>
            </applicationDescriptor>
            <HcapDescriptor>
-               <url>http://10.20.0.2:8880/procentric/application/index.html</url>
+               <url>http://10.20.0.2:8880/procentric/application/application.zip</url>
+               <applicationStructure>
+                  <baseDirectory>/</baseDirectory>
+                  <classpathExtension>/</classpathExtension>
+                  <initialClass>index.html</initialClass>
+               </applicationStructure>
            </HcapDescriptor>
         </Application>
      </ApplicationList>
--- a/procentric/application/xait.xml.localstorage
+++ b/procentric/application/xait.xml.localstorage
@@ -0,0 +1,32 @@
+<XAIT>
+   <versionNumber>25</versionNumber>
+   <AbstractService>
+      <svcName>Pro:Centric App</svcName>
+      <svcId>0x1204</svcId>
+      <isAutoSelect>true</isAutoSelect>
+      <ApplicationList>
+         <Application>
+            <appName>CT-HotelIPTV</appName>
+            <applicationIdentifier>
+               <orgId>1</orgId>
+               <appId>1</appId>
+            </applicationIdentifier>
+            <applicationDescriptor>
+               <type>Hcap-h</type>
+               <controlCode>AUTOSTART</controlCode>
+               <visibility>NOT_VISIBLE_USERS</visibility>
+               <priority>255</priority>
+               <version>25</version>
+            </applicationDescriptor>
+            <HcapDescriptor>
+               <url>http://10.20.0.2:8880/procentric/application/application.zip</url>
+               <applicationStructure>
+                  <baseDirectory>/</baseDirectory>
+                  <classpathExtension>/</classpathExtension>
+                  <initialClass>index.html</initialClass>
+               </applicationStructure>
+            </HcapDescriptor>
+         </Application>
+      </ApplicationList>
+   </AbstractService>
+</XAIT>
--- a/procentric/application/xait.xml.online
+++ b/procentric/application/xait.xml.online
@@ -0,0 +1,27 @@
+<XAIT>
+   <versionNumber>5</versionNumber>
+   <AbstractService>
+      <svcName>Pro:Centric App</svcName>
+      <svcId>0x1204</svcId>
+      <isAutoSelect>true</isAutoSelect>
+      <ApplicationList>
+         <Application>
+            <appName>CT-HotelIPTV</appName>
+            <applicationIdentifier>
+               <orgId>1</orgId>
+               <appId>1</appId>
+            </applicationIdentifier>
+            <applicationDescriptor>
+               <type>Hcap-h</type>
+               <controlCode>AUTOSTART</controlCode>
+               <visibility>NOT_VISIBLE_USERS</visibility>
+               <priority>255</priority>
+               <version>8</version>
+            </applicationDescriptor>
+            <HcapDescriptor>
+               <url>http://10.20.0.2:8880/procentric/application/index.html</url>
+            </HcapDescriptor>
+         </Application>
+      </ApplicationList>
+   </AbstractService>
+</XAIT>
--- a/procentric/system/LGService.xml
+++ b/procentric/system/LGService.xml
@@ -1,6 +1,6 @@
 <service>
    <setup>
-        <versionNumber>100</versionNumber>
+        <versionNumber>3</versionNumber>
        <modelName>65UR762H0NC</modelName>
        <priority>NORMAL</priority>
        <content>
@@ -12,12 +12,32 @@
        </content>
    </setup>
    <setup>
-        <versionNumber>13</versionNumber>
+        <versionNumber>2</versionNumber>
+        <modelName>65US761H0ND</modelName>
+        <priority>NORMAL</priority>
+        <content>
+            <type>EPK_FIRMWARE</type>
+            <data>starfish-atsc-secured-k6hp-41.242.japoon4hotel.k6hp-41-04.44.00_prodkey_nsu_V3_SECURED.epk</data>
+            <frequency>0</frequency>
+            <programNum>0</programNum>
+            <cTag>0</cTag>
+        </content>
+    </setup>
+    <setup>
+        <versionNumber>4</versionNumber>
        <modelName>49US761H0ND</modelName>
        <priority>NORMAL</priority>
        <content>
            <type>EPK_FIRMWARE</type>
-            <data>starfish-atsc-secured-k6hp-41.242.japoon4hotel.k6hp-78-04.47.70_prodkey_nsu_V3_SECURED.epk</data>
+            <data>starfish-atsc-secured-k6hp-41.242.japoon4hotel.k6hp-94-04.49.30_prodkey_nsu_V3_SECURED.epk</data>
+            <frequency>0</frequency>
+            <programNum>0</programNum>
+            <cTag>0</cTag>
+        </content>
+        <!-- FOR PTC F/W -->
+        <content>
+            <type>PTC_FIRMWARE</type>
+            <data>xxUS761H0ND_v8.00.088.txt</data>
            <frequency>0</frequency>
            <programNum>0</programNum>
            <cTag>0</cTag>
--- a/procentric/system/xxUS761H0ND_v8.00.088.txt
+++ b/procentric/system/xxUS761H0ND_v8.00.088.txt
Author	SHA1	Message	Date
paul kim	123c9d794d	issue #10 #11 #12 Fix EPG info time issue.	2024-09-05 19:25:01 +09:00
paul kim	91cd321a59	issue #10 #11 #12 Apply system reboot feature on instant_power mode set as 2. Change language popup titile and usage displaying method.	2024-09-05 12:35:44 +09:00
paul kim	baf7697664	issue #10 #11 Add xait reference configuration.	2024-07-04 16:26:14 +09:00