Commit 344f8f2d by qlintonger xeno

尝试添加截图标注+5

parent 6b6b27ca
...@@ -296,6 +296,7 @@ export class AgoraHandle { ...@@ -296,6 +296,7 @@ export class AgoraHandle {
case 'MarkBg': { case 'MarkBg': {
console.log('某人要求截图', msgData) console.log('某人要求截图', msgData)
chatChannelState.value.screenshotInitiatorId = msgData.msgData.initId; chatChannelState.value.screenshotInitiatorId = msgData.msgData.initId;
chatChannelState.value.displayImageEditor = true;
chatChannelState.value.screenshotURL = msgData.msgData.url; chatChannelState.value.screenshotURL = msgData.msgData.url;
break break
} }
...@@ -314,6 +315,7 @@ export class AgoraHandle { ...@@ -314,6 +315,7 @@ export class AgoraHandle {
chatChannelState.value.screenshotInitiatorId = '' chatChannelState.value.screenshotInitiatorId = ''
chatChannelState.value.screenshotRecord = {} chatChannelState.value.screenshotRecord = {}
chatChannelState.value.screenshotURL = '' chatChannelState.value.screenshotURL = ''
chatChannelState.value.displayImageEditor = false;
break break
} }
case 'EndScreenShareMark': { case 'EndScreenShareMark': {
......
...@@ -23,4 +23,5 @@ export function clearStateOfChatChannel() { ...@@ -23,4 +23,5 @@ export function clearStateOfChatChannel() {
chatChannelState.value.screenshotRecord = {}; chatChannelState.value.screenshotRecord = {};
chatChannelState.value.screenCaptureRecord = {}; chatChannelState.value.screenCaptureRecord = {};
chatChannelState.value.messageQueue = []; chatChannelState.value.messageQueue = [];
chatChannelState.value.displayImageEditor = false;
} }
\ No newline at end of file
...@@ -23,7 +23,8 @@ export const chatChannelState = ref({ ...@@ -23,7 +23,8 @@ export const chatChannelState = ref({
screenshotURL: "", screenshotURL: "",
screenshotRecord: {}, screenshotRecord: {},
screenCaptureRecord: {}, screenCaptureRecord: {},
messageQueue: [] messageQueue: [],
displayImageEditor: false
}) })
export const isUserHost = computed(function () { export const isUserHost = computed(function () {
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
:pass-in-records="screenshotRecord" :pass-in-records="screenshotRecord"
:record-listener="recordListener" :record-listener="recordListener"
:show-quit="isScreenShotByCurrentUser" :show-quit="isScreenShotByCurrentUser"
:start="displayImageEditor" :start="chatChannelState.displayImageEditor"
:target="firstVideoToBeAttached" :target="firstVideoToBeAttached"
:url-image="chatChannelState.screenshotURL" :url-image="chatChannelState.screenshotURL"
@cancel="reallyEndMarkHandle" @cancel="reallyEndMarkHandle"
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
</div> </div>
<div class="w-[120px] h-[72px] item" @click="startScreenShotDraw"> <div class="w-[120px] h-[72px] item" @click="startScreenShotDraw">
<global-icon :size="21" icon="screenshot"></global-icon> <global-icon :size="21" icon="screenshot"></global-icon>
<span class="mt-1 color-text-2">{{ !displayImageEditor ? '截图' : '正在截图' }}</span> <span class="mt-1 color-text-2">{{ !chatChannelState.displayImageEditor ? '截图' : '正在截图' }}</span>
</div> </div>
<div class="w-[120px] h-[72px] item" @click="toggleScreenShare"> <div class="w-[120px] h-[72px] item" @click="toggleScreenShare">
<global-icon :size="21" icon="shared-screen"></global-icon> <global-icon :size="21" icon="shared-screen"></global-icon>
...@@ -110,7 +110,6 @@ const ps = defineProps<{ ...@@ -110,7 +110,6 @@ const ps = defineProps<{
}>() }>()
const firstVideoToBeAttached = ref('[data-self="remote-main"] video'); const firstVideoToBeAttached = ref('[data-self="remote-main"] video');
const displayImageEditor = ref(false)
const recordListener = function(records: any) { const recordListener = function(records: any) {
AnyR?.agora.continueMark(records) AnyR?.agora.continueMark(records)
} }
...@@ -119,11 +118,10 @@ function reallyEndMarkHandle() { ...@@ -119,11 +118,10 @@ function reallyEndMarkHandle() {
if (isScreenShotByCurrentUser.value) { if (isScreenShotByCurrentUser.value) {
AnyR?.agora.endMark() AnyR?.agora.endMark()
} }
displayImageEditor.value = false
} }
function initialPaintDone(blob: any) { function initialPaintDone(blob: any) {
if (!chatChannelState.value.screenshotInitiatorId && displayImageEditor.value) { if (!chatChannelState.value.screenshotInitiatorId && chatChannelState.value.displayImageEditor) {
AnyR?.agora.startMark(blob, 'temp.png') AnyR?.agora.startMark(blob, 'temp.png')
console.log('发送画画png完成') console.log('发送画画png完成')
} }
...@@ -160,8 +158,8 @@ function startScreenShotDraw() { ...@@ -160,8 +158,8 @@ function startScreenShotDraw() {
if (allOtherChattersIdSet.value.length === 0 || !document.querySelector('[data-self="remote-main"] video')) { if (allOtherChattersIdSet.value.length === 0 || !document.querySelector('[data-self="remote-main"] video')) {
return Message.error('无截图目标') return Message.error('无截图目标')
} }
if (!displayImageEditor.value && !chatChannelState.value.screenshotInitiatorId) { if (!chatChannelState.value.displayImageEditor && !chatChannelState.value.screenshotInitiatorId) {
displayImageEditor.value = true chatChannelState.value.displayImageEditor = true
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment