June 2015 - Sandbox-commits - mailman.cloud.codelutin.com

r1738 - oipf/lib/js/impl/model
by ygrego＠users.nuiton.org June 17, 2015

June 17, 2015

Author: ygrego Date: 2015-06-17 15:26:50 +0000 (Wed, 17 Jun 2015) New Revision: 1738 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1738 Log: Main modification: permit that timeout use succeeded in emulator when method setPowerState is called. Modified: oipf/lib/js/impl/model/LocalSystem.js Modified: oipf/lib/js/impl/model/LocalSystem.js =================================================================== --- oipf/lib/js/impl/model/LocalSystem.js 2015-06-17 15:18:28 UTC (rev 1737) +++ oipf/lib/js/impl/model/LocalSystem.js 2015-06-17 15:26:50 UTC (rev 1738) @@ -379,7 +379,7 @@ this._callbacks = {}; this._eventManager = new EventManager(); this._timerManager = new TimerManager(); - this._timeout = this._timerManager.createTimer; + this._timeout = this._timerManager.createTimer.bind(this._timerManager, 0); this._defaultProperties = defaultProperties; OipfUtils.initProperties.call(this, defaultProperties.localSystem); this.systemReady = true; @@ -548,8 +548,8 @@ this.timeCurrentPowerState = new Date().getTime(); this.powerState = type; this._timeout() - .then(this._fireEvent.bind( - this, this._eventManager.createCustomEvent("PowerStateChange", [this.powerState]))); + .then(this._fireEvent.bind( + this, this._eventManager.createCustomEvent("PowerStateChange", [this.powerState]))); return true; }

1 0

r1737 - oipf/emulator/view
by ygrego＠users.nuiton.org June 17, 2015

June 17, 2015

Author: ygrego Date: 2015-06-17 15:18:28 +0000 (Wed, 17 Jun 2015) New Revision: 1737 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1737 Log: Manage emulator power transition and channel switch info view. Modified: oipf/emulator/view/index.html Modified: oipf/emulator/view/index.html =================================================================== --- oipf/emulator/view/index.html 2015-06-17 15:16:21 UTC (rev 1736) +++ oipf/emulator/view/index.html 2015-06-17 15:18:28 UTC (rev 1737) @@ -9,22 +9,34 @@ <title>TV Emulator</title> <meta charset="UTF-8"> <meta name="viewport" content="width=device-width, initial-scale=1.0"> + <link rel="stylesheet" type="text/css" href="./emulator/node_modules/bootstrap/dist/css/bootstrap.min.css"> <link rel="stylesheet" type="text/css" href="./emulator/css/main.css"> - <link rel="stylesheet" type="text/css" href="./emulator/node_modules/bootstrap/dist/css/bootstrap.min.css"> <script src="./lib/build/oipf-lib.js" type="text/javascript"></script> <script src="./emulator/node_modules/angular/angular.js"></script> <script src="./emulator/js/filters/VolumeFilter.js"></script> + <script src="./emulator/js/services/OIPFServices.js"></script> <script src="./emulator/js/contollers/RemoteControlControllers.js"></script> - <script src="./emulator/js/services/OIPFServices.js"></script> <script src="./emulator/js/emulator.js"></script> </head> <body> - - <div class="container-fluid" ng-controller="RemoteControlController"> + <div class="container-fluid"> <div class="row"> <div id="emulator" class="col-md-9"> + <div id="panelSwitching" ng-controller="PanelChannelController" ng-show="isRequired"> + <div class="col-md-2"> + <img src="http://telepoche.guidetele.com/medias/chaines/tf1.png"/> + </div> + <div class="col-md-6"> + <div> + efzefzefzefezfze + </div> + <div> + four-column layout + </div> + </div> + </div> <div id="volumeView" class="text-center" ng-show="volumeViewActive"> <div> @@ -41,8 +53,16 @@ </div> </div> </div> - <object is="video-broadcast"></object> + <div class="off" id="powerStateView" ng-controller="PowerStateController" ng-class="state"> + <div id="imgChannel" ng-show="beforeON"> + <h1>Emulator</h1> + </div> + </div> + + <object class="ready" id="videoBroadcast" is="video-broadcast" ng-controller="VideoBroadcastController"> + </object> +    @@ -53,7 +73,7 @@ </div> - <div class="col-sm-2 col-sm-offset-1"> + <div class="col-sm-2 col-sm-offset-1" ng-controller="RemoteControlController"> <div class="panel panel-default"> <div class="panel-body">

1 0

r1736 - oipf/emulator/css
by ygrego＠users.nuiton.org June 17, 2015

June 17, 2015

Author: ygrego Date: 2015-06-17 15:16:21 +0000 (Wed, 17 Jun 2015) New Revision: 1736 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1736 Log: Manage display of channel info after emulator power state ON transition. Modified: oipf/emulator/css/main.css Modified: oipf/emulator/css/main.css =================================================================== --- oipf/emulator/css/main.css 2015-06-17 15:13:24 UTC (rev 1735) +++ oipf/emulator/css/main.css 2015-06-17 15:16:21 UTC (rev 1736) @@ -8,62 +8,10 @@ Author : root */ -* { - box-sizing: border-box; -} - -.row:after { - content: ""; - clear: both; - display: block; -} - -[class*="col-"] { - float: left; +/*[class*="col-"] { padding: 15px; -} +}*/ -.col-1 {width: 8.33%;} -.col-2 {width: 16.66%;} -.col-3 {width: 25%;} -.col-4 {width: 33.33%;} -.col-5 {width: 41.66%;} -.col-6 {width: 50%;} -.col-7 {width: 58.33%;} -.col-8 {width: 66.66%;} -.col-9 {width: 75%; height: 100%} -.col-10 {width: 83.33%;} -.col-11 {width: 91.66%;} -.col-12 {width: 100%;} - -html { - font-family: "Lucida Sans", sans-serif; -} - -.header { - background-color: #9933cc; - color: #ffffff; - padding: 15px; -} - -.menu ul { - list-style-type: none; - margin: 0; - padding: 0; -} - -.menu li { - padding: 8px; - margin-bottom: 7px; - background-color: #33b5e5; - color: #ffffff; - box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24); -} - -.menu li:hover { - background-color: #0099cc; -} - #emulator { height: 600px; background-color: activecaption; @@ -73,6 +21,13 @@ background-color: #00b3ee; } +h1 { + font-size: 100px; + color: #555; + -webkit-text-fill-color: white; + -webkit-text-stroke: 3px #555; +} + #volumeView { width: 15%; height: 5%; @@ -89,13 +44,34 @@ left: 2em; } +#panelSwitching { + color: white; + background-color: rgba(0, 0, 0, .4); + position: absolute; + width: 97%; +} + #imgChannel { - background: #777; position: absolute; - right: 50%; - bottom: 50%; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); } -object { +.border { + border: 1px solid black; +} + +.ready { + width: 100%; + height: 100%; background-color: slategrey; } + +.off { + position: absolute; + width: 100%; + height: 100%; + background-color: black; + z-index: 1; +}

1 0

r1735 - oipf/emulator/js/contollers
by ygrego＠users.nuiton.org June 17, 2015

June 17, 2015

Author: ygrego Date: 2015-06-17 15:13:24 +0000 (Wed, 17 Jun 2015) New Revision: 1735 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1735 Log: Refactoring of controllers in order to separate the managing of video-broadcast object. Modified: oipf/emulator/js/contollers/RemoteControlControllers.js Modified: oipf/emulator/js/contollers/RemoteControlControllers.js =================================================================== --- oipf/emulator/js/contollers/RemoteControlControllers.js 2015-06-17 14:58:07 UTC (rev 1734) +++ oipf/emulator/js/contollers/RemoteControlControllers.js 2015-06-17 15:13:24 UTC (rev 1735) @@ -18,87 +18,58 @@ methodName && $scope[methodName].call($scope, buttonId); }; - $scope.state = 'OFF'; $scope.channel = ""; $scope.channelNumber = ""; $scope.channelNumberActive = false; $scope.volumeViewActive = false; $rootScope.powerChange = false; - $scope.currentVolume = 50; - $scope.setSate = function() { - }; - $scope.setPowerChange = function() { $rootScope.powerChange = !$rootScope.powerChange; console.log($rootScope.powerChange); }; $scope.clickMapping = { - "POWER": "setPowerChange", - "0": "setChannelByNumber", - "1": "setChannelByNumber", - "2": "setChannelByNumber", - "3": "setChannelByNumber", - "4": "setChannelByNumber", - "5": "setChannelByNumber", - "6": "setChannelByNumber", - "7": "setChannelByNumber", - "8": "setChannelByNumber", - "9": "setChannelByNumber", - "V+": "setVolume", - "V-": "setVolume" + "POWER": "setPowerChange", + "0": "setChannelByNumber", + "1": "setChannelByNumber", + "2": "setChannelByNumber", + "3": "setChannelByNumber", + "4": "setChannelByNumber", + "5": "setChannelByNumber", + "6": "setChannelByNumber", + "7": "setChannelByNumber", + "8": "setChannelByNumber", + "9": "setChannelByNumber", + "V+": "setVolume", + "V-": "setVolume" }; - $scope.setChannelByNumber = function(buttonId) { - $scope.channelNumberActive = true; - - if ($scope.channel.length == 0) { - $timeout(function() { - $scope.channel = $scope.channelNumber.toString(); - $scope.channelNumber = ""; - $scope.channelNumberActive = false; - }, 3000); - } - $scope.channelNumber += buttonId; - - }; - - $scope.setVolume = function(buttonId) { - $scope.volumeViewActive = true; - if (buttonId == "V+" && $scope.currentVolume < 100) { - $scope.currentVolume++; - } else if (buttonId == "V-" && $scope.currentVolume > 0) { - $scope.currentVolume--; - } - $timeout(function() { - $scope.volumeViewActive = false; - }, 3000); - }; }]); RemoteControlControllers.controller("PowerStateController", - ["$rootScope", "$scope", "ConfigurationService", function($rootScope, $scope, ConfigurationService) { + ["$rootScope", "$scope", "$timeout", "ConfigurationService", function($rootScope, $scope, $timeout, ConfigurationService) { $scope.onStarting = true; - $scope.videoStyle = "off"; - + $scope.state = "show"; + $scope.beforeON = false; + $rootScope.systemReady = false; $scope.configurationService = ConfigurationService(); $scope.configurationService.localSystem.onPowerStateChange = function(state) { + if ($scope.waitingState == state && $scope.result) { if (state == 0) { - console.log("POWER STATE CHANGE: OFF."); - $scope.videoStyle = "off"; - + $scope.state = "show"; + $rootScope.systemReady = false; } else { - console.log("POWER STATE CHANGE: ON."); - $scope.videoStyle = "on"; + $scope.state = "hidden"; + $rootScope.systemReady = true; + } - } } else { console.log("POWER STATE CHANGE: ERROR."); @@ -118,30 +89,91 @@ if ($scope.configurationService.localSystem.powerState == 0) { $scope.waitingState = 1; - $scope.result = $scope.configurationService.localSystem.setPowerState(1); + $scope.beforeON = true; + $timeout(function() { + $scope.beforeON = false; + $scope.result = $scope.configurationService.localSystem.setPowerState(1); + }, 5000); + } else if ($scope.configurationService.localSystem.powerState == 1) { $scope.waitingState = 0; $scope.result = $scope.configurationService.localSystem.setPowerState(0); } + } else { $scope.onStarting = false; } - }); }]); RemoteControlControllers.controller("VideoBroadcastController", - ["$rootScope", "$scope", "ConfigurationService", function($rootScope, $scope, ConfigurationService) { + ["$rootScope", "$scope", "$timeout", function($rootScope, $scope, $timeout) { + $scope.currentVolume = 50; + $rootScope.channelInfo = false; + $scope.setChannelByNumber = function(buttonId) { + $scope.channelNumberActive = true; + + if ($scope.channel.length == 0) { + $timeout(function() { + $scope.channel = $scope.channelNumber.toString(); + $scope.channelNumber = ""; + $scope.channelNumberActive = false; + }, 3000); + } + $scope.channelNumber += buttonId; + + }; + + $scope.setVolume = function(buttonId) { + $scope.volumeViewActive = true; + if (buttonId == "V+" && $scope.currentVolume < 100) { + $scope.currentVolume++; + } else if (buttonId == "V-" && $scope.currentVolume > 0) { + $scope.currentVolume--; + } + $timeout(function() { + $scope.volumeViewActive = false; + }, 3000); + }; + + $rootScope.$watch("systemReady", function(isReady) { + + if (isReady) { + console.group("VideoBroadcastController"); + console.log("System ready after power ON: active channel info view"); + $rootScope.channelInfo = true; + console.groupEnd("VideoBroadcastController"); + $timeout(function() { + $rootScope.channelInfo = false; + }, 4000); + } + + }); + }]); RemoteControlControllers.controller("PanelChannelController", ["$rootScope", "$scope", function($rootScope, $scope) { $scope.isRequired = false; + + $rootScope.$watch("channelInfo", function(newInfo) { + console.group("PanelChannelController"); + if (newInfo) { + console.log("Panel channel info will be activated."); + $scope.isRequired = true; + + } else if (!newInfo) { + console.log("Panel channel info will be deactivated."); + $scope.isRequired = false; + } + console.groupEnd("PanelChannelController"); + }); + }]);

1 0

r1734 - oipf/lib/js/utils
by ygrego＠users.nuiton.org June 17, 2015

June 17, 2015

Author: ygrego Date: 2015-06-17 14:58:07 +0000 (Wed, 17 Jun 2015) New Revision: 1734 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1734 Log: Addition of goods indentations. Modified: oipf/lib/js/utils/ProgrammeHelper.js Modified: oipf/lib/js/utils/ProgrammeHelper.js =================================================================== --- oipf/lib/js/utils/ProgrammeHelper.js 2015-06-17 14:53:28 UTC (rev 1733) +++ oipf/lib/js/utils/ProgrammeHelper.js 2015-06-17 14:58:07 UTC (rev 1734) @@ -87,7 +87,7 @@ return this.channelService.getADvbTChannel(name); } - transformInDateObject(wrongDateFormat) { + transformToDateObject(wrongDateFormat) { var pattern = /(\d{4})(\d{2})(\d{2})(\d{2})(\d{2})(\d{2})\s\+(\d{2})/; var tmpDate = wrongDateFormat; @@ -100,12 +100,13 @@ var mins = parseInt(tmpDate[5]); var secs = parseInt(tmpDate[6]); - var actualDate = new Date(year, month, day, hs, mins, secs); - return actualDate; + var date = new Date(year, month, day, hs, mins, secs); + + return date; } transformInSecondSince01011970(wrongDateFormat) { - return this.transformInDateObject(wrongDateFormat).getTime() / 1000; + return this.transformToDateObject(wrongDateFormat).getTime() / 1000; } minutesToSeconds(minutes) {

1 0

r1733 - oipf/lib/js/utils
by ygrego＠users.nuiton.org June 17, 2015

June 17, 2015

Author: ygrego Date: 2015-06-17 14:53:28 +0000 (Wed, 17 Jun 2015) New Revision: 1733 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1733 Log: Avoid to parse xml comment. Modified: oipf/lib/js/utils/XmlToJson.js Modified: oipf/lib/js/utils/XmlToJson.js =================================================================== --- oipf/lib/js/utils/XmlToJson.js 2015-06-17 14:38:01 UTC (rev 1732) +++ oipf/lib/js/utils/XmlToJson.js 2015-06-17 14:53:28 UTC (rev 1733) @@ -28,7 +28,7 @@ return null; } - this.rootsNode = this.xmlDocument.firstChild; + this.rootsNode = this.xmlDocument.firstElementChild; //We already know that document contains at least one child. var rootsName = this.rootsNode.nodeName;

1 0

r1732 - oipf/lib/js/utils
by ygrego＠users.nuiton.org June 17, 2015

June 17, 2015

Author: ygrego Date: 2015-06-17 14:38:01 +0000 (Wed, 17 Jun 2015) New Revision: 1732 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1732 Log: Avoid getting xml comment node. Modified: oipf/lib/js/utils/ProgrammeHelper.js Modified: oipf/lib/js/utils/ProgrammeHelper.js =================================================================== --- oipf/lib/js/utils/ProgrammeHelper.js 2015-06-17 11:42:06 UTC (rev 1731) +++ oipf/lib/js/utils/ProgrammeHelper.js 2015-06-17 14:38:01 UTC (rev 1732) @@ -15,19 +15,19 @@ }; this.channelNameMap = { - "ART1.kazer.org" : "ARTE", - "EUR2.kazer.org" : "D17", - "FRA2.kazer.org" : "FRANCE_2", - "FRA3.kazer.org" : "FRANCE_3", - "FRA4.kazer.org" : "FRANCE_4", - "FRA5.kazer.org" : "FRANCE_5", - "M61.kazer.org" : "M6", - "NRJ1.kazer.org" : "NRJ_12", - "NT11.kazer.org" : "NT1", - "RTL2.kazer.org" : "RTL9", - "TF11.kazer.org" : "TF1", - "TMC1.kazer.org" : "TMC", - "W91.kazer.org" : "W9" + "ART1.kazer.org": "ARTE", + "EUR2.kazer.org": "D17", + "FRA2.kazer.org": "FRANCE_2", + "FRA3.kazer.org": "FRANCE_3", + "FRA4.kazer.org": "FRANCE_4", + "FRA5.kazer.org": "FRANCE_5", + "M61.kazer.org": "M6", + "NRJ1.kazer.org": "NRJ_12", + "NT11.kazer.org": "NT1", + "RTL2.kazer.org": "RTL9", + "TF11.kazer.org": "TF1", + "TMC1.kazer.org": "TMC", + "W91.kazer.org": "W9" }; this.programmes = null; @@ -87,29 +87,25 @@ return this.channelService.getADvbTChannel(name); } - transformToActualDate(wrongDateFormat) { + transformInDateObject(wrongDateFormat) { var pattern = /(\d{4})(\d{2})(\d{2})(\d{2})(\d{2})(\d{2})\s\+(\d{2})/; var tmpDate = wrongDateFormat; tmpDate = pattern.exec(tmpDate); - var dateTmp = new Date(); - /*year = parseInt(tmpSSTime[1]); - month = parseInt(tmpSSTime[2]); - day = parseInt(tmpSSTime[3]);*/ - var year = dateTmp.getFullYear(); - var month = dateTmp.getUTCMonth(); - var day = dateTmp.getUTCDate(); + var year = parseInt(tmpDate[1]); + var month = parseInt(tmpDate[2]); + var day = parseInt(tmpDate[3]); var hs = parseInt(tmpDate[4]); var mins = parseInt(tmpDate[5]); var secs = parseInt(tmpDate[6]); - var actualDate = new Date(year, month, day, hs, mins, secs); + var actualDate = new Date(year, month, day, hs, mins, secs); return actualDate; } transformInSecondSince01011970(wrongDateFormat) { - return this.transformToActualDate(wrongDateFormat).getTime() / 1000; + return this.transformInDateObject(wrongDateFormat).getTime() / 1000; } minutesToSeconds(minutes) {

1 0

r1731 - oipf/emulator/js/contollers
by ygrego＠users.nuiton.org June 17, 2015

June 17, 2015

Author: ygrego Date: 2015-06-17 11:42:06 +0000 (Wed, 17 Jun 2015) New Revision: 1731 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1731 Log: Manage the information of current channel set in emulator and the channel switching. Modified: oipf/emulator/js/contollers/RemoteControlControllers.js Modified: oipf/emulator/js/contollers/RemoteControlControllers.js =================================================================== --- oipf/emulator/js/contollers/RemoteControlControllers.js 2015-06-16 15:35:00 UTC (rev 1730) +++ oipf/emulator/js/contollers/RemoteControlControllers.js 2015-06-17 11:42:06 UTC (rev 1731) @@ -133,3 +133,15 @@ }); }]); + +RemoteControlControllers.controller("VideoBroadcastController", + ["$rootScope", "$scope", "ConfigurationService", function($rootScope, $scope, ConfigurationService) { + + +}]); + +RemoteControlControllers.controller("PanelChannelController", + ["$rootScope", "$scope", function($rootScope, $scope) { + $scope.isRequired = false; +}]); +

1 0

r1730 - oipf/emulator/js/services
by ygrego＠users.nuiton.org June 16, 2015

June 16, 2015

Author: ygrego Date: 2015-06-16 15:35:00 +0000 (Tue, 16 Jun 2015) New Revision: 1730 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1730 Log: The objects created must be returned. Modified: oipf/emulator/js/services/OIPFServices.js Modified: oipf/emulator/js/services/OIPFServices.js =================================================================== --- oipf/emulator/js/services/OIPFServices.js 2015-06-16 15:28:55 UTC (rev 1729) +++ oipf/emulator/js/services/OIPFServices.js 2015-06-16 15:35:00 UTC (rev 1730) @@ -2,13 +2,16 @@ OIPFServices.factory("ChannelConfigService", function() { return oipfObjectFactory.createChannelConfig(); -}) -.factory("SearchManagerService", function() { - oipfObjectFactory.createSearchManagerObject(); -}) -.factory("ConfigurationService", function() { - oipfObjectFactory.createConfigurationObject(); -}) -.factory("RecordingSchedulerService", function() { - oipfObjectFactory.createRecordingSchedulerObject(); }); + +OIPFServices.factory("SearchManagerService", function() { + return oipfObjectFactory.createSearchManagerObject(); +}); + +OIPFServices.factory("ConfigurationService", function() { + return oipfObjectFactory.createConfigurationObject.bind(oipfObjectFactory); +}); + +OIPFServices.factory("RecordingSchedulerService", function() { + return oipfObjectFactory.createRecordingSchedulerObject(); +});

1 0

r1729 - oipf/emulator/js/contollers
by ygrego＠users.nuiton.org June 16, 2015

June 16, 2015

Author: ygrego Date: 2015-06-16 15:28:55 +0000 (Tue, 16 Jun 2015) New Revision: 1729 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1729 Log: The power state of emulator must be managed by a distinct controller. Modified: oipf/emulator/js/contollers/RemoteControlControllers.js Modified: oipf/emulator/js/contollers/RemoteControlControllers.js =================================================================== --- oipf/emulator/js/contollers/RemoteControlControllers.js 2015-06-16 10:38:11 UTC (rev 1728) +++ oipf/emulator/js/contollers/RemoteControlControllers.js 2015-06-16 15:28:55 UTC (rev 1729) @@ -6,25 +6,16 @@ var RemoteControlControllers = angular.module('RemoteControlControllers', []); RemoteControlControllers.controller('RemoteControlController', - ['$scope', '$http', '$timeout', function ($scope, $http, $timeout) { + ['$rootScope', '$scope', '$http', '$timeout', function ($rootScope, $scope, $http, $timeout) { + $http.get('./emulator/remoteControl/remoteControl.json').success(function(data) { $scope.remoteControl = data; }); - $scope.clickMapping = { - "POWER": "setEmulatorON", - "0": "setChannelByNumber", - "1": "setChannelByNumber", - "2": "setChannelByNumber", - "3": "setChannelByNumber", - "4": "setChannelByNumber", - "5": "setChannelByNumber", - "6": "setChannelByNumber", - "7": "setChannelByNumber", - "8": "setChannelByNumber", - "9": "setChannelByNumber", - "V+": "setVolume", - "V-": "setVolume", + $scope.remoteControlClick = function(buttonId) { + var methodName = $scope.clickMapping[buttonId]; + console.log("methodName:", methodName, $scope[methodName]); + methodName && $scope[methodName].call($scope, buttonId); }; $scope.state = 'OFF'; @@ -32,16 +23,33 @@ $scope.channelNumber = ""; $scope.channelNumberActive = false; $scope.volumeViewActive = false; - $scope.emulatorON = false; + $rootScope.powerChange = false; $scope.currentVolume = 50; $scope.setSate = function() { }; - $scope.setEmulatorON = function() { - $scope.emulatorON = !$scope.emulatorON; + $scope.setPowerChange = function() { + $rootScope.powerChange = !$rootScope.powerChange; + console.log($rootScope.powerChange); }; + $scope.clickMapping = { + "POWER": "setPowerChange", + "0": "setChannelByNumber", + "1": "setChannelByNumber", + "2": "setChannelByNumber", + "3": "setChannelByNumber", + "4": "setChannelByNumber", + "5": "setChannelByNumber", + "6": "setChannelByNumber", + "7": "setChannelByNumber", + "8": "setChannelByNumber", + "9": "setChannelByNumber", + "V+": "setVolume", + "V-": "setVolume" + }; + $scope.setChannelByNumber = function(buttonId) { $scope.channelNumberActive = true; @@ -67,13 +75,61 @@ $scope.volumeViewActive = false; }, 3000); }; +}]); - $scope.remoteControlClick = function(buttonId) { - var methodName = $scope.clickMapping[buttonId]; - console.log("methodName:", methodName, $scope[methodName]); - methodName && $scope[methodName].call($scope, buttonId); - }; - }]); +RemoteControlControllers.controller("PowerStateController", + ["$rootScope", "$scope", "ConfigurationService", function($rootScope, $scope, ConfigurationService) { + $scope.onStarting = true; + $scope.videoStyle = "off"; + $scope.configurationService = ConfigurationService(); + + $scope.configurationService.localSystem.onPowerStateChange = function(state) { + if ($scope.waitingState == state && $scope.result) { + if (state == 0) { + + console.log("POWER STATE CHANGE: OFF."); + $scope.videoStyle = "off"; + + } else { + + console.log("POWER STATE CHANGE: ON."); + $scope.videoStyle = "on"; + + } + } else { + + console.log("POWER STATE CHANGE: ERROR."); + + } + $scope.$apply(); + + console.groupEnd("PowerStateController"); + }; + + $rootScope.$watch("powerChange", function() { + + if (!$scope.onStarting) { + console.group("PowerStateController"); + console.log("The power state will change."); + + if ($scope.configurationService.localSystem.powerState == 0) { + + $scope.waitingState = 1; + $scope.result = $scope.configurationService.localSystem.setPowerState(1); + + } else if ($scope.configurationService.localSystem.powerState == 1) { + + $scope.waitingState = 0; + $scope.result = $scope.configurationService.localSystem.setPowerState(0); + } + } else { + $scope.onStarting = false; + } + + + }); + +}]);

1 0