@aochuang/common 1.0.139 → 1.0.142

package/common/voice/voice.vue

@@ -81,25 +81,14 @@ export default {
     }
   },
   created () {
-    const resolvePendingStart = () => {
-      if (this._pendingStartResolve) {
-        this._pendingStartResolve()
-        this._pendingStartResolve = null
-      }
-    }
-    const releasePlayEndPromise = () => {
-      if (this.playEndPromise && this.playEndPromise.resolve) {
-        this.playEndPromise.resolve()
-      }
-    }
     const newFactory = (Factory, options) => {
       return new Factory(Object.assign({
         playRate: this.playRate,
         onError: (e) => {
           this.starting = false
           this.playStatus = 'stop'
-          resolvePendingStart()
-          releasePlayEndPromise()
+          this._resolvePendingStart()
+          this._releasePlayEndPromise()
           this.$set(this.errorMsgMap, this.playId, e.message || '未知错误')
           this.$emit('error', Object.assign({
             playId:  this.playId
@@ -178,9 +167,15 @@ export default {
     start (id, val, total, cb) {
       return new Promise((resolve) => {
         this.stop()
+        const startToken = (this._startToken || 0) + 1
+        this._startToken = startToken
         this._pendingStartResolve = resolve
         const playEndPromise = this.playEndPromise || Promise.resolve()
         playEndPromise.finally(() => {
+          if (this._startToken !== startToken) {
+            resolve()
+            return
+          }
           this.playEndPromise = createPromise()
           val = formatOssPath(val)
           this.starting = true
@@ -189,12 +184,16 @@ export default {
           this.$delete(this.errorMsgMap, id)
           this.$nextTick(() => {
             this.player.setUrl(val, (ctx) => {
+              if (this._startToken !== startToken) {
+                resolve()
+                return
+              }
               cb && cb(ctx)
               if (!ctx || ctx.status !== 'success') {
                 this.starting = false
                 this.playStatus = 'stop'
-                resolvePendingStart()
-                releasePlayEndPromise()
+                this._resolvePendingStart()
+                this._releasePlayEndPromise()
                 resolve()
                 return
               }
@@ -203,7 +202,11 @@ export default {
               Promise.all([
                 this.player.start()
               ]).finally(() => {
-                resolvePendingStart()
+                if (this._startToken !== startToken) {
+                  resolve()
+                  return
+                }
+                this._resolvePendingStart()
                 resolve()
               })
             })
@@ -225,14 +228,12 @@ export default {
       this.player.resume()
     },
     stop () {
+      this._startToken = (this._startToken || 0) + 1
       this.starting = false
       this.playId = null
       this.playStatus = 'stop'
-      if (this._pendingStartResolve) {
-        this._pendingStartResolve()
-        this._pendingStartResolve = null
-      }
-      this.player.stop()
+      this._resolvePendingStart()
+      this.player && this.player.stop()
     },
     isPlaying (id) {
       return this.playStatus === 'play' && this.playId === id
@@ -288,6 +289,17 @@ export default {
         this.stop()
       }
       this.$delete(this.errorMsgMap, id)
+    },
+    _resolvePendingStart () {
+      if (this._pendingStartResolve) {
+        this._pendingStartResolve()
+        this._pendingStartResolve = null
+      }
+    },
+    _releasePlayEndPromise () {
+      if (this.playEndPromise && this.playEndPromise.resolve) {
+        this.playEndPromise.resolve()
+      }
     }
   },
   render () {

package/common/voice-player/voice-player.vue

@@ -287,6 +287,7 @@ export default {
     },
     playCurrPosition (val) {
       this.controlPlayPosition = val
+      this.$emit('progress-change', val)
     },
     url () {
       this.innerUrl = this.url
@@ -396,6 +397,57 @@ export default {
       }
       window.open(formatOssPath(this.voiceSrc), '_blank')
     },
+    setPlayPosition (position) {
+      let targetValue = parseFloat(position)
+      if (!Number.isFinite(targetValue)) {
+        return
+      }
+      if (this.voiceSeconds) {
+        targetValue = Math.max(0, Math.min(targetValue, Number(this.voiceSeconds)))
+      }
+      clearTimeout(this._controlChangeTimer)
+      this.controlPlayPosition = targetValue
+      if (this.AcVoice.playUrl !== this.innerUrl) {
+        return Promise.all([
+          this.play()
+        ]).then(() => {
+          if (!this.AcVoice.isSuperChangeProgress(this.innerUrl)) {
+            !this._notTips && this.$warn('AAC格式音频不支持更改播放进度，可以下载本地播放', () => {
+              this._notTips = false
+            })
+            this._notTips = true
+            return
+          }
+          this._controlChangeTimer = setTimeout(() => {
+            this.AcVoice.setPosition(targetValue)
+          }, 100)
+        })
+      } else {
+        if (!this.isPlaying) {
+          return this.play().then(() => {
+            if (!this.AcVoice.isSuperChangeProgress(this.innerUrl)) {
+              !this._notTips && this.$warn('AAC格式音频不支持更改播放进度，可以下载本地播放', () => {
+                this._notTips = false
+              })
+              this._notTips = true
+              return
+            }
+            this._controlChangeTimer = setTimeout(() => {
+              this.AcVoice.setPosition(targetValue)
+            }, 100)
+          })
+        } else {
+          if (!this.AcVoice.isSuperChangeProgress(this.innerUrl)) {
+            !this._notTips && this.$warn('AAC格式音频不支持更改播放进度，可以下载本地播放', () => {
+              this._notTips = false
+            })
+            this._notTips = true
+            return
+          }
+          this.AcVoice.setPosition(targetValue)
+        }
+      }
+    },
     handleControlChange (evt) {
       const targetValue = evt.target.value
       clearTimeout(this._controlChangeTimer)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aochuang/common",
-  "version": "1.0.139",
+  "version": "1.0.142",
   "description": "",
   "main": "index.js",
   "publishConfig": {