From fac73232fe18208d4242b8cefa003ccd7da0c44d Mon Sep 17 00:00:00 2001 From: "ziv.chang" Date: Mon, 13 Jan 2014 18:30:59 +0800 Subject: [PATCH] Update samples with meta viewport; version up Update samples with meta viewport bug fixing Change-Id: Idcc258e94c77dae4f223d7a8d73b3453ab31409e Signed-off-by: ziv.chang --- package/changelog | 4 + package/pkginfo.manifest | 2 +- .../Tizen/Web App/GhostCluster/project/index.html | 3 +- .../Tizen/Web App/MediaPlayer/project/css/main.css | 5 + .../Tizen/Web App/MediaPlayer/project/index.html | 3 +- .../Web App/MediaPlayer/project/js/audioPlayer.js | 142 +++++++++++++++++---- .../Tizen/Web App/MediaPlayer/project/js/main.js | 42 ++++-- .../Tizen/Web App/MediaPlayer/project/js/player.js | 70 +++++----- .../Web App/MediaPlayer/project/js/videoPlayer.js | 10 ++ .../project/packaging/MediaPlayer.changes | 9 ++ .../MediaPlayer/project/packaging/MediaPlayer.spec | 2 + .../Tizen/Web App/SettingsApp/project/index.html | 2 +- .../Tizen_Web_UI_FW_SinglePage/description.xml | 4 +- .../Tizen_Web_UI_FW_SinglePage/project/config.xml | 0 .../Tizen_Web_UI_FW_SinglePage/project/icon.png | Bin .../Tizen_Web_UI_FW_SinglePage/project/index.html | 4 +- .../Tizen_Web_UI_FW_SinglePage/single_page_32.png | Bin .../Tizen_Web_UI_FW_SinglePage/single_page_64.png | Bin .../Tizen_Web_UI_FW_SinglePage/snapshot_black.png | Bin .../Tizen_Web_UI_FW_SinglePage/snapshot_white.png | Bin .../tizen-app-template.xml | 0 21 files changed, 219 insertions(+), 83 deletions(-) rename samples/web/Template/Tizen/{Tizen Web UI Componment => Tizen Web UI Component}/Tizen_Web_UI_FW_SinglePage/description.xml (63%) rename samples/web/Template/Tizen/{Tizen Web UI Componment => Tizen Web UI Component}/Tizen_Web_UI_FW_SinglePage/project/config.xml (100%) rename samples/web/Template/Tizen/{Tizen Web UI Componment => Tizen Web UI Component}/Tizen_Web_UI_FW_SinglePage/project/icon.png (100%) rename samples/web/Template/Tizen/{Tizen Web UI Componment => Tizen Web UI Component}/Tizen_Web_UI_FW_SinglePage/project/index.html (94%) rename samples/web/Template/Tizen/{Tizen Web UI Componment => Tizen Web UI Component}/Tizen_Web_UI_FW_SinglePage/single_page_32.png (100%) rename samples/web/Template/Tizen/{Tizen Web UI Componment => Tizen Web UI Component}/Tizen_Web_UI_FW_SinglePage/single_page_64.png (100%) rename samples/web/Template/Tizen/{Tizen Web UI Componment => Tizen Web UI Component}/Tizen_Web_UI_FW_SinglePage/snapshot_black.png (100%) rename samples/web/Template/Tizen/{Tizen Web UI Componment => Tizen Web UI Component}/Tizen_Web_UI_FW_SinglePage/snapshot_white.png (100%) rename samples/web/Template/Tizen/{Tizen Web UI Componment => Tizen Web UI Component}/Tizen_Web_UI_FW_SinglePage/tizen-app-template.xml (100%) diff --git a/package/changelog b/package/changelog index 68ea787..95a63ba 100644 --- a/package/changelog +++ b/package/changelog @@ -1,3 +1,7 @@ +* 3.0.6 +- Update samples with meta viewport +== ziv.chang 2014-01-13 + * 3.0.5 - Add Web UI Componment - cowhide template == ziv.chang 2013-12-05 diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest index 5c31c6d..74dffd3 100644 --- a/package/pkginfo.manifest +++ b/package/pkginfo.manifest @@ -1,4 +1,4 @@ -Version:3.0.5 +Version:3.0.6 Maintainer: Ziv Chang Package:ivi-3.0-web-sample diff --git a/samples/web/Sample/Tizen/Web App/GhostCluster/project/index.html b/samples/web/Sample/Tizen/Web App/GhostCluster/project/index.html index 859fd9f..d58bbc0 100644 --- a/samples/web/Sample/Tizen/Web App/GhostCluster/project/index.html +++ b/samples/web/Sample/Tizen/Web App/GhostCluster/project/index.html @@ -1,6 +1,7 @@ - + + diff --git a/samples/web/Sample/Tizen/Web App/MediaPlayer/project/css/main.css b/samples/web/Sample/Tizen/Web App/MediaPlayer/project/css/main.css index e161441..340be7c 100644 --- a/samples/web/Sample/Tizen/Web App/MediaPlayer/project/css/main.css +++ b/samples/web/Sample/Tizen/Web App/MediaPlayer/project/css/main.css @@ -126,6 +126,11 @@ html display:none; } +#trackTime +{ + display:none; +} + #audioPlayer { position:absolute; diff --git a/samples/web/Sample/Tizen/Web App/MediaPlayer/project/index.html b/samples/web/Sample/Tizen/Web App/MediaPlayer/project/index.html index 709da72..1943409 100644 --- a/samples/web/Sample/Tizen/Web App/MediaPlayer/project/index.html +++ b/samples/web/Sample/Tizen/Web App/MediaPlayer/project/index.html @@ -10,6 +10,7 @@ Media Player + @@ -73,6 +74,6 @@ - + diff --git a/samples/web/Sample/Tizen/Web App/MediaPlayer/project/js/audioPlayer.js b/samples/web/Sample/Tizen/Web App/MediaPlayer/project/js/audioPlayer.js index 3081f78..5a5dafd 100644 --- a/samples/web/Sample/Tizen/Web App/MediaPlayer/project/js/audioPlayer.js +++ b/samples/web/Sample/Tizen/Web App/MediaPlayer/project/js/audioPlayer.js @@ -7,12 +7,19 @@ * */ +var mainArtistText; +var songDurationSec; + AudioPlayer = function() { this.clearAudioTimeInterval = undefined; this.currentAudioContent = undefined; } +/* + * Play function for when play button is clicked + */ + AudioPlayer.prototype.play = function() { console.log("MediaPlayer in AudioPlayer::play"); @@ -30,6 +37,7 @@ AudioPlayer.prototype.play = function() var timeoutFunction = function() { localStorage.prevAudioTime = this.playerControls.currentTime; + this.updateTrackTime(); } this.clearAudioTimeInterval = setInterval(timeoutFunction.bind(this),500); @@ -40,6 +48,10 @@ AudioPlayer.prototype.play = function() console.log(this.content[this.listIndex].artists[0] + " : " + this.content[this.listIndex].title + " can't play yet, it hasn't loaded"); } +/* + * Pause function for when pause button is clicked + */ + AudioPlayer.prototype.pause = function() { if (!this.playerControls.paused) @@ -49,10 +61,9 @@ AudioPlayer.prototype.pause = function() } } -AudioPlayer.prototype.playing = function() -{ - return !(this.playerControls.paused); -} +/* + * Next function for when next button is clicked + */ AudioPlayer.prototype.next = function() { @@ -67,6 +78,10 @@ AudioPlayer.prototype.next = function() } } +/* + * Previous function for when previous button is clicked + */ + AudioPlayer.prototype.previous = function() { if (this.content) @@ -80,6 +95,19 @@ AudioPlayer.prototype.previous = function() } } +/* + * Returns play state + */ + +AudioPlayer.prototype.playing = function() +{ + return !(this.playerControls.paused); +} + +/* + * Load the file located at the index. If play is true, play immediately once file is loaded + */ + AudioPlayer.prototype.load = function(index, play) { this.listIndex = index; @@ -90,17 +118,18 @@ AudioPlayer.prototype.load = function(index, play) this.playerControls.load(); } +/* + * Redraws the media bar with the new artist, title, and cover album + */ + AudioPlayer.prototype.updateMediaName = function(newArtist, newTitle, newCover) { - var playBarHeight = mediaNameCanvas.height; - var boxWidth = playBarHeight * 0.75; + playBarHeight = mediaNameCanvas.height; + boxWidth = playBarHeight * 0.75; + textStartX = boxWidth + 50; + songDurationSec = this.playerControls.duration; mediaNameCTX.clearRect(0,0,mediaNameCanvas.width, mediaNameCanvas.height); - var shadeJump = 10; - var alphaJump = 0.01; - var currColor = 255; - var currAlpha = 1.0; - mediaNameCTX.fillStyle="rgba(30,30,30,0.5)"; mediaNameCTX.strokeStyle="rgba(130,130,130,1)"; mediaNameCTX.lineWidth = 5; @@ -116,35 +145,74 @@ AudioPlayer.prototype.updateMediaName = function(newArtist, newTitle, newCover) if (screenOrientation === "portrait") { - var textStartX = boxWidth + 50; - var trackText = new TextObject(mediaNameCTX,{"text" : newTitle, "xLoc" : textStartX, "yLoc" : 70 , "zLoc" : 0, "width" : mediaNameCanvas.width - textStartX, "height" : 50, "lineHeight" : 65, "wordWrap" : true}); trackText.applyTemplate(mainMenuTitleTemplate); - var artistText = new TextObject(mediaNameCTX,{"text" : newArtist, "xLoc" : textStartX, "yLoc" : 70, "zLoc" : 0, + mainArtistText = new TextObject(mediaNameCTX,{"text" : newArtist, "xLoc" : textStartX, "yLoc" : 70, "zLoc" : 0, "width" : mediaNameCanvas.width - textStartX, "height" : 50, "lineHeight" : 50, "wordWrap" : true}); - artistText.applyTemplate(mainTrackTemplate); + mainArtistText.applyTemplate(mainTrackTemplate); } else { - var textStartX = boxWidth + 50; var trackText = new TextObject(mediaNameCTX,{"text" : newTitle, "xLoc" : textStartX, "yLoc" : 50 , "zLoc" : 0, "width" : mediaNameCanvas.width - textStartX, "height" : 30, "lineHeight" : 30, "wordWrap" : true}); trackText.applyTemplate(mainMenuTitleTemplateLandscape); - var artistText = new TextObject(mediaNameCTX,{"text" : newArtist, "xLoc" : textStartX, "yLoc" : 50, "zLoc" : 0, + mainArtistText = new TextObject(mediaNameCTX,{"text" : newArtist, "xLoc" : textStartX, "yLoc" : 50, "zLoc" : 0, "width" : mediaNameCanvas.width - textStartX, "height" : 30, "lineHeight" : 30, "wordWrap" : true}); - artistText.applyTemplate(mainTrackTemplateLandscape); + mainArtistText.applyTemplate(mainTrackTemplateLandscape); } trackText.drawObj(); trackText.drawLargeShadow(); - artistText.yLoc += trackText.height; - artistText.drawObj(); + mainArtistText.yLoc += trackText.height; + mainArtistText.drawObj(); + + this.updateTrackTime(); } +/* + * Redraws the current track time + */ + +AudioPlayer.prototype.updateTrackTime = function() +{ + playBarHeight = mediaNameCanvas.height; + boxWidth = playBarHeight * 0.75; + textStartX = boxWidth + 50; + var timeText = ''; + var songDurationSec = Math.floor(this.playerControls.duration % 60) > 9 ? Math.floor(this.playerControls.duration % 60) : '0' + Math.floor(this.playerControls.duration % 60); + var songDurationMin = Math.floor(this.playerControls.duration / 60) > 9 ? Math.floor(this.playerControls.duration / 60) : '0' + Math.floor(this.playerControls.duration / 60); + var songCurrentMin = Math.floor(this.playerControls.currentTime / 60) > 9 ? Math.floor(this.playerControls.currentTime / 60) : '0' + Math.floor(this.playerControls.currentTime / 60); + var songCurrentSec = Math.floor(this.playerControls.currentTime % 60) > 9 ? Math.floor(this.playerControls.currentTime % 60) : '0' + Math.floor(this.playerControls.currentTime % 60); + + if ((songCurrentMin !== undefined && songCurrentSec !== undefined) && (!isNaN(songCurrentMin) && !isNaN(songCurrentSec))) + timeText += songCurrentMin + ':' + songCurrentSec + ' / '; + else + timeText += "00:00 / "; + + if ((songDurationSec !== undefined && songDurationMin !== undefined) && (!isNaN(songDurationMin) && !isNaN(songDurationSec))) + timeText += songDurationMin + ':' + songDurationSec; + else + timeText += "00:00"; + + + var trackTimeText = new TextObject(trackTimeCTX,{"text" : timeText, "xLoc" : textStartX, "yLoc" : 50, "zLoc" : 0, + "width" : mediaNameCanvas.width - textStartX, "height" : 20, "lineHeight" : 20, "wordWrap" : false}); + + trackTimeText.applyTemplate(timeTemplate); + trackTimeCTX.clearRect(0, 0, trackTimeCanvas.width, trackTimeCanvas.height); + + trackTimeText.yLoc = ((playBarHeight - boxWidth) / 2) + boxWidth; + trackTimeText.drawObj(); +} + +/* + * Plays the currently loaded media file + */ + AudioPlayer.prototype.playLoadedMedia = function() { console.log("MediaPlayer in playLoadedMedia"); @@ -180,6 +248,9 @@ AudioPlayer.prototype.playLoadedMedia = function() this.currentFileLoaded = true; } +/* + * Sort the file list alphabetically + */ AudioPlayer.prototype.sortByAlpha = function() { @@ -203,6 +274,10 @@ AudioPlayer.prototype.sortByAlpha = function() this.fillMediaList(); } +/* + * Sort the file list by artist name + */ + AudioPlayer.prototype.sortByArtist = function() { console.log("MediaPlayer in sortByArtist"); @@ -225,6 +300,10 @@ AudioPlayer.prototype.sortByArtist = function() this.fillMediaList(); } +/* + * Sort the file list by album name + */ + AudioPlayer.prototype.sortByAlbum =function() { console.log("MediaPlayer in sortByAlbum"); @@ -247,6 +326,10 @@ AudioPlayer.prototype.sortByAlbum =function() this.fillMediaList(); } +/* + * Callback for when the local content has been successfully read using tizen.content. + */ + AudioPlayer.prototype.onContentLoaded = function() { try @@ -292,10 +375,9 @@ AudioPlayer.prototype.onContentLoaded = function() } } -AudioPlayer.prototype.redrawMediaName = function() -{ - this.updateMediaName(this.content[this.listIndex].artists[0], this.content[this.listIndex].title, this.content[this.listIndex].coverArt); -} +/* + * Create and draw an item in the media list + */ AudioPlayer.prototype.makeListItem = function(j, k) { @@ -303,6 +385,9 @@ AudioPlayer.prototype.makeListItem = function(j, k) for (var i = j; (i < (j+k) && i < this.content.length); i++) { + if (typeof this.content[i].title !== "string") + this.content[i].title = "Unknown"; + //Check if album art is done loading, if not draw default until it is if (this.content[i].artists === undefined) { @@ -310,10 +395,13 @@ AudioPlayer.prototype.makeListItem = function(j, k) this.content[i].artists[0] = "Unknown"; } - var trackText = {"text" : this.content[i].title, "xLoc" : canvasH + 20, "yLoc" : canvasH / 2.5 , "zLoc" : 0}; - var artistText = {"text" : this.content[i].artists[0], "xLoc" : canvasH + 20, "yLoc" : canvasH / 1.1 , "zLoc" : 0}; + else if (typeof this.content[i].artists[0] !== "string") + this.content[i].artists[0] = "Unknown"; + + var trackText = {"text" : this.content[i].title, "xLoc" : canvasH + 20, "yLoc" : canvasH / 2.5 , "zLoc" : 0}; + var artistText = {"text" : this.content[i].artists[0], "xLoc" : canvasH + 20, "yLoc" : canvasH / 1.1 , "zLoc" : 0}; - if (this.content[i].coverArt && this.content[i].coverArt.complete) + if (this.content[i].coverArt && this.content[i].coverArt.complete && (this.content[i].coverArt.naturalWidth !== 0 || this.content[i].coverArt.naturalHeight !== 0) ) this.makeListBar(this.content[i].coverArt, i, artistText, trackText); else this.makeListBar(musicIcon, i, artistText, trackText); diff --git a/samples/web/Sample/Tizen/Web App/MediaPlayer/project/js/main.js b/samples/web/Sample/Tizen/Web App/MediaPlayer/project/js/main.js index d278d89..3f27f62 100644 --- a/samples/web/Sample/Tizen/Web App/MediaPlayer/project/js/main.js +++ b/samples/web/Sample/Tizen/Web App/MediaPlayer/project/js/main.js @@ -33,10 +33,15 @@ var mediaListItemH; var playOnConnect = false; var mediaNameCanvas; var mediaNameCTX; +var trackTimeCanvas; +var trackTimeCTX; var speechObj; var nightMode = false; var waitingToResumeVideo = false; //Media has been paused by exterior forces. If set to true, resume previous media when given the signal. var stopServerSearch; +var playBarHeight; +var boxWidth; +var textStartX; var mainMenuTitleTemplateLandscape = {"font" : "oblique bolder 30pt arial", "lineWidth" : 9.5, "fillStyle" : "black", "strokeStyle" : "white", "textAlign" : "left", "largeShadow" : 8, "shadowOffsetX" : 0, "shadowOffsetY" : 0, "shadowBlur" : 45, "shadowColor" : "rgba(255, 187, 0, 0.4)"}; @@ -50,6 +55,9 @@ var mainTrackTemplateLandscape = {"font" : "bold 20pt Arial", "lineWidth" : 7.5, var mainTrackTemplate = {"font" : "bold 30pt Arial", "lineWidth" : 7.5, "fillStyle" : "black", "strokeStyle" : "white", "textAlign" : "left", "largeShadow" : 8, "shadowOffsetX" : 0, "shadowOffsetY" : 0, "shadowBlur" : 45, "shadowColor" : "rgba(255, 187, 0, 0.5))"}; +var timeTemplate = {"font" : "bold 25pt Arial", "lineWidth" : 7.5, "fillStyle" : "black", "strokeStyle" : "white", "textAlign" : "left", + "largeShadow" : 8, "shadowOffsetX" : 0, "shadowOffsetY" : 0, "shadowBlur" : 45, "shadowColor" : "rgba(255, 187, 0, 0.5))"}; + var mediaTextTemplate2 = {"font" : "bold 20pt Arial", "lineWidth" : 10.0, "fillStyle" : "white", "strokeStyle" : "rgba(0, 0, 0, 1.0)", "textAlign" : "left", "shadowOffsetX" : 0, "shadowOffsetY" : 0, "shadowBlur" : 0, "shadowColor" : "rgba(0, 0, 0, 1.0)"}; @@ -57,10 +65,10 @@ var mediaTextTemplate3 = {"font" : "bold 20pt Arial", "lineWidth" : 3.0, "fillSt var trackTextTemplate = {"font" : "bold 16pt Arial", "lineWidth" : 3.0, "fillStyle" : "white", "strokeStyle" : "black", "textAlign" : "left"}; -var mediaTextTemplate2Landscape = {"font" : "bold 15pt Arial", "lineWidth" : 10.0, "fillStyle" : "white", "strokeStyle" : "rgba(0, 0, 0, 1.0)", "textAlign" : "left", +var mediaTextTemplate2Landscape = {"font" : "bold 13pt Arial", "lineWidth" : 10.0, "fillStyle" : "white", "strokeStyle" : "rgba(0, 0, 0, 1.0)", "textAlign" : "left", "shadowOffsetX" : 0, "shadowOffsetY" : 0, "shadowBlur" : 0, "shadowColor" : "rgba(0, 0, 0, 1.0)"}; -var mediaTextTemplate3Landscape = {"font" : "bold 15pt Arial", "lineWidth" : 3.0, "fillStyle" : "white", "strokeStyle" : "rgba(100, 0, 0, 1.0)", "textAlign" : "left"}; +var mediaTextTemplate3Landscape = {"font" : "bold 13pt Arial", "lineWidth" : 3.0, "fillStyle" : "white", "strokeStyle" : "rgba(100, 0, 0, 1.0)", "textAlign" : "left"}; var trackTextTemplateLandscape = {"font" : "bold 11pt Arial", "lineWidth" : 3.0, "fillStyle" : "white", "strokeStyle" : "black", "textAlign" : "left"}; @@ -193,8 +201,13 @@ function getMedia(callback, filterType) { console.log("MediaPlayer in getMedia"); var manager = tizen.content; - var filter = new tizen.AttributeFilter("type", "EXACTLY", filterType); - manager.find(callback, onError, null, filter); + if (manager) + { + var filter = new tizen.AttributeFilter("type", "EXACTLY", filterType); + manager.find(callback, onError, null, filter); + } + else + console.log("MediaPlayer failed to receive media, tizen.content is unavailable"); } function showMediaMenu() @@ -206,6 +219,7 @@ function showMediaMenu() { case "audio": $("#mediaName").show(); + $("#trackTime").show(); $(".sortButton").show(); currentPlayer.show(); @@ -361,6 +375,7 @@ function showMainMenu() $(".navButton").hide(); $(".sortButton").hide(); $("#mediaName").hide(); + $("#trackTime").hide(); $(".player").hide(); $(".mainButton").css({"opacity": "100"}); $(".mainButton").show(); @@ -468,10 +483,10 @@ function resizePlayerPage() $("#listButton").css({"width": buttonWidth + "px", "height": buttonWidth + "px", "top": padding + "px", "left": (screenWidth - buttonWidth - padding * 2) + "px"}); $("#playButton").css({"width": buttonWidth * 1.15 + "px", "height": buttonWidth * 1.15 + "px", "top": padding * 0.3 + "px", "left": (screenWidth / 2) - (buttonWidth / 2) + "px"}); - mediaNameCanvas.width = (screenWidth); - mediaNameCanvas.height = (screenHeight * 0.34) - (buttonWidth + (2 * padding)); - mediaNameCanvas.style.top = (buttonWidth + (2 * padding) ) + "px"; - mediaNameCanvas.style.left = "0px"; + trackTimeCanvas.width = mediaNameCanvas.width = (screenWidth); + trackTimeCanvas.height = mediaNameCanvas.height = (screenHeight * 0.34) - (buttonWidth + (2 * padding)); + trackTimeCanvas.style.top = mediaNameCanvas.style.top = (buttonWidth + (2 * padding) ) + "px"; + trackTimeCanvas.style.left = mediaNameCanvas.style.left = "0px"; var sortButtonTop = (buttonWidth + (2 * padding) ) + mediaNameCanvas.height - (buttonWidth * 1.3); var sortButtonWidth = buttonWidth * 2.5; @@ -528,6 +543,11 @@ function init() imgIcon.src = "images/imageIcon.png"; mediaNameCanvas = document.getElementById("mediaName"); mediaNameCTX = mediaNameCanvas.getContext("2d"); + trackTimeCanvas = document.getElementById("trackTime"); + trackTimeCTX = trackTimeCanvas.getContext("2d"); + playBarHeight = mediaNameCanvas.height; + boxWidth = playBarHeight * 0.75; + textStartX = boxWidth + 50; var vehicle = tizen.vehicle; @@ -582,8 +602,12 @@ function init() //Setup voice control if (tizen.speech) setupSpeech(); - else + else { console.log("MediaPlayer: Speech Recognition not running, voice control will be unavailable"); + speechObj = { + vocalizeString: function(item) { console.log(item); } + }; + } audioPlayer = new MediaPlayer("audio"); videoPlayer = new MediaPlayer("video"); diff --git a/samples/web/Sample/Tizen/Web App/MediaPlayer/project/js/player.js b/samples/web/Sample/Tizen/Web App/MediaPlayer/project/js/player.js index d6867b7..3675222 100644 --- a/samples/web/Sample/Tizen/Web App/MediaPlayer/project/js/player.js +++ b/samples/web/Sample/Tizen/Web App/MediaPlayer/project/js/player.js @@ -107,56 +107,48 @@ MediaPlayer.prototype.emptyTimeouts = function() MediaPlayer.prototype.makeListBar = function(icon, i, artistTextObj, trackTextObj) { - var lightColor = ""; - var canvasW = mediaListItemW; - var canvasH = mediaListItemH * 0.95 ; + var lightColor = (i+1)%2 !== 0 ? "lightColor " : ""; + var nightColor = nightMode ? "night" : ""; + var canvasW = Math.floor(mediaListItemW); + var canvasH = Math.floor(mediaListItemH * 0.95) ; - if ((i+1)%2 !== 0) - { - lightColor = "lightColor "; - } - - if (nightMode) - { - this.mediaListItems.append("
  • " + - " " + - "
    • " - ); - } - else - { - this.mediaListItems.append("
  • " + - " " + - "
    • " - ); - } + this.mediaListItems.append("
  • " + + " " + + "
    • " + ); try { var currentCanvas = document.getElementById(this.type + "CanvasNum" + i); var currentCTX = currentCanvas.getContext("2d"); - this.content[i].ctx = currentCTX; - - currentCTX.drawImage(icon, 0, 0, canvasH, canvasH ); - var artistText = new TextObject(currentCTX,artistTextObj); - var trackText = new TextObject(currentCTX,trackTextObj); - var mediaTextTemp1 = screenOrientation === "portrait" ? mediaTextTemplate2 : mediaTextTemplate2Landscape; - var mediaTextTemp2 = screenOrientation === "portrait" ? mediaTextTemplate3 : mediaTextTemplate3Landscape; - var trackTextTemp = screenOrientation === "portrait" ? trackTextTemplate : trackTextTemplateLandscape; - - trackText.applyTemplate(mediaTextTemp1); - trackText.drawObj(); - trackText.applyTemplate(mediaTextTemp2); - trackText.drawObj(); - artistText.applyTemplate(trackTextTemp); - artistText.drawObj(); + if (currentCanvas && currentCTX) + { + this.content[i].ctx = currentCTX; + + currentCTX.drawImage(icon, 0, 0, canvasH, canvasH ); + var artistText = new TextObject(currentCTX,artistTextObj); + var trackText = new TextObject(currentCTX,trackTextObj); + var trackTextTemp1 = screenOrientation === "portrait" ? mediaTextTemplate2 : mediaTextTemplate2Landscape; + var trackTextTemp2 = screenOrientation === "portrait" ? mediaTextTemplate3 : mediaTextTemplate3Landscape; + var artistTextTemp = screenOrientation === "portrait" ? trackTextTemplate : trackTextTemplateLandscape; + + trackText.applyTemplate(trackTextTemp1); + trackText.drawObj(); + trackText.applyTemplate(trackTextTemp2); + trackText.drawObj(); + artistText.applyTemplate(artistTextTemp); + artistText.drawObj(); + } + else + console.log("MediaPlayer: Failed to draw media item for index " + i ); } catch(err) { console.log("MediaPlayer: drawImage failed for " + this.type + " - reason -> " + err); + console.log("Source below"); + console.log("Src = " + icon.src); } } diff --git a/samples/web/Sample/Tizen/Web App/MediaPlayer/project/js/videoPlayer.js b/samples/web/Sample/Tizen/Web App/MediaPlayer/project/js/videoPlayer.js index fef2111..333aedc 100644 --- a/samples/web/Sample/Tizen/Web App/MediaPlayer/project/js/videoPlayer.js +++ b/samples/web/Sample/Tizen/Web App/MediaPlayer/project/js/videoPlayer.js @@ -149,6 +149,16 @@ VideoPlayer.prototype.makeListItem = function(j, k) for (var i = j; (i < (j+k) && i < this.content.length); i++) { + + if (this.content[i].artists === undefined) + { + this.content[i].artists = new Array(); + this.content[i].artists[0] = "Unknown"; + } + + else if (typeof this.content[i].artists[0] !== "string") + this.content[i].artists[0] = "Unknown"; + var artistText = {"text" : this.content[i].artists[0], "xLoc" : canvasH + 20, "yLoc" : canvasH / 2.5 , "zLoc" : 0}; var trackText = {"text" : this.content[i].title, "xLoc" : canvasH + 20, "yLoc" : canvasH / 1.1 , "zLoc" : 0}; diff --git a/samples/web/Sample/Tizen/Web App/MediaPlayer/project/packaging/MediaPlayer.changes b/samples/web/Sample/Tizen/Web App/MediaPlayer/project/packaging/MediaPlayer.changes index 02ad2b0..03cb48f 100644 --- a/samples/web/Sample/Tizen/Web App/MediaPlayer/project/packaging/MediaPlayer.changes +++ b/samples/web/Sample/Tizen/Web App/MediaPlayer/project/packaging/MediaPlayer.changes @@ -1,3 +1,12 @@ +* Wed Dec 18 2013 brianjjones submit/tizen/20131218.195059@b3964db +- Adding requirement to the spec for speech-recognition and wrt-plugins-ivi + +* Mon Nov 18 2013 brianjjones submit/tizen/20131115.213224@f4bb5fa +- Fix for showing elapsed time bar on video screen + +* Thu Nov 14 2013 brianjjones accepted/tizen/20131015.185352@dcea024 +- Adding current track time to the metadata output + * Tue Oct 15 2013 brianjjones submit/tizen/20131015.010041@0cdd066 - Saving of the localStorage now occurs after the file has successfully loaded diff --git a/samples/web/Sample/Tizen/Web App/MediaPlayer/project/packaging/MediaPlayer.spec b/samples/web/Sample/Tizen/Web App/MediaPlayer/project/packaging/MediaPlayer.spec index b9eee68..a7421b9 100644 --- a/samples/web/Sample/Tizen/Web App/MediaPlayer/project/packaging/MediaPlayer.spec +++ b/samples/web/Sample/Tizen/Web App/MediaPlayer/project/packaging/MediaPlayer.spec @@ -8,7 +8,9 @@ URL: http://www.tizen.org2 Source0: %{name}-%{version}.tar.bz2 BuildRequires: zip BuildRequires: desktop-file-utils +Requires: speech-recognition Requires: wrt-installer +Requires: wrt-plugins-ivi %description A HTML media player for music, video, and images diff --git a/samples/web/Sample/Tizen/Web App/SettingsApp/project/index.html b/samples/web/Sample/Tizen/Web App/SettingsApp/project/index.html index 22b4f69..99b8370 100644 --- a/samples/web/Sample/Tizen/Web App/SettingsApp/project/index.html +++ b/samples/web/Sample/Tizen/Web App/SettingsApp/project/index.html @@ -10,7 +10,7 @@ - + Settings diff --git a/samples/web/Template/Tizen/Tizen Web UI Componment/Tizen_Web_UI_FW_SinglePage/description.xml b/samples/web/Template/Tizen/Tizen Web UI Component/Tizen_Web_UI_FW_SinglePage/description.xml similarity index 63% rename from samples/web/Template/Tizen/Tizen Web UI Componment/Tizen_Web_UI_FW_SinglePage/description.xml rename to samples/web/Template/Tizen/Tizen Web UI Component/Tizen_Web_UI_FW_SinglePage/description.xml index fdfdbea..7c314fa 100644 --- a/samples/web/Template/Tizen/Tizen Web UI Componment/Tizen_Web_UI_FW_SinglePage/description.xml +++ b/samples/web/Template/Tizen/Tizen Web UI Component/Tizen_Web_UI_FW_SinglePage/description.xml @@ -3,10 +3,10 @@ - Tizen Web UI Componment Application + Tizen Web UI Component Application 1.0 snapshot_white.png - Single-Page Application based on Tizen Web UI Componment(cowhide). + Single-Page Application based on Tizen Web UI Component(cowhide). diff --git a/samples/web/Template/Tizen/Tizen Web UI Componment/Tizen_Web_UI_FW_SinglePage/project/config.xml b/samples/web/Template/Tizen/Tizen Web UI Component/Tizen_Web_UI_FW_SinglePage/project/config.xml similarity index 100% rename from samples/web/Template/Tizen/Tizen Web UI Componment/Tizen_Web_UI_FW_SinglePage/project/config.xml rename to samples/web/Template/Tizen/Tizen Web UI Component/Tizen_Web_UI_FW_SinglePage/project/config.xml diff --git a/samples/web/Template/Tizen/Tizen Web UI Componment/Tizen_Web_UI_FW_SinglePage/project/icon.png b/samples/web/Template/Tizen/Tizen Web UI Component/Tizen_Web_UI_FW_SinglePage/project/icon.png similarity index 100% rename from samples/web/Template/Tizen/Tizen Web UI Componment/Tizen_Web_UI_FW_SinglePage/project/icon.png rename to samples/web/Template/Tizen/Tizen Web UI Component/Tizen_Web_UI_FW_SinglePage/project/icon.png diff --git a/samples/web/Template/Tizen/Tizen Web UI Componment/Tizen_Web_UI_FW_SinglePage/project/index.html b/samples/web/Template/Tizen/Tizen Web UI Component/Tizen_Web_UI_FW_SinglePage/project/index.html similarity index 94% rename from samples/web/Template/Tizen/Tizen Web UI Componment/Tizen_Web_UI_FW_SinglePage/project/index.html rename to samples/web/Template/Tizen/Tizen Web UI Component/Tizen_Web_UI_FW_SinglePage/project/index.html index 5820241..dcdc191 100644 --- a/samples/web/Template/Tizen/Tizen Web UI Componment/Tizen_Web_UI_FW_SinglePage/project/index.html +++ b/samples/web/Template/Tizen/Tizen Web UI Component/Tizen_Web_UI_FW_SinglePage/project/index.html @@ -7,7 +7,7 @@ - Cowhide - Tizen Web UI Componment + Cowhide - Tizen Web UI Component @@ -28,7 +28,7 @@

    Hello World!

    -

    Cowhide - Tizen Web UI Componment

    +

    Cowhide - Tizen Web UI Component

    diff --git a/samples/web/Template/Tizen/Tizen Web UI Componment/Tizen_Web_UI_FW_SinglePage/single_page_32.png b/samples/web/Template/Tizen/Tizen Web UI Component/Tizen_Web_UI_FW_SinglePage/single_page_32.png similarity index 100% rename from samples/web/Template/Tizen/Tizen Web UI Componment/Tizen_Web_UI_FW_SinglePage/single_page_32.png rename to samples/web/Template/Tizen/Tizen Web UI Component/Tizen_Web_UI_FW_SinglePage/single_page_32.png diff --git a/samples/web/Template/Tizen/Tizen Web UI Componment/Tizen_Web_UI_FW_SinglePage/single_page_64.png b/samples/web/Template/Tizen/Tizen Web UI Component/Tizen_Web_UI_FW_SinglePage/single_page_64.png similarity index 100% rename from samples/web/Template/Tizen/Tizen Web UI Componment/Tizen_Web_UI_FW_SinglePage/single_page_64.png rename to samples/web/Template/Tizen/Tizen Web UI Component/Tizen_Web_UI_FW_SinglePage/single_page_64.png diff --git a/samples/web/Template/Tizen/Tizen Web UI Componment/Tizen_Web_UI_FW_SinglePage/snapshot_black.png b/samples/web/Template/Tizen/Tizen Web UI Component/Tizen_Web_UI_FW_SinglePage/snapshot_black.png similarity index 100% rename from samples/web/Template/Tizen/Tizen Web UI Componment/Tizen_Web_UI_FW_SinglePage/snapshot_black.png rename to samples/web/Template/Tizen/Tizen Web UI Component/Tizen_Web_UI_FW_SinglePage/snapshot_black.png diff --git a/samples/web/Template/Tizen/Tizen Web UI Componment/Tizen_Web_UI_FW_SinglePage/snapshot_white.png b/samples/web/Template/Tizen/Tizen Web UI Component/Tizen_Web_UI_FW_SinglePage/snapshot_white.png similarity index 100% rename from samples/web/Template/Tizen/Tizen Web UI Componment/Tizen_Web_UI_FW_SinglePage/snapshot_white.png rename to samples/web/Template/Tizen/Tizen Web UI Component/Tizen_Web_UI_FW_SinglePage/snapshot_white.png diff --git a/samples/web/Template/Tizen/Tizen Web UI Componment/Tizen_Web_UI_FW_SinglePage/tizen-app-template.xml b/samples/web/Template/Tizen/Tizen Web UI Component/Tizen_Web_UI_FW_SinglePage/tizen-app-template.xml similarity index 100% rename from samples/web/Template/Tizen/Tizen Web UI Componment/Tizen_Web_UI_FW_SinglePage/tizen-app-template.xml rename to samples/web/Template/Tizen/Tizen Web UI Component/Tizen_Web_UI_FW_SinglePage/tizen-app-template.xml -- 2.7.4