fix(xgplayer): add return and catch for play method; fix volume overf…

…low style
OyutingO · Nov 4, 2019 · 442c030 · 442c030
1 parent d864e83
commit 442c030
Show file tree

Hide file tree

Showing 17 changed files with 26 additions and 25 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.2.0",
+    "version": "2.2.1",
     "description": "video player",
     "main": "./dist/index.js",
     "bin": {

diff --git a/packages/xgplayer/src/controls/localPreview.js b/packages/xgplayer/src/controls/localPreview.js
@@ -11,7 +11,7 @@ let localPreview = function () {
       player.start()
     } else {
       player.src = url
-      player.play()
+      player.play().catch(err => {})
     }
   }
   player.on('upload', onUpload)

diff --git a/packages/xgplayer/src/controls/mobile.js b/packages/xgplayer/src/controls/mobile.js
@@ -18,7 +18,7 @@ let mobile = function () {
         return false
       } else if (!player.ended) {
         if (player.paused) {
-          player.play()
+          player.play().catch(err => {})
         } else {
           player.pause()
         }

diff --git a/packages/xgplayer/src/controls/pc.js b/packages/xgplayer/src/controls/pc.js
@@ -20,7 +20,7 @@ let pc = function () {
             return false
           } else if (!player.ended) {
             if (player.paused) {
-              player.play()
+              player.play().catch(err => {})
             } else {
               player.pause()
             }

diff --git a/packages/xgplayer/src/controls/play.js b/packages/xgplayer/src/controls/play.js
@@ -8,7 +8,7 @@ let play = function () {
       return
     }
     if (player.paused) {
-      player.play()
+      player.play().catch(err => {})
     } else {
       player.pause()
     }

diff --git a/packages/xgplayer/src/controls/start.js b/packages/xgplayer/src/controls/start.js
@@ -22,12 +22,12 @@ let start = function () {
       if (!root.querySelector('video')) {
         player.start()
       }
-      player.play()
+      player.play().catch(err => {})
     } else {
       if (player.paused) {
         util.removeClass(root, 'xgplayer-nostart xgplayer-isloading')
         setTimeout(() => {
-          player.play()
+          player.play().catch(err => {})
         }, 10)
       }
     }

diff --git a/packages/xgplayer/src/player.js b/packages/xgplayer/src/player.js
@@ -229,7 +229,7 @@ class Player extends Proxy {
   reload () {
     this.video.load()
     this.reloadFunc = function () {
-      this.play()
+      this.play().catch(err => {})
     }
     this.once('loadeddata', this.reloadFunc)
   }
@@ -338,7 +338,7 @@ class Player extends Proxy {
       _replay()
     } else {
       this.currentTime = 0
-      this.play()
+      this.play().catch(err => {})
     }
   }
 
@@ -688,7 +688,7 @@ class Player extends Proxy {
       }
     } else if (e && e.keyCode === 32) { // 按 spacebar
       if (player.paused) {
-        player.play()
+        player.play().catch(err => {})
       } else {
         player.pause()
       }

diff --git a/packages/xgplayer/src/proxy.js b/packages/xgplayer/src/proxy.js
@@ -168,7 +168,7 @@ class Proxy {
     }
   }
   play () {
-    this.video.play()
+    return this.video.play()
   }
   pause () {
     this.video.pause()

diff --git a/packages/xgplayer/src/skin/assets/volumeLarge.svg b/packages/xgplayer/src/skin/assets/volumeLarge.svg
diff --git a/packages/xgplayer/src/skin/assets/volumeMuted.svg b/packages/xgplayer/src/skin/assets/volumeMuted.svg
diff --git a/packages/xgplayer/src/skin/assets/volumeSmall.svg b/packages/xgplayer/src/skin/assets/volumeSmall.svg
diff --git a/packages/xgplayer/src/skin/controls/definition.js b/packages/xgplayer/src/skin/controls/definition.js
@@ -95,7 +95,7 @@ let s_definition = function () {
   function onCanplayChangeDefinition () {
     player.currentTime = player.curTime
     if (!paused) {
-      player.play()
+      player.play().catch(err => {})
     }
   };
   ['touchend', 'click'].forEach(item => {

diff --git a/packages/xgplayer/src/skin/style/controls/volume.scss b/packages/xgplayer/src/skin/style/controls/volume.scss
@@ -7,6 +7,7 @@
     display: block;
     position: relative;
     margin-top: -100px;
+    overflow: hidden;
     z-index: 18;
     .xgplayer-icon {
       margin-top: 8px;