From a197efc6250370cf15b541be615ec21ad5c4afc3 Mon Sep 17 00:00:00 2001
From: =?utf8?q?V=C3=A1s=C3=A1ry=20D=C3=A1niel?=
 <daniel.vasary@userrendszerhaz.hu>
Date: Mon, 15 Jul 2019 10:09:31 +0000
Subject: [PATCH] =?utf8?q?video.js=20direkt=20haszn=C3=A1lat?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C31458
---
 .../pages/searchitems.zul                     | 58 +++++++++++++++++--
 .../user/jobengine/zk/model/SearchModel.java  | 23 ++++++--
 2 files changed, 72 insertions(+), 9 deletions(-)

diff --git a/server/user.jobengine.osgi.server/pages/searchitems.zul b/server/user.jobengine.osgi.server/pages/searchitems.zul
index 2c6beaed..e2be4653 100644
--- a/server/user.jobengine.osgi.server/pages/searchitems.zul
+++ b/server/user.jobengine.osgi.server/pages/searchitems.zul
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?taglib uri="http://www.zkoss.org/dsp/web/core" prefix="c" ?>
-<?script type="text/javascript" src="/js/videojs-ie8.min.js"?>
-<?script type="text/javascript" src="/js/video.js"?>
 <?init class="user.jobengine.zk.util.AuthInitiator"?>
 
-<zk xmlns:w="http://www.zkoss.org/2005/zk/client">
+<zk xmlns:w="http://www.zkoss.org/2005/zk/client" xmlns:h="xhtml">
+	<style src="/css/video-js.css" />
+	<h:script src="/js/videojs-ie8.min.js"  />
+	<h:script src="/js/video.js"  />
 	<script type="text/javascript">
 		function clearSelection () {
 			if(window.getSelection) {
@@ -18,6 +19,29 @@
 			}
 		}
 	</script>
+
+	<h:script type="text/javascript" defer="true">
+		var player = videojs('myVideoDiv', {
+			controls : true,
+			preload : "auto"
+		});
+		player.on('ended', function() {
+  			this.dispose();
+			console.log("ended", "Player disposed");
+		});
+		
+		function setSource(src) {
+			console.log("setSource", player, src);
+			player.src({type: 'video/mp4', src: src});
+		}	
+		
+		function pushTcIn() {
+			var current = player.currentTime();
+			console.log("pushTcIn", current);
+			zk.Widget.$('$videoListener').fire('onTcIn', current, {toServer:true});
+		}	
+	</h:script>
+
 	<!-- csak igy jo a list sebessege -->
 	<custom-attributes org.zkoss.zul.listbox.rod="true" />
 	<!-- 	<custom-attributes org.zkoss.zul.listbox.initRodSize="50" /> -->
@@ -76,6 +100,26 @@
     align-content: space-around; } .menuButtons
 		>button{ width:200px; } .z-messagebox-window{ top:40% !important; width:30% !important; } .z-toolbar-start{ width:100%; }
 
+
+	.myVideoDiv-dimensions {
+		width: 100%;
+		height: 100%;
+	}
+	
+	.vjs-error {
+		width: 100%;
+		height: 100%;
+	}
+	.vjs-modal-dialog-content {
+		width: 100%;
+		height: 100%;
+		display: none;
+	}
+	
+	.vjs-no-js {
+		width: 100%;
+		height: 100%;
+	}
 	</style>
 	<div id="scdiv" width="100%" height="100%" apply="org.zkoss.bind.BindComposer" viewModel="@id('vm') @init('user.jobengine.zk.model.SearchModel')">
 		<timer id="timer" delay="1" repeats="false" onTimer="@command('uiTick')" />
@@ -236,7 +280,12 @@
 				<borderlayout height="100%" width="100%">
 					<north border="none" size="60%" splittable="true" minsize="250" collapsible="true">
 						<div align="center" height="100%" width="100%">
-							<iframe id="mediaPlayer" height="100%" width="100%" autohide="false" src="@load(vm.lowresMediaFilePath)"></iframe>
+							<h:video id="myVideoDiv" class="video-js vjs-default-skin vjs-big-play-centered" poster="/img/mediacube_logo_v2_50x50.png">
+							</h:video>
+							<div id="videoListener" onTcIn="@command('onTcIn')" />
+							
+							
+<!-- 							<iframe id="mediaPlayer" height="100%" width="100%" autohide="false" src="@load(vm.lowresMediaFilePath)"></iframe> -->
 						</div>
 					</north>
 					<center border="none">
@@ -252,6 +301,7 @@
 										disabled="@load(not sessionScope.userPrincipal.editor or sessionScope.userPrincipal.anonymous or vm.selectedObject eq null)" label="Megosztás" />
 									<toolbarbutton image="/img/baseline_edit_black_18dp.png" autodisable="self" onClick="@command('openMetaDataDialog')"
 										disabled="@load(not sessionScope.userPrincipal.editor or sessionScope.userPrincipal.anonymous or vm.selectedObject eq null)" label="Szerkesztés" />
+									<toolbarbutton autodisable="self" onClick="pushTcIn()" label="IN" />
 								</div>
 								</div>
 							</toolbar>
diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/SearchModel.java b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/SearchModel.java
index 238d533d..94bba688 100644
--- a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/SearchModel.java
+++ b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/SearchModel.java
@@ -272,7 +272,6 @@ public class SearchModel extends AsyncBaseModel {
 			}
 
 			SessionUtil.putUserSearchFilter(searchFilters);
-
 		} catch (Exception e) {
 			Messagebox.show(e.getMessage(), "Hiba", Messagebox.OK, Messagebox.ERROR);
 			logger.catching(e);
@@ -361,7 +360,7 @@ public class SearchModel extends AsyncBaseModel {
 	}
 
 	public String getLowresMediaFilePath() throws Exception {
-		String ret = PAGES_MEDIAPLAYER;
+		String ret = null;
 		if (selectedObject != null) {
 			List<MediaFile> mediaFiles = selectedObject.getMedia().getMediaFiles();
 			if (mediaFiles != null) {
@@ -371,14 +370,12 @@ public class SearchModel extends AsyncBaseModel {
 						StoreUri sourceStoreUri = store.getSourceStoreUri(RemoteStoreProtocol.HTTP);
 						URL base = new URL(sourceStoreUri.toString());
 						String relative = mf.getRelativePath().replace("\\", "/");
-						ret += new URL(base, relative).toString();
+						ret = new URL(base, relative).toString();
 						break;
 					}
 				}
 			}
 		}
-		if (PAGES_MEDIAPLAYER.equals(ret))
-			ret += "&poster=/img/mediacube_logo_v2_50x50.png";
 		return ret;
 	}
 
@@ -506,6 +503,11 @@ public class SearchModel extends AsyncBaseModel {
 		logger.info("onPaging");
 	}
 
+	@Command
+	public void onTcIn(@ContextParam(ContextType.TRIGGER_EVENT) Event event) {
+		//event.getData() a tcin
+	}
+
 	@Command
 	public void onWestResize(@BindingParam("west") West _west) {
 		_west.invalidate();
@@ -614,6 +616,17 @@ public class SearchModel extends AsyncBaseModel {
 		if (selectedObject != null) {
 			selectedObject.setMedia(itemManager.getMedia(selectedObject.getMedia().getId()));
 			selectedObject.setItem(itemManager.getItem(selectedObject.getMedia().getItemId()));
+
+			try {
+				String video = getLowresMediaFilePath();
+				Clients.evalJavaScript("setSource('" + video + "')");
+
+				//ret += "&poster=/img/mediacube_logo_v2_50x50.png";
+
+			} catch (Exception e) {
+				logger.error(e);
+			}
+
 		}
 	}
 
-- 
2.54.0