cnhis-design-vue 2.1.29 → 2.1.31

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

@@ -1,6 +1,7 @@
 import { message } from 'ant-design-vue';
 import { getCacheSIP, setCacheSip, openSipDialog } from '@/utils/sip-device';
 import fetch from '@/utils/chatFetch';
+import axios from 'axios'
 let chatUid = 0;
 let chatUids = [];
 const chatUidUp = () => {
@@ -8,6 +9,30 @@ const chatUidUp = () => {
   chatUid++;
 };
 
+export const getClientDeviceToken = (params) => {
+  return axios({
+    method: "get",
+    baseURL: "",
+    url: "/ihcrm/rest/callEsb/util/get",
+    params: {
+      customerId: params,
+      interface: 'getDeviceTokenByCustomerId'
+    }
+  })
+    .then(({ data }) => {
+      if (data.status === "success" || data.code === "00000") {
+        const result = JSON.parse(data.result);
+        if (result.data) {
+          return result.data
+        }
+      } else {
+        return false
+      }
+    })
+    .catch((error) => {
+      console.error(error)
+    });
+};
 /**
  * 获取撤回文案
  * @param ctx Vue

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

@@ -24,7 +24,19 @@ export default class RtcClient {
     this.localStream_ = null;
     this.remoteStreams_ = [];
     this.options = options;
-    const sdkjs = Promise.resolve(options.vendor == 2 ? require('@/utils/kty-sdk') : { default: require('trtc-js-sdk') });
+    function getSDKJS () {
+      if (options.vendor == 2) {
+          return require('@/utils/kty-sdk');
+      } else if (options.vendor == 3) {
+        // 对接江苏省sdk
+        return { default: require('@/utils/trtc')}
+        // return { default: require('trtc-js-sdk')}
+      } else {
+        return { default: require('trtc-js-sdk') }
+      }
+    }
+    const sdkjs = Promise.resolve(getSDKJS());
+    console.log('sdkjs', sdkjs);
     sdkjs.then(res => {
       TRTC = res.default;
       // check if browser is compatible with TRTC
@@ -94,6 +106,8 @@ export default class RtcClient {
       },
       this.client_
     );
+    console.log('单人this.userId_', this.userId_);
+    console.log('单人创建本地流：', this.localStream_);
     // 设置视频分辨率帧率和码率
     // console.log,暂时注释
     this.localStream_.setVideoProfile(this.screen ? '1080p' : '720p');
@@ -127,6 +141,7 @@ export default class RtcClient {
   }
 
   async leave() {
+    console.log('单人leave: 离开房间');
     if (!this.isJoined_) {
       console.warn('leave() - leave without join()d observed');
       return;
@@ -193,8 +208,13 @@ export default class RtcClient {
       if (this.isSip) {
         this.dropSip();
       } else {
-        // 停止发布本地流
-        await this.client_.unpublish(this.localStream_);
+        console.log('单人unpublish: 释放本地流：', this.localStream_);
+        if (this.options.vendor === 3) {
+          this.localStream_.close();
+        } else {
+          // 停止发布本地流
+          await this.client_.unpublish(this.localStream_);
+        }
       }
       this.isPublished_ = false;
     } catch (error) {

package/packages/select-person/select-person.vue

@@ -217,6 +217,10 @@ export default create({
       type: Boolean,
       default: true
     },
+    filterChildren: {
+      type: Boolean,
+      default: false
+    },
     queryMainTreeData: Function, // 主树请求
     queryLoadChildData: Function, // 懒加载请求
     queryTreeSearch: Function // 检索请求
@@ -1283,20 +1287,21 @@ export default create({
       }
       let copyData = JSON.parse(JSON.stringify(this.treeData[key]));
       // 增加visible属性 true展示 false不展示
-      filterTree({ value: this.title, data: copyData, prop: 'title' });
+      filterTree({ value: this.title, data: copyData, prop: 'title', filterChildren: this.filterChildren });
       // 过滤visible属性 为true的数据
       copyData = copyData.filter(item => item.visible);
       const expandedKeys = [];
       vexutils.searchTree(copyData, item => {
-        if (item.visible) {
-          expandedKeys.push(item.key);
+        if (item.visible && item.title.indexOf(this.title) !== -1) {
+          const allParentIds = getAllParentId(copyData, item.key).filter(Boolean);
+          expandedKeys.push(...allParentIds);
         }
         if (item.children && item.children.length) {
           item.children = item.children.filter(child => child.visible);
         }
       });
       this.$set(this.treeData, 'temp', copyData);
-      this.expandedKeys = expandedKeys;
+      this.expandedKeys = [...new Set(expandedKeys)];
     },
     getStaticSearchParentKey(treeData, expandedKeys, orgId) {
       const keyword = this.title;

package/src/utils/UniRTCv2.js

@@ -1,6 +1,7 @@
 import io from 'socket.io-client';
+import fetch, { qs } from './chatFetch';
 
-function UniRTCObject(appId, tokenProvider) {
+function UniRTCObject(appId, tokenProvider, vueSelf) {
 
 	if (appId == null || appId == '') {
 		console.error('参数appId必填');
@@ -29,6 +30,7 @@ function UniRTCObject(appId, tokenProvider) {
 	this.clientType = '1';
 	this.client = null;
 	this.localStream = null;
+	this.vueSelf = vueSelf;
 	// ***********************API*********************//
 
 	// 我方接听API
@@ -130,6 +132,7 @@ function UniRTCObject(appId, tokenProvider) {
 		msg.targetDeviceToken = targetDeviceToken;
 		msg.brand = brand;
 		msg.message = message;
+		console.log('发送videoHangUp事件');
 		_socket.emit('videoHangUp', JSON.stringify(msg));
 		console.log('进行挂断[' + JSON.stringify(msg) + ']');
 	}
@@ -138,57 +141,66 @@ function UniRTCObject(appId, tokenProvider) {
 
 	// 登录成功callback
 	this.onLogined = function() {
-
 	}
 
 	// 呼入进来callback
 	this.onCallComing = function(incoming) {
-
+		console.log('呼入进来callback', incoming);
 	};
 
 	// 通话就绪callback
 	this.onCallReady = function(incoming) {
-
+		console.log('通话就绪callback', incoming);
 	};
 
 	// 开始呼叫callback
 	this.onCallStarted = function(outing) {
-
+		console.log('开始呼叫callback', outing);
 	};
 
 	// 停止呼叫callback
 	this.onCallStoped = function(outing) {
-
+		console.log('停止呼叫callback', outing);
 	};
 
 	// 呼出反馈callback
 	this.onCallReplied = function(outing) {
-
+		console.log('呼出反馈callback', outing);
 	};
 
 	// 呼出被接callback
 	this.onCallAccepted = function(outing) {
-
+		console.log('呼出被接callback', outing);
+		let videoData = {
+			...outing.guestConfig.videoData,
+			inviteResult: 1
+		}
+		this.vueSelf.subscribeAcceptedJST(videoData)
 	};
 
 	// 呼出被拒callback
 	this.onCallRefused = function(outing) {
-
+		console.log('呼出被拒callback', outing);
 	};
 
 	// 呼出超时callback
 	this.onCallTimeout = function(outing) {
-
+		console.log('呼出超时callback', outing);
 	};
 
 	// 设备状态检查
 	this.onStatusChecked = function(stat) {
-
+		console.log('设备状态检查', stat);
+		if (stat[0].status == '0') {
+			_this.vueSelf.setCallerStatus('在线')
+		} else {
+			_this.vueSelf.setCallerStatus('离线')
+		}
 	}
 
 	// 会议挂断callback
 	this.onHangup = function() {
-
+		console.log('会议挂断callback');
 	}
 
 	this.reconnect = function() {
@@ -210,7 +222,8 @@ function UniRTCObject(appId, tokenProvider) {
 
 	function _connect() {
 		// 创建链接
-		_socket = io.connect('https://video.jsehealth.com:9999');
+		// _socket = io.connect('https://video.jsehealth.com:9999'); // 生产环境
+		_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");
 
@@ -218,7 +231,7 @@ function UniRTCObject(appId, tokenProvider) {
 		_socket.on('connect', function() {
 			_onDeviceConnected();
 			_socket.on('registerReturn', _onDeviceRegistered);
-			_socket.on('deviceLoginReturn', _onDeviceLogined);
+			_socket.on('deviceLoginReturn', _onDeviceLogined); 
 			_socket.on('videoCallNotification', _onCallComing);
 			_socket.on('videoCallReturn', _onCallReplied);
 			_socket.on('videoInfoNotification', _onCallReady);
@@ -303,7 +316,25 @@ function UniRTCObject(appId, tokenProvider) {
 			// alert('设备登录失败\n' + msg);
 		}
 	}
-
+	// 对方拒绝接听回调
+	function customerRefuse(vuePage) {
+		let curScrollParam = vuePage.getRefuseParam();
+		const videoData = vuePage.videoData;
+		const params = {
+			assemblyId: curScrollParam.assemblyId,
+			orgId: curScrollParam.orgId,
+			userId: curScrollParam.userId,
+			sessionId: videoData.sessionId,
+			recordId: videoData.recordId,
+			inviteResult: 0,
+			isExpire: ''
+		};
+		fetch.post('/chat/access/videoInviteEnter', qs.stringify(params)).then(({ data }) => {
+			if (data.result === 'SUCCESS') {
+				vuePage.$message.info('对方拒绝接听');
+			}
+		});
+	}
 	// 呼出反馈handler
 	function _onCallReplied(msg) {
 		console.log('对方反馈[' + msg + ']');
@@ -330,6 +361,13 @@ function UniRTCObject(appId, tokenProvider) {
 		} else if (data.code.substring(0, 1) == '1') {
 			console.error(msg);
 			// alert(data.msg);
+		} else if (data.code === '3001') {
+			console.log('错误号：'+data.code+'====>错误编码:'+data.msg);
+			customerRefuse(_this.vueSelf);
+			target = data.deviceToken;
+			outing = _outing.get(target);
+			_this.stopCall(outing);
+			_this.onCallRefused(outing);
 		} else {
 			console.log('错误号：'+data.code+'====>错误编码:'+data.msg);
 			target = data.deviceToken;