diff --git a/.env.development b/.env.development index 8723b259..8ac8badb 100644 --- a/.env.development +++ b/.env.development @@ -8,7 +8,7 @@ ENV = 'development' # VITE_APP_BASE_API_Url = 'https://aitstest.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:7002' # VITE_APP_BASE_API_Url = 'http://192.168.247.200' # VITE_APP_BASE_API_Url = 'http://aitscdn.jlbank.com.cn:7001' @@ -16,14 +16,14 @@ ENV = 'development' # dev # 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' # DEV # app入口 -VITE_APP_BASE_API_Url = 'http://25.18.122.65:7001' +# VITE_APP_BASE_API_Url = 'http://25.18.122.65:7001' # VITE_APP_BASE_API_Url = 'http://25.16.122.91:9786' # VITE_APP_BASE_API_Url = 'http://25.18.122.66:9786' diff --git a/.env.development.yh b/.env.development.yh index 910048f4..e9359d3e 100644 --- a/.env.development.yh +++ b/.env.development.yh @@ -4,7 +4,7 @@ ENV = 'development.yh' VITE_APP_BASE_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_TRAEXAM = 'http://25.64.32.154:9604' # VITE_APP_BASE_H5_API_Url_TRAPRACTICE = 'http://25.64.32.156:9603' # VITE_APP_BASE_H5_API_Url_TRAAPP = 'http://25.64.32.154:9601' diff --git a/src/pages/course/components/touchBtn.vue b/src/pages/course/components/touchBtn.vue index 19aea28e..3d1a24b3 100644 --- a/src/pages/course/components/touchBtn.vue +++ b/src/pages/course/components/touchBtn.vue @@ -296,7 +296,13 @@ let _res = await getPermission() if (_res) { hasPermission.value = true - showOverlayTalking(obj); + setTimeout(()=>{ + if(!isGettingPermission.value){ + showOverlayTalking(obj); + }else{ + isGettingPermission.value = false + } + },100) } }else{ showOverlayTalking(obj); @@ -310,18 +316,17 @@ let _recordPerm = await permission.requestAndroidPermission('android.permission.RECORD_AUDIO'); if (_recordPerm !== 1) { showTalkingModel.value = false; - common.show('提示信息', '当前页面需要使用的录音权限,是否前往开启?', true, '取消', '确定').then((res) => { - if (res) { - // 去开启权限 - permission.gotoAppPermissionSetting(); - } else { - // 取消 - common.navigateBack(); - } - }); + let res = await common.show('提示信息', '当前页面需要使用的录音权限,是否前往开启?', true, '取消', '确定') + if (res) { + // 去开启权限 + permission.gotoAppPermissionSetting(); + } else { + // 取消 + common.navigateBack(); + } return false } else { - isGettingPermission.value = false + // isGettingPermission.value = false return true } } else { @@ -340,10 +345,10 @@ return false } else if (_state === 'not determined') { // startRecord() - isGettingPermission.value = false + // isGettingPermission.value = false return true } else { - isGettingPermission.value = false + // isGettingPermission.value = false return true } } diff --git a/src/pages/sparring/components/touchBtn.vue b/src/pages/sparring/components/touchBtn.vue index 5f51cd64..dd26ed33 100644 --- a/src/pages/sparring/components/touchBtn.vue +++ b/src/pages/sparring/components/touchBtn.vue @@ -6,7 +6,7 @@ {{'语音对话'}} - @@ -239,7 +239,13 @@ let _res = await getPermission() if (_res) { hasPermission.value = true - showOverlayTalking(obj); + setTimeout(()=>{ + if(!isGettingPermission.value){ + showOverlayTalking(obj); + }else{ + isGettingPermission.value = false + } + },100) } } else { showOverlayTalking(obj); @@ -253,18 +259,17 @@ let _recordPerm = await permission.requestAndroidPermission('android.permission.RECORD_AUDIO'); if (_recordPerm !== 1) { showTalkingModel.value = false; - common.show('提示信息', '当前页面需要使用的录音权限,是否前往开启?', true, '取消', '确定').then((res) => { - if (res) { - // 去开启权限 - permission.gotoAppPermissionSetting(); - } else { - // 取消 - common.navigateBack(); - } - }); + let res = await common.show('提示信息', '当前页面需要使用的录音权限,是否前往开启?', true, '取消', '确定') + if (res) { + // 去开启权限 + permission.gotoAppPermissionSetting(); + } else { + // 取消 + common.navigateBack(); + } return false } else { - isGettingPermission.value = false + // isGettingPermission.value = false return true } } else { @@ -283,10 +288,10 @@ return false } else if (_state === 'not determined') { // startRecord() - isGettingPermission.value = false + // isGettingPermission.value = false return true } else { - isGettingPermission.value = false + // isGettingPermission.value = false return true } } @@ -359,8 +364,12 @@ }; onShow(()=>{ // stopRecord() + // if(isGettingPermission.value){ + // hideOverlayTalking() + // } }) onHide(()=>{ + console.log('onHide') isGettingPermission.value = true })