feat(xgplayer): add progressDot duration

skyplaying · Nov 13, 2019 · 3002144 · 3002144
1 parent ba55841
commit 3002144
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 9 deletions.
diff --git a/packages/xgplayer/browser/index.js b/packages/xgplayer/browser/index.js
diff --git a/packages/xgplayer/browser/index.js.map b/packages/xgplayer/browser/index.js.map
diff --git a/packages/xgplayer/dist/index.js b/packages/xgplayer/dist/index.js
diff --git a/packages/xgplayer/dist/index.js.map b/packages/xgplayer/dist/index.js.map
diff --git a/packages/xgplayer/package.json b/packages/xgplayer/package.json
@@ -1,6 +1,6 @@
 {
     "name": "xgplayer",
-    "version": "2.3.3",
+    "version": "2.3.4",
     "description": "video player",
     "main": "./dist/index.js",
     "typings": "./types/index.d.ts",

diff --git a/packages/xgplayer/src/skin/controls/memoryPlay.js b/packages/xgplayer/src/skin/controls/memoryPlay.js
@@ -4,7 +4,7 @@ let smemoryPlay = function () {
   let player = this
   let util = Player.util
   let lastPlayTime = player.config.lastPlayTime || 0
-  let lastPlayTimeHideDelay = player.config.lastPlayTimeHideDelay || 0
+  let lastPlayTimeHideDelay = player.config.lastPlayTimeHideDelay || 3
   let dom = null
   if (lastPlayTime <= 0) {
     return

diff --git a/packages/xgplayer/src/skin/controls/progress.js b/packages/xgplayer/src/skin/controls/progress.js
@@ -55,6 +55,9 @@ let s_progress = function () {
         if (item.time >= 0 && item.time <= player.duration) {
           let dot = util.createDom('xg-progress-dot', item.text ? `<span class="xgplayer-progress-tip">${item.text}</span>` : '', {}, 'xgplayer-progress-dot')
           dot.style.left = (item.time / player.duration) * 100 + '%'
+          if(item.duration >= 0) {
+            dot.style.width = (Math.min(item.duration, player.duration - item.time) / player.duration) * 100 + '%'
+          }
           outer.appendChild(dot)
           player.dotArr[item.time] = dot
           dotEvent(dot, item.text)
@@ -63,13 +66,16 @@ let s_progress = function () {
     }
   }
   player.once('canplay', onCanplay)
-  player.addProgressDot = function (time, text) {
+  player.addProgressDot = function (time, text, duration) {
     if (player.dotArr[time]) {
       return
     }
     if (time >= 0 && time <= player.duration) {
       let dot = util.createDom('xg-progress-dot', '', {}, 'xgplayer-progress-dot')
       dot.style.left = (time / player.duration) * 100 + '%'
+      if(duration >= 0) {
+        dot.style.width = (Math.min(duration, player.duration - time) / player.duration) * 100 + '%'
+      }
       outer.appendChild(dot)
       player.dotArr[time] = dot
       dotEvent(dot, text)