From b2fd82e9f40777404d7e8d3b1b132f268029ba91 Mon Sep 17 00:00:00 2001
From: amass <168062547@qq.com>
Date: Wed, 14 Jun 2023 15:06:52 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=AE=8C=E6=88=90=E8=BF=9B=E5=BA=A6=E6=9D=A1?=
 =?UTF-8?q?=E7=9A=84seek=E5=8A=9F=E8=83=BD=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/MainPage.js                       |  5 ++--
 src/PlayerBar.js                      | 27 ++++++++++-------
 src/RecordLyrics.js                   | 10 +++++--
 src/business/recorderSlice.js         |  6 +++-
 src/components/Waveform.js            | 43 ++++++++++++---------------
 src/components/useSetTrackProgress.js | 32 --------------------
 6 files changed, 50 insertions(+), 73 deletions(-)
 delete mode 100644 src/components/useSetTrackProgress.js

diff --git a/src/MainPage.js b/src/MainPage.js
index 2be11b0..e88d785 100644
--- a/src/MainPage.js
+++ b/src/MainPage.js
@@ -35,6 +35,7 @@ export default function () {
     const dispatch = useDispatch()
     const accessToken = useSelector(state => state.user.accessToken);
     const passportId = useSelector(state => state.user.passportId);
+    const currentTime = useSelector(state => state.recorder.currentTime);
     useEffect(() => {
         yzs.get_record_list(accessToken, passportId).then(list => {
             dispatch(setList(list.result));
@@ -53,8 +54,8 @@ export default function () {
                     mr: `24px`,
                 }}
             >
-                <PlayerBar />
-                <RecordLyrics />
+                <PlayerBar currentTime={currentTime} />
+                <RecordLyrics currentTime={currentTime} />
             </Box>
         </ThemeProvider>
     </div >
diff --git a/src/PlayerBar.js b/src/PlayerBar.js
index 321ea35..95a043f 100644
--- a/src/PlayerBar.js
+++ b/src/PlayerBar.js
@@ -6,7 +6,7 @@ import { useResizeDetector } from 'react-resize-detector';
 import pauseIcon from "./assets/play.png";
 import playIcon from "./assets/pause.png";
 import downloadIcon from "./assets/download.png";
-import { togglePauseState } from "./business/recorderSlice.js"
+import { setCurrentTime, togglePauseState } from "./business/recorderSlice.js"
 import Waveform from "./components/Waveform";
 
 const durationFormat = (time) => {
@@ -18,10 +18,9 @@ const durationFormat = (time) => {
     return hour.toString().padStart(2, '0') + ":" + minute.toString().padStart(2, '0') + ":" + second.toString().padStart(2, '0');
 }
 
-export default function () {
+export default function ({ currentTime }) {
     const dispatch = useDispatch();
-    const [duration, setDuration] = useState("00:00:00");
-    const [currentTime, setCurrentTime] = useState("00:00:00");
+    const [duration, setDuration] = useState(0);
     const [canvasWidth, setCanvasWidth] = useState(0);
     const currentIndex = useSelector(state => state.recorder.currentIndex);
     const recordList = useSelector(state => state.recorder.list);
@@ -43,10 +42,10 @@ export default function () {
     };
 
     const onDurationChange = (event) => {
-        setDuration(durationFormat(player.current.duration));
+        setDuration(player.current.duration);
     }
     const onTimeUpdate = (event) => {
-        setCurrentTime(durationFormat(player.current.currentTime));
+        dispatch(setCurrentTime(player.current.currentTime));
     }
 
     const onResize = useCallback((width, height) => {
@@ -57,7 +56,15 @@ export default function () {
         onResize: onResize
     });
 
-    return <Stack container >
+    const seekRecord = (second) => {
+        player.current.currentTime = second;
+    }
+
+    return <Stack container sx={{
+        position: "sticky",
+        top: 48,
+        backgroundColor: "#FAFAFA",
+    }} >
         <Container disableGutters maxWidth={false} sx={{
             height: 60,
             display: "flex",
@@ -75,7 +82,7 @@ export default function () {
             </IconButton>
 
             <audio autoplay ref={player} src={currentBlob} onDurationChange={onDurationChange} onTimeUpdate={onTimeUpdate} />
-            <Waveform width={canvasWidth} />
+            <Waveform width={canvasWidth} duration={duration} currentTime={currentTime} playing={!pause} seek={seekRecord} />
             <Select
                 defaultValue={1.0}
                 sx={{
@@ -89,12 +96,10 @@ export default function () {
                 <MenuItem value={1.5}>1.5X</MenuItem>
                 <MenuItem value={2.0}>2.0X</MenuItem>
             </Select>
-
-
         </div>
 
         <Container maxWidth={false} sx={{ backgroundColor: "#F2F4F5" }}>
-            <Typography sx={{ color: "#6B7486" }}>  {currentTime} / {duration}</Typography>
+            <Typography sx={{ color: "#6B7486" }}>  {durationFormat(currentTime)} / {durationFormat(duration)}</Typography>
 
         </Container>
     </Stack>
diff --git a/src/RecordLyrics.js b/src/RecordLyrics.js
index e42ac31..94f7c8a 100644
--- a/src/RecordLyrics.js
+++ b/src/RecordLyrics.js
@@ -3,9 +3,14 @@ import { Typography, Paper } from "@mui/material";
 import styles from './RecordLyrics.module.css';
 import { useSelector, useDispatch } from 'react-redux'
 
+function isHighlight(currentTime, { start, end }) {
+    currentTime *= 1000;
+    return (currentTime > start) && (currentTime <= end);
+}
 
 
-export default function () {
+
+export default function ({ currentTime }) {
     const currentLyric = useSelector(state => state.recorder.currentLyric);
     const currentIndex = useSelector(state => state.recorder.currentIndex);
     const recordList = useSelector(state => state.recorder.list);
@@ -16,8 +21,7 @@ export default function () {
     return <Paper className={styles.lyricsBrowser}>
         {recordList.at(currentIndex).type === 1 ? (typeof currentLyric === "object" ? currentLyric.map((lyric, index) => {
             return <div className={styles.lyricItem}>
-                <Typography align="left">{lyric.text}</Typography>
-                <Typography align="left">{lyric.translation}</Typography>
+                <Typography align="left" color={isHighlight(currentTime, lyric) ? "red" : "black"}>{lyric.text}</Typography>
             </div>
         }) : <React.Fragment />) : <div> {typeof currentLyric === "string" ? currentLyric : ""}</div>}
     </Paper>
diff --git a/src/business/recorderSlice.js b/src/business/recorderSlice.js
index b7a0dd1..92a6424 100644
--- a/src/business/recorderSlice.js
+++ b/src/business/recorderSlice.js
@@ -7,6 +7,7 @@ export const recorderSlice = createSlice({
         currentIndex: 0,
         currentLyric: [],
         currentBlob: {},
+        currentTime: 0, // 当前音频播放时间
         pause: true,
     },
     reducers: {
@@ -23,6 +24,9 @@ export const recorderSlice = createSlice({
         setCurrentBlob: (state, action) => {
             state.currentBlob = action.payload;
         },
+        setCurrentTime: (state, action) => {
+            state.currentTime = action.payload;
+        },
         togglePauseState: (state) => {
             state.pause = !state.pause;
         },
@@ -30,6 +34,6 @@ export const recorderSlice = createSlice({
 })
 
 // Action creators are generated for each case reducer function
-export const { setCurrentIndex, setList, setCurrentLyric, setCurrentBlob, togglePauseState } = recorderSlice.actions
+export const { setCurrentIndex, setList, setCurrentLyric, setCurrentBlob, togglePauseState, setCurrentTime } = recorderSlice.actions
 
 export default recorderSlice.reducer
\ No newline at end of file
diff --git a/src/components/Waveform.js b/src/components/Waveform.js
index 4885d71..17ae108 100644
--- a/src/components/Waveform.js
+++ b/src/components/Waveform.js
@@ -1,11 +1,10 @@
 import { useEffect, useRef, useState, useCallback } from "react";
-import useSetTrackProgress from "./useSetTrackProgress.js"
-import { useResizeDetector } from 'react-resize-detector';
 
 const pointWidth = 2;
 const pointMargin = 3;
+const leftPadding = 14; // 留出空间画时间戳
+const rightPadding = 14;
 
-const trackDuration = 60;   // <audio> duration: seconds
 const chunkedData = [10, 12, 12, 15, 20, 30, 34, 36, 37, 35, 37, 63, 73, 83, 67, 86, 76, 74, 83, 90, 79, 85, 90, 83, 83, 75, 57, 70, 82, 58, 73, 73, 85, 73, 76, 75,
     30, 34, 36, 37, 35, 37, 63, 73, 83, 67, 86, 76, 74, 83, 90, 79, 85, 90, 83, 83, 75, 57, 70, 82, 58, 73, 73, 85, 73, 76, 75,
     30, 34, 36, 37, 35, 37, 63, 73, 83, 67, 86, 76, 74, 83, 90, 79, 85, 90, 83, 83, 75, 57, 70, 82, 58, 73, 73, 85, 73, 76, 75,
@@ -33,7 +32,7 @@ const pointCoordinates = ({
     const pointHeight = Math.round((amplitude / 100) * maxAmplitude)
     const verticalCenter = Math.round((canvasHeight - pointHeight) / 2)
     return [
-        index * (pointWidth + pointMargin) + 14, // x starting point
+        index * (pointWidth + pointMargin) + leftPadding, // x starting point
         (canvasHeight - pointHeight) - verticalCenter + 10, // y starting point
         pointWidth, // width
         pointHeight, // height
@@ -46,15 +45,16 @@ function drawText(context, width, duration) {
     context.fillStyle = "#99A3AF";
 
     let timepoint = 0;
-    let segements = parseInt((width - 30) / 80);
-    let interval = parseInt(duration / segements);
-    for (let i = 0; i < segements; i++) {
+    let segements = parseInt((width - leftPadding - rightPadding) / 80);
+    let interval = Math.ceil(duration / segements);
+    console.log("segements", segements, width / 80, width);
+    for (let i = 0; i <= segements; i++) {
         context.fillStyle = "#99A3AF";
         context.fillText(timeTag(timepoint), i * 80, 10 + 4);
         timepoint += interval;
     }
 
-    for (let i = 14; i < width; i += 40) {
+    for (let i = leftPadding; i < width - rightPadding; i += 40) {
         context.fillStyle = "#9DA7B2";
         context.fillRect(i, 0, 1, (i - 14) % 80 == 0 ? 12 : 6);
     }
@@ -64,7 +64,7 @@ const paintCanvas = ({
     canvas, waveformData, duration, canvasWidth, canvasHeight, pointWidth, pointMargin,
     playingPoint, hoverXCoord,
 }) => {
-    // console.log("paintCanvas", canvasHeight, playingPoint, hoverXCoord);
+    console.log("paintCanvas", duration, canvasHeight, playingPoint, hoverXCoord);
     const ref = canvas.current;
     const ctx = ref.getContext('2d')
     ctx.clearRect(0, 0, ref.width, ref.height);
@@ -96,20 +96,18 @@ const paintCanvas = ({
     );
 }
 
-export default function ({ width }) {
+export default function ({ width, duration, currentTime, playing, seek }) {
     const canvas = useRef(null);
-    const [trackPlaying, setTrackPlaying] = useState(true);
     const [trackProgress, setTrackProgress] = useState(0);  // [0,100]
     const [hoverXCoord, setHoverXCoord] = useState(0);
-    const [startTime, setStartTime] = useState(Date.now());
 
-    const playingPoint = (trackProgress * (canvas.current ? width : 0) / 100) / (pointWidth + pointMargin);
+    const playingPoint = (trackProgress * (canvas.current ? (width - leftPadding) : 0) / 100) / (pointWidth + pointMargin);
 
     const paintWaveform = useCallback(() => {
         paintCanvas({
             canvas,
             waveformData: chunkedData,
-            duration: trackDuration,
+            duration: duration,
             canvasWidth: width,
             canvasHeight: canvas.current.height,
             pointWidth,
@@ -117,24 +115,21 @@ export default function ({ width }) {
             playingPoint,
             hoverXCoord,
         })
-    }, [playingPoint, hoverXCoord])
-
-    useSetTrackProgress({
-        trackProgress, setTrackProgress, trackDuration, startTime,
-        trackPlaying
-    });
+    }, [playingPoint, hoverXCoord, duration, width])
 
 
     useEffect(() => {
         if (!canvas.current) return;
         paintWaveform()
-
-    }, [canvas, width])
+    }, [canvas, width, duration, hoverXCoord])
 
     useEffect(() => {
         paintWaveform()
     }, [playingPoint])
 
+    useEffect(() => {
+        setTrackProgress(currentTime * 100 / duration);
+    }, [currentTime]);
 
     const setDefaultX = useCallback(() => {
         setHoverXCoord(0);
@@ -146,8 +141,8 @@ export default function ({ width }) {
 
     const seekTrack = (e) => {
         const xCoord = e.clientX - canvas.current.getBoundingClientRect().left
-        const seekMs = trackDuration * (xCoord / width);
-        setStartTime(Date.now() / 1000 - seekMs)
+        const seekSecond = duration * ((xCoord - leftPadding) / (width - leftPadding));
+        seek(seekSecond);
     }
 
     return <canvas height={70} width={width} ref={canvas}
diff --git a/src/components/useSetTrackProgress.js b/src/components/useSetTrackProgress.js
deleted file mode 100644
index 1f5c335..0000000
--- a/src/components/useSetTrackProgress.js
+++ /dev/null
@@ -1,32 +0,0 @@
-import { useEffect } from 'react'
-
-const clamp = (val, min, max) => Math.min(Math.max(val, min), max)
-
-export default ({
-    trackProgress, trackDuration, startTime,
-    setTrackProgress, trackPlaying,
-}) => {
-    useEffect(() => {
-        let animation
-        if (trackPlaying) {
-            animation = window.requestAnimationFrame(() => {
-                console.log("ani");
-                const trackProgressPerc = ((Date.now() / 1000 - startTime)) * 100 / trackDuration
-                setTrackProgress(
-                    clamp(
-                        trackProgressPerc,
-                        0, 100,
-                    ),
-                )
-            })
-        }
-        return () => {
-            window.cancelAnimationFrame(animation)
-        }
-    }, [
-        trackPlaying,
-        trackDuration,
-        startTime,
-        trackProgress,
-    ])
-}
\ No newline at end of file