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

r1744 - oipf/lib/js/impl
by ygrego＠users.nuiton.org 18 Jun '15

18 Jun '15

Author: ygrego Date: 2015-06-18 08:07:22 +0000 (Thu, 18 Jun 2015) New Revision: 1744 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1744 Log: Now channel can have a logo if this information is available. Modified: oipf/lib/js/impl/OipfObjectFactory.js Modified: oipf/lib/js/impl/OipfObjectFactory.js =================================================================== --- oipf/lib/js/impl/OipfObjectFactory.js 2015-06-18 08:05:07 UTC (rev 1743) +++ oipf/lib/js/impl/OipfObjectFactory.js 2015-06-18 08:07:22 UTC (rev 1744) @@ -639,14 +639,18 @@ this._oipfConfiguration.channelOrigin, channelListJson.channelList.channel ); + this.channelConfig = new ChannelConfig(this._channelService); } _setSearchManagerObject(programmesJson) { - var oipfProgrammes = new ProgrammeHelper(this._channelService) + var somesChannelInfo = programmesJson.tv.channel; + + var oipfProgrammes = new ProgrammeHelper(this._channelService, somesChannelInfo) .initProgrammes(programmesJson.tv.programme); + var programmeService = new ProgrammeService(oipfProgrammes); - this.searchManagerObject = - new SearchManagerObject(programmeService); + + this.searchManagerObject = new SearchManagerObject(programmeService); } }

1 0

r1743 - oipf/lib/data
by ygrego＠users.nuiton.org 18 Jun '15

18 Jun '15

Author: ygrego Date: 2015-06-18 08:05:07 +0000 (Thu, 18 Jun 2015) New Revision: 1743 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1743 Log: Make some channels names identicals to additional channels information available in xml-tv's data. Modified: oipf/lib/data/oipfChannels.xml Modified: oipf/lib/data/oipfChannels.xml =================================================================== --- oipf/lib/data/oipfChannels.xml 2015-06-18 08:00:53 UTC (rev 1742) +++ oipf/lib/data/oipfChannels.xml 2015-06-18 08:05:07 UTC (rev 1743) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <channelList> <channel> - <name>ARTE</name> + <name>Arte</name> <channelType>TYPE_TV</channelType> <idType>12</idType> <ccid></ccid> @@ -67,7 +67,7 @@ <logoURL></logoURL> </channel> <channel> - <name>FRANCE_2</name> + <name>FRANCE 2</name> <channelType>TYPE_TV</channelType> <idType>12</idType> <ccid></ccid> @@ -100,7 +100,7 @@ <logoURL></logoURL> </channel> <channel> - <name>FRANCE_3</name> + <name>FRANCE 3</name> <channelType>TYPE_TV</channelType> <idType>12</idType> <ccid></ccid> @@ -133,7 +133,7 @@ <logoURL></logoURL> </channel> <channel> - <name>FRANCE_4</name> + <name>FRANCE 4</name> <channelType>TYPE_TV</channelType> <idType>12</idType> <ccid></ccid> @@ -166,7 +166,7 @@ <logoURL></logoURL> </channel> <channel> - <name>FRANCE_5</name> + <name>FRANCE 5</name> <channelType>TYPE_TV</channelType> <idType>12</idType> <ccid></ccid> @@ -232,7 +232,7 @@ <logoURL></logoURL> </channel> <channel> - <name>NRJ_12</name> + <name>NRJ 12</name> <channelType>TYPE_TV</channelType> <idType>12</idType> <ccid></ccid> @@ -429,4 +429,4 @@ <isHD>false</isHD> <logoURL></logoURL> </channel> -</channelList> \ No newline at end of file +</channelList>

1 0

r1742 - oipf/lib/js/utils
by ygrego＠users.nuiton.org 18 Jun '15

18 Jun '15

Author: ygrego Date: 2015-06-18 08:00:53 +0000 (Thu, 18 Jun 2015) New Revision: 1742 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1742 Log: Permit to retrive a channel simply with its name and create a channel from a configuration(with a JSON object). Modified: oipf/lib/js/utils/ChannelService.js Modified: oipf/lib/js/utils/ChannelService.js =================================================================== --- oipf/lib/js/utils/ChannelService.js 2015-06-18 07:51:44 UTC (rev 1741) +++ oipf/lib/js/utils/ChannelService.js 2015-06-18 08:00:53 UTC (rev 1742) @@ -52,6 +52,14 @@ } } + getChannelSimplyByName(channelName) { + for (var i = 0, li = this.channelList.length; i < li; i++) { + if (this.channelList[i].name == channelName) { + return this.channelList[i]; + } + } + } + prevChannel(channelCollection, channel) { return channelUtils.findChannel(channelCollection, channel, -1); }

1 0

r1741 - oipf/lib/js/utils
by ygrego＠users.nuiton.org 18 Jun '15

18 Jun '15

Author: ygrego Date: 2015-06-18 07:51:44 +0000 (Thu, 18 Jun 2015) New Revision: 1741 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1741 Log: Use of icon for channel this will be more friendly in emulator. Manage additionals channels information. No more necessary to modify the channel mapping between channel real name and channel identifier. Modified: oipf/lib/js/utils/ProgrammeHelper.js Modified: oipf/lib/js/utils/ProgrammeHelper.js =================================================================== --- oipf/lib/js/utils/ProgrammeHelper.js 2015-06-17 16:04:19 UTC (rev 1740) +++ oipf/lib/js/utils/ProgrammeHelper.js 2015-06-18 07:51:44 UTC (rev 1741) @@ -5,37 +5,33 @@ */ class ProgrammeHelper { - constructor(channelService) { + constructor(channelService, channels) { this.map = { "title": "name", "start": "startTime", + "stop": "duration", "desc": "description", - "length#text": "duration", "episode-num#text": "episode", "title#text": "name" }; - 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" - }; + this.channelsLogoAndRealName = {}; + this.setChannelsLogoAndRealName(channels) - this.programmes = null; this.channelService = channelService; this.programmes = []; } + setChannelsLogoAndRealName(channelsArray) { + var self = this; + if (channelsArray) { + channelsArray.forEach(function(item) { + if (item.id) { + self.channelsLogoAndRealName[item.id] = item; + } + }); + } + } /* * Description: * Don't take in charge the "credits" property of a xmlTv programmes for the moment. @@ -57,14 +53,14 @@ if (key == "start") { element = self.transformInSecondSince01011970(element); } + if (key == "stop") { + element = self.transformInSecondSince01011970(element); + } if (key == "channel") { - channelName = self.channelNameMap[element]; + channelName = element; } if (key == "#text") { key = parentKey + key; - if (key == "length#text") { - element = self.minutesToSeconds(element); - } } var mapping = self.map[key]; if (mapping) { @@ -75,7 +71,22 @@ }; createProgramme(object, programme); - programme.channel = this.initChannel(channelName); + var realChannelName = this.channelsLogoAndRealName[channelName]["display-name"]; + var channelLogoUrl = this.channelsLogoAndRealName[channelName].icon.src; + + if (realChannelName) { + var channel = this.channelService.getChannelSimplyByName(realChannelName); + if (!channel) { + channel = this.initChannel(realChannelName); + } + channel.logoUrl = channelLogoUrl; + programme.channel = channel; + } + + if (programme.startTime && programme.duration) { + programme.duration = programme.duration - programme.startTime; + } + programme.programmeID = OipfUtils.createUUID(); var programmeObject = new Programme(programme); this.programmes.push(programmeObject); @@ -95,7 +106,7 @@ tmpDate = pattern.exec(tmpDate); var year = parseInt(tmpDate[1]); - var month = parseInt(tmpDate[2]); + var month = parseInt(tmpDate[2]) - 1; var day = parseInt(tmpDate[3]); var hs = parseInt(tmpDate[4]); var mins = parseInt(tmpDate[5]);

1 0

r1740 - oipf/lib/js/utils
by ygrego＠users.nuiton.org 17 Jun '15

17 Jun '15

Author: ygrego Date: 2015-06-17 16:04:19 +0000 (Wed, 17 Jun 2015) New Revision: 1740 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1740 Log: Sometimes we can require a channel created from a configuration(JSON object). Modified: oipf/lib/js/utils/ChannelService.js Modified: oipf/lib/js/utils/ChannelService.js =================================================================== --- oipf/lib/js/utils/ChannelService.js 2015-06-17 15:43:39 UTC (rev 1739) +++ oipf/lib/js/utils/ChannelService.js 2015-06-17 16:04:19 UTC (rev 1740) @@ -68,4 +68,15 @@ name); } + getADvbTChannelWithConf(conf) { + if (conf) { + conf.idType = ID_DVB_T; + conf.onid = this.getNumber(); + conf.tsid = this.getNumber(); + conf.sid = this.getNumber(); + + return new Channel(conf); + } + } + }

1 0

r1739 - oipf/lib/js/utils
by ygrego＠users.nuiton.org 17 Jun '15

17 Jun '15

Author: ygrego Date: 2015-06-17 15:43:39 +0000 (Wed, 17 Jun 2015) New Revision: 1739 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1739 Log: Take into account somes differences present in new xml-tv file. Modified: oipf/lib/js/utils/ProgrammeHelper.js Modified: oipf/lib/js/utils/ProgrammeHelper.js =================================================================== --- oipf/lib/js/utils/ProgrammeHelper.js 2015-06-17 15:26:50 UTC (rev 1738) +++ oipf/lib/js/utils/ProgrammeHelper.js 2015-06-17 15:43:39 UTC (rev 1739) @@ -11,7 +11,8 @@ "start": "startTime", "desc": "description", "length#text": "duration", - "episode-num#text": "episode" + "episode-num#text": "episode", + "title#text": "name" }; this.channelNameMap = {

1 0

r1738 - oipf/lib/js/impl/model
by ygrego＠users.nuiton.org 17 Jun '15

17 Jun '15

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 17 Jun '15

17 Jun '15

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 17 Jun '15

17 Jun '15

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 17 Jun '15

17 Jun '15

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