Merge branch 'Dev' of http://10.1.1.202:3030/steve07s/BIM-Monitor into Dev

api-detail.php

@@ -26,11 +26,8 @@ if (!isset($_SESSION['loggedin'])) {
 		var searchURL = window.location.search;
 		searchURL = searchURL.substring(1, searchURL.length);
 		object = decodeURIComponent(searchURL.split("&")[0].split("=")[1]);
-		if(object == 'undefined'){
+		if (object == 'undefined') {
 			window.location.href = "./api-list.php";
-			console.log("in " + object);
-		}else{
-			console.log("not in: "+object);
 		}
 
 		$.ajax({
@@ -43,12 +40,12 @@ if (!isset($_SESSION['loggedin'])) {
 			contentType: "application/json",
 			dataType: "json"
 		}).done(function(data) {
-			if(data.APIID == null)
-				data.APIID ='';			
+			if (data.APIID == null)
+				data.APIID = '';
 			folder = data.software + '/' + data.APIID + data.APIName;
-			
-			
-			data[1] = data[1]=="Dynamo" ? data.software + " " + data.dynamoVersion : data.software + " " + data.revitVersion;			
+
+
+			data[1] = data[1] == "Dynamo" ? data.software + " " + data.dynamoVersion : data.software + " " + data.revitVersion;
 			for (i = 0; i < 6; i++) {
 				if (data[i] != null)
 					table.push(data[i]);
@@ -105,7 +102,7 @@ if (!isset($_SESSION['loggedin'])) {
 								<ul>
 									<li class="right">
 										<a href="#" onclick="window.history.go(-1); return false;"><i class="fa fa-undo"></i> 返回</a>
-									</li>									
+									</li>
 								</ul>
 							</div>
 							<div class="row">
@@ -150,7 +147,7 @@ if (!isset($_SESSION['loggedin'])) {
 
 
 									</section>
-								</div>								
+								</div>
 								<div class="col-md-6">
 									<section class="panel">
 										<div class="panel-body">
@@ -179,10 +176,11 @@ if (!isset($_SESSION['loggedin'])) {
 	<script>
 		/*Vue */
 		vm.mount('.body');
-		
-		if(webLink != null){
+		const downloads = ["dll", "dyn", "exe", "msi"];
+		const videos = ["mp4", "m3u8", "ts","avi"];
+		if (webLink != null) {
 			$("#webLink").append("<a href='" + webLink + "' target='_blank'>" + source + "</a>");
-		}else if(webLink == null){
+		} else if (webLink == null) {
 			$("#webLink").append("<span>" + source + "</span>");
 		}
 
@@ -200,11 +198,69 @@ if (!isset($_SESSION['loggedin'])) {
 					dataType: "json"
 				});
 			});
+
+			$('#treeAjaxHTML').jstree({
+				'core': {
+					'themes': {
+						'responsive': false
+					},
+					'check_callback': true,
+					'data': {
+						'url': './script/php/getTree.php?folder=' + folder,
+					}
+				},
+				'types': {
+					'default': {
+						'icon': 'fa fa-folder'
+					},
+					'file': {
+						'icon': 'fa fa-file'
+					}
+				},
+				'plugins': ['types']
+			}).on("ready.jstree", function(e, data) {
+
+				var jsonNodes = $('#treeAjaxHTML').jstree(true).get_json('#', {
+					flat: true
+				});
+
+				$.each(jsonNodes, function(i, val) {
+
+					var treeNode = document.getElementById($(val).attr('id'));
+					var nodeText = $(val).attr('text');					
+					
+					let href = $(val).attr('a_attr').href;
+					let exts = href.split('.');
+					let ext = exts[exts.length - 1]
+					if (downloads.includes(ext)) {	
+						$("#apiList").append("<a download href='" + href + "' id='api" + 1 + "'>" + nodeText + "</a><br>");
+					}
+					if (videos.includes(ext) || downloads.includes(ext)) {
+						$(treeNode).hide();						
+					}
+					
+				
+				})
+			}).on('select_node.jstree', function(event, data) {
+
+				data.instance.toggle_node(data.node);
+
+				if (data.node.text.includes(".")) {
+					console.log(data.node);
+					var link = document.createElement("a");
+					link.download = data.node.text;
+					link.href = data.node.a_attr.href;
+					document.body.appendChild(link);
+					link.click();
+					document.body.removeChild(link);
+				}
+
+
+			});
 		});
-		
 	</script>
 	<script src="assets/vendor/jstree/jstree.js"></script>
-	<script src="assets/javascripts/ui-elements/examples.treeview.js"></script>
+	<!-- <script src="assets/javascripts/ui-elements/examples.treeview.js"></script> -->
 	<?php include("bim-support-body.html"); ?>
 
 	<script>

script/php/api_video_tool.php

@@ -33,12 +33,7 @@ function ConvertVideo($file_path, $ffmpeg)
             ->x264()
             ->setHlsTime(300)
             ->addRepresentations([$r_1080p])
-            ->save("../." . $dir_name . '/' . $file_name . ".m3u8");
-       /* $video->frame(FFMpeg\Coordinate\TimeCode::fromSeconds(40))
-            ->save("../." . $dir_name . '/' . $file_name . ".jpg");
-        $video
-            ->gif(FFMpeg\Coordinate\TimeCode::fromSeconds(40), new FFMpeg\Coordinate\Dimension(640, 480), 5)
-            ->save("../." . $dir_name . '/' . $file_name . ".gif");*/
+            ->save("../." . $dir_name . '/' . $file_name . ".m3u8");      
         echo "<span style='color:red;'>";
         echo "   " . $ext . " ==> m3u8";
         echo "</span>";