sync with vue-pc-chat

siqiii · siqiii · commit e8acc57bf66d · 2025-03-12T15:34:04.000+08:00
diff --git a/src/main.js b/src/main.js
@@ -70,6 +70,9 @@ app.use(CoolLightBox)
                 subWindowLoadDataOptions.loadFriendList = true
                 subWindowLoadDataOptions.loadDefaultConversationList = true
             }
+            if ( path.startsWith('/workspace')) {
+                subWindowLoadDataOptions.loadFriendList = true
+            }
             store.init(false, subWindowLoadDataOptions);
         }
         // web
diff --git a/src/store.js b/src/store.js
@@ -3,7 +3,7 @@ import Vue from 'vue'
 import wfc from "./wfc/client/wfc";
 import EventType from "./wfc/client/wfcEvent";
 import ConversationType from "./wfc/model/conversationType";
-import {eq, gt, numberValue} from "./wfc/util/longUtil";
+import {eq, gt, lt, numberValue} from "./wfc/util/longUtil";
 import helper from "./ui/util/helper";
 import convert from './vendor/pinyin'
 import GroupType from "./wfc/model/groupType";
@@ -249,8 +249,14 @@ let store = {
                 if (msgIndex > -1) {
                     // FYI: https://v2.vuejs.org/v2/guide/reactivity#Change-Detection-Caveats
                     conversationState.currentConversationMessageList.splice(msgIndex, 1, msg);
-                    console.log('msg duplicate')
+                    console.log('msg duplicate, update message')
                     return;
+                } else {
+                    let firstMsg = conversationState.currentConversationMessageList[0];
+                    if(firstMsg && lt(msg.timestamp, firstMsg.timestamp)) {
+                        console.log('msg timestamp is less than first msg, maybe update old message content, ignore')
+                        return;
+                    }
                 }
 
                 conversationState.currentConversationMessageList.push(msg);
@@ -592,11 +598,11 @@ let store = {
 
         if (conversationState.currentConversationInfo && conversationState.currentConversationInfo.conversation.equal(conversation)) {
             let isClearConversationMessageHistory = !conversationInfo.lastMessage && !!conversationState.currentConversationInfo.lastMessage;
-            conversationState.currentConversationInfo = conversationInfo;
             // 清除聊天记录
             if (isClearConversationMessageHistory) {
                 conversationState.currentConversationMessageList = [];
             }
+            conversationState.currentConversationInfo = conversationInfo;
         }
 
         // sort
diff --git a/src/ui/common/Alert.js b/src/ui/common/Alert.js
@@ -24,6 +24,7 @@ export default {
             this.$modal.show(
                 AlertView,
                 {
+                    name: options.name ? options.name : 'alert-modal',
                     showIcon: showIcon,
                     title: options.title,
                     content: options.content,
@@ -32,7 +33,7 @@ export default {
                 },
                 null,
                 {
-                    name: 'alert-modal',
+                    name: options.name ? options.name : 'alert-modal',
                     clickToClose: true,
                     adaptive: true,
                     width: 260,
diff --git a/src/ui/common/AlertView.vue b/src/ui/common/AlertView.vue
@@ -16,6 +16,11 @@
 export default {
     name: "AlertView",
     props: {
+        name: {
+            type: String,
+            required: true,
+            default: '',
+        },
         showIcon: {
             type: Boolean,
             required: false,
@@ -53,11 +58,11 @@ export default {
     },
     methods: {
         cancel() {
-            this.$modal.hide('alert-modal', {cancel: true})
+            this.$modal.hide(this.name, {cancel: true})
         },
 
         confirm() {
-            this.$modal.hide('alert-modal', {confirm: true})
+            this.$modal.hide(this.name, {confirm: true})
         },
     }
 }
diff --git a/src/ui/main/conversation/MessageInputView.vue b/src/ui/main/conversation/MessageInputView.vue
@@ -53,6 +53,9 @@
                         <li v-if="!inputOptions['disableVideoCall']">
                             <i @click="startVideoCall" class="icon-ion-ios-videocam"/>
                         </li>
+                        <li v-if="sharedMiscState.isElectron && !inputOptions['disableVideoCall'] && conversationInfo.conversation.type === 0">
+                            <i @click="requestRemoteControl" class="icon-ion-android-desktop"/>
+                        </li>
                     </template>
                     <li v-if="!inputOptions['disableChannelMenu'] && conversationInfo.conversation.type === 3 && conversationInfo.conversation._target.menus && conversationInfo.conversation._target.menus.length">
                         <i @click="toggleChannelMenu" class="icon-ion-android-menu"/>
@@ -133,6 +136,8 @@ import TypingMessageContent from "../../../wfc/messages/typingMessageContent";
 import {currentWindow, fs} from "../../../platform";
 import {vOnClickOutside} from '@vueuse/components'
 import SendMixMediaMessageView from "../view/SendMixMediaMessageView.vue";
+import avenginekitproxy from "../../../wfc/av/engine/avenginekitproxy";
+import avenginekit from "../../../wfc/av/internal/engine.min";
 
 export default {
     name: "MessageInputView",
@@ -557,6 +562,23 @@ export default {
             this.$startVoipCall({audioOnly: false, conversation: conversation});
         },
 
+        requestRemoteControl(){
+            if(avenginekit.startConference){
+                if(process.platform === 'linux'){
+                    this.$notify({
+                        text:'远程协助，目前只支持 Windows 和 macOS',
+                        type:'error',
+                    })
+                    return
+                }
+                avenginekitproxy.requestRemoteControl(this.conversationInfo.conversation);
+            }else {
+                this.$notify({
+                    text:'需要高级版音视频才支持远程协助',
+                    type:'error',
+                })
+            }
+        },
         toggleChannelMenu(toggle = true) {
             if (toggle) {
                 this.$parent.$refs['conversationMessageList'].style.flexGrow = 1;
diff --git a/src/ui/voip/ScreenOrWindowPicker.vue b/src/ui/voip/ScreenOrWindowPicker.vue
@@ -1,7 +1,7 @@
 <template>
     <section class="screen-window-picker-container" ref="contentContainer">
-        <h2 class="title">选择要分享什么</h2>
-        <p class="desc">WFC想分享您屏幕上的内容</p>
+        <h2 class="title">{{ title }}</h2>
+        <p class="desc">{{ desc }}</p>
         <div class="category-container">
             <div class="category" v-bind:class="{active:this.currentCategory === 'screen'}"
                  @click="setCategory('screen')">
@@ -48,6 +48,23 @@ import IpcEventType from "../../ipcEventType";
 
 export default {
     name: "ScreenOrWindowPicker",
+    props: {
+        title: {
+            type: String,
+            required: false,
+            default: "选择要分享什么"
+        },
+        desc: {
+            type: String,
+            required: false,
+            default: "WFC想分享您屏幕上的内容"
+        },
+        types: {
+            type: Array,
+            required: false,
+            default: ['screen', 'window']
+        }
+    },
     data() {
         return {
             currentCategory: 'screen', // window
@@ -95,8 +112,7 @@ export default {
     },
 
     mounted() {
-        let types = ['screen', 'window'];
-        ipcRenderer.invoke(IpcEventType.GET_SOURCE, {types: types, thumbnailSize: {width: 200, height: 200}, fetchWindowIcons: true})
+        ipcRenderer.invoke(IpcEventType.GET_SOURCE, {types: this.types, thumbnailSize: {width: 200, height: 200}, fetchWindowIcons: true})
             .then(sources => {
                 this.screenSources = sources.filter(source => source.id.startsWith('screen'))
                 this.windowSources = sources.filter(source => source.id.startsWith('window'))
diff --git a/src/ui/voip/ScreenShareControlView.vue b/src/ui/voip/ScreenShareControlView.vue
@@ -19,8 +19,8 @@
             <p>开启视频</p>
         </div>
         <div class="action">
-            <img @click="stopScreenShare" class="action-img" src='@/assets/images/av_video_answer.png'/>
-            <p>结束共享</p>
+            <img @click="stopScreenShare" class="action-img" src='@/assets/images/av_hang_up.png'/>
+            <p>{{ stopScreenShareTitle}}</p>
         </div>
     </div>
 
@@ -38,6 +38,15 @@ export default {
             type: String,
             default: null,
         },
+        stopScreenShareTitle: {
+            type: String,
+            required: false,
+            default: '结束共享',
+        },
+        stopScreenShareFunc: {
+            type: Function,
+            required: false,
+        }
     },
     data() {
         return {
@@ -88,6 +97,10 @@ export default {
         },
 
         stopScreenShare() {
+            if (this.stopScreenShareFunc) {
+                this.stopScreenShareFunc();
+                return
+            }
             console.log('stopScreenShare', this.session);
             this.session.stopScreenShare();
             console.log('stopScreenShare', this.session.videoMuted, this.session.audioMuted);
diff --git a/src/wfc/av/engine/avenginekit.js b/src/wfc/av/engine/avenginekit.js
@@ -33,6 +33,12 @@ export default class WfcAVEngineKit {
      */
     static SCREEN_SHARING_REPLACE_MODE = true;
 
+    /**
+     * 是否启用 datachannel
+     * @type {boolean}
+     */
+    static ENABLE_DATA_CHANNEL = false
+
     /**
      禁止双流模式下，小流低帧率。默认为false，小流的帧率为8fps。当为true时使用 {@link SMALL_STREAM_FPS}， 或者使用同大流一样的帧率
      */
@@ -67,6 +73,11 @@ export default class WfcAVEngineKit {
      */
 
     static FORCE_MEDIA_OVER_TCP = false;
+    /**
+     * 没有麦克风和音频输出设备时，是否允许发起或参加音视频通话
+     * @type {boolean}
+     */
+    static ENABLE_VOIP_WHEN_NO_MIC_AND_SPEAKER= true;
 
     /**
      * 高级版音视频 SDK 有效
diff --git a/src/wfc/av/engine/avenginekitproxy.js b/src/wfc/av/engine/avenginekitproxy.js
@@ -86,6 +86,9 @@ export class AvEngineKitProxy {
         let content = message.content;
 
         let msg = wfc.getMessageByUid(messageUid);
+        if (!msg) {
+            return
+        }
         let orgContent = msg.messageContent;
         orgContent.connectTime = content.connectTime ? content.connectTime : orgContent.connectTime;
         orgContent.endTime = content.endTime ? content.endTime : orgContent.endTime;
@@ -169,6 +172,10 @@ export class AvEngineKitProxy {
             console.log('not enable multi call ');
             return;
         }
+        if (!isElectron() && msg.messageContent === MessageContentType.VOIP_REMOTE_CONTROL_REQUEST) {
+            console.log('only pc support remote control');
+            return;
+        }
         let now = (new Date()).valueOf();
         let delta = wfc.getServerDeltaTime();
         if (now - (numberValue(msg.timestamp) - delta) >= 90 * 1000) {
@@ -193,7 +200,7 @@ export class AvEngineKitProxy {
                     this.onVoipCallErrorCallback && this.onVoipCallErrorCallback(-1);
                 }
             }
-            if (!this.isSupportVoip || !this.hasMicrophone || !this.hasSpeaker) {
+            if (!this.isSupportVoip || (!WfcAVEngineKit.ENABLE_VOIP_WHEN_NO_MIC_AND_SPEAKER && (!this.hasSpeaker || !this.hasMicrophone))) {
                 this.onVoipCallErrorCallback && this.onVoipCallErrorCallback(-2);
                 return;
             }
@@ -241,6 +248,9 @@ export class AvEngineKitProxy {
                     }
                     if (!this.callWin) {
                         if (this.conversation) {
+                            msg.participantUserInfos = participantUserInfos;
+                            msg.selfUserInfo = selfUserInfo;
+                            msg.timestamp = longValue(numberValue(msg.timestamp) - delta)
                             this.showCallUI(msg.conversation, false, {
                                 event: 'message',
                                 args: msg
@@ -369,7 +379,7 @@ export class AvEngineKitProxy {
             return;
         }
         console.log(`startCall speaker、microphone、webcam检测结果分别为：${this.hasSpeaker} , ${this.hasMicrophone}, ${this.hasWebcam}，如果不全为true，请检查硬件设备是否正常，否则通话可能存在异常`)
-        if (!this.isSupportVoip || !this.hasSpeaker || !this.hasMicrophone) {
+        if (!this.isSupportVoip || (!WfcAVEngineKit.ENABLE_VOIP_WHEN_NO_MIC_AND_SPEAKER && (!this.hasSpeaker || !this.hasMicrophone))) {
             console.log('not support voip', this.isSupportVoip, this.hasSpeaker, this.hasMicrophone, this.hasWebcam);
             this.onVoipCallErrorCallback && this.onVoipCallErrorCallback(-2);
             return;
@@ -428,7 +438,7 @@ export class AvEngineKitProxy {
             this.onVoipCallErrorCallback && this.onVoipCallErrorCallback(-1);
             return;
         }
-        if (!this.isSupportVoip || !this.hasSpeaker || !this.hasMicrophone) {
+        if (!this.isSupportVoip || (!WfcAVEngineKit.ENABLE_VOIP_WHEN_NO_MIC_AND_SPEAKER && (!this.hasSpeaker || !this.hasMicrophone))) {
             console.log('not support voip', this.isSupportVoip, this.hasSpeaker);
             this.onVoipCallErrorCallback && this.onVoipCallErrorCallback(-2);
             return;
@@ -488,7 +498,7 @@ export class AvEngineKitProxy {
             this.onVoipCallErrorCallback && this.onVoipCallErrorCallback(-1);
             return;
         }
-        if (!this.isSupportVoip || !this.hasSpeaker || !this.hasMicrophone) {
+        if (!this.isSupportVoip || (!WfcAVEngineKit.ENABLE_VOIP_WHEN_NO_MIC_AND_SPEAKER && (!this.hasSpeaker || !this.hasMicrophone))) {
             console.log('not support voip', this.isSupportVoip, this.hasSpeaker, this.hasMicrophone);
             this.onVoipCallErrorCallback && this.onVoipCallErrorCallback(-2);
             return;
diff --git a/src/wfc/av/engine/subscriber.js b/src/wfc/av/engine/subscriber.js
@@ -14,6 +14,9 @@ export default class Subscriber {
     audience = false;
     currentVideoType;
 
+    // 单向，只能用来对方发送来的数据，需要向其他人发送数据时，需要使用 publisherImpl.dataChannel
+    dataChannel
+
     constructor (userId) {
         this.userId = userId;
     }
diff --git a/src/wfc/av/internal/engine-conference.min.js b/src/wfc/av/internal/engine-conference.min.js
diff --git a/src/wfc/client/wfc.js b/src/wfc/client/wfc.js
@@ -1950,7 +1950,7 @@ export class WfcManager {
 
     /**
      *
-     * 群里面是否开启了已送达报告和已读报告功能
+     * 是否开启了群组已读报告功能
      * @return {boolean}
      */
     isGroupReceiptEnabled() {
@@ -2010,7 +2010,7 @@ export class WfcManager {
     }
 
     /**
-     *
+     * 获取会话的阅读状态。
      * @param conversation
      * @return {Map<string, Long>}
      */

Original file line number	Diff line number	Diff line change
`@@ -70,6 +70,9 @@ app.use(CoolLightBox)`
`70`	`70`	`subWindowLoadDataOptions.loadFriendList = true`
`71`	`71`	`subWindowLoadDataOptions.loadDefaultConversationList = true`
`72`	`72`	`}`
	`73`	`+ if ( path.startsWith('/workspace')) {`
	`74`	`+ subWindowLoadDataOptions.loadFriendList = true`
	`75`	`+ }`
`73`	`76`	`store.init(false, subWindowLoadDataOptions);`
`74`	`77`	`}`
`75`	`78`	`// web`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,9 @@ export default class Subscriber {`
`14`	`14`	`audience = false;`
`15`	`15`	`currentVideoType;`
`16`	`16`
	`17`	`+ // 单向，只能用来对方发送来的数据，需要向其他人发送数据时，需要使用 publisherImpl.dataChannel`
	`18`	`+ dataChannel`
	`19`	`+`
`17`	`20`	`constructor (userId) {`
`18`	`21`	`this.userId = userId;`
`19`	`22`	`}`