react_hsbc_teller 0.7.2 → 0.7.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react_hsbc_teller",
-  "version": "0.7.2",
+  "version": "0.7.6",
   "description": "React",
   "private": false,
   "main": "lib/hsbc.js",

package/packages/pages/video/video.jsx

@@ -32,10 +32,12 @@ let pictureInPictureVideo = ''
 class Video extends Component {
   constructor(props) {
     super(props)
-		this.cancel = axios.CancelToken.source()
+		// this.cancel = axios.CancelToken.source()
 	}
+  cancel = axios.CancelToken.source()
   signCanvas = React.createRef();
   state = {
+    sessionType: true,
     isWhiteboard: false,
     isSelect: '',
     loading: false,
@@ -47,6 +49,7 @@ class Video extends Component {
     employeeNumber: '',
     employeeName: '',
     isModalVisibleInvitation: false,
+    linkData: '',
     roomCustomerList: [],
     facialImg: '',
     isModalVisibleFacial: false,
@@ -112,6 +115,7 @@ class Video extends Component {
     imStatus: false,
     imJoinRoom: false,
     analyserData: new Map(),
+    analyserHeight: new Map()
   };
   // eslint-disable-next-line no-undef
   test_controller = '';
@@ -161,6 +165,9 @@ class Video extends Component {
       })
     } catch (err) {
       console.error(err);
+      this.setState({
+        sessionType: false
+      })
       this.props.createRoomCallback({
         type: 2,
         errorManage: '保存房间信息失败',
@@ -538,7 +545,12 @@ class Video extends Component {
     }
   };
   endSessionValue = () => {
-    this.test_controller.LeaveRoom()
+    if(this.state.sessionType) {
+      this.test_controller.LeaveRoom()
+    } else {
+      this.finishSession()
+    }
+    
   };
   // 画中画
   pictureInPicture = () => {
@@ -680,7 +692,7 @@ class Video extends Component {
             for (let k = 0; k < str.length; k++){
               // console.log(str.substring(0,k+1))
               // console.log(cobj.measureText(str.substring(0,k+1)).width)
-                  if (cobj.measureText(str.substring(0,k+1)).width>240){
+                  if (cobj.measureText(str.substring(0,k+1)).width>210){
                     str = str.substring(0,k-2)
                     str += '...'
                     break;
@@ -1079,6 +1091,9 @@ class Video extends Component {
     window.IMOpenfire = msg =>{
       console.log('im登录', msg)
       if(!msg) {
+        this.setState({
+          sessionType: false
+        })
         this.roomCallBack(2, 'im建立连接失败',-7)
       } else {
         this.setState({
@@ -1184,7 +1199,7 @@ class Video extends Component {
         microphoneList: objList1,
         speakerList: [objList2[0]]
       })
-      if (!this.state.appId) {
+      if (!this.state.appId && this.state.sessionType) {
         this.mpaasSig(data);
         this.setState({
           cameraValue: obj[0].actionid,
@@ -1200,6 +1215,9 @@ class Video extends Component {
     // 获取设备失败
     this.test_controller.OnGetDevicesFailed = (code, msg) => {
       console.log('获取设备失败', code, msg)
+      this.setState({
+        sessionType: false
+      })
       this.messageClick('获取设备失败，请检查摄像头设备是否可用或是否禁用摄像头','error')
       this.roomCallBack(2, '获取设备失败',-1)
     };
@@ -1210,6 +1228,9 @@ class Video extends Component {
     };
     this.test_controller.OnConnectFailed = (code, msg) => {
       console.log('建立连接失败', code, msg)
+      this.setState({
+        sessionType: false
+      })
       this.roomCallBack(2, '连接失败',-2)
     };
     // 断开连接回调
@@ -1224,6 +1245,9 @@ class Video extends Component {
     // 初始化房间失败
     this.test_controller.OnInitRoomConfigFail = (err_code, err_msg) => {
       console.log('初始化房间失败', err_code, err_msg)
+      this.setState({
+        sessionType: false
+      })
       this.roomCallBack(2, '初始化失败',-3)
     };
     // 初始化成功回调
@@ -1250,6 +1274,9 @@ class Video extends Component {
     // 创建房间失败
     this.test_controller.OnCreateRoomFailed = (err_code, err_msg) => {
       console.log('创建房间失败', err_code, err_msg)
+      this.setState({
+        sessionType: false
+      })
       this.roomCallBack(2, '创建房间失败',-4)
     };
     // 初始化⾳视频成功
@@ -1272,6 +1299,9 @@ class Video extends Component {
     // 加入房间失败
     this.test_controller.OnJoinRoomFailed = (err_code, err_msg) => {
       console.log('加入房间失败', err_code, err_msg)
+      this.setState({
+        sessionType: false
+      })
       this.roomCallBack(2, '加入失败',-5)
     };
     // 发布媒体流成功
@@ -1287,11 +1317,35 @@ class Video extends Component {
             'tellerId': this.props.tellerAccount
           })
         });
+      } 
+      if(sid == document.getElementById('publish_video1').name) {
+        this.timer = setInterval(
+          () => {
+            console.log('hhhhhh',this.state.analyserHeight.get(sid))
+            if(this.state.analyserHeight.get(sid) > 0 && !this.state.voiceStatue) {
+              callNimIM('sendCustomCmdMsg', {
+                customId: this.state.imRoomId,
+                content: JSON.stringify({
+                  'typeId': 3200,
+                  "data": {
+                    'sessionId': this.state.sessionId,
+                    'userId': this.props.tellerAccount
+                  }
+
+                })
+              });
+            }
+          },
+          3000
+        );
       }
     };
     // 发布媒体流失败
     this.test_controller.OnPublishFailed = (sid, err_code, err_msg) => {
       console.log('发布媒体流失败', sid, err_code, err_msg)
+      this.setState({
+        sessionType: false
+      })
       this.roomCallBack(2, '发布失败',-6)
     };
     // 订阅媒体流成功
@@ -1843,6 +1897,7 @@ class Video extends Component {
       exitType
     ) => {
       console.log('退出房间者', participant, exitType)
+      this.messageClick(this.props.customLeaveRoom,'error')
     };
     // 弱网回调
     this.test_controller.OnNetworkWeak = (bpsSend, bpsRecv, sid) => {
@@ -2112,6 +2167,10 @@ class Video extends Component {
         let startX = x2 // 绘制起始点x
         let startY = y1 - height  // 绘制起始点y
         ctx.fillRect(startX, startY, width, height)
+        this.state.analyserHeight.set(sid,startY)
+        this.setState({
+          analyserHeight: this.state.analyserHeight
+        })
       }
       requestAnimationFrame(this.test_controller.OnVolumeAnalyser.bind(this, sid, analyser));
       
@@ -2153,7 +2212,7 @@ class Video extends Component {
   finishSession = async () => {
 
 
-    if (this.state.roomCustomerList.length == 0) {
+    if (this.state.roomCustomerList.length == 0 && this.state.sessionType) {
       try {
         let result = await API.finishSession({
           sessionId: this.state.sessionId,
@@ -2167,7 +2226,8 @@ class Video extends Component {
       isWhiteboard: false,
       isPictureInPicture: false,
       imStatus: false,
-      imJoinRoom: false
+      imJoinRoom: false,
+      sessionType: true
     });
     this.props.onLeaveRoom({
       code: LEAVE_TYPE.TELLER_EXIT,
@@ -2204,8 +2264,12 @@ class Video extends Component {
     axios.get(this.props.resourcePath + "/beauty/beauty.js")
     .then(response => this.addToScriptClick()).catch(function (error) {
       console.log(error);
+      this.setState({
+        sessionType: false
+      })
       this.roomCallBack(2, '创建房间失败',-4)
       
+      
   })
     
   }
@@ -2280,7 +2344,8 @@ class Video extends Component {
     this.setState = (state, callback) => {
       return
     }
-    this.cancel('')
+    this.cancel = ''
+    this.timer && clearInterval(this.timer);
   }
   componentWillMount() {
     if (this.props.sessionId) {
@@ -2600,7 +2665,8 @@ class Video extends Component {
       isModalVisibleInvitation: true,
       employeeNumber: '',
       employeeName: '',
-      employeeError: ''
+      employeeError: '',
+      linkData: ''
     })
 
   }
@@ -2785,6 +2851,15 @@ class Video extends Component {
 
     }
   }
+  linkClick=()=>{
+    let inp = document.createElement('input')
+      inp.value = this.state.linkData
+      document.body.appendChild(inp)
+      inp.select() // 选择对象;
+      console.log(inp.value, '复制到的内容')
+      document.execCommand('Copy') // 执行浏览器复制命令
+      inp.remove()
+  }
   queryStaff = async () => {
     if(!this.state.employeeNumber) return
     try {
@@ -2797,6 +2872,11 @@ class Video extends Component {
           employeeName: result.data.staffName,
           employeeError: result.data.staffName ? '' : '查无此人',
         })
+        if(result.data.staffName){
+          this.setState({
+            linkData:'https://wp-staff-gateway.wealth-platform.uat.ali.cloud.cn.hsbc/meeting-ui/OHB/CN/HSBC?chnlID=OHB&locale=zh_CN&chnlCC=CN&chnlGMC=HSBC&targetFunc=supervisorMeeting&sourceFunc=rmMeeting&appointmentID='+ this.props.businessNumber + '&staffID='+this.state.employeeNumber+'&staffName='+ encodeURIComponent(result.data.staffName)
+          })
+        }
       } else {
         this.messageClick('查询失败','error')
       }
@@ -3510,7 +3590,12 @@ class Video extends Component {
           <Modal className="modelClass" title="新增预约" closable={false} centered={true} visible={this.state.isModalVisibleInvitation} footer={[
              <div key='invitation'>
             <Button className="modelButtonCancel" onClick={this.handleCancelInvitation}>取消</Button>
-            <Button className="modelButtonOk" type="primary" danger onClick={this.handleOkInvitation}>确定</Button>
+            {
+              this.state.employeeName &&<Button className='modelButtonOk'type="primary" danger onClick={this.handleOkInvitation}>发送邮件</Button>
+            }
+            {
+              !this.state.employeeName &&<Button className='modelButtonCancelOne' type="primary" danger >发送邮件</Button>
+            }
             </div>
           ]}>
             <div>
@@ -3522,6 +3607,12 @@ class Video extends Component {
               <div className="invitationDiv">
               <span className="modalSpan">&nbsp;&nbsp;&nbsp;姓名：</span><span>{this.state.employeeName}</span>
               </div>
+              {
+                this.state.employeeName &&<div className='invitationDiv'>
+                <span className="modalSpan">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><Button className="invitationButton" onClick={this.linkClick}> <img className='invitationImg' src={require("../../assets/img/link.png").default} alt="" />复制链接</Button>
+                </div>
+              }
+              
             </div>
             {
               this.state.employeeError && <div className='errorClassInvitation'>
@@ -3587,6 +3678,7 @@ Video.defaultProps = {
   fontSize: '14',
   fontFamily: 'auto',
   menus: ['SHARE', 'FRIES', 'OCR', 'INVITE', 'PIP'],
+  customLeaveRoom: '客户离开房间',
   meetingInfo: {
     title: '测试',
     host: 'wmz',

package/packages/pages/video/video.less

@@ -123,6 +123,15 @@
   font-size: 17px;
   color: #666666;
 }
+.invitationImg{
+  width: 20px;
+  height: 20px;
+}
+.invitationButton{
+  color: #1a9adc !important;
+  border: none !important;
+  background: #fff !important;
+}
 .invitationDiv{
   margin-left: 40px;
   margin-bottom: 15px;
@@ -312,6 +321,15 @@
   border: 1px #5C5C5C solid!important;
   border-spacing: 20px!important;
 }
+.modelButtonCancelOne{
+  width: 100px!important;
+  height: 40px!important;
+  font-size: 16px!important;
+  color: #5C5C5C!important;
+  border: 1px #5C5C5C solid!important;
+  border-spacing: 20px!important;
+  background: #d9d9d9!important;
+}
 .modelButtonOk{
   width: 100px!important;
   height: 40px!important;
@@ -434,4 +452,9 @@
       width: 18px;
     height: 18px;
     }
+}
+.linkClass{
+  margin: 20px 40px;
+  font-size: 14px;
+  word-break: break-all;
 }