更新lib

lib/vue-aliplayer-v2.common.js

@@ -142,18 +142,22 @@ if (typeof window !== 'undefined') {
 // EXTERNAL MODULE: ./node_modules/_core-js@2.6.10@core-js/modules/es6.function.name.js
 var es6_function_name = __webpack_require__("7cfd");
 
-// CONCATENATED MODULE: ./node_modules/_cache-loader@2.0.1@cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"05d0d90a-vue-loader-template"}!./node_modules/_vue-loader@15.7.2@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_cache-loader@2.0.1@cache-loader/dist/cjs.js??ref--0-0!./node_modules/_vue-loader@15.7.2@vue-loader/lib??vue-loader-options!./packages/AliplayerV2/src/main.vue?vue&type=template&id=2633e826&
+// CONCATENATED MODULE: ./node_modules/_cache-loader@2.0.1@cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"05d0d90a-vue-loader-template"}!./node_modules/_vue-loader@15.7.2@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_cache-loader@2.0.1@cache-loader/dist/cjs.js??ref--0-0!./node_modules/_vue-loader@15.7.2@vue-loader/lib??vue-loader-options!./packages/AliplayerV2/src/main.vue?vue&type=template&id=f75253da&
-var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{attrs:{"id":_vm.id}})}
+var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{attrs:{"id":_vm.config.id}})}
 var staticRenderFns = []
 
 
-// CONCATENATED MODULE: ./packages/AliplayerV2/src/main.vue?vue&type=template&id=2633e826&
+// CONCATENATED MODULE: ./packages/AliplayerV2/src/main.vue?vue&type=template&id=f75253da&
 
 // EXTERNAL MODULE: ./node_modules/_core-js@2.6.10@core-js/modules/web.dom.iterable.js
 var web_dom_iterable = __webpack_require__("4634");
 
+// EXTERNAL MODULE: ./node_modules/_core-js@2.6.10@core-js/modules/es6.regexp.to-string.js
+var es6_regexp_to_string = __webpack_require__("cc1d");
+
 // CONCATENATED MODULE: ./node_modules/_cache-loader@2.0.1@cache-loader/dist/cjs.js??ref--12-0!./node_modules/_thread-loader@2.1.3@thread-loader/dist/cjs.js!./node_modules/_babel-loader@8.0.6@babel-loader/lib!./node_modules/_cache-loader@2.0.1@cache-loader/dist/cjs.js??ref--0-0!./node_modules/_vue-loader@15.7.2@vue-loader/lib??vue-loader-options!./packages/AliplayerV2/src/main.vue?vue&type=script&lang=js&
 
+
 //
 //
 //
@@ -171,15 +175,13 @@ var web_dom_iterable = __webpack_require__("4634");
     source: {
       //播放源(此属性存在则优先于options.source) 动态切换,目前只支持同种格式（mp4/flv/m3u8）之间切换。暂不支持直播rtmp流切换。
       required: false,
-      type: [Object],
+      type: [String],
-      default: function _default() {
+      default: null
-        return null;
-      }
     },
     id: {
       required: false,
       type: [String],
-      default: "player-".concat(Date.parse(new Date()))
+      default: null
     },
     cssLink: {
       //css版本源
@@ -199,7 +201,7 @@ var web_dom_iterable = __webpack_require__("4634");
       player: null,
       //播放器实例
       config: {
-        id: null,
+        id: "player-".concat(Math.random().toString(36).substr(2).toLocaleUpperCase()),
         //播放器的ID
         width: '100%',
         autoplay: true // isLive: true,
@@ -289,9 +291,16 @@ var web_dom_iterable = __webpack_require__("4634");
     };
   },
   watch: {
-    source: function source(url) {
+    source: function source() {
       //监听播放源变化
-      this.loadByUrl(url);
+      this.init();
+    },
+    options: {
+      //配置项是对象,只能深度监听
+      handler: function handler() {
+        this.init();
+      },
+      deep: true
     }
   },
   mounted: function mounted() {
@@ -345,7 +354,11 @@ var web_dom_iterable = __webpack_require__("4634");
           _this3.initPlayer();
         });
       } else {
-        this.initPlayer();
+        this.initPlayer(); //这样是为了兼容页面上有多个播放器
+
+        scriptTag.addEventListener("load", function () {
+          _this3.initPlayer();
+        });
       }
     },
 
@@ -356,7 +369,6 @@ var web_dom_iterable = __webpack_require__("4634");
     initPlayer: function initPlayer() {
       var _this4 = this;
 
-      // console.log(`this.player`,this.player);
       if (typeof window.Aliplayer != 'undefined') {
         var options = this.options;
 
@@ -368,27 +380,20 @@ var web_dom_iterable = __webpack_require__("4634");
 
         if (this.source) this.config.source = this.source; //播放源
 
-        this.config.id = this.id; // this.player = new Aliplayer(this.config, function(player) {
+        if (this.id) this.config.id = this.id;
-        //     // console.log('播放器创建好了',player);
+        this.player && this.player.dispose(); //防止实例的重复
-        // });
 
-        if (!this.player) {
+        this.player = Aliplayer(this.config);
-          // console.log(this.config);
-          this.player = Aliplayer(this.config);
 
-          var _loop = function _loop(ev) {
+        var _loop = function _loop(ev) {
-            _this4.player && _this4.player.on(_this4.events[ev], function (e) {
+          _this4.player && _this4.player.on(_this4.events[ev], function (e) {
-              // console.log(`object ${this.events[ev]}`,e);
+            // console.log(`object ${this.events[ev]}`,e);
-              _this4.$emit(_this4.events[ev], e);
+            _this4.$emit(_this4.events[ev], e);
-            });
+          });
-          };
+        };
 
-          for (var ev in this.events) {
+        for (var ev in this.events) {
-            _loop(ev);
+          _loop(ev);
-          }
-        } else {
-          this.player && this.player.replay(); //销毁后重播
-          // console.log(`this.player && this.player.replay()`,'销毁后重播');
         } //通过播放器实例的off方法取消订阅
         //player.off('ready',handleReady);
 
@@ -567,7 +572,7 @@ var web_dom_iterable = __webpack_require__("4634");
      */
     getStatus: function getStatus() {
       // console.log(`获取播放器状态，包含的值`,this.player && this.player.fullscreenService && this.player && this.player.fullscreenService.getStatus());
-      return this.player && this.player.fullscreenService && this.player.fullscreenService.getStatus();
+      return this.player && this.player.getStatus();
     },
 
     /**
@@ -672,6 +677,8 @@ var web_dom_iterable = __webpack_require__("4634");
   },
   beforeDestroy: function beforeDestroy() {
     //防止重复创建
+    this.dispose(); //销毁播放器(防止直播播放的情况下,播放器已经销毁,而后台还在继续下载资源造成卡顿的bug)
+
     var head = document.querySelector('head'); //移除所有的重复创建的标签
 
     var nodes = document.querySelectorAll('script[src="https://g.alicdn.com/de/prismplayer/2.8.2/hls/aliplayer-hls-min.js"]');
@@ -1468,6 +1475,18 @@ module.exports = Object('z').propertyIsEnumerable(0) ? Object : function (it) {
 };
 
 
+/***/ }),
+
+/***/ "9f7e":
+/***/ (function(module, exports, __webpack_require__) {
+
+// 21.2.5.3 get RegExp.prototype.flags()
+if (__webpack_require__("f9a5") && /./g.flags != 'g') __webpack_require__("d3d8").f(RegExp.prototype, 'flags', {
+  configurable: true,
+  get: __webpack_require__("e7a1")
+});
+
+
 /***/ }),
 
 /***/ "a6ad":
@@ -1605,6 +1624,39 @@ module.exports = function (done, value) {
 };
 
 
+/***/ }),
+
+/***/ "cc1d":
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+__webpack_require__("9f7e");
+var anObject = __webpack_require__("8cac");
+var $flags = __webpack_require__("e7a1");
+var DESCRIPTORS = __webpack_require__("f9a5");
+var TO_STRING = 'toString';
+var $toString = /./[TO_STRING];
+
+var define = function (fn) {
+  __webpack_require__("a6d5")(RegExp.prototype, TO_STRING, fn, true);
+};
+
+// 21.2.5.14 RegExp.prototype.toString()
+if (__webpack_require__("0cc1")(function () { return $toString.call({ source: 'a', flags: 'b' }) != '/a/b'; })) {
+  define(function toString() {
+    var R = anObject(this);
+    return '/'.concat(R.source, '/',
+      'flags' in R ? R.flags : !DESCRIPTORS && R instanceof RegExp ? $flags.call(R) : undefined);
+  });
+// FF44- RegExp#toString has a wrong name
+} else if ($toString.name != TO_STRING) {
+  define(function toString() {
+    return $toString.call(this);
+  });
+}
+
+
 /***/ }),
 
 /***/ "d15b":
@@ -1729,6 +1781,27 @@ module.exports = {};
 })(document);
 
 
+/***/ }),
+
+/***/ "e7a1":
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+// 21.2.5.3 get RegExp.prototype.flags
+var anObject = __webpack_require__("8cac");
+module.exports = function () {
+  var that = anObject(this);
+  var result = '';
+  if (that.global) result += 'g';
+  if (that.ignoreCase) result += 'i';
+  if (that.multiline) result += 'm';
+  if (that.unicode) result += 'u';
+  if (that.sticky) result += 'y';
+  return result;
+};
+
+
 /***/ }),
 
 /***/ "e85e":

lib/vue-aliplayer-v2.umd.js

@@ -151,18 +151,22 @@ if (typeof window !== 'undefined') {
 // EXTERNAL MODULE: ./node_modules/_core-js@2.6.10@core-js/modules/es6.function.name.js
 var es6_function_name = __webpack_require__("7cfd");
 
-// CONCATENATED MODULE: ./node_modules/_cache-loader@2.0.1@cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"05d0d90a-vue-loader-template"}!./node_modules/_vue-loader@15.7.2@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_cache-loader@2.0.1@cache-loader/dist/cjs.js??ref--0-0!./node_modules/_vue-loader@15.7.2@vue-loader/lib??vue-loader-options!./packages/AliplayerV2/src/main.vue?vue&type=template&id=2633e826&
+// CONCATENATED MODULE: ./node_modules/_cache-loader@2.0.1@cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"05d0d90a-vue-loader-template"}!./node_modules/_vue-loader@15.7.2@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_cache-loader@2.0.1@cache-loader/dist/cjs.js??ref--0-0!./node_modules/_vue-loader@15.7.2@vue-loader/lib??vue-loader-options!./packages/AliplayerV2/src/main.vue?vue&type=template&id=f75253da&
-var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{attrs:{"id":_vm.id}})}
+var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{attrs:{"id":_vm.config.id}})}
 var staticRenderFns = []
 
 
-// CONCATENATED MODULE: ./packages/AliplayerV2/src/main.vue?vue&type=template&id=2633e826&
+// CONCATENATED MODULE: ./packages/AliplayerV2/src/main.vue?vue&type=template&id=f75253da&
 
 // EXTERNAL MODULE: ./node_modules/_core-js@2.6.10@core-js/modules/web.dom.iterable.js
 var web_dom_iterable = __webpack_require__("4634");
 
+// EXTERNAL MODULE: ./node_modules/_core-js@2.6.10@core-js/modules/es6.regexp.to-string.js
+var es6_regexp_to_string = __webpack_require__("cc1d");
+
 // CONCATENATED MODULE: ./node_modules/_cache-loader@2.0.1@cache-loader/dist/cjs.js??ref--12-0!./node_modules/_thread-loader@2.1.3@thread-loader/dist/cjs.js!./node_modules/_babel-loader@8.0.6@babel-loader/lib!./node_modules/_cache-loader@2.0.1@cache-loader/dist/cjs.js??ref--0-0!./node_modules/_vue-loader@15.7.2@vue-loader/lib??vue-loader-options!./packages/AliplayerV2/src/main.vue?vue&type=script&lang=js&
 
+
 //
 //
 //
@@ -180,15 +184,13 @@ var web_dom_iterable = __webpack_require__("4634");
     source: {
       //播放源(此属性存在则优先于options.source) 动态切换,目前只支持同种格式（mp4/flv/m3u8）之间切换。暂不支持直播rtmp流切换。
       required: false,
-      type: [Object],
+      type: [String],
-      default: function _default() {
+      default: null
-        return null;
-      }
     },
     id: {
       required: false,
       type: [String],
-      default: "player-".concat(Date.parse(new Date()))
+      default: null
     },
     cssLink: {
       //css版本源
@@ -208,7 +210,7 @@ var web_dom_iterable = __webpack_require__("4634");
       player: null,
       //播放器实例
       config: {
-        id: null,
+        id: "player-".concat(Math.random().toString(36).substr(2).toLocaleUpperCase()),
         //播放器的ID
         width: '100%',
         autoplay: true // isLive: true,
@@ -298,9 +300,16 @@ var web_dom_iterable = __webpack_require__("4634");
     };
   },
   watch: {
-    source: function source(url) {
+    source: function source() {
       //监听播放源变化
-      this.loadByUrl(url);
+      this.init();
+    },
+    options: {
+      //配置项是对象,只能深度监听
+      handler: function handler() {
+        this.init();
+      },
+      deep: true
     }
   },
   mounted: function mounted() {
@@ -354,7 +363,11 @@ var web_dom_iterable = __webpack_require__("4634");
           _this3.initPlayer();
         });
       } else {
-        this.initPlayer();
+        this.initPlayer(); //这样是为了兼容页面上有多个播放器
+
+        scriptTag.addEventListener("load", function () {
+          _this3.initPlayer();
+        });
       }
     },
 
@@ -365,7 +378,6 @@ var web_dom_iterable = __webpack_require__("4634");
     initPlayer: function initPlayer() {
       var _this4 = this;
 
-      // console.log(`this.player`,this.player);
       if (typeof window.Aliplayer != 'undefined') {
         var options = this.options;
 
@@ -377,27 +389,20 @@ var web_dom_iterable = __webpack_require__("4634");
 
         if (this.source) this.config.source = this.source; //播放源
 
-        this.config.id = this.id; // this.player = new Aliplayer(this.config, function(player) {
+        if (this.id) this.config.id = this.id;
-        //     // console.log('播放器创建好了',player);
+        this.player && this.player.dispose(); //防止实例的重复
-        // });
 
-        if (!this.player) {
+        this.player = Aliplayer(this.config);
-          // console.log(this.config);
-          this.player = Aliplayer(this.config);
 
-          var _loop = function _loop(ev) {
+        var _loop = function _loop(ev) {
-            _this4.player && _this4.player.on(_this4.events[ev], function (e) {
+          _this4.player && _this4.player.on(_this4.events[ev], function (e) {
-              // console.log(`object ${this.events[ev]}`,e);
+            // console.log(`object ${this.events[ev]}`,e);
-              _this4.$emit(_this4.events[ev], e);
+            _this4.$emit(_this4.events[ev], e);
-            });
+          });
-          };
+        };
 
-          for (var ev in this.events) {
+        for (var ev in this.events) {
-            _loop(ev);
+          _loop(ev);
-          }
-        } else {
-          this.player && this.player.replay(); //销毁后重播
-          // console.log(`this.player && this.player.replay()`,'销毁后重播');
         } //通过播放器实例的off方法取消订阅
         //player.off('ready',handleReady);
 
@@ -576,7 +581,7 @@ var web_dom_iterable = __webpack_require__("4634");
      */
     getStatus: function getStatus() {
       // console.log(`获取播放器状态，包含的值`,this.player && this.player.fullscreenService && this.player && this.player.fullscreenService.getStatus());
-      return this.player && this.player.fullscreenService && this.player.fullscreenService.getStatus();
+      return this.player && this.player.getStatus();
     },
 
     /**
@@ -681,6 +686,8 @@ var web_dom_iterable = __webpack_require__("4634");
   },
   beforeDestroy: function beforeDestroy() {
     //防止重复创建
+    this.dispose(); //销毁播放器(防止直播播放的情况下,播放器已经销毁,而后台还在继续下载资源造成卡顿的bug)
+
     var head = document.querySelector('head'); //移除所有的重复创建的标签
 
     var nodes = document.querySelectorAll('script[src="https://g.alicdn.com/de/prismplayer/2.8.2/hls/aliplayer-hls-min.js"]');
@@ -1477,6 +1484,18 @@ module.exports = Object('z').propertyIsEnumerable(0) ? Object : function (it) {
 };
 
 
+/***/ }),
+
+/***/ "9f7e":
+/***/ (function(module, exports, __webpack_require__) {
+
+// 21.2.5.3 get RegExp.prototype.flags()
+if (__webpack_require__("f9a5") && /./g.flags != 'g') __webpack_require__("d3d8").f(RegExp.prototype, 'flags', {
+  configurable: true,
+  get: __webpack_require__("e7a1")
+});
+
+
 /***/ }),
 
 /***/ "a6ad":
@@ -1614,6 +1633,39 @@ module.exports = function (done, value) {
 };
 
 
+/***/ }),
+
+/***/ "cc1d":
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+__webpack_require__("9f7e");
+var anObject = __webpack_require__("8cac");
+var $flags = __webpack_require__("e7a1");
+var DESCRIPTORS = __webpack_require__("f9a5");
+var TO_STRING = 'toString';
+var $toString = /./[TO_STRING];
+
+var define = function (fn) {
+  __webpack_require__("a6d5")(RegExp.prototype, TO_STRING, fn, true);
+};
+
+// 21.2.5.14 RegExp.prototype.toString()
+if (__webpack_require__("0cc1")(function () { return $toString.call({ source: 'a', flags: 'b' }) != '/a/b'; })) {
+  define(function toString() {
+    var R = anObject(this);
+    return '/'.concat(R.source, '/',
+      'flags' in R ? R.flags : !DESCRIPTORS && R instanceof RegExp ? $flags.call(R) : undefined);
+  });
+// FF44- RegExp#toString has a wrong name
+} else if ($toString.name != TO_STRING) {
+  define(function toString() {
+    return $toString.call(this);
+  });
+}
+
+
 /***/ }),
 
 /***/ "d15b":
@@ -1738,6 +1790,27 @@ module.exports = {};
 })(document);
 
 
+/***/ }),
+
+/***/ "e7a1":
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+// 21.2.5.3 get RegExp.prototype.flags
+var anObject = __webpack_require__("8cac");
+module.exports = function () {
+  var that = anObject(this);
+  var result = '';
+  if (that.global) result += 'g';
+  if (that.ignoreCase) result += 'i';
+  if (that.multiline) result += 'm';
+  if (that.unicode) result += 'u';
+  if (that.sticky) result += 'y';
+  return result;
+};
+
+
 /***/ }),
 
 /***/ "e85e":