Переглянути джерело

fix: 老师端云教练按钮和指法图镜像修改

TIANYONG 11 місяців тому
батько
коміт
0234d60946

+ 1 - 1
src/page-instrument/follow-model/index.tsx

@@ -41,7 +41,7 @@ export default defineComponent({
         {
           followData.isBeginMask && <div class={styles.beginMask}></div>
         }        
-        <div class={[styles.operatingBtn, state.playBtnDirection === "left" ? styles.operatingLeft : ""]}>
+        <div class={[styles.operatingBtn, state.platform === IPlatform.PC && state.musicScoreBtnDirection === "left" ? styles.operatingLeft : ""]}>
           {!followData.start && (
             <img
               class={[styles.iconBtn, "follow-1"]}

+ 4 - 4
src/page-instrument/header-top/index.tsx

@@ -626,7 +626,7 @@ export default defineComponent({
     return () => (
       <>
         <div
-          class={[styles.headerTop]}
+          class={[styles.headerTop, state.platform === IPlatform.PC && state.musicScoreBtnDirection === "left" ? styles.headerTopRight : ""]}
           onClick={(e: Event) => {
             e.stopPropagation();
             if (state.platform === IPlatform.PC) {
@@ -691,7 +691,7 @@ export default defineComponent({
           {/* 模式提醒 */}
           {
             state.modeType === "practise" &&
-              <div class={[styles.modeWarn, "practiseModeWarn"]}>
+            <div class={[styles.modeWarn, "practiseModeWarn", state.platform === IPlatform.PC && state.musicScoreBtnDirection === "left" ? styles.modeWarnRight : ""]}>
                 <img src={state.playType === "play" ? headImg("perform1.png") : headImg("sing1.png")} />
                 <div>{state.playType === "play" ? "演奏场景" : "演唱场景"}</div>
               </div>
@@ -882,7 +882,7 @@ export default defineComponent({
             "driver-1",
             styles.playBtn,
             playBtn.value.disabled && styles.disabled,
-            // state.platform === IPlatform.PC && state.musicScoreBtnDirection === "left" ? styles.playLeftButton : state.platform === IPlatform.PC && state.musicScoreBtnDirection === "right" ? styles.playRightButton : "",
+            state.platform === IPlatform.PC && state.musicScoreBtnDirection === "left" ? styles.playLeftButton : state.platform === IPlatform.PC && state.musicScoreBtnDirection === "right" ? styles.playRightButton : "",
           ]}
           onClick={() => togglePlay(state.playState === "play" ? "paused" : "play")}
         >
@@ -897,7 +897,7 @@ export default defineComponent({
         <div
           id="tips-step-9"
           style={{ display: resetBtn.value.display ? "" : "none" }}
-          class={[styles.resetBtn, resetBtn.value.disabled && styles.disabled]}
+          class={[styles.resetBtn, resetBtn.value.disabled && styles.disabled, state.platform === IPlatform.PC && state.musicScoreBtnDirection === "left" ? styles.pauseLeftButton : state.platform === IPlatform.PC && state.musicScoreBtnDirection === "right" ? styles.pauseRightButton : ""]}
           onClick={() => handleResetPlay()}
         >
           <img class={styles.iconBtn} src={headImg("icon_reset.png")} />

+ 30 - 42
src/page-instrument/view-detail/index.tsx

@@ -271,7 +271,7 @@ export default defineComponent({
         handleInitTick(osmd?.Sheet?.SheetPlaybackSetting?.Rhythm?.Numerator || 4);
       // }
       // api_cloudLoading();
-      state.playBtnDirection = query.imagePos === 'right' ? 'right' : 'left';
+      state.playBtnDirection = query.imagePos === 'left' ? 'left' : 'right';
       state.isAttendClass = (query.imagePos === 'left' || query.imagePos === 'right') ? true : false;
       // if (state.fingeringInfo.direction === "vertical" && state.setting.displayFingering) {
       //   state.musicScoreBtnDirection = state.playBtnDirection === 'right' ? 'left' : 'right';
@@ -316,47 +316,35 @@ export default defineComponent({
         } else {
           console.log('指法',state.playBtnDirection,state.platform)
           // 老师端,竖向指法,需要根据功能按钮方向进行设置
-          // if (state.platform === IPlatform.PC) {
-          //   return {
-          //     container: {
-          //       paddingRight: state.playBtnDirection === "right" ? "initial" : state.fingeringInfo.width,
-          //       paddingLeft: state.playBtnDirection === "right" ? state.fingeringInfo.width : "initial",
-          //     },
-          //     fingerBox: {
-          //       position: "absolute",
-          //       width: state.fingeringInfo.width,
-          //       height: state.fingeringInfo.name === "hulusi-flute" ? "86%" : "80%",
-          //       right: state.playBtnDirection === "right" ? "initial" : 0,
-          //       left: state.playBtnDirection === "right" ? 0 : "initial",
-          //       top: state.fingeringInfo.name === "ocarina" ? "60px" : 0,
-          //     },
-          //   };
-          // } else {
-          //   return {
-          //     container: {
-          //       paddingLeft: state.fingeringInfo.width,
-          //     },
-          //     fingerBox: {
-          //       position: "absolute",
-          //       width: state.fingeringInfo.width,
-          //       height: state.fingeringInfo.name === "hulusi-flute" ? "86%" : "80%",
-          //       left: 0,
-          //       top: state.fingeringInfo.name === "ocarina" ? "60px" : 0,
-          //     },
-          //   };
-          // }
-          return {
-            container: {
-              paddingLeft: state.fingeringInfo.width,
-            },
-            fingerBox: {
-              position: "absolute",
-              width: state.fingeringInfo.width,
-              height: state.fingeringInfo.name === "hulusi-flute" ? "86%" : "80%",
-              left: 0,
-              top: state.fingeringInfo.name === "ocarina" ? "60px" : 0,
-            },
-          };
+          if (state.platform === IPlatform.PC) {
+            return {
+              container: {
+                paddingRight: state.playBtnDirection === "right" ? "initial" : state.fingeringInfo.width,
+                paddingLeft: state.playBtnDirection === "right" ? state.fingeringInfo.width : "initial",
+              },
+              fingerBox: {
+                position: "absolute",
+                width: state.fingeringInfo.width,
+                height: state.fingeringInfo.name === "hulusi-flute" ? "86%" : "80%",
+                right: state.playBtnDirection === "right" ? "initial" : 0,
+                left: state.playBtnDirection === "right" ? 0 : "initial",
+                top: state.fingeringInfo.name === "ocarina" ? "60px" : 0,
+              },
+            };
+          } else {
+            return {
+              container: {
+                paddingLeft: state.fingeringInfo.width,
+              },
+              fingerBox: {
+                position: "absolute",
+                width: state.fingeringInfo.width,
+                height: state.fingeringInfo.name === "hulusi-flute" ? "86%" : "80%",
+                left: 0,
+                top: state.fingeringInfo.name === "ocarina" ? "60px" : 0,
+              },
+            };
+          }
         }
       }
       return {

+ 1 - 1
src/page-instrument/view-detail/smoothAnimation/index.ts

@@ -80,7 +80,7 @@ export function initSmoothAnimation() {
    calcClientWidth()
    window.addEventListener("resize", calcClientWidth)
    // 初始化 只有练习模式 才显示
-   state.modeType === "practise" && (smoothAnimationState.isShow.value = true)
+   state.modeType === "practise" && (smoothAnimationState.isShow.value = state.melodyLine)
    // 多分轨合并显示、打击乐、节奏练习的曲子不显示旋律线
    if (state.isCombineRender || state.isPercussion) {
       smoothAnimationState.isShow.value = false