audio play support list by date

themes/beauty/controller/SiteController.php

@@ -745,33 +745,40 @@ Class SiteController extends Controller {
 
         $cateId = $this->get('pid', '');
         $cacheParentDataId = $this->get('cid', '');
-        $page = $this->get('page', 1);
+        $page = $this->get('page', 0);
         $pageSize = $this->get('limit', 100);
 
-        if (empty($videoUrl) || empty($videoId) || empty($cateId) || empty($cacheParentDataId)) {
+        //增加按年、月查看视频自动播放更多视频支持
+        $para_year = $this->get('year', '');
+        $para_month = $this->get('month', '');
+
+        if (empty($videoUrl) || empty($videoId) || empty($cateId)) {
             throw new Exception("缺少参数！", 403);
         }
 
         $arr = parse_url($videoUrl);
         $videoFilename = basename($arr['path']);
 
-        //增加文件后缀格式检查，区分：mp4, mov, m3u8
+        //增加文件后缀格式检查，区分：mp4, mov, m3u8, mp3
         $videoExtension = pathinfo($arr['path'], PATHINFO_EXTENSION);
         $videoSourceType = Html::getMediaSourceType($videoExtension);
 
         //从缓存数据获取封面图
         $poster = '/img/beauty/audio_bg.jpg';
         $cacheSeconds = 86400;
-        $cachedParentData = Common::getCacheFromFile($cacheParentDataId, $cacheSeconds);
+
-        if (!empty($cachedParentData)) {
+        if (!empty($cacheParentDataId)) {
-            $mp3 = $cachedParentData[$videoId];
+            $cachedParentData = Common::getCacheFromFile($cacheParentDataId, $cacheSeconds);
-            if (!empty($mp3['snapshot'])) {
+            if (!empty($cachedParentData)) {
-                $poster = $mp3['snapshot'];
+                $mp3 = $cachedParentData[$videoId];
-            }else {
+                if (!empty($mp3['snapshot'])) {
-                $imgExts = !empty(FSC::$app['config']['supportedImageExts']) ? FSC::$app['config']['supportedImageExts'] : array('jpg', 'jpeg', 'png', 'webp', 'gif');
+                    $poster = $mp3['snapshot'];
-                $matchedImage = Html::searchImageByFilename($mp3['filename'], $cachedParentData, $imgExts);
+                }else {
-                if (!empty($matchedImage)) {
+                    $imgExts = !empty(FSC::$app['config']['supportedImageExts']) ? FSC::$app['config']['supportedImageExts'] : array('jpg', 'jpeg', 'png', 'webp', 'gif');
-                    $poster = $matchedImage['path'];
+                    $matchedImage = Html::searchImageByFilename($mp3['filename'], $cachedParentData, $imgExts);
+                    if (!empty($matchedImage)) {
+                        $poster = $matchedImage['path'];
+                    }
                 }
             }
         }
@@ -797,7 +804,8 @@ Class SiteController extends Controller {
         $params = compact(
             'videoUrl', 'videoId', 'videoFilename',
             'cateId', 'cacheParentDataId', 'page', 'pageSize',
-            'copyright', 'isAdminIp', 'videoExtension', 'videoSourceType', 'poster'
+            'copyright', 'isAdminIp', 'videoExtension', 'videoSourceType', 'poster',
+            'para_year', 'para_month'
         );
         return $this->render($viewName, $params, $pageTitle);
     }

themes/beauty/views/list/bydate.php

@@ -59,7 +59,7 @@ if (!empty($viewData['para_month'])) {
                 <li class="menu-title">
                     年月
                     <?php if (!empty($viewData['isAdminIp'])) { ?>
-                    <img class="svg icon1 svgimg verMiddle" src="/img/beauty/refresh.svg" alt="清空缓存数据" title="刷新缓存数据" style="margin-left:10px;width:16px">
+                    <img class="svg icon1 svgimg verMiddle hide" src="/img/beauty/refresh.svg" alt="清空缓存数据" title="刷新缓存数据" style="margin-left:10px;width:16px">
                     <?php } ?>
                 </li>
                 <?php
@@ -276,9 +276,11 @@ eof;
                 }else if (in_array($file['extension'], $audioExts)) {       //输出音乐
                     $title = !empty($file['title']) ? $file['title'] : $file['filename'];
                     $videoUrl = urlencode($file['path']);
-                    $linkUrl = "/site/audioplayer?id={$file['id']}&pid={$file['pid']}&cid={$viewData['cacheDataId']}&url={$videoUrl}";
+                    $linkUrl = "/site/audioplayer?id={$file['id']}&pid={$file['pid']}&url={$videoUrl}";
                     if ($viewData['showType'] == 'audio') {
                         $linkUrl .= "&page={$viewData['page']}&limit={$viewData['pageSize']}";
+                        //支持按年、月查看视频时，获取更多视频以便自动播放
+                        $linkUrl .= "&year={$viewData['para_year']}&month={$viewData['para_month']}";
                     }
 
                     $snapshot = '/img/beauty/audio_icon.jpeg';

themes/beauty/views/site/index.php

@@ -68,7 +68,7 @@ $main_view_cls = $menu_ext_status == 'opened' ? '' : 'full';
                 <li class="menu-title">
                     年月
                     <?php if (!empty($viewData['isAdminIp'])) { ?>
-                    <img class="svg icon1 svgimg verMiddle" src="/img/beauty/refresh.svg" alt="清空缓存数据" title="刷新缓存数据" style="margin-left:10px;width:16px">
+                    <img class="svg icon1 svgimg verMiddle hide" src="/img/beauty/refresh.svg" alt="清空缓存数据" title="刷新缓存数据" style="margin-left:10px;width:16px">
                     <?php } ?>
                 </li>
                 <?php

themes/beauty/views/site/mp3player.php

@@ -26,7 +26,7 @@
     </div><!-- /.container-fluid -->
 </nav>
 
-
+<?php if (!empty($viewData['cacheParentDataId']) || !empty($viewData['page'])) { ?>
 <div class="morevideos audiolist">
     <div class="btn_autoplay text_dark ml-1">
         自动播放：
@@ -43,8 +43,12 @@
         data-cid="<?php echo $viewData['cacheParentDataId']; ?>"
         data-page="<?php echo $viewData['page']; ?>"
         data-page-size="<?php echo $viewData['pageSize']; ?>"
+        data-api="<?php echo !empty($viewData['cacheParentDataId']) ? '/list/' : '/list/bydate/'; ?>"
+        data-year="<?php echo $viewData['para_year']; ?>"
+        data-month="<?php echo $viewData['para_month']; ?>"
         class="row othervideos"><div class="ml-2">...</div></div>
 </div>
+<?php } ?>
 <div class="audioplayer" style="background:url('/img/beauty/audio_bg.jpg') top center">
     <div class="row">
         <div class="col col-md-offset-3 col-md-6 col-xs-12">