@aochuang/common 1.0.132 → 1.0.133

package/common/voice/voice-player-audio.js

@@ -90,18 +90,34 @@ export default class VoicePlayerAudio {
     if (!url) {
       this.stop()
     }
-    this.$audio.src = url
-    if (play) {
-      this.start()
-    }
-    const eventCb = () => {
+    const onLoaded = () => {
+      cleanup()
       cb && cb({
         duration: this.$audio.duration,
         status: 'success'
       })
-      this.$audio.removeEventListener('loadedmetadata', eventCb)
     }
-    this.$audio.addEventListener('loadedmetadata', eventCb)
+    const onError = () => {
+      cleanup()
+      this.options.onError && this.options.onError({
+        url: this._url,
+        message: 'Invalid Url'
+      })
+      cb && cb({
+        status: 'error',
+        message: 'Invalid Url'
+      })
+    }
+    const cleanup = () => {
+      this.$audio.removeEventListener('loadedmetadata', onLoaded)
+      this.$audio.removeEventListener('error', onError)
+    }
+    this.$audio.addEventListener('loadedmetadata', onLoaded)
+    this.$audio.addEventListener('error', onError)
+    this.$audio.src = url
+    if (play) {
+      this.start()
+    }
   }
 
   /**

package/common/voice/voice.vue

@@ -81,11 +81,25 @@ 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.$set(this.errorMsgMap, this.playId, e.message || '未知错误')
           this.$emit('error', Object.assign({
             playId:  this.playId
@@ -164,22 +178,32 @@ export default {
     start (id, val, total, cb) {
       return new Promise((resolve) => {
         this.stop()
+        this._pendingStartResolve = resolve
         const playEndPromise = this.playEndPromise || Promise.resolve()
         playEndPromise.finally(() => {
           this.playEndPromise = createPromise()
           val = formatOssPath(val)
           this.starting = true
           this.playUrl = val
+          this.playId = id
           this.$delete(this.errorMsgMap, id)
           this.$nextTick(() => {
             this.player.setUrl(val, (ctx) => {
               cb && cb(ctx)
+              if (!ctx || ctx.status !== 'success') {
+                this.starting = false
+                this.playStatus = 'stop'
+                resolvePendingStart()
+                releasePlayEndPromise()
+                resolve()
+                return
+              }
               this._resetPosition(total)
-              this.playId = id
               this.playStatus = 'play'
               Promise.all([
                 this.player.start()
               ]).finally(() => {
+                resolvePendingStart()
                 resolve()
               })
             })
@@ -204,6 +228,10 @@ export default {
       this.starting = false
       this.playId = null
       this.playStatus = 'stop'
+      if (this._pendingStartResolve) {
+        this._pendingStartResolve()
+        this._pendingStartResolve = null
+      }
       this.player.stop()
     },
     isPlaying (id) {

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

@@ -302,14 +302,10 @@ export default {
     this.AcVoice.$on('end', this.handleVoiceEnd)
     this.AcVoice.$on('error', this.handleVoiceError)
   },
-  beforeDestroy () {
-    this.AcVoice.remove(this.id)
-    this.AcVoice.$off('playing', this.handleVoicePlaying)
-    this.AcVoice.$off('end', this.handleVoiceEnd)
-    this.AcVoice.$off('error', this.handleVoiceError)
-  },
   methods: {
     handleVoiceError (e) {
+      this.loading = false
+      this.progressing = false
       if (e.type === 'aac' && e.playId === this.id) {
         if (e.message && e.message === 'Maximum call stack size exceeded') {
           if (this.allowDownload) {
@@ -321,9 +317,11 @@ export default {
       }
     },
     handleVoiceEnd () {
+      this.loading = false
       this.progressing = false
     },
     handleVoicePlaying (evt) {
+      this.loading = false
       this.isSuperChangeProgress = this.AcVoice.isSuperChangeProgress(this.innerUrl)
       if (!this.isNeedConvertWav) {
         return
@@ -497,6 +495,10 @@ export default {
     }
   },
   beforeDestroy () {
+    this.AcVoice.remove(this.id)
+    this.AcVoice.$off('playing', this.handleVoicePlaying)
+    this.AcVoice.$off('end', this.handleVoiceEnd)
+    this.AcVoice.$off('error', this.handleVoiceError)
     clearTimeout(this._controlChangeTimer)
   }
 }

package/components/icon/demo_index.html

@@ -54,6 +54,12 @@
       <div class="content unicode" style="display: block;">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+              <span class="icon iconfont">&#xe89b;</span>
+                <div class="name">upload-2-fill</div>
+                <div class="code-name">&amp;#xe89b;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon iconfont">&#xe6f9;</span>
                 <div class="name">bookmark-3-line</div>
@@ -2406,9 +2412,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1785737622729') format('woff2'),
-       url('iconfont.woff?t=1785737622729') format('woff'),
-       url('iconfont.ttf?t=1785737622729') format('truetype');
+  src: url('iconfont.woff2?t=1785898568941') format('woff2'),
+       url('iconfont.woff?t=1785898568941') format('woff'),
+       url('iconfont.ttf?t=1785898568941') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -2434,6 +2440,15 @@
       <div class="content font-class">
         <ul class="icon_lists dib-box">
           
+          <li class="dib">
+            <span class="icon iconfont icon-upload-2-fill"></span>
+            <div class="name">
+              upload-2-fill
+            </div>
+            <div class="code-name">.icon-upload-2-fill
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon iconfont icon-bookmark-3-line"></span>
             <div class="name">
@@ -5962,6 +5977,14 @@
       <div class="content symbol">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-upload-2-fill"></use>
+                </svg>
+                <div class="name">upload-2-fill</div>
+                <div class="code-name">#icon-upload-2-fill</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-bookmark-3-line"></use>

package/components/icon/icon.vue

@@ -13,7 +13,7 @@ export default {
     size: {
       type: Number
     },
-    color: {
+    color: { 
       type: String
     }
   },

package/components/icon/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 4387417 */
-  src: url('iconfont.woff2?t=1785737622729') format('woff2'),
-       url('iconfont.woff?t=1785737622729') format('woff'),
-       url('iconfont.ttf?t=1785737622729') format('truetype');
+  src: url('iconfont.woff2?t=1785898568941') format('woff2'),
+       url('iconfont.woff?t=1785898568941') format('woff'),
+       url('iconfont.ttf?t=1785898568941') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-upload-2-fill:before {
+  content: "\e89b";
+}
+
 .icon-bookmark-3-line:before {
   content: "\e6f9";
 }