From ab15172eb00855899da98c9b2b9b028a4d306789 Mon Sep 17 00:00:00 2001
From: thlo <smarttv640@gmail.com>
Date: Tue, 3 Sep 2013 18:41:33 +0200
Subject: * Image Viewer for Media Folder (press enter on an Image) * Timer GUI
 improvements * 3D interaction Improvements.

---
 smarttv-client/Javascript/Main.js | 51 +++++++++++++++++++++++++--------------
 1 file changed, 33 insertions(+), 18 deletions(-)

(limited to 'smarttv-client/Javascript/Main.js')

diff --git a/smarttv-client/Javascript/Main.js b/smarttv-client/Javascript/Main.js
index 1d62d74..0743604 100755
--- a/smarttv-client/Javascript/Main.js
+++ b/smarttv-client/Javascript/Main.js
@@ -191,14 +191,14 @@ Main.init = function () {
 	Comm.init();
 
 	Timers.init();
+	ImgViewer.init();
 //	Timers.show();
 
 	
 	if (Config.deviceType == 0){
 	Main.log("ProductInfo= " + deviceapis.tv.info.getProduct());
 	Main.logToServer("ProductInfo= " + deviceapis.tv.info.getProduct());
-	Main.logToServer("isBdPlayer= " + Main.isBdPlayer());
-	Main.logToServer("TimeZone= " + deviceapis.tv.info.getTimeZone());
+	Main.logToServer("isTvSet= " + Main.isTvSet());
 	}
 //	TestHandler.showMenu(20);
 	
@@ -221,9 +221,10 @@ Main.init = function () {
 	}
 */	
 //	 Read widget conf. find the file to log
-/*
+
+	/*
 	xhttp=new XMLHttpRequest();
-	xhttp.open("GET","$MANAGER_WIDGET/Common/webapi/1.0/deviceapis.js",false);
+	xhttp.open("GET","$MANAGER_WIDGET/Common/API/TVKeyValue.js",false);
 	xhttp.send("");
 	xmlDoc=xhttp.responseText;
 	Main.logToServer (xmlDoc);
@@ -261,8 +262,8 @@ Main.testUrls = function () {
 
 };
 
-Main.isBdPlayer = function () {
-	if (deviceapis.tv.info.getProduct() == 2) //deviceapis.tv.info.PRODUCT_TYPE_BD
+Main.isTvSet = function () {
+	if (deviceapis.tv.info.getProduct() == 0) //deviceapis.tv.info.PRODUCT_TYPE_TV
 		return true;
 	else
 		return false;
@@ -593,19 +594,23 @@ Main.playItem = function (url) {
 		
 		break;
 	case Main.eMED:
-		Display.hide();
-    	Display.showProgress();
-		Player.mFormat = Player.ePDL;
+		if (ImgViewer.isImage() == true) {
+			ImgViewer.show();
+		}
+		else {
+			Display.hide();
+			Display.showProgress();
+			Player.mFormat = Player.ePDL;
     	
-    	Main.log(" playItem: now= " + now + " start_time= " + start_time + " dur= " + duration + " (Start + Dur - now)= " + ((start_time + duration) -now));
-
-		Display.setOlTitle(Data.getCurrentItem().childs[Main.selectedVideo].title);
+			Main.log(" playItem: now= " + now + " start_time= " + start_time + " dur= " + duration + " (Start + Dur - now)= " + ((start_time + duration) -now));
 
-		Player.setVideoURL( Data.getCurrentItem().childs[Main.selectedVideo].payload.link);
-		Player.playVideo(-1);
+			Display.setOlTitle(Data.getCurrentItem().childs[Main.selectedVideo].title);
 
-		Player.guid = "unknown";
+			Player.setVideoURL( Data.getCurrentItem().childs[Main.selectedVideo].payload.link);
+			Player.playVideo(-1);
 
+			Player.guid = "unknown";
+		}
 		break;
 	case Main.eURLS:
 		Display.hide();
@@ -873,10 +878,12 @@ cPlayStateKeyHndl.prototype.handleKeyDown = function (keyCode) {
         case tvKey.KEY_YELLOW:
 			Player.nextSubtitleTrack();
         	break;
-        case 1089:
+        case tvKey.KEY_SUB_TITLE: // (1089) BD Player Key for Green
         case tvKey.KEY_3D: 
         case tvKey.KEY_GREEN:
         	Player.toggle3DEffectMode();
+         	widgetAPI.blockNavigation(event);
+
         	break;
 		break;
         default:
@@ -1074,6 +1081,12 @@ cLivePlayStateKeyHndl.prototype.handleKeyDown = function (keyCode) {
      case tvKey.KEY_YELLOW:
 			Player.nextSubtitleTrack();
      	break;
+     case tvKey.KEY_SUB_TITLE: // BD Player Fix for Key Green (1089)
+     case tvKey.KEY_3D: 
+     case tvKey.KEY_GREEN:
+     	Player.toggle3DEffectMode();
+     	widgetAPI.blockNavigation(event);
+     	break;
 
      default:
      	this.defaultKeyHandler.handleDefKeyDown(keyCode);
@@ -1157,7 +1170,9 @@ cMenuKeyHndl.prototype.handleKeyDown = function (keyCode) {
 		break;
  
  	case tvKey.KEY_RED:
- 		RecCmdHandler.showMenu(Data.getCurrentItem().childs[Main.selectedVideo].payload.guid);
+		if ((Main.state == Main.eLIVE) || (Main.state == Main.eREC)) {
+			RecCmdHandler.showMenu(Data.getCurrentItem().childs[Main.selectedVideo].payload.guid);
+		}
  		break;		
  	case tvKey.KEY_YELLOW:
  		if (Main.state == Main.eURLS) {
@@ -1603,11 +1618,11 @@ Main.tvKeys = {
 		KEY_LEFT :37,
 		KEY_RIGHT :39,
 		KEY_ENTER :13,
+		KEY_RED :82,
 
 		KEY_RETURN :27,
 		KEY_STOP :27, // ESC
 //		KEY_MUTE :27,
-		KEY_RED :82,
 
 		KEY_1 :49,
 		KEY_2 :50,
-- 
cgit v1.2.3