From b9476a4a23ebb4b91f7d243997759caabcb67ca7 Mon Sep 17 00:00:00 2001
From: harry <harry@fangmingyi.com>
Date: Sat, 14 Mar 2020 00:44:49 +0800
Subject: [PATCH] fix /issues/28573

---
 public/react/package-lock.json                    | 15 +++++++++++++++
 .../modules/courses/Video/video-play/index.jsx    |  7 +++----
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/public/react/package-lock.json b/public/react/package-lock.json
index a22a5a9ea..4cb59a032 100644
--- a/public/react/package-lock.json
+++ b/public/react/package-lock.json
@@ -13577,6 +13577,21 @@
       "resolved": "http://registry.npm.taobao.org/q/download/q-1.5.1.tgz",
       "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc="
     },
+    "qr.js": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npm.taobao.org/qr.js/download/qr.js-0.0.0.tgz",
+      "integrity": "sha1-ys6GOG9ZoNuAUPqQ2baw6IoeNk8="
+    },
+    "qrcode.react": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npm.taobao.org/qrcode.react/download/qrcode.react-1.0.0.tgz",
+      "integrity": "sha1-foiJ2zt2nlVejrRj1MbeIhw21d4=",
+      "requires": {
+        "loose-envify": "^1.4.0",
+        "prop-types": "^15.6.0",
+        "qr.js": "0.0.0"
+      }
+    },
     "qs": {
       "version": "6.7.0",
       "resolved": "http://registry.npm.taobao.org/qs/download/qs-6.7.0.tgz",
diff --git a/public/react/src/modules/courses/Video/video-play/index.jsx b/public/react/src/modules/courses/Video/video-play/index.jsx
index cfc5ad343..8c3a2eb20 100644
--- a/public/react/src/modules/courses/Video/video-play/index.jsx
+++ b/public/react/src/modules/courses/Video/video-play/index.jsx
@@ -111,17 +111,14 @@ export default ({ src, videoId, logWatchHistory, courseId = null }) => {
         log()
       }
     }
-
+    //循环播放， 累计时长不能清空
     async function onEnded() {
       log(() => {
         logId = null
-        logCount = 1
         lastUpdatedTime = 0
-        sumTimePlayed = 0
         initLog = false
         isLoging = false
         isSeeking = false
-        pos = []
       }, true)
     }
 
@@ -140,6 +137,8 @@ export default ({ src, videoId, logWatchHistory, courseId = null }) => {
               log()
             }
           }
+        }else {
+          lastUpdatedTime = newTime
         }
       }