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

r1783 - oipf/emulator/js/filters
by ygrego＠users.nuiton.org July 8, 2015

July 8, 2015

Author: ygrego Date: 2015-07-08 16:07:41 +0200 (Wed, 08 Jul 2015) New Revision: 1783 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1783 Log: Delete unused filter and 2 new filters will take care of volume diplaying and date formatting. Added: oipf/emulator/js/filters/DateFilter.js oipf/emulator/js/filters/VolumeIconFilter.js Added: oipf/emulator/js/filters/DateFilter.js =================================================================== --- oipf/emulator/js/filters/DateFilter.js (rev 0) +++ oipf/emulator/js/filters/DateFilter.js 2015-07-08 14:07:41 UTC (rev 1783) @@ -0,0 +1,8 @@ +Filters.filter("dateFilter", ["$filter", function($filter) { + return function(input) { + if (input == 0) { + return "\uE037"; + } + return "\uE038"; + } +}]); Added: oipf/emulator/js/filters/VolumeIconFilter.js =================================================================== --- oipf/emulator/js/filters/VolumeIconFilter.js (rev 0) +++ oipf/emulator/js/filters/VolumeIconFilter.js 2015-07-08 14:07:41 UTC (rev 1783) @@ -0,0 +1,8 @@ +Filters.filter("checkVolume", function() { + return function(input) { + if (input == 0) { + return "\uE037"; + } + return "\uE038"; + } +});

1 0

r1782 - oipf/emulator/js/contollers
by ygrego＠users.nuiton.org July 8, 2015

July 8, 2015

Author: ygrego Date: 2015-07-08 16:02:46 +0200 (Wed, 08 Jul 2015) New Revision: 1782 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1782 Log: Display programme genre when emulator initialized. Modified: oipf/emulator/js/contollers/PanelChannelController.js Modified: oipf/emulator/js/contollers/PanelChannelController.js =================================================================== --- oipf/emulator/js/contollers/PanelChannelController.js 2015-07-08 14:01:27 UTC (rev 1781) +++ oipf/emulator/js/contollers/PanelChannelController.js 2015-07-08 14:02:46 UTC (rev 1782) @@ -8,7 +8,7 @@ $scope.programmeTitle; $scope.startTime; $scope.stopTime; - $scope.category; + $scope.genres; $scope.parentalControl; $scope.chanLogo = ""; @@ -15,10 +15,12 @@ $rootScope.$watch("channelInfo", function(newInfo) { console.group("PanelChannelController"); + console.log("PanelChannelController"); if (newInfo) { console.log("Panel channel info will be activated."); $scope.chanLogo = $scope.videoBroadcastService.getCurrentChannelLogoUrl(); $scope.programmeTitle = $scope.searchManagerService.getCurrentProgrammeName(); + $scope.genres = $scope.searchManagerService.getCurrentProgrammeGenre(); $scope.isRequired = true; } else if (!newInfo) {

1 0

r1781 - oipf/emulator/view
by ygrego＠users.nuiton.org July 8, 2015

July 8, 2015

Author: ygrego Date: 2015-07-08 16:01:27 +0200 (Wed, 08 Jul 2015) New Revision: 1781 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1781 Log: Display programme genre. Modified: oipf/emulator/view/index.html Modified: oipf/emulator/view/index.html =================================================================== --- oipf/emulator/view/index.html 2015-07-08 14:00:18 UTC (rev 1780) +++ oipf/emulator/view/index.html 2015-07-08 14:01:27 UTC (rev 1781) @@ -39,10 +39,10 @@ </div> <div class="col-md-6"> <div> - {{programmeTitle}} + <b>{{programmeTitle}}</b> </div> <div> - + <p ng-repeat="genre in genres">{{genre}} </p> </div> </div> </div>

1 0

r1780 - oipf/emulator/js/services
by ygrego＠users.nuiton.org July 8, 2015

July 8, 2015

Author: ygrego Date: 2015-07-08 16:00:18 +0200 (Wed, 08 Jul 2015) New Revision: 1780 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1780 Log: Additionnal features in order to manage programmes searching and state of video-broadcast service. Modified: oipf/emulator/js/services/SearchManagerService.js oipf/emulator/js/services/VideoBroadcastService.js Modified: oipf/emulator/js/services/SearchManagerService.js =================================================================== --- oipf/emulator/js/services/SearchManagerService.js 2015-07-08 11:25:55 UTC (rev 1779) +++ oipf/emulator/js/services/SearchManagerService.js 2015-07-08 14:00:18 UTC (rev 1780) @@ -16,6 +16,10 @@ return this.currentProgramme.name || "Programme"; }; + searchManagerService.getCurrentProgrammeGenre = function() { + return this.currentProgramme.genre || ["Unknow"]; + }; + searchManagerObject.onMetadataSearch = function(resolve, reject, search, state) { console.log("[INFO]: onMetadataSearch called"); Modified: oipf/emulator/js/services/VideoBroadcastService.js =================================================================== --- oipf/emulator/js/services/VideoBroadcastService.js 2015-07-08 11:25:55 UTC (rev 1779) +++ oipf/emulator/js/services/VideoBroadcastService.js 2015-07-08 14:00:18 UTC (rev 1780) @@ -1,4 +1,4 @@ -OIPFServices.factory("VideoBroadcastService", ["$q", function(promise) { +OIPFServices.factory("VideoBroadcastService", ["$q", function($q) { var videoBroadcastService = new Service(); var videoBroadcastObject = document.getElementById("videoBroadcast"); @@ -13,8 +13,6 @@ } - videoBroadcastService.promiseManager = promise; - videoBroadcastService.getCurrentChannel = function() { return this.videoBroadcastObject.currentChannel; }; @@ -24,13 +22,14 @@ }; videoBroadcastService.bindToCurrentChannel = function() { + var deferred = $q.defer(); + console.log("bindToCurrentChannel", deferred); - 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.onChangeState.bind(this, deferred.resolve.bind(deferred), deferred.reject.bind(deferred)); this.addTransition(videoBroadcastConstants.state.UNREALIZED, videoBroadcastConstants.state.CONNECTING); @@ -37,7 +36,7 @@ this.addTransition(videoBroadcastConstants.state.CONNECTING, videoBroadcastConstants.state.PRESENTING, - deferred.resolve); + deferred.resolve.bind(deferred)); this.videoBroadcastObject.bindToCurrentChannel(); @@ -46,7 +45,7 @@ videoBroadcastService.release = function() { - var deferred = this.promiseManager.defer(); + var deferred = $q.defer(); if (this.videoBroadcastObject.playState) { this.currentIndex = 0; @@ -68,7 +67,7 @@ videoBroadcastService.prevChannel = function() { - var deferred = this.promiseManager.defer(); + var deferred = $q.defer(); this.currentIndex = 0; this.previousState = this.videoBroadcastObject.playState; @@ -90,7 +89,7 @@ videoBroadcastService.nextChannel = function() { - var deferred = this.promiseManager.defer(); + var deferred = $q.defer(); this.currentIndex = 0; this.previousState = this.videoBroadcastObject.playState; @@ -114,10 +113,10 @@ if (buttonId == "V+") { var volume = this.videoBroadcastObject.getVolume(); - var result = this.videoBroadcastObject.setVolume(volume+1); + var result = this.videoBroadcastObject.setVolume(volume + 1); } else if (buttonId == "V-") { var volume = this.videoBroadcastObject.getVolume(); - result = this.videoBroadcastObject.setVolume(volume-1); + result = this.videoBroadcastObject.setVolume(volume - 1); } return result;

1 0

r1779 - oipf/lib
by ygrego＠users.nuiton.org July 8, 2015

July 8, 2015

Author: ygrego Date: 2015-07-08 13:25:55 +0200 (Wed, 08 Jul 2015) New Revision: 1779 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1779 Log: Take into account a new file for oipf bundle. Modified: oipf/lib/paths.json Modified: oipf/lib/paths.json =================================================================== --- oipf/lib/paths.json 2015-07-08 11:23:16 UTC (rev 1778) +++ oipf/lib/paths.json 2015-07-08 11:25:55 UTC (rev 1779) @@ -21,10 +21,12 @@ "js/utils/ProgrammeService.js", "js/utils/XmlToJson.js", "js/utils/ProgrammeHelper.js", + "js/utils/ComplexPromise.js", "configuration/ConfigDefaultProperties.js", "configuration/CapabilitiesProperties.js", "configuration/OipfConfiguration.js", "js/impl/model/Collection.js", + "js/impl/model/ComplexObject.js", "js/impl/model/SignalInfo.js", "js/impl/model/LNBInfo.js", "js/impl/model/NetworkInterface.js", @@ -49,6 +51,7 @@ "js/impl/model/Recording.js", "js/impl/model/Application.js", "js/impl/model/ApplicationCollection.js", + "js/impl/model/StringCollection.js", "js/impl/OipfObjectFactory.js", "js/impl/ConfigurationObject.js", "js/impl/ChannelConfig.js",

1 0

r1778 - oipf/lib/js/utils
by ygrego＠users.nuiton.org July 8, 2015

July 8, 2015

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 July 8, 2015

July 8, 2015

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 July 7, 2015

July 7, 2015

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 July 7, 2015

July 7, 2015

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 July 7, 2015

July 7, 2015

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 July 7, 2015

July 7, 2015

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 July 7, 2015

July 7, 2015

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 July 7, 2015

July 7, 2015

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 July 7, 2015

July 7, 2015

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 July 7, 2015

July 7, 2015

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

r1768 - oipf/emulator/js
by ygrego＠users.nuiton.org July 7, 2015

July 7, 2015

Author: ygrego Date: 2015-07-07 10:09:31 +0000 (Tue, 07 Jul 2015) New Revision: 1768 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1768 Log: Make accessible all new services. Modified: oipf/emulator/js/emulator.js Modified: oipf/emulator/js/emulator.js =================================================================== --- oipf/emulator/js/emulator.js 2015-07-07 10:02:31 UTC (rev 1767) +++ oipf/emulator/js/emulator.js 2015-07-07 10:09:31 UTC (rev 1768) @@ -1,6 +1,7 @@ /* * */ +var OIPFServices = angular.module("OIPFServices", []); var Controllers = angular.module("Controllers", []); var emulatorApplication = angular.module('emulatorApplication',

1 0

r1767 - oipf/emulator/view
by ygrego＠users.nuiton.org July 7, 2015

July 7, 2015

Author: ygrego Date: 2015-07-07 10:02:31 +0000 (Tue, 07 Jul 2015) New Revision: 1767 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1767 Log: Some features have been moved in differents files. Modified: oipf/emulator/view/index.html Modified: oipf/emulator/view/index.html =================================================================== --- oipf/emulator/view/index.html 2015-07-07 10:00:37 UTC (rev 1766) +++ oipf/emulator/view/index.html 2015-07-07 10:02:31 UTC (rev 1767) @@ -17,7 +17,10 @@ <script src="./emulator/js/emulator.js"></script> <script src="./emulator/js/filters/VolumeFilter.js"></script> <script src="./emulator/js/utils/Service.js"></script> - <script src="./emulator/js/services/OIPFServices.js"></script> + <script src="./emulator/js/services/ChannelConfigService.js"></script> + <script src="./emulator/js/services/ConfigurationService.js"></script> + <script src="./emulator/js/services/SearchManagerService.js"></script> + <script src="./emulator/js/services/VideoBroadcastService.js"></script> <script src="./emulator/js/contollers/RemoteControlController.js"></script> <script src="./emulator/js/contollers/VideoBroadcastController.js"></script> <script src="./emulator/js/contollers/PowerStateController.js"></script>

1 0

r1766 - oipf/emulator/js/services
by ygrego＠users.nuiton.org July 7, 2015

July 7, 2015

Author: ygrego Date: 2015-07-07 10:00:37 +0000 (Tue, 07 Jul 2015) New Revision: 1766 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1766 Log: Not used. Removed: oipf/emulator/js/services/OIPFServices.js Deleted: oipf/emulator/js/services/OIPFServices.js =================================================================== --- oipf/emulator/js/services/OIPFServices.js 2015-07-07 09:41:42 UTC (rev 1765) +++ oipf/emulator/js/services/OIPFServices.js 2015-07-07 10:00:37 UTC (rev 1766) @@ -1,60 +0,0 @@ -var OIPFServices = angular.module("OIPFServices", []); - -OIPFServices.factory("ChannelConfigService", function() { - return oipfObjectFactory.createChannelConfig(); -}); - -OIPFServices.factory("SearchManagerService", function() { - return oipfObjectFactory.createSearchManagerObject(); -}); - -OIPFServices.factory("ConfigurationService", function() { - return oipfObjectFactory.createConfigurationObject.bind(oipfObjectFactory); -}); - -OIPFServices.factory("RecordingSchedulerService", function() { - return oipfObjectFactory.createRecordingSchedulerObject(); -}); - -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.bindToCurrentChannel = function() { - - var deffered = this.promise.defer(); - - this.videoBroadcastObject.onPlayStateChange = - this.onChangeState.bind(this, deffered.resolve, deffered.reject); - - this.addTransition(videoBroadcastConstants.state.UNREALIZED, - videoBroadcastConstants.state.CONNECTING); - - this.addTransition(videoBroadcastConstants.sate.CONNECTING, - videoBroadcastConstants.state.PRESENTING, - deffered.resolve); - - this.videoBroadcastObject.bindToCurrentChannel(); - - return deffered; - }; - - return videoBroadcastService; -}]); - - -

1 0

r1765 - oipf/emulator/css
by ygrego＠users.nuiton.org July 7, 2015

July 7, 2015

Author: ygrego Date: 2015-07-07 09:41:42 +0000 (Tue, 07 Jul 2015) New Revision: 1765 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1765 Log: Some elements weren't well-positioned. Modified: oipf/emulator/css/main.css Modified: oipf/emulator/css/main.css =================================================================== --- oipf/emulator/css/main.css 2015-07-07 09:31:42 UTC (rev 1764) +++ oipf/emulator/css/main.css 2015-07-07 09:41:42 UTC (rev 1765) @@ -23,9 +23,8 @@ h1 { font-size: 100px; - color: #555; - -webkit-text-fill-color: white; - -webkit-text-stroke: 3px #555; + color: dodgerblue; + font-family: cursive; } #volumeView { @@ -68,6 +67,12 @@ background-color: slategrey; } +object { + width: 100%; + height: 100%; + background-color: slategrey; +} + .off { position: absolute; width: 100%; @@ -75,3 +80,11 @@ background-color: black; z-index: 1; } + +#marg { + margin-left: -3px +} + +.panel2 { + width: 140px +}

1 0

r1764 - oipf/emulator/js/contollers
by ygrego＠users.nuiton.org July 7, 2015

July 7, 2015

Author: ygrego Date: 2015-07-07 09:31:42 +0000 (Tue, 07 Jul 2015) New Revision: 1764 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1764 Log: Become unnecessary. Removed: oipf/emulator/js/contollers/RemoteControlControllers.js Deleted: oipf/emulator/js/contollers/RemoteControlControllers.js =================================================================== --- oipf/emulator/js/contollers/RemoteControlControllers.js 2015-07-07 09:28:04 UTC (rev 1763) +++ oipf/emulator/js/contollers/RemoteControlControllers.js 2015-07-07 09:31:42 UTC (rev 1764) @@ -1,181 +0,0 @@ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. - */ -var RemoteControlControllers = angular.module('RemoteControlControllers', []); - -RemoteControlControllers.controller('RemoteControlController', - ['$rootScope', '$scope', '$http', '$timeout', function ($rootScope, $scope, $http, $timeout) { - - $http.get('./emulator/remoteControl/remoteControl.json').success(function(data) { - $scope.remoteControl = data; - }); - - $scope.remoteControlClick = function(buttonId) { - var methodName = $scope.clickMapping[buttonId]; - console.log("methodName:", methodName, $scope[methodName]); - methodName && $scope[methodName].call($scope, buttonId); - }; - - $scope.channel = ""; - $scope.channelNumber = ""; - $scope.channelNumberActive = false; - $scope.volumeViewActive = false; - $rootScope.powerChange = false; - - $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" - }; - -}]); - - -RemoteControlControllers.controller("PowerStateController", - ["$rootScope", "$scope", "$timeout", "ConfigurationService", function($rootScope, $scope, $timeout, ConfigurationService) { - - $scope.onStarting = true; - $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.state = "show"; - $rootScope.systemReady = false; - } else { - console.log("POWER STATE CHANGE: ON."); - $scope.state = "hidden"; - $rootScope.systemReady = true; - } - - } 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.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", "$timeout", "VideoBroadcastService", function($rootScope, $scope, $timeout, VideoBroadcastService) { - - $scope.videoBroadcastService = VideoBroadcastService; - - $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

r1763 - oipf/emulator/js/contollers
by ygrego＠users.nuiton.org July 7, 2015

July 7, 2015

Author: ygrego Date: 2015-07-07 09:28:04 +0000 (Tue, 07 Jul 2015) New Revision: 1763 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1763 Log: The name was not appropriated. Added: oipf/emulator/js/contollers/RemoteControlController.js Added: oipf/emulator/js/contollers/RemoteControlController.js =================================================================== --- oipf/emulator/js/contollers/RemoteControlController.js (rev 0) +++ oipf/emulator/js/contollers/RemoteControlController.js 2015-07-07 09:28:04 UTC (rev 1763) @@ -0,0 +1,57 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +Controllers.controller("RemoteControlController", + ["$rootScope", "$scope", "$http", "VideoBroadcastService", function($rootScope, $scope, $http, VideoBroadcastService) { + + $http.get("./emulator/remoteControl/remoteControl.json").success(function(data) { + $scope.remoteControl = data; + }); + + $scope.remoteControlClick = function(buttonId) { + var methodName = $scope.clickMapping[buttonId]; + console.log("methodName:", methodName, $scope[methodName]); + methodName && $scope[methodName].call($scope, buttonId); + }; + + $scope.videoBroadcastService = VideoBroadcastService; + + $scope.channel = ""; + $scope.channelNumber = ""; + $scope.channelNumberActive = false; + $rootScope.channelChange = false; + + $scope.setPowerChange = function() { + $scope.$broadcast("PowerStateChangeEvent"); + }; + + $scope.setChannel = function(changeType) { + $scope.$broadcast("ChannelChangeEvent", changeType); + }; + + $scope.setVolume = function(changeType) { +// $rootScope.volumeChange = id; + $scope.$broadcast("VolumeEvent", changeType); + }; + + $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", + "P+": "setChannel", + "P-": "setChannel" + }; + +}]);

1 0

r1762 - oipf/emulator/js/filters
by ygrego＠users.nuiton.org July 7, 2015

July 7, 2015

Author: ygrego Date: 2015-07-07 09:21:45 +0000 (Tue, 07 Jul 2015) New Revision: 1762 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1762 Log: Manage the stopping of volume. Modified: oipf/emulator/js/filters/VolumeFilter.js Modified: oipf/emulator/js/filters/VolumeFilter.js =================================================================== --- oipf/emulator/js/filters/VolumeFilter.js 2015-07-07 09:16:19 UTC (rev 1761) +++ oipf/emulator/js/filters/VolumeFilter.js 2015-07-07 09:21:45 UTC (rev 1762) @@ -1,14 +1,14 @@ -/* +/* * To change this license header, choose License Headers in Project Properties. * To change this template file, choose Tools | Templates * and open the template in the editor. */ -angular.module('VolumeFilter', []).filter('checkVolume', function() { +angular.module("VolumeFilter", []).filter("checkVolume", function() { return function(input) { if (input == 0) { - return '&#xe037'; + return "\uE037"; } - return '&#xe038'; + return "\uE038"; } });

1 0

r1761 - oipf/emulator/js
by ygrego＠users.nuiton.org July 7, 2015

July 7, 2015

Author: ygrego Date: 2015-07-07 09:16:19 +0000 (Tue, 07 Jul 2015) New Revision: 1761 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1761 Log: A better organization of controllers. Modified: oipf/emulator/js/emulator.js Modified: oipf/emulator/js/emulator.js =================================================================== --- oipf/emulator/js/emulator.js 2015-07-07 08:15:38 UTC (rev 1760) +++ oipf/emulator/js/emulator.js 2015-07-07 09:16:19 UTC (rev 1761) @@ -1,10 +1,12 @@ /* * */ +var Controllers = angular.module("Controllers", []); + var emulatorApplication = angular.module('emulatorApplication', [ "OIPFServices", - 'RemoteControlControllers', + 'Controllers', 'VolumeFilter' ]);

1 0

r1760 - oipf/emulator/js/utils
by ygrego＠users.nuiton.org July 7, 2015

July 7, 2015

Author: ygrego Date: 2015-07-07 08:15:38 +0000 (Tue, 07 Jul 2015) New Revision: 1760 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1760 Log: Know the running state of method. Modified: oipf/emulator/js/utils/Service.js Modified: oipf/emulator/js/utils/Service.js =================================================================== --- oipf/emulator/js/utils/Service.js 2015-07-06 14:46:39 UTC (rev 1759) +++ oipf/emulator/js/utils/Service.js 2015-07-07 08:15:38 UTC (rev 1760) @@ -12,6 +12,7 @@ var error = currentTransition.error; if (begin == this.previousState && end == newState && error == errorCode) { + console.log("Transition succeeded."); currentTransition.callback && currentTransition.callback(); this.previousState = newState; this.currentIndex++;

1 0

r1759 - oipf/emulator/view
by ＠users.nuiton.org July 6, 2015

July 6, 2015

Author: Date: 2015-07-06 14:46:39 +0000 (Mon, 06 Jul 2015) New Revision: 1759 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1759 Log: Permit utilization of event dispatching for notify the remote control actions to controllers. Manage easier the display of channel information. Modified: oipf/emulator/view/index.html Modified: oipf/emulator/view/index.html =================================================================== --- oipf/emulator/view/index.html 2015-06-22 11:36:30 UTC (rev 1758) +++ oipf/emulator/view/index.html 2015-07-06 14:46:39 UTC (rev 1759) @@ -14,54 +14,58 @@ <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/utils/Service.js"></script> <script src="./emulator/js/services/OIPFServices.js"></script> - <script src="./emulator/js/contollers/RemoteControlControllers.js"></script> - <script src="./emulator/js/emulator.js"></script> + <script src="./emulator/js/contollers/RemoteControlController.js"></script> + <script src="./emulator/js/contollers/VideoBroadcastController.js"></script> + <script src="./emulator/js/contollers/PowerStateController.js"></script> + <script src="./emulator/js/contollers/PanelChannelController.js"></script> </head> <body> - <div class="container-fluid"> + <div class="container-fluid" ng-controller="RemoteControlController"> <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"/> + <img ng-src="{{chanLogo}}"/> </div> <div class="col-md-6"> <div> - efzefzefzefezfze + Toto TV </div> <div> - four-column layout + SÉRIE </div> </div> </div> - <div id="volumeView" class="text-center" ng-show="volumeViewActive"> - <div> - <h3> - <span class="label label-default"> - {{currentVolume}} - <span class="glyphicon glyphicon-volume-up"></span> - </span> - </h3> - <div class="progress"> - <div class="progress-bar" role="progressbar" aria-valuenow="0" - aria-valuemin="0" aria-valuemax="100" style="width:{{currentVolume}}%"> - </div> - </div> - </div> - </div> <div class="off" id="powerStateView" ng-controller="PowerStateController" ng-class="state"> <div id="imgChannel" ng-show="beforeON"> - <h1>Emulator</h1> + <h1>EMULATOR</h1> </div> </div> - <object class="ready" id="videoBroadcast" is="video-broadcast" ng-controller="VideoBroadcastController"> + <object id="videoBroadcast" is="video-broadcast" ng-controller="VideoBroadcastController"> + <img class="pull-right" ng-src="{{chanLogo}}"/> + <div id="volumeView" class="text-center" ng-show="volumeViewActive"> + <div> + <h3> + <span class="label label-default"> + {{currentVolume}} + <span class="glyphicon {{volumeClass}}"></span> + </span> + </h3> + <div class="progress"> + <div class="progress-bar" role="progressbar" aria-valuenow="0" + aria-valuemin="0" aria-valuemax="100" style="width:{{currentVolume}}%"> + </div> + </div> + </div> + </div> </object>  @@ -74,13 +78,13 @@ </div> - <div class="col-sm-2 col-sm-offset-1" ng-controller="RemoteControlController"> + <div class="col-md-2 col-sm-offset-1"> - <div class="panel panel-default"> + <div class="panel panel-default panel2"> <div class="panel-body"> <div class="row"> <div class="col-md-2 col-md-offset-2"> - <button type="button" class="btn btn-default btn-sm" ng-click="remoteControlClick('POWER')"> + <button id="marg" type="button" class="btn btn-default btn-sm" ng-click="remoteControlClick('POWER')"> <span class="glyphicon glyphicon-off"></span> </button> </div>

1 0