cnhis-design-vue 2.1.29 → 2.1.30

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

@@ -373,15 +373,17 @@ export default {
       });
   },
   async initUniRTC({ commit, state }, obj) {
-    const { uniAppId, uniSecretKey, params } = obj;
+    const { uniAppId, uniSecretKey, params, vueSelf } = obj;
     let uniRTC = null;
     const getLoginToken = async () => {
       let appSign;
       const paramsData = {
         clientType: '1',
         deviceToken: uniRTC.deviceToken,
-        appId: uniAppId,
-        secretKey: uniSecretKey
+        // appId: uniAppId,
+        // secretKey: uniSecretKey
+        appId: 'hangchuang', // 测试（9997）账号
+        secretKey: 'hangchuang' // // 测试（9997）秘钥
       };
       try {
         const { data } = await fetch.get('/chat/access/getMediaAuthSign', { params: paramsData });
@@ -394,7 +396,9 @@ export default {
         return;
       }
     };
-    uniRTC = new UniRTCObject(uniAppId, getLoginToken);
+    // uniRTC = new UniRTCObject(uniAppId, getLoginToken);
+    uniRTC = new UniRTCObject('hangchuang', getLoginToken, vueSelf);
+    console.log('uniRTC', uniRTC);
     uniRTC.onCallComing = incoming => {
       commit("setIncoming", incoming);
       console.log('onCallComing->', incoming);

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

@@ -1,112 +1,112 @@
-export default () => {
-  return {
-    userInfo: null, // 用户信息
-    currentSip: null, // 当前用户选择的sip设备
-    assemblyId: null, // 组件id
-    sessionId: null, // 会话id
-    classify: null, // 会话分类
-    isAppendMsg: false, // 是否追加消息
-    message: '', // 当前接收或发送的消息
-    isScrollListChange: false, // 排队/会话列表新增、修改、删除
-    listChangeItem: null, // 排队/会话列表变化项
-    currentTab: 'queue',
-    msgList: [], // 历史消息
-    serviceId: '', // 服务端id
-    clientId: '', // 客户端id
-    scrollTo: '', // 滚动条定位
-    keywords: '', // 搜索关键字
-    searchKeywords: '', // 点击搜索触发
-    onChating: false, // 是否正在聊天
-    enable: false, // 是否有聊天组件权限
-    modalVisible: false,
-    medicalOrPrescription: '',
-    footerMessage: '',
-    sessionStatistic: {
-      peopleCount: '',
-      unreadCount: ''
-    },
-    queueStatistic: {
-      peopleCount: '',
-      unreadCount: ''
-    },
-    offlineSessionStatistic: {
-      peopleCount: '',
-      unreadCount: ''
-    },
-    offlineClassifyCount: {},
-    voiceAlert: true,
-    appendList: [],
-    disableOperate: false,
-    // 视频相关
-    showVideo: false,
-    roomId: null,
-    userSig: null,
-    caller: null,
-    videoId: null,
-    recordId: null,
-    videoSessionId: null,
-    callings: [],
-    delays: [],
-    assemblySetting: {}, // 组件配置
-    sessionTotalTime: 0, // 会话总时长
-    sessionTime: null, // 会话时长
-    sessionTimer: null,
-    queueItem: null, // 待接入
-    sessionHistoryList: [],
-    sdkInfo: null, // 音视频通话sdk信息
-    sessionType: 1,
-    multiVideoShow: false,
-    videoStatus: 0,
-    addMemberType: 1, // 1添加会话人员2添加视频人员
-    videoMembers: [],
-    videoListChange: {},
-    videoData: {},
-    videoMode: 1, // 1语音2视频
-    isSessionOwner: false,
-    showAudio: false,
-    groupMembers: [],
-    muteAudio: false,
-
-    // 聊天客户端
-    queueId: '',
-    chatType: '',
-    historySessionId: '',
-    botSessionId: '',
-    serviceName: '',
-    statusTitle: '',
-    sessionEnd: false,
-    isServer: false,
-    closedSession: false,
-
-    // 客户端参数
-    clientParams: {},
-
-    // 机器人智能客服
-    robotId: '',
-    questionId: '',
-    dictionaryKey: '',
-    chatMode: '',
-    chatFlag: false,
-    chatUserId: '',
-    videoRecord: [],
-    videoVoiceList: [],
-    clientChatISRobot: '',
-    chatName: '',
-    scrollQueueId: '',
-    lastClassify: '',
-    lastCurrentTab: '',
-    queryParams: {}, // 路由参数
-    accessParams: {}, // 其他参数
-    intentionId: '',
-    dictionaryValue: '',
-    orgId: '',
-    curScrollItem: null,
-    isQuickReply: false,
-    isRecorderVoice: false,
-    msgRecordCache: {}, // 消息已读记录缓存
-    userStatus: '',
-    uniRTC: null,
-    incoming: null,
-    outing: []
-  };
-};
+export default () => {
+  return {
+    userInfo: null, // 用户信息
+    currentSip: null, // 当前用户选择的sip设备
+    assemblyId: null, // 组件id
+    sessionId: null, // 会话id
+    classify: null, // 会话分类
+    isAppendMsg: false, // 是否追加消息
+    message: '', // 当前接收或发送的消息
+    isScrollListChange: false, // 排队/会话列表新增、修改、删除
+    listChangeItem: null, // 排队/会话列表变化项
+    currentTab: 'queue',
+    msgList: [], // 历史消息
+    serviceId: '', // 服务端id
+    clientId: '', // 客户端id
+    scrollTo: '', // 滚动条定位
+    keywords: '', // 搜索关键字
+    searchKeywords: '', // 点击搜索触发
+    onChating: false, // 是否正在聊天
+    enable: false, // 是否有聊天组件权限
+    modalVisible: false,
+    medicalOrPrescription: '',
+    footerMessage: '',
+    sessionStatistic: {
+      peopleCount: '',
+      unreadCount: ''
+    },
+    queueStatistic: {
+      peopleCount: '',
+      unreadCount: ''
+    },
+    offlineSessionStatistic: {
+      peopleCount: '',
+      unreadCount: ''
+    },
+    offlineClassifyCount: {},
+    voiceAlert: true,
+    appendList: [],
+    disableOperate: false,
+    // 视频相关
+    showVideo: false,
+    roomId: null,
+    userSig: null,
+    caller: null,
+    videoId: null,
+    recordId: null,
+    videoSessionId: null,
+    callings: [],
+    delays: [],
+    assemblySetting: {}, // 组件配置
+    sessionTotalTime: 0, // 会话总时长
+    sessionTime: null, // 会话时长
+    sessionTimer: null,
+    queueItem: null, // 待接入
+    sessionHistoryList: [],
+    sdkInfo: null, // 音视频通话sdk信息
+    sessionType: 1,
+    multiVideoShow: false,
+    videoStatus: 0,
+    addMemberType: 1, // 1添加会话人员2添加视频人员
+    videoMembers: [],
+    videoListChange: {},
+    videoData: {},
+    videoMode: 1, // 1语音2视频
+    isSessionOwner: false,
+    showAudio: false,
+    groupMembers: [],
+    muteAudio: false,
+
+    // 聊天客户端
+    queueId: '',
+    chatType: '',
+    historySessionId: '',
+    botSessionId: '',
+    serviceName: '',
+    statusTitle: '',
+    sessionEnd: false,
+    isServer: false,
+    closedSession: false,
+
+    // 客户端参数
+    clientParams: {},
+
+    // 机器人智能客服
+    robotId: '',
+    questionId: '',
+    dictionaryKey: '',
+    chatMode: '',
+    chatFlag: false,
+    chatUserId: '',
+    videoRecord: [],
+    videoVoiceList: [],
+    clientChatISRobot: '',
+    chatName: '',
+    scrollQueueId: '',
+    lastClassify: '',
+    lastCurrentTab: '',
+    queryParams: {}, // 路由参数
+    accessParams: {}, // 其他参数
+    intentionId: '',
+    dictionaryValue: '',
+    orgId: '',
+    curScrollItem: null,
+    isQuickReply: false,
+    isRecorderVoice: false,
+    msgRecordCache: {}, // 消息已读记录缓存
+    userStatus: '',
+    uniRTC: null,
+    incoming: null,
+    outing: []
+  };
+};

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) {