diff --git a/.env.development b/.env.development index 3119b39a..2f74cf79 100644 --- a/.env.development +++ b/.env.development @@ -12,7 +12,7 @@ VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001' #VITE_APP_BASE_API_Url = 'http://25.18.122.65:7001' # sit -VITE_APP_BASE_API_Url = 'http://25.18.122.91:9786' +# VITE_APP_BASE_API_Url = 'http://25.18.122.91:9786' # UAT # VITE_APP_BASE_API_Url = 'http://25.18.122.78:9786' diff --git a/.env.development.yh b/.env.development.yh index e5b3101e..474c810a 100644 --- a/.env.development.yh +++ b/.env.development.yh @@ -2,9 +2,9 @@ ENV = 'development.yh' # 'development.yh' -# VITE_APP_BASE_H5_API_Url = 'http://25.18.122.65:7001' +VITE_APP_BASE_H5_API_Url = 'http://25.18.122.65:7001' -VITE_APP_BASE_H5_API_Url = 'http://25.18.122.91:9786' +# VITE_APP_BASE_H5_API_Url = 'http://25.18.122.91:9786' # VITE_APP_BASE_H5_API_Url = 'http://25.18.122.78:9786' # VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002' # VITE_APP_BASE_H5_API_Url_TRAEXAM = 'http://25.64.32.154:9604' diff --git a/src/api/common.js b/src/api/common.js index 80258eb9..0c70e2f6 100644 --- a/src/api/common.js +++ b/src/api/common.js @@ -56,6 +56,7 @@ export function downloadFile(id = '', url = '') { header['summary'] = token let baseUrl = get_base_url(); let _url = id?`${baseUrl}/traoss/tras3/show/${id}?tk=${token}`:`${url}?tk=${token}` + console.log(_url) return new Promise((resolve, reject) => { uni.downloadFile({ url: _url, diff --git a/src/pages/sparring/components/question.vue b/src/pages/sparring/components/question.vue index 695e1a4c..a6ad08cc 100644 --- a/src/pages/sparring/components/question.vue +++ b/src/pages/sparring/components/question.vue @@ -53,7 +53,8 @@ } from '@/common/common.js'; import { downloadFile, - downloadVoiceFile + downloadVoiceFile, + getPreviewFileUrl } from '@/api/common.js' import { useStorageStore @@ -110,11 +111,12 @@ const pauseVoice = (flag) => { if (!talkUserVoiceObj.value) return talkUserVoiceObj.value.pause() - if (flag === 'destory') talkVoiceObj.value.destory() + if (flag === 'destory') talkUserVoiceObj.value.destory() isPlaying.value = false emit('changePlay', '') } const playVoice = () => { + console.log(talkUserVoiceObj.value, 1111) emit('changePlay', unref(dataInfo)?.id) talkUserVoiceObj.value.volume = 1 if (isTesting.value) { @@ -130,29 +132,50 @@ return } else { voiceLoading.value = true; - let _id = unref(dataInfo)?.fileId + let _id = unref(dataInfo)?.fileId || unref(dataInfo)?.ossKey + console.log('dataInfo', unref(dataInfo)) storageStore.getStorageById('audio', _id, (url) => { if (url) { voiceLoading.value = false; itemVoice.value = url; - talkVoiceObj.value.src = url; - if (voiceIsPlaying.value) return + talkUserVoiceObj.value.src = url; if (unref(dataInfo)?.id !== props.activeVoiceId) return - talkVoiceObj.value.play(); + talkUserVoiceObj.value.play(); } else { + // downloadVoiceFile(`/traoss/tras3/show/${_id}`) + // .then((res) => { downloadFile(_id) .then((res) => { + console.log(res) if (res?.data) { common.msg(res.data.message); return; } + voiceLoading.value = false; itemVoice.value = res.tempFilePath; - talkVoiceObj.value.src = res.tempFilePath; - if (voiceIsPlaying.value) return + talkUserVoiceObj.value.src = res.tempFilePath; if (unref(dataInfo)?.id !== props.activeVoiceId) return - talkVoiceObj.value.play(); + talkUserVoiceObj.value.play(); storageStore.setStorage('audio', _id, itemVoice.value); + // uni.saveFile({ + // tempFilePath: res.tempFilePath, + // success:(_res)=>{ + // voiceLoading.value = false; + // itemVoice.value = _res.savedFilePath; + // talkUserVoiceObj.value.src = _res.savedFilePath; + // if (unref(dataInfo)?.id !== props.activeVoiceId) return + // talkUserVoiceObj.value.play(); + // storageStore.setStorage('audio', _id, itemVoice.value); + // }, + // fail:() => { + // emit('changePlay', ''); + // voiceLoading.value = false; + // }, + // complete:()=>{ + // voiceLoading.value = false; + // } + // }) }) .catch((err) => { voiceLoading.value = false; @@ -187,7 +210,7 @@ talkUserVoiceObj.value.onCanplay(() => { setVoiceTime(0) }) - itemVoice.value = unref(dataInfo).talkingVoice + // itemVoice.value = unref(dataInfo).talkingVoice // talkUserVoiceObj.value.src = itemVoice.value // talkUserVoiceObj.value.sessionCategory = 'soloAmbient' // //#ifdef APP-PLUS @@ -227,7 +250,7 @@ deep: true, immediate: true }) - watch(() => props.dataInfo.talkingVoice, (val) => { + watch(() => props.dataInfo.ossKey, (val) => { if (val) { initVoice() } diff --git a/src/pages/sparring/tip.vue b/src/pages/sparring/tip.vue index c0d44b9b..69ae0437 100644 --- a/src/pages/sparring/tip.vue +++ b/src/pages/sparring/tip.vue @@ -220,6 +220,7 @@ }) => { console.log('新发送语音', ossKey, text); if (!ossKey) { + talkingList.value.pop(); uni.showToast({ title: '系统异常,请联系管理员', icon: 'none',