feat(flv/utils/Observer): update Observer for compatibility

packages/xgplayer-flv/src/index.js

@@ -8,6 +8,7 @@ class FlvPlayer extends Player {
  this._options = options
  this.__flv__ = null
  this.init(options)
+
  Object.defineProperty(this, 'src', {
  set: (val) => {
  if (typeof val === 'string' && val.startsWith('blob:')) {
@@ -41,6 +42,8 @@ class FlvPlayer extends Player {
  this.once('destroy', () => {
  VodTask.clear()
  player.__flv__.destroy()
+ player.__flv__.mse = null
+ player.video.src = ''
  player.__flv__ = null
  })
  }

packages/xgplayer-flv/src/utils/Observer.js

@@ -2,74 +2,79 @@
  * @author fuyuhao
  */
 
+const nativeSlice = Array.prototype.slice
+
 class Observer {
  constructor () {
- this.fnId = 0
- this._listenerIdMap = new Map()
- this._listeners = new Map()
+ this.fnId = 1
+ this._listenerIdMap = {}
+ this._listeners = {}
  }
  on (key, fn) {
  const fnId = this.fnId++
  const listeners = this._getListenersByKey(key)
- this._listenerIdMap.set(fnId, fn)
+ this._listenerIdMap[fnId] = fn
  if (listeners) {
  listeners.unshift(fnId)
- return
+ return fnId
  }
- this._listeners.set(key, [fnId])
+ this._listeners[key] = [fnId]
  return fnId
  }
- emit (key, ...params) {
- this._getListenersByKey(key).forEach(fnId => {
- const fn = this._getListenerById(fnId)
- fn && fn(...params)
- })
+ emit (key) {
+ const args = nativeSlice.call(arguments, 1)
+ const listeners = this._getListenersByKey(key) || []
+ for (let i = 0, len = listeners.length; i < len; i++) {
+ const fn = this._getListenerById(listeners[i])
+ fn && fn.apply(null, args)
+ }
  }
  once (key, fn) {
  const fnId = this.fnId++
  const listeners = this._getListenersByKey(key)
- this._listenerIdMap.set(fnId, (...params) => {
- fn(...params)
+ this._listenerIdMap[fnId] = () => {
+ const args = nativeSlice.call(arguments)
+ fn.apply(null, args)
  this.off(key, fnId)
- })
+ }
  if (listeners) {
  listeners.unshift(fnId)
- return
+ return fnId
  }
- this._listeners.set(key, [fnId])
+ this._listeners[key] = [fnId]
  return fnId
  }
  off (key, fnId) {
  const listeners = this._getListenersByKey(key)
  const fn = this._getListenerById(fnId)
- if (!fn || !listeners || !listeners.includes(fnId)) {
+ if (!fn || !listeners || listeners.indexOf(fnId) < 0) {
  return
  }
- this._listenerIdMap.delete(fnId)
+ delete this._listenerIdMap[fnId]
  if (listeners.length === 1) {
- this._listeners.delete(key)
+ delete this._listeners[key]
  } else {
- listeners.splice(listeners.indexOf(fnId), 1)
+ listeners[listeners.indexOf(fnId)] = undefined
  }
  }
  _getListenersByKey (key) {
- return this._listeners.get(key)
+ return this._listeners[key]
  }
  _getListenerById (fnId) {
- return this._listenerIdMap.get(fnId)
+ return this._listenerIdMap[fnId]
  }
  flush (key) {
  const listeners = this._getListenersByKey(key)
  if (listeners) {
  listeners.forEach(fnId => {
- this._listenerIdMap.delete(fnId)
+ delete this._listenerIdMap[fnId]
  })
- this._listeners.delete(key)
+ delete this._listeners[key]
  }
  }
  destroy () {
- this._listeners.clear()
- this._listenerIdMap.clear()
+ this._listeners = null
+ this._listenerIdMap = null
  }
 }