Home Explore Help
Sign In
tianyong
/
gym-music-score
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge remote-tracking branch 'origin/hqy声部播放' into feature-tianyong

TIANYONG 3 months ago
parent
7f10a5bcbd 9047e21d42
commit
1a3bc4a420
52 changed files with 492 additions and 200 deletions
Split View Show Diff Stats
  1. 1 0
      dist/css/instrument-1323ac03.css
  2. 1 0
      dist/css/instrument-779663c4.css
  3. 14 0
      dist/instrument.html
  4. 1 0
      dist/js/index-2412b618.js
  5. 4 0
      dist/js/index-2b3cdad1.js
  6. 1 0
      dist/js/index-2b75eea3.js
  7. 5 0
      dist/js/index-30867e06.js
  8. 1 0
      dist/js/index-3cafac81.js
  9. 1 0
      dist/js/index-400de80d.js
  10. 1 0
      dist/js/index-510e08aa.js
  11. 1 0
      dist/js/index-a1a9bb00.js
  12. 4 0
      dist/js/index-legacy-0fc270ac.js
  13. 1 0
      dist/js/index-legacy-4944a4a2.js
  14. 1 0
      dist/js/index-legacy-5ab7e089.js
  15. 1 0
      dist/js/index-legacy-67868214.js
  16. 5 0
      dist/js/index-legacy-93f3f88c.js
  17. 1 0
      dist/js/index-legacy-c80b06c2.js
  18. 1 0
      dist/js/index-legacy-d037e21c.js
  19. 1 0
      dist/js/index-legacy-e50750f3.js
  20. 0 0
      dist/js/instrument-78478f22.js
  21. 1 0
      dist/js/instrument-legacy-2487cf7d.js
  22. 1 0
      dist/js/instrument-legacy-66a7e915.js
  23. 0 0
      dist/js/modeView-593dcee8.js
  24. 0 0
      dist/js/modeView-legacy-2bbb69ed.js
  25. 0 0
      dist/js/polyfills-858fb2ee.js
  26. 0 0
      dist/js/polyfills-legacy-7ea27e1e.js
  27. BIN
      dist/png/tips-02a6a659.png
  28. 1 2
      src/page-instrument/api.ts
  29. BIN
      src/page-instrument/component/the-music-list/imgs/lock.png
  30. 35 12
      src/page-instrument/component/the-music-list/index.module.less
  31. 22 14
      src/page-instrument/component/the-music-list/list.tsx
  32. 58 32
      src/page-instrument/component/vip/index.module.less
  33. 21 19
      src/page-instrument/component/vip/index.tsx
  34. BIN
      src/page-instrument/component/vip/tips.png
  35. 1 1
      src/page-instrument/evaluat-model/index.tsx
  36. 0 0
      src/page-instrument/header-top/image/glMode.json
  37. 0 0
      src/page-instrument/header-top/image/lxMode.json
  38. 0 0
      src/page-instrument/header-top/image/pcMode.json
  39. 1 1
      src/page-instrument/header-top/index.module.less
  40. 8 1
      src/page-instrument/header-top/index.tsx
  41. 39 39
      src/page-instrument/header-top/modeView.tsx
  42. 8 5
      src/page-instrument/header-top/speed/index.module.less
  43. 18 1
      src/state.ts
  44. 0 2
      src/store.ts
  45. 141 69
      src/view/audio-list/index.tsx
  46. BIN
      src/view/music-score/combineAudio/imgs/lock.png
  47. BIN
      src/view/music-score/combineAudio/imgs/open.png
  48. 18 0
      src/view/music-score/combineAudio/index.module.less
  49. 68 0
      src/view/music-score/combineAudio/index.tsx
  50. 3 1
      src/view/music-score/index.tsx
  51. 1 0
      stats.html
  52. 1 1
      vite.config.ts

File diff suppressed because it is too large
+ 1 - 0
dist/css/instrument-1323ac03.css


File diff suppressed because it is too large
+ 1 - 0
dist/css/instrument-779663c4.css


+ 14 - 0
dist/instrument.html
View File 

@@ -2,7 +2,11 @@
 
 <html lang="en">
 
 
 <head>
 
+<<<<<<< HEAD
 
   <script type="module" crossorigin src="./js/polyfills-7a7509f3.js"></script>
 
+=======
 
+  <script type="module" crossorigin src="./js/polyfills-858fb2ee.js"></script>
 
+>>>>>>> origin/hqy声部播放
 
 
   <meta charset="UTF-8" />
 
   <meta name="viewport"
 
@@ -41,8 +45,13 @@
 
       })
 
     }
 
   </script>
 
+<<<<<<< HEAD
 
   <script type="module" crossorigin src="./js/instrument-2e311432.js"></script>
 
   <link rel="stylesheet" href="./css/instrument-779663c4.css">
 
+=======
 
+  <script type="module" crossorigin src="./js/instrument-78478f22.js"></script>
 
+  <link rel="stylesheet" href="./css/instrument-1323ac03.css">
 
+>>>>>>> origin/hqy声部播放
 
   <script type="module">import.meta.url;import("_").catch(()=>1);async function* g(){};window.__vite_is_modern_browser=true;</script>
 
   <script type="module">!function(){if(window.__vite_is_modern_browser)return;console.warn("vite: loading legacy chunks, syntax error above and the same error below should be ignored");var e=document.getElementById("vite-legacy-polyfill"),n=document.createElement("script");n.src=e.src,n.onload=function(){System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))},document.body.appendChild(n)}();</script>
 
 </head>
 
@@ -65,8 +74,13 @@
 
     var vConsole = new window.VConsole();
 
   </script>   -->
 
   <script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
 
+<<<<<<< HEAD
 
   <script nomodule crossorigin id="vite-legacy-polyfill" src="./js/polyfills-legacy-7329b624.js"></script>
 
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/instrument-legacy-2487cf7d.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 
+=======
 
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./js/polyfills-legacy-7ea27e1e.js"></script>
 
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/instrument-legacy-66a7e915.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 
+>>>>>>> origin/hqy声部播放
 
 </body>
 
 
 </html>

File diff suppressed because it is too large
+ 1 - 0
dist/js/index-2412b618.js


+ 4 - 0
dist/js/index-2b3cdad1.js
View File 

@@ -1 +1,5 @@
 
+<<<<<<<< HEAD:dist/js/index-2b3cdad1.js
 
 import{d as i,g as l,r as d,E as e,o as r,s as c,b as s,M as u}from"./instrument-2e311432.js";const f="_skeleton_vtlsh_1",m="_detail_vtlsh_12",p="_container_vtlsh_20",a={skeleton:f,detail:m,container:p},y=i({name:"music-list",setup(){const n=l(),t=d({isLoading:!0,isProductLoading:!1,product:[{state:!1,name:"五线谱",type:e.staff,base64:""},{state:!1,name:"首调",type:e.firstTone,base64:""},{state:!1,name:"固定调",type:e.fixedTone,base64:""}]});r(()=>{window.appName="colexiu",c.xmlUrl=n.xmlUrl,t.isLoading=!1});const o=async()=>{console.log("渲染完成")};return()=>s("div",{class:a.detail},[s("div",{id:"scrollContainer",class:[a.container,"hideCursor"]},[!t.isLoading&&s(u,{onRendered:o},null)])])}});export{y as default};
 
+========
 
+import{d as i,g as l,r as d,E as e,o as r,s as c,b as s,M as u}from"./instrument-78478f22.js";const f="_skeleton_vtlsh_1",m="_detail_vtlsh_12",p="_container_vtlsh_20",a={skeleton:f,detail:m,container:p},y=i({name:"music-list",setup(){const n=l(),t=d({isLoading:!0,isProductLoading:!1,product:[{state:!1,name:"五线谱",type:e.staff,base64:""},{state:!1,name:"首调",type:e.firstTone,base64:""},{state:!1,name:"固定调",type:e.fixedTone,base64:""}]});r(()=>{window.appName="colexiu",c.xmlUrl=n.xmlUrl,t.isLoading=!1});const o=async()=>{console.log("渲染完成")};return()=>s("div",{class:a.detail},[s("div",{id:"scrollContainer",class:[a.container,"hideCursor"]},[!t.isLoading&&s(u,{onRendered:o},null)])])}});export{y as default};
 
+>>>>>>>> origin/hqy声部播放:dist/js/index-30867e06.js

File diff suppressed because it is too large
+ 1 - 0
dist/js/index-2b75eea3.js


+ 5 - 0
dist/js/index-30867e06.js
View File 

@@ -0,0 +1,5 @@
 
+<<<<<<<< HEAD:dist/js/index-2b3cdad1.js
 
+import{d as i,g as l,r as d,E as e,o as r,s as c,b as s,M as u}from"./instrument-2e311432.js";const f="_skeleton_vtlsh_1",m="_detail_vtlsh_12",p="_container_vtlsh_20",a={skeleton:f,detail:m,container:p},y=i({name:"music-list",setup(){const n=l(),t=d({isLoading:!0,isProductLoading:!1,product:[{state:!1,name:"五线谱",type:e.staff,base64:""},{state:!1,name:"首调",type:e.firstTone,base64:""},{state:!1,name:"固定调",type:e.fixedTone,base64:""}]});r(()=>{window.appName="colexiu",c.xmlUrl=n.xmlUrl,t.isLoading=!1});const o=async()=>{console.log("渲染完成")};return()=>s("div",{class:a.detail},[s("div",{id:"scrollContainer",class:[a.container,"hideCursor"]},[!t.isLoading&&s(u,{onRendered:o},null)])])}});export{y as default};
 
+========
 
+import{d as i,g as l,r as d,E as e,o as r,s as c,b as s,M as u}from"./instrument-78478f22.js";const f="_skeleton_vtlsh_1",m="_detail_vtlsh_12",p="_container_vtlsh_20",a={skeleton:f,detail:m,container:p},y=i({name:"music-list",setup(){const n=l(),t=d({isLoading:!0,isProductLoading:!1,product:[{state:!1,name:"五线谱",type:e.staff,base64:""},{state:!1,name:"首调",type:e.firstTone,base64:""},{state:!1,name:"固定调",type:e.fixedTone,base64:""}]});r(()=>{window.appName="colexiu",c.xmlUrl=n.xmlUrl,t.isLoading=!1});const o=async()=>{console.log("渲染完成")};return()=>s("div",{class:a.detail},[s("div",{id:"scrollContainer",class:[a.container,"hideCursor"]},[!t.isLoading&&s(u,{onRendered:o},null)])])}});export{y as default};
 
+>>>>>>>> origin/hqy声部播放:dist/js/index-30867e06.js

File diff suppressed because it is too large
+ 1 - 0
dist/js/index-3cafac81.js


File diff suppressed because it is too large
+ 1 - 0
dist/js/index-400de80d.js


File diff suppressed because it is too large
+ 1 - 0
dist/js/index-510e08aa.js


File diff suppressed because it is too large
+ 1 - 0
dist/js/index-a1a9bb00.js


+ 4 - 0
dist/js/index-legacy-0fc270ac.js
View File 

@@ -1 +1,5 @@
 
+<<<<<<<< HEAD:dist/js/index-legacy-0fc270ac.js
 
 System.register(["./instrument-legacy-2487cf7d.js"],(function(e,t){"use strict";var i,n,a,o,r,s,l,d,c=document.createElement("style");return c.textContent="._skeleton_vtlsh_1{position:fixed;left:0;top:0;width:100vw;height:100vh;padding:.53333rem .8rem;background-color:#fff;z-index:1000;--van-skeleton-paragraph-height: .8rem}._detail_vtlsh_12{width:100vw;height:100vh;overflow:hidden;overflow-y:auto;--header-height: 1.65333rem;background:var(--container-background)}._detail_vtlsh_12 ._container_vtlsh_20{margin:0 .26667rem;border-radius:.26667rem}._detail_vtlsh_12 #musicAndSelection{overflow:initial!important;height:initial!important;max-height:initial!important}\n",document.head.appendChild(c),{setters:[e=>{i=e.d,n=e.g,a=e.r,o=e.E,r=e.o,s=e.s,l=e.b,d=e.M}],execute:function(){const t="_detail_vtlsh_12",c="_container_vtlsh_20";e("default",i({name:"music-list",setup(){const e=n(),i=a({isLoading:!0,isProductLoading:!1,product:[{state:!1,name:"五线谱",type:o.staff,base64:""},{state:!1,name:"首调",type:o.firstTone,base64:""},{state:!1,name:"固定调",type:o.fixedTone,base64:""}]});r((()=>{window.appName="colexiu",s.xmlUrl=e.xmlUrl,i.isLoading=!1}));const h=async()=>{console.log("渲染完成")};return()=>l("div",{class:t},[l("div",{id:"scrollContainer",class:[c,"hideCursor"]},[!i.isLoading&&l(d,{onRendered:h},null)])])}}))}}}));
 
+========
 
+System.register(["./instrument-legacy-66a7e915.js"],(function(e,t){"use strict";var i,n,a,o,r,s,l,d,c=document.createElement("style");return c.textContent="._skeleton_vtlsh_1{position:fixed;left:0;top:0;width:100vw;height:100vh;padding:.53333rem .8rem;background-color:#fff;z-index:1000;--van-skeleton-paragraph-height: .8rem}._detail_vtlsh_12{width:100vw;height:100vh;overflow:hidden;overflow-y:auto;--header-height: 1.65333rem;background:var(--container-background)}._detail_vtlsh_12 ._container_vtlsh_20{margin:0 .26667rem;border-radius:.26667rem}._detail_vtlsh_12 #musicAndSelection{overflow:initial!important;height:initial!important;max-height:initial!important}\n",document.head.appendChild(c),{setters:[e=>{i=e.d,n=e.g,a=e.r,o=e.E,r=e.o,s=e.s,l=e.b,d=e.M}],execute:function(){const t="_detail_vtlsh_12",c="_container_vtlsh_20";e("default",i({name:"music-list",setup(){const e=n(),i=a({isLoading:!0,isProductLoading:!1,product:[{state:!1,name:"五线谱",type:o.staff,base64:""},{state:!1,name:"首调",type:o.firstTone,base64:""},{state:!1,name:"固定调",type:o.fixedTone,base64:""}]});r((()=>{window.appName="colexiu",s.xmlUrl=e.xmlUrl,i.isLoading=!1}));const h=async()=>{console.log("渲染完成")};return()=>l("div",{class:t},[l("div",{id:"scrollContainer",class:[c,"hideCursor"]},[!i.isLoading&&l(d,{onRendered:h},null)])])}}))}}}));
 
+>>>>>>>> origin/hqy声部播放:dist/js/index-legacy-93f3f88c.js

File diff suppressed because it is too large
+ 1 - 0
dist/js/index-legacy-4944a4a2.js


File diff suppressed because it is too large
+ 1 - 0
dist/js/index-legacy-5ab7e089.js


File diff suppressed because it is too large
+ 1 - 0
dist/js/index-legacy-67868214.js


+ 5 - 0
dist/js/index-legacy-93f3f88c.js
View File 

@@ -0,0 +1,5 @@
 
+<<<<<<<< HEAD:dist/js/index-legacy-0fc270ac.js
 
+System.register(["./instrument-legacy-2487cf7d.js"],(function(e,t){"use strict";var i,n,a,o,r,s,l,d,c=document.createElement("style");return c.textContent="._skeleton_vtlsh_1{position:fixed;left:0;top:0;width:100vw;height:100vh;padding:.53333rem .8rem;background-color:#fff;z-index:1000;--van-skeleton-paragraph-height: .8rem}._detail_vtlsh_12{width:100vw;height:100vh;overflow:hidden;overflow-y:auto;--header-height: 1.65333rem;background:var(--container-background)}._detail_vtlsh_12 ._container_vtlsh_20{margin:0 .26667rem;border-radius:.26667rem}._detail_vtlsh_12 #musicAndSelection{overflow:initial!important;height:initial!important;max-height:initial!important}\n",document.head.appendChild(c),{setters:[e=>{i=e.d,n=e.g,a=e.r,o=e.E,r=e.o,s=e.s,l=e.b,d=e.M}],execute:function(){const t="_detail_vtlsh_12",c="_container_vtlsh_20";e("default",i({name:"music-list",setup(){const e=n(),i=a({isLoading:!0,isProductLoading:!1,product:[{state:!1,name:"五线谱",type:o.staff,base64:""},{state:!1,name:"首调",type:o.firstTone,base64:""},{state:!1,name:"固定调",type:o.fixedTone,base64:""}]});r((()=>{window.appName="colexiu",s.xmlUrl=e.xmlUrl,i.isLoading=!1}));const h=async()=>{console.log("渲染完成")};return()=>l("div",{class:t},[l("div",{id:"scrollContainer",class:[c,"hideCursor"]},[!i.isLoading&&l(d,{onRendered:h},null)])])}}))}}}));
 
+========
 
+System.register(["./instrument-legacy-66a7e915.js"],(function(e,t){"use strict";var i,n,a,o,r,s,l,d,c=document.createElement("style");return c.textContent="._skeleton_vtlsh_1{position:fixed;left:0;top:0;width:100vw;height:100vh;padding:.53333rem .8rem;background-color:#fff;z-index:1000;--van-skeleton-paragraph-height: .8rem}._detail_vtlsh_12{width:100vw;height:100vh;overflow:hidden;overflow-y:auto;--header-height: 1.65333rem;background:var(--container-background)}._detail_vtlsh_12 ._container_vtlsh_20{margin:0 .26667rem;border-radius:.26667rem}._detail_vtlsh_12 #musicAndSelection{overflow:initial!important;height:initial!important;max-height:initial!important}\n",document.head.appendChild(c),{setters:[e=>{i=e.d,n=e.g,a=e.r,o=e.E,r=e.o,s=e.s,l=e.b,d=e.M}],execute:function(){const t="_detail_vtlsh_12",c="_container_vtlsh_20";e("default",i({name:"music-list",setup(){const e=n(),i=a({isLoading:!0,isProductLoading:!1,product:[{state:!1,name:"五线谱",type:o.staff,base64:""},{state:!1,name:"首调",type:o.firstTone,base64:""},{state:!1,name:"固定调",type:o.fixedTone,base64:""}]});r((()=>{window.appName="colexiu",s.xmlUrl=e.xmlUrl,i.isLoading=!1}));const h=async()=>{console.log("渲染完成")};return()=>l("div",{class:t},[l("div",{id:"scrollContainer",class:[c,"hideCursor"]},[!i.isLoading&&l(d,{onRendered:h},null)])])}}))}}}));
 
+>>>>>>>> origin/hqy声部播放:dist/js/index-legacy-93f3f88c.js

File diff suppressed because it is too large
+ 1 - 0
dist/js/index-legacy-c80b06c2.js


File diff suppressed because it is too large
+ 1 - 0
dist/js/index-legacy-d037e21c.js


File diff suppressed because it is too large
+ 1 - 0
dist/js/index-legacy-e50750f3.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/instrument-78478f22.js


File diff suppressed because it is too large
+ 1 - 0
dist/js/instrument-legacy-2487cf7d.js


File diff suppressed because it is too large
+ 1 - 0
dist/js/instrument-legacy-66a7e915.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/modeView-593dcee8.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/modeView-legacy-2bbb69ed.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/polyfills-858fb2ee.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/polyfills-legacy-7ea27e1e.js


BIN
dist/png/tips-02a6a659.png
View File


+ 1 - 2
src/page-instrument/api.ts
View File 

@@ -48,8 +48,7 @@ export const studentQueryUserInfo = async () => {
 
         phone:data.phone,
 
         clientType:"STUDENT",
 
         id:data.id,
 
-        gender:"",
 
-        membershipEndTime: data.membershipEndTime
 
+        gender:""
 
       }
 
       return res
 
     }

BIN
src/page-instrument/component/the-music-list/imgs/lock.png
View File


+ 35 - 12
src/page-instrument/component/the-music-list/index.module.less
View File 

@@ -147,17 +147,22 @@
 
         overflow: hidden;
 
         position: relative;
 
         flex-shrink: 0;
 
-        .iconType {
 
+        .lock{
 
             position: absolute;
 
-            width: 28px;
 
-            height: 14px;
 
-            right: 0;
 
-            top: 0;
 
-            z-index: 9;
 
-            border-top-right-radius: 8px !important;
 
-            &.VIP {
 
-                background: url('./imgs/icon-music-vip.png') no-repeat center;
 
-                background-size: contain;
 
+            width: 100%;
 
+            height: 100%;
 
+            background-color: rgba(0,0,0,.3);
 
+            z-index: 1;
 
+            &::after{
 
+                content: "";
 
+                position: absolute;
 
+                top: 50%;
 
+                left: 50%;
 
+                transform: translate(-50%, -50%);
 
+                width: 13px;
 
+                height: 15px;
 
+                background: url("./imgs/lock.png") no-repeat;
 
+                background-size: 100% 100%;
 
             }
 
         }
 
     }
 
@@ -177,7 +182,6 @@
 
             display: flex;
 
             align-items: center;
 
             margin-top: 6px;
 
-            height: 14px;
 
             .usedNum{
 
                 display: flex;
 
                 align-items: center;
 
@@ -199,15 +203,34 @@
 
                 }
 
             }
 
             .author {
 
+                margin-left: 5px;
 
                 font-weight: 400;
 
                 font-size: 13px;
 
                 color: rgba(0,0,0,0.5);
 
-                line-height: 1;
 
+                line-height: 14px;
 
                 flex-grow: 1;
 
                 white-space: nowrap;
 
                 overflow: hidden;
 
                 text-overflow: ellipsis;
 
             }
 
+            .freeIcon{
 
+                padding: 0px 3px;
 
+                border-radius: 3px;
 
+                font-weight: 400;
 
+                font-size: 10px;
 
+                color: #01C1B5;
 
+                line-height: 14px;
 
+                border: 1px solid rgba(1,193,181,0.7);
 
+            }
 
+            .lockIcon{
 
+                padding: 0px 3px;
 
+                border-radius: 3px;
 
+                font-weight: 400;
 
+                font-size: 10px;
 
+                color: #D08C24;
 
+                line-height: 14px;
 
+                border: 1px solid rgba(208,140,36,0.7);
 
+            }
 
         }
 
     }
 
 }

+ 22 - 14
src/page-instrument/component/the-music-list/list.tsx
View File 

@@ -1,4 +1,4 @@
 
-import { defineComponent, onMounted, reactive, watch } from "vue";
 
+import { computed, defineComponent, onMounted, reactive, watch } from "vue";
 
 import styles from "./index.module.less";
 
 import { api_musicSheetPage } from "../../api";
 
 import state, { togglePlay } from "/src/state";
 
@@ -9,7 +9,7 @@ import searImg from "./imgs/searImg.png"
 
 import huoimg from "./imgs/huo.png"
 
 import emptyImg from "./imgs/empty.png"
 
 import { getQuery } from "/src/utils/queryString";
 
-import { vipData, isVip } from "../vip"
 
+import { vipData } from "../vip"
 
 
 export default defineComponent({
 
   name: "TheMusicList-list",
 
@@ -75,13 +75,8 @@ export default defineComponent({
 
     });
 
 
     const openAccomapina = (item: any) => {
 
-      // 学生端 没有开会员查看会员曲目
 
-      if(item.paymentType === "VIP" && state.systemType === "student" && !isVip.value){
 
-        vipData.show = true
 
-        return
 
-      }
 
-      // 学校查看会员曲目
 
-      if(item.paymentType === "VIP" && state.systemType === "web" && state.isSchool){
 
+      // 学生端 没有开会员查看会员曲目    // 学校查看会员曲目
 
+      if(item.useStatus === "LOCK" && vipVerify.value){
 
         vipData.show = true
 
         return
 
       }
 
@@ -111,6 +106,9 @@ export default defineComponent({
 
           ? (num / 10000).toFixed(1).replace(/\.0$/, '') + "万" 
           : num.toString();
 
     }
 
+    const vipVerify = computed(() => {
 
+      return state.systemType === "student" || (state.systemType === "web" && state.isSchool)
 
+    })
 
     return () => (
 
       <div class={styles.wrap}>
 
         <div class={[styles.searchBox,data.isFocus && styles.isFocus]}>
 
@@ -131,16 +129,26 @@ export default defineComponent({
 
             return (
 
               <div class={[styles.item, state.examSongId == item.id && styles.itemActive]} onClick={() => openAccomapina(item)}>
 
                 <div class={styles.titleImg}>
 
-                  <i class={[styles.iconType, styles[item.paymentType]]}></i>
 
+                  {
 
+                    item.useStatus==='LOCK'&&vipVerify.value && <div class={styles.lock}></div>
 
+                  }
 
                   <Image src={item.titleImg} class={styles.img} />
 
                 </div>
 
                 <div class={styles.content}>
 
-                  <p class={styles.name}>{item.musicSheetName}</p>
 
-                  {
 
-                    item.composer &&                   
+                  <div class={styles.name}>{item.musicSheetName}</div>
 
+                  {          
+                    ((["FREE","LOCK"].includes(item.useStatus)&&vipVerify.value) || item.composer) &&
 
                     <div class={styles.detail}>
 
                       {/* {item.usedNum && <div class={styles.usedNum}><img src={huoimg}/><div>{formatNumber(item.usedNum)}</div></div>} */}
 
-                      <p class={styles.author}>{item.composer}</p>
 
+                      {
 
+                        item.useStatus==='FREE'&&vipVerify.value && <div class={[styles.freeIcon]}>试用</div>
 
+                      }
 
+                      {
 
+                        item.useStatus==='LOCK'&&vipVerify.value && <div class={[styles.lockIcon]}>未解锁</div>
 
+                      }
 
+                      {
 
+                        item.composer && <div class={styles.author}>{item.composer}</div>
 
+                      }
 
                     </div>
 
                   }
 
                 </div>

+ 58 - 32
src/page-instrument/component/vip/index.module.less
View File 

@@ -1,33 +1,59 @@
 
-.vip{
 
-  padding: 20px 30px;
 
-  padding-top: 30px;
 
-  min-width: 230px;
 
-  >img{
 
-    width: 161px;
 
-    margin: 0 auto 20px;
 
-    display: block;
 
-  }
 
-  >p{
 
-    margin: 0;
 
-    font-size: 14px;
 
-    color: #808080;
 
-    margin: 0 auto 20px;
 
-    text-align: center;
 
-  }
 
-  .btn{
 
-    font-size: 16px;
 
-    height: 40px;
 
-    line-height: 40px;
 
-    width: 100%;
 
-  }
 
-  &+i{
 
-    right: 10px;
 
-    top: 10px;
 
-  }
 
+.vipPopup {
 
+   /* 引导页出来不能点击的问题 */
 
+   pointer-events: initial !important;
 
+   & * {
 
+      pointer-events: initial !important;
 
+   }
 
+   :global {
 
+      .van-popup__close-icon {
 
+         color: #333333;
 
+         top: 23px;
 
+         right: 23px;
 
+         font-size: 20px;
 
+      }
 
+   }
 
+   .vip {
 
+      padding-bottom: 20px;
 
+      width: 295px;
 
+      .title {
 
+         height: 49px;
 
+         background: linear-gradient(to bottom, #defaff, #ffffff);
 
+         padding-bottom: 4px;
 
+         display: flex;
 
+         justify-content: center;
 
+         align-items: flex-end;
 
+         .tit {
 
+            font-weight: 500;
 
+            font-size: 18px;
 
+            color: #1a1a1a;
 
+            line-height: 25px;
 
+         }
 
+      }
 
+      .text {
 
+         margin-top: 16px;
 
+         padding: 0 20px;
 
+         font-weight: 400;
 
+         font-size: 16px;
 
+         color: #666666;
 
+         line-height: 26px;
 
+         text-align: center;
 
+      }
 
+      .btnCon {
 
+         margin-top: 25px;
 
+         display: flex;
 
+         justify-content: center;
 
+         :global {
 
+            .van-button {
 
+               width: 120px;
 
+               height: 40px;
 
+               border-radius: 20px;
 
+               font-weight: 500;
 
+               font-size: 16px;
 
+               & + .van-button {
 
+                  margin-left: 15px;
 
+               }
 
+            }
 
+         }
 
+      }
 
+   }
 
 }
 
-.vipPopup{
 
-  pointer-events: initial !important;
 
-  & *{
 
-    pointer-events: initial !important;
 
-  }
 
-}

+ 21 - 19
src/page-instrument/component/vip/index.tsx
View File 

@@ -7,31 +7,25 @@ import dayjs from "dayjs"
 
 import { storeData } from "/src/store"
 
 import { postMessage } from "/src/utils/native-message"
 
 import { usePageVisibility } from "@vant/use"
 
-import { studentQueryUserInfo } from "/src/page-instrument/api"
 
+import { getMusicSheetDetail } from "/src/utils/baseApi"
 
 import { api_back } from "/src/helpers/communication"
 
 
 export const vipData = reactive({
 
    show: false
 
 })
 
 
-export const isVip = computed(() => {
 
-   return dayjs().isBefore(dayjs(storeData.user?.membershipEndTime))
 
-})
 
-
 
 export default defineComponent({
 
    name: "vip-popup",
 
    setup() {
 
       const getContent = computed(() => {
 
-         if (state.isHomeWork) {
 
-            return "您还不是团练宝会员，请开通服务后使用该功能"
 
-         } else if (state.isSchool) {
 
+         if (state.isSchool) {
 
             return "VIP曲目暂不可用"
 
          } else {
 
-            return "您尚未开通云练习服务，请联系乐团老师开通"
 
+            return "该曲目暂未解锁，解锁更多曲目，享受全新学习体验"
 
          }
 
       })
 
       onMounted(() => {
 
-         if (state.isHomeWork && !isVip.value && state.paymentType === "VIP") {
 
+         if (state.isHomeWork && state.paymentType === "LOCK") {
 
             vipData.show = true
 
          }
 
       })
 
@@ -71,11 +65,12 @@ export default defineComponent({
 
       const pageVisibility = usePageVisibility()
 
       watch(pageVisibility, value => {
 
          if (state.isHomeWork && value === "visible") {
 
-            if (!isVip.value) {
 
-               studentQueryUserInfo().then(res => {
 
+            if (state.paymentType === "LOCK") {
 
+               getMusicSheetDetail(state.examSongId).then(res => {
 
                   if (res.code === 200) {
 
-                     storeData.user.membershipEndTime = res?.data?.membershipEndTime
 
-                     if (isVip.value) {
 
+                     state.paymentType = res?.data?.useStatus
 
+                     // 当没有锁定的时候 去掉弹窗
 
+                     if(state.paymentType !== "LOCK"){
 
                         vipData.show = false
 
                      }
 
                   }
 
@@ -97,11 +92,18 @@ export default defineComponent({
 
                round
 
             >
 
                <div class={styles.vip}>
 
-                  <img src={TipsIcon} />
 
-                  <p>{getContent.value}</p>
 
-                  <Button class={styles.btn} round color="#01C1B5" onClick={hanldeOpen}>
 
-                     {state.isHomeWork ? "开通" : " 确定"}
 
-                  </Button>
 
+                  <div class={styles.title}>
 
+                     <div class={styles.tit}>温馨提示</div>
 
+                  </div>
 
+                  <div class={styles.text}>{getContent.value}</div>
 
+                  <div class={styles.btnCon}>
 
+                     <Button class={styles.btn} round onClick={handleClose}>
 
+                        取消
 
+                     </Button>
 
+                     <Button class={styles.btn} round color="#01C1B5" onClick={hanldeOpen}>
 
+                        {state.isHomeWork ? "去开通" : " 确定"}
 
+                     </Button>
 
+                  </div>
 
                </div>
 
             </Popup>
 
          </>

BIN
src/page-instrument/component/vip/tips.png
View File


+ 1 - 1
src/page-instrument/evaluat-model/index.tsx
View File 

@@ -523,7 +523,7 @@ export default defineComponent({
 
       // 如果打开了延迟检测开关，需要先发送开始检测的消息
 
       const delayData = await api_getDeviceDelay();
 
       console.log('设备的延迟值',delayData.content?.value)
 
-      if (delayData && delayData.content?.value <= 0) {
 
+      if (delayData && delayData.content?.value <= 0 && state.paymentType !== "LOCK") {
 
         await api_startDelayCheck({});
 
       } else {
 
         evaluatingData.checkEnd = true;

File diff suppressed because it is too large
+ 0 - 0
src/page-instrument/header-top/image/glMode.json


File diff suppressed because it is too large
+ 0 - 0
src/page-instrument/header-top/image/lxMode.json


File diff suppressed because it is too large
+ 0 - 0
src/page-instrument/header-top/image/pcMode.json


+ 1 - 1
src/page-instrument/header-top/index.module.less
View File 

@@ -420,7 +420,7 @@
 
         width: 100%;
 
         display: flex;
 
         justify-content: space-between;
 
-        padding: 0 100px;
 
+        padding: 0 80px;
 
         position: relative;
 
         top: 50%;
 
         transform: translateY(-50%);

+ 8 - 1
src/page-instrument/header-top/index.tsx
View File 

@@ -10,7 +10,7 @@ import Speed from "./speed";
 
 import { evaluatingData, handleStartEvaluat } from "/src/view/evaluating";
 
 import Settting from "./settting";
 
 import state, { IPlatform, handleChangeSection, handleResetPlay, handleRessetState, togglePlay, IPlayState, refreshMusicSvg, EnumMusicRenderType, resetSettings, handleGuide, resetCursorPosition } from "/src/state";
 
-import { getAudioCurrentTime } from "/src/view/audio-list";
 
+import { audioData, getAudioCurrentTime } from "/src/view/audio-list";
 
 import { followData, toggleFollow } from "/src/view/follow-practice";
 
 import { api_back } from "/src/helpers/communication";
 
 import MusicType from "./music-type";
 
@@ -373,6 +373,8 @@ export default defineComponent({
 
       if (state.modeType === "follow") return { display: false, disabled: false };
 
       // 评测开始 禁用
 
       if (state.modeType === "evaluating") return { display: false, disabled: true };
 
+      // 总谱渲染在播放过程中 不能切换 
+      if(state.isCombineRender && state.playState === "play") return { display: true, disabled: true } 
       if (!state.isAppPlay) {
 
         if (state.playType === "play") {
 
           // 原声, 伴奏 少一个,就不能切换
 
@@ -821,6 +823,11 @@ export default defineComponent({
 
                   }
 
                 }
 
                 handlerModeChange(oldPlayType, oldPlaySource);
 
+                // 总谱 并且开启了单个声轨音频时候
 
+                if(state.isCombineRender && state.playSource === "background") {
 
+                  audioData.combineIndex = -1
 
+                  state.music = ""
 
+                }
 
                 showToast({
 
                   message: state.playType === "play" ? (state.playSource === "music" ? "已切换为原声" : "已切换为伴奏") : state.playSource === "music" ? "已切换为范唱" : state.playSource === "background" ? "已切换为伴唱" : "已切换为唱名",
 
                   position: "top",

+ 39 - 39
src/page-instrument/header-top/modeView.tsx
View File 

@@ -24,27 +24,27 @@ import { browser } from "/src/utils";
 
 export default defineComponent({
 
   name: "modeView",
 
   setup() {
 
-    // const modeImgDom1 = ref();
 
-    // const modeImgDom2 = ref();
 
-    // const modeImgDom3 = ref();
 
-    // watch(
 
-    //   () => headTopData.modeType,
 
-    //   (value, oldValue) => {
 
-    //     // headTopData.modeType 值 刚开始是 ""  所以 第一次切换时候不触发播放动画
 
-    //     if (!oldValue) return;
 
-    //     nextTick(() => {
 
-    //       if (value === "show") {
 
-    //         modeImgDom1.value?.pause();
 
-    //         modeImgDom2.value?.pause();
 
-    //         modeImgDom3.value?.pause();
 
-    //       } else if (value === "init") {
 
-    //         modeImgDom1.value?.play();
 
-    //         modeImgDom2.value?.play();
 
-    //         modeImgDom3.value?.play();
 
-    //       }
 
-    //     });
 
-    //   }
 
-    // );
 
+    const modeImgDom1 = ref();
 
+    const modeImgDom2 = ref();
 
+    const modeImgDom3 = ref();
 
+    watch(
 
+      () => headTopData.modeType,
 
+      (value, oldValue) => {
 
+        // headTopData.modeType 值 刚开始是 ""  所以 第一次切换时候不触发播放动画
 
+        if (!oldValue) return;
 
+        nextTick(() => {
 
+          if (value === "show") {
 
+            modeImgDom1.value?.pause();
 
+            modeImgDom2.value?.pause();
 
+            modeImgDom3.value?.pause();
 
+          } else if (value === "init") {
 
+            modeImgDom1.value?.play();
 
+            modeImgDom2.value?.play();
 
+            modeImgDom3.value?.play();
 
+          }
 
+        });
 
+      }
 
+    );
 
     watch(
 
       () => evaluatingData.socketErrorStatus,
 
       () => {
 
@@ -76,36 +76,36 @@ export default defineComponent({
 
           }}
 
         />
 
         <div class={[styles.modeBox, ((!state.isPercussion && !state.enableEvaluation) || (state.isPercussion && state.enableEvaluation) || (state.isPercussion && !state.enableEvaluation)) && styles.twoModeBox]}>
 
-          {/* <Vue3Lottie ref={modeImgDom1} class={styles.modeImg} animationData={lxMode} autoPlay={false} loop={true} onClick={() => {
 
+          <Vue3Lottie ref={modeImgDom1} class={styles.modeImg} animationData={lxMode} autoPlay={false} loop={true} onClick={() => {
 
             if(state.isSingleLine){
 
               smoothAnimationState.isShow.value = state.melodyLine;
 
             }
 
             headTopData.handleChangeModeType("practise")
 
-            }}></Vue3Lottie> */}
 
-          <img class={styles.modeImg} src={lxImg} 
+            }}></Vue3Lottie>
 
+          {/* <img class={styles.modeImg} src={lxImg} 
             onClick={() => {
 
               if(state.isSingleLine){
 
                 smoothAnimationState.isShow.value = state.melodyLine;
 
               }
 
               headTopData.handleChangeModeType("practise")
 
-            }} />
 
+            }} /> */}
 
           {!state.isPercussion && 
-              // <Vue3Lottie ref={modeImgDom2} class={styles.modeImg} animationData={glMode} autoPlay={false} loop={true} onClick={() => headTopData.handleChangeModeType("follow")}></Vue3Lottie>
 
-              <img class={styles.modeImg} src={glImg} 
-                onClick={() => headTopData.handleChangeModeType("follow")} />
 
+              <Vue3Lottie ref={modeImgDom2} class={styles.modeImg} animationData={glMode} autoPlay={false} loop={true} onClick={() => headTopData.handleChangeModeType("follow")}></Vue3Lottie>
 
+              /* <img class={styles.modeImg} src={glImg} 
+                onClick={() => headTopData.handleChangeModeType("follow")} /> */
 
           }
 
           {state.enableEvaluation && 
-            // <Vue3Lottie ref={modeImgDom3} class={styles.modeImg} animationData={pcMode} autoPlay={false} loop={true} onClick={() => {
 
-            //   // 点击评测模式进入评测模块的需要检测耳机状态，通过返回按钮进入评测模块的，不检测耳机状态
 
-            //   evaluatingData.needCheckErjiStatus = true;
 
-            //   headTopData.handleChangeModeType("evaluating")
 
-            // }}></Vue3Lottie>
 
-            <img class={styles.modeImg} src={pcImg} 
-              onClick={() => {
 
-                  // 点击评测模式进入评测模块的需要检测耳机状态，通过返回按钮进入评测模块的，不检测耳机状态
 
-                  evaluatingData.needCheckErjiStatus = true;
 
-                  headTopData.handleChangeModeType("evaluating")
 
-                }} />
 
+            <Vue3Lottie ref={modeImgDom3} class={styles.modeImg} animationData={pcMode} autoPlay={false} loop={true} onClick={() => {
 
+               // 点击评测模式进入评测模块的需要检测耳机状态，通过返回按钮进入评测模块的，不检测耳机状态
 
+              evaluatingData.needCheckErjiStatus = true;
 
+              headTopData.handleChangeModeType("evaluating")
 
+            }}></Vue3Lottie>
 
+            // <img class={styles.modeImg} src={pcImg} 
+            //   onClick={() => {
 
+            //       // 点击评测模式进入评测模块的需要检测耳机状态，通过返回按钮进入评测模块的，不检测耳机状态
 
+            //       evaluatingData.needCheckErjiStatus = true;
 
+            //       headTopData.handleChangeModeType("evaluating")
 
+            //     }} />
 
           }
 
         </div>
 
         {/** 延迟检测中途，socket出错，网络提示弹窗 */}

+ 8 - 5
src/page-instrument/header-top/speed/index.module.less
View File 

@@ -1,7 +1,10 @@
 
 .speedContainer{
 
     width: 334px;
 
     &.isHideBeat .content{
 
-        height: 172px;
 
+        height: 206px;
 
+        .speedSel{
 
+            padding-bottom: 0px !important;
 
+        }
 
     }
 
     .head{
 
         height: 42px;
 
@@ -25,7 +28,7 @@
 
     }
 
     .content{
 
         margin-top: -26px;
 
-        height: 230px;
 
+        height: 264px;
 
         background: #FFFFFF;
 
         border-radius: 16px;
 
         padding: 36px 16px 16px 16px;
 
@@ -122,8 +125,8 @@
 
                 }
 
             }
 
             .speedSel{
 
-                margin-top: 20px;
 
-                padding-bottom: 8px;
 
+                margin-top: 8px;
 
+                padding-bottom: 18px;
 
                 display: flex;
 
                 justify-content: space-between;
 
                 flex-wrap: wrap;
 
@@ -138,7 +141,7 @@
 
                     font-size: 13px;
 
                     color: rgba(0,0,0,0.6);
 
                     cursor: pointer;
 
-                    margin-bottom: 10px;
 
+                    margin-top: 10px;
 
                     margin-right: 3px;
 
                     &:active{
 
                         background: #B3EDE9;

+ 18 - 1
src/state.ts
View File 

@@ -1588,6 +1588,23 @@ function initMusicSource(data: any, tracks: string[], partIndex: number, workRec
 
             audioBeatMixUrl: banSongObj.scoreAudioBeatMixUrl
 
           }
 
         }
 
+        // 总谱 需要播放各个声部的音频
 
+        if(state.combinePartIndexs.length) {
 
+          // 当选择多个分轨时候
 
+          state.combinePartIndexs.map( partI => {
 
+            const musicSheetSound = musicSheetSoundList.find((item:any)=>{
 
+              return item.track?.toLowerCase().trim() === tracks[partI]?.toLowerCase().trim()
 
+            })
 
+            musicSheetSound?.audioFileUrl && (audioData.combineMusics[partI] = musicSheetSound.audioFileUrl)
 
+          })
 
+        }else{
 
+          tracks.map((itemTrack:any, partI:number) => {
 
+            const musicSheetSound = musicSheetSoundList.find((item:any)=>{
 
+              return item.track?.toLowerCase().trim() === itemTrack?.toLowerCase().trim()
 
+            })
 
+            musicSheetSound?.audioFileUrl && (audioData.combineMusics[partI] = musicSheetSound.audioFileUrl)
 
+          })
 
+        }
 
         // 总谱演奏模式是 伴奏
 
         accompanyObj = musicSheetAccompanimentList.find((item: any) => {
 
           return item.audioPlayType === "PLAY"
 
@@ -1733,7 +1750,7 @@ const setState = (data: any, index: number) => {
 
   state.appName = "COLEXIU";
 
   state.detailId = data.bizId;
 
   state.xmlUrl = data.xmlFileUrl;
 
-  state.paymentType = data.paymentType
 
+  state.paymentType = data.useStatus
 
   state.partIndex = index >= 0 ? index : 0;
 
   state.trackId = data.track;
 
   state.subjectId = data.subjectIds ? data.subjectIds.split(',')?.[0] : 0;

+ 0 - 2
src/store.ts
View File 

@@ -5,8 +5,6 @@ type IUser = {
 
   nickname?: string;
 
   /** 真实姓名 */
 
   realName?: string;
 
-  /** 会员结束时间 */
 
-  membershipEndTime?: string;
 
   tenantId?: number;
 
   /** 声部名称 */
 
   subjectId?: any;

+ 141 - 69
src/view/audio-list/index.tsx
View File 

@@ -18,6 +18,7 @@ import Crunker from "/src/utils/crunker"
 
 import tickMp3 from "/src/assets/tick.wav"
 
 import tockMp3 from "/src/assets/tock.wav"
 
 import { metronomeData } from "/src/helpers/metronome";
 
+import { showToast } from "vant"
 
 
 export const audioData = reactive({
 
 	songEle: null as HTMLAudioElement | null, // 原生
 
@@ -44,7 +45,10 @@ export const audioData = reactive({
 
 		mingSongGirlEle: null as HTMLAudioElement | null,
 
 		beatMingSongEle: null as HTMLAudioElement | null,
 
 		beatMingSongGirlEle: null as HTMLAudioElement | null
 
-	}
 
+	},
 
+	combineIndex: -1, // 当前 播放的总谱音频索引
 
+	combineMusics: {} as Record<string, any>, // 音频 url
 
+	combineMusicEles:[] as {key:number, value:HTMLAudioElement, beatValue:HTMLAudioElement|null}[] // 存储的音频el 当大于4个时候删除
 
 });
 
 const midiRef = ref();
 
 /** 播放或暂停 */
 
@@ -204,6 +208,141 @@ export const changeMingSongType = () =>{
 
 		audioData.songCollection.beatMingSongEle = mingSongType === 1 ? beatMingSongEle : beatMingSongGirlEle
 
 	}
 
 }
 
+
 
+const createAudio = (src?: string): Promise<HTMLAudioElement | null> => {
 
+	if(!src){
 
+		return Promise.resolve(null)
 
+	}
 
+	return new Promise((resolve) => {
 
+		const a = new Audio(src + '?v=' + Date.now());
 
+		a.onloadedmetadata = () => {
 
+			resolve(a);
 
+		};
 
+		a.onerror = () => {
 
+			resolve(null);
 
+		};
 
+		// 当未加载 资源之前 切换到其他浏览器标签，浏览器可能会禁止资源加载所以无法触发onloadedmetadata事件，导致一直在加载中，这里做个兼容
 
+		if (document.visibilityState === 'visible') {
 
+			a.load();
 
+		} else {
 
+			const onVisibilityChange = () => {
 
+				if (document.visibilityState === 'visible') {
 
+					document.removeEventListener('visibilitychange', onVisibilityChange);
 
+					a.load();
 
+				}
 
+			};
 
+			document.addEventListener('visibilitychange', onVisibilityChange);
 
+		}
 
+	});
 
+};
 
+
 
+// 合成节拍器资源
 
+const crunker = new Crunker()
 
+async function mergeBeatAudio(music?:string, accompany?:string){
 
+	let beatMusic, beatAccompany
 
+	if(!state.isMixBeat) {
 
+		return [beatMusic, beatAccompany]
 
+	}
 
+	console.time("音频合成时间")
 
+	try{
 
+		console.time("音频加载时间")
 
+		const [musicBuff, accompanyBuff, tickBuff, tockBuff] = await crunker.fetchAudio(music?`${music}?v=${Date.now()}`:undefined, accompany?`${accompany}?v=${Date.now()}`:undefined, tickMp3, tockMp3)
 
+		console.timeEnd("音频加载时间")
 
+		// 计算音频空白时间
 
+		const silenceDuration = musicBuff&&!state.isEvxml ? crunker.calculateSilenceDuration(musicBuff) : 0
 
+		const silenceBgDuration = accompanyBuff&&!state.isEvxml ? crunker.calculateSilenceDuration(accompanyBuff) : 0
 
+		console.log(`音频空白时间:${silenceDuration};${silenceBgDuration}`)
 
+		const beats:AudioBuffer[] = []
 
+		const beatsTime:number[] = []
 
+		const beatsBgTime:number[] = []
 
+		metronomeData.metroMeasure.map(measures=>{
 
+			measures.map((item:any)=>{
 
+				beats.push(item.isTick?tickBuff!:tockBuff!)
 
+				beatsTime.push(item.time + silenceDuration) // xml 计算的时候 加上空白的时间
 
+				beatsBgTime.push(item.time + silenceBgDuration) // xml 计算的时候 加上空白的时间 没有背景不赋值
 
+			})
 
+		})
 
+		console.time("音频合并时间")
 
+		const musicBuffMeg = musicBuff && crunker.mergeAudioBuffers([musicBuff,...beats],[0,...beatsTime])
 
+		const accompanyBuffMeg = accompanyBuff && crunker.mergeAudioBuffers([accompanyBuff,...beats],[0,...beatsBgTime])
 
+		console.timeEnd("音频合并时间")
 
+		console.time("音频audioDom生成时间")
 
+		beatMusic = musicBuffMeg && crunker.exportAudioElement(musicBuffMeg)
 
+		beatAccompany = accompanyBuffMeg && crunker.exportAudioElement(accompanyBuffMeg)
 
+		console.timeEnd("音频audioDom生成时间")
 
+	}catch(err){
 
+		console.log(err)
 
+	}
 
+	console.timeEnd("音频合成时间")
 
+	return [beatMusic, beatAccompany]
 
+}
 
+// 切换对应的声轨，并且配置当前的audio
 
+export async function changeCombineAudio (combineIndex: number){
 
+	// 重复点击的时候取消选中 原音
 
+	if(combineIndex === audioData.combineIndex){
 
+		audioData.combineIndex = -1
 
+		state.playSource = "background"
 
+		state.music = ""
 
+		// 当没有背景音文件的时候
 
+		if(!state.accompany) {
 
+			state.noMusicSource = true
 
+		}
 
+		return
 
+	}
 
+	state.loadingText = "音频资源加载中，请稍后…";
 
+	state.isLoading = true;
 
+	const musicUrl = audioData.combineMusics[combineIndex]
 
+	// 有就拿缓存，没有就加载
 
+	const cacheMusicIndex = audioData.combineMusicEles.findIndex(ele => {
 
+		return ele.key === combineIndex
 
+	})
 
+	const cacheMusic = audioData.combineMusicEles[cacheMusicIndex]
 
+	if(cacheMusic?.value){
 
+		audioData.songCollection.songEle = cacheMusic.value
 
+		audioData.songCollection.beatSongEle = cacheMusic.beatValue
 
+		// 使用缓存之后 当前数据位置向后偏移，删除缓存的时候以使用顺序位置
 
+		const itemMusic = audioData.combineMusicEles.splice(cacheMusicIndex, 1)
 
+		audioData.combineMusicEles.push(...itemMusic)
 
+	}else{
 
+		const music = await createAudio(musicUrl)
 
+		const [beatMusic] = await mergeBeatAudio(musicUrl)
 
+		// 当没有背景音的时候 需要绑定事件
 
+		if(!state.accompany){
 
+			if(music){
 
+				music.addEventListener("play", onPlay);
 
+				music.addEventListener("ended", onEnded);
 
+			}			
+			if(beatMusic){
 
+				beatMusic.addEventListener("play", onPlay);
 
+				beatMusic.addEventListener("ended", onEnded);
 
+			}
 
+		}
 
+		audioData.combineMusicEles.push({
 
+			key: combineIndex,
 
+			value: music!,
 
+			beatValue: beatMusic!
 
+		})
 
+		// 当大于4个数据的时候 删除掉最前面的数据
 
+		if(audioData.combineMusicEles.length > 4){
 
+			audioData.combineMusicEles.splice(0,1)
 
+		}
 
+		audioData.songCollection.songEle = music
 
+		audioData.songCollection.beatSongEle = beatMusic!
 
+	}
 
+	audioData.combineIndex = combineIndex
 
+	state.music = musicUrl
 
+	state.playSource = "music"
 
+	// 当没有背景音文件的时候
 
+	if(!state.accompany) {
 
+		state.noMusicSource = false
 
+	}
 
+	showToast({
 
+		message:  "已开启原声",
 
+		position: "top",
 
+		className: "selectionToast",
 
+	});
 
+	state.isLoading = false;
 
+}
 
 export default defineComponent({
 
 	name: "audio-list",
 
 	setup() {
 
@@ -238,33 +377,6 @@ export default defineComponent({
 
 			}
 
 		);
 
 
-		const createAudio = (src?: string): Promise<HTMLAudioElement | null> => {
 
-			if(!src){
 
-				return Promise.resolve(null)
 
-			}
 
-			return new Promise((resolve) => {
 
-				const a = new Audio(src + '?v=' + Date.now());
 
-				a.onloadedmetadata = () => {
 
-					resolve(a);
 
-				};
 
-				a.onerror = () => {
 
-					resolve(null);
 
-				};
 
-				// 当未加载 资源之前 切换到其他浏览器标签，浏览器可能会禁止资源加载所以无法触发onloadedmetadata事件，导致一直在加载中，这里做个兼容
 
-				if (document.visibilityState === 'visible') {
 
-					a.load();
 
-				} else {
 
-					const onVisibilityChange = () => {
 
-						if (document.visibilityState === 'visible') {
 
-							document.removeEventListener('visibilitychange', onVisibilityChange);
 
-							a.load();
 
-						}
 
-					};
 
-					document.addEventListener('visibilitychange', onVisibilityChange);
 
-				}
 
-			});
 
-		};
 
-
 
 		/**
 
 		 * #11046
 
 		 * 声音与圆点消失的节点不一致，可能原因是部分安卓手机没有立即播放，所以需要等待有音频进度返回时再播放节拍器
 
@@ -338,46 +450,6 @@ export default defineComponent({
 
 		function loadBeatAudio(){
 
 			return Promise.all([createAudio(state.beatSong.music), createAudio(state.beatSong.accompany), createAudio(state.beatSong.fanSong), createAudio(state.beatSong.banSong), createAudio(state.beatSong.mingSong), createAudio(state.beatSong.mingSongGirl)])
 
 		}
 
-		// 合成节拍器资源
 
-		async function mergeBeatAudio(){
 
-			let beatMusic, beatAccompany
 
-			if(!state.isMixBeat) {
 
-				return [beatMusic, beatAccompany]
 
-			}
 
-			console.time("音频合成时间")
 
-			try{
 
-				const crunker = new Crunker()
 
-				console.time("音频加载时间")
 
-				const [musicBuff, accompanyBuff, tickBuff, tockBuff] = await crunker.fetchAudio(state.music?`${state.music}?v=${Date.now()}`:undefined, state.accompany?`${state.accompany}?v=${Date.now()}`:undefined, tickMp3, tockMp3)
 
-				console.timeEnd("音频加载时间")
 
-				// 计算音频空白时间
 
-				const silenceDuration = musicBuff&&!state.isEvxml ? crunker.calculateSilenceDuration(musicBuff) : 0
 
-				const silenceBgDuration = accompanyBuff&&!state.isEvxml ? crunker.calculateSilenceDuration(accompanyBuff) : 0
 
-				console.log(`音频空白时间:${silenceDuration};${silenceBgDuration}`)
 
-				const beats:AudioBuffer[] = []
 
-				const beatsTime:number[] = []
 
-				const beatsBgTime:number[] = []
 
-				metronomeData.metroMeasure.map(measures=>{
 
-					measures.map((item:any)=>{
 
-						beats.push(item.isTick?tickBuff!:tockBuff!)
 
-						beatsTime.push(item.time + silenceDuration) // xml 计算的时候 加上空白的时间
 
-						beatsBgTime.push(item.time + silenceBgDuration) // xml 计算的时候 加上空白的时间 没有背景不赋值
 
-					})
 
-				})
 
-				console.time("音频合并时间")
 
-				const musicBuffMeg = musicBuff && crunker.mergeAudioBuffers([musicBuff,...beats],[0,...beatsTime])
 
-				const accompanyBuffMeg = accompanyBuff && crunker.mergeAudioBuffers([accompanyBuff,...beats],[0,...beatsBgTime])
 
-				console.timeEnd("音频合并时间")
 
-				console.time("音频audioDom生成时间")
 
-				beatMusic = musicBuffMeg && crunker.exportAudioElement(musicBuffMeg)
 
-				beatAccompany = accompanyBuffMeg && crunker.exportAudioElement(accompanyBuffMeg)
 
-				console.timeEnd("音频audioDom生成时间")
 
-			}catch(err){
 
-				console.log(err)
 
-			}
 
-			console.timeEnd("音频合成时间")
 
-			return [beatMusic, beatAccompany]
 
-		}
 
 		onMounted(async () => {
 
 			// 预览的时候不走音频加载逻辑
 
 			if(state.isPreView){
 
@@ -430,7 +502,7 @@ export default defineComponent({
 
 				// 处理带节拍器的音源
 
 				//const [beatMusic, beatAccompany, beatFanSong, beatBanSong, beatMingSong, beatMingSongGirl] = await loadBeatAudio()
 
 				// 客户端合成节拍器
 
-				const [beatMusic, beatAccompany, beatFanSong, beatBanSong, beatMingSong, beatMingSongGirl] = await mergeBeatAudio()
 
+				const [beatMusic, beatAccompany, beatFanSong, beatBanSong, beatMingSong, beatMingSongGirl] = await mergeBeatAudio(state.music, state.accompany)
 
 				Object.assign(audioData.songCollection, {
 
 					beatSongEle:beatMusic,
 
 					beatBackgroundEle:beatAccompany,

BIN
src/view/music-score/combineAudio/imgs/lock.png
View File


BIN
src/view/music-score/combineAudio/imgs/open.png
View File


+ 18 - 0
src/view/music-score/combineAudio/index.module.less
View File 

@@ -0,0 +1,18 @@
 
+.combineAudio {
 
+   position: absolute;
 
+   left: 0;
 
+   top: 0;
 
+   z-index: 1;
 
+   .combineAudioImg {
 
+      position: absolute;
 
+      z-index: 119;
 
+      width: 22PX;
 
+      height: 22PX;
 
+      padding: 2PX;
 
+      transform: scale(var(--combineZoom));
 
+   }
 
+   &.play .combineAudioImg {
 
+      pointer-events: none;
 
+      opacity: 0.4;
 
+   }
 
+}

+ 68 - 0
src/view/music-score/combineAudio/index.tsx
View File 

@@ -0,0 +1,68 @@
 
+import { defineComponent, onMounted, ref, computed } from "vue"
 
+import styles from "./index.module.less"
 
+import { audioData, changeCombineAudio } from "/src/view/audio-list"
 
+import openImg from "./imgs/open.png"
 
+import lockImg from "./imgs/lock.png"
 
+import state from "/src/state"
 
+
 
+export default defineComponent({
 
+   name: "combineAudio",
 
+   setup(props, { emit }) {
 
+      const elementsData = ref<{ index: number; top: number; left: number }[]>([])
 
+      onMounted(() => {
 
+         const parent = document.querySelector("#osmdCanvasPage1")
 
+         const elements = document.querySelectorAll("g[data-trackIdx]")
 
+         const musicContainerPos = document.getElementById("musicAndSelection")?.getBoundingClientRect() || {
 
+            top: 0,
 
+            left: 0
 
+         }
 
+         const combineMusicsIndexs = Object.keys(audioData.combineMusics)
 
+         elements.forEach(element => {
 
+            const dataTrackIdx = element.getAttribute("data-trackIdx")
 
+            // 当有 dataTrackIdx 并且有原音的时候 显示
 
+            if (dataTrackIdx && combineMusicsIndexs.includes(dataTrackIdx)) {
 
+               const elementRect = element.getBoundingClientRect()
 
+               const height = elementRect.height
 
+               let top = elementRect.top + height / 2 - 11 - musicContainerPos.top
 
+               let left = elementRect.left - 22 - 10 - musicContainerPos.left
 
+               elementsData.value.push({
 
+                  index: parseInt(dataTrackIdx),
 
+                  top: top,
 
+                  left: left
 
+               })
 
+            }
 
+         })
 
+      })
 
+      const combineZoom = computed(() => {
 
+         let zoom = state.zoom
 
+         if (zoom < 1) {
 
+            zoom = 1
 
+         } else if (zoom > 1.5) {
 
+            zoom = 1.5
 
+         }
 
+         return zoom
 
+      })
 
+      return () => (
 
+         <>
 
+            <div class={[styles.combineAudio, state.playState === "play" && styles.play]}>
 
+               {elementsData.value.map(item => {
 
+                  return (
 
+                     <img
 
+                        class={styles.combineAudioImg}
 
+                        onClick={() => {
 
+                           changeCombineAudio(item.index)
 
+                        }}
 
+                        style={{
 
+                           top: item.top + "px",
 
+                           left: item.left - (combineZoom.value - 1) * 22 + "px",
 
+                           "--combineZoom": combineZoom.value
 
+                        }}
 
+                        src={audioData.combineIndex === item.index ? openImg : lockImg}
 
+                     />
 
+                  )
 
+               })}
 
+            </div>
 
+         </>
 
+      )
 
+   }
 
+})

+ 3 - 1
src/view/music-score/index.tsx
View File 

@@ -11,6 +11,7 @@ import { resetFormate, resetGivenFormate, setGlobalMusicSheet, limitSingleSvgPag
 
 import { setGlobalData } from "/src/utils";
 
 import { storeData } from "/src/store";
 
 import HorizontalDragScroll from './HorizontalDragScroll';
 
+import CombineAudio from './combineAudio';
 
 import { getQuery } from "/src/utils/queryString";
 
 
 export const musicRenderTypeKey = "musicRenderType";
 
@@ -139,7 +140,7 @@ export default defineComponent({
 
 				// osmd.EngravingRules.PageTopMargin = state.isPreView ? 1 : 3;
 
 				osmd.EngravingRules.PageTopMargin = (state.isPreView && state.musicRenderType === EnumMusicRenderType.staff) ? 1 : state.isPreView ? 2 : 3;
 
 				osmd.EngravingRules.PageTopMarginNarrow = 3;
 
-				osmd.EngravingRules.PageLeftMargin = 3.6;
 
+				osmd.EngravingRules.PageLeftMargin = state.isCombineRender ? 8 : 3.6;
 
 				osmd.EngravingRules.PageRightMargin = 3;
 
 				osmd.EngravingRules.BreathMarkDistance = 0.1; // 呼吸标记距离音符的位置，百分比
 
 				osmd.EngravingRules.PageBottomMargin = state.isSingleLine ? 2 : 18;
 
@@ -261,6 +262,7 @@ export default defineComponent({
 
 			>
 
 				{slots.default?.()}
 
 				{props.showSelection && musicData.showSelection && !state.isEvaluatReport &&!state.isSimplePage && !state.isPreView && state.musicRendered && <Selection />}
 
+				{props.showSelection && musicData.showSelection && state.isCombineRender &&!state.isSimplePage && !state.isPreView && state.musicRendered && <CombineAudio></CombineAudio> }
 
 			</div>
 
 		);
 
 	},

File diff suppressed because it is too large
+ 1 - 0
stats.html


+ 1 - 1
vite.config.ts
View File 

@@ -52,7 +52,7 @@ export default defineConfig({
 
     // https: true,
 
     proxy: {
 
       "^/instrument/.*": {
 
-        target: "https://test.gym.lexiaoya.cn",
 
+        target: "https://dev.gym.lexiaoya.cn",
 
         changeOrigin: true,
 
         rewrite: (path) => path.replace(/^\/instrument/, ""),
 
       },

Some files were not shown because too many files changed in this diff