fix(xgplayer): support changing UI when setting muted or playbackrate…

… value
202780181 · Nov 14, 2021 · 0694541 · 0694541
1 parent ed0b775
commit 0694541
Show file tree

Hide file tree

Showing 23 changed files with 31 additions and 27 deletions.
diff --git a/packages/xgplayer/browser/core_player.js b/packages/xgplayer/browser/core_player.js
diff --git a/packages/xgplayer/browser/core_player.js.map b/packages/xgplayer/browser/core_player.js.map
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/core_player.js b/packages/xgplayer/dist/core_player.js
diff --git a/packages/xgplayer/dist/core_player.js.map b/packages/xgplayer/dist/core_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/es/core_player.js b/packages/xgplayer/es/core_player.js
diff --git a/packages/xgplayer/es/core_player.js.map b/packages/xgplayer/es/core_player.js.map
diff --git a/packages/xgplayer/es/index.js b/packages/xgplayer/es/index.js
diff --git a/packages/xgplayer/es/index.js.map b/packages/xgplayer/es/index.js.map
diff --git a/packages/xgplayer/es/simple_player.js b/packages/xgplayer/es/simple_player.js
diff --git a/packages/xgplayer/es/simple_player.js.map b/packages/xgplayer/es/simple_player.js.map
diff --git a/packages/xgplayer/package.json b/packages/xgplayer/package.json
@@ -1,6 +1,6 @@
 {
     "name": "xgplayer",
-    "version": "2.31.1",
+    "version": "2.31.2",
     "description": "video player",
     "main": "./dist/index.js",
     "typings": "./types/index.d.ts",

diff --git a/packages/xgplayer/src/controls/volume.js b/packages/xgplayer/src/controls/volume.js
@@ -141,7 +141,7 @@ let volume = function () {
         removeClass(root, 'xgplayer-volume-muted')
         removeClass(root, 'xgplayer-volume-small')
         removeClass(root, 'xgplayer-volume-large')
-        if (player.volume === 0) {
+        if (player.volume === 0 || player.muted) {
           addClass(root, 'xgplayer-volume-muted')
         } else if (player.volume < 0.5) {
           addClass(root, 'xgplayer-volume-small')

diff --git a/packages/xgplayer/src/proxy.js b/packages/xgplayer/src/proxy.js
@@ -87,7 +87,7 @@ class Proxy {
     }
 
     this.ev = ['play', 'playing', 'pause', 'ended', 'error', 'seeking', 'seeked', 'progress', 
-      'timeupdate', 'waiting', 'canplay', 'canplaythrough', 'durationchange', 'volumechange', 'loadedmetadata', 'loadeddata', 'loadstart'
+      'timeupdate', 'waiting', 'canplay', 'canplaythrough', 'durationchange', 'volumechange', 'ratechange', 'loadedmetadata', 'loadeddata', 'loadstart'
     ].map((item) => {
       return {
         [item]: `on${item.charAt(0).toUpperCase()}${item.slice(1)}`

diff --git a/packages/xgplayer/src/skin/controls/playbackRate.js b/packages/xgplayer/src/skin/controls/playbackRate.js
@@ -124,11 +124,15 @@ let s_playbackRate = function () {
   player.switchPlaybackRate = function (playbackRateObj = {}) {
     let liList = player.controls.querySelectorAll('.xgplayer-playbackrate ul li')
     for(let i = 0; i < liList.length; i++) {
-      if(liList[i].getAttribute('cname') === `${playbackRateObj.playbackRate}` || i === playbackRateObj.index) {
+      if(!hasClass(liList[i], 'selected') && (liList[i].getAttribute('cname') === `${playbackRateObj.playbackRate}` || i === playbackRateObj.index)) {
         liList[i].click()
       }
     }
   }
+
+  player.on('ratechange', () => {
+    player.switchPlaybackRate({ playbackRate: player.playbackRate })
+  })
 }
 
 export default {

diff --git a/packages/xgplayer/version.json b/packages/xgplayer/version.json
@@ -1,3 +1,3 @@
 {
-  "version": "2.31.1"
+  "version": "2.31.2"
 }