Quellcode durchsuchen

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

TIANYONG vor 1 Jahr
Ursprung
Commit
568081ceb6

Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
src/pages/detail/CheckDelayPopup/image/left_ adorn.json


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
src/pages/detail/CheckDelayPopup/image/right_ adorn.json


+ 12 - 0
src/pages/detail/CheckDelayPopup/index.module.less

@@ -24,6 +24,18 @@
         pointer-events: none;
         width: 100%;
     }
+    .leftAdorn {
+        position: fixed;
+        left: 0;
+        bottom: 0;
+        width: 1.66rem;
+    }
+    .rightAdorn {
+        position: fixed;
+        right: 0;
+        bottom: 0;
+        width: 1.28rem;
+    }
 }
 
 .animationContainer {

+ 2 - 2
src/pages/detail/CheckDelayPopup/index.tsx

@@ -53,8 +53,8 @@ export default defineComponent({
 		return () => (
 			<div class={styles.delayContainer}>
 				<Vue3Lottie class={styles.delayBg} animationData={delay_bg}></Vue3Lottie>
-				<Vue3Lottie class={styles.delayAdorn} animationData={left_adorn}></Vue3Lottie>
-				<Vue3Lottie class={styles.delayAdorn} animationData={right_adorn}></Vue3Lottie>
+				<Vue3Lottie class={styles.leftAdorn} animationData={left_adorn}></Vue3Lottie>
+				<Vue3Lottie class={styles.rightAdorn} animationData={right_adorn}></Vue3Lottie>
 				{/*返回按钮*/}
 				{/* <img class={styles.delayBackBtn} src={icon_backBtn} onClick={() => emit("close")} /> */}
 				<Vue3Lottie class={styles.delayAdorn} animationData={step1} style={{ display: props.delayData.step <= 2 ? '' : 'none' }}></Vue3Lottie>

+ 3 - 3
src/subpages/colexiu/buttons/evaluating.tsx

@@ -394,7 +394,7 @@ const connect = async () => {
     clientId: 'STUDENT',
     hertz: SettingState.sett.hertz,
     feature: 'EVALUATION',
-    practiceSource: search.unitId ? 'UNIT_TEST' : 'PRACTICE',
+    practiceSource: (search.resourceType && search.resourceType === 'practice') ? 'UNIT_TEST_PRACTICE' : search.unitId ? 'UNIT_TEST' : 'PRACTICE',
     // 这里定义的是数字但是因为是通过input输入所以强制转化一次
     reactionTimeMs: parseFloat('' + SettingState.eva.reactionTimeMs) || 0,
     speed: runtime.speed,
@@ -462,7 +462,7 @@ const cancelTheEvaluation = () => {
     RuntimeUtils.clearIntervalTimeline()
     RuntimeUtils.setCurrentTime(0)
     Toast.clear()
-  }, 200);
+  }, 500);
 }
 
 const stopPlay = () => {
@@ -589,7 +589,7 @@ const playerStop = () => {
       }
     )
     RuntimeUtils.endCapture()
-  },200)
+  }, 500);
 }
 export const evaluatPlayerStop = playerStop
 

+ 1 - 0
src/subpages/colexiu/buttons/index.tsx

@@ -111,6 +111,7 @@ export const onChangeModelType = (type: IModelType) => {
     RuntimeUtils.changeSpeed(detailState.activeDetail?.originalSpeed, false)
     // 评测模式
     runtime.evaluatingStatus = true
+    modelType.value = type
   } else {
     const speeds = store.get('speeds') || {}
     const search = useOriginSearch()

+ 2 - 1
src/subpages/colexiu/popups/permission/index.tsx

@@ -37,7 +37,8 @@ export default defineComponent({
         ) : permissionPopup.active === 'demand' ? (
           <Demand />
         ) : permissionPopup.active === 'earphone' ? (
-          <Earphone />
+          // <Earphone />
+          null
         ) : permissionPopup.active === 'memberAndDemand' ? (
           <MemberAndDemand />
         ) : null}

Einige Dateien werden nicht angezeigt, da zu viele Dateien in diesem Diff geändert wurden.