Compare commits

...

6 Commits

Author SHA1 Message Date
82e14bb969 无感处理墨册SAAS化加好友需求遗漏代码,等待后续上线通知
Some checks failed
Check / lint (push) Has been cancelled
Check / typecheck (push) Has been cancelled
Check / build (build, 18.x, ubuntu-latest) (push) Has been cancelled
Check / build (build, 18.x, windows-latest) (push) Has been cancelled
Check / build (build:app, 18.x, ubuntu-latest) (push) Has been cancelled
Check / build (build:app, 18.x, windows-latest) (push) Has been cancelled
Check / build (build:mp-weixin, 18.x, ubuntu-latest) (push) Has been cancelled
Check / build (build:mp-weixin, 18.x, windows-latest) (push) Has been cancelled
2025-06-30 14:07:18 +08:00
6ae597c7f4 体制外正式环境为特殊账户开启控制台
Some checks are pending
Check / lint (push) Waiting to run
Check / typecheck (push) Waiting to run
Check / build (build, 18.x, ubuntu-latest) (push) Waiting to run
Check / build (build, 18.x, windows-latest) (push) Waiting to run
Check / build (build:app, 18.x, ubuntu-latest) (push) Waiting to run
Check / build (build:app, 18.x, windows-latest) (push) Waiting to run
Check / build (build:mp-weixin, 18.x, ubuntu-latest) (push) Waiting to run
Check / build (build:mp-weixin, 18.x, windows-latest) (push) Waiting to run
2025-06-30 13:47:09 +08:00
94ef829509 无感处理墨册SAAS化加好友需求部分代码,等待后续上线通知
Some checks are pending
Check / lint (push) Waiting to run
Check / typecheck (push) Waiting to run
Check / build (build, 18.x, ubuntu-latest) (push) Waiting to run
Check / build (build, 18.x, windows-latest) (push) Waiting to run
Check / build (build:app, 18.x, ubuntu-latest) (push) Waiting to run
Check / build (build:app, 18.x, windows-latest) (push) Waiting to run
Check / build (build:mp-weixin, 18.x, ubuntu-latest) (push) Waiting to run
Check / build (build:mp-weixin, 18.x, windows-latest) (push) Waiting to run
2025-06-30 13:26:36 +08:00
16c881acfd 处理语音时长显示格式
Some checks are pending
Check / lint (push) Waiting to run
Check / typecheck (push) Waiting to run
Check / build (build, 18.x, ubuntu-latest) (push) Waiting to run
Check / build (build, 18.x, windows-latest) (push) Waiting to run
Check / build (build:app, 18.x, ubuntu-latest) (push) Waiting to run
Check / build (build:app, 18.x, windows-latest) (push) Waiting to run
Check / build (build:mp-weixin, 18.x, ubuntu-latest) (push) Waiting to run
Check / build (build:mp-weixin, 18.x, windows-latest) (push) Waiting to run
2025-06-30 10:30:43 +08:00
d3164014ee 重构语音播放动画和展示效果;解决复制语音转文字内容错误问题;增加语音转文字loading
Some checks are pending
Check / lint (push) Waiting to run
Check / typecheck (push) Waiting to run
Check / build (build, 18.x, ubuntu-latest) (push) Waiting to run
Check / build (build, 18.x, windows-latest) (push) Waiting to run
Check / build (build:app, 18.x, ubuntu-latest) (push) Waiting to run
Check / build (build:app, 18.x, windows-latest) (push) Waiting to run
Check / build (build:mp-weixin, 18.x, ubuntu-latest) (push) Waiting to run
Check / build (build:mp-weixin, 18.x, windows-latest) (push) Waiting to run
2025-06-30 09:22:24 +08:00
d81bfad19d 抽出所有向OA的Webview通信的方法并封装,统一向所有的webview广播,解决webviewId动态分配导致指定Id时有极小几率不是目标webview导致业务无法继续的问题 2025-06-26 19:06:51 +08:00
19 changed files with 570 additions and 269 deletions

View File

@ -1,6 +1,7 @@
import request from '@/service/index.js' import request from '@/service/index.js'
import qs from 'qs' import qs from 'qs'
import { useTalkStore, useDialogueStore } from '@/store' import { useTalkStore, useDialogueStore } from '@/store'
import { handleFindWebview } from '@/utils/common'
// 获取聊天列表服务接口 // 获取聊天列表服务接口
export const ServeGetTalkList = (data) => { export const ServeGetTalkList = (data) => {
@ -46,23 +47,7 @@ export const ServeClearTalkUnreadNum = (data, unReadNum) => {
useTalkStore().findTalkIndex(useDialogueStore().index_name) useTalkStore().findTalkIndex(useDialogueStore().index_name)
]?.is_disturb ]?.is_disturb
) { ) {
if (typeof plus !== 'undefined') { handleFindWebview(`updateUnreadMsgNumReduce('${unReadNum}')`)
let OAWebView = plus.webview.all()
OAWebView.forEach((webview) => {
if (webview.id === 'webviewId1') {
webview.evalJS(`updateUnreadMsgNumReduce('${unReadNum}')`)
}
})
} else {
document.addEventListener('plusready', () => {
let OAWebView = plus.webview.all()
OAWebView.forEach((webview) => {
if (webview.id === 'webviewId1') {
webview.evalJS(`updateUnreadMsgNumReduce('${unReadNum}')`)
}
})
})
}
} }
return request({ return request({
url: '/api/v1/talk/unread/clear', url: '/api/v1/talk/unread/clear',
@ -83,7 +68,8 @@ export const ServeTalkRecords = (data) => {
// 获取转发会话记录详情列表服务接口 // 获取转发会话记录详情列表服务接口
export const ServeGetForwardRecords = (data) => { export const ServeGetForwardRecords = (data) => {
return request({ return request({
url: '/api/v1/talk/records/forward/v2', // url: '/api/v1/talk/records/forward/v2',
url: '/api/v1/talk/records/forward',
method: 'GET', method: 'GET',
data, data,
}) })

View File

@ -4,7 +4,8 @@ import qs from 'qs'
// ES搜索聊天记录-主页搜索什么都有 // ES搜索聊天记录-主页搜索什么都有
export const ServeSeachQueryAll = (data) => { export const ServeSeachQueryAll = (data) => {
return request({ return request({
url: '/api/v1/elasticsearch/query-all/v2', // url: '/api/v1/elasticsearch/query-all/v2',
url: '/api/v1/elasticsearch/query-all',
method: 'POST', method: 'POST',
data, data,
}) })
@ -13,7 +14,8 @@ export const ServeSeachQueryAll = (data) => {
// ES搜索用户数据 // ES搜索用户数据
export const ServeQueryUser = (data) => { export const ServeQueryUser = (data) => {
return request({ return request({
url: '/api/v1/elasticsearch/query-user/v2', // url: '/api/v1/elasticsearch/query-user/v2',
url: '/api/v1/elasticsearch/query-user',
method: 'POST', method: 'POST',
data, data,
}) })

View File

@ -1,109 +1,155 @@
<script lang="ts" setup> <script lang="ts" setup>
import { ref, reactive, onMounted } from "vue"; import { ref, reactive, onMounted, onUnmounted, computed } from 'vue'
import { PlayOne, PauseOne } from "@icon-park/vue-next"; import { PlayOne, PauseOne } from '@icon-park/vue-next'
import { ITalkRecordExtraAudio, ITalkRecord } from "@/types/chat"; import { ITalkRecordExtraAudio, ITalkRecord } from '@/types/chat'
import { onHide } from '@dcloudio/uni-app'
import aTrumpet from '@/uni_modules/a-trumpet/components/a-trumpet/a-trumpet.vue'
import { useUserStore } from '@/store'
const props = defineProps<{ const props = defineProps<{
extra: ITalkRecordExtraAudio; extra: ITalkRecordExtraAudio
data: ITalkRecord; data: ITalkRecord
maxWidth?: Boolean; maxWidth?: Boolean
}>(); }>()
const audioRef = ref(); const userStore = useUserStore()
const audioContext = ref<any>(null); const talkParams = reactive({
uid: computed(() => userStore.uid),
const durationDesc = ref("-"); })
const audioContext = ref<any>(null)
const durationDesc = ref('-')
const state = reactive({ const state = reactive({
isAudioPlay: false, isAudioPlay: false,
progress: 0, progress: 0,
duration: 0, duration: 0,
currentTime: 0, currentTime: 0,
loading: true, loading: true,
}); })
//
function onOtherAudioPlay(e) {
if (e.detail !== props.data.msg_id && state.isAudioPlay) {
audioContext.value.pause()
state.isAudioPlay = false
}
}
onMounted(() => { onMounted(() => {
// 使uni-app audioContext.value = uni.createInnerAudioContext()
audioContext.value = uni.createInnerAudioContext(); audioContext.value.src = props.extra.url
audioContext.value.src = props.extra.url;
audioContext.value.onCanplay(() => { audioContext.value.onCanplay(() => {
state.duration = audioContext.value.duration; state.duration = audioContext.value.duration
durationDesc.value = formatTime(parseInt(audioContext.value.duration)); durationDesc.value = formatTime(parseInt(audioContext.value.duration))
state.loading = false; state.loading = false
}); })
audioContext.value.onTimeUpdate(() => { audioContext.value.onTimeUpdate(() => {
if (audioContext.value.duration == 0) { if (audioContext.value.duration == 0) {
state.progress = 0; state.progress = 0
} else { } else {
state.currentTime = audioContext.value.currentTime; state.currentTime = audioContext.value.currentTime
state.progress = state.progress =
(audioContext.value.currentTime / audioContext.value.duration) * 100; (audioContext.value.currentTime / audioContext.value.duration) * 100
} }
}); })
audioContext.value.onEnded(() => { audioContext.value.onEnded(() => {
state.isAudioPlay = false; state.isAudioPlay = false
state.progress = 0; state.progress = 0
}); })
audioContext.value.onError((e) => { audioContext.value.onError((e) => {
console.log("音频播放异常===>", e); console.log('音频播放异常===>', e)
}); })
});
window.addEventListener('audio-play', onOtherAudioPlay)
})
onUnmounted(() => {
window.removeEventListener('audio-play', onOtherAudioPlay)
audioContext.value &&
audioContext.value.destroy &&
audioContext.value.destroy()
})
onHide(() => {
if (audioContext.value && audioContext.value.pause) {
audioContext.value.pause()
state.isAudioPlay = false
}
})
const onPlay = () => { const onPlay = () => {
if (state.isAudioPlay) { if (state.isAudioPlay) {
audioContext.value.pause(); audioContext.value.pause()
state.isAudioPlay = false
} else { } else {
audioContext.value.play(); //
window.dispatchEvent(
new CustomEvent('audio-play', { detail: props.data.msg_id }),
)
audioContext.value.play()
state.isAudioPlay = true
} }
}
state.isAudioPlay = !state.isAudioPlay;
};
const onPlayEnd = () => {
state.isAudioPlay = false;
state.progress = 0;
};
const formatTime = (value: number = 0) => { const formatTime = (value: number = 0) => {
if (value == 0) { if (value == 0) {
return "-"; return '-'
} }
const minutes = Math.floor(value / 60)
const minutes = Math.floor(value / 60); let seconds = value
let seconds = value;
if (minutes > 0) { if (minutes > 0) {
seconds = Math.floor(value - minutes * 60); seconds = Math.floor(value - minutes * 60)
} }
return `${minutes}'${seconds}"`
return `${minutes}'${seconds}"`; }
};
</script> </script>
<template> <template>
<div class="im-message-audio"> <div
<div class="play"> class="audio-message"
<div class="btn pointer" @click.stop="onPlay"> @click.stop="onPlay"
<n-icon :class="
:size="18" props?.data?.user_id == talkParams.uid
:component="state.isAudioPlay ? PauseOne : PlayOne" ? 'justify-end py-[22rpx] pl-[30rpx] pr-[16rpx]'
/> : 'justify-start py-[22rpx] pr-[30rpx] pl-[16rpx]'
</div> "
>
<a-trumpet
v-if="props?.data?.user_id != talkParams.uid"
:isPlay="state.isAudioPlay"
color="#C1C1C1"
:size="30"
></a-trumpet>
<div
:class="
props?.data?.user_id == talkParams.uid ? 'mr-[8rpx]' : 'ml-[8rpx]'
"
>
{{ Math.ceil(props?.extra?.duration / 1000) }}s
</div> </div>
<div class="desc"> <a-trumpet
<span class="line" v-for="i in 23" :key="i"></span> v-if="props?.data?.user_id == talkParams.uid"
<span :isPlay="state.isAudioPlay"
class="indicator" color="#C1C1C1"
:style="{ left: state.progress + '%' }" :size="30"
v-show="state.progress > 0" direction="left"
></span> ></a-trumpet>
</div>
<div class="time">{{ durationDesc }}</div>
</div> </div>
</template> </template>
<style lang="less" scoped> <style lang="less" scoped>
.audio-message {
display: flex;
flex-direction: row;
align-items: center;
width: 100%;
height: 100%;
background-color: #fff;
border-radius: 10px;
}
.im-message-audio { .im-message-audio {
--audio-bg-color: #f5f5f5; --audio-bg-color: #f5f5f5;
--audio-btn-bg-color: #ffffff; --audio-btn-bg-color: #ffffff;
@ -245,7 +291,7 @@ const formatTime = (value: number = 0) => {
} }
} }
html[theme-mode="dark"] { html[theme-mode='dark'] {
.im-message-audio { .im-message-audio {
--audio-bg-color: #2c2c32; --audio-bg-color: #2c2c32;
--audio-btn-bg-color: rgb(78, 75, 75); --audio-btn-bg-color: rgb(78, 75, 75);

View File

@ -15,6 +15,7 @@ import {
useDialogueListStore, useDialogueListStore,
useGroupStore, useGroupStore,
} from '@/store' } from '@/store'
import { handleFindWebview } from '@/utils/common'
/** /**
* 好友状态事件 * 好友状态事件
@ -154,23 +155,7 @@ class Talk extends Base {
//更新未读数量+1 //更新未读数量+1
updateUnreadMsgNumAdd() { updateUnreadMsgNumAdd() {
if (typeof plus !== 'undefined') { handleFindWebview(`updateUnreadMsgNumAdd()`)
let OAWebView = plus.webview.all()
OAWebView.forEach((webview) => {
if (webview.id === 'webviewId1') {
webview.evalJS(`updateUnreadMsgNumAdd()`)
}
})
} else {
document.addEventListener('plusready', () => {
let OAWebView = plus.webview.all()
OAWebView.forEach((webview) => {
if (webview.id === 'webviewId1') {
webview.evalJS(`updateUnreadMsgNumAdd()`)
}
})
})
}
} }
/** /**

View File

@ -16,8 +16,14 @@ import { vLoading } from '@/components/x-loading/index.js'
import messagePopup from '@/components/x-message/useMessagePopup' import messagePopup from '@/components/x-message/useMessagePopup'
import pageAnimation from '@/components/page-animation/index.vue' import pageAnimation from '@/components/page-animation/index.vue'
import * as plugins from './plugins' import * as plugins from './plugins'
import { useDialogueStore, useTalkStore, useUserStore, useDialogueListStore } from '@/store' import {
import {uniStorage} from "@/utils/uniStorage.js" useDialogueStore,
useTalkStore,
useUserStore,
useDialogueListStore,
} from '@/store'
import { uniStorage } from '@/utils/uniStorage.js'
import { handleFindWebview } from '@/utils/common'
const { showMessage } = messagePopup() const { showMessage } = messagePopup()
dayjs.locale('zh-cn') dayjs.locale('zh-cn')
@ -67,12 +73,7 @@ export function createApp() {
return return
} }
console.log('===准备创建本地通知栏消息') console.log('===准备创建本地通知栏消息')
let OAWebView = plus.webview.all() handleFindWebview(`doCreatePushMessage('${msg}')`)
OAWebView.forEach((webview, index) => {
if (webview.id === 'webviewId1') {
webview.evalJS(`doCreatePushMessage('${msg}')`)
}
})
} }
//处理聊天推送弹窗点开 //处理聊天推送弹窗点开
@ -93,15 +94,15 @@ export function createApp() {
// 通讯录跳转 // 通讯录跳转
window.handleContacts = () => { window.handleContacts = () => {
// 旧版本-按组织架构树的通讯录 // 旧版本-按组织架构树的通讯录
// uni.navigateTo({ uni.navigateTo({
// url: '/pages/chooseByDeps/index?chooseMode=3&type=true' url: '/pages/chooseByDeps/index?chooseMode=3&type=true'
// }); });
// 新版本-按公司别、好友、群组的通讯录 // 新版本-按公司别、好友、群组的通讯录
uni.navigateTo({ // uni.navigateTo({
url: '/pages/addressBook/index?type=true', // url: '/pages/addressBook/index?type=true',
}); // })
}; }
//处理OA、墨册强制刷新时聊天同步强制刷新 //处理OA、墨册强制刷新时聊天同步强制刷新
window.doLocationRefresh = () => { window.doLocationRefresh = () => {
@ -114,25 +115,32 @@ export function createApp() {
//检查聊天页面是否可用 //检查聊天页面是否可用
window.checkChatWebviewAvailable = () => { window.checkChatWebviewAvailable = () => {
let OAWebView = plus.webview.all() handleFindWebview(`doneCheckChatWebviewAvailable()`)
OAWebView.forEach((webview, index) => {
if (webview.id === 'webviewId1') {
webview.evalJS(`doneCheckChatWebviewAvailable()`)
}
})
} }
//获取从base传来的多选视频列表 //获取从base传来的多选视频列表
window.getBaseMulVideo = (videoList) => { window.getBaseMulVideo = (videoList) => {
const videos = JSON.parse(decodeURIComponent(videoList)) const videos = JSON.parse(decodeURIComponent(videoList))
console.error('=====videos', videos) console.error('=====videos', videos)
if(videos.length > 0){ if (videos.length > 0) {
const videoUri = videos[0] const videoUri = videos[0]
console.error('=====videoUri', videoUri) console.error('=====videoUri', videoUri)
} }
} }
//检查是否是特殊测试用户,开启控制台
const checkTestUser = () => {
const userStore = useUserStore()
if (
import.meta.env.VITE_SHOW_CONSOLE === 'false' &&
userStore.mobile == '18100591363'
) {
new VConsole()
}
}
checkTestUser()
window.message = ['success', 'error', 'warning'].reduce((acc, type) => { window.message = ['success', 'error', 'warning'].reduce((acc, type) => {
acc[type] = (message) => { acc[type] = (message) => {
if (typeof message === 'string') { if (typeof message === 'string') {

View File

@ -331,7 +331,7 @@ import avatarModule from '@/components/avatar-module/index.vue'
import { ref, onMounted, reactive, watch } from 'vue' import { ref, onMounted, reactive, watch } from 'vue'
import { onLoad } from '@dcloudio/uni-app' import { onLoad } from '@dcloudio/uni-app'
import { handleSetWebviewStyle } from '@/utils/common' import { handleSetWebviewStyle, handleFindWebview } from '@/utils/common'
import { ServeUserGroupChatList, ServeCreateTalkList } from '@/api/chat/index' import { ServeUserGroupChatList, ServeCreateTalkList } from '@/api/chat/index'
import { ServeGetSessionId } from '@/api/search/index' import { ServeGetSessionId } from '@/api/search/index'
import { formatTalkItem } from '@/utils/talk' import { formatTalkItem } from '@/utils/talk'
@ -376,12 +376,7 @@ onLoad((options) => {
const goWebHome = () => { const goWebHome = () => {
uni.navigateBack() uni.navigateBack()
let OAWebView = plus.webview.all() handleFindWebview(`handleBackHost()`)
OAWebView.forEach((webview) => {
if (webview.id === 'webviewId1') {
webview.evalJS(`handleBackHost()`)
}
})
} }
onMounted(() => { onMounted(() => {

View File

@ -342,7 +342,8 @@
import checkBox from '@/components/checkBox/index.vue' import checkBox from '@/components/checkBox/index.vue'
import lodash from 'lodash' import lodash from 'lodash'
import { import {
handleSetWebviewStyle handleSetWebviewStyle,
handleFindWebview
} from '@/utils/common' } from '@/utils/common'
import { import {
@ -398,12 +399,7 @@
}) })
const goWebHome = () => { const goWebHome = () => {
uni.navigateBack() uni.navigateBack()
let OAWebView = plus.webview.all() handleFindWebview(`handleBackHost()`)
OAWebView.forEach((webview) => {
if (webview.id === 'webviewId1') {
webview.evalJS(`handleBackHost()`)
}
})
} }
// //
const isPreSelectedMember = (member) => { const isPreSelectedMember = (member) => {

View File

@ -57,6 +57,7 @@ import videoImg from '@/static/image/chatList/video@2x.png'
import folder from '@/static/image/chatList/folder.png' import folder from '@/static/image/chatList/folder.png'
import { uploadImg } from '@/api/chat' import { uploadImg } from '@/api/chat'
import { uniqueId } from '@/utils' import { uniqueId } from '@/utils'
import { handleFindWebview } from '@/utils/common'
const props = defineProps({ const props = defineProps({
sendUserInfo: { sendUserInfo: {
@ -162,12 +163,7 @@ const photoActionsSelect = (index) => {
) )
} }
} else { } else {
// let OAWebView = plus.webview.all() // handleFindWebview(`getPlusVideoPicker()`)
// OAWebView.forEach((webview, index) => {
// if (webview.id === 'webviewId1') {
// webview.evalJS(`getPlusVideoPicker()`)
// }
// })
// return // return
uni.chooseVideo({ uni.chooseVideo({
sourceType: ['album'], sourceType: ['album'],

View File

@ -256,16 +256,17 @@ const checkSendPermission = () => {
// //
const checkNeedAddFriend = () => { const checkNeedAddFriend = () => {
let params = { state.canSendMsg = true
receiver_id: state.userInfo.sys_id, //id // let params = {
talk_type: 1, // receiver_id: state.userInfo.sys_id, //id
} // talk_type: 1,
ServeCheckFriend(params).then((res) => { // }
console.log(res) // ServeCheckFriend(params).then((res) => {
if (res?.code === 200) { // console.log(res)
state.canSendMsg = res.data?.is_friend || false // if (res?.code === 200) {
} // state.canSendMsg = res.data?.is_friend || false
}) // }
// })
} }
// //

View File

@ -229,10 +229,19 @@
> >
<div <div
class="talk-tools voice-content" class="talk-tools voice-content"
v-if="item.voiceContent" v-if="
item?.voiceContent ||
(!item?.voiceContent && item?.isVoiceToTexting)
"
@click="copyVoiceContent(item?.voiceContent || '')" @click="copyVoiceContent(item?.voiceContent || '')"
> >
<span>{{ item.voiceContent }}</span> <wd-loading
v-if="item?.isVoiceToTexting && !item?.voiceContent"
color="#46299D"
:size="20"
style="margin: 0 12rpx 0 0;"
/>
<span v-if="item?.voiceContent">{{ item.voiceContent }}</span>
</div> </div>
</div> </div>
@ -2710,6 +2719,12 @@ const onProgressFn = (progress, id) => {
// console.log((progress.loaded / progress.total) * 100, 'progress') // console.log((progress.loaded / progress.total) * 100, 'progress')
} }
//
const startRecord = () => {
//
window.dispatchEvent(new CustomEvent('audio-play', { detail: null }))
}
// //
const endRecord = (file, url, duration) => { const endRecord = (file, url, duration) => {
console.log(file, url, duration) console.log(file, url, duration)
@ -2736,6 +2751,9 @@ const endRecord = (file, url, duration) => {
resp.catch(() => {}) resp.catch(() => {})
} }
//
const cancelRecord = () => {}
// //
const sendMediaMessage = (mediaUrl, duration, size) => { const sendMediaMessage = (mediaUrl, duration, size) => {
// console.log(mediaUrl, 'mediaUrl') // console.log(mediaUrl, 'mediaUrl')
@ -2764,17 +2782,21 @@ const sendMediaMessage = (mediaUrl, duration, size) => {
// //
const convertText = (msgItem) => { const convertText = (msgItem) => {
msgItem.isVoiceToTexting = true
const resp = ServeConvertText({ const resp = ServeConvertText({
voiceUrl: msgItem.extra.url, voiceUrl: msgItem.extra.url,
msgId: msgItem.msg_id, msgId: msgItem.msg_id,
}) })
// console.log(resp, 'resp') // console.log(resp, 'resp')
resp.then(({ code, data }) => { resp.then(({ code, data }) => {
msgItem.isVoiceToTexting = false
// console.log(code, data, 'data') // console.log(code, data, 'data')
if (code === 200) { if (code === 200) {
console.log(data.convText, 'convText') console.log(data.convText, 'convText')
msgItem.voiceContent = data.convText msgItem.voiceContent = data.convText
} }
}).catch(() => {
msgItem.isVoiceToTexting = false
}) })
} }
// //
@ -2785,16 +2807,17 @@ const chatInputHeight = computed(() => {
// //
const checkNeedAddFriend = () => { const checkNeedAddFriend = () => {
let params = { state.value.isFriendOrSameCompany = true
receiver_id: talkParams.receiver_id, //id // let params = {
talk_type: 1, // receiver_id: talkParams.receiver_id, //id
} // talk_type: 1,
ServeCheckFriend(params).then((res) => { // }
console.log(res) // ServeCheckFriend(params).then((res) => {
if (res?.code === 200) { // console.log(res)
state.value.isFriendOrSameCompany = res.data?.is_friend || false // if (res?.code === 200) {
} // state.value.isFriendOrSameCompany = res.data?.is_friend || false
}) // }
// })
} }
// //
@ -2817,9 +2840,16 @@ const copyVoiceContent = (voiceContent) => {
if (!voiceContent) { if (!voiceContent) {
return return
} }
clipboard(voiceContent, () => { uni.setClipboardData({
message.success('复制成功') data: voiceContent,
showToast: false,
success: () => {
message.success('复制成功')
},
}) })
// clipboard(voiceContent, () => {
// message.success('')
// })
} }
</script> </script>
<style scoped lang="less"> <style scoped lang="less">

View File

@ -86,7 +86,7 @@
</div> </div>
</div> </div>
<div class="divider"></div> <div class="divider"></div>
<div <!-- <div
@click="toAddFriendPage" @click="toAddFriendPage"
class="flex items-center pl-[22rpx] py-[32rpx]" class="flex items-center pl-[22rpx] py-[32rpx]"
> >
@ -103,7 +103,7 @@
添加好友 添加好友
</div> </div>
</div> </div>
<div class="divider"></div> <div class="divider"></div> -->
<div <div
@click="toAddressBookPage" @click="toAddressBookPage"
class="flex items-center pl-[22rpx] py-[32rpx]" class="flex items-center pl-[22rpx] py-[32rpx]"
@ -245,14 +245,14 @@ const toAddFriendPage = () => {
// //
const toAddressBookPage = () => { const toAddressBookPage = () => {
// - // -
// uni.navigateTo({ uni.navigateTo({
// url: '/pages/chooseByDeps/index?chooseMode=3', url: '/pages/chooseByDeps/index?chooseMode=3',
// }) })
// - // -
uni.navigateTo({ // uni.navigateTo({
url: '/pages/addressBook/index', // url: '/pages/addressBook/index',
}) // })
} }
/* watch( /* watch(

View File

@ -5,6 +5,7 @@ import lodash from 'lodash'
import { ref } from 'vue' import { ref } from 'vue'
import { createGlobalState, useStorage } from '@vueuse/core' import { createGlobalState, useStorage } from '@vueuse/core'
import { uniStorage } from '@/utils/uniStorage.js' import { uniStorage } from '@/utils/uniStorage.js'
import { handleFindWebview } from '@/utils/common'
export const useDialogueListStore = createGlobalState(() => { export const useDialogueListStore = createGlobalState(() => {
const testDatabase = async () => { const testDatabase = async () => {
@ -40,19 +41,33 @@ export const useDialogueListStore = createGlobalState(() => {
} }
const content = { const content = {
content: "我试试传送文件和图片是不是一个接口", content: '我试试传送文件和图片是不是一个接口',
name: "测试excel1.xlsx", name: '测试excel1.xlsx',
path: "https://cdn-test.szjixun.cn/fonchain-chat/chat/file/multipart/20250307/727a2371-ffc4-46da-b953-a7d449ff82ff-测试excel1.xlsx", path:
'https://cdn-test.szjixun.cn/fonchain-chat/chat/file/multipart/20250307/727a2371-ffc4-46da-b953-a7d449ff82ff-测试excel1.xlsx',
size: 9909, size: 9909,
drive: 3 drive: 3,
}; }
const extra = JSON.stringify(content); const extra = JSON.stringify(content)
let chatDBexecuteSql2 = { let chatDBexecuteSql2 = {
eventType: 'executeSql', eventType: 'executeSql',
eventParams: { eventParams: {
name: 'chat', name: 'chat',
sql: 'INSERT INTO talk_records (msg_id, sequence, talk_type, msg_type, user_id, receiver_id, is_revoke, is_mark, quote_id, extra, created_at, updated_at, biz_date) VALUES ("'+'77b715fb30f54f739a255a915ef72445'+'", 166, 2, 1, 1774, 888890, 0, 0, "'+''+'", "'+extra+'", "'+'2025-03-06T15:57:07.000Z'+'", "'+'2025-03-06T15:57:07.000Z'+'", "'+'20250306'+'")', sql:
'INSERT INTO talk_records (msg_id, sequence, talk_type, msg_type, user_id, receiver_id, is_revoke, is_mark, quote_id, extra, created_at, updated_at, biz_date) VALUES ("' +
'77b715fb30f54f739a255a915ef72445' +
'", 166, 2, 1, 1774, 888890, 0, 0, "' +
'' +
'", "' +
extra +
'", "' +
'2025-03-06T15:57:07.000Z' +
'", "' +
'2025-03-06T15:57:07.000Z' +
'", "' +
'20250306' +
'")',
}, },
} }
let chatDBSelectSql = { let chatDBSelectSql = {
@ -69,38 +84,27 @@ export const useDialogueListStore = createGlobalState(() => {
path: '_doc/chat.db', path: '_doc/chat.db',
}, },
} }
document.addEventListener('plusready', () => { // handleFindWebview(
let OAWebView = plus.webview.all() // `operateSQLite('${encodeURIComponent(JSON.stringify(chatDatabase))}')`,
OAWebView.forEach((webview, index) => { // )
if (webview.id === 'webviewId1') { // handleFindWebview(
webview.evalJS( // `operateSQLite('${encodeURIComponent(
`operateSQLite('${encodeURIComponent( // JSON.stringify(chatDBexecuteSql),
JSON.stringify(chatDatabase), // )}')`,
)}')`, // )
) // handleFindWebview(
webview.evalJS( // `operateSQLite('${encodeURIComponent(
`operateSQLite('${encodeURIComponent( // JSON.stringify(chatDBexecuteSql2),
JSON.stringify(chatDBexecuteSql), // )}')`,
)}')`, // )
) // handleFindWebview(
webview.evalJS( // `operateSQLite('${encodeURIComponent(JSON.stringify(chatDBSelectSql))}')`,
`operateSQLite('${encodeURIComponent( // )
JSON.stringify(chatDBexecuteSql2), // handleFindWebview(
)}')`, // `operateSQLite('${encodeURIComponent(
) // JSON.stringify(chatDBIsOpenDatabase),
webview.evalJS( // )}')`,
`operateSQLite('${encodeURIComponent( // )
JSON.stringify(chatDBSelectSql),
)}')`,
)
webview.evalJS(
`operateSQLite('${encodeURIComponent(
JSON.stringify(chatDBIsOpenDatabase),
)}')`,
)
}
})
})
} }
// testDatabase() // testDatabase()

View File

@ -2,6 +2,7 @@ import { defineStore } from 'pinia'
import { ServeGetTalkList, ServeCreateTalkList } from '@/api/chat/index' import { ServeGetTalkList, ServeCreateTalkList } from '@/api/chat/index'
import { formatTalkItem, ttime, KEY_INDEX_NAME } from '@/utils/talk' import { formatTalkItem, ttime, KEY_INDEX_NAME } from '@/utils/talk'
import { useEditorDraftStore } from './editor-draft' import { useEditorDraftStore } from './editor-draft'
import { handleFindWebview } from '@/utils/common'
// import { ISession } from '@/types/chat' // import { ISession } from '@/types/chat'
export const useTalkStore = defineStore('talk', { export const useTalkStore = defineStore('talk', {
@ -103,23 +104,7 @@ export const useTalkStore = defineStore('talk', {
return resp.then(({ code, data }) => { return resp.then(({ code, data }) => {
if (code == 200) { if (code == 200) {
//向OA的webview通信改变未读消息数量 //向OA的webview通信改变未读消息数量
if (typeof plus !== 'undefined') { handleFindWebview(`doUpdateUnreadNum('${data.unread_num}')`)
let OAWebView = plus.webview.all()
OAWebView.forEach((webview) => {
if (webview.id === 'webviewId1') {
webview.evalJS(`doUpdateUnreadNum('${data.unread_num}')`)
}
})
} else {
document.addEventListener('plusready', () => {
let OAWebView = plus.webview.all()
OAWebView.forEach((webview) => {
if (webview.id === 'webviewId1') {
webview.evalJS(`doUpdateUnreadNum('${data.unread_num}')`)
}
})
})
}
this.items = data.items.map((item) => { this.items = data.items.map((item) => {
const value = formatTalkItem(item) const value = formatTalkItem(item)

View File

@ -0,0 +1,2 @@
## 1.0.02023-09-05
实现基础功能

View File

@ -0,0 +1,130 @@
<template>
<view :style="[boxStyel]" class="box">
<view class="audio-style" :style="[audioStyel]" :class="{ 'animation': isPlay }">
<view class="small" :style="{'background-color': color}"></view>
<view class="middle" :style="{'border-right-color': color}"></view>
<view class="large" :style="{'border-right-color': color}"></view>
</view>
</view>
</template>
<script>
export default {
emits: [],
props: {
isPlay: {
type: [Boolean],
default: false
},
direction: {
type: String,
default: 'right'
},
size: {
type: Number,
default: 24
},
color: {
type: String,
default: '#222'
}
},
data() {
return {
};
},
computed: {
audioStyel() {
return {
transform: `scale(${this.size / 24})`
};
},
boxStyel() {
const directDic = { right: '0deg', bottom: '90deg', left: '180deg', top: '270deg' };
const dir = directDic[this.direction || 'left'];
const style = {
transform: `rotate(${dir})`,
width: this.size + 'px',
height: this.size + 'px'
};
return style;
}
},
methods: {}
};
</script>
<style lang="scss" scoped>
view{
box-sizing: border-box;
}
.box {
// border: 1px solid #4c4c4c;
display: inline-flex;
align-items: center;
justify-content: center;
overflow: hidden;
}
.audio-style {
display: flex;
align-items: center;
justify-content: center;
overflow: hidden;
& > view {
border: 2px solid transparent;
border-radius: 50%;
}
}
.small {
border: 0px solid;
width: 3px;
height: 3px;
}
.middle {
width: 16px;
height: 16px;
margin-left: -11px;
opacity: 1;
}
.large {
width: 24px;
height: 24px;
margin-left: -19px;
opacity: 1;
}
.animation {
.middle {
animation: middle 1.2s ease-in-out infinite;
}
.large {
animation: large 1.2s ease-in-out infinite;
}
}
//
@keyframes middle {
0% {
opacity: 0;
}
10% {
opacity: 1;
}
100% {
opacity: 0;
}
}
@keyframes large {
0% {
opacity: 0;
}
50% {
opacity: 1;
}
60% {
opacity: 0;
}
100% {
opacity: 0;
}
}
</style>

View File

@ -0,0 +1,83 @@
{
"id": "a-trumpet",
"displayName": "纯css语音播放语音聊天播放小喇叭动画组件",
"version": "1.0.0",
"description": "纯css语音播放语音聊天播放小喇叭动画组件",
"keywords": [
"a-trumpet",
"语音播报",
"播放小喇叭",
"动画"
],
"repository": "",
"engines": {
},
"dcloudext": {
"type": "component-vue",
"sale": {
"regular": {
"price": "0.00"
},
"sourcecode": {
"price": "0.00"
}
},
"contact": {
"qq": ""
},
"declaration": {
"ads": "无",
"data": "无",
"permissions": "无"
},
"npmurl": ""
},
"uni_modules": {
"dependencies": [],
"encrypt": [],
"platforms": {
"cloud": {
"tcb": "y",
"aliyun": "y"
},
"client": {
"Vue": {
"vue2": "y",
"vue3": "y"
},
"App": {
"app-vue": "y",
"app-nvue": "y"
},
"H5-mobile": {
"Safari": "y",
"Android Browser": "y",
"微信浏览器(Android)": "y",
"QQ浏览器(Android)": "y"
},
"H5-pc": {
"Chrome": "y",
"IE": "y",
"Edge": "y",
"Firefox": "y",
"Safari": "y"
},
"小程序": {
"微信": "y",
"阿里": "y",
"百度": "y",
"字节跳动": "y",
"QQ": "y",
"钉钉": "y",
"快手": "y",
"飞书": "y",
"京东": "y"
},
"快应用": {
"华为": "y",
"联盟": "y"
}
}
}
}
}

View File

@ -0,0 +1,18 @@
# a-trumpet
## 用法
```html
<a-trumpet :isPlay="isplay"></a-trumpet>
<a-trumpet :isPlay="isplay" color="#1100ff"></a-trumpet>
<a-trumpet :isPlay="isplay" :size="50"></a-trumpet>
<a-trumpet :isPlay="isplay" direction="right"></a-trumpet>
```
## 属性说明:
| 属性名 | 类型 | 默认值 | 说明 |
| ---- | ---- | ---- | ---- |
| isplay | Boolean | false | 是否播放动画 |
| size | Number | 24 | 宽高的尺寸 |
| color | String | #222 | 颜色 |
| direction | String | top、bottom、left、ringt| 方向,上下左右 |

View File

@ -160,7 +160,7 @@ import 'recorder-core/src/engine/mp3-engine'
import 'recorder-core/src/extensions/waveview' import 'recorder-core/src/extensions/waveview'
import recordCancelBg from '@/static/image/record/chat-voice-animation-bg-red.png' import recordCancelBg from '@/static/image/record/chat-voice-animation-bg-red.png'
// #endif // #endif
import { multiplication } from '@/utils/common' import { multiplication, handleFindWebview } from '@/utils/common'
export default { export default {
name: 'nbVoiceRecord', name: 'nbVoiceRecord',
/** /**
@ -355,7 +355,11 @@ export default {
// }, 1000) // }, 1000)
if (Number(permissionStatus) === 1) { if (Number(permissionStatus) === 1) {
that.continueAppMicro() that.continueAppMicro()
} else if (Number(permissionStatus) === -1) { } else if (
Number(permissionStatus) === -1 ||
(Number(permissionStatus) === 0 &&
uni.getSystemInfoSync().osName === 'ios')
) {
uni.showModal({ uni.showModal({
title: '提示', title: '提示',
content: '检测到您还未授权麦克风哦', content: '检测到您还未授权麦克风哦',
@ -364,12 +368,10 @@ export default {
cancelText: '保持拒绝', cancelText: '保持拒绝',
success: ({ confirm, cancel }) => { success: ({ confirm, cancel }) => {
if (confirm) { if (confirm) {
let OAWebView = plus.webview.all() handleFindWebview(`handleRequestAndroidPermission('settings')`)
OAWebView.forEach((webview, index) => { }
if (webview.id === 'webviewId1') { if (cancel) {
webview.evalJS(`handleRequestAndroidPermission('settings')`) that.isCheckingPermission = false
}
})
} }
}, },
}) })
@ -451,12 +453,7 @@ export default {
// #endif // #endif
// #ifdef H5 // #ifdef H5
if (typeof plus !== 'undefined') { if (typeof plus !== 'undefined') {
let OAWebView = plus.webview.all() handleFindWebview(`handleRequestAndroidPermission('micro')`)
OAWebView.forEach((webview, index) => {
if (webview.id === 'webviewId1') {
webview.evalJS(`handleRequestAndroidPermission('micro')`)
}
})
} else { } else {
that.continueAppMicro(isFirstRequestPer) that.continueAppMicro(isFirstRequestPer)
} }

View File

@ -214,6 +214,27 @@ export function handleSetWebviewStyle(hasTabBar) {
} }
} }
//遍历所有的webview并通信
export function handleFindWebview(evalJS_) {
const findWebview = () => {
let allWebView = plus.webview.all()
allWebView.forEach((webview) => {
//由于webviewId后面的数字是动态分配的在很小情况下OAWebview的Id并不是webviewId1
//因此不做限制,全局广播,由接收页面自行接收处理
// if (webview.id === 'webviewId1') {//找到OAWebview
webview.evalJS(evalJS_)
// }
})
}
if (typeof plus !== 'undefined') {
findWebview()
} else {
document.addEventListener('plusready', () => {
findWebview()
})
}
}
// 通用运算函数 // 通用运算函数
/* /*
函数加法函数用来得到精确的加法结果 函数加法函数用来得到精确的加法结果
@ -223,16 +244,16 @@ export function handleSetWebviewStyle(hasTabBar) {
返回值两数相加的结果 返回值两数相加的结果
*/ */
export function addition(arg1, arg2) { export function addition(arg1, arg2) {
arg1 = arg1.toString(), arg2 = arg2.toString(); ;(arg1 = arg1.toString()), (arg2 = arg2.toString())
var arg1Arr = arg1.split("."), var arg1Arr = arg1.split('.'),
arg2Arr = arg2.split("."), arg2Arr = arg2.split('.'),
d1 = arg1Arr.length == 2 ? arg1Arr[1] : "", d1 = arg1Arr.length == 2 ? arg1Arr[1] : '',
d2 = arg2Arr.length == 2 ? arg2Arr[1] : ""; d2 = arg2Arr.length == 2 ? arg2Arr[1] : ''
var maxLen = Math.max(d1.length, d2.length); var maxLen = Math.max(d1.length, d2.length)
var m = Math.pow(10, maxLen); var m = Math.pow(10, maxLen)
var result = Number(((arg1 * m + arg2 * m) / m).toFixed(maxLen)); var result = Number(((arg1 * m + arg2 * m) / m).toFixed(maxLen))
var d = arguments[2]; var d = arguments[2]
return typeof d === "number" ? Number((result).toFixed(d)) : result; return typeof d === 'number' ? Number(result.toFixed(d)) : result
} }
/* /*
@ -251,12 +272,20 @@ export function addition(arg1, arg2) {
返回值两数相乘的结果 返回值两数相乘的结果
*/ */
export function multiplication(arg1, arg2) { export function multiplication(arg1, arg2) {
var r1 = arg1.toString(), var r1 = arg1.toString(),
r2 = arg2.toString(), r2 = arg2.toString(),
m, resultVal, d = arguments[2]; m,
m = (r1.split(".")[1] ? r1.split(".")[1].length : 0) + (r2.split(".")[1] ? r2.split(".")[1].length : 0); resultVal,
resultVal = Number(r1.replace(".", "")) * Number(r2.replace(".", "")) / Math.pow(10, m); d = arguments[2]
return typeof d !== "number" ? Number(resultVal) : Number(resultVal.toFixed(parseInt(d))); m =
(r1.split('.')[1] ? r1.split('.')[1].length : 0) +
(r2.split('.')[1] ? r2.split('.')[1].length : 0)
resultVal =
(Number(r1.replace('.', '')) * Number(r2.replace('.', ''))) /
Math.pow(10, m)
return typeof d !== 'number'
? Number(resultVal)
: Number(resultVal.toFixed(parseInt(d)))
} }
/* /*
@ -267,10 +296,18 @@ export function multiplication(arg1, arg2) {
返回值arg1除于arg2的结果 返回值arg1除于arg2的结果
*/ */
export function division(arg1, arg2) { export function division(arg1, arg2) {
var r1 = arg1.toString(), var r1 = arg1.toString(),
r2 = arg2.toString(), r2 = arg2.toString(),
m, resultVal, d = arguments[2]; m,
m = (r2.split(".")[1] ? r2.split(".")[1].length : 0) - (r1.split(".")[1] ? r1.split(".")[1].length : 0); resultVal,
resultVal = Number(r1.replace(".", "")) / Number(r2.replace(".", "")) * Math.pow(10, m); d = arguments[2]
return typeof d !== "number" ? Number(resultVal) : Number(resultVal.toFixed(parseInt(d))); m =
(r2.split('.')[1] ? r2.split('.')[1].length : 0) -
(r1.split('.')[1] ? r1.split('.')[1].length : 0)
resultVal =
(Number(r1.replace('.', '')) / Number(r2.replace('.', ''))) *
Math.pow(10, m)
return typeof d !== 'number'
? Number(resultVal)
: Number(resultVal.toFixed(parseInt(d)))
} }