更新合并

dist/assets/index-193c30fc.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-193c30fc.js
 import{d as i,E as l,U as d,by as e,K as r,S as c,j as s,aI as u}from"./index-7421ebbb.js";const f="_skeleton_vtlsh_1",m="_detail_vtlsh_12",p="_container_vtlsh_20",a={skeleton:f,detail:m,container:p},_=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{_ as default};
+========
+import{d as i,E as l,U as d,by as e,K as r,S as c,j as s,aI as u}from"./index-ced32dc0.js";const f="_skeleton_vtlsh_1",m="_detail_vtlsh_12",p="_container_vtlsh_20",a={skeleton:f,detail:m,container:p},_=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{_ as default};
+>>>>>>>> iteration-20231016:dist/assets/index-94934ce7.js

dist/assets/index-4e7f00bf.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-4e7f00bf.js
 import{d,r as i,U as p,S as e,x as r,j as o,ae as n}from"./index-7421ebbb.js";const c=d({name:"measureSpeed",setup(){const s=i(!1),t=p({speed:e.speed,originSpeed:e.originSpeed});return r(()=>e.section.length,()=>{if(e.modeType==="practise"){if(!s.value&&e.section.length===2){s.value=!0,t.speed=e.speed;const a=e.section[0].beatSpeed;e.originSpeed=a,n(a)}s.value&&e.section.length===0&&(s.value=!1,e.originSpeed=t.originSpeed,n(t.speed))}}),()=>o("div",null,null)}});export{c as M};
+========
+import{d,r as i,U as p,S as e,x as r,j as o,ae as n}from"./index-ced32dc0.js";const c=d({name:"measureSpeed",setup(){const s=i(!1),t=p({speed:e.speed,originSpeed:e.originSpeed});return r(()=>e.section.length,()=>{if(e.modeType==="practise"){if(!s.value&&e.section.length===2){s.value=!0,t.speed=e.speed;const a=e.section[0].beatSpeed;e.originSpeed=a,n(a)}s.value&&e.section.length===0&&(s.value=!1,e.originSpeed=t.originSpeed,n(t.speed))}}),()=>o("div",null,null)}});export{c as M};
+>>>>>>>> iteration-20231016:dist/assets/index-e0f328c3.js

dist/assets/index-94934ce7.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-193c30fc.js
+import{d as i,E as l,U as d,by as e,K as r,S as c,j as s,aI as u}from"./index-7421ebbb.js";const f="_skeleton_vtlsh_1",m="_detail_vtlsh_12",p="_container_vtlsh_20",a={skeleton:f,detail:m,container:p},_=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{_ as default};
+========
+import{d as i,E as l,U as d,by as e,K as r,S as c,j as s,aI as u}from"./index-ced32dc0.js";const f="_skeleton_vtlsh_1",m="_detail_vtlsh_12",p="_container_vtlsh_20",a={skeleton:f,detail:m,container:p},_=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{_ as default};
+>>>>>>>> iteration-20231016:dist/assets/index-94934ce7.js

dist/assets/index-a364d201.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-a364d201.js
 import{d as f,E as y,U as h,by as r,K as w,S as v,an as T,j as i,aI as b,A as _,ap as S}from"./index-7421ebbb.js";import{s as L}from"./instrument-e2436fef.js";import"./vue3-lottie.es-08f47283.js";import"./index-5cd74e9e.js";import"./index-d7338626.js";import"./index-11b8edf6.js";const x="_skeleton_vtlsh_1",A="_detail_vtlsh_12",N="_container_vtlsh_20",c={skeleton:x,detail:A,container:N},C=f({name:"music-list",setup(){const d=y(),o="productRenderType",e=h({isLoading:!0,isProductLoading:!1,step:0,product:[{state:!1,name:"五线谱",type:r.staff,base64:""},{state:!1,name:"首调",type:r.firstTone,base64:""},{state:!1,name:"固定调",type:r.fixedTone,base64:""}]});w(()=>{window.appName="colexiu",v.xmlUrl=d.xmlUrl,sessionStorage.setItem(o,e.product[e.step].type),T({message:"生成中",duration:0}),setTimeout(()=>{e.isLoading=!1},500)});const p=async()=>{var t;e.product[e.step].state=!0,e.product[e.step].base64=await l();try{console.log(JSON.parse(JSON.stringify(e.product)),e.step)}catch(n){}if(e.step+=1,e.step!==e.product.length){sessionStorage.setItem(o,e.product[e.step].type),_(()=>{e.isLoading=!0,setTimeout(()=>{e.isLoading=!1},500)});return}S(),console.log(e.product),(t=window.parent)==null||t.postMessage({api:"webApi_renderSvg",product:JSON.stringify(e.product)},"*")},l=()=>new Promise(t=>{setTimeout(async()=>{var n;try{const s=(n=document.getElementById("osmdSvgPage1"))==null?void 0:n.cloneNode(!0);if(!s){t("");return}const u=s.width.animVal.value,m=s.height.animVal.value,a=document.createElementNS("http://www.w3.org/2000/svg","rect");a.setAttribute("x","0"),a.setAttribute("y","0"),a.setAttribute("width",`${u*2}`),a.setAttribute("height",`${m*2}`),a.setAttribute("fill","#fff"),s.prepend(a);const g=L(s.outerHTML).toDataURL("image/png",1);t(g)}catch(s){t("")}},500)});return()=>i("div",{class:c.detail},[i("div",{id:"scrollContainer",class:[c.container,"hideCursor"]},[!e.isLoading&&i(b,{renderTypeKey:o,showSelection:!1,onRendered:p},null)])])}});export{C as default};
+========
+import{d as f,E as y,U as h,by as r,K as w,S as v,an as T,j as i,aI as b,A as _,ap as S}from"./index-ced32dc0.js";import{s as L}from"./instrument-8738d708.js";import"./vue3-lottie.es-d9306ad9.js";import"./index-c9c833f5.js";import"./index-c9721001.js";import"./index-710ea47e.js";const x="_skeleton_vtlsh_1",A="_detail_vtlsh_12",N="_container_vtlsh_20",c={skeleton:x,detail:A,container:N},C=f({name:"music-list",setup(){const d=y(),o="productRenderType",e=h({isLoading:!0,isProductLoading:!1,step:0,product:[{state:!1,name:"五线谱",type:r.staff,base64:""},{state:!1,name:"首调",type:r.firstTone,base64:""},{state:!1,name:"固定调",type:r.fixedTone,base64:""}]});w(()=>{window.appName="colexiu",v.xmlUrl=d.xmlUrl,sessionStorage.setItem(o,e.product[e.step].type),T({message:"生成中",duration:0}),setTimeout(()=>{e.isLoading=!1},500)});const p=async()=>{var t;e.product[e.step].state=!0,e.product[e.step].base64=await l();try{console.log(JSON.parse(JSON.stringify(e.product)),e.step)}catch(n){}if(e.step+=1,e.step!==e.product.length){sessionStorage.setItem(o,e.product[e.step].type),_(()=>{e.isLoading=!0,setTimeout(()=>{e.isLoading=!1},500)});return}S(),console.log(e.product),(t=window.parent)==null||t.postMessage({api:"webApi_renderSvg",product:JSON.stringify(e.product)},"*")},l=()=>new Promise(t=>{setTimeout(async()=>{var n;try{const s=(n=document.getElementById("osmdSvgPage1"))==null?void 0:n.cloneNode(!0);if(!s){t("");return}const u=s.width.animVal.value,m=s.height.animVal.value,a=document.createElementNS("http://www.w3.org/2000/svg","rect");a.setAttribute("x","0"),a.setAttribute("y","0"),a.setAttribute("width",`${u*2}`),a.setAttribute("height",`${m*2}`),a.setAttribute("fill","#fff"),s.prepend(a);const g=L(s.outerHTML).toDataURL("image/png",1);t(g)}catch(s){t("")}},500)});return()=>i("div",{class:c.detail},[i("div",{id:"scrollContainer",class:[c.container,"hideCursor"]},[!e.isLoading&&i(b,{renderTypeKey:o,showSelection:!1,onRendered:p},null)])])}});export{C as default};
+>>>>>>>> iteration-20231016:dist/assets/index-f5729471.js

dist/assets/index-e0f328c3.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-4e7f00bf.js
+import{d,r as i,U as p,S as e,x as r,j as o,ae as n}from"./index-7421ebbb.js";const c=d({name:"measureSpeed",setup(){const s=i(!1),t=p({speed:e.speed,originSpeed:e.originSpeed});return r(()=>e.section.length,()=>{if(e.modeType==="practise"){if(!s.value&&e.section.length===2){s.value=!0,t.speed=e.speed;const a=e.section[0].beatSpeed;e.originSpeed=a,n(a)}s.value&&e.section.length===0&&(s.value=!1,e.originSpeed=t.originSpeed,n(t.speed))}}),()=>o("div",null,null)}});export{c as M};
+========
+import{d,r as i,U as p,S as e,x as r,j as o,ae as n}from"./index-ced32dc0.js";const c=d({name:"measureSpeed",setup(){const s=i(!1),t=p({speed:e.speed,originSpeed:e.originSpeed});return r(()=>e.section.length,()=>{if(e.modeType==="practise"){if(!s.value&&e.section.length===2){s.value=!0,t.speed=e.speed;const a=e.section[0].beatSpeed;e.originSpeed=a,n(a)}s.value&&e.section.length===0&&(s.value=!1,e.originSpeed=t.originSpeed,n(t.speed))}}),()=>o("div",null,null)}});export{c as M};
+>>>>>>>> iteration-20231016:dist/assets/index-e0f328c3.js

dist/assets/index-f5729471.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-a364d201.js
+import{d as f,E as y,U as h,by as r,K as w,S as v,an as T,j as i,aI as b,A as _,ap as S}from"./index-7421ebbb.js";import{s as L}from"./instrument-e2436fef.js";import"./vue3-lottie.es-08f47283.js";import"./index-5cd74e9e.js";import"./index-d7338626.js";import"./index-11b8edf6.js";const x="_skeleton_vtlsh_1",A="_detail_vtlsh_12",N="_container_vtlsh_20",c={skeleton:x,detail:A,container:N},C=f({name:"music-list",setup(){const d=y(),o="productRenderType",e=h({isLoading:!0,isProductLoading:!1,step:0,product:[{state:!1,name:"五线谱",type:r.staff,base64:""},{state:!1,name:"首调",type:r.firstTone,base64:""},{state:!1,name:"固定调",type:r.fixedTone,base64:""}]});w(()=>{window.appName="colexiu",v.xmlUrl=d.xmlUrl,sessionStorage.setItem(o,e.product[e.step].type),T({message:"生成中",duration:0}),setTimeout(()=>{e.isLoading=!1},500)});const p=async()=>{var t;e.product[e.step].state=!0,e.product[e.step].base64=await l();try{console.log(JSON.parse(JSON.stringify(e.product)),e.step)}catch(n){}if(e.step+=1,e.step!==e.product.length){sessionStorage.setItem(o,e.product[e.step].type),_(()=>{e.isLoading=!0,setTimeout(()=>{e.isLoading=!1},500)});return}S(),console.log(e.product),(t=window.parent)==null||t.postMessage({api:"webApi_renderSvg",product:JSON.stringify(e.product)},"*")},l=()=>new Promise(t=>{setTimeout(async()=>{var n;try{const s=(n=document.getElementById("osmdSvgPage1"))==null?void 0:n.cloneNode(!0);if(!s){t("");return}const u=s.width.animVal.value,m=s.height.animVal.value,a=document.createElementNS("http://www.w3.org/2000/svg","rect");a.setAttribute("x","0"),a.setAttribute("y","0"),a.setAttribute("width",`${u*2}`),a.setAttribute("height",`${m*2}`),a.setAttribute("fill","#fff"),s.prepend(a);const g=L(s.outerHTML).toDataURL("image/png",1);t(g)}catch(s){t("")}},500)});return()=>i("div",{class:c.detail},[i("div",{id:"scrollContainer",class:[c.container,"hideCursor"]},[!e.isLoading&&i(b,{renderTypeKey:o,showSelection:!1,onRendered:p},null)])])}});export{C as default};
+========
+import{d as f,E as y,U as h,by as r,K as w,S as v,an as T,j as i,aI as b,A as _,ap as S}from"./index-ced32dc0.js";import{s as L}from"./instrument-8738d708.js";import"./vue3-lottie.es-d9306ad9.js";import"./index-c9c833f5.js";import"./index-c9721001.js";import"./index-710ea47e.js";const x="_skeleton_vtlsh_1",A="_detail_vtlsh_12",N="_container_vtlsh_20",c={skeleton:x,detail:A,container:N},C=f({name:"music-list",setup(){const d=y(),o="productRenderType",e=h({isLoading:!0,isProductLoading:!1,step:0,product:[{state:!1,name:"五线谱",type:r.staff,base64:""},{state:!1,name:"首调",type:r.firstTone,base64:""},{state:!1,name:"固定调",type:r.fixedTone,base64:""}]});w(()=>{window.appName="colexiu",v.xmlUrl=d.xmlUrl,sessionStorage.setItem(o,e.product[e.step].type),T({message:"生成中",duration:0}),setTimeout(()=>{e.isLoading=!1},500)});const p=async()=>{var t;e.product[e.step].state=!0,e.product[e.step].base64=await l();try{console.log(JSON.parse(JSON.stringify(e.product)),e.step)}catch(n){}if(e.step+=1,e.step!==e.product.length){sessionStorage.setItem(o,e.product[e.step].type),_(()=>{e.isLoading=!0,setTimeout(()=>{e.isLoading=!1},500)});return}S(),console.log(e.product),(t=window.parent)==null||t.postMessage({api:"webApi_renderSvg",product:JSON.stringify(e.product)},"*")},l=()=>new Promise(t=>{setTimeout(async()=>{var n;try{const s=(n=document.getElementById("osmdSvgPage1"))==null?void 0:n.cloneNode(!0);if(!s){t("");return}const u=s.width.animVal.value,m=s.height.animVal.value,a=document.createElementNS("http://www.w3.org/2000/svg","rect");a.setAttribute("x","0"),a.setAttribute("y","0"),a.setAttribute("width",`${u*2}`),a.setAttribute("height",`${m*2}`),a.setAttribute("fill","#fff"),s.prepend(a);const g=L(s.outerHTML).toDataURL("image/png",1);t(g)}catch(s){t("")}},500)});return()=>i("div",{class:c.detail},[i("div",{id:"scrollContainer",class:[c.container,"hideCursor"]},[!e.isLoading&&i(b,{renderTypeKey:o,showSelection:!1,onRendered:p},null)])])}});export{C as default};
+>>>>>>>> iteration-20231016:dist/assets/index-f5729471.js

dist/assets/index-legacy-10b95896.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-legacy-f327b771.js
+System.register(["./index-legacy-1573d689.js"],(function(e,n){"use strict";var i,t,s,r,d,p,o;return{setters:[e=>{i=e.d,t=e.r,s=e.U,r=e.S,d=e.x,p=e.j,o=e.ae}],execute:function(){e("M",i({name:"measureSpeed",setup(){const e=t(!1),n=s({speed:r.speed,originSpeed:r.originSpeed});return d((()=>r.section.length),(()=>{if("practise"===r.modeType){if(!e.value&&2===r.section.length){e.value=!0,n.speed=r.speed;const i=r.section[0].beatSpeed;r.originSpeed=i,o(i)}e.value&&0===r.section.length&&(e.value=!1,r.originSpeed=n.originSpeed,o(n.speed))}})),()=>p("div",null,null)}}))}}}));
+========
+System.register(["./index-legacy-e504e01a.js"],(function(e,n){"use strict";var i,t,s,r,d,p,o;return{setters:[e=>{i=e.d,t=e.r,s=e.U,r=e.S,d=e.x,p=e.j,o=e.ae}],execute:function(){e("M",i({name:"measureSpeed",setup(){const e=t(!1),n=s({speed:r.speed,originSpeed:r.originSpeed});return d((()=>r.section.length),(()=>{if("practise"===r.modeType){if(!e.value&&2===r.section.length){e.value=!0,n.speed=r.speed;const i=r.section[0].beatSpeed;r.originSpeed=i,o(i)}e.value&&0===r.section.length&&(e.value=!1,r.originSpeed=n.originSpeed,o(n.speed))}})),()=>p("div",null,null)}}))}}}));
+>>>>>>>> iteration-20231016:dist/assets/index-legacy-10b95896.js

dist/assets/index-legacy-80eb11dc.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-legacy-80eb11dc.js
 System.register(["./index-legacy-1573d689.js"],(function(e,t){"use strict";var i,n,a,o,r,s,d,l,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.E,a=e.U,o=e.by,r=e.K,s=e.S,d=e.j,l=e.aI}],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()=>d("div",{class:t},[d("div",{id:"scrollContainer",class:[c,"hideCursor"]},[!i.isLoading&&d(l,{onRendered:h},null)])])}}))}}}));
+========
+System.register(["./index-legacy-e504e01a.js"],(function(e,t){"use strict";var i,n,a,o,r,s,d,l,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.E,a=e.U,o=e.by,r=e.K,s=e.S,d=e.j,l=e.aI}],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()=>d("div",{class:t},[d("div",{id:"scrollContainer",class:[c,"hideCursor"]},[!i.isLoading&&d(l,{onRendered:h},null)])])}}))}}}));
+>>>>>>>> iteration-20231016:dist/assets/index-legacy-b7847ab2.js

dist/assets/index-legacy-b7847ab2.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-legacy-80eb11dc.js
+System.register(["./index-legacy-1573d689.js"],(function(e,t){"use strict";var i,n,a,o,r,s,d,l,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.E,a=e.U,o=e.by,r=e.K,s=e.S,d=e.j,l=e.aI}],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()=>d("div",{class:t},[d("div",{id:"scrollContainer",class:[c,"hideCursor"]},[!i.isLoading&&d(l,{onRendered:h},null)])])}}))}}}));
+========
+System.register(["./index-legacy-e504e01a.js"],(function(e,t){"use strict";var i,n,a,o,r,s,d,l,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.E,a=e.U,o=e.by,r=e.K,s=e.S,d=e.j,l=e.aI}],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()=>d("div",{class:t},[d("div",{id:"scrollContainer",class:[c,"hideCursor"]},[!i.isLoading&&d(l,{onRendered:h},null)])])}}))}}}));
+>>>>>>>> iteration-20231016:dist/assets/index-legacy-b7847ab2.js

dist/assets/index-legacy-f327b771.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-legacy-f327b771.js
 System.register(["./index-legacy-1573d689.js"],(function(e,n){"use strict";var i,t,s,r,d,p,o;return{setters:[e=>{i=e.d,t=e.r,s=e.U,r=e.S,d=e.x,p=e.j,o=e.ae}],execute:function(){e("M",i({name:"measureSpeed",setup(){const e=t(!1),n=s({speed:r.speed,originSpeed:r.originSpeed});return d((()=>r.section.length),(()=>{if("practise"===r.modeType){if(!e.value&&2===r.section.length){e.value=!0,n.speed=r.speed;const i=r.section[0].beatSpeed;r.originSpeed=i,o(i)}e.value&&0===r.section.length&&(e.value=!1,r.originSpeed=n.originSpeed,o(n.speed))}})),()=>p("div",null,null)}}))}}}));
+========
+System.register(["./index-legacy-e504e01a.js"],(function(e,n){"use strict";var i,t,s,r,d,p,o;return{setters:[e=>{i=e.d,t=e.r,s=e.U,r=e.S,d=e.x,p=e.j,o=e.ae}],execute:function(){e("M",i({name:"measureSpeed",setup(){const e=t(!1),n=s({speed:r.speed,originSpeed:r.originSpeed});return d((()=>r.section.length),(()=>{if("practise"===r.modeType){if(!e.value&&2===r.section.length){e.value=!0,n.speed=r.speed;const i=r.section[0].beatSpeed;r.originSpeed=i,o(i)}e.value&&0===r.section.length&&(e.value=!1,r.originSpeed=n.originSpeed,o(n.speed))}})),()=>p("div",null,null)}}))}}}));
+>>>>>>>> iteration-20231016:dist/assets/index-legacy-10b95896.js

dist/colexiu.html

@@ -40,11 +40,19 @@
       },
     })
   </script>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/colexiu-45e18703.js"></script>
   <link rel="modulepreload" crossorigin href="./assets/index-7421ebbb.js">
   <link rel="modulepreload" crossorigin href="./assets/index-5cd74e9e.js">
   <link rel="modulepreload" crossorigin href="./assets/vue3-lottie.es-08f47283.js">
   <link rel="modulepreload" crossorigin href="./assets/index-4e7f00bf.js">
+=======
+  <script type="module" crossorigin src="./assets/colexiu-deea88ed.js"></script>
+  <link rel="modulepreload" crossorigin href="./assets/index-ced32dc0.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-c9c833f5.js">
+  <link rel="modulepreload" crossorigin href="./assets/vue3-lottie.es-d9306ad9.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-e0f328c3.js">
+>>>>>>> iteration-20231016
   <link rel="stylesheet" href="./assets/index-96ddda46.css">
   <link rel="stylesheet" href="./assets/index-cc0254c0.css">
   <link rel="stylesheet" href="./assets/colexiu-4a62fa3a.css">
@@ -58,7 +66,11 @@
   
   <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>
   <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-72e42ccb.js"></script>
+<<<<<<< HEAD
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/colexiu-legacy-b5d50ec6.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/colexiu-legacy-f6f14ad5.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> iteration-20231016
 </body>
 
 </html>

dist/index.html

@@ -75,12 +75,21 @@
       }
     })
   </script>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/index-75965270.js"></script>
   <link rel="modulepreload" crossorigin href="./assets/index-7421ebbb.js">
   <link rel="modulepreload" crossorigin href="./assets/index-5cd74e9e.js">
   <link rel="modulepreload" crossorigin href="./assets/index-11b8edf6.js">
   <link rel="modulepreload" crossorigin href="./assets/index-7b0c408e.js">
   <link rel="modulepreload" crossorigin href="./assets/index-4e7f00bf.js">
+=======
+  <script type="module" crossorigin src="./assets/index-ff4b61f8.js"></script>
+  <link rel="modulepreload" crossorigin href="./assets/index-ced32dc0.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-c9c833f5.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-710ea47e.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-92293534.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-e0f328c3.js">
+>>>>>>> iteration-20231016
   <link rel="modulepreload" crossorigin href="./assets/plyr.min-424cfb91.js">
   <link rel="stylesheet" href="./assets/index-96ddda46.css">
   <link rel="stylesheet" href="./assets/index-cc0254c0.css">
@@ -101,7 +110,11 @@
   
   <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>
   <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-72e42ccb.js"></script>
+<<<<<<< HEAD
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/index-legacy-05a8c7c7.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/index-legacy-9156e647.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> iteration-20231016
 </body>
 
 </html>

dist/instrument.html

@@ -42,12 +42,21 @@
     }
 
   </script>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/instrument-e2436fef.js"></script>
   <link rel="modulepreload" crossorigin href="./assets/index-7421ebbb.js">
   <link rel="modulepreload" crossorigin href="./assets/vue3-lottie.es-08f47283.js">
   <link rel="modulepreload" crossorigin href="./assets/index-5cd74e9e.js">
   <link rel="modulepreload" crossorigin href="./assets/index-d7338626.js">
   <link rel="modulepreload" crossorigin href="./assets/index-11b8edf6.js">
+=======
+  <script type="module" crossorigin src="./assets/instrument-8738d708.js"></script>
+  <link rel="modulepreload" crossorigin href="./assets/index-ced32dc0.js">
+  <link rel="modulepreload" crossorigin href="./assets/vue3-lottie.es-d9306ad9.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-c9c833f5.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-c9721001.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-710ea47e.js">
+>>>>>>> iteration-20231016
   <link rel="stylesheet" href="./assets/index-96ddda46.css">
   <link rel="stylesheet" href="./assets/index-cc0254c0.css">
   <link rel="stylesheet" href="./assets/instrument-853b1ddb.css">
@@ -61,7 +70,11 @@
   
   <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>
   <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-72e42ccb.js"></script>
+<<<<<<< HEAD
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/instrument-legacy-e9b137ac.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/instrument-legacy-6132e6dc.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> iteration-20231016
 </body>
 
 </html>

dist/orchestra.html

@@ -41,6 +41,7 @@
       transition: opacity .3s;
     }
   </style>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/orchestra-615bb74c.js"></script>
   <link rel="modulepreload" crossorigin href="./assets/index-7421ebbb.js">
   <link rel="modulepreload" crossorigin href="./assets/index-5cd74e9e.js">
@@ -48,6 +49,15 @@
   <link rel="modulepreload" crossorigin href="./assets/index-7b0c408e.js">
   <link rel="modulepreload" crossorigin href="./assets/index-4e7f00bf.js">
   <link rel="modulepreload" crossorigin href="./assets/index-d7338626.js">
+=======
+  <script type="module" crossorigin src="./assets/orchestra-6cef8d26.js"></script>
+  <link rel="modulepreload" crossorigin href="./assets/index-ced32dc0.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-c9c833f5.js">
+  <link rel="modulepreload" crossorigin href="./assets/vue3-lottie.es-d9306ad9.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-92293534.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-e0f328c3.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-c9721001.js">
+>>>>>>> iteration-20231016
   <link rel="stylesheet" href="./assets/index-96ddda46.css">
   <link rel="stylesheet" href="./assets/index-cc0254c0.css">
   <link rel="stylesheet" href="./assets/index-85f95688.css">
@@ -73,7 +83,11 @@
   
   <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>
   <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-72e42ccb.js"></script>
+<<<<<<< HEAD
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/orchestra-legacy-0b505c36.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/orchestra-legacy-f468e976.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> iteration-20231016
 </body>
 
 </html>

dist/report-share.html

@@ -25,8 +25,13 @@
       transition: opacity .3s;
     }
   </style>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/report-share-90271d19.js"></script>
   <link rel="modulepreload" crossorigin href="./assets/index-7421ebbb.js">
+=======
+  <script type="module" crossorigin src="./assets/report-share-605d7999.js"></script>
+  <link rel="modulepreload" crossorigin href="./assets/index-ced32dc0.js">
+>>>>>>> iteration-20231016
   <link rel="modulepreload" crossorigin href="./assets/plyr.min-424cfb91.js">
   <link rel="stylesheet" href="./assets/index-96ddda46.css">
   <link rel="stylesheet" href="./assets/plyr-ad8ef5ae.css">
@@ -52,7 +57,11 @@
   
   <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>
   <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-72e42ccb.js"></script>
+<<<<<<< HEAD
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/report-share-legacy-3592adac.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/report-share-legacy-d18dc680.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> iteration-20231016
 </body>
 
 </html>

src/page-instrument/evaluat-model/index.tsx

@@ -1,12 +1,5 @@
 import { Transition, defineComponent, onMounted, reactive, watch } from "vue";
-import {
-	connectWebsocket,
-	evaluatingData,
-	handleEndBegin,
-	handleStartBegin,
-	handleStartEvaluat,
-	handleViewReport,
-} from "/src/view/evaluating";
+import { connectWebsocket, evaluatingData, handleEndBegin, handleStartBegin, handleStartEvaluat, handleViewReport } from "/src/view/evaluating";
 import Earphone from "./earphone";
 import styles from "./index.module.less";
 import SoundEffect from "./sound-effect";
@@ -31,282 +24,266 @@ import DelayCheck from "./delay-check";
 type TCriteria = "frequency" | "amplitude" | "decibels";
 
 export default defineComponent({
-	name: "evaluat-model",
-	setup() {
-		const evaluatModel = reactive({
-			tips: true,
-			evaluatUpdateAudio: false,
-			isSaveVideo: state.setting.camera && state.setting.saveToAlbum,
-			shareMode: false,
-		});
-		
-		/**
-		 * 执行检测
-		 */
-		const handlePerformDetection = async () => {
-			// 检测完成不检测了
-			if (evaluatingData.checkEnd) return;
-			// 延迟检测
-			if (evaluatingData.checkStep === 0) {
-				evaluatingData.checkStep = 10;
-				// 没有设备延迟数据 或 开启了效音 显示检测组件,并持续检测耳机状态
-				if (state.setting.soundEffect) {
-					evaluatingData.soundEffectMode = true;
-					return;
-				}
-				const delayData = await api_getDeviceDelay();
-				// console.log("🚀 ~ delayTime:", delayData);
-				if (delayData && delayData.content?.value < 0) {	
-					evaluatingData.soundEffectMode = true;
-					return;
-				}
-				handlePerformDetection();
-				return;
-			}
-			// 效验完成
-			if (evaluatingData.checkStep === 10) {
-				evaluatingData.checkEnd = true;
-				console.log("检测结束,生成数据");
-				handleConnect();
-			}
-		};
-		const browserInfo = browser();
-		/** 是否是节奏练习 */
-		const isRhythmicExercises = () => {
-			const examSongName = state.examSongName || "";
-			return examSongName.indexOf("节奏练习") > -1;
-		};
+  name: "evaluat-model",
+  setup() {
+    const evaluatModel = reactive({
+      tips: true,
+      evaluatUpdateAudio: false,
+      isSaveVideo: state.setting.camera && state.setting.saveToAlbum,
+      shareMode: false,
+    });
 
-		/** 获取评测标准 */
-		const getEvaluationCriteria = () => {
-			let criteria: TCriteria = "frequency";
-			// 声部打击乐
-			if ([23, 113, 121].includes(state.subjectId)) {
-				criteria = "amplitude";
-			} else if (isRhythmicExercises()) {
-				// 分类为节奏练习
-				criteria = "decibels";
-			}
-			return criteria;
-		};
+    /**
+     * 执行检测
+     */
+    const handlePerformDetection = async () => {
+      console.log(evaluatingData.checkStep, evaluatingData, "检测");
+      // 检测完成不检测了
+      if (evaluatingData.checkEnd) return;
+      // 延迟检测
 
-		/** 生成评测曲谱数据 */
-		const formatTimes = () => {
-			let ListenMode = false;
-			let dontEvaluatingMode = false;
-			let skip = false;
-			const datas = [];
-			for (let index = 0; index < state.times.length; index++) {
-				const item = state.times[index];
-				const note = getNoteByMeasuresSlursStart(item);
-				const rate = state.speed / state.originSpeed;
-				const difftime = item.difftime;
-				const start = difftime + (item.sourceRelativeTime || item.relativeTime);
-				const end = difftime + (item.sourceRelaEndtime || item.relaEndtime);
-				const isStaccato = note.noteElement.voiceEntry.isStaccato();
-				const noteRate = isStaccato ? 0.5 : 1;
-				if (note.formatLyricsEntries.contains("Play") || note.formatLyricsEntries.contains("Play...")) {
-					ListenMode = false;
-				}
-				if (note.formatLyricsEntries.contains("Listen")) {
-					ListenMode = true;
-				}
-				if (note.formatLyricsEntries.contains("纯律结束")) {
-					dontEvaluatingMode = false;
-				}
-				if (note.formatLyricsEntries.contains("纯律")) {
-					dontEvaluatingMode = true;
-				}
-				const nextNote = state.times[index + 1];
-				// console.log("noteinfo", note.noteElement.isRestFlag && !!note.stave && !!nextNote)
-				if (
-					skip &&
-					(note.stave || !item.noteElement.isRestFlag || (nextNote && !nextNote.noteElement.isRestFlag))
-				) {
-					skip = false;
-				}
-				if (
-					note.noteElement.isRestFlag &&
-					!!note.stave &&
-					!!nextNote &&
-					nextNote.noteElement.isRestFlag
-				) {
-					skip = true;
-				}
-				// console.log(note.measureOpenIndex, item.measureOpenIndex, note);
-				// console.log("skip", skip)
-				const data = {
-					timeStamp: (start * 1000) / rate,
-					duration: ((end * 1000) / rate - (start * 1000) / rate) * noteRate,
-					frequency: item.frequency,
-					nextFrequency: item.nextFrequency,
-					prevFrequency: item.prevFrequency,
-					// 重复的情况index会自然累加,render的index是谱面渲染的index
-					measureIndex: note.measureOpenIndex,
-					measureRenderIndex: item.measureListIndex,
-					dontEvaluating: ListenMode || dontEvaluatingMode || item.skipMode,
-					musicalNotesIndex: item.i,
-					denominator: note.noteElement?.Length.denominator,
-					isOrnament: !!note?.voiceEntry?.ornamentContainer,
-				};
-				datas.push(data);
-			}
-			return datas;
-		};
-		/** 连接websocket */
-		const handleConnect = async () => {
-			const behaviorId = localStorage.getItem("behaviorId") || undefined;
-			const rate = state.speed / state.originSpeed;
-			const content = {
-				musicXmlInfos: formatTimes(),
-				subjectId: state.subjectId,
-				detailId: state.detailId,
-				examSongId: state.examSongId,
-				xmlUrl: state.xmlUrl,
-				partIndex: state.partIndex,
-				behaviorId,
-				platform: browserInfo.ios ? "IOS" : browserInfo.android ? "ANDROID" : "WEB",
-				clientId:
-					storeData.platformType === "STUDENT"
-						? "student"
-						: storeData.platformType === "TEACHER"
-						? "teacher"
-						: "education",
-				hertz: state.setting.frequency,
-				reactionTimeMs: state.setting.reactionTimeMs,
-				speed: state.speed,
-				heardLevel: state.setting.evaluationDifficulty,
-				beatLength: Math.round((state.fixtime * 1000) / rate),
-				evaluationCriteria: getEvaluationCriteria(),
-			};
-			await connectWebsocket(content);
-			// state.playSource = "music";
-		};
+      if (evaluatingData.checkStep === 0) {
+        evaluatingData.checkStep = 10;
+        // 没有设备延迟数据 或 开启了效音 显示检测组件,并持续检测耳机状态
 
-		/** 评测结果按钮处理 */
-		const handleEvaluatResult = (type: "practise" | "tryagain" | "look" | "share" | "update") => {
-			if (type === "update") {
-				if (evaluatingData.resultData?.recordIdStr || evaluatingData.resultData?.recordId) {
-					// 上传云端
-					// evaluatModel.evaluatUpdateAudio = true;
-					api_openAdjustRecording({
-						recordId: evaluatingData.resultData?.recordIdStr || evaluatingData.resultData?.recordId,
-						title: state.examSongName || '曲谱演奏',
-						coverImg: state.coverImg,
-					});
-					return;
-				}
-			} else if (type === "share") {
-				// 分享
-				evaluatModel.shareMode = true;
-				return;
-			} else if (type === "look") {
-				// 跳转
-				handleViewReport("recordId", "instrument");
-				return;
-			} else if (type === "practise") {
-				// 去练习
-				handleStartEvaluat();
-			} else if (type === "tryagain") {
-				// 再来一次
-				handleStartBegin();
-			}
-			evaluatingData.resulstMode = false;
-		};
+        if (state.setting.soundEffect) {
+          evaluatingData.soundEffectMode = true;
+          return;
+        }
+        // 判断只有开始了设备检测之后才去调用api
+        if (state.setting.soundEffect) {
+          const delayData = await api_getDeviceDelay();
+          // console.log("🚀 ~ delayTime:", delayData);
+          if (delayData && delayData.content?.value < 0) {
+            evaluatingData.soundEffectMode = true;
+            return;
+          }
+        }
 
-		/** 上传音视频 */
-		const hanldeUpdateVideoAndAudio = async (update = false) => {
-			if (!update) {
-				evaluatModel.evaluatUpdateAudio = false;
-				return;
-			}
-			if (state.setting.camera && state.setting.saveToAlbum) {
-				evaluatModel.evaluatUpdateAudio = false;
-				api_videoUpdate((res: any) => {
-					if (res) {
-						if (res?.content?.type === "success") {
-							handleSaveResult({
-								id: evaluatingData.resultData?.recordId,
-								videoFilePath: res?.content?.filePath,
-							});
-						} else if (res?.content?.type === "error") {
-							showToast({
-								message: res.content?.message || "上传失败",
-							});
-						}
-					}
-				});
-				return;
-			}
-			evaluatModel.evaluatUpdateAudio = false;
-			showToast("上传成功");
-		};
-		const handleSaveResult = async (_body: any) => {
-			await api_musicPracticeRecordVideoUpload(_body);
-			showToast("上传成功");
-		};
+        handlePerformDetection();
+        return;
+      }
+      // 效验完成
+      if (evaluatingData.checkStep === 10) {
+        evaluatingData.checkEnd = true;
+        console.log("检测结束,生成数据");
+        handleConnect();
+      }
+    };
+    const browserInfo = browser();
+    /** 是否是节奏练习 */
+    const isRhythmicExercises = () => {
+      const examSongName = state.examSongName || "";
+      return examSongName.indexOf("节奏练习") > -1;
+    };
 
-		onMounted(() => {
-			evaluatingData.isDisabledPlayMusic = true
-			handlePerformDetection();
-		});
-		return () => (
-			<div>
-				<Transition name="pop-center">
-					{evaluatingData.websocketState && !evaluatingData.startBegin && evaluatingData.checkEnd && (
-						<div class={styles.startBtn} onClick={handleStartBegin}>
-							<img src={iconEvaluat.evaluatingStart} />
-						</div>
-					)}
-				</Transition>
-				<Transition name="pop-center">
-					{evaluatingData.websocketState && evaluatingData.startBegin && (
-						<div class={styles.endBtn} onClick={() => handleEndBegin()}>
-							<img src={iconEvaluat.evaluatingEnd} />
-						</div>
-					)}
-				</Transition>
+    /** 获取评测标准 */
+    const getEvaluationCriteria = () => {
+      let criteria: TCriteria = "frequency";
+      // 声部打击乐
+      if ([23, 113, 121].includes(state.subjectId)) {
+        criteria = "amplitude";
+      } else if (isRhythmicExercises()) {
+        // 分类为节奏练习
+        criteria = "decibels";
+      }
+      return criteria;
+    };
 
-				<div
-					style={{ display: !evaluatingData.startBegin ? "" : "none" }}
-					class={styles.dialogueBox}
-					key="start"
-				>
-					<div class={styles.dialogue}>
-						<img class={styles.dialoguebg} src={iconTastBg} />
-						<div>演奏前请调整好乐器，保证最佳演奏状态。</div>
-					</div>
-					<Vue3Lottie class={styles.dialogueIcon} animationData={startData}></Vue3Lottie>
-				</div>
-				<div
-					style={{ display: evaluatingData.startBegin ? "" : "none" }}
-					class={styles.dialogueBox}
-					key="start"
-				>
-					<div class={styles.dialogueing}>收音中...</div>
-					<Vue3Lottie class={styles.dialogueIcon} animationData={startingData}></Vue3Lottie>
-				</div>
+    /** 生成评测曲谱数据 */
+    const formatTimes = () => {
+      let ListenMode = false;
+      let dontEvaluatingMode = false;
+      let skip = false;
+      const datas = [];
+      for (let index = 0; index < state.times.length; index++) {
+        const item = state.times[index];
+        const note = getNoteByMeasuresSlursStart(item);
+        const rate = state.speed / state.originSpeed;
+        const difftime = item.difftime;
+        const start = difftime + (item.sourceRelativeTime || item.relativeTime);
+        const end = difftime + (item.sourceRelaEndtime || item.relaEndtime);
+        const isStaccato = note.noteElement.voiceEntry.isStaccato();
+        const noteRate = isStaccato ? 0.5 : 1;
+        if (note.formatLyricsEntries.contains("Play") || note.formatLyricsEntries.contains("Play...")) {
+          ListenMode = false;
+        }
+        if (note.formatLyricsEntries.contains("Listen")) {
+          ListenMode = true;
+        }
+        if (note.formatLyricsEntries.contains("纯律结束")) {
+          dontEvaluatingMode = false;
+        }
+        if (note.formatLyricsEntries.contains("纯律")) {
+          dontEvaluatingMode = true;
+        }
+        const nextNote = state.times[index + 1];
+        // console.log("noteinfo", note.noteElement.isRestFlag && !!note.stave && !!nextNote)
+        if (skip && (note.stave || !item.noteElement.isRestFlag || (nextNote && !nextNote.noteElement.isRestFlag))) {
+          skip = false;
+        }
+        if (note.noteElement.isRestFlag && !!note.stave && !!nextNote && nextNote.noteElement.isRestFlag) {
+          skip = true;
+        }
+        // console.log(note.measureOpenIndex, item.measureOpenIndex, note);
+        // console.log("skip", skip)
+        const data = {
+          timeStamp: (start * 1000) / rate,
+          duration: ((end * 1000) / rate - (start * 1000) / rate) * noteRate,
+          frequency: item.frequency,
+          nextFrequency: item.nextFrequency,
+          prevFrequency: item.prevFrequency,
+          // 重复的情况index会自然累加,render的index是谱面渲染的index
+          measureIndex: note.measureOpenIndex,
+          measureRenderIndex: item.measureListIndex,
+          dontEvaluating: ListenMode || dontEvaluatingMode || item.skipMode,
+          musicalNotesIndex: item.i,
+          denominator: note.noteElement?.Length.denominator,
+          isOrnament: !!note?.voiceEntry?.ornamentContainer,
+        };
+        datas.push(data);
+      }
+      return datas;
+    };
+    /** 连接websocket */
+    const handleConnect = async () => {
+      const behaviorId = localStorage.getItem("behaviorId") || undefined;
+      const rate = state.speed / state.originSpeed;
+      const content = {
+        musicXmlInfos: formatTimes(),
+        subjectId: state.subjectId,
+        detailId: state.detailId,
+        examSongId: state.examSongId,
+        xmlUrl: state.xmlUrl,
+        partIndex: state.partIndex,
+        behaviorId,
+        platform: browserInfo.ios ? "IOS" : browserInfo.android ? "ANDROID" : "WEB",
+        clientId: storeData.platformType === "STUDENT" ? "student" : storeData.platformType === "TEACHER" ? "teacher" : "education",
+        hertz: state.setting.frequency,
+        reactionTimeMs: state.setting.reactionTimeMs,
+        speed: state.speed,
+        heardLevel: state.setting.evaluationDifficulty,
+        beatLength: Math.round((state.fixtime * 1000) / rate),
+        evaluationCriteria: getEvaluationCriteria(),
+      };
+      await connectWebsocket(content);
+      // state.playSource = "music";
+    };
 
-				{evaluatingData.soundEffectMode && <DelayCheck onClose={() => {
-					evaluatingData.soundEffectMode = false;
-					handlePerformDetection();
-				}} />}
+    /** 评测结果按钮处理 */
+    const handleEvaluatResult = (type: "practise" | "tryagain" | "look" | "share" | "update") => {
+      if (type === "update") {
+        if (evaluatingData.resultData?.recordIdStr || evaluatingData.resultData?.recordId) {
+          // 上传云端
+          // evaluatModel.evaluatUpdateAudio = true;
+          api_openAdjustRecording({
+            recordId: evaluatingData.resultData?.recordIdStr || evaluatingData.resultData?.recordId,
+            title: state.examSongName || "曲谱演奏",
+            coverImg: state.coverImg,
+          });
+          return;
+        }
+      } else if (type === "share") {
+        // 分享
+        evaluatModel.shareMode = true;
+        return;
+      } else if (type === "look") {
+        // 跳转
+        handleViewReport("recordId", "instrument");
+        return;
+      } else if (type === "practise") {
+        // 去练习
+        handleStartEvaluat();
+      } else if (type === "tryagain") {
+        // 再来一次
+        handleStartBegin();
+      }
+      evaluatingData.resulstMode = false;
+    };
 
-				<Popup
-					teleport="body"
-					closeOnClickOverlay={false}
-					class={["popup-custom", "van-scale"]}
-					transition="van-scale"
-					v-model:show={evaluatingData.earphoneMode}
-				>
-					<Earphone
-						onClose={() => {
-							evaluatingData.earphoneMode = false;
-							handlePerformDetection();
-						}}
-					/>
-				</Popup>
-				{/* <Popup
+    /** 上传音视频 */
+    const hanldeUpdateVideoAndAudio = async (update = false) => {
+      if (!update) {
+        evaluatModel.evaluatUpdateAudio = false;
+        return;
+      }
+      if (state.setting.camera && state.setting.saveToAlbum) {
+        evaluatModel.evaluatUpdateAudio = false;
+        api_videoUpdate((res: any) => {
+          if (res) {
+            if (res?.content?.type === "success") {
+              handleSaveResult({
+                id: evaluatingData.resultData?.recordId,
+                videoFilePath: res?.content?.filePath,
+              });
+            } else if (res?.content?.type === "error") {
+              showToast({
+                message: res.content?.message || "上传失败",
+              });
+            }
+          }
+        });
+        return;
+      }
+      evaluatModel.evaluatUpdateAudio = false;
+      showToast("上传成功");
+    };
+    const handleSaveResult = async (_body: any) => {
+      await api_musicPracticeRecordVideoUpload(_body);
+      showToast("上传成功");
+    };
+
+    onMounted(() => {
+      evaluatingData.isDisabledPlayMusic = true;
+      handlePerformDetection();
+    });
+    return () => (
+      <div>
+        <Transition name="pop-center">
+          {evaluatingData.websocketState && !evaluatingData.startBegin && evaluatingData.checkEnd && (
+            <div class={styles.startBtn} onClick={handleStartBegin}>
+              <img src={iconEvaluat.evaluatingStart} />
+            </div>
+          )}
+        </Transition>
+        <Transition name="pop-center">
+          {evaluatingData.websocketState && evaluatingData.startBegin && (
+            <div class={styles.endBtn} onClick={() => handleEndBegin()}>
+              <img src={iconEvaluat.evaluatingEnd} />
+            </div>
+          )}
+        </Transition>
+
+        <div style={{ display: !evaluatingData.startBegin ? "" : "none" }} class={styles.dialogueBox} key="start">
+          <div class={styles.dialogue}>
+            <img class={styles.dialoguebg} src={iconTastBg} />
+            <div>演奏前请调整好乐器，保证最佳演奏状态。</div>
+          </div>
+          <Vue3Lottie class={styles.dialogueIcon} animationData={startData}></Vue3Lottie>
+        </div>
+        <div style={{ display: evaluatingData.startBegin ? "" : "none" }} class={styles.dialogueBox} key="start">
+          <div class={styles.dialogueing}>收音中...</div>
+          <Vue3Lottie class={styles.dialogueIcon} animationData={startingData}></Vue3Lottie>
+        </div>
+
+        {evaluatingData.soundEffectMode && (
+          <DelayCheck
+            onClose={() => {
+              evaluatingData.soundEffectMode = false;
+              handlePerformDetection();
+            }}
+          />
+        )}
+
+        <Popup teleport="body" closeOnClickOverlay={false} class={["popup-custom", "van-scale"]} transition="van-scale" v-model:show={evaluatingData.earphoneMode}>
+          <Earphone
+            onClose={() => {
+              evaluatingData.earphoneMode = false;
+              handlePerformDetection();
+            }}
+          />
+        </Popup>
+        {/* <Popup
 					teleport="body"
 					closeOnClickOverlay={false}
 					class={["popup-custom", "van-scale"]}
@@ -325,33 +302,16 @@ export default defineComponent({
 					/>
 				</Popup> */}
 
-				<Popup
-					teleport="body"
-					closeOnClickOverlay={false}
-					class={["popup-custom", "van-scale"]}
-					transition="van-scale"
-					v-model:show={evaluatingData.resulstMode}
-				>
-					<EvaluatResult onClose={handleEvaluatResult} />
-				</Popup>
-				<Popup
-					teleport="body"
-					closeOnClickOverlay={false}
-					class={["popup-custom", "van-scale"]}
-					transition="van-scale"
-					v-model:show={evaluatModel.evaluatUpdateAudio}
-				>
-					<EvaluatAudio onClose={hanldeUpdateVideoAndAudio} />
-				</Popup>
-				<Popup
-					teleport="body"
-					class={["popup-custom", "van-scale"]}
-					transition="van-scale"
-					v-model:show={evaluatModel.shareMode}
-				>
-					<EvaluatShare onClose={() => (evaluatModel.shareMode = false)} />
-				</Popup>
-			</div>
-		);
-	},
+        <Popup teleport="body" closeOnClickOverlay={false} class={["popup-custom", "van-scale"]} transition="van-scale" v-model:show={evaluatingData.resulstMode}>
+          <EvaluatResult onClose={handleEvaluatResult} />
+        </Popup>
+        <Popup teleport="body" closeOnClickOverlay={false} class={["popup-custom", "van-scale"]} transition="van-scale" v-model:show={evaluatModel.evaluatUpdateAudio}>
+          <EvaluatAudio onClose={hanldeUpdateVideoAndAudio} />
+        </Popup>
+        <Popup teleport="body" class={["popup-custom", "van-scale"]} transition="van-scale" v-model:show={evaluatModel.shareMode}>
+          <EvaluatShare onClose={() => (evaluatModel.shareMode = false)} />
+        </Popup>
+      </div>
+    );
+  },
 });