Merge branch 'feature-903' into gyt-test

src/subpages/colexiu/popups/follow/index.tsx

@@ -12,6 +12,7 @@ import detailState from '/src/pages/detail/state'
 import iconFollwBtn from './icons/icon-follwBtn.png'
 import { unitTestData } from '/src/subpages/colexiu/unitTest/index'
 import { formatPitch } from '/src/subpages/colexiu/buttons/evaluating'
+import SettingState from '/src/pages/detail/setting-state'
 
 // 显示或隐藏播放按钮
 const togglePlayer = (show: boolean = false) => {
@@ -134,7 +135,12 @@ const handleEnd = () => {
  */
 const autoEndFollow = () => {
 	if (data.index >= detailState.times.length) {
-		handleEnd()
+    // 如果开了自动循环需要重新开始跟练
+    if (SettingState.sett.loop) {
+      handleStart()
+    } else {
+      handleEnd()
+    }
 		return
 	}
 	let nextIndex = data.index + 1;
@@ -142,7 +148,12 @@ const autoEndFollow = () => {
 	// 后面的音符是否都是休止音符
 	const isAllRest = !rightTimes.some((item: any) => item.frequency > 1);
 	if (isAllRest && detailState.times[data.index].frequency < 1) {
-		handleEnd()
+    // 如果开了自动循环需要重新开始跟练
+    if (SettingState.sett.loop) {
+      handleStart()
+    } else {
+      handleEnd()
+    }
 		return
 	}
 }

src/subpages/colexiu/popups/setting/index.module.less

@@ -83,7 +83,13 @@
   border-radius: 5px;
 }
 
+.columnBox {
+  display: flex;
+  flex-direction: column;
+}
+
 .groupBox {
+  flex: 1;
   padding: 4px 12px;
   overflow: hidden;
   overflow-y: auto;
@@ -110,7 +116,6 @@
   margin: 4px auto;
   margin-bottom: 8px;
   box-sizing: border-box;
-  position: absolute;
   bottom: 0;
   display: flex;
   width: 100%;

src/subpages/colexiu/popups/setting/index.tsx

@@ -17,12 +17,12 @@ export default defineComponent({
     return () => (
       <div class={styles.setting}>
         <Tabs active={props.active}>
-          <Tab title="全局设置" name="1">
+          <Tab title="设置" name="1">
             <Seet />
           </Tab>
-          <Tab title="练习设置" name="2">
+          {/* <Tab title="练习设置" name="2">
             <Practise />
-          </Tab>
+          </Tab> */}
           <Tab title="评测设置" name="3">
             <Evaluat />
           </Tab>

src/subpages/colexiu/popups/setting/sett.tsx

@@ -19,6 +19,7 @@ import { promisefiyPostMessage } from '/src/helpers/native-message'
 import Popups from '..'
 import Feedback from '../feedback'
 import { useReload } from '../../uses'
+
 export const suggestPopup: Ref<any> = ref(null)
 export const confirmShow: Ref<boolean> = ref(false)
 
@@ -132,7 +133,7 @@ export default defineComponent({
     return () => {
       return (
         <>
-          <div>
+          <div class={styles.columnBox}>
             <NoticeBar
               class={styles.noticebar}
               left-icon={InfoIcon}
@@ -169,8 +170,22 @@ export default defineComponent({
                   }
                 </>
               }
-
               <Divider />
+              <Cell center border={false} title="循环播放">
+                <Switch v-model={SettingState.sett.loop} {...switchProps}>
+                  off
+                </Switch>
+              </Cell>
+              <Divider />
+              <Cell center border={false} title="显示指法">
+                <Switch v-model={SettingState.sett.fingering} {...switchProps} onChange={val => {
+                      SettingState.sett.fingering = val
+                      runtime.event.emit('settingFingeringChange')
+                    }
+                  }>
+                  off
+                </Switch>
+              </Cell>
               {/* <Cell center border={false} title="乐谱大小">
                 <div style={{ display: 'flex' }}>
                   <RadioGroup