cnhis-design-vue 2.1.35 → 2.1.36

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();

package/src/utils/UniRTCv2.js

@@ -1,5 +1,6 @@
 import io from 'socket.io-client';
 import fetch, { qs } from './chatFetch';
+import vexutils from '../utils/vexutils';
 
 function UniRTCObject(appId, tokenProvider, vueSelf) {
 
@@ -120,6 +121,7 @@ function UniRTCObject(appId, tokenProvider, vueSelf) {
 			obj.deviceToken = deviceTokens[i];
 			msg.deviceArray.push(obj);
 		}
+		console.log('设备参数', msg);
 		_socket.emit('onlineStatusQuery', JSON.stringify(msg));
 		console.log('检查设备状态[' + JSON.stringify(msg) + ']');
 	}
@@ -171,11 +173,11 @@ function UniRTCObject(appId, tokenProvider, vueSelf) {
 	// 呼出被接callback
 	this.onCallAccepted = function(outing) {
 		console.log('呼出被接callback', outing);
-		let videoData = {
-			...outing.guestConfig.videoData,
-			inviteResult: 1
-		}
-		this.vueSelf.subscribeAcceptedJST(videoData)
+		// let videoData = {
+		// 	...outing.guestConfig.videoData,
+		// 	inviteResult: 1
+		// }
+		// this.vueSelf.subscribeAcceptedJST(videoData)
 	};
 
 	// 呼出被拒callback
@@ -191,10 +193,34 @@ function UniRTCObject(appId, tokenProvider, vueSelf) {
 	// 设备状态检查
 	this.onStatusChecked = function(stat) {
 		console.log('设备状态检查', stat);
-		if (stat[0].status == '0') {
+		let index = stat.findIndex(item => item.status == '0')
+		let outtings =[]
+		outtings.push(...stat)
+		let targetInfo = _this.vueSelf.targetInfo
+		if (index != -1) {
+			if (_this.vueSelf.callTimer) {
+				clearInterval(_this.vueSelf.callTimer)
+				_this.vueSelf.setCallTimer(null)
+			}
 			_this.vueSelf.setCallerStatus('在线')
+			_this.startCall(stat[index].deviceToken, '腾讯视频', 'tencent', {
+				sdkAppId: Number(_this.vueSelf.sdkInfo.sdkAppId),
+				userId: _this.vueSelf.isServer ? _this.vueSelf.serviceId : _this.vueSelf.clientId,
+				userSig: _this.vueSelf.videoData.token,
+				roomId: Number(_this.vueSelf.roomId),
+				videoData: _this.vueSelf.videoData
+			}, {
+				sdkAppId: Number(_this.vueSelf.sdkInfo.sdkAppId),
+				userId: targetInfo.username,
+				userSig: targetInfo.token,
+				roomId: Number(_this.vueSelf.videoData.roomId),
+				videoData: _this.vueSelf.videoData
+				// privateMapKey
+			})
+			_this.vueSelf.setOuting( outtings)
 		} else {
 			_this.vueSelf.setCallerStatus('离线')
+			_this.vueSelf.sendVideoCall()
 		}
 	}
 
@@ -226,7 +252,6 @@ function UniRTCObject(appId, tokenProvider, vueSelf) {
 		_socket = io.connect('https://t.jsehealth.com:9997'); // 测试环境
 		// _socket = io.connect('http://127.0.0.1:9090');
 		// _socket = io.connect("https://dli.xikang.com:9999");
-
 		// 注册事件处理函数
 		_socket.on('connect', function() {
 			_onDeviceConnected();
@@ -316,8 +341,9 @@ function UniRTCObject(appId, tokenProvider, vueSelf) {
 			// alert('设备登录失败\n' + msg);
 		}
 	}
-	// 对方拒绝接听回调
-	function customerRefuse(vuePage) {
+	const customerConfirmDebounce = vexutils.debounce(customerConfirm, 2000);
+	// 对方接听/拒绝接听回调
+	function customerConfirm(vuePage, accept) {
 		let curScrollParam = vuePage.getRefuseParam();
 		const videoData = vuePage.videoData;
 		const params = {
@@ -326,12 +352,12 @@ function UniRTCObject(appId, tokenProvider, vueSelf) {
 			userId: curScrollParam.userId,
 			sessionId: videoData.sessionId,
 			recordId: videoData.recordId,
-			inviteResult: 0,
+			inviteResult: accept ? 1 : 0,
 			isExpire: ''
 		};
 		fetch.post('/chat/access/videoInviteEnter', qs.stringify(params)).then(({ data }) => {
 			if (data.result === 'SUCCESS') {
-				vuePage.$message.info('对方拒绝接听');
+				vuePage.$message.info(accept ? '接入成功' : '对方拒绝接听');
 			}
 		});
 	}
@@ -343,6 +369,8 @@ function UniRTCObject(appId, tokenProvider, vueSelf) {
 
 		// 如果对方接听，就向对方发送视频配置
 		if (data.code == '0') {
+			// 接听调用接口
+			customerConfirmDebounce(_this.vueSelf, true)
 			target = data.deviceToken;
 			outing = _outing.get(target);
 			if (outing == null) {
@@ -363,7 +391,7 @@ function UniRTCObject(appId, tokenProvider, vueSelf) {
 			// alert(data.msg);
 		} else if (data.code === '3001') {
 			console.log('错误号：'+data.code+'====>错误编码:'+data.msg);
-			customerRefuse(_this.vueSelf);
+			customerConfirmDebounce(_this.vueSelf, false);
 			target = data.deviceToken;
 			outing = _outing.get(target);
 			_this.stopCall(outing);