Quellcode durchsuchen

style: 开启摄像头,谱面透明度优化

TIANYONG vor 1 Jahr
Ursprung
Commit
021cedc05c
2 geänderte Dateien mit 17 neuen und 3 gelöschten Zeilen
  1. 1 1
      src/helpers/formateMusic.ts
  2. 16 2
      src/page-instrument/view-detail/index.tsx

+ 1 - 1
src/helpers/formateMusic.ts

@@ -598,7 +598,7 @@ export const formatXML = (xml: string): string => {
 	// 		word.outerHTML = '<words id="test-word" default-x="805" default-y="100" x="200" justify="right" valign="middle" font-family="SimHei" font-style="normal" font-size="11.9365" font-weight="normal">筒音作5</words>'
 	// 	}
 	// }
-	console.log(11111,Array.from(xmlParse.getElementsByTagName("staffline")),Array.from(xmlParse.getElementsByTagName("words")))
+	// console.log(11111,Array.from(xmlParse.getElementsByTagName("staffline")),Array.from(xmlParse.getElementsByTagName("words")))
 	// let speed = -1
 	let beats = -1;
 	let beatType = -1;

+ 16 - 2
src/page-instrument/view-detail/index.tsx

@@ -360,6 +360,11 @@ export default defineComponent({
         class={[styles.detail, state.setting.eyeProtection && "eyeProtection", state.platform === IPlatform.PC && styles.PC]}
         style={{
           paddingLeft: detailData.paddingLeft,
+          background: state.setting.camera
+          ? `rgba(${state.setting.eyeProtection ? '253,244,229' : '255,255,255'} ,${
+            state.setting.cameraOpacity / 100
+            }) !important`
+          : '',
         }}
       >
         <Transition name="van-fade">
@@ -374,7 +379,7 @@ export default defineComponent({
           id="scrollContainer"
           style={{ ...fingerConfig.value.container, 
             height: detailData.headerHide ? "100vh" : "",
-            opacity: state.setting.camera ? `${state.setting.cameraOpacity / 100}` : "" }}
+          }}
           class={[styles.container, !state.setting.displayCursor && "hideCursor", browsInfo.xiaomi && styles.xiaomi]}
           onClick={(e: Event) => {
             e.stopPropagation();
@@ -389,7 +394,16 @@ export default defineComponent({
           {/* 指法 */}
           {state.setting.displayFingering && state.fingeringInfo?.name && (
             <div style={{ ...fingerConfig.value.fingerBox }}>
-              <Fingering onOpen={() => handleOpenFignerView()} />
+              <Fingering 
+                   style={{
+                    background: state.setting.camera
+                      ? `rgba(${state.setting.eyeProtection ? '253,244,229' : '255,255,255'} ,${
+                          state.setting.cameraOpacity / 100
+                        })`
+                      : '',
+                  }}              
+                onOpen={() => handleOpenFignerView()} 
+              />
             </div>
           )}
         </div>