react_hsbc_teller 1.7.0 → 1.7.3

package/package.json

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

package/packages/demo/pdf.js

@@ -55,8 +55,9 @@ handleResourcePath = (event) => {
 }
 
   render() {
+    console.log('22',this.props)
     return (
-      <div className="test">
+      <div className="test" style={{width: this.props.width,height:this.props.height}}>
                 {
                         <div>
                             坐席账号：<input placeholder="请输入坐席账号" value={this.state.tellerAccount} onChange={e => this.handleChangeTeller(e)}></input>

package/packages/pages/video/video.jsx

@@ -46,10 +46,6 @@ let rateList = []
 let beautyDiv = {};
 let CanvasHome = styled.div`
   position: fixed;
-  width: 76vw;
-  height: 74vh;
-  top: 3vh;
-  left: 1.5vw;
   z-index: ${props=>props.zIndexNum};
 
   .canvas{
@@ -112,6 +108,8 @@ class Video extends Component {
     isScreenSwitching: false,
     whiteboardWidth: '',
     whiteboardHeight: '',
+    whiteboardTop: '',
+    whiteboardLeft: '',
     laveRoomSharedScreen: false,
     isJoinRoom: false,
     sessionType: false,
@@ -375,8 +373,8 @@ class Video extends Component {
   mpaasSig = async data => {
     console.log(data);
     try {
-      // let result = JSON.parse(this.decrypt(await API.mpaasSig({ ciphertext: this.encrypt({account: data.account, type: data.type})})));
-      let result = await API.mpaasSig({account: data.account, type: data.type});
+      let result = JSON.parse(this.decrypt(await API.mpaasSig({ ciphertext: this.encrypt({account: data.account, type: data.type})})));
+      // let result = await API.mpaasSig({account: data.account, type: data.type});
       console.log('mpaasSig',result,result.mpsSig);
       window.sessionStorage.setItem('alimpassSig', result.mpsSig);
         this.state.workSpaceId = result.workspaceId,
@@ -496,9 +494,9 @@ class Video extends Component {
         {
           tag: 'projectionWhiteboard',
           xPosition: 0,
-          yPosition: 175,
-          width: 960,
-          height: 540
+          yPosition: 270,
+          width: 1280,
+          height: 720
         },
         // {
         //   tag: 'VIDEO_SOURCE_SCREEN_ONE',
@@ -518,43 +516,43 @@ class Video extends Component {
           tag: 'tag1',
           xPosition: 0,
           yPosition: 0,
-          width: 213,
-          height: 175
+          width: 310,
+          height: 180
         },
         {
           tag: 'customer1',
-          xPosition: 213,
+          xPosition: 320,
           yPosition: 0,
-          width: 213,
-          height: 175
+          width: 310,
+          height: 180
         },
         {
           tag: 'customer2',
-          xPosition: 426,
+          xPosition: 640,
           yPosition: 0,
-          width: 213,
-          height: 175
+          width: 310,
+          height: 180
         },
         {
           tag: 'customer3',
-          xPosition: 639,
+          xPosition: 960,
           yPosition: 0,
-          width: 213,
-          height: 175
+          width: 310,
+          height: 180
         },
         {
           tag: 'customer4',
-          xPosition: 852,
+          xPosition: 1280,
           yPosition: 0,
-          width: 213,
-          height: 175
+          width: 310,
+          height: 180
         },
         {
           tag: 'customer5',
-          xPosition: 1065,
+          xPosition: 1600,
           yPosition: 0,
-          width: 213,
-          height: 175
+          width: 310,
+          height: 180
         },
         // {
         //   tag: 'customer6',
@@ -608,25 +606,17 @@ class Video extends Component {
           width: item.width,
           height: item.height
         })
-      }) : 
-      list.push({
+      }) : list.push({
         tag: 'VIDEO_SOURCE_SCREEN',
-          xPosition: 960,
-          yPosition: 535,
-          width: 320,
-          height: 180
+          xPosition: 1290,
+          yPosition: 640,
+          width: 630,
+          height: 350
       })
-      // list.push({
-      //   tag: 'VIDEO_SOURCE_SCREEN_19_9',
-      //     xPosition: 960,
-      //     yPosition: 573,
-      //     width: 304,
-      //     height: 144
-      // })
       const filePath = 'recordId_' + new Date().valueOf();
       const recordParam = {};
-      recordParam.width = 1280;
-      recordParam.height = 720;
+      recordParam.width = 1920;
+      recordParam.height = 1080;
       recordParam.recordTotalStream = 0;
       recordParam.startTimeout = 10;
       recordParam.splitType = 0;
@@ -1827,6 +1817,72 @@ class Video extends Component {
         // 手机端停止投屏
         this.tabTitlesClick('customerScreen', 'delect')
         
+      } else if (Mival.typeId == 1401) {
+        if (Mival.sessionId == this.state.sessionId) {
+          if (Mival.userId == this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId1").innerText).uid) {
+            this.setState({
+              videoOneName: Mival.name
+            })
+
+          }
+          if (Mival.userId == (document.getElementById("feedId2").innerText ? this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId2").innerText).uid : '')) {
+            this.setState({
+              videoTwoName: Mival.name
+            })
+          }
+          if (Mival.userId == (document.getElementById("feedId3").innerText ? this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId3").innerText).uid : '')) {
+            this.setState({
+              videoThreeName: Mival.name
+            })
+          }
+          if (Mival.userId == (document.getElementById("feedId4").innerText ? this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId4").innerText).uid : '')) {
+            this.setState({
+              videoFourName: Mival.name
+            })
+          }
+          if (Mival.userId == (document.getElementById("feedId5").innerText ? this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId5").innerText).uid : '')) {
+            this.setState({
+              videoFiveName: Mival.name
+            })
+          }
+          if (Mival.userId == (document.getElementById("feedId6").innerText ? this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId6").innerText).uid : '')) {
+            this.setState({
+              videoSixName: Mival.name
+            })
+          }
+
+          if (Mival.userId == (document.getElementById("feedId7").innerText ? this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId7").innerText).uid : '')) {
+            this.setState({
+              videoSevenName: Mival.name
+            })
+          }
+          if (Mival.userId == (document.getElementById("feedId8").innerText ? this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId8").innerText).uid : '')) {
+            this.setState({
+              videoEightName: Mival.name
+            })
+          }
+          if (Mival.userId == (document.getElementById("feedId9").innerText ? this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId9").innerText).uid : '')) {
+            this.setState({
+              videoNineName: Mival.name
+            })
+          }
+          if (Mival.userId == (document.getElementById("feedId10").innerText ? this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId10").innerText).uid : '')) {
+            this.setState({
+              videoTenName: Mival.name
+            })
+          }
+          if (Mival.userId == (document.getElementById("feedId11").innerText ? this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId11").innerText).uid : '')) {
+            this.setState({
+              videoElevenName: Mival.name
+            })
+          }
+          if (Mival.userId == (document.getElementById("feedId12").innerText ? this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId12").innerText).uid : '')) {
+            this.setState({
+              videoTwelveName: Mival.name
+            })
+          }
+
+        }
       }
     };
     window.IMOpenfire = msg =>{
@@ -2163,6 +2219,14 @@ class Video extends Component {
         }
       } 
       if(sid == document.getElementById('publish_video1').name) {
+        var box=document.getElementById("whiteboardDIV");
+       if(box){ //此处在加一层判断，更加严密，如果box存在的情况下获取
+        this.setState({
+          whiteboardTop: box.getBoundingClientRect().top * 1.08 - 40,
+          whiteboardLeft: box.getBoundingClientRect().left
+        })
+           console.log('whiteboardDIV',this.state.whiteboardTop,this.state.whiteboardLeft)
+       }
         this.setState({
 
           loading: false,
@@ -3534,6 +3598,8 @@ userType:'1'
 
       this.props.resourcePath + "/eruda.js",
       this.props.resourcePath + "/iconfont.js",
+      this.props.resourcePath + "/html2canvas.js",
+      this.props.resourcePath + "/dom-to-image.js",
       
 
         
@@ -3724,7 +3790,7 @@ userType:'1'
           // publish_config.video_profile_diy={width:1280, height:720, frameRate:8, bitrate:1500}
           publish_config.enableDesktopAudio=true
           publish_config.degradationType=2
-          publish_config.desktopStreamToCanvas=true
+          publish_config.desktopStreamToCanvas=false
           publish_config.sid = document.getElementById('video20').name
           this.test_controller.ChangeMediaStream(publish_config)
           this.state.isScreenSwitching = true
@@ -3736,7 +3802,7 @@ userType:'1'
             // publish_config.video_profile_type=100
             // publish_config.video_profile_diy={width:1280, height:720, frameRate:8, bitrate:1500}
             publish_config.enableDesktopAudio=true
-            publish_config.desktopStreamToCanvas=true
+            publish_config.desktopStreamToCanvas=false
             publish_config.degradationType=2
             publish_config.sid = document.getElementById('video20').name;
             this.test_controller.ChangeMediaStream(publish_config);
@@ -3745,7 +3811,7 @@ userType:'1'
             publish_config.publish_device = 2
             publish_config.need_volume_analyser = true
             publish_config.video_profile_type = 1
-            publish_config.desktopStreamToCanvas=true
+            publish_config.desktopStreamToCanvas=false
             // publish_config.video_profile_type=100
             // publish_config.video_profile_diy={width:1280, height:720, frameRate:8, bitrate:1500}
             publish_config.enableDesktopAudio=true
@@ -3770,8 +3836,22 @@ userType:'1'
           if (!this.state.isPictureInPicture) {
             this.pictureInPicture()
           }
-  
+
+          
         }
+        // const publish_config1 = {};
+        //   publish_config1.publish_device = 4;
+        //   publish_config1.media_type = 1;
+        //   publish_config1.part_of_screen_id = 'whiteboardDIV';
+        //   publish_config1.video_profile_type = 2;
+        //   publish_config1.degradationType=2
+        //   publish_config1.publish_video_id = 'video30';
+        //   publish_config1.publish_tag = 'projectionWhiteboard';
+        //   publish_config1.capture_interval = 200
+        //   publish_config1.capture_mode = 2
+        //   publish_config.capture_lib =  'dom2image'
+        //   publish_config1.listen_events = ['keyup', 'scroll', 'click','touchstart','touchend','touchmove','mousemove']
+        //   this.test_controller.Publish(publish_config1)
       } else {
         this.messageClick('internal staff正在共享屏幕，请先关闭','error')
       }
@@ -4644,7 +4724,9 @@ userType:'1'
        if(box){ //此处在加一层判断，更加严密，如果box存在的情况下获取
             this.state.whiteboardWidth = box.offsetWidth,
             this.state.whiteboardHeight = box.offsetHeight  * 0.92,
-           console.log('whiteboardDIV', this.state.whiteboardHeight,box.clientHeight,this.state.whiteboardWidth)
+            this.state.whiteboardTop = box.getBoundingClientRect().top * 1.08 - 40
+            this.state.whiteboardLeft = box.getBoundingClientRect().left
+           console.log('whiteboardDIV', this.state.whiteboardHeight,this.state.whiteboardWidth,this.state.whiteboardTop,this.state.whiteboardLeft)
        }
   }
   muteOpposite = (value) => {
@@ -4933,7 +5015,7 @@ userType:'1'
             {tabTitleList}
             {/* <img style={sectionStyle} src={require("../../assets/img/placeholder_bg.png").default} alt="" /> */}
             <div id="whiteboardDIV" style={{height: 'calc(100% - 33px)'}}>
-            <CanvasHome zIndexNum={this.state.zIndexNum} style={{width: this.state.whiteboardWidth,height: this.state.whiteboardHeight}}>
+            <CanvasHome zIndexNum={this.state.zIndexNum} style={{width: this.state.whiteboardWidth + 'Px',height: this.state.whiteboardHeight + 'Px',top: this.state.whiteboardTop + 'Px',left:this.state.whiteboardLeft + 'Px'}}>
           {this.state.operateShow &&
             <OpreateDiv id="operate">
               <span style={{color: this.state.selectSpan == 'pen' ?  '#1890ff' : '#333'}} onClick={() => this.setTool('pen')}>铅笔</span>
@@ -5577,6 +5659,8 @@ userType:'1'
           </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>
+          <video className="mixedvideo" id="video30" autoPlay width="0" height="0"></video>
+          
 
         </Spin>
       </div>);