react_hsbc_teller 1.0.7 → 1.0.8

package/package.json

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

package/packages/demo/demo.js

@@ -1,5 +1,6 @@
 import React, { Component } from "react";
 import HSBC from "../pages/index";
+import Pdf from './pdf.js'
 
 class Demo extends Component {
   state = {
@@ -169,7 +170,7 @@ joinRoomCallback=(data)=>{
                             imgCallback={this.imgCallback}
                             >
                                 
-                                {/* <Pdf></Pdf> */}
+                                <Pdf></Pdf>
                         </HSBC>
                         :
                         <div>

package/packages/demo/pdf.js

@@ -0,0 +1,78 @@
+import React, { Component } from "react";
+
+class pdf extends Component {
+  state = {
+    isVideo: false,
+    tellerAccount: '',
+    callbackUrl: 'http://47.102.126.132:8720/hsbc/callback',
+    businessNumber: '',
+    lang: 'zh',
+    roomServerUrl: 'wss://mrtc.mpaas.cn-hangzhou.aliyuncs.com/ws',
+    baseURL:'https://counter-web.leimondata.cn:18082/api/leimon-counter-api',
+    resourcePath:'https://counter-web.leimondata.cn:7199',
+}
+startVideo = () => {
+    this.setState({
+        isVideo: true
+    })
+}
+onLeaveRoom = (val) => {
+    console.log(val)
+    this.setState({
+        isVideo: false
+    })
+}
+handleChangeTeller = (event) => {
+    this.setState({
+        tellerAccount: event.target.value
+    })
+}
+handleChangeCall = (event) => {
+    this.setState({
+        callbackUrl: event.target.value
+    })
+}
+handleChangeBysiness = (event) => {
+    this.setState({
+        businessNumber: event.target.value
+    })
+}
+
+handleRoomServerUrl = (event) => {
+    this.setState({
+        roomServerUrl: event.target.value
+    })
+}
+handleBaseURL = (event) => {
+    this.setState({
+        baseURL: event.target.value
+    })
+}
+handleResourcePath = (event) => {
+    this.setState({
+        resourcePath: event.target.value
+    })
+}
+
+  render() {
+    return (
+      <div className="test">
+                {
+                        <div>
+                            坐席账号：<input placeholder="请输入坐席账号" value={this.state.tellerAccount} onChange={e => this.handleChangeTeller(e)}></input>
+                            回调地址：<input placeholder="请输入回调地址" value={this.state.callbackUrl} onChange={e => this.handleChangeCall(e)}></input>
+                            全局流水号：<input placeholder="请输入全局流水号" value={this.state.businessNumber} onChange={e => this.handleChangeBysiness(e)}></input>
+                            阿里服务器地址：<input placeholder="请输入阿里服务器地址" value={this.state.roomServerUrl} onChange={e => this.handleRoomServerUrl(e)}></input>
+                            接口地址：<input placeholder="请输入接口地址" value={this.state.baseURL} onChange={e => this.handleBaseURL(e)}></input>
+                            阿里资源服务地址：<input placeholder="请输入阿里资源服务地址" value={this.state.resourcePath} onChange={e => this.handleResourcePath(e)}></input>
+
+                            <button className="button" onClick={this.startVideo.bind(this)}>开启视频</button>
+                        </div>
+                }
+            </div>
+    );
+  }
+}
+
+
+export default pdf;

package/packages/pages/foot/foot.jsx

@@ -113,7 +113,7 @@ export default class foot extends Component {
                                   item == 'INVITE' && <div className="one" onClick={this.invitationClick.bind(this)}>
                                   <img className="imgClass" src={require("../../assets/img/icon_invitation.png").default} alt="" />
                                   <div className="text">
-                                      会议邀请
+                                  邀请参会者
                                   </div>
                               </div>
                               }
@@ -123,7 +123,7 @@ export default class foot extends Component {
                               item == 'PIP' && <div className="one" onClick={this.pictureInPicture.bind(this)}>
                                   <img className="imgClass" src={require("../../assets/img/huazhonghua.png").default} alt="" />
                                   <div className="text">
-                                      画中画
+                                  开启视频画中画
                                   </div>
                               </div>
                       }
@@ -149,7 +149,7 @@ export default class foot extends Component {
                     <div className="one">
                         <img className="imgClass" src={require("../../assets/img/inspection.png").default} alt="" />
                         <div className="text">
-                            设备检测
+                        设置视频设备
                         </div>
                     </div>
                     </div>
@@ -166,7 +166,7 @@ export default class foot extends Component {
                 
                 <div className="total totalThree">
                     <button className="buttonClass" onClick={this.endSession.bind(this)}>
-                        <span className="spanClass">结束</span>
+                        <span className="spanClass">结束会议</span>
                     </button>
                 </div>
             </div>

package/packages/pages/foot/foot.less

@@ -23,6 +23,9 @@ width: 100%;
   align-items: center;
   flex-wrap: nowrap;
   }
+  .footHover{
+      margin: 0 5px;
+  }
   .footHover :hover{
       background: #F3F3F3;
       border-radius: 8px;
@@ -31,7 +34,7 @@ width: 100%;
     margin-top: 8px;
     padding-bottom: 10px;
     text-align: center;
-    width: 80px;
+    max-width: 110px;
 height: 11px;
 font-size: 14px;
 font-family: PingFangSC-Regular, PingFang SC;
@@ -50,7 +53,7 @@ line-height: 11px;
 .buttonClass{
     font-size: 16px;
     color: #ffffff;
-    width: 70px;
+    width: 90px;
     height: 32px;
     background: #B70000;
     border-radius: 6px;

package/packages/pages/header/header.jsx

@@ -8,7 +8,7 @@ export default class header extends Component {
         return(
             <div className="Hamburger">
                 <div className="left-header">
-                    <div className="title">汇丰银行营业厅</div>
+                    <div className="title">汇丰银行远程会议</div>
                 </div>
             </div>
         )

package/packages/pages/video/video.jsx

@@ -63,7 +63,7 @@ class Video extends Component {
     isModalVisibleFacial: false,
     isModalVisibleEnd: false,
     isModalVisible: false,
-    screenName: '投屏',
+    screenName: '共享模式',
     suspendName: '暂停',
     cameraImg: cameraImgOpen,
     voiceStatue: false,
@@ -716,8 +716,24 @@ class Video extends Component {
     const cobj = canvas.getContext('2d'); // 获取绘图环境
     canvas.width = width;
     canvas.height = height;
-
-    interval = setInterval(() => {
+    let blob = new Blob([
+      `
+      let timer;
+      onmessage = ({data:flag})=>{
+          if(!flag){
+              clearInterval(timer);
+          }else{
+             timer = setInterval(function() { postMessage(''); }, 100);
+          }
+      }
+      `,
+    ]);
+    let url = window.URL.createObjectURL(blob);
+    var worker = new Worker(url);
+    window.URL.revokeObjectURL(blob);
+    let flag1 = true;
+
+    worker.onmessage =() => {
       cobj.clearRect(0, 0, width, height);
       for (let i = 0; i < list.length; i++) {
 
@@ -856,7 +872,8 @@ class Video extends Component {
         }
         
       }
-    }, 100);
+    };
+    worker.postMessage(flag1);
     const captureStream = canvas.captureStream();
     const mix_stream = new MediaStream(captureStream);
     pictureInPictureVideo = document.getElementById('mixedvideo');
@@ -875,7 +892,7 @@ class Video extends Component {
     pictureInPictureVideo.addEventListener('leavepictureinpicture', (event) => {
       pictureInPictureVideo.srcObject = null;
       pictureInPictureVideo.style.display = "none";
-      clearInterval(interval);
+      worker.postMessage(false);
       this.state.isPictureInPicture = false
     });
   }
@@ -1505,6 +1522,9 @@ class Video extends Component {
     // 音视频关闭通知
     this.test_controller.OnMediaClose = (code, sid) => {
       console.log(code, sid)
+      if((code == 5004 || code == 5007) && document.getElementById('publish_video1').name == sid) {
+        this.roomCallBack(2, '媒体链路连接异常/超时',8)
+      }
     };
     // 加入房间成功
     this.test_controller.OnJoinRoomSucc = () => {
@@ -1781,7 +1801,8 @@ class Video extends Component {
           'meetingInfo': {
             'title': this.props.meetingInfo.title,
             'host': this.props.meetingInfo.host,
-            'customers': this.props.meetingInfo.customers
+            'customers': this.props.meetingInfo.customers,
+            'otherAttendees': this.props.meetingInfo.otherAttendees
           }
 
         })
@@ -2000,7 +2021,7 @@ class Video extends Component {
         this.state.isSharedScreen = false
         this.setState({
           
-          screenName: '投屏'
+          screenName: '共享模式'
         });
         this.tabTitlesClick('RMScreen', 'delect')
         if (this.state.isPictureInPicture) {
@@ -2286,10 +2307,10 @@ class Video extends Component {
     // 切流成功通知
     this.test_controller.OnChangeMediaStreamSuccess = (sid) => {
       console.log('切流成功通知', sid);
-      if(this.state.isModalVisibleInspection) {
-        this.messageClick('切换摄像头或麦克风成功','success')
+      if(this.state.loading) {
+        this.messageClick('摄像头或麦克风切换成功','success')
         this.setState({
-          isModalVisibleInspection: false
+            loading: false
         })
       }
       
@@ -2301,7 +2322,12 @@ class Video extends Component {
       msg
     ) => {
       console.log('切流失败通知', sid, code, msg)
+      if(this.state.loading) {
+      this.setState({
+          loading: false
+      })
       this.messageClick('切换摄像头或麦克风失败，请先检查设备','error')
+    }
     };
     // 服务端录制初始化成功
     this.test_controller.OnInitRemoteRecordSucc = (
@@ -2502,7 +2528,7 @@ class Video extends Component {
     this.timer && clearInterval(this.timer);
     if(this.state.isSharedScreen) {
       this.setState({
-        screenName: '投屏',
+        screenName: '共享模式',
       })
       this.state.isSharedScreen = false
       this.state.laveRoomSharedScreen = true
@@ -2517,7 +2543,7 @@ class Video extends Component {
       })
     } else {
       this.setState({
-        screenName: '投屏',
+        screenName: '共享模式',
       });
       this.state.isSharedScreen = false
       this.state.laveRoomSharedScreen = true
@@ -2809,7 +2835,7 @@ class Video extends Component {
         this.state.isSharedScreen = false
         this.state.isScreenSwitching = false
         this.setState({
-          screenName: '投屏'
+          screenName: '共享模式'
         });
         console.log(pictureInPictureVideo)
         this.tabTitlesClick('RMScreen', 'delect')
@@ -2842,7 +2868,7 @@ class Video extends Component {
         this.tabTitlesClick(
           {
             value: 'RMScreen',
-            name: '坐席投屏'
+            name: '共享内容'
           }, 'add'
         )
         if (!this.state.isPictureInPicture) {
@@ -3279,11 +3305,16 @@ class Video extends Component {
     this.test_controller.GetDevices()
   }
   handleOkInspection = () => {
+    this.setState({
+      isModalVisibleInspection: false,
+      loading: true
+    })
     const config = {}
     config.sid = document.getElementById('publish_video1').name
     config.videoSource = this.state.cameraValue
     config.audioSource = this.state.microphoneValue
     this.test_controller.ChangeProfile(config)
+
   }
   handleCancelInspection = () => {
     this.setState({
@@ -3316,6 +3347,21 @@ class Video extends Component {
     if (this.props.children) {
       pdfChildren = React.cloneElement(this.props.children, { width: this.state.whiteboardWidth, height: this.state.whiteboardHeight, show: this.state.isSelect == 'RMWhiteboard'})
     }
+    const otherAttendeesList = (
+      <span className='labelClass'>
+        {(meetingInfo.otherAttendees ? meetingInfo.otherAttendees.length>0 ? true : false : false) &&
+          meetingInfo.otherAttendees.map((item, index) => {
+            return <label key={index}>
+              {item}
+              {
+                meetingInfo.otherAttendees.length > 0 && index != meetingInfo.otherAttendees.length - 1 && <label>，</label>
+              }
+
+            </label>
+          })
+        }
+      </span>
+    )
     const customerNameList = (
       <span className='labelClass'>
         {
@@ -3413,9 +3459,9 @@ class Video extends Component {
           <Header></Header>
           <div className="health">
           <div className="healthVideo">
-            <div className="projection">
+            <div className="projection"  style={{background: this.state.tabTitles.length > 0 ? '#f0f0f0' : '#ffffff'}}>
             {tabTitleList}
-            <img style={sectionStyle} src={require("../../assets/img/placeholder_bg.png").default} alt="" />
+            {/* <img style={sectionStyle} src={require("../../assets/img/placeholder_bg.png").default} alt="" /> */}
             <div id="whiteboardDIV" style={{height: this.state.tabTitles.length > 0 ? 'calc(100% - 33px)' : '100%'}}>
             
               <div className="videoDiv" style={{ display: (this.state.isSelect == 'RMScreen') ? '' : 'none', }}>
@@ -3431,7 +3477,8 @@ class Video extends Component {
                 </div>
 
               </div>
-              <div className="videoDiv" style={{ display: (this.state.isSelect == 'RMWhiteboard') ? '' : 'none', }}>
+              {/* <div className="videoDiv" style={{ display: (this.state.isSelect == 'RMWhiteboard') ? '' : 'none', }}> */}
+              <div className="videoDiv">
                 <div id="touBoxItem">
                   {pdfChildren}
                 </div>
@@ -3463,9 +3510,17 @@ class Video extends Component {
                         <label className='labelClass'>{meetingInfo.host}</label>
                       </li>
                       <li>
-                        <span>参会者：</span>
+                        <span>客户：</span>
                         {customerNameList}
                       </li>
+                      {
+                        (meetingInfo.otherAttendees ? meetingInfo.otherAttendees.length>0 ? true : false : false) && <li>
+                        <span>其他参会者：</span>
+                        {otherAttendeesList}
+                      </li>
+                      }
+                      
+                      
                     </ul>
                   </div>
                 </div>
@@ -3885,7 +3940,7 @@ class Video extends Component {
             <Button className="modelButtonOk" type="primary" danger onClick={this.handleOkEnd}>确定</Button>
             </div>
           ]}>
-            <div className='endModal'>确定是否结束会话？</div>
+            <div className='endModal'>是否要结束并退出会议？</div>
           </Modal>
           <Modal title={this.state.titleModal}  closable={false} centered={true} visible={this.state.isModalVisibleFacial} footer={[
             <div key='facial'>
@@ -3904,7 +3959,7 @@ class Video extends Component {
             </div>
 
           </Modal> */}
-          <Modal className="modelClass" title="新增预约" closable={false} centered={true} visible={this.state.isModalVisibleInvitation} footer={[
+          <Modal className="modelClass" title="邀请参会人员" closable={false} centered={true} visible={this.state.isModalVisibleInvitation} footer={[
              <div key='invitation'>
             <Button className="modelButtonCancel" onClick={this.handleCancelInvitation}>取消</Button>
             {
@@ -3958,21 +4013,21 @@ class Video extends Component {
               ></CanvasDraw>
             </div>
           </Modal>
-          <Modal title="设备检测" closable={false} centered={true} visible={this.state.isModalVisibleInspection} footer={[
+          <Modal title="设置视频设备" closable={false} centered={true} visible={this.state.isModalVisibleInspection} footer={[
              <div key='inspection'>
             <Button className="modelButtonCancel" onClick={this.handleCancelInspection}>取消</Button>
             <Button className="modelButtonOk" type="primary" danger onClick={this.handleOkInspection}>确定</Button>
             </div>
           ]}>
             <div className="inspection">
-              <div>摄像头设备：</div>
+              <div>摄像头：</div>
               {camera}
-              <div>麦克风设备：</div>
+              <div>麦克风：</div>
               {microphone}
               {
                 this.state.speakerList.length > 0 &&
                  <span>
-                   <div>扬声器设备：</div>
+                   <div>扬声器：</div>
               {speaker}
                  </span>
               }
@@ -3991,7 +4046,7 @@ imRoomId: "Fwua8kGB6@conference.openfire2.leimondata.cn",
 sessionId: "Fwua8kGB6",
   tellerAccount: 't001',
   businessNumber: '123',
-  callbackUrl: 'http://47.102.126.132:8720/hsbc/callback',
+  callbackUrl: 'http://182.92.184.31:8720/hsbc/callback',
   // roomServerUrl: 'wss://app.uat.dsp.hsbcfts.com.cn/mpaas/mrtc/ws', 
   roomServerUrl: 'wss://mrtc.mpaas.cn-hangzhou.aliyuncs.com/ws',
 
@@ -4009,7 +4064,8 @@ sessionId: "Fwua8kGB6",
   meetingInfo: {
     title: '--',
     host: '--',
-    customers: ['--']
+    customers: ['--'],
+    otherAttendees: undefined
   },
   isTranscribing: false,
 }

package/packages/pages/video/video.less

@@ -164,7 +164,7 @@
 .projection{
   width: 80%;
   position: relative;
-  background: #f3f3f3;
+  // background: #fff;
   color: #333;
   border-radius: 0 4px 4px 4px;
   text-align: left;