@aochuang/client-sdk 1.0.356 → 1.0.358

package/components/wework-chat-control/voice/voice.vue

@@ -20,10 +20,11 @@
             ref="player"
             :id="nextId"
             :url="voiceSrc"
+            :get-url-method="getUrlMethod"
             :enable-convert-to-wav="enableConvertToWav"
             :update-wav-method="updateWavMethod"
             :seconds="voiceDuration"
-            :allow-download="allowDownload"
+            :allow-download="canDownload"
           ></ac-voice-player>
         </div>
       </div>
@@ -53,6 +54,7 @@
 import { parse } from '../../../utils/json'
 import { unique } from '../../../utils/string'
 import AcVoicePlayer from '@aochuang/common/common/voice-player'
+import { formatOssPath } from '@aochuang/common/utils/oss'
 
 const ConvertStatusEnum = {
   NORMAL: -1, // 没有转换
@@ -100,6 +102,9 @@ export default {
       type: Boolean,
       default: true
     },
+    downloadMethod: {
+      type: Function
+    },
     transformVoiceToTextEnable: {
       type: Boolean,
       default: false
@@ -120,6 +125,7 @@ export default {
   },
   data () {
     return {
+      downloadedContent: null,
       transformStatus: typeof this.convertStatus === 'number' ? this.convertStatus : ConvertStatusEnum.NORMAL,
       playRate: 1,
       transforming: false,
@@ -129,11 +135,17 @@ export default {
   },
   computed: {
     nextContent () {
-      return parse(this.content) || {}
+      return this.downloadedContent || parse(this.content) || {}
     },
     voiceSrc () {
-      let url = this.nextContent.resPath
-      return url
+      if (typeof this.nextContent === 'string') {
+        return this.nextContent
+      }
+      const voiceSrc = this.nextContent.resPath || this.nextContent.voicePath || this.nextContent.url || ''
+      if (!voiceSrc) {
+        return
+      }
+      return formatOssPath(voiceSrc) 
     },
     nextId () {
       return this.id || unique()
@@ -141,6 +153,9 @@ export default {
     voiceDuration () {
       return this.nextContent.durationMs ? this.nextContent.durationMs : null
     },
+    canDownload () {
+      return this.allowDownload && !!this.nextContent.resPath
+    },
     isPlaying () {
       return this.AcVoice.isPlaying(this.id)
     },
@@ -169,6 +184,46 @@ export default {
     }
   },
   methods: {
+    getUrlMethod () {
+      const content = this.nextContent
+      const currentUrl = typeof content === 'string'
+        ? content
+        : content.resPath || content.url
+      if (currentUrl) {
+        return Promise.resolve(currentUrl)
+      }
+      if (!this.downloadMethod) {
+        return Promise.reject(new Error('未找到语音下载方法'))
+      }
+
+      const updateContentProps = (data) => {
+        if (!data || typeof data !== 'object' || Array.isArray(data)) {
+          throw new Error('updateContentProps只支持更新数据对象')
+        }
+        this.downloadedContent = data
+        return data
+      }
+      const result = this.downloadMethod({
+        content,
+        updateContentProp: (prop, value) => updateContentProps(Object.assign({}, this.nextContent, {[prop]: value})),
+        updateContentProps
+      })
+      return Promise.resolve(result).then((data) => {
+        const resultContent = typeof data === 'string' ? {url: data} : data
+        const url = resultContent && (resultContent.resPath || resultContent.url)
+        if (url) {
+          return url
+        }
+        const nextContent = this.nextContent
+        const nextUrl = typeof nextContent === 'string'
+          ? nextContent
+          : nextContent.resPath || nextContent.url
+        if (nextUrl) {
+          return nextUrl
+        }
+        throw new Error('语音下载未返回有效地址')
+      })
+    },
     handleTransformClick () {
       if (this.transformVoiceToTextMethod) {
         this.transforming = true

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aochuang/client-sdk",
-  "version": "1.0.356",
+  "version": "1.0.358",
   "description": "",
   "files": [
     "common",