|
|
@@ -89,7 +89,7 @@ export default defineComponent({
|
|
|
icon: icons.icon_mode,
|
|
|
},
|
|
|
],
|
|
|
- fingeringMode: query.listenMode || ("scaleMode" as "fingeringMode" | "listenMode" | "scaleMode"), // 模式
|
|
|
+ fingeringMode: query.type || ("scaleMode" as "fingeringMode" | "listenMode" | "scaleMode"), // 模式
|
|
|
noteType: "all" as "#c" | "all", // 音调
|
|
|
});
|
|
|
const fingerData = reactive({
|
|
|
@@ -215,11 +215,24 @@ export default defineComponent({
|
|
|
if (playAction.listenLock) return;
|
|
|
if (playAction.showAnswerLoading) return;
|
|
|
if (data.fingeringMode === "scaleMode") {
|
|
|
+ if (["pan-flute", "ocarina"].includes(data.subject)) {
|
|
|
+ data.viewIndex = 1;
|
|
|
+ } else {
|
|
|
+ data.viewIndex = 0;
|
|
|
+ }
|
|
|
+ const o: any = {
|
|
|
+ "pan-flute": 2,
|
|
|
+ ocarina: 2,
|
|
|
+ piccolo: 2,
|
|
|
+ "hulusi-flute": 2,
|
|
|
+ };
|
|
|
+ data.viewTotal = o[data.subject] || 1;
|
|
|
data.fingeringMode = "listenMode";
|
|
|
} else if (data.fingeringMode === "listenMode") {
|
|
|
data.fingeringMode = "fingeringMode";
|
|
|
} else if (data.fingeringMode === "fingeringMode") {
|
|
|
data.fingeringMode = "scaleMode";
|
|
|
+ data.noteType = "all";
|
|
|
}
|
|
|
resetMode(true, 0);
|
|
|
__init();
|
|
|
@@ -839,12 +852,15 @@ export default defineComponent({
|
|
|
if (data.subject === val.value) return;
|
|
|
data.subject = val.value;
|
|
|
data.viewIndex = 0;
|
|
|
+
|
|
|
+ fingerData.fingeringInfo = subjectFingering(data.subject);
|
|
|
+ console.log(fingerData.fingeringInfo);
|
|
|
resetElement();
|
|
|
resetMode(true, 0);
|
|
|
+ api_setRequestedOrientation(orientationDirection.value);
|
|
|
// 设置屏幕方向
|
|
|
- __init();
|
|
|
setTimeout(() => {
|
|
|
- api_setRequestedOrientation(orientationDirection.value);
|
|
|
+ __init();
|
|
|
}, 100);
|
|
|
}}
|
|
|
>
|
