Halaman utama Jelajahi Bantuan
Masuk
liushengqiang
/
music-score
1
0
Fork 0
Berkas Masalah 0 Permintaan Tarik 0 Wiki
Jelajahi Sumber

Merge branch 'feature-patch' into ktyq-test-new

TIANYONG 1 Minggu lalu
induk
c51e873cd9 8ad7e6e59f
melakukan
dc9c7ae474
13 mengubah file dengan 80 tambahan dan 16 penghapusan
Tampilan Split Tampilkan Statistik Diff
  1. 5 1
      dist/colexiu.html
  2. 5 1
      dist/index.html
  3. 5 1
      dist/instrument.html
  4. 0 0
      dist/js/polyfills-5f5c17f2.js
  5. 0 0
      dist/js/polyfills-legacy-7b17cfe7.js
  6. 5 1
      dist/orchestra.html
  7. 5 1
      dist/report-share.html
  8. 16 8
      src/page-instrument/custom-plugins/guide-driver/index.tsx
  9. 22 0
      src/page-instrument/evaluat-model/index.tsx
  10. 1 0
      src/page-instrument/header-top/index.tsx
  11. 7 0
      src/view/audio-list/index.tsx
  12. 8 3
      src/view/evaluating/index.tsx
  13. 1 0
      stats.html

+ 5 - 1
dist/colexiu.html
Tampilan Berkas 

@@ -2,7 +2,7 @@
 
 <html lang="en">
 
 
 <head>
 
-  <script type="module" crossorigin src="./js/polyfills-bdbb13e0.js"></script>
 
+  <script type="module" crossorigin src="./js/polyfills-5f5c17f2.js"></script>
 
 
   <meta charset="UTF-8" />
 
   <link rel="icon" type="image/svg+xml" href="./vite.svg" />
 
@@ -56,7 +56,11 @@
 
   <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="./js/polyfills-legacy-8a063122.js"></script>
 
+=======
 
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./js/polyfills-legacy-7b17cfe7.js"></script>
 
+>>>>>>> feature-patch
 
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/colexiu-legacy-713ae06c.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 
 </body>

+ 5 - 1
dist/index.html
Tampilan Berkas 

@@ -2,7 +2,7 @@
 
 <html lang="ZH-cn">
 
 
 <head>
 
-  <script type="module" crossorigin src="./js/polyfills-bdbb13e0.js"></script>
 
+  <script type="module" crossorigin src="./js/polyfills-5f5c17f2.js"></script>
 
 
   <meta charset="UTF-8">
 
   <link rel="icon" href="./favicon.ico" />
 
@@ -98,7 +98,11 @@
 
   <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="./js/polyfills-legacy-8a063122.js"></script>
 
+=======
 
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./js/polyfills-legacy-7b17cfe7.js"></script>
 
+>>>>>>> feature-patch
 
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/gym-legacy-d12db85d.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 
 </body>

+ 5 - 1
dist/instrument.html
Tampilan Berkas 

@@ -2,7 +2,7 @@
 
 <html lang="en">
 
 
 <head>
 
-  <script type="module" crossorigin src="./js/polyfills-bdbb13e0.js"></script>
 
+  <script type="module" crossorigin src="./js/polyfills-5f5c17f2.js"></script>
 
 
   <meta charset="UTF-8" />
 
   <meta name="viewport"
 
@@ -67,7 +67,11 @@
 
     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-8a063122.js"></script>
 
+=======
 
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./js/polyfills-legacy-7b17cfe7.js"></script>
 
+>>>>>>> feature-patch
 
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/instrument-legacy-deedd6c2.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 
 </body>

File diff ditekan karena terlalu besar
+ 0 - 0
dist/js/polyfills-5f5c17f2.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/js/polyfills-legacy-7b17cfe7.js


+ 5 - 1
dist/orchestra.html
Tampilan Berkas 

@@ -2,7 +2,7 @@
 
 <html lang="en">
 
 
 <head>
 
-  <script type="module" crossorigin src="./js/polyfills-bdbb13e0.js"></script>
 
+  <script type="module" crossorigin src="./js/polyfills-5f5c17f2.js"></script>
 
 
   <meta charset="UTF-8" />
 
   <!-- <link rel="icon" type="image/svg+xml" href="/vite.svg" /> -->
 
@@ -70,7 +70,11 @@
 
   </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-8a063122.js"></script>
 
+=======
 
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./js/polyfills-legacy-7b17cfe7.js"></script>
 
+>>>>>>> feature-patch
 
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/orchestra-legacy-bc9298ad.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 
 </body>

+ 5 - 1
dist/report-share.html
Tampilan Berkas 

@@ -2,7 +2,7 @@
 
 <html lang="en">
 
 
 <head>
 
-  <script type="module" crossorigin src="./js/polyfills-bdbb13e0.js"></script>
 
+  <script type="module" crossorigin src="./js/polyfills-5f5c17f2.js"></script>
 
 
   <meta charset="UTF-8" />
 
   <!-- <link rel="icon" type="image/svg+xml" href="/vite.svg" /> -->
 
@@ -52,7 +52,11 @@
 
   </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-8a063122.js"></script>
 
+=======
 
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./js/polyfills-legacy-7b17cfe7.js"></script>
 
+>>>>>>> feature-patch
 
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/report-share-legacy-ee7cc2d5.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 
 </body>

+ 16 - 8
src/page-instrument/custom-plugins/guide-driver/index.tsx
Tampilan Berkas 

@@ -34,6 +34,8 @@ type ButtonStatus = {
 
   originPlayType?: Boolean;
 
   /** 是否显示原音 */
 
   originBtnStatus?: Boolean;
 
+  /** 是否显示律动按钮 */
 
+  rhythmBtnStatus?: Boolean;
 
 };
 
 
 /** 练习模式 */
 
@@ -68,7 +70,10 @@ export const PractiseDriver = defineComponent({
 
       if (!props.statusAll.originBtnStatus) {
 
         length -= 1;
 
       }
 
-
 
+      // 律动
 
+      if (!props.statusAll.rhythmBtnStatus) {
 
+        length -= 1;
 
+      }
 
       // 显示指法
 
       if (!state.setting.displayFingering) {
 
         length -= 1;
 
@@ -168,8 +173,9 @@ export const PractiseDriver = defineComponent({
 
           },
 
         });
 
       }
 
-      options.steps?.push(
 
-        {
 
+      // 节奏律动
 
+      if (props.statusAll.rhythmBtnStatus) {
 
+        options.steps?.push({
 
           element: ".driver-777",
 
           popover: {
 
             title: "",
 
@@ -182,8 +188,10 @@ export const PractiseDriver = defineComponent({
 
             onPopoverRender: (popover: PopoverDOM, options: { config: Config; state: State }) => {
 
               driverInitialPosition(popover, options);
 
             },
 
-          },
 
-        },
 
+          },          
+        })
 
+      }
 
+      options.steps?.push(
 
         {
 
           element: ".driver-4",
 
           popover: {
 
@@ -192,7 +200,7 @@ export const PractiseDriver = defineComponent({
 
             popoverClass: "popoverClass popoverClass4",
 
             align: "start",
 
             side: "top",
 
-            nextBtnText: `下一步 (${options.steps.length + 2}/${length})`,
 
+            nextBtnText: `下一步 (${options.steps.length + 1}/${length})`,
 
             showButtons: ["next"],
 
             onPopoverRender: (popover: PopoverDOM, options: { config: Config; state: State }) => {
 
               driverInitialPosition(popover, options);
 
@@ -207,7 +215,7 @@ export const PractiseDriver = defineComponent({
 
             popoverClass: "popoverClass popoverClass5",
 
             align: "start",
 
             side: "top",
 
-            nextBtnText: `下一步 (${options.steps.length + 3}/${length})`,
 
+            nextBtnText: `下一步 (${options.steps.length + 2}/${length})`,
 
             showButtons: ["next"],
 
             onPopoverRender: (popover: PopoverDOM, options: { config: Config; state: State }) => {
 
               driverInitialPosition(popover, options);
 
@@ -1544,4 +1552,4 @@ export const EvaluatingReportDriver = defineComponent({
 
       </Teleport>
 
     );
 
   },
 
-});
 
+});

+ 22 - 0
src/page-instrument/evaluat-model/index.tsx
Tampilan Berkas 

@@ -180,6 +180,8 @@ export default defineComponent({
 
       let skip = false;
 
       const datas = [];
 
       let selectTimes = state.times;
 
+      // 选段评测前面小节的listen、play标识
 
+      let preLyricsContent = ''
 
       let unitTestIdx = 0;
 
       let preTime = 0;
 
       let preTimes = [];
 
@@ -224,6 +226,22 @@ export default defineComponent({
 
       if (state.section.length === 2 && firstNoteTime === 0 && state.section[0]?.MeasureNumberXML === state.firstMeasureNumber + 1 && state.times[0].fixtime) {
 
         actualBeatLength  = actualBeatLength + Math.round((state.times[0].fixtime * 1000) / 1)
 
       }
 
+      // 找到选段评测，开始小节前面最近的是play或者listen的小节
 
+      if (preTimes.length) {
 
+        for (let index = preTimes.length-1; index >= 0; index--) {
 
+          const item = preTimes[index]
 
+          const note = getNoteByMeasuresSlursStart(item)
 
+          if (note.formatLyricsEntries.contains('Play') || note.formatLyricsEntries.contains('Play...')) {
 
+            preLyricsContent = 'Play'
 
+            break
 
+          }
 
+          if (note.formatLyricsEntries.contains('Listen')) {
 
+            preLyricsContent = 'Listen'
 
+            break
 
+          }
 
+        }
 
+        preLyricsContent = preLyricsContent ? preLyricsContent : 'Play'
 
+      }       
       for (let index = 0; index < selectTimes.length; index++) {
 
         const item = selectTimes[index];
 
         const note = getNoteByMeasuresSlursStart(item);
 
@@ -236,6 +254,10 @@ export default defineComponent({
 
         const end = difftime + (item.sourceRelaEndtime || item.relaEndtime) - starTime;
 
         const isStaccato = note.noteElement.voiceEntry.isStaccato();
 
         const noteRate = isStaccato ? 0.5 : 1;
 
+        // 如果选段评测，开始小节没有注脚，则取前面最近的小节的注脚
 
+        if (index == 0 && !note.formatLyricsEntries.length) {
 
+          ListenMode = preLyricsContent === 'Play' ? false : preLyricsContent === 'Listen' ? true : false
 
+        }        
         if (note.formatLyricsEntries.contains("Play") || note.formatLyricsEntries.contains("Play...")) {
 
           ListenMode = false;
 
         }

+ 1 - 0
src/page-instrument/header-top/index.tsx
Tampilan Berkas 

@@ -1134,6 +1134,7 @@ export default defineComponent({
 
               originBtnStatus: originBtn.value.display,
 
               backTitle: !(state.playState == "play" || followData.start || evaluatingData.startBegin) && isMusicList.value,
 
               titleType: smoothAnimationState.isShow.value ? "TEXT" : isMusicList.value ? "IMG" : "NONE",
 
+              rhythmBtnStatus: rhythmBtn.value.display
 
             }}
 
           />
 
         )}

+ 7 - 0
src/view/audio-list/index.tsx
Tampilan Berkas 

@@ -497,8 +497,15 @@ export default defineComponent({
 
 		 * #11046
 
 		 * 声音与圆点消失的节点不一致，可能原因是部分安卓手机没有立即播放，所以需要等待有音频进度返回时再播放节拍器
 
 		 * mp3节拍器的圆点动画
 
+		 * 
+		 * #12291
 
+		 * 如果是选段评测，并且开始小节不是第一个小节，不需要播放节拍器的圆点动画
 
 		 */
 
 		const tickAnimate = (time: number) => {
 
+			if (state.section.length && state.section[0]?.MeasureNumberXML !== state.firstMeasureNumber) {
 
+				evaluatingData.needPlayTick = false;
 
+				return;
 
+			}			
 			if (storeData.isApp && state.modeType === 'evaluating' && evaluatingData.needPlayTick && time > 0) {
 
 				evaluatingData.needPlayTick = false;
 
 				handleStartTick()

+ 8 - 3
src/view/evaluating/index.tsx
Tampilan Berkas 

@@ -118,6 +118,7 @@ export const evaluatingData = reactive({
 
   onceErjiPopShow: false, // 是否已经提示过耳机弹窗，重新进入评测页面，重置该状态为false，手动关掉耳机弹窗，改变该状态为true，本次评测都不在提示耳机状态弹窗
 
   needCheckErjiStatus: true, // 点击评测模式进入评测模块的需要检测耳机状态，通过返回按钮进入评测模块的，不检测耳机状态
 
   showOpenCameraPop: false, // 开启摄像头提示弹窗
 
+  evaluatResultLoading: false, // 评测结果处理中
 
 });
 
 
 const sendOffsetTime = async (offsetTime: number) => {
 
@@ -346,6 +347,8 @@ const handleScoreResult = (res?: IPostMessage) => {
 
           evaluatingData.hideResultModal = true;
 
         }
 
         evaluatingData.resulstMode = evaluatingData.isErrorState ? false : true;
 
+        evaluatingData.startBegin = false;
 
+        evaluatingData.evaluatResultLoading = false;
 
       }, 200);
 
       evaluatingData.resultData = {
 
         ...body,
 
@@ -508,11 +511,12 @@ const recordStartTimePoint = async (res?: IPostMessage) => {
 
  * @returns
 
  */
 
 export const handleEndEvaluat = (isComplete = false, endType?: string) => {
 
-  // 没有开始评测 , 不是评测模式 , 不评分
 
-  if (!evaluatingData.startBegin || state.modeType !== "evaluating") return;
 
+  // 没有开始评测 , 不是评测模式 , 不评分；evaluatResultLoading：评测结果处理中，避免重复结束
 
+  if (!evaluatingData.startBegin || state.modeType !== "evaluating" || evaluatingData.evaluatResultLoading) return;
 
   // 结束录音
 
   // api_stopRecording();
 
   // 结束评测
 
+  evaluatingData.evaluatResultLoading = true
 
   console.log("评测结束1");
 
   endEvaluating({
 
     musicScoreId: state.examSongId,
 
@@ -535,7 +539,7 @@ export const handleEndEvaluat = (isComplete = false, endType?: string) => {
 
     }
 
   }
 
   setTimeout(() => {
 
-    evaluatingData.startBegin = false;
 
+    // evaluatingData.startBegin = false;
 
     if (endType === 'selfCancel') {
 
       // 重置播放倍率
 
       const item: any = (state.sectionStatus && state.section.length === 2) ? state.sectionFirst || state.section[0] : state.times[0];
 
@@ -636,6 +640,7 @@ export const handleViewReport = (key: "recordId" | "recordIdStr", type: "gym" |
 
     statusBarTextColor: false,
 
     isOpenLight: true,
 
     c_orientation: 0,
 
+    showLoadingAnim: true
 
   });
 
 };

File diff ditekan karena terlalu besar
+ 1 - 0
stats.html


Beberapa file tidak ditampilkan karena terlalu banyak file yang berubah dalam diff ini