Explorar o código

Merge branch '2023-9-6_调整合成'

liushengqiang hai 1 ano
pai
achega
a7a2a26a87

+ 4 - 0
dist/assets/index-0601e738.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-0601e738.js
 import{d as f,E as y,U as h,bx as r,K as w,S as v,an as T,j as i,aI as b,A as _,ap as S}from"./index-08e7187c.js";import{s as x}from"./instrument-00b218dd.js";import"./vue3-lottie.es-f68e0262.js";import"./index-94a6ff62.js";import"./index-ecf1f09e.js";import"./index-c64ff501.js";const L="_skeleton_vtlsh_1",A="_detail_vtlsh_12",N="_container_vtlsh_20",c={skeleton:L,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=x(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,bx as r,K as w,S as v,an as T,j as i,aI as b,A as _,ap as S}from"./index-74ea4cc3.js";import{s as x}from"./instrument-bcb24cd2.js";import"./vue3-lottie.es-c0f30985.js";import"./index-5e40d6fd.js";import"./index-80fe8008.js";import"./index-d716a063.js";const L="_skeleton_vtlsh_1",A="_detail_vtlsh_12",N="_container_vtlsh_20",c={skeleton:L,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=x(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};
+>>>>>>>> 2023-9-6_调整合成:dist/assets/index-6f3929a4.js

+ 5 - 0
dist/assets/index-6f3929a4.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-0601e738.js
+import{d as f,E as y,U as h,bx as r,K as w,S as v,an as T,j as i,aI as b,A as _,ap as S}from"./index-08e7187c.js";import{s as x}from"./instrument-00b218dd.js";import"./vue3-lottie.es-f68e0262.js";import"./index-94a6ff62.js";import"./index-ecf1f09e.js";import"./index-c64ff501.js";const L="_skeleton_vtlsh_1",A="_detail_vtlsh_12",N="_container_vtlsh_20",c={skeleton:L,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=x(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,bx as r,K as w,S as v,an as T,j as i,aI as b,A as _,ap as S}from"./index-74ea4cc3.js";import{s as x}from"./instrument-bcb24cd2.js";import"./vue3-lottie.es-c0f30985.js";import"./index-5e40d6fd.js";import"./index-80fe8008.js";import"./index-d716a063.js";const L="_skeleton_vtlsh_1",A="_detail_vtlsh_12",N="_container_vtlsh_20",c={skeleton:L,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=x(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};
+>>>>>>>> 2023-9-6_调整合成:dist/assets/index-6f3929a4.js

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 0
dist/assets/index-83d4d775.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 0
dist/assets/index-dd47d042.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 0
dist/assets/index-legacy-1cc74d66.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 0
dist/assets/index-legacy-5d2399d8.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 0
dist/assets/index-legacy-9820f930.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 0
dist/assets/index-legacy-c570463d.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 0
dist/assets/instrument-00b218dd.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 0
dist/assets/instrument-bcb24cd2.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/assets/instrument-legacy-2ecaf047.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 0
dist/assets/instrument-legacy-bee9440b.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 0
dist/assets/polyfills-59b1c2d8.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 0
dist/assets/polyfills-e458eda9.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 0
dist/assets/polyfills-legacy-00986d5e.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 0
dist/assets/polyfills-legacy-ac804f96.js


+ 9 - 0
dist/colexiu.html

@@ -2,7 +2,11 @@
 <html lang="en">
 
 <head>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/polyfills-e458eda9.js"></script>
+=======
+  <script type="module" crossorigin src="./assets/polyfills-59b1c2d8.js"></script>
+>>>>>>> 2023-9-6_调整合成
 
   <meta charset="UTF-8" />
   <link rel="icon" type="image/svg+xml" href="./vite.svg" />
@@ -57,8 +61,13 @@
   <img id="loading" class="show" src="./loading.svg" alt="loading" />
   
   <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="./assets/polyfills-legacy-00986d5e.js"></script>
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/colexiu-legacy-46628e31.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-ac804f96.js"></script>
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/colexiu-legacy-05c53752.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> 2023-9-6_调整合成
 </body>
 
 </html>

+ 9 - 0
dist/index.html

@@ -2,7 +2,11 @@
 <html lang="ZH-cn">
 
 <head>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/polyfills-e458eda9.js"></script>
+=======
+  <script type="module" crossorigin src="./assets/polyfills-59b1c2d8.js"></script>
+>>>>>>> 2023-9-6_调整合成
 
   <meta charset="UTF-8">
   <link rel="icon" href="./favicon.ico" />
@@ -100,8 +104,13 @@
   <img id="loading" class="show" src="./loading.svg" alt="loading" />
   
   <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="./assets/polyfills-legacy-00986d5e.js"></script>
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/index-legacy-70d222d7.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-ac804f96.js"></script>
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/index-legacy-797e9398.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> 2023-9-6_调整合成
 </body>
 
 </html>

+ 18 - 0
dist/instrument.html

@@ -2,7 +2,11 @@
 <html lang="en">
 
 <head>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/polyfills-e458eda9.js"></script>
+=======
+  <script type="module" crossorigin src="./assets/polyfills-59b1c2d8.js"></script>
+>>>>>>> 2023-9-6_调整合成
 
   <meta charset="UTF-8" />
   <meta name="viewport"
@@ -42,12 +46,21 @@
     }
 
   </script>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/instrument-00b218dd.js"></script>
   <link rel="modulepreload" crossorigin href="./assets/index-08e7187c.js">
   <link rel="modulepreload" crossorigin href="./assets/vue3-lottie.es-f68e0262.js">
   <link rel="modulepreload" crossorigin href="./assets/index-94a6ff62.js">
   <link rel="modulepreload" crossorigin href="./assets/index-ecf1f09e.js">
   <link rel="modulepreload" crossorigin href="./assets/index-c64ff501.js">
+=======
+  <script type="module" crossorigin src="./assets/instrument-bcb24cd2.js"></script>
+  <link rel="modulepreload" crossorigin href="./assets/index-74ea4cc3.js">
+  <link rel="modulepreload" crossorigin href="./assets/vue3-lottie.es-c0f30985.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-5e40d6fd.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-80fe8008.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-d716a063.js">
+>>>>>>> 2023-9-6_调整合成
   <link rel="stylesheet" href="./assets/index-96ddda46.css">
   <link rel="stylesheet" href="./assets/index-cc0254c0.css">
   <link rel="stylesheet" href="./assets/instrument-b3dbe73e.css">
@@ -60,8 +73,13 @@
   <img id="loading" class="show" src="./loading.svg" alt="loading" />
   
   <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="./assets/polyfills-legacy-00986d5e.js"></script>
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/instrument-legacy-bee9440b.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-ac804f96.js"></script>
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/instrument-legacy-2ecaf047.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> 2023-9-6_调整合成
 </body>
 
 </html>

+ 9 - 0
dist/orchestra.html

@@ -2,7 +2,11 @@
 <html lang="en">
 
 <head>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/polyfills-e458eda9.js"></script>
+=======
+  <script type="module" crossorigin src="./assets/polyfills-59b1c2d8.js"></script>
+>>>>>>> 2023-9-6_调整合成
 
   <meta charset="UTF-8" />
   <!-- <link rel="icon" type="image/svg+xml" href="/vite.svg" /> -->
@@ -72,8 +76,13 @@
   </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="./assets/polyfills-legacy-00986d5e.js"></script>
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/orchestra-legacy-952252f0.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-ac804f96.js"></script>
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/orchestra-legacy-d8484e3a.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> 2023-9-6_调整合成
 </body>
 
 </html>

+ 9 - 0
dist/report-share.html

@@ -2,7 +2,11 @@
 <html lang="en">
 
 <head>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/polyfills-e458eda9.js"></script>
+=======
+  <script type="module" crossorigin src="./assets/polyfills-59b1c2d8.js"></script>
+>>>>>>> 2023-9-6_调整合成
 
   <meta charset="UTF-8" />
   <!-- <link rel="icon" type="image/svg+xml" href="/vite.svg" /> -->
@@ -51,8 +55,13 @@
   </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="./assets/polyfills-legacy-00986d5e.js"></script>
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/report-share-legacy-3a511ad7.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-ac804f96.js"></script>
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/report-share-legacy-0056a6c0.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> 2023-9-6_调整合成
 </body>
 
 </html>

+ 8 - 0
src/helpers/communication.ts

@@ -294,3 +294,11 @@ export const api_cloudAccompanyMessage = (audioFileUrl: string) => {
 		},
 	});
 };
+
+/** 合成音频传伴奏弹窗 */
+export const api_openAdjustRecording = (content: any) => {
+	postMessage({
+		api: "openAdjustRecording",
+		content,
+	});
+};

+ 6 - 2
src/page-instrument/evaluat-model/index.tsx

@@ -17,7 +17,7 @@ import { getNoteByMeasuresSlursStart } from "/src/helpers/formateMusic";
 import { Icon, Popup, showToast } from "vant";
 import EvaluatResult from "./evaluat-result";
 import EvaluatAudio from "./evaluat-audio";
-import { api_getDeviceDelay, api_proxyServiceMessage, api_videoUpdate, getEarphone } from "/src/helpers/communication";
+import { api_getDeviceDelay, api_openAdjustRecording, api_proxyServiceMessage, api_videoUpdate, getEarphone } from "/src/helpers/communication";
 import EvaluatShare from "./evaluat-share";
 import { Vue3Lottie } from "vue3-lottie";
 import startData from "./data/start.json";
@@ -187,7 +187,11 @@ export default defineComponent({
 		const handleEvaluatResult = (type: "practise" | "tryagain" | "look" | "share" | "update") => {
 			if (type === "update") {
 				// 上传云端
-				evaluatModel.evaluatUpdateAudio = true;
+				// evaluatModel.evaluatUpdateAudio = true;
+				api_openAdjustRecording({
+					recordId: evaluatingData.resultData?.recordIdStr || evaluatingData.resultData?.recordId,
+					title: state.examSongName || '曲谱演奏',
+				});
 				return;
 			} else if (type === "share") {
 				// 分享

Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio