mdm-client 1.0.2 → 1.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mdm-client",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "private": false,
   "main": "index.js",
   "author": {

package/src/App.vue

@@ -16,6 +16,7 @@
     <LiveMulti
       :inviteList="inviteList"
       :deviceList="deviceList"
+      :meetingTerminals="meetingTerminals"
       :inviteData="inviteData"
       :tempRoomName="tempRoomName"
       :tempRoomNum="tempRoomNum"
@@ -26,8 +27,7 @@
       :org="org"
       :baseUrl="baseUrl"
       :token="token"
-      :defaultInviteWay="defaultInviteWay"
-      :isCustomizeMiniInvitations="isCustomizeMiniInvitations"
+      :addressBookTabList="['人员', '会议终端', 'volte', '设备']"
       ref="liveMultiRef"
       @inviteReceiveClose="closeMultiInviteReceive"
     />
@@ -36,37 +36,37 @@
 
 <script>
 import { mittBus, ShowMessage } from "./utils/index.js";
-import LiveClient from './utils/livekit/live-client-esm.js';
+import LiveClient from "./utils/livekit/live-client-esm.js";
 
 export default {
-  name: 'App',
+  name: "App",
   data() {
     return {
       livePointRef: null,
       liveMultiRef: null,
       isCallBoardShow: false,
       isMeetingReadyDialogShow: false,
-      tempRoomName: '',
-      tempRoomNum: '',
-      meetingReadyDialogType: 'launch',
-      defaultCallNum: '',
+      tempRoomName: "",
+      tempRoomNum: "",
+      meetingReadyDialogType: "launch",
+      defaultCallNum: "",
       inviteList: [],
       deviceList: [],
+      meetingTerminals: [],
       userData: {
-        userId: 'liujinbo',
-        username: 'test01',
-        mobile: '18151665421',
-        officeName: 'test_department',
+        userId: "liujinbo",
+        username: "test01",
+        mobile: "18151665421",
+        officeName: "test_department",
       },
-      org: '7906019982501000',
+      org: "7906019982501000",
       isPointInviteReceiveShow: false,
       isMultiInviteReceiveShow: false,
       inviteData: {},
-      defaultInviteWay: 'identity',
-      isCustomizeMiniInvitations: false,
       baseUrl: "https://10.2.12.103:8443",
       roomServerUrl: "wss://10.2.12.103:8443",
-      token: "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJMb2dpbkluZm8iOnsibG9naW5Db2RlIjoibGl1amluYm8iLCJ1c2VyTmFtZSI6IuWImOmUpuazoiIsInRlbmFudElEIjo3OTA2MDE5OTgyNTAxMDAwLCJkZXB0VHJlZSI6Ijc5MDYwNzA4NTA5MDEwMDAvNzkwNzk1MzkyNjcwMTAwMCIsInVzZXJJRCI6NzkwNjI1NzUyOTgwMTAwMCwicm9sZUlEIjo3OTA2MDc0MzkyMDAxMDAwLCJ2ZXJzaW9uSUQiOjc5MDc5NDk3NjQyMDEwMDB9LCJwbGF0Zm9ybUlEIjowLCJwaG9uZSI6IiIsImV4cCI6MTc1NTg4NDExNCwiaWF0IjoxNzU1MTY0MTE0fQ.NXXtuVG6ZxRObwwEsQzZpwKGiD6YN4vVVn2ojz_syNk",
+      token:
+        "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJMb2dpbkluZm8iOnsibG9naW5Db2RlIjoibGl1amluYm8iLCJ1c2VyTmFtZSI6IuWImOmUpuazoiIsInRlbmFudElEIjo3OTA2MDE5OTgyNTAxMDAwLCJkZXB0VHJlZSI6Ijc5MDYwNzA4NTA5MDEwMDAvNzkwNzk1MzkyNjcwMTAwMCIsInVzZXJJRCI6NzkwNjI1NzUyOTgwMTAwMCwicm9sZUlEIjo3OTA2MDc0MzkyMDAxMDAwLCJ2ZXJzaW9uSUQiOjc5MDc5NDk3NjQyMDEwMDB9LCJwbGF0Zm9ybUlEIjowLCJwaG9uZSI6IiIsImV4cCI6MTc2MzIxNjUyNSwiaWF0IjoxNzYyNDk2NTI1fQ.FEGXEUhOfOC0nqKr9oaARnbzrqhGW8iE7WixaapiXXE",
       liveClient: null,
       showMessage: null,
     };
@@ -83,11 +83,10 @@ export default {
   },
   methods: {
     launchMultiMeeting(e) {
-      this.meetingReadyDialogType = 'launch';
+      this.meetingReadyDialogType = "launch";
       this.inviteList = e?.inviteList ? e.inviteList : [];
       this.deviceList = e?.deviceList ? e.deviceList : [];
-      this.defaultInviteWay = e?.defaultInviteWay || 'identity';
-      this.isCustomizeMiniInvitations = e?.isCustomizeMiniInvitations || false;
+      this.meetingTerminals = e?.meetingTerminals ? e.meetingTerminals : [];
       this.isMeetingReadyDialogShow = true;
     },
     multiMeetingAppeInvite(e) {
@@ -96,12 +95,12 @@ export default {
       }
     },
     joinMultiMeeting(e) {
-      this.meetingReadyDialogType = 'join';
+      this.meetingReadyDialogType = "join";
       this.tempRoomNum = e.roomNum;
       this.isMeetingReadyDialogShow = true;
     },
     openCallBoardDialog(e) {
-      this.defaultCallNum = e?.defaultCallNum || '';
+      this.defaultCallNum = e?.defaultCallNum || "";
       this.isCallBoardShow = true;
     },
     openPointInviteReceive(e) {
@@ -119,22 +118,22 @@ export default {
       this.isMultiInviteReceiveShow = false;
     },
     makePointCall(e) {
-      if (e.type === 'voice') {
+      if (e.type === "voice") {
         this.$refs.livePointRef.makeVoiceCall({
-          inviteName: e?.inviteName || '',
-          invitePhone: e?.callNum || '',
+          inviteName: e?.inviteName || "",
+          invitePhone: e?.callNum || "",
           inviteType: e?.inviteType || 0,
         });
-      } else if (e.type === 'video') {
+      } else if (e.type === "video") {
         this.$refs.livePointRef.makeVideoCall({
-          inviteName: e?.inviteName || '',
-          invitePhone: e?.callNum || '',
+          inviteName: e?.inviteName || "",
+          invitePhone: e?.callNum || "",
           inviteType: e?.inviteType || 0,
         });
-      } else if (e.type === 'miniLink') {
+      } else if (e.type === "miniLink") {
         this.$refs.livePointRef.makeMiniCall({
-          inviteName: e?.inviteName || '',
-          invitePhone: e?.callNum || '',
+          inviteName: e?.inviteName || "",
+          invitePhone: e?.callNum || "",
           inviteType: e?.inviteType || 0,
         });
       }
@@ -148,7 +147,7 @@ export default {
       }
     },
     initLiveClient() {
-      this.tempRoomName = this.userData.username + '的视频会议';
+      this.tempRoomName = this.userData.username + "的视频会议";
       const initParams = {
         userId: this.userData.userId,
         org: this.org,
@@ -158,32 +157,32 @@ export default {
         roomServerUrl: this.roomServerUrl,
         token: this.token,
       };
-      console.log('initParams', initParams);
+      console.log("initParams", initParams);
       this.liveClient = new LiveClient(initParams);
       this.initLiveClientEvent();
-      window['liveClient'] = this.liveClient;
-      mittBus.emit('liveClientInitSuccess');
+      window["liveClient"] = this.liveClient;
+      mittBus.emit("liveClientInitSuccess");
     },
     initLiveClientEvent() {
       if (!this.liveClient) {
         this.showMessage.error({
-          message: 'liveClient实例未初始化',
+          message: "liveClient实例未初始化",
         });
         return;
       }
-      this.liveClient.on('socketOpen', () => {
-        console.log('websocket链接建立成功');
+      this.liveClient.on("socketOpen", () => {
+        console.log("websocket链接建立成功");
       });
-      this.liveClient.on('receiveInviteSuccess', e => {
-        console.log('收到会议邀请', e);
+      this.liveClient.on("receiveInviteSuccess", (e) => {
+        console.log("收到会议邀请", e);
         if (e.isP2P == 1) {
           this.openPointInviteReceive(e);
         } else {
           this.openMultiInviteReceive(e);
         }
       });
-      this.liveClient.on('receiveInviteCancel', e => {
-        console.log('收到会议邀请撤回', e);
+      this.liveClient.on("receiveInviteCancel", (e) => {
+        console.log("收到会议邀请撤回", e);
         if (this.isPointInviteReceiveShow && this.inviteData.roomNum === e.roomNum) {
           this.closePointInviteReceive();
         }
@@ -195,7 +194,7 @@ export default {
     removeAllEvent() {
       if (!this.liveClient) {
         this.showMessage.error({
-          message: 'liveClient实例未初始化',
+          message: "liveClient实例未初始化",
         });
         return;
       }
@@ -204,33 +203,45 @@ export default {
     resetLiveClient() {
       if (this.liveClient) {
         this.liveClient.closeSocket();
-        window['liveClient'] = null;
+        window["liveClient"] = null;
         this.liveClient = null;
       }
     },
     addBusEvent() {
-      mittBus.on('launchMultiMeeting', this.launchMultiMeeting);
-      mittBus.on('multiMeetingAppeInvite', this.multiMeetingAppeInvite);
-      mittBus.on('openPointMeetingBoard', this.openCallBoardDialog);
-      mittBus.on('launchPointMeeting', this.launchPointMeeting);
-      mittBus.on('joinMultiMeeting', this.joinMultiMeeting);
-      mittBus.on('makeCall', this.makePointCall);
-      mittBus.on('pullMonitorDevice', this.pullMonitorDevice);
+      mittBus.on("launchMultiMeeting", this.launchMultiMeeting);
+      mittBus.on("multiMeetingAppeInvite", this.multiMeetingAppeInvite);
+      mittBus.on("openPointMeetingBoard", this.openCallBoardDialog);
+      mittBus.on("launchPointMeeting", this.launchPointMeeting);
+      mittBus.on("joinMultiMeeting", this.joinMultiMeeting);
+      mittBus.on("makeCall", this.makePointCall);
+      mittBus.on("pullMonitorDevice", this.pullMonitorDevice);
     },
     removeBusEvent() {
-      mittBus.off('launchMultiMeeting', this.launchMultiMeeting);
-      mittBus.off('multiMeetingAppeInvite', this.multiMeetingAppeInvite);
-      mittBus.off('openPointMeetingBoard', this.openCallBoardDialog);
-      mittBus.off('launchPointMeeting', this.launchPointMeeting);
-      mittBus.off('joinMultiMeeting', this.joinMultiMeeting);
-      mittBus.off('makeCall', this.makePointCall);
-      mittBus.off('pullMonitorDevice', this.pullMonitorDevice);
+      mittBus.off("launchMultiMeeting", this.launchMultiMeeting);
+      mittBus.off("multiMeetingAppeInvite", this.multiMeetingAppeInvite);
+      mittBus.off("openPointMeetingBoard", this.openCallBoardDialog);
+      mittBus.off("launchPointMeeting", this.launchPointMeeting);
+      mittBus.off("joinMultiMeeting", this.joinMultiMeeting);
+      mittBus.off("makeCall", this.makePointCall);
+      mittBus.off("pullMonitorDevice", this.pullMonitorDevice);
     },
     openMeeingReadyDialog() {
       this.launchMultiMeeting({
-        inviteList: [],
-        deviceList: [],
-        defaultInviteWay: "identity",
+        // inviteList: [
+        //   {
+        //     id: "7906257529801001",
+        //     label: "利哥测试手机",
+        //     phone: "13218096827",
+        //     source: "volte",
+        //   },
+        // ],
+        // deviceList: [],
+        // meetingTerminals: [
+        //   {
+        //     id: "8960067290301000",
+        //     label: "华为会议T100",
+        //   }
+        // ],
       });
     },
   },
@@ -243,4 +254,4 @@ export default {
   height: 100%;
   text-align: center;
 }
-</style>
+</style>

package/src/assets/style/base.scss

@@ -148,6 +148,11 @@
 	--default-avatar-mini: url("../image/common/default_avatar_mini.png");
 	--yq-icon: url("../image/screenBlue/yq.png");
 	--add-icon: url("../image/screenBlue/add.png");
+	--meeting-loading-icon: url("../image/common/loading.png");
+	--rotate-icon1: url("../image/common/rotate_icon1.png");
+	--rotate-icon2: url("../image/common/rotate_icon2.png");
+	--rotate-icon3: url("../image/common/rotate_icon3.png");
+	--rotate-icon4: url("../image/common/rotate_icon4.png");
 }
 
 * {

package/src/components/LiveMulti/LiveMulti.vue

@@ -28,14 +28,16 @@
         :joinType="multiMeetingData.joinType"
         :tempInviteList="inviteList"
         :deviceList="deviceList"
-        :isCustomizeMiniInvitations="isCustomizeMiniInvitations"
+        :meetingTerminals="meetingTerminals"
         :miniPagePath="miniPagePath"
-        :defaultInviteWay="defaultInviteWay"
         :baseUrl="baseUrl"
         :userData="userData"
         :isInMeeting="isInMeeting"
         :org="org"
         :token="token"
+        :isMirror="multiMeetingData.isMirror"
+        :isVoiceMotivationOpen="isVoiceMotivationOpen"
+        :address-book-tab-list="addressBookTabList"
         @multiMeetingClose="closeMultiMeeting"
         @miniInviteSend="sendMiniInvite"
         @inviteMessageSend="sendMessageInvite"
@@ -104,18 +106,14 @@ export default {
       type: Array,
       default: () => []
     },
-    isCustomizeMiniInvitations: {
-      type: Boolean,
-      default: false
+    meetingTerminals: {
+      type: Array,
+      default: () => [],
     },
     miniPagePath: {
       type: String,
       default: ""
     },
-    defaultInviteWay: {
-      type: String,
-      default: "identity"
-    },
     baseUrl: {
       type: String,
       default: ""
@@ -143,7 +141,17 @@ export default {
     value: {
       type: Boolean,
       default: false
-    }
+    },
+    // 通讯录可见的标签页配置
+    addressBookTabList: {
+      type: Array,
+      default: () => ["组织架构", "人员", "会议终端", "volte", "设备", "监控", "常用分组"],
+    },
+    // 语音激励开关
+    isVoiceMotivationOpen: {
+      type: Boolean,
+      default: false,
+    },
   },
   data() {
     return {
@@ -158,7 +166,8 @@ export default {
         audioInputDevice: "",
         audioOutputDevice: "",
         videoDevice: "",
-        joinType: "launch"
+        joinType: "launch",
+        isMirror: false
       },
       trackData: {},
       isInMeeting: false
@@ -200,7 +209,8 @@ export default {
         audioInputDevice: "",
         audioOutputDevice: "",
         videoDevice: "",
-        joinType: "launch"
+        joinType: "launch",
+        isMirror: false
       };
       this.isMeetingDialogShow = true;
     },
@@ -227,10 +237,10 @@ export default {
         }
       })
     },
-    pullMonitorDevice(monitorID, monitorName) {
+    pullMonitorDevice(monitorID, monitorName, integrationType = 0) {
       if (this.$refs.liveMultipleMeetingRef) {
         if (this.isInMeeting) {
-          this.$refs.liveMultipleMeetingRef.pullMonitorDevice(monitorID, monitorName);
+          this.$refs.liveMultipleMeetingRef.pullMonitorDevice(monitorID, monitorName, integrationType);
         } else {
           this.showMessage.error("请先进入会议");
         }
@@ -268,7 +278,8 @@ export default {
               outputStatus: true,
               audioInputDevice: "",
               audioOutputDevice: "",
-              videoDevice: ""
+              videoDevice: "",
+              isMirror: false
             });
             this.inviteReceiveClose();
           } else {