Merge branch 'hqyDevNewVersion' of http://git.dayaedu.com/liushengqiang/music-score into feature-tianyong-newVersion

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

@@ -17,14 +17,14 @@ export function startCountdown() {
 		step: 3,
 		isAnimating: false
 	})
-	soundVIdeo?.play()
+	//soundVIdeo?.play()
 	let resolveFun: (value: boolean) => void
 	_countdownTIme = setInterval(() => {
 		if (countdownData.step <= 0) {
 			clearInterval(_countdownTIme)
 			countdownData.isShow = false
 			resolveFun(true)
-			soundVIdeo?.pause()
+			//soundVIdeo?.pause()
 		} else {
 			countdownData.isAnimating = true
 			const _time = setTimeout(() => {

src/page-instrument/evaluat-model/index.module.less

@@ -33,7 +33,23 @@
       height: 100%;
     }
   }
-
+.operatingBtn{
+    position: fixed;
+    right: 30px;
+    bottom: 0;
+    height: var(--header-height);
+    z-index: 99;
+    display: flex;
+    align-items: center;
+    .iconBtn{
+        width: 50px;
+        height: 50px;
+        cursor: pointer;
+        & + .iconBtn{
+            margin-left: 20px;
+        }
+    }
+}
 .dialogueBox {
     position: fixed;
     bottom: -1px;

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

@@ -17,6 +17,7 @@ import startData from "./data/start.json";
 import startingData from "./data/starting.json";
 import iconTastBg from "./icons/task-bg.svg";
 import iconEvaluat from "./icons/evaluating.json";
+import { headImg } from "/src/page-instrument/header-top/image";
 import { api_musicPracticeRecordVideoUpload } from "../api";
 // import DelayCheck from "./delay-check";
 import { headTopData } from "../header-top/index";
@@ -363,7 +364,7 @@ export default defineComponent({
     });
     return () => (
       <div>
-        <Transition name="pop-center">
+        {/* <Transition name="pop-center">
           {evaluatingData.websocketState && !evaluatingData.startBegin && evaluatingData.checkEnd && (
             <div class={styles.startBtn} onClick={() => {
               startBtnHandle()
@@ -378,9 +379,22 @@ export default defineComponent({
               <img src={iconEvaluat.evaluatingEnd} />
             </div>
           )}
-        </Transition>
-
-        <div style={{ display: !evaluatingData.startBegin && !evaluatingData.soundEffectMode ? "" : "none" }} class={styles.dialogueBox} key="start">
+        </Transition> */}
+        <div class={styles.operatingBtn}>
+          {evaluatingData.websocketState && !evaluatingData.startBegin && evaluatingData.checkEnd && (
+              <img class={styles.iconBtn} src={headImg("icon_play.png")} 
+              onClick={() => {
+                startBtnHandle()
+              }} />
+            )}
+          {evaluatingData.websocketState && evaluatingData.startBegin && (
+            <>
+              <img class={styles.iconBtn} src={headImg("icon_reset.png")} onClick={()=>handleEvaluatResult("tryagain")} />  
+              <img class={styles.iconBtn} src={headImg("submit.png")} onClick={() => handleEndBegin()}/> 
+            </>
+          )} 
+        </div>
+        {/* <div style={{ display: !evaluatingData.startBegin && !evaluatingData.soundEffectMode ? "" : "none" }} class={styles.dialogueBox} key="start">
           <div class={styles.dialogue}>
             <img class={styles.dialoguebg} src={iconTastBg} />
             <div>演奏前请调整好乐器，保证最佳演奏状态。</div>
@@ -390,7 +404,7 @@ export default defineComponent({
         <div style={{ display: evaluatingData.startBegin ? "" : "none" }} class={styles.dialogueBox} key="start">
           <div class={styles.dialogueing}>收音中...</div>
           <Vue3Lottie class={styles.dialogueIcon} animationData={startingData}></Vue3Lottie>
-        </div>
+        </div> */}
 
         {evaluatingData.soundEffectMode && (
           <DelayCheck