Merge branch 'iteration-beat-one'

src/views/tempo-practice/beat-tick.ts

@@ -76,7 +76,7 @@ export const handleStartBeat = async () => {
   beatData.tickEnd = false;
   beatData.index = 0;
   beatData.beatLengthInMilliseconds = (60 / setting.speed) * 1000;
-  let startTime = +new Date();
+  // let startTime = +new Date();
   for (let i = 0; i < setting.scorePart.length; i++) {
     if (beatData.tickEnd) return false;
     for (let j = 0; j < setting.scorePart[i].length; j++) {
@@ -107,6 +107,8 @@ export const handleStartBeat = async () => {
             // 连音
             if (params.liaison) {
               time = single16th * (1 / params.beatNum);
+            } else if (attr.point) {
+              time = single16th * 0.25 * 3;
             } else {
               time = single16th * 0.5;
             }
@@ -130,7 +132,7 @@ export const handleStartBeat = async () => {
     }
   }
 
-  console.log(+new Date() - startTime);
+  // console.log(+new Date() - startTime);
   beatData.show = false;
   handleStartBeat();
   return true;

src/views/tempo-practice/index.tsx

@@ -14,7 +14,7 @@ import iconAdd from './images/icon-add.png';
 import { getImage } from './images/music';
 import j1 from './images/music/j-1.png';
 // import j2 from './images/music/j-2.png';
-import { Popover, Popup } from 'vant';
+import { Popover, Popup, showToast } from 'vant';
 import SettingModal from './setting-modal';
 import { randomScoreElement, renderScore, setting } from './setting';
 import { handleStartTick, hendleEndTick } from './tick';
@@ -116,6 +116,10 @@ export default defineComponent({
                 <div
                   class={[styles.beat, child.selected ? styles.active : '']}
                   onClick={() => {
+                    if (setting.tempo.length <= 1) {
+                      showToast('无法切换，请选择至少2种节奏型');
+                      return;
+                    }
                     const obj = randomScoreElement(child.index);
                     child.index = obj.index;
                     child.url = obj.url;

src/views/tempo-practice/setting-modal/index.module.less

@@ -95,6 +95,7 @@
   bottom: 0;
   left: 0;
   right: 0;
+  z-index: 9;
   display: flex;
   align-items: center;
   justify-content: center;

src/views/tempo-practice/setting-modal/index.tsx

@@ -1,6 +1,6 @@
 import { computed, defineComponent, onMounted, reactive } from 'vue';
 import styles from './index.module.less';
-import { Button } from 'vant';
+import { Button, showToast } from 'vant';
 import {
   barLineList,
   beatList,
@@ -53,6 +53,10 @@ export default defineComponent({
     };
 
     const onSubmit = () => {
+      if (state.tempo.length <= 0) {
+        showToast('节奏型不能为空');
+        return;
+      }
       setting.element = state.element;
       setting.beat = state.beat;
       setting.barLine = state.barLine;

src/views/tempo-practice/tick.ts

@@ -2,6 +2,7 @@ import { reactive } from 'vue';
 import tockAndTick from './tockAndTick.json';
 import { Howl } from 'howler';
 import { initSelectScorePart, setting } from './setting';
+import { beatDesc } from './beat-desc';
 
 const tickData = reactive({
   list: [] as number[],
@@ -95,12 +96,13 @@ export const handleStartTick = async () => {
   }
   tickData.index = 0;
   tickData.beatLengthInMilliseconds = (60 / setting.speed) * 1000;
-  let startTime = +new Date();
+  // let startTime = +new Date();
   // const allTick: any = [];
-  console.log(setting.scorePart, tickData.len);
+  // console.log(setting.scorePart, tickData.len);
   for (let i = 0; i < setting.scorePart.length; i++) {
     if (tickData.tickEnd) return false;
     const temp = setting.scorePart[i];
+    // console.log(temp, 'temp', beatDesc[i.index]);
     for (let j = 0; j < temp.length; j++) {
       // 提前结束, 直接放回false
       if (tickData.tickEnd) return false;