Merge branch 'feature-tianyong-newVersion' into ktyq-test-new

src/helpers/metronome.ts

@@ -385,7 +385,7 @@ class Metronome {
 		} catch (error) {
 			console.log(error);
 		}
-		console.log('节拍器',metroList, metroMeasure);
+		// console.log('节拍器',metroList, metroMeasure);
 		// 5.得到所有的节拍时间
 		metronomeData.metroList = metroList;
 		metronomeData.metroMeasure = metroMeasure;

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

@@ -59,8 +59,8 @@ export default defineComponent({
         api_back();
       } else {
         evaluatingData.soundEffectMode = false;
-        handleRessetState();
-        headTopData.modeType = "init";
+        // handleRessetState();
+        // headTopData.modeType = "init";
       }
     };
     /**
@@ -374,6 +374,13 @@ export default defineComponent({
     };
 
     const startBtnHandle = async () => {
+      // 如果打开了延迟检测开关，需要先发送开始检测的消息
+      const delayData = await api_getDeviceDelay();
+      console.log('设备的延迟值',delayData.content?.value)
+      if (delayData && delayData.content?.value <= 0) {
+        await api_startDelayCheck({});
+        return;
+      }
       evaluatingData.needReplayEvaluat = false;
       // 选段未完成时，清除选段状态
       if (state.sectionStatus && state.section.length < 2) {
@@ -490,7 +497,7 @@ export default defineComponent({
     return () => (
       <div>
         <div class={styles.operatingBtn}>
-          {evaluatingData.websocketState && !evaluatingData.startBegin && (
+          {!evaluatingData.startBegin && (
             <img
               class={[styles.iconBtn, "evaluting-1"]}
               src={headImg("icon_play.png")}
@@ -499,7 +506,7 @@ export default defineComponent({
               }}
             />
           )}
-          {evaluatingData.websocketState && evaluatingData.startBegin && (
+          {evaluatingData.startBegin && (
             <>
               <img class={styles.iconBtn} src={headImg("icon_reset.png")} onClick={() => {
                 // 校验评测最小间隔时间

src/page-instrument/header-top/settting/index.module.less

@@ -102,6 +102,18 @@
                     color: #000000;
                     line-height: 21px;
                 }
+                .titbtn {
+                    width: 76px;
+                    height: 26px;
+                    font-weight: 600;
+                    font-size: 14px;
+                    color: #fff;
+                    text-align: center;
+                    line-height: 26px;
+                    background: url("../image/titBtn.png") no-repeat;
+                    background-size: 100% 100%;
+                    cursor: pointer;
+                }
                 .spendCon{
                     flex-grow: 1;
                     display: flex;

src/page-instrument/header-top/settting/index.tsx

@@ -87,8 +87,9 @@ export default defineComponent({
                                     </div>   
                                 }                     
                                 <div class={styles.cellBox}>
-                                    <div class={styles.tit}>重新延迟检测</div>
-                                    <Switch v-model={state.setting.soundEffect}></Switch>
+                                    <div class={styles.tit}>延迟检测</div>
+                                    {/* <Switch v-model={state.setting.soundEffect}></Switch> */}
+                                    <div class={styles.titbtn} onClick={() => state.setting.soundEffect = true}>重新检测</div>
                                 </div> 
                                 <div class={[styles.cellBox, state.setting.camera && styles.isCamera]}>
                                     <div class={styles.tit}>摄像头</div>

src/page-instrument/header-top/speed/index.tsx

@@ -35,7 +35,11 @@ export default defineComponent({
 			() => {
 				// handleSetSpeed(speed.value);
 				state.speed = Math.floor(speed.value);
-				handleSetSpeed(speed.value);
+				// handleSetSpeed(speed.value);
+				if (state.playState === 'paused') {
+					const currentItem: any = (state.sectionStatus && state.section.length === 2) ? state.sectionFirst || state.section[0] : state.times[state.activeNoteIndex];
+					state.basePlayRate = currentItem?.measureSpeed ? state.speed / currentItem.measureSpeed : state.speed / state.originSpeed;
+				}
 			}
 		);
 		watch(

src/page-instrument/view-evaluat-report/component/share-top/index.tsx

@@ -357,7 +357,7 @@ export default defineComponent({
                   {itemType.value === "integrity" && (
                     <div>
                       <Note fill="#65FFAE" />
-                      <span>时值正确</span>
+                      <span>演奏正确</span>
                     </div>
                   )}
                   <div>
@@ -417,7 +417,7 @@ export default defineComponent({
                   {itemType.value === "integrity" && (
                     <div>
                       <i style={{ background: bgColors.right }}></i>
-                      <span>时值正确</span>
+                      <span>演奏正确</span>
                     </div>
                   )}
                   <div>

src/page-instrument/view-evaluat-report/index.module.less

@@ -67,7 +67,7 @@
         overflow: initial;
         height: initial;
         max-height: initial;
-        transform: translateY(-3%) !important;
+        // transform: translateY(-3%) !important;
         & > #osmdCanvasPage1 {
           top: 0.5rem;
           position: relative !important;

src/state.ts

@@ -733,6 +733,7 @@ const handlePlaying = () => {
 };
 /** 跳转到指定音符开始播放 */
 export const skipNotePlay = async (itemIndex: number, isStart = false) => {
+  console.log('点击音符')
   const item = state.times[itemIndex];
   let itemTime = item.time;
   if (isStart) {

src/view/abnormal-pop/index.module.less

@@ -8,7 +8,7 @@
     width: 100vw;
     height: 100vh;
     overflow: hidden;
-    .close {
+    .closeIcon {
         position: absolute;
         width: 20px;
         height: 20px;

src/view/abnormal-pop/index.tsx

@@ -15,7 +15,7 @@ export default defineComponent({
       <>
         {evaluatingData.socketErrorStatus === 0 && (
           <div class={styles.fraction}>
-            <img class={styles.close} src={popImgs.icon_close} onClick={() => emit("close")} />
+            {evaluatingData.socketErrorStatus === 0 && <img class={styles.closeIcon} src={popImgs.icon_close} onClick={() => emit("close")} />}
             <div class={styles.content}>
               <div class={styles.title}>网络连接失败</div>
               <div class={styles.desc}>请确保网络正常后重新连接</div>

src/view/music-score/index.tsx

@@ -123,7 +123,8 @@ export default defineComponent({
 				osmd.EngravingRules.BreathMarkDistance = 0.1; 
 				osmd.EngravingRules.PageBottomMargin = 0;
 			} else {
-				osmd.EngravingRules.PageTopMargin = state.isEvaluatReport && storeData.isApp ? 10 : state.isEvaluatReport ? 7 : 3; // 顶部间距
+				// osmd.EngravingRules.PageTopMargin = state.isEvaluatReport ? 7 : 3; // 顶部间距
+				osmd.EngravingRules.PageTopMargin = 3;
 				osmd.EngravingRules.PageTopMarginNarrow = 3;
 				osmd.EngravingRules.PageLeftMargin = 3.6;
 				osmd.EngravingRules.PageRightMargin = 3;

vite.config.ts

@@ -76,8 +76,8 @@ export default defineConfig({
         // target: "https://kt.colexiu.com",
         // target: "https://test.lexiaoya.cn",
         // target: "https://kt.colexiu.com",
-         target: "https://dev.resource.colexiu.com", // 内容平台开发环境，内容平台开发，需在url链接上加上isCbs=true
-        //target: "https://test.kt.colexiu.com",
+        //target: "https://dev.resource.colexiu.com", // 内容平台开发环境，内容平台开发，需在url链接上加上isCbs=true
+        target: "https://test.kt.colexiu.com",
         //target: "https://mec.colexiu.com",
         changeOrigin: true,
         rewrite: (path) => path.replace(/^\/instrument/, ""),