Browse Source

update:歌曲播放增加随机播放v1

lvzhiqiang 1 year ago
parent
commit
920bf10ce2

+ 1 - 1
src/main/java/top/lvzhiqiang/service/impl/CoinServiceImpl.java

@@ -886,6 +886,7 @@ public class CoinServiceImpl implements CoinService {
             // CoinCurrencyHolding同步
             // CoinCurrencyHolding同步
             params.put("sortField", Collections.singletonList("cch.buy_time"));
             params.put("sortField", Collections.singletonList("cch.buy_time"));
             params.put("sort", "desc");
             params.put("sort", "desc");
+            params.put("status", "1");
             List<CoinCurrencyHolding> currentHoldingList = coinMapper.findCurrentHoldingList(params);
             List<CoinCurrencyHolding> currentHoldingList = coinMapper.findCurrentHoldingList(params);
             parseCurrentHoldingMap4Coingecko(currentHoldingList);
             parseCurrentHoldingMap4Coingecko(currentHoldingList);
 
 
@@ -964,7 +965,6 @@ public class CoinServiceImpl implements CoinService {
 
 
             Map<String, List<CoinCurrencyHolding>> currencyHoldingMap = currentHoldingList.stream().collect(Collectors.groupingBy(CoinCurrencyHolding::getCoingeckoId));
             Map<String, List<CoinCurrencyHolding>> currencyHoldingMap = currentHoldingList.stream().collect(Collectors.groupingBy(CoinCurrencyHolding::getCoingeckoId));
 
 
-
             for (int j = 0; j < result.size(); j++) {
             for (int j = 0; j < result.size(); j++) {
                 JSONObject marketData = result.getJSONObject(j);
                 JSONObject marketData = result.getJSONObject(j);
                 String id = marketData.getString("id");
                 String id = marketData.getString("id");

+ 6 - 0
src/main/resources/static/coin.html

@@ -364,6 +364,11 @@
             <input type="text" style="width: 100px;padding-top: 3px;" id="apis-quiet-div-music-pageSize" disabled="disabled" value="20">
             <input type="text" style="width: 100px;padding-top: 3px;" id="apis-quiet-div-music-pageSize" disabled="disabled" value="20">
             <input type="text" style="width: 100px;padding-top: 3px;" id="apis-quiet-div-music-pages" disabled="disabled" value="999999">
             <input type="text" style="width: 100px;padding-top: 3px;" id="apis-quiet-div-music-pages" disabled="disabled" value="999999">
             <input type="text" style="width: 100px;padding-top: 3px;" id="apis-quiet-div-music-keyword" placeholder="关键词">
             <input type="text" style="width: 100px;padding-top: 3px;" id="apis-quiet-div-music-keyword" placeholder="关键词">
+            <select id="apis-quiet-div-music-playRuleField" style="height: 24px;">
+                <option value="1">随机</option>
+                <option value="2">循环</option>
+                <option value="3">单曲循环</option>
+            </select>
             <select id="apis-quiet-div-music-categoryField" style="height: 24px;">
             <select id="apis-quiet-div-music-categoryField" style="height: 24px;">
                 <option value="">--</option>
                 <option value="">--</option>
             </select>
             </select>
@@ -379,6 +384,7 @@
                 <option value="desc">desc</option>
                 <option value="desc">desc</option>
                 <option value="asc">asc</option>
                 <option value="asc">asc</option>
             </select>
             </select>
+            <button class="apis-quiet-div-music-start">开始</button>
         </div>
         </div>
 
 
         <div id="apis-quiet-div-currentHolding" style="display: none;">
         <div id="apis-quiet-div-currentHolding" style="display: none;">

+ 61 - 4
src/main/resources/static/js/my-coin.js

@@ -284,6 +284,63 @@ function handleSelectChange(objj) {
 
 
             if (nameEn === 'music') {
             if (nameEn === 'music') {
                 $("#apis-quiet-content > audio").css("display", "block");
                 $("#apis-quiet-content > audio").css("display", "block");
+
+                $("#apis-quiet-content > audio").on('ended', function () {
+                    let totalCount = $("div#apis-quiet-content").find("span.contentSPAN").text();
+                    if (totalCount === 0) {
+                        return;
+                    }
+
+                    let playRule = $("#apis-quiet-div-music-playRuleField").val();
+                    if (playRule === '1') {
+                        let randomNum = Math.floor(Math.random() * totalCount) + 1;
+                        let musicPageNo = $("#apis-quiet-div-music-pageNo").val();
+                        let musicPageSize = $("#apis-quiet-div-music-pageSize").val();
+                        if (randomNum >= (musicPageNo - 1) * musicPageSize + 1 && randomNum <= musicPageNo * musicPageSize) {
+                            let startNum = randomNum - ((musicPageNo - 1) * musicPageSize);
+                            $('#apis-quiet-content').find(".contentTD > tr").eq(startNum - 1).find("button.apis-quiet-div-music-play").click();
+                        } else {
+                            let toMusicPageNo = Math.floor(randomNum / musicPageSize + 1);
+                            $("#apis-quiet-div-music-pageNo").val(toMusicPageNo);
+                            $("#apis-quiet-div").find("button.apis-quiet-div-button2").click();
+                            let startNum = randomNum - ((toMusicPageNo - 1) * musicPageSize);
+
+                            setTimeout(function () {
+                                $('#apis-quiet-content').find(".contentTD > tr").eq(startNum - 1).find("button.apis-quiet-div-music-play").click();
+                            }, 3000);
+                        }
+                    } else if (playRule === '2') {
+                        $('#apis-quiet-content').find(".contentTD > tr")[0].find("button.apis-quiet-div-music-play").click();
+                    }
+                });
+                $("button.apis-quiet-div-music-start").click(function () {
+                    let totalCount = $("div#apis-quiet-content").find("span.contentSPAN").text();
+                    if (totalCount === 0) {
+                        return;
+                    }
+
+                    let playRule = $("#apis-quiet-div-music-playRuleField").val();
+                    if (playRule === '1') {
+                        let randomNum = Math.floor(Math.random() * totalCount) + 1;
+                        let musicPageNo = $("#apis-quiet-div-music-pageNo").val();
+                        let musicPageSize = $("#apis-quiet-div-music-pageSize").val();
+                        if (randomNum >= (musicPageNo - 1) * musicPageSize + 1 && randomNum <= musicPageNo * musicPageSize) {
+                            let startNum = randomNum - ((musicPageNo - 1) * musicPageSize);
+                            $('#apis-quiet-content').find(".contentTD > tr").eq(startNum - 1).find("button.apis-quiet-div-music-play").click();
+                        } else {
+                            let toMusicPageNo = Math.floor(randomNum / musicPageSize + 1);
+                            $("#apis-quiet-div-music-pageNo").val(toMusicPageNo);
+                            $("#apis-quiet-div").find("button.apis-quiet-div-button2").click();
+                            let startNum = randomNum - ((toMusicPageNo - 1) * musicPageSize);
+
+                            setTimeout(function () {
+                                $('#apis-quiet-content').find(".contentTD > tr").eq(startNum - 1).find("button.apis-quiet-div-music-play").click();
+                            }, 3000);
+                        }
+                    } else if (playRule === '2') {
+                        $('#apis-quiet-content').find(".contentTD > tr")[0].find("button.apis-quiet-div-music-play").click();
+                    }
+                });
             } else {
             } else {
                 $("#apis-quiet-content > audio").css("display", "none");
                 $("#apis-quiet-content > audio").css("display", "none");
                 $("#apis-quiet-content > audio > source").attr("src", "");
                 $("#apis-quiet-content > audio > source").attr("src", "");
@@ -503,7 +560,7 @@ function mainSearch(url, nameEn, slideDiv, typetype, needCustomFlag) {
                     } else if (nameEn === 'music') {
                     } else if (nameEn === 'music') {
                         str += '<td style="padding: 0px 10px 0px 10px;">';
                         str += '<td style="padding: 0px 10px 0px 10px;">';
                         str += '<button class="apis-quiet-div-music-play" operationType="play" symbolName="' + dataDetail.lowQualityUrl + '">播放</button>';
                         str += '<button class="apis-quiet-div-music-play" operationType="play" symbolName="' + dataDetail.lowQualityUrl + '">播放</button>';
-                        str += '<button class="apis-quiet-div-music-pause" operationType="pause" symbolName="' + dataDetail.lowQualityUrl + '">暂停</button>';
+                        // str += '<button class="apis-quiet-div-music-pause" operationType="pause" symbolName="' + dataDetail.lowQualityUrl + '">暂停</button>';
                         str += '<button class="apis-quiet-div-music-detail" operationType="detail" symbolName="' + dataDetail.id + '">详情</button>';
                         str += '<button class="apis-quiet-div-music-detail" operationType="detail" symbolName="' + dataDetail.id + '">详情</button>';
                         str += '<button class="apis-quiet-div-music-update" operationType="update" symbolName="' + dataDetail.id + '">编辑</button>';
                         str += '<button class="apis-quiet-div-music-update" operationType="update" symbolName="' + dataDetail.id + '">编辑</button>';
                         str += '<button class="apis-quiet-div-music-delete" operationType="delete" symbolName="' + dataDetail.id + '">删除</button>';
                         str += '<button class="apis-quiet-div-music-delete" operationType="delete" symbolName="' + dataDetail.id + '">删除</button>';
@@ -522,7 +579,7 @@ function mainSearch(url, nameEn, slideDiv, typetype, needCustomFlag) {
                 } else if (nameEn === 'music') {
                 } else if (nameEn === 'music') {
                     $(".apis-quiet-div-music-delete").unbind("click");
                     $(".apis-quiet-div-music-delete").unbind("click");
                     $(".apis-quiet-div-music-play").unbind("click");
                     $(".apis-quiet-div-music-play").unbind("click");
-                    $(".apis-quiet-div-music-pause").unbind("click");
+                    // $(".apis-quiet-div-music-pause").unbind("click");
                     $(".apis-quiet-div-music-detail").unbind("click");
                     $(".apis-quiet-div-music-detail").unbind("click");
                     $(".apis-quiet-div-music-update").unbind("click");
                     $(".apis-quiet-div-music-update").unbind("click");
                 }
                 }
@@ -794,10 +851,10 @@ function initContentEvent(nameEn) {
                 $("#apis-quiet-content > audio")[0].play();
                 $("#apis-quiet-content > audio")[0].play();
             }
             }
         });
         });
-        $(".apis-quiet-div-music-pause").click(function () {
+        /*$(".apis-quiet-div-music-pause").click(function () {
             var symbol = $(this).attr("symbolName");
             var symbol = $(this).attr("symbolName");
             $("#apis-quiet-content > audio")[0].pause();
             $("#apis-quiet-content > audio")[0].pause();
-        });
+        });*/
         $(".apis-quiet-div-music-detail,.apis-quiet-div-music-update").click(function () {
         $(".apis-quiet-div-music-detail,.apis-quiet-div-music-update").click(function () {
             if ($("#musicpreview").css("display") === 'none') {
             if ($("#musicpreview").css("display") === 'none') {
                 $("#musicpreview").css("display", "block");
                 $("#musicpreview").css("display", "block");