react_hsbc_teller 1.0.8 → 1.1.1

package/package.json

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

package/packages/pages/foot/foot.less

@@ -35,6 +35,7 @@ width: 100%;
     padding-bottom: 10px;
     text-align: center;
     max-width: 110px;
+    min-width: 80px;
 height: 11px;
 font-size: 14px;
 font-family: PingFangSC-Regular, PingFang SC;

package/packages/pages/video/video.jsx

@@ -27,7 +27,9 @@ const LEAVE_TYPE = {
   TELLER_EXIT: 1, // 坐席退出
   ROOM_DESTROYED: -1, // 房间异常
 }
-let pictureInPictureVideo = ''
+let pictureInPictureVideo
+let mix_stream
+let worker
 message.config({
   getContainer: ()=>document.getElementById('allHSBC')
 })
@@ -41,6 +43,7 @@ class Video extends Component {
   cancel = axios.CancelToken.source()
   signCanvas = React.createRef();
   state = {
+    listVideoPicture: [],
     isScreenSwitching: false,
     whiteboardWidth: '',
     whiteboardHeight: '',
@@ -592,16 +595,16 @@ class Video extends Component {
         if(!val) {
           document.exitPictureInPicture()
         } else {
-          this.pictureInPictureClick()
+          this.pictureInPictureClick('update')
         }
       } else {
         if(!val) {
-        this.pictureInPictureClick()
+        this.pictureInPictureClick('add')
         }
       }
     }
   };
-  pictureInPictureClick=()=>{
+  pictureInPictureClick=(val)=>{
     let interval
     const list = []
     if (document.getElementById('video1').name) {
@@ -710,12 +713,18 @@ class Video extends Component {
       })
     }
     console.log(list)
-    const width = 640;
-    const height = 360 * list.length;
+    this.state.listVideoPicture = list
+    // const width = 640;
+    // const height = 360 * this.state.listVideoPicture.length;
+    if(val == 'add') {
+      pictureInPictureVideo.srcObject = mix_stream;
+      let flag1 = true;
+      worker.postMessage(flag1);
+    }
+  }
+  workerClick=()=>{
     const canvas = document.createElement('canvas');
     const cobj = canvas.getContext('2d'); // 获取绘图环境
-    canvas.width = width;
-    canvas.height = height;
     let blob = new Blob([
       `
       let timer;
@@ -729,15 +738,17 @@ class Video extends Component {
       `,
     ]);
     let url = window.URL.createObjectURL(blob);
-    var worker = new Worker(url);
+    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++) {
+      cobj.clearRect(0, 0, 640, 360 * this.state.listVideoPicture.length);
+      canvas.width = 640;
+      canvas.height = 360 * this.state.listVideoPicture.length;
+      for (let i = 0; i < this.state.listVideoPicture.length; i++) {
 
-        let videoId = list[i].name;
+        let videoId = this.state.listVideoPicture[i].name;
         let videoDiv = document.getElementById(videoId);
         let videoWidth = videoDiv.videoWidth;
         let videoHeight = videoDiv.videoHeight;
@@ -748,7 +759,7 @@ class Video extends Component {
         } else {
           newVideoHeight = videoHeight * 640 / videoWidth;
         }
-        if(list[i].noVideo){
+        if(this.state.listVideoPicture[i].noVideo){
           cobj.fillStyle = '#333';
         cobj.fillRect((640 - newVideoWidth) / 2, 360 * i, newVideoWidth, newVideoHeight)
         } else {
@@ -762,11 +773,11 @@ class Video extends Component {
         cobj.fill();
         cobj.stroke();
         cobj.beginPath();
-        cobj.font = "28px auto";
+        cobj.font = "28px serif";
         cobj.textAlign = 'left';
         cobj.lineWidth = 1;
         // 文字
-        let str = list[i].title
+        let str = this.state.listVideoPicture[i].title
         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)
@@ -781,7 +792,7 @@ class Video extends Component {
         //左边框
         cobj.beginPath();
         cobj.moveTo(0, 0);
-        cobj.lineTo(0, 360 * list.length);
+        cobj.lineTo(0, 360 * this.state.listVideoPicture.length);
         cobj.closePath(); //闭合路径
         cobj.lineWidth = 5; //线的边框为10像素
         cobj.strokeStyle = '#d9363e';
@@ -798,7 +809,7 @@ class Video extends Component {
 
         //右边框
         cobj.beginPath();
-        cobj.moveTo(640, 360 * list.length);
+        cobj.moveTo(640, 360 * this.state.listVideoPicture.length);
         cobj.lineTo(640, 0);
         cobj.closePath(); //闭合路径
         cobj.lineWidth = 5; //线的边框为10像素
@@ -808,8 +819,8 @@ class Video extends Component {
 
         //上边框
         cobj.beginPath();
-        cobj.moveTo(0, 360 * list.length);
-        cobj.lineTo(640, 360 * list.length);
+        cobj.moveTo(0, 360 * this.state.listVideoPicture.length);
+        cobj.lineTo(640, 360 * this.state.listVideoPicture.length);
         cobj.closePath(); //闭合路径
         cobj.lineWidth = 5; //线的边框为10像素
         cobj.strokeStyle = '#d9363e';
@@ -819,26 +830,15 @@ class Video extends Component {
         let microphoneSize = 50
         var img = document.getElementById("icon_huatong");
         var img1 = document.getElementById("icon_huatong_close");
-        if(this.state[list[i].voice]) {
+        if(this.state[this.state.listVideoPicture[i].voice]) {
           cobj.drawImage(img1, 10, 360 * (i + 1) - 60, microphoneSize, microphoneSize);
         } else {
           cobj.drawImage(img, 10, 360 * (i + 1) - 60, microphoneSize, microphoneSize);
 
         // 绘制实时音量
-        let sid = document.getElementById(list[i].name).name
+        let sid = document.getElementById(this.state.listVideoPicture[i].name).name
         let analyser = this.state.analyserData.get(sid)
         aou(analyser)
-        //  let sid = document.getElementById(list[i].name).name
-        //   let stream = this.test_controller.GetMediaInfo(sid).audio_
-        //   let acc = new AudioContext()
-        //   let mic = acc.createMediaStreamSource(stream)
-        //   let analyser = acc.createAnalyser()
-        //   analyser.fftSize = 256
-        //   mic.connect(analyser)
-        //   aou(analyser) 
-        //   let microphoneSize = 50
-        //   var img = document.getElementById("icon_huatong");
-        //   cobj.drawImage(img, 600, 360 * (i + 1) - 60, microphoneSize, microphoneSize);
         function aou(analyser){
           if(analyser) {
             let dataArray = new Uint8Array(analyser.frequencyBinCount);
@@ -873,11 +873,11 @@ class Video extends Component {
         
       }
     };
-    worker.postMessage(flag1);
+   
     const captureStream = canvas.captureStream();
-    const mix_stream = new MediaStream(captureStream);
+    mix_stream = new MediaStream(captureStream);
     pictureInPictureVideo = document.getElementById('mixedvideo');
-    pictureInPictureVideo.srcObject = mix_stream;
+    
     pictureInPictureVideo.onloadedmetadata = () => {
       pictureInPictureVideo.requestPictureInPicture();
     };
@@ -892,9 +892,11 @@ class Video extends Component {
     pictureInPictureVideo.addEventListener('leavepictureinpicture', (event) => {
       pictureInPictureVideo.srcObject = null;
       pictureInPictureVideo.style.display = "none";
+      this.state.listVideoPicture = []
       worker.postMessage(false);
       this.state.isPictureInPicture = false
     });
+
   }
   roomCallBack = (type, manege,code) => {
     this.setState({
@@ -1135,7 +1137,10 @@ class Video extends Component {
       else if (Mival.typeId == 1220) {
         // 一炒多的图片
         if (Mival.sessionId == this.state.sessionId) {
-          this.props.imgCallback(Mival.data.type, Mival.data.file) // 文字抄录和风险抄录，3--风险，，2--文字
+          this.props.imgCallback({
+            type: Mival.data.type, 
+            file: Mival.data.file}
+            ) // 文字抄录和风险抄录，3--风险，，2--文字
         }
       } else if (Mival.typeId == 1216) {
         // 签字回调
@@ -1355,7 +1360,7 @@ class Video extends Component {
       type: '2',
       sigType: 1
     };
-
+    this.workerClick()
     this.test_controller.GetDevices();
     // 获取设备成功
     this.test_controller.OnGetDevicesSuccess = (devicesInfo) => {
@@ -2017,7 +2022,6 @@ class Video extends Component {
             'tellerId': this.props.tellerAccount
           })
         })
-        this.state.sessionType = false
         this.state.isSharedScreen = false
         this.setState({
           
@@ -2618,6 +2622,7 @@ class Video extends Component {
       this.props.resourcePath + "/beauty/beauty.js",
       this.props.resourcePath + "/beauty/meeting_beautify_stream.js",
       this.props.resourcePath + "/beauty/backgroundBlur.js",
+
       this.props.resourcePath + "/adapter.js",
       this.props.resourcePath + "/getMediaInfo.js",
       // this.props.resourcePath + "/pdf.js",
@@ -2629,10 +2634,17 @@ class Video extends Component {
       this.props.resourcePath + "/meeting_im.js",
       this.props.resourcePath + "/meeting_vod.js",
       this.props.resourcePath + "/meeting_invite.js",
-      this.props.resourcePath + "/client_record.js",
+      this.props.resourcePath + "/client_record.js",  
       this.props.resourcePath + "/remote_record.js",
       this.props.resourcePath + "/meeting_camera_stream.js",
       this.props.resourcePath + "/meeting_api.js",
+
+      this.props.resourcePath + "/eruda.js",
+      this.props.resourcePath + "/iconfont.js",
+      this.props.resourcePath + "/dialogue.css",
+      
+
+        
     ]
     const that = this
     let i = 0
@@ -2808,6 +2820,8 @@ class Video extends Component {
         publish_config.media_type = 1
         publish_config.publish_device = 2
         publish_config.video_profile_type = 1
+        publish_config.enableDesktopAudio=true
+        publish_config.degradationType=2
         publish_config.sid = document.getElementById('video20').name
         this.test_controller.ChangeMediaStream(publish_config)
         this.state.isScreenSwitching = true
@@ -2847,6 +2861,8 @@ class Video extends Component {
           publish_config.media_type = 1;
           publish_config.publish_device = 2;
           publish_config.video_profile_type = 1;
+          publish_config.enableDesktopAudio=true
+          publish_config.degradationType=2
           publish_config.sid = document.getElementById('video20').name;
           this.test_controller.ChangeMediaStream(publish_config);
         } else {
@@ -2854,6 +2870,8 @@ class Video extends Component {
           publish_config.publish_device = 2
           publish_config.need_volume_analyser = true
           publish_config.video_profile_type = 1
+          publish_config.enableDesktopAudio=true
+          publish_config.degradationType=2
           publish_config.publish_video_id = 'video20'
           publish_config.publish_streamId_id = 'subscribe_streamId20'
           publish_config.publish_tag = 'projectionWhiteboard'
@@ -3215,6 +3233,7 @@ class Video extends Component {
       console.log(inp.value, '复制到的内容')
       document.execCommand('Copy') // 执行浏览器复制命令
       inp.remove()
+      this.messageClick('复制成功','success')
   }
   queryStaff = async () => {
     if(!this.state.employeeNumber) return
@@ -3255,26 +3274,75 @@ class Video extends Component {
         value: 'RMWhiteboard',
         name: 'RM白板'
       }, 'add')
-      if (document.getElementById('video20').name) {
-        // 代表已经有了进行切流
-        publish_config.publish_device = 4
-        publish_config.media_type = 1
-        publish_config.sid = document.getElementById('video20').name
-        publish_config.part_of_screen_id = 'touBoxItem'
-        publish_config.video_profile_type = 5
-        this.test_controller.ChangeMediaStream(publish_config);
-      } else {
-
-        publish_config.media_type = 1
-        publish_config.publish_device = 4
-        publish_config.need_volume_analyser = true
-        publish_config.video_profile_type = 5
-        publish_config.part_of_screen_id = 'touBoxItem';
-        publish_config.publish_video_id = 'video20'
-        publish_config.publish_streamId_id = 'subscribe_streamId10'
-        publish_config.publish_tag = 'projectionWhiteboard'
-        this.test_controller.Publish(publish_config)
-      }
+      const width = this.state.whiteboardWidth;
+      const height = this.state.whiteboardHeight;
+      const canvas = document.createElement('canvas');
+      const videoMedia = document.getElementById('manedvideo');
+      const cobj = canvas.getContext('2d'); // 获取绘图环境
+      const w = window.screen.width;
+      const h = window.screen.height;
+      canvas.width = width;
+      canvas.height = height;
+      videoMedia.addEventListener('play', (event) =>{
+        var $this = this; //cache
+        console.log('333111',!$this.paused,!$this.ended)
+        loop()
+        function loop() {
+            if (!$this.paused && !$this.ended) {
+              cobj.drawImage(videoMedia, 0, 0, width, height, 0, 0,width, height,);
+                setTimeout(loop, 1000 / 10); // drawing at 30fps
+            }
+        }
+        
+        if (document.getElementById('video20').name) {
+          // 代表已经有了进行切流
+          publish_config.publish_device = 5
+          publish_config.media_type = 1
+          publish_config.sid = document.getElementById('video20').name
+          publish_config.stream = canvas.captureStream(10)
+          publish_config.video_profile_type = 5
+          this.test_controller.ChangeMediaStream(publish_config);
+        } else {
+  
+          publish_config.media_type = 1
+          publish_config.publish_device = 5
+          publish_config.need_volume_analyser = true
+          publish_config.video_profile_type = 5
+          publish_config.stream = canvas.captureStream(10)
+          publish_config.publish_video_id = 'video20'
+          publish_config.publish_streamId_id = 'subscribe_streamId10'
+          publish_config.publish_tag = 'projectionWhiteboard'
+          this.test_controller.Publish(publish_config)
+        }
+    }, 0);
+      navigator.mediaDevices.getDisplayMedia({
+        video: true
+    })
+    .then((stream) => {
+      videoMedia.srcObject = stream;
+    }, error => {
+        console.log("Unable to acquire screen capture", error);
+    });
+      // if (document.getElementById('video20').name) {
+      //   // 代表已经有了进行切流
+      //   publish_config.publish_device = 4
+      //   publish_config.media_type = 1
+      //   publish_config.sid = document.getElementById('video20').name
+      //   publish_config.part_of_screen_id = 'touBoxItem'
+      //   publish_config.video_profile_type = 5
+      //   this.test_controller.ChangeMediaStream(publish_config);
+      // } else {
+
+      //   publish_config.media_type = 1
+      //   publish_config.publish_device = 4
+      //   publish_config.need_volume_analyser = true
+      //   publish_config.video_profile_type = 5
+      //   publish_config.part_of_screen_id = 'touBoxItem';
+      //   publish_config.publish_video_id = 'video20'
+      //   publish_config.publish_streamId_id = 'subscribe_streamId10'
+      //   publish_config.publish_tag = 'projectionWhiteboard'
+      //   this.test_controller.Publish(publish_config)
+      // }
     } else {
       this.messageClick('当前已经切换RM白板','success')
 
@@ -3470,15 +3538,15 @@ class Video extends Component {
                     id="video20"
                     autoPlay
                     muted={true}
-                    className="video"
+                    className="videoTab"
                   />
                   <audio id="audio20" autoPlay />
                   <label style={{ display: 'none' }} id="feedId20" type="text" />
                 </div>
 
               </div>
-              {/* <div className="videoDiv" style={{ display: (this.state.isSelect == 'RMWhiteboard') ? '' : 'none', }}> */}
-              <div className="videoDiv">
+              <div className="videoDiv" style={{ display: (this.state.isSelect == 'RMWhiteboard') ? '' : 'none', }}>
+              {/* <div className="videoDiv"> */}
                 <div id="touBoxItem">
                   {pdfChildren}
                 </div>
@@ -3489,7 +3557,7 @@ class Video extends Component {
                     id="video21"
                     autoPlay
                     muted={true}
-                    className="video"
+                    className="videoTab"
                   />
                   <audio id="audio21" autoPlay />
                   <label style={{ display: 'none' }} id="feedId21" type="text" />
@@ -3979,19 +4047,19 @@ 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 className='invitationDiv'>
+                <span  className="modalSpan">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
+                <Button style={{ display: this.state.employeeName? '' : 'none'}} 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'>
-              <img alt="" src={require("../../assets/img/tooltips2_fail.png").default} />
-              <span>{this.state.employeeError}</span>
+            
+            <div className={`errorClassInvitation ${this.state.employeeError ? 'errorClassInvitationColor' : ''}`}>
+              <img style={{ display: this.state.employeeError? '' : 'none'}} alt="" src={require("../../assets/img/tooltips2_fail.png").default} />
+              <span style={{ display: this.state.employeeError? '' : 'none'}}>{this.state.employeeError}</span>
               </div>
-            }
+            
             
           </Modal>
           <Modal title="签字白板" width={600} destroyOnClose={true} closable={false} centered={true} visible={isTranscribing} footer={
@@ -4035,6 +4103,8 @@ class Video extends Component {
             </div>
           </Modal>
           <video className="mixedvideo" id="mixedvideo" autoPlay muted={true} width="0" height="0"></video>
+          <video className="mixedvideo" id="manedvideo" autoPlay width="0" height="0"></video>
+
         </Spin>
       </div>);
   }

package/packages/pages/video/video.less

@@ -5,7 +5,7 @@
 .mixedvideo{
   display: none;
   position:absolute;
-  object-fit: contain
+  object-fit: cover
 }
 .imgClass{
   width: 100%;
@@ -50,13 +50,19 @@
   border-radius: 6px;
 }
 .videoFit{
-  object-fit: contain !important;
+  object-fit: cover !important;
 }
 // .isBack {
 //   transform: rotateY(180deg);
 //   // background: #333;
 // }
 .video1{
+  width: 100%;
+  height: 100%;
+  object-fit: cover;
+  border-radius: 6px;
+}
+.videoTab{
   width: 100%;
   height: 100%;
   object-fit: contain;
@@ -65,7 +71,7 @@
 .video{
   width: 100%;
   height: 100%;
-  object-fit: contain;
+  object-fit: cover;
   border-radius: 6px;
 }
 .video1Div{
@@ -77,7 +83,7 @@
   background: #f0f0f0;
 }
 .healthVideo{
-  height:  ~"calc(100vh - 150px)";
+  height:  ~"calc(100vh - 15.8125rem)";
   width: 100%;
   display: inline-flex;
 }
@@ -86,7 +92,7 @@
 }
 .ownClass{
   height: calc(100vh - 15px);
-  object-fit: contain;
+  object-fit: cover;
   width: 100%;
 }
 .publishVideoClass{
@@ -138,6 +144,7 @@
 .invitationDiv{
   margin-left: 40px;
   margin-bottom: 15px;
+  height: 27px;
   input::-webkit-inner-spin-button {
     -webkit-appearance: none;
     appearance: none;
@@ -453,12 +460,14 @@
 .radio input:checked+i:after {
   opacity: 1;
 }
+.errorClassInvitationColor{
+  background: #F9F2F3;
+  border: 1px #E5B2B5 solid;
+}
 .errorClassInvitation{
   width: 90%;
   height: 50px;
   margin: 50px 30px 0px;
-  background: #F9F2F3;
-  border: 1px #E5B2B5 solid;
     img{
       margin: 15px 20px;
       width: 18px;