Merge pull request #7 from PlayEdu/dev

视频详情课时加载错误修复

src/compenents/header/index.tsx

@@ -1,6 +1,6 @@
 import React, { useState, useEffect } from "react";
 import styles from "./index.module.scss";
-import { Modal, Button, Dropdown } from "antd";
+import { Modal, Button, Dropdown, Image } from "antd";
 import type { MenuProps } from "antd";
 import { useDispatch, useSelector } from "react-redux";
 import { Link, useNavigate, useLocation } from "react-router-dom";
@@ -217,9 +217,11 @@ export const Header: React.FC = () => {
               <div className="d-flex" style={{ cursor: "pointer" }}>
                 {user && user.name && (
                   <>
-                    <img
+                    <Image
+                      loading="lazy"
                       style={{ width: 36, height: 36, borderRadius: "50%" }}
                       src={user.avatar}
+                      preview={false}
                     />
                     <span className="ml-8 c-admin">{user.name}</span>
                   </>

src/compenents/user-info/index.tsx

@@ -101,6 +101,7 @@ export const UserInfoModel: React.FC<PropInterface> = ({ open, onCancel }) => {
               <div className="d-flex">
                 {avatar && (
                   <Image
+                    loading="lazy"
                     width={60}
                     height={60}
                     style={{ borderRadius: "50%" }}

src/index.scss

@@ -291,9 +291,13 @@ h1 {
 }
 
 #meedu-player-container {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
   width: 100%;
-  height: auto;
+  height: 100%;
-  position: relative;
 }
 
 .ant-tree-switcher {
@@ -375,3 +379,7 @@ h1 {
 .ant-popover-inner {
   padding: 8px 0px !important;
 }
+
+.dplayer-notice {
+  opacity: 0 !important;
+}

src/pages/course/index.tsx

@@ -173,33 +173,35 @@ const CoursePage = () => {
                 {chapters.map((item: any, index: number) => (
                   <div key={item.id} className={styles["chapter-it"]}>
                     <div className={styles["chapter-name"]}>{item.name}</div>
-                    {hours[item.id].map((it: any, int: number) => (
+                    {hours[item.id] &&
-                      <div key={it.id} className={styles["hours-it"]}>
+                      hours[item.id].map((it: any, int: number) => (
-                        {learnHourRecord[it.id] && (
+                        <div key={it.id} className={styles["hours-it"]}>
-                          <HourCompenent
+                          {learnHourRecord[it.id] && (
-                            id={it.id}
+                            <HourCompenent
-                            cid={item.course_id}
+                              id={it.id}
-                            title={it.title}
+                              cid={item.course_id}
-                            record={learnHourRecord[it.id]}
+                              title={it.title}
-                            duration={it.duration}
+                              record={learnHourRecord[it.id]}
-                            progress={
+                              duration={it.duration}
-                              (learnHourRecord[it.id].finished_duration * 100) /
+                              progress={
-                              learnHourRecord[it.id].total_duration
+                                (learnHourRecord[it.id].finished_duration *
-                            }
+                                  100) /
-                          ></HourCompenent>
+                                learnHourRecord[it.id].total_duration
-                        )}
+                              }
-                        {!learnHourRecord[it.id] && (
+                            ></HourCompenent>
-                          <HourCompenent
+                          )}
-                            id={it.id}
+                          {!learnHourRecord[it.id] && (
-                            cid={item.course_id}
+                            <HourCompenent
-                            title={it.title}
+                              id={it.id}
-                            record={null}
+                              cid={item.course_id}
-                            duration={it.duration}
+                              title={it.title}
-                            progress={0}
+                              record={null}
-                          ></HourCompenent>
+                              duration={it.duration}
-                        )}
+                              progress={0}
-                      </div>
+                            ></HourCompenent>
-                    ))}
+                          )}
+                        </div>
+                      ))}
                   </div>
                 ))}
               </div>

src/pages/course/video.tsx

@@ -22,17 +22,46 @@ const CoursePalyPage = () => {
   const [loading, setLoading] = useState<Boolean>(false);
   const [isLastpage, setIsLastpage] = useState<Boolean>(false);
   const [totalHours, setTotalHours] = useState<any>([]);
+  const [playingTime, setPlayingTime] = useState(0);
+  const [watchedSeconds, setWatchedSeconds] = useState(0);
   const myRef = useRef(0);
+  const playRef = useRef(0);
+  const watchRef = useRef(0);
+  const totalRef = useRef(0);
 
   useEffect(() => {
     getCourse();
     getDetail();
+    document.oncontextmenu = function (e) {
+      /*屏蔽浏览器默认右键事件*/
+      e = e || window.event;
+      return false;
+    };
+    return () => {
+      document.oncontextmenu = function (e) {
+        /*恢复浏览器默认右键事件*/
+        e = e || window.event;
+        return true;
+      };
+    };
   }, [params.courseId, params.hourId]);
 
   useEffect(() => {
     myRef.current = playDuration;
   }, [playDuration]);
 
+  useEffect(() => {
+    playRef.current = playingTime;
+  }, [playingTime]);
+
+  useEffect(() => {
+    watchRef.current = watchedSeconds;
+  }, [watchedSeconds]);
+
+  useEffect(() => {
+    totalRef.current = hour.duration;
+  }, [hour]);
+
   const getCourse = () => {
     Course.detail(Number(params.courseId)).then((res: any) => {
       let totalHours: any = [];
@@ -77,6 +106,9 @@ const CoursePalyPage = () => {
           };
           setLastSeeValue(params);
           setLastSeeValue(params);
+          setWatchedSeconds(record.finished_duration);
+        } else if (record && record.is_finished === 1) {
+          setWatchedSeconds(res.data.hour.duration);
         }
         getVideoUrl(params);
         setLoading(false);
@@ -96,6 +128,10 @@ const CoursePalyPage = () => {
   };
 
   const initDPlayer = (playUrl: string, isTrySee: number, params: any) => {
+    let banDrag =
+      systemConfig.playerIsDisabledDrag &&
+      watchRef.current < totalRef.current &&
+      watchRef.current === 0;
     window.player = new window.DPlayer({
       container: document.getElementById("meedu-player-container"),
       autoplay: false,
@@ -114,16 +150,38 @@ const CoursePalyPage = () => {
         color: systemConfig.playerBulletSecretColor || "red",
         opacity: Number(systemConfig.playerBulletSecretOpacity),
       },
-      ban_drag: false,
+      ban_drag: banDrag,
       last_see_pos: params,
     });
     // 监听播放进度更新evt
     window.player.on("timeupdate", () => {
-      playTimeUpdate(parseInt(window.player.video.currentTime), false);
+      let currentTime = parseInt(window.player.video.currentTime);
+      if (
+        systemConfig.playerIsDisabledDrag &&
+        watchRef.current < totalRef.current &&
+        currentTime - playRef.current >= 2 &&
+        currentTime > watchRef.current
+      ) {
+        message.warning("首次学习禁止快进");
+        window.player.seek(watchRef.current);
+      } else {
+        setPlayingTime(currentTime);
+        playTimeUpdate(parseInt(window.player.video.currentTime), false);
+      }
     });
     window.player.on("ended", () => {
+      if (
+        systemConfig.playerIsDisabledDrag &&
+        watchRef.current < totalRef.current &&
+        window.player.video.duration - playRef.current >= 2
+      ) {
+        window.player.seek(playRef.current);
+        return;
+      }
+      setPlayingTime(0);
       setPlayendedStatus(true);
       playTimeUpdate(parseInt(window.player.video.currentTime), true);
+      exitFullscreen();
       window.player && window.player.destroy();
     });
     setLoading(false);
@@ -157,6 +215,18 @@ const CoursePalyPage = () => {
     }
   };
 
+  const exitFullscreen = () => {
+    let de: any;
+    de = document;
+    if (de.fullscreenElement !== null) {
+      de.exitFullscreen();
+    } else if (de.mozCancelFullScreen) {
+      de.mozCancelFullScreen();
+    } else if (de.webkitCancelFullScreen) {
+      de.webkitCancelFullScreen();
+    }
+  };
+
   return (
     <div className={styles["video-mask"]}>
       <div className={styles["top-cont"]}>
@@ -165,6 +235,11 @@ const CoursePalyPage = () => {
             className={styles["close-btn"]}
             onClick={() => {
               window.player && window.player.destroy();
+              document.oncontextmenu = function (e) {
+                /*恢复浏览器默认右键事件*/
+                e = e || window.event;
+                return true;
+              };
               navigate(-1);
             }}
           >

src/pages/index/compenents/courses-model.tsx

@@ -29,6 +29,7 @@ export const CoursesModel: React.FC<PropInterface> = ({
     >
       <div className={styles["top-content"]}>
         <Image
+          loading="lazy"
           width={120}
           height={90}
           style={{ borderRadius: 10 }}
@@ -65,7 +66,13 @@ export const CoursesModel: React.FC<PropInterface> = ({
         )}
         {progress >= 100 && (
           <div className={styles["success"]}>
-            <Image width={24} height={24} src={mediaIcon} preview={false} />
+            <Image
+              loading="lazy"
+              width={24}
+              height={24}
+              src={mediaIcon}
+              preview={false}
+            />
             <span className="ml-8">恭喜你学完此课程!</span>
           </div>
         )}

src/pages/index/index.tsx

@@ -187,8 +187,6 @@ const IndexPage = () => {
         overflowX: "hidden",
         overflowY: "auto",
       }}
-      onMouseOut={() => setOpen(false)}
-      onMouseOver={() => setOpen(true)}
     >
       <Tree
         selectedKeys={selectKey}
@@ -332,10 +330,7 @@ const IndexPage = () => {
             trigger="click"
             onOpenChange={handleOpenChange}
           >
-            <Space
+            <Space className={styles["dropButton"]}>
-              className={styles["dropButton"]}
-              onMouseOver={() => setOpen(true)}
-            >
               {categoryText}
               <i
                 className="iconfont icon-icon-xiala"

src/pages/init/index.tsx

@@ -22,60 +22,70 @@ export const InitPage = (props: Props) => {
   const [showHeader, setShowHeader] = useState<boolean>(true);
   const [showNoHeader, setShowNoHeader] = useState<boolean>(false);
   const [showFooter, setShowFooter] = useState<boolean>(true);
-  if (props.loginData) {
+  const [init, setInit] = useState<boolean>(false);
-    dispatch(loginAction(props.loginData));
-  }
-  if (props.configData) {
-    let config: SystemConfigStoreInterface = {
-      //系统配置
-      systemApiUrl: props.configData["system-api-url"],
-      systemH5Url: props.configData["system-h5-url"],
-      systemLogo: props.configData["system-logo"],
-      systemName: props.configData["system-name"],
-      systemPcUrl: props.configData["system-pc-url"],
-      pcIndexFooterMsg: props.configData["system-pc-index-footer-msg"],
-      //播放器配置
-      playerPoster: props.configData["player-poster"],
-      playerIsEnabledBulletSecret:
-        props.configData["player-is-enabled-bullet-secret"] &&
-        props.configData["player-is-enabled-bullet-secret"] === "1"
-          ? true
-          : false,
-      playerBulletSecretText: props.configData["player-bullet-secret-text"],
-      playerBulletSecretColor: props.configData["player-bullet-secret-color"],
-      playerBulletSecretOpacity:
-        props.configData["player-bullet-secret-opacity"],
-    };
-    dispatch(saveConfigAction(config));
-  }
-
   useEffect(() => {
-    setShowHeader(true);
+    if (pathname) {
-    setShowNoHeader(false);
+      if (pathname === "/login") {
-    setShowFooter(true);
+        setShowNoHeader(true);
-    if (pathname === "/login") {
+        setShowHeader(false);
-      setShowNoHeader(true);
+        setShowFooter(false);
-      setShowHeader(false);
+      } else if (!params.hourId) {
-      setShowFooter(false);
+        setShowNoHeader(false);
-    } else if (!params.hourId) {
+        setShowHeader(true);
-      setShowNoHeader(false);
+        setShowFooter(true);
-      setShowHeader(true);
+      } else {
-      setShowFooter(true);
+        setShowNoHeader(false);
-    } else {
+        setShowHeader(false);
-      setShowNoHeader(false);
+        setShowFooter(false);
-      setShowHeader(false);
+      }
-      setShowFooter(false);
     }
   }, [pathname, params]);
 
+  useEffect(() => {
+    if (props.loginData) {
+      dispatch(loginAction(props.loginData));
+    }
+    if (props.configData) {
+      let config: SystemConfigStoreInterface = {
+        //系统配置
+        systemApiUrl: props.configData["system-api-url"],
+        systemH5Url: props.configData["system-h5-url"],
+        systemLogo: props.configData["system-logo"],
+        systemName: props.configData["system-name"],
+        systemPcUrl: props.configData["system-pc-url"],
+        pcIndexFooterMsg: props.configData["system-pc-index-footer-msg"],
+        //播放器配置
+        playerPoster: props.configData["player-poster"],
+        playerIsEnabledBulletSecret:
+          props.configData["player-is-enabled-bullet-secret"] &&
+          props.configData["player-is-enabled-bullet-secret"] === "1"
+            ? true
+            : false,
+        playerIsDisabledDrag:
+          props.configData["player-disabled-drag"] &&
+          props.configData["player-disabled-drag"] === "1"
+            ? true
+            : false,
+        playerBulletSecretText: props.configData["player-bullet-secret-text"],
+        playerBulletSecretColor: props.configData["player-bullet-secret-color"],
+        playerBulletSecretOpacity:
+          props.configData["player-bullet-secret-opacity"],
+      };
+      dispatch(saveConfigAction(config));
+    }
+    setInit(true);
+  }, [props]);
+
   return (
     <>
-      <div>
+      {init && (
-        {showNoHeader && <NoHeader></NoHeader>}
+        <div>
-        {showHeader && <Header></Header>}
+          {showNoHeader && <NoHeader></NoHeader>}
-        <Outlet />
+          {showHeader && <Header></Header>}
-        {showFooter && <Footer></Footer>}
+          <Outlet />
-      </div>
+          {showFooter && <Footer></Footer>}
+        </div>
+      )}
     </>
   );
 };

src/pages/latest-learn/index.tsx

@@ -56,6 +56,7 @@ const LatestLearnPage = () => {
                 >
                   <div style={{ width: 120 }}>
                     <Image
+                      loading="lazy"
                       src={item.course.thumb}
                       width={120}
                       height={90}
@@ -91,6 +92,7 @@ const LatestLearnPage = () => {
                           {item.record.progress >= 10000 && (
                             <>
                               <Image
+                                loading="lazy"
                                 width={24}
                                 height={24}
                                 src={mediaIcon}

src/store/system/systemConfigSlice.ts

@@ -9,6 +9,7 @@ type SystemConfigStoreInterface = {
   pcIndexFooterMsg: string;
   playerPoster: string;
   playerIsEnabledBulletSecret: boolean;
+  playerIsDisabledDrag: boolean;
   playerBulletSecretText: string;
   playerBulletSecretColor: string;
   playerBulletSecretOpacity: string;
@@ -23,6 +24,7 @@ let defaultValue: SystemConfigStoreInterface = {
   pcIndexFooterMsg: "",
   playerPoster: "",
   playerIsEnabledBulletSecret: false,
+  playerIsDisabledDrag: false,
   playerBulletSecretText: "",
   playerBulletSecretColor: "",
   playerBulletSecretOpacity: "",