Merge branch 'gyt-feature-tianyong' into gyt-test

src/pages/detail/CheckDelayPopup/index.module.less

@@ -8,10 +8,10 @@
     background-repeat: no-repeat;
     .delayBg {
         position: relative;
-        width: 130%;
+        width: 140%;
         height: 100%;
         // top: -10%;
-        left: -15%;
+        left: -20%;
     }
     .delayAdorn {
         position: absolute;
@@ -168,6 +168,38 @@
         }
     }
 }
+.heartbeat {
+    animation: heartbeat 1.5s ease-in-out infinite both;
+}
+
+@keyframes heartbeat {
+    from {
+        transform: scale(1);
+        transform-origin: center center;
+        animation-timing-function: ease-out;
+    }
+
+    10% {
+        -webkit-transform: scale(0.91);
+        transform: scale(0.91);
+        animation-timing-function: ease-in;
+    }
+
+    17% {
+        transform: scale(0.98);
+        animation-timing-function: ease-out;
+    }
+
+    33% {
+        transform: scale(0.87);
+        animation-timing-function: ease-in;
+    }
+
+    45% {
+        transform: scale(1);
+        animation-timing-function: ease-out;
+    }
+}
 @keyframes aniBg {
     0% {
         background-image: url('./image/step_state_icon3.png');

src/pages/detail/CheckDelayPopup/index.tsx

@@ -115,8 +115,8 @@ export default defineComponent({
 						<img class={styles.dbContext} src={step_tips_5} style={{ display: props.delayData.step >= 6 && !props.delayData.erji ? '' : 'none' }} />
 						<img class={styles.dbContext} src={step_tips_5_1} style={{ display: props.delayData.step >= 6 && props.delayData.erji && props.delayData.earPhoneType !== "有线耳机" ? '' : 'none' }} />
 						<img class={styles.dbContext} src={step_tips_5_2} style={{ display: props.delayData.step >= 6 && props.delayData.erji && props.delayData.earPhoneType === "有线耳机" ? '' : 'none' }} />
-						<img class={styles.dbBtn} src={step_btn_1} style={{ display: props.delayData.step <= 2 ? '' : 'none' }} onClick={() => emit("startCheckDelay")} />
-						<img class={styles.dbBtn} src={step_btn_2} style={{ display: props.delayData.step >= 6 ? '' : 'none' }} onClick={() => {emit("close")}} />
+						<img class={[styles.dbBtn, styles.heartbeat]} src={step_btn_1} style={{ display: props.delayData.step <= 2 ? '' : 'none' }} onClick={() => emit("startCheckDelay")} />
+						<img class={[styles.dbBtn, styles.heartbeat]} src={step_btn_2} style={{ display: props.delayData.step >= 6 ? '' : 'none' }} onClick={() => {emit("close")}} />
 					</div>
 				</div>
 			</div>

src/subpages/colexiu/buttons/evaluating.tsx

@@ -109,7 +109,7 @@ const delayData =  reactive({
             delayData.step = 3
           }
         } else {
-          if (delayData.step === 2 || delayData.step === 3) {
+          if (delayData.step === 2) {
             delayData.step = 4
           }
         }
@@ -155,6 +155,7 @@ const delayData =  reactive({
     if (!delayData.time || delayData.isForce) {
       delayData.open = (runtime.delayCheckFirst && searchParams.evaluatingRecord || !SettingState.sett.tuning) ? false : true
       delayData.count = 0;
+      checkWiredStatus();
       if (runtime.delayCheckFirst && searchParams.evaluatingRecord) {
         // closeErji()
       }
@@ -166,9 +167,12 @@ const delayData =  reactive({
 
 		/** 持续检测耳机状态 */
     const checkWiredStatus = () => {
-      console.log('耳机状态',delayData.checkStatus)
+      console.log('耳机状态',delayData.checkStatus, delayData.step)
 			// 设备检测结束,停止获取耳机状态
-			if (delayData.checkStatus !== 'ing' || delayData.open === false) {
+			// if (delayData.checkStatus !== 'ing' || delayData.open === false) {
+			// 	return
+			// }
+      if (delayData.open === false) {
 				return
 			}
 			setTimeout(async () => {
@@ -176,8 +180,12 @@ const delayData =  reactive({
 				if (delayData.erji) {
 					delayData.count = 0;
 					delayData.time = 0;
-					delayData.checkStatus = 'error'
-				}
+					// delayData.checkStatus = 'error'
+				} else {
+          if (delayData.step === 3) {
+            delayData.step = 1
+          }
+        }
 				checkWiredStatus();
 			}, 1000)
 		}  
@@ -257,7 +265,6 @@ const delayData =  reactive({
       setTimeout(() => {
         startTune()
       }, 2000)
-			checkWiredStatus();
 		}
 
 // frequency 频率, amplitude 振幅, decibels 分贝
@@ -502,6 +509,7 @@ const stopPlay = () => {
   startButtonShow.value = true
   connentLoading.value = false
   evaluating.value = false
+  modelType.value = 'init'
 }
 export const evaluatStopPlay = stopPlay
 

src/subpages/colexiu/uses/use-evaluat.ts

@@ -53,8 +53,8 @@ export const handleCheckEvaluatStatus = () => {
   // postMessage({ api: 'isWiredHeadsetOn' }, setWiredStatus)
   postMessage({ api: 'isWiredHeadsetOn' }, (evt) => {
     // console.log('🚀 ~ 耳机状态', evt)
-    permissionPopup.active = 'earphone'
-    permissionPopup.show = !evt?.content.checkIsWired
+    // permissionPopup.active = 'earphone'
+    // permissionPopup.show = !evt?.content.checkIsWired
   })
 }