fix(xgplayer): support encrypt hls definition

liuweiqin · Oct 9, 2020 · 5fc8a9b · 5fc8a9b
1 parent 8db332b
commit 5fc8a9b
Show file tree

Hide file tree

Showing 13 changed files with 23 additions and 22 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/player.js.map b/packages/xgplayer/browser/player.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/player.js.map b/packages/xgplayer/dist/player.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/package.json b/packages/xgplayer/package.json
@@ -1,6 +1,6 @@
 {
     "name": "xgplayer",
-    "version": "2.11.7",
+    "version": "2.12.0",
     "description": "video player",
     "main": "./dist/index.js",
     "typings": "./types/index.d.ts",

diff --git a/packages/xgplayer/src/skin/controls/definition.js b/packages/xgplayer/src/skin/controls/definition.js
@@ -27,6 +27,10 @@ let s_definition = function () {
               a.href = player[item]._mediaDataSource.url
             }
           }
+          if(item === 'hls') {
+            a.href = player[item].originUrl || player[item].url
+            src = a.href
+          }
           src = a.href
           return false
         } else {
@@ -36,10 +40,6 @@ let s_definition = function () {
     } else {
       src = player.currentSrc || player.src
     }
-    if(player['hls']) {
-      a.href = player['hls'].url
-      src = a.href
-    }
     list.forEach(item => {
       a.href = item.url
       if (player.dash) {
@@ -87,7 +87,7 @@ let s_definition = function () {
     player.definitionList = list
     if (list && list instanceof Array && list.length > 1) {
       util.addClass(root, 'xgplayer-is-definition')
-      player.on('canplay', onCanplayResourceReady)
+      player.once('canplay', onCanplayResourceReady)
     }
   }
   player.on('resourceReady', onResourceReady)
@@ -108,12 +108,12 @@ let s_definition = function () {
       let list = player.definitionList
       let li = e.target || e.srcElement, a = document.createElement('a')
       if (li && li.tagName.toLocaleLowerCase() === 'li') {
-        player.emit('beforeDefinitionChange', a.href)
         let from, to
         Array.prototype.forEach.call(li.parentNode.childNodes, item => {
           if(util.hasClass(item, 'selected')) {
             from = item.getAttribute('cname')
             util.removeClass(item, 'selected')
+            player.emit('beforeDefinitionChange', item.getAttribute('url'))
           }
         })
         if (player.dash) {
@@ -143,6 +143,9 @@ let s_definition = function () {
                   curRUL.href = player[item]._mediaDataSource.url
                 }
               }
+              if(item === 'hls') {
+                curRUL.href = player[item].originUrl || player[item].url
+              }
               return false
             } else {
               return true

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