cnhis-design-vue 2.1.34 → 2.1.36

package/packages/multi-chat/chat/audio.vue

@@ -76,7 +76,7 @@ import fetch, { qs } from '@/utils/chatFetch';
 import RtcClient from '../utils/rtc-client-multi';
 import { getSipUserId } from '@/utils/sip-device';
 import uniRTCAPI from './mixins/uniRTCAPI';
-import { getClientDeviceToken } from '../utils/index';
+import { getClientDeviceToken, startVideoCall, getUuid } from '../utils/index';
 export default {
   inject: ['store', 'i18nText'],
   mixins: [uniRTCAPI],
@@ -119,7 +119,10 @@ export default {
       'muteAudio',
       'curScrollItem',
       'outing',
-      'callerStatus'
+      'callerStatus',
+      'doctorInfo',
+      'requestId',
+      'callTimer'
     ]),
     mySipName() {
       const videoData = this.videoData;
@@ -202,12 +205,14 @@ export default {
     }
   },
   beforeDestroy() {
+    clearInterval(this.callTimer)
+    this.setCallTimer(null)
     clearInterval(this.timer);
     clearInterval(this.expireTimer);
   },
   methods: {
     ...mapActions(['sendMessage']),
-    ...mapMutations(['setShowAudio', 'setVideoData', 'setRecordId', 'setShowVideo', 'setVideoMembers', 'setMuteAudio']),
+    ...mapMutations(['setShowAudio', 'setVideoData', 'setRecordId', 'setShowVideo', 'setVideoMembers', 'setMuteAudio', 'setTargetInfo', 'setRequestId', 'setCallTimer']),
     playStream(stream, id, isUserId = true) {
       const el = this.$el.querySelector(`#${isUserId ? 'uid_' : ''}${id}`);
       el && stream.play(el);
@@ -242,6 +247,23 @@ export default {
         document.onmouseup = null;
       };
     },
+    sendVideoCall(flag) {
+      const curScrollItemParams = JSON.parse(this.curScrollItem?.params)
+      const startVideoParam = {
+        customerId: curScrollItemParams.customerId,
+        doctorIdNo: this.doctorInfo.idCard,
+        doctorId: this.doctorInfo.userId,
+        sendStatus: flag,
+        requestId: this.requestId
+      }
+      return startVideoCall(startVideoParam).then(videoRes => {
+        if (!videoRes) {
+          return false
+        }
+        console.log('推送公众号成功');
+        return videoRes
+      })
+    },
     /* 发起邀请 */
     lanchInvite() {
       let memberIds = this.videoMembers.map(item => item.userId).join(',');
@@ -258,25 +280,62 @@ export default {
         params.sipKey = callerSipKey;
         params.sipName = callerSipName;
       }
-      fetch.post('/chat/access/videoInvite', qs.stringify(params)).then(({ data }) => {
+      fetch.post('/chat/access/videoInvite', qs.stringify(params)).then(async ({ data }) => {
         if (data.result === 'SUCCESS') {
+          this.setRequestId(getUuid())
           this.$message.success(this.i18nText('1.9.386'));
           // this.appendVideoMessage();
           this.setVideoData(data.map);
+          this.setTargetInfo({username: data.map?.targetList[0].username, token: data.map?.targetList[0].token})
           // 江苏省
           if (this.uniRTC || data.map?.vendor == 3) {
             console.log('this.curScrollItem', this.curScrollItem);
             const curScrollItemParams = JSON.parse(this.curScrollItem?.params)
-            getClientDeviceToken(curScrollItemParams.customerId).then(tokenRes => {
-              if (!tokenRes) {
-                return
-              }
-              const targetInfo = data.map?.targetList || [];
-              // const targetList = data.map?.targetList || [];
-              const targetList = [{deviceToken: tokenRes.deviceToken, username: targetInfo[0].username, token: targetInfo[0].token}]
+            const videoCallInfo = await this.sendVideoCall(false)
+            if (Array.isArray(videoCallInfo) && videoCallInfo.length) {
+              let targetList = videoCallInfo.map(item => {
+                return {
+                  deviceToken: item.token
+                }
+              })
               this.checkStatus(targetList);
-              this.startCall(targetList);
-            })
+            } else {
+              getClientDeviceToken(curScrollItemParams.customerId).then(tokenRes => {
+                if (!tokenRes || tokenRes.code != 200) {
+                  return
+                }
+                const targetInfo = data.map?.targetList || [];
+                // const targetList = data.map?.targetList || [];
+                const targetList = [{deviceToken: tokenRes.deviceToken, username: targetInfo[0].username, token: targetInfo[0].token}]
+                this.checkStatus(targetList);
+                // this.startCall(targetList);
+              })
+            }
+            const timerId = setInterval(async () => {
+              console.log('定时调用查询状态');
+              const curScrollItemParams1 = JSON.parse(this.curScrollItem?.params)
+              const videoCallInfo1 = await this.sendVideoCall(false)
+              if (Array.isArray(videoCallInfo1) && videoCallInfo1.length) {
+                let targetList = videoCallInfo1.map(item => {
+                  return {
+                    deviceToken: item.token
+                  }
+                })
+                this.checkStatus(targetList);
+              } else {
+                getClientDeviceToken(curScrollItemParams1.customerId).then(tokenRes => {
+                  if (!tokenRes || tokenRes.code != 200) {
+                    return
+                  }
+                  const targetInfo = data.map?.targetList || [];
+                  // const targetList = data.map?.targetList || [];
+                  const targetList = [{deviceToken: tokenRes.deviceToken, username: targetInfo[0].username, token: targetInfo[0].token}]
+                  this.checkStatus(targetList);
+                  // this.startCall(targetList);
+                })
+              }
+            }, 7000)
+            this.setCallTimer(timerId)
           }
         } else {
           this.$message.warning(data.resultMsg);
@@ -286,6 +345,8 @@ export default {
     },
     /* 挂断视频 */
     handleReject(accept, isTimeOut = false) {
+      clearInterval(this.callTimer)
+      this.setCallTimer(null)
       if (!this.videoData?.inviteResult) {
         if (this.validTalkingEnv && accept == '1') {
           this.validTalkingEnv().then(res => {
@@ -335,6 +396,8 @@ export default {
           if (accept == '0') {
             this.$message.success(`${this.i18nText('1.9.387')}!`);
             this.setShowAudio(false);
+            clearInterval(this.callTimer)
+            this.setCallTimer(null)
             this.setMuteAudio(false);
             this.setVideoMembers([]);
             this.setVideoData({});
@@ -352,6 +415,8 @@ export default {
             if (data.map.type == 1 && data.map.mode == 2) {
               this.setShowVideo(true);
               this.setShowAudio(false);
+              clearInterval(this.callTimer)
+              this.setCallTimer(null)
             }
             this.setVideoData(data.map);
             this.$nextTick(() => {
@@ -409,7 +474,8 @@ export default {
         wsUrl: this.sdkInfo?.wsUrl,
         turnUrl: this.sdkInfo?.turnUrl,
         turnUsername: this.sdkInfo?.turnUsername,
-        turnCredential: this.sdkInfo?.turnCredential
+        turnCredential: this.sdkInfo?.turnCredential,
+        videoData: this.videoData
       });
       this.timer = setInterval(() => {
         this.meetingTime = this.meetingTime + 1;
@@ -429,6 +495,8 @@ export default {
         this.rtc.leave();
         this.rtc = null;
       }
+      clearInterval(this.callTimer)
+      this.setCallTimer(null)
     }
   },
   watch: {

package/packages/multi-chat/chat/chatFooter.vue

@@ -402,7 +402,8 @@ export default {
       'setLastCurrentTab',
       'setIsRecorderVoice',
       'setVideoData',
-      'setSessionType'
+      'setSessionType',
+      'setCallerStatus'
     ]),
     ...mapMutations({
       clearMsgList: 'setMsgList'
@@ -722,6 +723,7 @@ export default {
       });
     },
     handleVideoClick(type) {
+      this.setCallerStatus('')
       // this.curScrollItem.type 2多人 1单人
       if (this.sessionType === 2) {
         this.$emit('update:addvisible', true);

package/packages/multi-chat/chat/chatMain.vue

@@ -299,7 +299,9 @@ export default {
       'enable',
       'appendList',
       'queueItem',
-      'isRecorderVoice'
+      'isRecorderVoice',
+      'callTimer',
+      'requestId'
     ]),
     orgId() {
       const getters = this.store.getters;
@@ -396,6 +398,7 @@ export default {
   },
   created() {
     this.attachEvent();
+    this.getUserInformation();
   },
   methods: {
     ...mapMutations([
@@ -411,13 +414,25 @@ export default {
       'setShowAudio',
       'setVideoMode',
       'setVideoMembers',
-      'setIsRecorderVoice'
+      'setIsRecorderVoice',
+      'setDoctorInfo',
+      'setCallTimer'
     ]),
     ...mapActions({
       getEarlierMsg: 'setMsgList',
       handleBotChat: 'handleBotChat',
       sendMessage: 'sendMessage'
     }),
+    // 获取医生信息
+    getUserInformation() {
+      const url =  '/user/getUserInformation';
+      fetch.get(url).then(({ data }) => {
+        if (data.result === 'SUCCESS') {
+          this.setDoctorInfo(data?.map?.sysUserInformation)
+          console.log('data?.map?.sysUserInformation', data?.map?.sysUserInformation);
+        }
+      });
+    },
     getMessageItemClass(item) {
       // content.source === 1, 代表为系统消息, 系统统一左侧展示
       if (item.content?.source === 1) {

package/packages/multi-chat/chat/index.vue

@@ -336,7 +336,7 @@ import addConference from './addConference';
 import ClassifyTabs from '../components/classify-tabs';
 import ChatTabsHeader from '../components/chat-tabs-header';
 import UserStatus from '../components/user-status';
-import { checkTalkingEnv } from '../utils/index';
+import { checkTalkingEnv, startVideoCall } from '../utils/index';
 import uniRTCAPI from './mixins/uniRTCAPI';
 
 export default {
@@ -475,7 +475,10 @@ export default {
       'curScrollItem',
       'disableOperate',
       'sdkInfo',
-      'closedSession'
+      'closedSession',
+      'doctorInfo',
+      'targetInfo',
+      'requestId'
     ]),
     isNormalStyle() {
       return this.styleFold !== 'Y';
@@ -646,7 +649,8 @@ export default {
       'setQueueItem',
       'setCurScrollItem',
       'setSessionType',
-      'setCallerStatus'
+      'setCallerStatus',
+      'setOuting'
     ]),
     ...mapActions(['setChatTimer', 'getVideoHistoryList', 'initUniRTC']),
     ...mapActions({
@@ -1309,6 +1313,22 @@ export default {
         assemblyId: this.assemblyId
       }
     },
+    sendVideoCall() {
+      const curScrollItemParams = JSON.parse(this.curScrollItem?.params)
+      const startVideoParam = {
+        customerId: curScrollItemParams.customerId,
+        doctorIdNo: this.doctorInfo.idCard,
+        doctorId: this.doctorInfo.userId,
+        sendStatus: true,
+        requestId: this.requestId
+      }
+      startVideoCall(startVideoParam).then(videoRes => {
+        if (!videoRes) {
+          return
+        }
+        console.log('推送公众号成功');
+      })
+    },
     // 获取视频sdk
     getSdkAppId() {
       fetch

package/packages/multi-chat/chat/multiVideo.vue

@@ -480,12 +480,12 @@ export default {
             const curScrollItemParams = JSON.parse(this.curScrollItem?.params)
             getClientDeviceToken(curScrollItemParams.customerId).then(tokenRes => {
               const targetInfo = data.map?.targetList || [];
-              if (!tokenRes) {
+              if (!tokenRes || tokenRes.code != 200) {
                 return
               }
               const targetList = [{deviceToken: tokenRes.deviceToken, username: targetInfo[0].username, token: targetInfo[0].token}]
               this.checkStatus(targetList);
-              this.startCall(targetList);
+              // this.startCall(targetList);
             })
           }
         } else {
@@ -544,7 +544,8 @@ export default {
         wsUrl: this.sdkInfo?.wsUrl,
         turnUrl: this.sdkInfo?.turnUrl,
         turnUsername: this.sdkInfo?.turnUsername,
-        turnCredential: this.sdkInfo?.turnCredential
+        turnCredential: this.sdkInfo?.turnCredential,
+        videoData: this.videoData
       });
     },
     toggleScreen(flag, options) {

package/packages/multi-chat/chat/video.vue

@@ -282,7 +282,8 @@ export default {
         wsUrl: this.sdkInfo?.wsUrl,
         turnUrl: this.sdkInfo?.turnUrl,
         turnUsername: this.sdkInfo?.turnUsername,
-        turnCredential: this.sdkInfo?.turnCredential
+        turnCredential: this.sdkInfo?.turnCredential,
+        videoData: this.videoData
       });
       this.setVideoMembers([]);
     },

package/packages/multi-chat/store/getters.js

@@ -355,5 +355,17 @@ export default {
   },
   callerStatus(state) {
     return state.callerStatus;
+  },
+  doctorInfo(state) {
+    return state.doctorInfo;
+  },
+  targetInfo(state) {
+    return state.targetInfo;
+  },
+  callTimer(state) {
+    return state.callTimer;
+  },
+  requestId(state) {
+    return state.requestId;
   }
 };

package/packages/multi-chat/store/mutation.js

@@ -280,5 +280,17 @@ export default {
   },
   setCallerStatus(state, callerStatus) {
     state.callerStatus = callerStatus;
+  },
+  setDoctorInfo(state, doctorInfo) {
+    state.doctorInfo = doctorInfo;
+  },
+  setTargetInfo(state, targetInfo) {
+    state.targetInfo = targetInfo;
+  },
+  setCallTimer(state, callTimer) {
+    state.callTimer = callTimer;
+  },
+  setRequestId(state, requestId) {
+    state.requestId = requestId;
   }
 };

package/packages/multi-chat/store/state.js

@@ -108,6 +108,10 @@ export default () => {
     uniRTC: null,
     incoming: null,
     outing: [],
-    callerStatus: '' // 呼叫人在线离线状态（江苏通）
+    callerStatus: '', // 呼叫人在线离线状态（江苏通）
+    doctorInfo: null, // 登录人信息（江苏通）
+    targetInfo: null,  // 呼叫targetInfo()
+    requestId: null, // 随机数
+    callTimer: null // 定时器
   };
 };

package/packages/multi-chat/utils/index.js

@@ -2,6 +2,7 @@ import { message } from 'ant-design-vue';
 import { getCacheSIP, setCacheSip, openSipDialog } from '@/utils/sip-device';
 import fetch from '@/utils/chatFetch';
 import axios from 'axios'
+import vexutils from '@/utils/vexutils';
 let chatUid = 0;
 let chatUids = [];
 const chatUidUp = () => {
@@ -9,6 +10,58 @@ const chatUidUp = () => {
   chatUid++;
 };
 
+export function getUuid() {
+  return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
+    var r = (Math.random() * 16) | 0,
+      v = c == 'x' ? r : (r & 0x3) | 0x8;
+    return v.toString(16);
+  });
+}
+
+export function getRandomNum(num) {
+  return Math.floor((Math.random()+Math.floor(Math.random()*9+1))*Math.pow(10,num-1));
+}
+
+/**
+ * 
+ * @param {*} params customerIdNo患者customerId,医生身份证
+ * @returns 开启呼叫视频
+ */
+export const startVideoCall = (params) => {
+  return axios({
+    method: "get",
+    baseURL: "",
+    url: "/ihcrm/rest/callEsb/util/get",
+    params: {
+      customerId: params.customerId,
+      doctorIdNo: params.doctorIdNo,
+      doctorId: params.doctorId,
+      sendStatus:params.sendStatus,
+      requestId:  params.requestId,
+      interface: 'startVideoCall'
+    }
+  })
+    .then(({ data }) => {
+      if (data.status === "success" || data.code === "00000") {
+        const result = data.result;
+        if (result.code === '00000' || result.success) {
+          if (result.data && vexutils.isJSON(result.data)) {
+            return JSON.parse(result.data)
+          } else {
+            return []
+          }
+        } else {
+          return false
+        }
+      } else {
+        return false
+      }
+    })
+    .catch((error) => {
+      console.error(error)
+    });
+};
+
 export const getClientDeviceToken = (params) => {
   return axios({
     method: "get",

package/packages/multi-chat/utils/rtc-client.js

@@ -16,6 +16,7 @@ export default class RtcClient {
     // 是否开启视频
     this.openVideo = screen ? false : options.openVideo;
     this.screen = screen;
+    this.videoData = options.videoData
     // 远端关闭时，关闭窗口
     this.videoWindow = options.videoWindow;
 
@@ -63,9 +64,10 @@ export default class RtcClient {
       roomId: this.roomId_,
       sdkAppId: this.sdkAppId_,
       userId: this.userId_,
-      userSig: this.userSig_
+      userSig: this.userSig_,
+      userDefineRecordId: new Date().getTime() + '_' + this.roomId_ + '_' + this.userId_
     });
-
+    
     // 添加代理服务地址
     this.setServer();
 
@@ -77,6 +79,47 @@ export default class RtcClient {
       await this.client_.join({ roomId: this.roomId_ });
       console.log('join room success');
       this.isJoined_ = true;
+      if (this.options.vendor == 3) {
+        try {
+          // 预排版模式，自 v4.9.0 版本开始支持
+          const config = {
+            mode: 'preset-layout',
+            videoWidth: 1280,
+            videoHeight: 720,
+            videoBitrate: 1500,
+            videoFramerate: 20,
+            videoGOP: 2,
+            audioSampleRate: 48000,
+            audioBitrate: 64,
+            audioChannels: 1,
+            // 预设一路本地摄像头、一路本地屏幕分享、两路远端流的排版位置
+            mixUsers: [
+              {
+                width: 1280,
+                height: 720,
+                locationX: 0,
+                locationY: 0,
+                pureAudio: false,
+                userId: this.userId_, // 本地摄像头占位，传入推摄像头的 client userId
+                zOrder: 1
+              },
+              {
+                width: 250,
+                height: 400,
+                locationX: 980,
+                locationY: 30,
+                pureAudio: false,
+                userId: this.videoData.callee, // 远端流占位
+                zOrder: 2
+              }
+            ]
+          }
+          console.log('混流设置', config);
+          await this.client_.startMixTranscode(config);
+        } catch (error) {
+          console.error('startMixTranscode failed ', error);
+        }
+      }
     } catch (error) {
       console.error('failed to join room because: ' + error);
       if (this.options.vendor == 2) {
@@ -153,12 +196,16 @@ export default class RtcClient {
     }
 
     try {
+      // if (this.options.vendor == 3) {
+      //   console.log('关闭混流');
+      //   await this.client_.stopMixTranscode();
+      // }
       // leave the room
       await this.client_.leave();
       this.isJoined_ = false;
     } catch (error) {
       console.error('failed to leave the room because ' + error);
-      location.reload();
+      // location.reload();
     } finally {
       // 停止本地流，关闭本地流内部的音视频播放器
       this.localStream_.stop();