diff --git a/.env.development b/.env.development index f296d9bd..59bec98a 100644 --- a/.env.development +++ b/.env.development @@ -6,7 +6,7 @@ ENV = 'development' # VITE_APP_BASE_API_Url = 'https://aits.jlbank.com.cn:7001' -VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002' +VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001' # VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002' @@ -17,7 +17,7 @@ VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002' #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 @@ -33,7 +33,7 @@ VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002' # h5专用地址x2 # VITE_APP_BASE_H5_API_Url_TRAAPP = 'http://25.64.32.150:9601' # dev -# VITE_APP_BASE_H5_API_Url = 'http://25.18.122.65:7001' +VITE_APP_BASE_H5_API_Url = 'http://25.18.122.65:7001' # sit #VITE_APP_BASE_H5_API_Url = 'http://25.18.122.91:9786' diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json index 15f11888..e4668703 100644 --- a/.hbuilderx/launch.json +++ b/.hbuilderx/launch.json @@ -2,7 +2,7 @@ "version" : "1.0", "configurations" : [ { - "playground" : "custom", + "playground" : "standard", "type" : "uni-app:app-android" }, { diff --git a/certificate/ios/jiaixuedev.mobileprovision b/certificate/ios/jiaixuedev.mobileprovision index f77c4ce3..1ef02c87 100644 Binary files a/certificate/ios/jiaixuedev.mobileprovision and b/certificate/ios/jiaixuedev.mobileprovision differ diff --git a/src/manifest.json b/src/manifest.json index bd6d64b1..3a5e9a32 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -65,7 +65,17 @@ }, /* ios打包配置 */ "ios" : { - "dSYMs" : false + "dSYMs" : false, + "deploymentTarget": "11.0", + "privacyDescription": { + "NSCameraUsageDescription": "此应用需要访问您的摄像头来进行视频录制和拍照功能", + "NSMicrophoneUsageDescription": "此应用需要访问您的麦克风来录制音频" + }, + "capabilities": { + "entitlements": { + "com.apple.developer.avfoundation.multitasking-camera-access": true + } + } }, /* SDK配置 */ "sdkConfigs" : {}, diff --git a/src/pages/preview/components/previewAiSparring.vue b/src/pages/preview/components/previewAiSparring.vue index 94516384..d3ade402 100644 --- a/src/pages/preview/components/previewAiSparring.vue +++ b/src/pages/preview/components/previewAiSparring.vue @@ -64,6 +64,7 @@ traId: item.traId }).then(res=>{ if(res.body.inRange){ + // todo common.navigateTo('/pages/sparring/detail?traId=' + item.traId + '&isPreview=1') }else{ common.show(res.body.message) diff --git a/src/pages/sparring/components/talk-camera.nvue b/src/pages/sparring/components/talk-camera.nvue new file mode 100644 index 00000000..5613d303 --- /dev/null +++ b/src/pages/sparring/components/talk-camera.nvue @@ -0,0 +1,102 @@ + + + + + diff --git a/src/pages/sparring/js/useWebSocket.js b/src/pages/sparring/js/useWebSocket.js index 723c88f2..ebfbae19 100644 --- a/src/pages/sparring/js/useWebSocket.js +++ b/src/pages/sparring/js/useWebSocket.js @@ -36,7 +36,8 @@ export default function useWebSocket(aaas = null, options = {}) { onStartRecord, playPcmCallback, setPlayNumber = () => {}, //设置当前播放的音频的id,用于播放完成回调 - onError = () => {} + onError = () => {}, + onClose = () => {}, }) => { const wsUrl = _baseUrl + url + '?summary=' + getToken() const finalAuthParams = { @@ -53,10 +54,20 @@ export default function useWebSocket(aaas = null, options = {}) { } }); ws.value.onOpen((res) => { + console.log('onOpen', finalAuthParams); ws.value.send({ data: ProtocolCodec.pack(MessageType.IDENTITY, finalAuthParams) }); }); + ws.value.onError((err) => onError(err)) + + + + ws.value.onClose((err) => { + console.log('onClose', err); + onClose(err) + }); + ws.value.onMessage((res) => { const { msgType, @@ -76,19 +87,27 @@ export default function useWebSocket(aaas = null, options = {}) { playPcmCallback(numArray) break; case MessageType.ERROR: - switch (body.errCode) { case 1: // ASR或TTS初始化出错 + console.log('后端返回的错误', body.errMsg); + case 4: + console.log('通话接通失败', body.errMsg); // 通话接通失败,请稍后再试! + ws.value.close({ + code: 4001, + reason: body.errMsg + }) break; default: // 其他错误码的默认处理(如果需要) + // ws.value.close({ + // code: 1001, + // reason: body.errMsg + // }) break; } - console.log('错误', body); - // this.handleErrorMessage(body); break; case MessageType.CONTROL_CMD: // 控制消息 @@ -96,11 +115,8 @@ export default function useWebSocket(aaas = null, options = {}) { if (body.type === 1) { // 开始播放,记录当前播放的语音id console.log('开始播放,记录当前播放的语音id', body.lock); setPlayNumber(body.lock) - } break; - - default: console.log('其他消息', msgType, body); break; @@ -112,6 +128,7 @@ export default function useWebSocket(aaas = null, options = {}) { data }); } + const close = () => { ws.value.close({ code: 1000, diff --git a/src/pages/sparring/talk.vue b/src/pages/sparring/talk.vue index 3d0d10df..a40760f9 100644 --- a/src/pages/sparring/talk.vue +++ b/src/pages/sparring/talk.vue @@ -1,6 +1,6 @@ + + diff --git a/src/pages/test/CameraPreview1.vue b/src/pages/test/CameraPreview1.vue new file mode 100644 index 00000000..1fae4ee8 --- /dev/null +++ b/src/pages/test/CameraPreview1.vue @@ -0,0 +1,102 @@ + + + + + diff --git a/src/pages/test/testChat.vue b/src/pages/test/testChat.vue index 5ff66349..336c20c6 100644 --- a/src/pages/test/testChat.vue +++ b/src/pages/test/testChat.vue @@ -1,13 +1,38 @@ - + \ No newline at end of file + diff --git a/src/pages/test/testChat2.nvue b/src/pages/test/testChat2.nvue deleted file mode 100644 index e69de29b..00000000 diff --git a/src/pages/test/testChat2vue b/src/pages/test/testChat2vue new file mode 100644 index 00000000..6543709f --- /dev/null +++ b/src/pages/test/testChat2vue @@ -0,0 +1,762 @@ + + + + + \ No newline at end of file diff --git a/src/pages/test/testChat3.vue b/src/pages/test/testChat3.vue new file mode 100644 index 00000000..e69a2c28 --- /dev/null +++ b/src/pages/test/testChat3.vue @@ -0,0 +1,20 @@ + + +