fix(xgplayer): android definition set currentTime

tamhgdc · Feb 9, 2021 · 8394f60 · 8394f60
1 parent b20c0cd
commit 8394f60
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 11 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/browser/simple_player.js b/packages/xgplayer/browser/simple_player.js
diff --git a/packages/xgplayer/browser/simple_player.js.map b/packages/xgplayer/browser/simple_player.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/dist/simple_player.js b/packages/xgplayer/dist/simple_player.js
diff --git a/packages/xgplayer/dist/simple_player.js.map b/packages/xgplayer/dist/simple_player.js.map
diff --git a/packages/xgplayer/src/skin/controls/definition.js b/packages/xgplayer/src/skin/controls/definition.js
@@ -92,7 +92,7 @@ let s_definition = function () {
   }
   player.on('resourceReady', onResourceReady)
 
-  function onCanplayChangeDefinition () {
+  function onPlayingChangeDefinition () {
     player.currentTime = player.curTime
     if (!paused) {
       let playPromise = player.play()
@@ -101,6 +101,9 @@ let s_definition = function () {
       }
     }
   };
+  function onTimeupdateChangeDefinition () {
+    player.once('timeupdate', onPlayingChangeDefinition)
+  };
   ['touchend', 'click'].forEach(item => {
     container.addEventListener(item, function (e) {
       e.preventDefault()
@@ -163,7 +166,11 @@ let s_definition = function () {
             player.curTime = player.currentTime, paused = player.paused
             if (!player.ended) {
               player.src = a.href
-              player.once('canplay', onCanplayChangeDefinition)
+              if(navigator.userAgent.toLowerCase().indexOf('android') > -1) {
+                player.once('timeupdate', onTimeupdateChangeDefinition)
+              } else {
+                player.once('playing', onPlayingChangeDefinition)
+              }
             }
           }
         }
@@ -197,7 +204,12 @@ let s_definition = function () {
   function onDestroy () {
     player.off('resourceReady', onResourceReady)
     player.off('canplay', onCanplayResourceReady)
-    player.off('canplay', onCanplayChangeDefinition)
+    if(navigator.userAgent.toLowerCase().indexOf('android') > -1) {
+      player.off('timeupdate', onTimeupdateChangeDefinition)
+      player.off('timeupdate', onPlayingChangeDefinition)
+    } else {
+      player.off('playing', onPlayingChangeDefinition)
+    }
     player.off('blur', onBlur)
     player.off('destroy', onDestroy)
   }