issue #10 #11 Change method for instant_power and power_mode configuration.

procentric/application/lib/hoteltv.api.js

@@ -868,7 +868,7 @@ HotelTV.api = (function() {
 
             _json_report.model = _dev_inf.model_name;
             _json_report.hw_ver = _dev_inf.hardware_version.major + "." + _dev_inf.hardware_version.minor;
-            _json_report.sw_ver = _dev_inf.hcap_middleware_version.major + "." + _dev_inf.hcap_middleware_version.minor + "." + _dev_inf.hcap_middleware_version.revision;
+            _json_report.sw_ver = _dev_inf.platform_version.major + "." + _dev_inf.platform_version.minor + "." + _dev_inf.platform_version.revision;
             _json_report.scr_resolution = _dev_inf.display_resolution;
 
             _json_report.uptime.second = Math.floor(_dev_inf.uptime / 1000);

procentric/application/lib/hoteltv.hcap.js

@@ -42,6 +42,7 @@ HotelTV.hcap = (function() {
         'tv_channel_ui', "mute_on_tv_input",
         'soft_ap_ui', "soft_ap", "soft_ap_password",
         'picture',
+        'power_mode',
         'end_of_item'
     ];
 
@@ -306,18 +307,18 @@ HotelTV.hcap = (function() {
      */
     function __hcapfxn_set_powermode(sz_key, value) {
         return new Promise((resolve, reject) => {
-            let _pwrMode = null;
+            let _pwrModeTgt = value;
             try {
                 hcap.power.getPowerMode({
                     "onSuccess" : function(s) {
                         console.log("onSuccess power mode " + s.mode);
+                        _pwrModeTgt = s.mode;
                         if ( s.mode!=value )
                         {
                             hcap.power.setPowerMode({
                                 "mode" : value,
                                 "onSuccess" : function() {
                                     console.log("onSuccess set power mode to " + value);
-                                    _pwrMode = s.mode;
                                     resolve({ "key": sz_key, "value": value });
                                 },
                                 "onFailure" : function(f) {
@@ -328,8 +329,8 @@ HotelTV.hcap = (function() {
                         }
                         else
                         {
-                            _pwrMode = s.mode;
+                            console.log("onFailure : no need to change power_mode::> " + _pwrModeTgt);
-                            resolve({ "key": sz_key, "value": value });
+                            resolve({ "key": sz_key, "value": 2 });
                         }
                     },
                     "onFailure": function(f) {
@@ -677,6 +678,8 @@ HotelTV.hcap = (function() {
                             _pmFxnArProperty.push(__hcapfxn_get_netinfo(hcap_property_key[i]));
                         } else if (hcap_property_key[i] == 'picture') {
 
+                        } else if (hcap_property_key[i] == 'power_mode') {
+
                         } else if (hcap_property_key[i] == "wifi_screen_share"){
                             // HCAP대신 IDCAP API호출
                             _pmFxnArProperty.push(__idcapfxn_get_property(hcap_property_key[i]));
@@ -912,24 +915,9 @@ HotelTV.hcap = (function() {
                 if (_devinfo["instant_power"] !== undefined) {
                     let _instant_pwr_target_mode = Number(_devconfig.system.misc.instantPower);
                     if (_devinfo["instant_power"] != _instant_pwr_target_mode) {
-                        console.log("INSTANT POWER MODE::> off");
+                        _pmFxnArProperty.push(__hcapfxn_set_property('instant_power', _instant_pwr_target_mode));
-                        __hcapfxn_set_property('instant_power', _instant_pwr_target_mode).then(_result => {
-                            _devinfo["instant_power"] = _instant_pwr_target_mode;
-                            console.log("instant_power mode set as " + _devinfo["instant_power"]);
-                        });
-                    }
-
-                    if ( _instant_pwr_target_mode==2 ){
-                        __hcapfxn_set_powermode('power_mode', hcap.power.PowerMode.WARM).then(_result => {
-                            _devinfo["power_mode"] = hcap.power.PowerMode.WARM;
-                            console.log("power_mode mode set as " + _devinfo["power_mode"]);
-                        });
-                    } else if ( _instant_pwr_target_mode==1 ){
-                        __hcapfxn_set_powermode('power_mode', hcap.power.PowerMode.WARM).then(_result => {
-                            _devinfo["power_mode"] = hcap.power.PowerMode.WARM;
-                            console.log("power_mode mode set as " + _devinfo["power_mode"]);
-                        });
                     }
+                    _pmFxnArProperty.push(__hcapfxn_set_powermode('power_mode', hcap.power.PowerMode.WARM));
                 }
 
                 // STEP#006::> SERVICE RELATED PARAMETERS
@@ -1223,10 +1211,14 @@ HotelTV.hcap = (function() {
                             for (let i = 0; i < _ret.length; i++) {
                                 let _set_item = _ret[i];
                                 //리부팅을 하지 않아도 되는 항목들 no_need_reboot_param을 필터링
-                                let no_need_reboot_param = ["wifi_screen_share", "soft_ap", "soft_ap_ui", "osd_layer_id", "instant_power"];
+                                let no_need_reboot_param = ["wifi_screen_share", "soft_ap", "soft_ap_ui", "osd_layer_id", "instant_power", "power_mode"];
                                 if (no_need_reboot_param.indexOf(_set_item.key) == -1) {
                                     //Needed reboot the system
                                     need_to_reboot = true;
+                                } else {
+                                    if ( _set_item.key == 'power_mode' ){
+                                        _devinfo[_set_item.key] = _set_item.value;
+                                    }
                                 }
                                 console.log(`Device config[${_set_item.key}] set to ${_set_item.value}`);
                             }

procentric/application/lib/hoteltv.js

@@ -208,6 +208,7 @@ HotelTV.Init = async function() {
 
     //SETP#02::> Set Debug Options
     __fxn_Set_DebugOpt(false, 'osd', false);
+    //__fxn_Set_DebugOpt(true, 'native', false);
 
     //STEP#03::> Get Device Info
     HotelTV.ui_utils.SetBusy(true);