From 088ab69f327a39175791678c6cb07c312f75d6f8 Mon Sep 17 00:00:00 2001
From: king <2229249788@qq.com>
Date: Mon, 31 Jul 2023 15:54:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=92=AD=E6=94=BE=E7=BB=93=E6=9D=9F=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E6=92=AD=E6=94=BE=E4=B8=8B=E4=B8=80=E4=B8=AA=E8=AF=BE?=
 =?UTF-8?q?=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/videoInfo/components/catalogue.tsx  |   2 +-
 .../business/videoInfo/components/course.tsx     |   6 +++---
 src/pages/business/videoInfo/videoInfo.tsx       |  13 +++++++------
 src/static/img/curRecord.png                     | Bin 0 -> 2413 bytes
 src/static/img/hourRecord.png                    | Bin 0 -> 3357 bytes
 5 files changed, 11 insertions(+), 10 deletions(-)
 create mode 100644 src/static/img/curRecord.png
 create mode 100644 src/static/img/hourRecord.png

diff --git a/src/pages/business/videoInfo/components/catalogue.tsx b/src/pages/business/videoInfo/components/catalogue.tsx
index 7bcf800..132bda6 100644
--- a/src/pages/business/videoInfo/components/catalogue.tsx
+++ b/src/pages/business/videoInfo/components/catalogue.tsx
@@ -85,7 +85,7 @@ const Catalogue: FC<Props> = ({data, setHors, id}) => {
         if (flat.id === lastTimeId) {
           const next = flats[index + 1]
           if (next) {
-            setHors(true, lastTimeId)
+            setHors(true, next.id)
           }
         }
       }
diff --git a/src/pages/business/videoInfo/components/course.tsx b/src/pages/business/videoInfo/components/course.tsx
index e6dadd4..b1340c4 100644
--- a/src/pages/business/videoInfo/components/course.tsx
+++ b/src/pages/business/videoInfo/components/course.tsx
@@ -32,7 +32,7 @@ const Course: FC<Props> = ({id, courseId, preview, curEnd}: Props) => {
   const [count, setCount] = useState<Record<number, number> | null>(null)
   const [frequency, setFrequency] = useState<number>(1) // 次数
   const [testId, setTestId] = useState<number | null>(null)
-  const [startRecording, setStartRecording] = useState<CurEndParam | null>(null) // 开始记录
+  const [startRecording, setStartRecording] = useState<CurEndParam | null>(null) // 视频开始记录
   const {user} = Profile.useContainer()
 
 
@@ -179,7 +179,7 @@ const Course: FC<Props> = ({id, courseId, preview, curEnd}: Props) => {
         setTime={videoSeek}
       />
 
-      <view>
+      <View>
         <CustomPageContainer
           show={show}
           position='bottom'
@@ -239,7 +239,7 @@ const Course: FC<Props> = ({id, courseId, preview, curEnd}: Props) => {
             {frequency === 0 && validate && <Button className='button' onClick={again}>重新学习</Button>}
           </View>
         </CustomPageContainer>
-      </view>
+      </View>
     </>
 
   )
diff --git a/src/pages/business/videoInfo/videoInfo.tsx b/src/pages/business/videoInfo/videoInfo.tsx
index 958e020..ebe0377 100644
--- a/src/pages/business/videoInfo/videoInfo.tsx
+++ b/src/pages/business/videoInfo/videoInfo.tsx
@@ -1,5 +1,5 @@
 import {Image, Text, View} from "@tarojs/components";
-import {FC, useEffect, useState} from "react";
+import {FC, useCallback, useEffect, useState} from "react";
 import {CourseDepData, curriculum} from "@/api";
 import './videoInfo.scss'
 import {Profile} from '@/store'
@@ -24,7 +24,7 @@ const VideoInfo: FC = () => {
     }
     /** 用于自动播放 判断当前课程是否完成 */
     if (playId) {
-      currentVideo()
+      currentVideo(res)
     }
   }
 
@@ -37,8 +37,9 @@ const VideoInfo: FC = () => {
     getData()
   }, [])
 
+
   /** 播放下一个视频 */
-  function playNext() {
+  const playNext = useCallback(() => {
     const flats: Hour[] = Object.values(data?.hours || {}).flat(Infinity) as Hour[]
     if (playId === flats?.[flats.length - 1]?.id) {
       Taro.showModal({title: '当前课程结束'})
@@ -61,12 +62,12 @@ const VideoInfo: FC = () => {
         return
       }
     }
-  }
+  }, [playId, data])
 
   /**
    * 判断当前课程是否完成
    */
-  function currentVideo() {
+  const currentVideo = useCallback((data: CourseDepData) => {
     const courseHourRecordsFinish = data?.learn_hour_records.find(d => d.id === playId)?.courseHourRecordsFinish
     if (typeof courseHourRecordsFinish === 'number') {
       if (courseHourRecordsFinish === 1) {
@@ -82,7 +83,7 @@ const VideoInfo: FC = () => {
         })
       }
     }
-  }
+  }, [playId, data])
 
   Taro.useDidShow(() => {
     data && getData()
diff --git a/src/static/img/curRecord.png b/src/static/img/curRecord.png
new file mode 100644
index 0000000000000000000000000000000000000000..02d6ac5611ba4d70b92d69986eda75c3a17e90e3
GIT binary patch
literal 2413
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

literal 0
HcmV?d00001

diff --git a/src/static/img/hourRecord.png b/src/static/img/hourRecord.png
new file mode 100644
index 0000000000000000000000000000000000000000..c87a275443c2bc8d4259627529c5cf18fc72c140
GIT binary patch
literal 3357
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

literal 0
HcmV?d00001