ui

src/subpages/colexiu-report/index.tsx

@@ -122,6 +122,7 @@ export default defineComponent({
 
     const filterNotes = () => {
       const include = ['RIGHT', 'WRONG', 'CADENCE_WRONG']
+      console.log(active.value)
       if (active.value === 'pitch') {
         include.push(...['CADENCE_FAST', 'CADENCE_SLOW'])
       } else if (active.value === 'rhythm') {
@@ -136,6 +137,7 @@ export default defineComponent({
       clearViewColor()
       for (const note of filterNotes()) {
         const active = allNote.value[note.musicalNotesIndex]
+        console.log("🚀 ~ active:", active)
         setTimeout(() => {
           if (useedid.value.includes(active.id)) {
             return
@@ -204,9 +206,11 @@ export default defineComponent({
       })
       runtime.osmd = osmd
       allNote.value = getAllNodes(runtime.osmd)
+      console.log("🚀 ~ allNote.value:", allNote.value)
       setViewColor()
       const setEvaluatings = (note: any, data: any, dontTransition = true) => {
         const startNote = getBoundingBoxByverticalNote(note)
+        console.log("🚀 ~ startNote:", startNote)
         detailState.evaluatings = {
           ...detailState.evaluatings,
           [startNote.measureIndex]: {
@@ -268,7 +272,7 @@ export default defineComponent({
               style={{
                 paddingLeft: detailState.isSpecialShapedScreen ? detailState.notchHeight / 2 + 'px' : 'auto',
               }}
-              onActiveChange={() => setViewColor()}
+              onActiveChange={(active: string) => setViewColor()}
             />
           )}
           <div

src/subpages/colexiu/buttons/index.module.less

@@ -302,7 +302,7 @@
 
 .dialogueBox {
   position: fixed;
-  bottom: 0;
+  bottom: -1px;
   right: 0;
   z-index: 9;
   display: flex;

src/subpages/colexiu/buttons/index.tsx

@@ -24,6 +24,8 @@ import { switchProps } from '../popups/setting/evaluat'
 import iconBack from './icons/icon-back.svg'
 import iconFollowEndBtn from '../popups/follow/icons/icon-followEndBtn.png'
 import iconEvaluatingEnd from './icons/icon-evaluatingEnd.png'
+import iconCameraOff from './icons/icon-camera-off.png'
+import iconCameraOn from './icons/icon-camera-on.png'
 import store from 'store'
 import styles from './index.module.less'
 import { sendBackRecordTotalTime } from '../App'
@@ -262,7 +264,7 @@ export default defineComponent({
                     reference: () => (
                       <div>
                         <Button class={[styles.button, styles.hasText]}>
-                          <ButtonIcon key="camera" name="camera" />
+                          <img src={SettingState.sett.camera ? iconCameraOn : iconCameraOff} />
                           <span>摄像头</span>
                         </Button>
                       </div>

src/subpages/colexiu/popups/evaluating/content.tsx

@@ -4,7 +4,7 @@ import qs from 'query-string'
 import appState from '/src/state'
 import detailState from '/src/pages/detail/state'
 import styles from './index.module.less'
-import backIcon from '../sound-effect/icons/back.svg'
+import backIcon from '../sound-effect/icons/back.png'
 import iconBadge from './icons/icon-badge.svg'
 import iconLianxi from './icons/icon-lianxi.png'
 import iconReport from './icons/icon-report.png'

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

@@ -73,7 +73,6 @@
   position: fixed;
   top: 50%;
   left: 50%;
-  margin-top: 10vh;
   transform: translate(-50%, -50%);
   font-size: 12px;
   color: #fff;

src/subpages/colexiu/popups/sound-effect/icons/back.svg

@@ -1,18 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="48px" height="49px" viewBox="0 0 48 49" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>编组 8</title>
+<svg width="30px" height="30px" viewBox="0 0 30 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>切片</title>
     <defs>
         <linearGradient x1="-5.48380785e-12%" y1="5.38483651%" x2="100%" y2="100%" id="linearGradient-1">
             <stop stop-color="#FF9C63" offset="0%"></stop>
             <stop stop-color="#FF7144" offset="100%"></stop>
         </linearGradient>
-        <rect id="path-2" x="0" y="0" width="46" height="46" rx="18"></rect>
-        <filter x="-5.4%" y="-3.3%" width="110.9%" height="113.0%" filterUnits="objectBoundingBox" id="filter-3">
-            <feOffset dx="0" dy="2" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
-            <feGaussianBlur stdDeviation="0.5" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
-            <feColorMatrix values="0 0 0 0 0.741508152   0 0 0 0 0.472091343   0 0 0 0 0.43649793  0 0 0 0.273082386 0" type="matrix" in="shadowBlurOuter1"></feColorMatrix>
-        </filter>
-        <filter x="-6.5%" y="-4.3%" width="113.0%" height="115.2%" filterUnits="objectBoundingBox" id="filter-4">
+        <circle id="path-2" cx="15" cy="15" r="15"></circle>
+        <filter x="-6.7%" y="-6.7%" width="113.3%" height="113.3%" filterUnits="objectBoundingBox" id="filter-3">
             <feGaussianBlur stdDeviation="1.5" in="SourceAlpha" result="shadowBlurInner1"></feGaussianBlur>
             <feOffset dx="0" dy="1" in="shadowBlurInner1" result="shadowOffsetInner1"></feOffset>
             <feComposite in="shadowOffsetInner1" in2="SourceAlpha" operator="arithmetic" k2="-1" k3="1" result="shadowInnerInner1"></feComposite>
@@ -20,17 +15,17 @@
             <feGaussianBlur stdDeviation="0.5" in="SourceAlpha" result="shadowBlurInner2"></feGaussianBlur>
             <feOffset dx="-1" dy="-3" in="shadowBlurInner2" result="shadowOffsetInner2"></feOffset>
             <feComposite in="shadowOffsetInner2" in2="SourceAlpha" operator="arithmetic" k2="-1" k3="1" result="shadowInnerInner2"></feComposite>
-            <feColorMatrix values="0 0 0 0 0.983016304   0 0 0 0 0.353183073   0 0 0 0 0.108247927  0 0 0 0.615220717 0" type="matrix" in="shadowInnerInner2" result="shadowMatrixInner2"></feColorMatrix>
+            <feColorMatrix values="0 0 0 0 0.983016304   0 0 0 0 0.353183073   0 0 0 0 0.108247927  0 0 0 0.462194056 0" type="matrix" in="shadowInnerInner2" result="shadowMatrixInner2"></feColorMatrix>
             <feMerge>
                 <feMergeNode in="shadowMatrixInner1"></feMergeNode>
                 <feMergeNode in="shadowMatrixInner2"></feMergeNode>
             </feMerge>
         </filter>
-        <polyline id="path-5" points="26.5 33.5 15.5 22.5 26.5 11.5"></polyline>
-        <filter x="-77.3%" y="-38.8%" width="282.1%" height="195.8%" filterUnits="objectBoundingBox" id="filter-6">
-            <feMorphology radius="2.5" operator="dilate" in="SourceAlpha" result="shadowSpreadOuter1"></feMorphology>
+        <polyline id="path-4" points="7.5 15 0 7.5 7.5 0"></polyline>
+        <filter x="-100.0%" y="-47.5%" width="335.0%" height="221.6%" filterUnits="objectBoundingBox" id="filter-5">
+            <feMorphology radius="1.5" operator="dilate" in="SourceAlpha" result="shadowSpreadOuter1"></feMorphology>
             <feOffset dx="1" dy="2" in="shadowSpreadOuter1" result="shadowOffsetOuter1"></feOffset>
-            <feMorphology radius="2.5" operator="erode" in="SourceAlpha" result="shadowInner"></feMorphology>
+            <feMorphology radius="1.5" operator="erode" in="SourceAlpha" result="shadowInner"></feMorphology>
             <feOffset dx="1" dy="2" in="shadowInner" result="shadowInner"></feOffset>
             <feComposite in="shadowOffsetOuter1" in2="shadowInner" operator="out" result="shadowOffsetOuter1"></feComposite>
             <feGaussianBlur stdDeviation="2" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
@@ -38,18 +33,18 @@
         </filter>
     </defs>
     <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="评测结果-18分" transform="translate(-32.000000, -18.000000)">
-            <g id="返回" transform="translate(33.000000, 18.000000)">
-                <g id="矩形">
-                    <use fill="black" fill-opacity="1" filter="url(#filter-3)" xlink:href="#path-2"></use>
+        <g id="云教练主界面" transform="translate(-35.000000, -22.000000)">
+            <g id="编组-11" transform="translate(35.000000, 22.000000)">
+                <g id="椭圆形">
                     <use fill="url(#linearGradient-1)" fill-rule="evenodd" xlink:href="#path-2"></use>
-                    <use fill="black" fill-opacity="1" filter="url(#filter-4)" xlink:href="#path-2"></use>
+                    <use fill="black" fill-opacity="1" filter="url(#filter-3)" xlink:href="#path-2"></use>
                 </g>
-                <g id="Stroke-1" stroke-linecap="round" stroke-linejoin="round">
-                    <use fill="black" fill-opacity="1" filter="url(#filter-6)" xlink:href="#path-5"></use>
-                    <use stroke="#FFFFFF" stroke-width="5" xlink:href="#path-5"></use>
+                <g id="图标/通用/返回" transform="translate(10.500000, 7.500000)" stroke-linecap="round" stroke-linejoin="round">
+                    <g id="Stroke-1">
+                        <use fill="black" fill-opacity="1" filter="url(#filter-5)" xlink:href="#path-4"></use>
+                        <use stroke="#FFFFFF" stroke-width="3" xlink:href="#path-4"></use>
+                    </g>
                 </g>
-                <ellipse id="椭圆形" fill="#FFFFFF" opacity="0.503383" transform="translate(9.654568, 10.912808) rotate(43.000000) translate(-9.654568, -10.912808) " cx="9.65456821" cy="10.9128077" rx="1.98414685" ry="3.9682937"></ellipse>
             </g>
         </g>
     </g>

src/subpages/colexiu/popups/sound-effect/index.tsx

@@ -8,7 +8,7 @@ import styles from './index.module.less'
 import iconArrow from './icons/icon-arrow.svg'
 import iconBottom from './icons/icon-bottom.png'
 import iconRed from './icons/icon-red.png'
-import iconBack from './icons/back.svg'
+import iconBack from './icons/back.png'
 import iconGreen from './icons/icon-green.png'
 import iconWhite from './icons/icon-white.png'
 import iconSound from './icons/icon-sound.png'
@@ -139,7 +139,7 @@ export default defineComponent({
               /> */}
             </div>
             <div class={styles.des}>
-              请演奏 <span style={{ color: 'var(--primary-color)' }}>{data.text}</span>直到绿灯全部亮起
+              请演奏 <span style={{ color: 'var(--primary-color)' }}>Ab</span>直到绿灯全部亮起
             </div>
             <div class={styles.lampWrap}>
               {dotIcons.value.map((item, index) => (
@@ -160,7 +160,7 @@ export default defineComponent({
             vSlots={{
               reference: () => (
                 <Button class={styles.skepBtn} icon={iconArrow} iconPosition="right">
-                  跳过本次
+                  跳过
                 </Button>
               ),
             }}