update:影片详情页页面开发v3

src/main/java/top/lvzhiqiang/entity/VideoInfo.java

@@ -115,7 +115,8 @@ public class VideoInfo implements Serializable {
     private String score;
     private String comment;
     private String commentFirst;
-    private String imgPrefixPath;
+    private String imgPrefixGFPath;
+    private String imgPrefixSYPath;
     private List<String> imgGFList = new ArrayList<>();
     private List<String> imgSYList = new ArrayList<>();
 }

src/main/java/top/lvzhiqiang/service/impl/VideoInfoServiceImpl.java

@@ -113,11 +113,13 @@ public class VideoInfoServiceImpl extends BaseServiceImpl<Object> implements Vid
             }
 
             String qibingPath = WebAppConfig.dicCodeList.stream().filter(x -> 1 == x.getType() && env.equals(x.getEnv()) && "apics_path".equals(x.getCodeKey())).findFirst().get().getCodeValue();
-            String imgPrefixPath = "骑兵步兵/".concat(videoInfo.getIdentificationCode()).concat("/img_gf/");
-            videoInfo.setImgPrefixPath(imgPrefixPath);
+            String imgPrefixGFPath = "骑兵步兵/".concat(videoInfo.getIdentificationCode()).concat("/img_gf/");
+            String imgPrefixSYPath = "骑兵步兵/".concat(videoInfo.getIdentificationCode()).concat("/img_sy/");
+            videoInfo.setImgPrefixGFPath(imgPrefixGFPath);
+            videoInfo.setImgPrefixSYPath(imgPrefixSYPath);
 
             // 获取样品图像-官方
-            File imgGFFile = new File(qibingPath, imgPrefixPath);
+            File imgGFFile = new File(qibingPath, imgPrefixGFPath);
             if (imgGFFile.exists()) {
                 File[] files = imgGFFile.listFiles();
                 for (File file : files) {
@@ -125,7 +127,7 @@ public class VideoInfoServiceImpl extends BaseServiceImpl<Object> implements Vid
                 }
             }
             // 获取样品图像-私有
-            File imgSYFile = new File(qibingPath, "骑兵步兵/".concat(videoInfo.getIdentificationCode()).concat("/img_sy/"));
+            File imgSYFile = new File(qibingPath, imgPrefixSYPath);
             if (imgSYFile.exists()) {
                 File[] files = imgSYFile.listFiles();
                 for (File file : files) {

src/main/resources/static/css/magnific-popup.css

@@ -0,0 +1,363 @@
+/* Magnific Popup CSS */
+.mfp-bg {
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  z-index: 1042;
+  overflow: hidden;
+  position: fixed;
+  background: #0b0b0b;
+  opacity: 0.8;
+  filter: alpha(opacity=80); }
+
+.mfp-wrap {
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  z-index: 1043;
+  position: fixed;
+  outline: none !important;
+  -webkit-backface-visibility: hidden; }
+
+.mfp-container {
+  text-align: center;
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  left: 0;
+  top: 0;
+  padding: 0 8px;
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box; }
+
+.mfp-container:before {
+  content: '';
+  display: inline-block;
+  height: 100%;
+  vertical-align: middle; }
+
+.mfp-align-top .mfp-container:before {
+  display: none; }
+
+.mfp-content {
+  position: relative;
+  display: inline-block;
+  vertical-align: middle;
+  margin: 0 auto;
+  text-align: left;
+  z-index: 1045; }
+
+.mfp-inline-holder .mfp-content, .mfp-ajax-holder .mfp-content {
+  width: 100%;
+  cursor: auto; }
+
+.mfp-ajax-cur {
+  cursor: progress; }
+
+.mfp-zoom-out-cur, .mfp-zoom-out-cur .mfp-image-holder .mfp-close {
+  cursor: -moz-zoom-out;
+  cursor: -webkit-zoom-out;
+  cursor: zoom-out; }
+
+.mfp-zoom {
+  cursor: pointer;
+  cursor: -webkit-zoom-in;
+  cursor: -moz-zoom-in;
+  cursor: zoom-in; }
+
+.mfp-auto-cursor .mfp-content {
+  cursor: auto; }
+
+.mfp-close, .mfp-arrow, .mfp-preloader, .mfp-counter {
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  user-select: none; }
+
+.mfp-loading.mfp-figure {
+  display: none; }
+
+.mfp-hide {
+  display: none !important; }
+
+.mfp-preloader {
+  color: #cccccc;
+  position: absolute;
+  top: 50%;
+  width: auto;
+  text-align: center;
+  margin-top: -0.8em;
+  left: 8px;
+  right: 8px;
+  z-index: 1044; }
+  .mfp-preloader a {
+    color: #cccccc; }
+    .mfp-preloader a:hover {
+      color: white; }
+
+.mfp-s-ready .mfp-preloader {
+  display: none; }
+
+.mfp-s-error .mfp-content {
+  display: none; }
+
+button.mfp-close, button.mfp-arrow {
+  overflow: visible;
+  cursor: pointer;
+  background: transparent;
+  border: 0;
+  -webkit-appearance: none;
+  display: block;
+  outline: none;
+  padding: 0;
+  z-index: 1046;
+  -webkit-box-shadow: none;
+  box-shadow: none; }
+button::-moz-focus-inner {
+  padding: 0;
+  border: 0; }
+
+.mfp-close {
+  width: 44px;
+  height: 44px;
+  line-height: 44px;
+  position: absolute;
+  right: 0;
+  top: 0;
+  text-decoration: none;
+  text-align: center;
+  opacity: 0.65;
+  padding: 0 0 18px 10px;
+  color: white;
+  font-style: normal;
+  font-size: 28px;
+  font-family: Arial, Baskerville, monospace; }
+  .mfp-close:hover, .mfp-close:focus {
+    opacity: 1; }
+  .mfp-close:active {
+    top: 1px; }
+
+.mfp-close-btn-in .mfp-close {
+  color: #333333; }
+
+.mfp-image-holder .mfp-close, .mfp-iframe-holder .mfp-close {
+  color: white;
+  right: -6px;
+  text-align: right;
+  padding-right: 6px;
+  width: 100%; }
+
+.mfp-counter {
+  position: absolute;
+  top: 0;
+  right: 0;
+  color: #cccccc;
+  font-size: 12px;
+  line-height: 18px; }
+
+.mfp-arrow {
+  position: absolute;
+  opacity: 0.65;
+  margin: 0;
+  top: 50%;
+  margin-top: -55px;
+  padding: 0;
+  width: 90px;
+  height: 110px;
+  -webkit-tap-highlight-color: rgba(0, 0, 0, 0); }
+  .mfp-arrow:active {
+    margin-top: -54px; }
+  .mfp-arrow:hover, .mfp-arrow:focus {
+    opacity: 1; }
+  .mfp-arrow:before, .mfp-arrow:after, .mfp-arrow .mfp-b, .mfp-arrow .mfp-a {
+    content: '';
+    display: block;
+    width: 0;
+    height: 0;
+    position: absolute;
+    left: 0;
+    top: 0;
+    margin-top: 35px;
+    margin-left: 35px;
+    border: medium inset transparent; }
+  .mfp-arrow:after, .mfp-arrow .mfp-a {
+    border-top-width: 13px;
+    border-bottom-width: 13px;
+    top: 8px; }
+  .mfp-arrow:before, .mfp-arrow .mfp-b {
+    border-top-width: 21px;
+    border-bottom-width: 21px; }
+
+.mfp-arrow-left {
+  left: 0; }
+  .mfp-arrow-left:after, .mfp-arrow-left .mfp-a {
+    border-right: 17px solid white;
+    margin-left: 31px; }
+  .mfp-arrow-left:before, .mfp-arrow-left .mfp-b {
+    margin-left: 25px;
+    border-right: 27px solid #3f3f3f; }
+
+.mfp-arrow-right {
+  right: 0; }
+  .mfp-arrow-right:after, .mfp-arrow-right .mfp-a {
+    border-left: 17px solid white;
+    margin-left: 39px; }
+  .mfp-arrow-right:before, .mfp-arrow-right .mfp-b {
+    border-left: 27px solid #3f3f3f; }
+
+.mfp-iframe-holder {
+  padding-top: 40px;
+  padding-bottom: 40px; }
+  .mfp-iframe-holder .mfp-content {
+    line-height: 0;
+    width: 100%;
+    max-width: 900px; }
+  .mfp-iframe-holder .mfp-close {
+    top: -40px; }
+
+.mfp-iframe-scaler {
+  width: 100%;
+  height: 0;
+  overflow: hidden;
+  padding-top: 56.25%; }
+  .mfp-iframe-scaler iframe {
+    position: absolute;
+    display: block;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    box-shadow: 0 0 8px rgba(0, 0, 0, 0.6);
+    background: black; }
+
+/* Main image in popup */
+img.mfp-img {
+  width: auto;
+  max-width: 100%;
+  height: auto;
+  display: block;
+  line-height: 0;
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
+  padding: 40px 0 40px;
+  margin: 0 auto; }
+
+/* The shadow behind the image */
+.mfp-figure {
+  line-height: 0; }
+  .mfp-figure:after {
+    content: '';
+    position: absolute;
+    left: 0;
+    top: 40px;
+    bottom: 40px;
+    display: block;
+    right: 0;
+    width: auto;
+    height: auto;
+    z-index: -1;
+    box-shadow: 0 0 8px rgba(0, 0, 0, 0.6);
+    background: #444444; }
+  .mfp-figure small {
+    color: #bdbdbd;
+    display: block;
+    font-size: 12px;
+    line-height: 14px; }
+
+.mfp-bottom-bar {
+  margin-top: -36px;
+  position: absolute;
+  top: 100%;
+  left: 0;
+  width: 100%;
+  cursor: auto; }
+
+.mfp-title {
+  text-align: left;
+  line-height: 18px;
+  color: #f3f3f3;
+  word-wrap: break-word;
+  padding-right: 36px; }
+
+.mfp-image-holder .mfp-content {
+  max-width: 100%; }
+
+.mfp-gallery .mfp-image-holder .mfp-figure {
+  cursor: pointer; }
+
+@media screen and (max-width: 800px) and (orientation: landscape), screen and (max-height: 300px) {
+  /**
+       * Remove all paddings around the image on small screen
+       */
+  .mfp-img-mobile .mfp-image-holder {
+    padding-left: 0;
+    padding-right: 0; }
+  .mfp-img-mobile img.mfp-img {
+    padding: 0; }
+  .mfp-img-mobile .mfp-figure {
+    /* The shadow behind the image */ }
+    .mfp-img-mobile .mfp-figure:after {
+      top: 0;
+      bottom: 0; }
+    .mfp-img-mobile .mfp-figure small {
+      display: inline;
+      margin-left: 5px; }
+  .mfp-img-mobile .mfp-bottom-bar {
+    background: rgba(0, 0, 0, 0.6);
+    bottom: 0;
+    margin: 0;
+    top: auto;
+    padding: 3px 5px;
+    position: fixed;
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    box-sizing: border-box; }
+    .mfp-img-mobile .mfp-bottom-bar:empty {
+      padding: 0; }
+  .mfp-img-mobile .mfp-counter {
+    right: 5px;
+    top: 3px; }
+  .mfp-img-mobile .mfp-close {
+    top: 0;
+    right: 0;
+    width: 35px;
+    height: 35px;
+    line-height: 35px;
+    background: rgba(0, 0, 0, 0.6);
+    position: fixed;
+    text-align: center;
+    padding: 0; } }
+
+@media all and (max-width: 900px) {
+  .mfp-arrow {
+    -webkit-transform: scale(0.75);
+    transform: scale(0.75); }
+  .mfp-arrow-left {
+    -webkit-transform-origin: 0;
+    transform-origin: 0; }
+  .mfp-arrow-right {
+    -webkit-transform-origin: 100%;
+    transform-origin: 100%; }
+  .mfp-container {
+    padding-left: 6px;
+    padding-right: 6px; } }
+
+.mfp-ie7 .mfp-img {
+  padding: 0; }
+.mfp-ie7 .mfp-bottom-bar {
+  width: 600px;
+  left: 50%;
+  margin-left: -300px;
+  margin-top: 5px;
+  padding-bottom: 5px; }
+.mfp-ie7 .mfp-container {
+  padding: 0; }
+.mfp-ie7 .mfp-content {
+  padding-top: 44px; }
+.mfp-ie7 .mfp-close {
+  top: 0;
+  right: 0;
+  padding-top: 0; }

src/main/resources/static/css/my-voddetail.css

@@ -42,4 +42,32 @@
 
 .dynamic_hide {
     display: none;
+}
+
+.sample-box{
+    display: inline-block;
+    background-color: #fff;
+    overflow: hidden;
+    margin: 5px;
+    width: 140px;
+    padding: 0px;
+    border: none;
+    border-radius: 0px;
+    box-shadow: 0 1px 3px rgba(0,0,0,.3);
+    -moz-box-shadow: 0 1px 3px rgba(0,0,0,.3);
+    -webkit-box-shadow: 0 1px 3px rgba(0,0,0,.3);
+}
+.sample-box .photo-frame{
+    overflow: hidden;
+    margin: 10px;
+}
+.sample-box img{
+    height: 90px;
+    vertical-align: middle;
+    border: 0;
+}
+
+.myui-panel, .myui-panel-box{
+    padding-top: 0px;
+    padding-bottom: 0px;
 }

src/main/resources/static/js/my-voddetail.js

@@ -8,6 +8,7 @@ $(function () {
  */
 function initOther() {
     $(".commentdiv").eq(1).css("display", "none");
+    $(".imgdiv").eq(1).css("display", "none");
 
     $("#commentul").find("a").click(function () {
         $("#commentul").find("a").parent().removeClass("active")
@@ -17,6 +18,65 @@ function initOther() {
         var datadiv = $(this).attr("data-div");
         $("#".concat(datadiv)).parents(".commentdiv").css("display", "block");
     });
+
+    $("#imgtul").find("a").click(function () {
+        $("#imgtul").find("a").parent().removeClass("active")
+        $(this).parent().addClass("active");
+
+        $(".imgdiv").css("display", "none");
+        var datadiv = $(this).attr("data-div");
+        $("#".concat(datadiv)).css("display", "block");
+    });
+}
+
+function initWaterfall(imgTitle) {
+    $('#sample-waterfall-gf').magnificPopup({
+        delegate: 'a',
+        type: 'image',
+        closeOnContentClick: false,
+        closeBtnInside: false,
+        mainClass: 'mfp-with-zoom mfp-img-mobile',
+        image: {
+            verticalFit: true,
+            titleSrc: function (item) {
+                return imgTitle + "" + item.src.substring(item.src.lastIndexOf("/") + 1);
+            }
+        },
+        gallery: {
+            enabled: true
+        },
+        zoom: {
+            enabled: true,
+            duration: 300,
+            opener: function (element) {
+                return element.find('img');
+            }
+        }
+    });
+    $('#sample-waterfall-sy').magnificPopup({
+        delegate: 'a',
+        type: 'image',
+        closeOnContentClick: false,
+        closeBtnInside: false,
+        mainClass: 'mfp-with-zoom mfp-img-mobile',
+        image: {
+            verticalFit: true,
+            titleSrc: function (item) {
+                return imgTitle + "" + item.src.substring(item.src.lastIndexOf("/") + 1);
+            }
+        },
+        gallery: {
+            enabled: true
+        },
+        zoom: {
+            enabled: true,
+            duration: 300,
+            opener: function (element) {
+                return element.find('img');
+            }
+        }
+
+    });
 }
 
 function getUrlParam(name) {
@@ -79,10 +139,10 @@ function initDetail() {
                     $(scoreli).removeClass("fa-star-o");
                     $(scoreli).addClass("fa-star");
 
-                    $("#ratewords").text($("ul.rating").find("li").eq(count -1).attr("title"));
+                    $("#ratewords").text($("ul.rating").find("li").eq(count - 1).attr("title"));
                 }
 
-                $("#videoInfoCover").attr("src", data.imgUrl)
+                $("#videoInfoCover").attr("src", "apics/".concat(data.imgUrl));
                 $("#videoName").text(data.name);
                 $("#identificationCode").text(data.identificationCode);
                 $("#issueDate").text(data.issueDate);
@@ -105,7 +165,35 @@ function initDetail() {
                 $("#commentfirstspan").text(data.commentFirst);
                 $("#commentspan").text(data.comment);
 
-                console.log(data)
+                var imgTitle = data.identificationCode + " " + data.name;
+                if (data.imgGFList.length > 0) {
+                    var imgGFList = data.imgGFList;
+                    var str = "";
+                    for (var i = 0; i < imgGFList.length; i++) {
+                        var imgGF = imgGFList[i];
+                        str += '<a class="sample-box" href="apics/' + data.imgPrefixGFPath + imgGF + '">' +
+                            '<div class="photo-frame">' +
+                            '<img src="apics/' + data.imgPrefixGFPath + imgGF + '" title="' + imgTitle + i + '">' +
+                            '</div></a>';
+                    }
+                    $("#sample-waterfall-gf").html(str);
+                }
+                if (data.imgSYList.length > 0) {
+                    var imgSYList = data.imgSYList;
+                    var str = "";
+                    for (var i = 0; i < imgSYList.length; i++) {
+                        var imgSY = imgSYList[i];
+                        str += '<a class="sample-box" href="apics/' + data.imgPrefixSYPath + imgSY + '">' +
+                            '<div class="photo-frame">' +
+                            '<img src="apics/' + data.imgPrefixSYPath + imgSY + '" title="' + imgTitle + i + '">' +
+                            '</div></a>';
+                    }
+                    $("#sample-waterfall-sy").html(str);
+                }
+
+                initWaterfall(imgTitle);
+
+                console.log(data);
             } else {
                 alert(data.message);
             }

src/main/resources/static/voddetail.html

@@ -17,8 +17,10 @@
     <link rel="stylesheet" href="css/mytheme-site.css?v=2.8" type="text/css">
     <link rel="stylesheet" href="css/mytheme-font.css?v=2.8" type="text/css">
     <link rel="stylesheet" href="css/my-voddetail.css" type="text/css">
+    <link rel="stylesheet" href="css/magnific-popup.css" type="text/css">
     <script src="js/jquery-3.6.0.min.js"></script>
     <script type="text/javascript" src="js/my-voddetail.js"></script>
+    <script type="text/javascript" src="js/jquery.magnific-popup.min.js"></script>
     <!--[if lt IE 9]>
     <script src="https://cdn.staticfile.org/html5shiv/3.7.3/html5shiv.min.js"></script>
     <script src="https://cdn.staticfile.org/respond.js/1.4.2/respond.min.js"></script>
@@ -173,13 +175,13 @@
                 <div class="myui-panel-box clearfix">
                     <div class="col-xs-1">
                         <span class="text-muted">当前位置：</span>
-                        <a href="https://ty.fantuan.tv">首页</a> <i class="fa fa-angle-right text-muted"></i>
-                        <a href="#" id ="videoType"></a> <i class="fa fa-angle-right text-muted"></i>
+                        <a href="https://jav.lvzhiqiang.top/video.html">首页</a> <i class="fa fa-angle-right text-muted"></i>
+                        <a href="javascript:void(0);" id ="videoType"></a> <i class="fa fa-angle-right text-muted"></i>
                         <span class="text-muted" id ="videoName"></span>
                     </div>
                     <div class="col-xs-1">
                         <div class="myui-content__thumb">
-                            <a class="myui-vodlist__thumb picture" href="#" title="金属之声·奥斯卡">
+                            <a class="myui-vodlist__thumb picture" href="javascript:void(0);" title="金属之声·奥斯卡">
                                 <img class="lazyload" id="videoInfoCover" src="" style="">
                                 <span class="play hidden-xs"></span>
                             </a>
@@ -239,6 +241,33 @@
                 </div>
             </div>
             <!-- end 详细信息-->
+            <!-- 样品图像-->
+            <div class="myui-panel myui-panel-bg clearfix">
+                <div class="myui-panel-box clearfix">
+                    <div class="myui-panel_hd">
+                        <div class="myui-panel__head active bottom-line clearfix">
+                            <h3 class="title">样品图像 </h3>
+                            <ul class="nav nav-tabs active" id="imgtul">
+                                <li class="active"><a href="javascript:void(0);" data-toggle="tab" data-div="imggfdiv">官方</a></li>
+                                <li class=""><a href="javascript:void(0);" data-toggle="tab" data-div="imgsydiv">自有</a></li>
+                            </ul>
+                        </div>
+                    </div>
+                    <div class="tab-content myui-panel_bd imgdiv" id="imggfdiv">
+                        <div class="tab-pane fade in clearfix active">
+                            <div id="sample-waterfall-gf">
+                            </div>
+                        </div>
+                    </div>
+                    <div class="tab-content myui-panel_bd imgdiv" id="imgsydiv">
+                        <div class="tab-pane fade in clearfix active">
+                            <div id="sample-waterfall-sy">
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <!-- end 样品图像-->
             <!-- 剧情简介-->
             <div class="myui-panel myui-panel-bg clearfix" id="desc">
                 <div class="myui-panel-box clearfix">
@@ -268,25 +297,6 @@
                 </div>
             </div>
             <!-- end 剧情简介-->
-            <!-- 样品图像-->
-            <div class="myui-panel myui-panel-bg clearfix">
-                <div class="myui-panel-box clearfix">
-                    <div class="myui-panel_hd">
-                        <div class="myui-panel__head active bottom-line clearfix">
-                            <h3 class="title">样品图像 </h3>
-                            <ul class="nav nav-tabs active">
-                                <li class="active"><a href="javascript:void(0);" data-toggle="tab">官方</a></li>
-                                <li class=""><a href="javascript:void(0);" data-toggle="tab">自有</a></li>
-                            </ul>
-                        </div>
-                    </div>
-                    <div class="tab-content myui-panel_bd">
-                        <div id="playlist1" class="tab-pane fade in clearfix active">
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <!-- end 样品图像-->
         </div>
     </div>
 </div>