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

r1778 - oipf/lib/js/utils
by ygrego＠users.nuiton.org 08 Jul '15

08 Jul '15

Author: ygrego Date: 2015-07-08 13:23:16 +0200 (Wed, 08 Jul 2015) New Revision: 1778 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1778 Log: Have more information about programmes. Modified: oipf/lib/js/utils/ProgrammeHelper.js Modified: oipf/lib/js/utils/ProgrammeHelper.js =================================================================== --- oipf/lib/js/utils/ProgrammeHelper.js 2015-07-08 07:51:39 UTC (rev 1777) +++ oipf/lib/js/utils/ProgrammeHelper.js 2015-07-08 11:23:16 UTC (rev 1778) @@ -7,14 +7,30 @@ constructor(channelService, channels) { this.map = { - "title": "name", - "start": "startTime", - "stop": "duration", - "desc": "description", + category: "genre", + title: "name", + start: "startTime", + stop: "duration", + "desc#text": "description", "episode-num#text": "episode", "title#text": "name" }; + this.transformationData = { + start: { + methodTransformName: "millsecondsSinceJanuary1970", + necessaryData: ["value"] + }, + stop: { + methodTransformName: "millsecondsSinceJanuary1970", + necessaryData: ["value"] + }, + category: { + methodTransformName: "setCategory", + necessaryData: ["value"] + } + } + this.channelsLogoAndRealName = {}; this.setChannelsLogoAndRealName(channels) @@ -40,7 +56,9 @@ for (var i = 0, l = programmeList.length; i < l; i++) { var programme = {}; var object = programmeList[i]; - var channelName; + var channelName = { + value: "" + }; var self = this; var createProgramme = function(object, programme, parentKey) { var keys = Object.keys(object); @@ -47,32 +65,18 @@ for (var j = 0, l1 = keys.length; j < l1; j++) { var key = keys[j]; var element = object[key]; - if (element instanceof Object) { + if (element instanceof Object && !(element instanceof Array)) { createProgramme(element, programme, key); } else { - if (key == "start") { - element = self.transformInSecondSince01011970(element); - } - if (key == "stop") { - element = self.transformInSecondSince01011970(element); - } - if (key == "channel") { - channelName = element; - } - if (key == "#text") { - key = parentKey + key; - } - var mapping = self.map[key]; - if (mapping) { - programme[mapping] = element; - } + self.setProgrammeProperty(element, key, parentKey, programme, channelName); } } + }; createProgramme(object, programme); - var realChannelName = this.channelsLogoAndRealName[channelName]["display-name"]; - var channelLogoUrl = this.channelsLogoAndRealName[channelName].icon.src; + var realChannelName = this.channelsLogoAndRealName[channelName.value]["display-name"]; + var channelLogoUrl = this.channelsLogoAndRealName[channelName.value].icon.src; if (realChannelName) { var channel = this.channelService.getChannelSimplyByName(realChannelName); @@ -99,8 +103,41 @@ return this.channelService.getADvbTChannel(name); } + setProgrammeProperty(element, key, parentKey, programme, channelName) { + /*if (key == "start") { + element = self.transformInSecondSince01011970(element); + } + if (key == "stop") { + element = self.transformInSecondSince01011970(element); + }*/ + var data = { + value: element, + key: key + }; + + if (key == "channel") { + channelName.value = element; + } + + if (key == "#text") { + key = parentKey + key; + } + + var mapping = this.map[key]; + + /*if (mapping) { + programme[mapping] = element; + }*/ + + if (mapping) { + programme[mapping] = this.doTransformation(data); + } + + } + transformToDateObject(wrongDateFormat) { - var pattern = /(\d{4})(\d{2})(\d{2})(\d{2})(\d{2})(\d{2})\s\+(\d{2})/; +// var pattern = /(\d{4})(\d{2})(\d{2})(\d{2})(\d{2})(\d{2})\s\+(\d{2})/; + var pattern = /(\d{4})(\d{2})(\d{2})(\d{2})(\d{2})(\d{2})/; var tmpDate = wrongDateFormat; tmpDate = pattern.exec(tmpDate); @@ -125,5 +162,54 @@ return minutes * 60; } + doTransformation(data) { + var key = data.key; + + var transformationData = this.transformationData[key]; + + if (transformationData) { + var methodTransformationParams = + this.getMethodTransformationParameter(data, transformationData.necessaryData); + + var methodTransformationName = transformationData.methodTransformName; + + return this[methodTransformationName].apply(this, methodTransformationParams); + } + + return data.value; + } + + getMethodTransformationParameter(data, infoList) { + var param = []; + + for (var i = 0, li = infoList.length; i < li; i++) { + var infoName = infoList[i]; + + var paramValue = data[infoName]; + + param.push(paramValue); + } + + return param; + } + + setCategory(categoryList) { + var category = new StringCollection(); + + for (var i = 0, li = categoryList.length; i < li; i++) { + var categoryItem = categoryList[i]; + + categoryItem && category.push(categoryItem); + } + + return category + } + + millsecondsSinceJanuary1970(date) { + date = this.transformInSecondSince01011970(date); + + return date; + } + }

1 0

r1777 - oipf/emulator/view
by ygrego＠users.nuiton.org 08 Jul '15

08 Jul '15

Author: ygrego Date: 2015-07-08 09:51:39 +0200 (Wed, 08 Jul 2015) New Revision: 1777 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1777 Log: Addition of new filters files. Modified: oipf/emulator/view/index.html Modified: oipf/emulator/view/index.html =================================================================== --- oipf/emulator/view/index.html 2015-07-07 13:58:47 UTC (rev 1776) +++ oipf/emulator/view/index.html 2015-07-08 07:51:39 UTC (rev 1777) @@ -15,7 +15,8 @@ <script src="./lib/build/oipf-lib.js" type="text/javascript"></script> <script src="./emulator/node_modules/angular/angular.js"></script> <script src="./emulator/js/emulator.js"></script> - <script src="./emulator/js/filters/VolumeFilter.js"></script> + <script src="./emulator/js/filters/VolumeIconFilter.js"></script> + <script src="./emulator/js/filters/DateFilter.js"></script> <script src="./emulator/js/utils/Service.js"></script> <script src="./emulator/js/services/ChannelConfigService.js"></script> <script src="./emulator/js/services/ConfigurationService.js"></script> @@ -26,6 +27,7 @@ <script src="./emulator/js/contollers/PowerStateController.js"></script> <script src="./emulator/js/contollers/PanelChannelController.js"></script> + </head> <body> <div class="container-fluid" ng-controller="RemoteControlController">

1 0

r1776 - oipf/emulator/js
by ygrego＠users.nuiton.org 07 Jul '15

07 Jul '15

Author: ygrego Date: 2015-07-07 13:58:47 +0000 (Tue, 07 Jul 2015) New Revision: 1776 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1776 Log: Avoid editor alert + New filters implementations Modified: oipf/emulator/js/emulator.js Modified: oipf/emulator/js/emulator.js =================================================================== --- oipf/emulator/js/emulator.js 2015-07-07 13:47:01 UTC (rev 1775) +++ oipf/emulator/js/emulator.js 2015-07-07 13:58:47 UTC (rev 1776) @@ -3,11 +3,12 @@ */ var OIPFServices = angular.module("OIPFServices", []); var Controllers = angular.module("Controllers", []); +var Filters = angular.module("Filters", []); -var emulatorApplication = angular.module('emulatorApplication', +var emulatorApplication = angular.module("emulatorApplication", [ "OIPFServices", - 'Controllers', - 'VolumeFilter' + "Controllers", + "Filters" ]);

1 0

r1775 - oipf/emulator/view
by ygrego＠users.nuiton.org 07 Jul '15

07 Jul '15

Author: ygrego Date: 2015-07-07 13:47:01 +0000 (Tue, 07 Jul 2015) New Revision: 1775 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1775 Log: Display current programme name. Modified: oipf/emulator/view/index.html Modified: oipf/emulator/view/index.html =================================================================== --- oipf/emulator/view/index.html 2015-07-07 13:21:33 UTC (rev 1774) +++ oipf/emulator/view/index.html 2015-07-07 13:47:01 UTC (rev 1775) @@ -37,10 +37,10 @@ </div> <div class="col-md-6"> <div> - Toto TV + {{programmeTitle}} </div> <div> - SÉRIE + </div> </div> </div>

1 0

r1774 - oipf/emulator/js/contollers
by ygrego＠users.nuiton.org 07 Jul '15

07 Jul '15

Author: ygrego Date: 2015-07-07 13:21:33 +0000 (Tue, 07 Jul 2015) New Revision: 1774 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1774 Log: Permit the update of current programme information in channel data view. Modified: oipf/emulator/js/contollers/PanelChannelController.js Modified: oipf/emulator/js/contollers/PanelChannelController.js =================================================================== --- oipf/emulator/js/contollers/PanelChannelController.js 2015-07-07 13:17:52 UTC (rev 1773) +++ oipf/emulator/js/contollers/PanelChannelController.js 2015-07-07 13:21:33 UTC (rev 1774) @@ -1,8 +1,15 @@ Controllers.controller("PanelChannelController", - ["$rootScope", "$scope", "VideoBroadcastService", function($rootScope, $scope, VideoBroadcastService) { + ["$rootScope", "$scope", "VideoBroadcastService", "SearchManagerService", + function($rootScope, $scope, VideoBroadcastService, SearchManagerService) { $scope.isRequired = false; // VideoBroadcastService.videoBroadcastObject.currentChannel = {logoURL: ""}; $scope.videoBroadcastService = VideoBroadcastService; + $scope.searchManagerService = SearchManagerService; + $scope.programmeTitle; + $scope.startTime; + $scope.stopTime; + $scope.category; + $scope.parentalControl; $scope.chanLogo = ""; @@ -11,6 +18,7 @@ if (newInfo) { console.log("Panel channel info will be activated."); $scope.chanLogo = $scope.videoBroadcastService.getCurrentChannelLogoUrl(); + $scope.programmeTitle = $scope.searchManagerService.getCurrentProgrammeName(); $scope.isRequired = true; } else if (!newInfo) {

1 0

r1773 - oipf/emulator/js/services
by ygrego＠users.nuiton.org 07 Jul '15

07 Jul '15

Author: ygrego Date: 2015-07-07 13:17:52 +0000 (Tue, 07 Jul 2015) New Revision: 1773 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1773 Log: Facilitate the current programme information access. Modified: oipf/emulator/js/services/SearchManagerService.js Modified: oipf/emulator/js/services/SearchManagerService.js =================================================================== --- oipf/emulator/js/services/SearchManagerService.js 2015-07-07 10:38:21 UTC (rev 1772) +++ oipf/emulator/js/services/SearchManagerService.js 2015-07-07 13:17:52 UTC (rev 1773) @@ -4,6 +4,18 @@ var searchManagerObject = oipfObjectFactory.createSearchManagerObject(); + searchManagerService.setCurrentProgramme = function(programme) { + this.currentProgramme = programme; + }; + + searchManagerService.getCurrentProgramme = function() { + return this.currentProgramme; + }; + + searchManagerService.getCurrentProgrammeName = function() { + return this.currentProgramme.name || "Programme"; + }; + searchManagerObject.onMetadataSearch = function(resolve, reject, search, state) { console.log("[INFO]: onMetadataSearch called"); @@ -13,7 +25,9 @@ case 0: if (search.result.length == 1) { console.log("[TEST-RUNNING][Info] Label: Obtain current program according to oipf norm, State: found"); + searchManagerService.setCurrentProgramme(search.result[0]); resolve(); + } else { console.log("[TEST-RUNNING][Info] Label: Obtain current program according to oipf norm, State: not found"); reject();

1 0

r1772 - oipf/emulator/js/contollers
by ygrego＠users.nuiton.org 07 Jul '15

07 Jul '15

Author: ygrego Date: 2015-07-07 10:38:21 +0000 (Tue, 07 Jul 2015) New Revision: 1772 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1772 Log: Permit the display of the channel information and the searching of current programme. Modified: oipf/emulator/js/contollers/VideoBroadcastController.js Modified: oipf/emulator/js/contollers/VideoBroadcastController.js =================================================================== --- oipf/emulator/js/contollers/VideoBroadcastController.js 2015-07-07 10:27:32 UTC (rev 1771) +++ oipf/emulator/js/contollers/VideoBroadcastController.js 2015-07-07 10:38:21 UTC (rev 1772) @@ -26,7 +26,6 @@ }, 3000); } $scope.channelNumber += buttonId; - }; $scope.$on("ChannelChangeEvent", function(event, changeType) { @@ -70,13 +69,10 @@ console.groupEnd("VideoBroadcastController"); // $rootScope.channelInfo = true; $scope.chanLogo = $scope.videoBroadcastService.getCurrentChannelLogoUrl(); - $timeout(function() { - $rootScope.channelInfo = false; - }, 4000); }) .then(function() { return $scope.searchManagerService - ._findCurrentProgramme($scope.videoBroadcastService.getCurrentChannel()); + .findCurrentProgramme($scope.videoBroadcastService.getCurrentChannel()); }) .then(function() { console.log("Current programme OK.");

1 0

r1771 - oipf/emulator/js/services
by ygrego＠users.nuiton.org 07 Jul '15

07 Jul '15

Author: ygrego Date: 2015-07-07 10:27:32 +0000 (Tue, 07 Jul 2015) New Revision: 1771 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1771 Log: The programme searching must be accessible directly from the service. Modified: oipf/emulator/js/services/SearchManagerService.js Modified: oipf/emulator/js/services/SearchManagerService.js =================================================================== --- oipf/emulator/js/services/SearchManagerService.js 2015-07-07 10:17:27 UTC (rev 1770) +++ oipf/emulator/js/services/SearchManagerService.js 2015-07-07 10:27:32 UTC (rev 1771) @@ -43,9 +43,9 @@ searchManagerObject.onMetadataSearch = searchManagerObject.onMetadataSearch .bind(searchManagerObject, deferred.resolve, deferred.reject); - searchManagerObject["_findCurrentProgramme"] = function(channel) { + searchManagerService.findCurrentProgramme = function(channel) { var searchTarget = 1; - var metaDataSearch = this.createSearch(searchTarget); + var metaDataSearch = this.searchManagerObject.createSearch(searchTarget); var startTime = null; metaDataSearch.findProgrammesFromStream(channel, startTime); var offset = 0;

1 0

r1770 - oipf/emulator/js/services
by ygrego＠users.nuiton.org 07 Jul '15

07 Jul '15

Author: ygrego Date: 2015-07-07 10:17:27 +0000 (Tue, 07 Jul 2015) New Revision: 1770 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1770 Log: Don't mix the services. Added: oipf/emulator/js/services/ChannelConfigService.js oipf/emulator/js/services/ConfigurationService.js oipf/emulator/js/services/SearchManagerService.js oipf/emulator/js/services/VideoBroadcastService.js Added: oipf/emulator/js/services/ChannelConfigService.js =================================================================== --- oipf/emulator/js/services/ChannelConfigService.js (rev 0) +++ oipf/emulator/js/services/ChannelConfigService.js 2015-07-07 10:17:27 UTC (rev 1770) @@ -0,0 +1,4 @@ + +OIPFServices.factory("ChannelConfigService", function() { + return oipfObjectFactory.createChannelConfig.call(oipfObjectFactory); +}); Added: oipf/emulator/js/services/ConfigurationService.js =================================================================== --- oipf/emulator/js/services/ConfigurationService.js (rev 0) +++ oipf/emulator/js/services/ConfigurationService.js 2015-07-07 10:17:27 UTC (rev 1770) @@ -0,0 +1,15 @@ +OIPFServices.factory("ConfigurationService", function() { + var configurationService = new Service(); + + configurationService.configurationObject = oipfObjectFactory.createConfigurationObject.call(oipfObjectFactory); + + configurationService.getPowerState = function() { + return this.configurationObject.localSystem.powerState; + }; + + configurationService.setPowerState = function(powerState) { + return this.configurationObject.localSystem.setPowerState(powerState); + }; + + return configurationService; +}); Added: oipf/emulator/js/services/SearchManagerService.js =================================================================== --- oipf/emulator/js/services/SearchManagerService.js (rev 0) +++ oipf/emulator/js/services/SearchManagerService.js 2015-07-07 10:17:27 UTC (rev 1770) @@ -0,0 +1,61 @@ +OIPFServices.factory("SearchManagerService", ["$q", function(promise) { + + var searchManagerService = new Service(); + + var searchManagerObject = oipfObjectFactory.createSearchManagerObject(); + + searchManagerObject.onMetadataSearch = function(resolve, reject, search, state) { + + console.log("[INFO]: onMetadataSearch called"); + + switch (state) { + + case 0: + if (search.result.length == 1) { + console.log("[TEST-RUNNING][Info] Label: Obtain current program according to oipf norm, State: found"); + resolve(); + } else { + console.log("[TEST-RUNNING][Info] Label: Obtain current program according to oipf norm, State: not found"); + reject(); + } + break; + + case 3: + var message = "[INFO] MetadataSearch in Idle state because of either search abort or parameters have been modified (query, constraints or search target)"; + console.log(message); + reject(); + break; + + case 4: + message = "[INFO] The search cannot be complete because of lack of ressources or any other reason."; + console.log(message); + reject(); + break; + + default: + console.log("Unknow state"); + reject(); + } + }; + + var deferred = promise.defer(); + + searchManagerObject.onMetadataSearch = searchManagerObject.onMetadataSearch + .bind(searchManagerObject, deferred.resolve, deferred.reject); + + searchManagerObject["_findCurrentProgramme"] = function(channel) { + var searchTarget = 1; + var metaDataSearch = this.createSearch(searchTarget); + var startTime = null; + metaDataSearch.findProgrammesFromStream(channel, startTime); + var offset = 0; + var count = 1; + metaDataSearch.result.getResults(offset, count); + + return deferred.promise; + }; + + searchManagerService.searchManagerObject = searchManagerObject; + + return searchManagerService; +}]); Added: oipf/emulator/js/services/VideoBroadcastService.js =================================================================== --- oipf/emulator/js/services/VideoBroadcastService.js (rev 0) +++ oipf/emulator/js/services/VideoBroadcastService.js 2015-07-07 10:17:27 UTC (rev 1770) @@ -0,0 +1,132 @@ +OIPFServices.factory("VideoBroadcastService", ["$q", function(promise) { + + var videoBroadcastService = new Service(); + var videoBroadcastObject = document.getElementById("videoBroadcast"); + + if (videoBroadcastObject) { + + videoBroadcastService.videoBroadcastObject = videoBroadcastObject; + + } else { + + console.log("There is no video-broadcast object present in DOM!!!!"); + + } + + videoBroadcastService.promiseManager = promise; + + videoBroadcastService.getCurrentChannel = function() { + return this.videoBroadcastObject.currentChannel; + }; + + videoBroadcastService.getCurrentChannelLogoUrl = function() { + return this.getCurrentChannel().logoUrl; + }; + + videoBroadcastService.bindToCurrentChannel = function() { + + var deferred = this.promiseManager.defer(); + this.previousState = this.videoBroadcastObject.playState; + this.currentIndex = 0; + + this.videoBroadcastObject.onPlayStateChange = + this.onChangeState.bind(this, deferred.resolve, deferred.reject); + + this.addTransition(videoBroadcastConstants.state.UNREALIZED, + videoBroadcastConstants.state.CONNECTING); + + this.addTransition(videoBroadcastConstants.state.CONNECTING, + videoBroadcastConstants.state.PRESENTING, + deferred.resolve); + + this.videoBroadcastObject.bindToCurrentChannel(); + + return deferred.promise; + }; + + videoBroadcastService.release = function() { + + var deferred = this.promiseManager.defer(); + + if (this.videoBroadcastObject.playState) { + this.currentIndex = 0; + this.previousState = this.videoBroadcastObject.playState; + + this.videoBroadcastObject.onPlayStateChange = + this.onChangeState.bind(this, deferred.resolve, deferred.reject); + + this.addTransition(this.previousState, + videoBroadcastConstants.state.UNREALIZED, + deferred.resolve); + + this.videoBroadcastObject.release && this.videoBroadcastObject.release(); + } + + + return deferred.promise; + }; + + videoBroadcastService.prevChannel = function() { + + var deferred = this.promiseManager.defer(); + this.currentIndex = 0; + + this.previousState = this.videoBroadcastObject.playState; + + this.addTransition(this.previousState, + videoBroadcastConstants.state.CONNECTING); + + this.addTransition(videoBroadcastConstants.state.CONNECTING, + videoBroadcastConstants.state.PRESENTING); + + this.videoBroadcastObject.onChannelChangeSucceeded = function(channel) { + deferred.resolve(); + }; + + this.videoBroadcastObject.prevChannel && this.videoBroadcastObject.prevChannel(); + + return deferred.promise; + } + + videoBroadcastService.nextChannel = function() { + + var deferred = this.promiseManager.defer(); + this.currentIndex = 0; + + this.previousState = this.videoBroadcastObject.playState; + + this.addTransition(this.previousState, + videoBroadcastConstants.state.CONNECTING); + + this.addTransition(videoBroadcastConstants.state.CONNECTING, + videoBroadcastConstants.state.PRESENTING); + + this.videoBroadcastObject.onChannelChangeSucceeded = function(channel) { + deferred.resolve(); + }; + + this.videoBroadcastObject.nextChannel && this.videoBroadcastObject.nextChannel(); + + return deferred.promise; + } + + videoBroadcastService.setVolume = function(buttonId) { + + if (buttonId == "V+") { + var volume = this.videoBroadcastObject.getVolume(); + var result = this.videoBroadcastObject.setVolume(volume+1); + } else if (buttonId == "V-") { + var volume = this.videoBroadcastObject.getVolume(); + result = this.videoBroadcastObject.setVolume(volume-1); + } + + return result; + } + + videoBroadcastService.getVolume = function() { + this.videoBroadcastObject.getVolume && console.log(this.videoBroadcastObject.getVolume()); + return this.videoBroadcastObject.getVolume && this.videoBroadcastObject.getVolume() || 50; + } + + return videoBroadcastService; +}]);

1 0

r1769 - oipf/emulator/js/contollers
by ygrego＠users.nuiton.org 07 Jul '15

07 Jul '15

Author: ygrego Date: 2015-07-07 10:14:27 +0000 (Tue, 07 Jul 2015) New Revision: 1769 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1769 Log: Discharge some controllers. Added: oipf/emulator/js/contollers/PanelChannelController.js oipf/emulator/js/contollers/PowerStateController.js oipf/emulator/js/contollers/VideoBroadcastController.js Added: oipf/emulator/js/contollers/PanelChannelController.js =================================================================== --- oipf/emulator/js/contollers/PanelChannelController.js (rev 0) +++ oipf/emulator/js/contollers/PanelChannelController.js 2015-07-07 10:14:27 UTC (rev 1769) @@ -0,0 +1,23 @@ +Controllers.controller("PanelChannelController", + ["$rootScope", "$scope", "VideoBroadcastService", function($rootScope, $scope, VideoBroadcastService) { + $scope.isRequired = false; +// VideoBroadcastService.videoBroadcastObject.currentChannel = {logoURL: ""}; + $scope.videoBroadcastService = VideoBroadcastService; + + $scope.chanLogo = ""; + + $rootScope.$watch("channelInfo", function(newInfo) { + console.group("PanelChannelController"); + if (newInfo) { + console.log("Panel channel info will be activated."); + $scope.chanLogo = $scope.videoBroadcastService.getCurrentChannelLogoUrl(); + $scope.isRequired = true; + + } else if (!newInfo) { + console.log("Panel channel info will be deactivated."); + $scope.isRequired = false; + } + console.groupEnd("PanelChannelController"); + }); + +}]); Added: oipf/emulator/js/contollers/PowerStateController.js =================================================================== --- oipf/emulator/js/contollers/PowerStateController.js (rev 0) +++ oipf/emulator/js/contollers/PowerStateController.js 2015-07-07 10:14:27 UTC (rev 1769) @@ -0,0 +1,62 @@ +Controllers.controller("PowerStateController", + ["$rootScope", "$scope", "$timeout", "ConfigurationService", "ChannelConfigService", + function($rootScope, $scope, $timeout, ConfigurationService, ChannelConfigService) { + + $scope.state = "show"; + $scope.beforeON = false; + $rootScope.systemReady = false; + $scope.configurationService = ConfigurationService; + $scope.channelConfigService = ChannelConfigService; + + $scope.configurationService.configurationObject.localSystem.onPowerStateChange = function(state) { + + if ($scope.waitingState == state && $scope.result) { + if (state == 0) { + console.log("POWER STATE CHANGE: OFF."); + $scope.state = "show"; + $rootScope.systemReady = false; + + } else { + console.log("POWER STATE CHANGE: ON."); + $scope.setSystemReadyAndHideWaitingView(); + } + + } else { + + console.log("POWER STATE CHANGE: ERROR."); + + } + $scope.$apply(); + + console.groupEnd("PowerStateController"); + }; + + $scope.$on("PowerStateChangeEvent", function() { + + console.group("PowerStateController"); + console.log("The power state will change."); + + if ($scope.configurationService.getPowerState() == 0) { + + $scope.waitingState = 1; + $scope.beforeON = true; + $timeout(function() { + $scope.result = $scope.configurationService.setPowerState(1); + }, 3500); + + } else if ($scope.configurationService.getPowerState() == 1) { + + $scope.waitingState = 0; + $scope.result = $scope.configurationService.setPowerState(0); + } + + }); + + $scope.setSystemReadyAndHideWaitingView = function() { + console.log("The system is ready."); + $scope.state = "hidden"; + $rootScope.systemReady = true; + $scope.beforeON = false; + } + +}]); Added: oipf/emulator/js/contollers/VideoBroadcastController.js =================================================================== --- oipf/emulator/js/contollers/VideoBroadcastController.js (rev 0) +++ oipf/emulator/js/contollers/VideoBroadcastController.js 2015-07-07 10:14:27 UTC (rev 1769) @@ -0,0 +1,131 @@ +Controllers.controller("VideoBroadcastController", + ["$rootScope", "$scope", "$timeout", "VideoBroadcastService", "SearchManagerService", "ConfigurationService", + function($rootScope, $scope, $timeout, VideoBroadcastService, SearchManagerService, ConfigurationService) { + + $scope.videoBroadcastService = VideoBroadcastService; + $scope.searchManagerService = SearchManagerService; + $scope.configurationService = ConfigurationService; + + $scope.chanLogo = ""; + + $scope.promiseVolumeView = null; + $scope.volumeClass = "glyphicon-volume-down"; + $scope.currentVolume = $scope.configurationService.configurationObject.localSystem.volume; + + $rootScope.channelInfo = false; + $scope.volumeViewActive = true; + + $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.$on("ChannelChangeEvent", function(event, changeType) { + console.log(changeType); + }); + + $scope.$on("VolumeEvent", function(event, changeType) { + console.log("A VolumeEvent has been received: The volume will change."); + console.log("Activation of volume view."); + + if (changeType == "V+") { + $scope.volumeClass = "glyphicon-volume-up"; + + } else if (changeType == "V-") { + $scope.volumeClass = "glyphicon-volume-down"; + } + + $scope.volumeViewActive = true; + var result = $scope.videoBroadcastService.setVolume(changeType); + + if (result) { + $scope.currentVolume = $scope.videoBroadcastService.getVolume(); + } + + $scope.promiseVolumeView = $timeout(function() { + console.log("Deactivation of volume view."); + $scope.volumeViewActive = false; + }, 5000); + + }); + + $rootScope.$watch("systemReady", function(isReady) { + + if (isReady) { + console.group("VideoBroadcastController"); + console.log("System ready after power ON: active channel info view"); + var promise = $scope.videoBroadcastService.bindToCurrentChannel.call($scope.videoBroadcastService); + + promise.then(function() { + console.log("VideoBroadcast current channel binding OK."); + console.groupEnd("VideoBroadcastController"); +// $rootScope.channelInfo = true; + $scope.chanLogo = $scope.videoBroadcastService.getCurrentChannelLogoUrl(); + $timeout(function() { + $rootScope.channelInfo = false; + }, 4000); + }) + .then(function() { + return $scope.searchManagerService + ._findCurrentProgramme($scope.videoBroadcastService.getCurrentChannel()); + }) + .then(function() { + console.log("Current programme OK."); + $rootScope.channelInfo = true; + console.groupEnd("VideoBroadcastController"); + $timeout(function() { + $rootScope.channelInfo = false; + }, 4000); + }); + } else { + var promise = $scope.videoBroadcastService.release.call($scope.videoBroadcastService); + promise.then(function() { + console.group("VideoBroadcastController"); + console.log("The video-broadcast object have been released, SYSTEM OFF.") + console.groupEnd("VideoBroadcastController"); + }); + } + + }); + + /*$rootScope.$watch("channelChange", function(type) { + + if (type == "+P") { + console.group("VideoBroadcastController"); + console.log("Require a channel switch up"); + var promise = $scope.videoBroadcastService.prevChannel.call($scope.videoBroadcastService); + + promise.then(function() { + $rootScope.channelInfo = true; + $scope.chanLogo = $scope.videoBroadcastService.getCurrentChannelLogoUrl(); + $timeout(function() { + $rootScope.channelInfo = false; + }, 4000); + }); + + } else { + console.group("VideoBroadcastController"); + console.log("Require a channel switch down"); + var promise = $scope.videoBroadcastService.nextChannel.call($scope.videoBroadcastService); + + promise.then(function() { + $rootScope.channelInfo = true; + $scope.chanLogo = $scope.videoBroadcastService.getCurrentChannelLogoUrl(); + $timeout(function() { + $rootScope.channelInfo = false; + }, 4000); + }); + } + + });*/ + +}]);

1 0