react_hsbc_teller 1.3.4 → 1.3.7

package/package.json

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

package/packages/pages/video/video.jsx

@@ -296,6 +296,7 @@ class Video extends Component {
     // initWebSocket('wss://im.uat.dsp.hsbcfts.com.cn:443/wealth/im/ws/')
     // initWebSocket('wss://' + JSON.parse(window.sessionStorage.getItem('sigData')).hostname + ':' + '15603' + '/ws/');
     if(!this.state.imStatus){
+      this.state.manualClose = false
       initWebSocket('wss://' + JSON.parse(window.sessionStorage.getItem('sigData')).hostname + ':' + JSON.parse(window.sessionStorage.getItem('sigData')).webPort + '/ws/');
 
     }
@@ -376,7 +377,7 @@ class Video extends Component {
     recordParam.startTimeout = 10;
     recordParam.splitType = 0;
     recordParam.endType = 1;
-    recordParam.crf = 30
+    recordParam.crf = 26
     recordParam.overlaps = [
       {
         tag: '', // 流 tag，如果不设置或为空，则为全局⽔印
@@ -400,9 +401,9 @@ class Video extends Component {
     },
     {
       tag: 'VIDEO_SOURCE_SCREEN',
-      xPosition: 1280,
+      xPosition: 1290,
       yPosition: 630,
-      width: 640,
+      width: 630,
       height: 360
     },
     {
@@ -1872,6 +1873,13 @@ class Video extends Component {
         this.state.rtoken = '',
         this.state.sessionId = '',
         this.state.imRoomId = ''
+        this.state.imJoinRoom = false
+        if(this.state.imStatus) {
+          console.log('disconnect断开连接')
+          this.state.manualClose = true
+          this.state.imStatus = false
+          disconnect();
+        }
       this.test_controller.Disconnect()
       let data = {
         account: this.props.tellerAccount,
@@ -2342,7 +2350,6 @@ class Video extends Component {
         }, function (code, message, data) {
           console.log(data)
         })
-        setTimeout(() => {
       let array = this.state.roomCustomerList;
       let newArray = [...array];
       newArray.push({
@@ -2397,24 +2404,6 @@ class Video extends Component {
 
           }
         } else {
-          //     let data_param = {
-          //       isVideo: true,
-          //       videoIndex: this.state.videoList.length + 1,
-          //       videoTwoName: ''
-          //     }
-          //     let videoList = this.state.videoList;
-          // let newvideoList = [...videoList];
-          // newvideoList.push(data_param);
-          //     this.setState({
-          //       videoList: newvideoList
-          //     },()=>{
-          // config_param = {
-          //   subscribe_video_id: 'video' + this.state.videoList.length,
-          //   subscribe_audio_id: 'audio' + this.state.videoList.length,
-          //   subscribe_streamId_id: 'subscribe_streamId' + this.state.videoList.length,
-          //   feedId_id: 'feedId' + this.state.videoList.length,
-          //   feedId: feed.feedId
-          // }
           if (!document.getElementById('video1').name) {
             config_param = {
               subscribe_video_id: 'video1',
@@ -2526,19 +2515,11 @@ class Video extends Component {
           if (config_param !== undefined) {
             config_param.need_volume_analyser = true
             console.log(config_param)
-
-            
-              this.test_controller.Subscribe(config_param)
-            
-
+            this.test_controller.Subscribe(config_param)
           }
-          // })
-
-
         }
 
       }
-    }, 2000);
     };
     // 推送“有新订阅”给与会者
     this.test_controller.OnNewSubscribe = (subscriber, feed) => {
@@ -4005,6 +3986,9 @@ class Video extends Component {
       this.signCanvas.current.canvas.drawing.toDataURL('image/png').replace(/data.+?;base64,/, "")
     )
   }
+  handleCancelSign=()=>{
+    this.signCanvas.current.clear()
+  }
 
   navigatorClick=()=>{
     const that = this
@@ -4017,22 +4001,25 @@ class Video extends Component {
     const top = document.getElementById("whiteboardDIV").getBoundingClientRect().top
     const bottom = document.getElementById("whiteboardDIV").getBoundingClientRect().bottom
     const width = (right - left)* window.screen.width / document.body.clientWidth
-    const height = (bottom - top)* window.screen.width / (document.body.clientWidth)
+    const height = ((bottom - top)* window.screen.width / document.body.clientWidth) - 50
     const x = left * window.screen.width / document.body.clientWidth
-    const y = top* window.screen.width / (document.body.clientWidth)
-    canvas.width = width;
-    canvas.height = height;
+    const y = top* window.screen.width / document.body.clientWidth
+    canvas.width = 1280;
+    canvas.height = 720;
+    cobj.fillStyle = 'rgb(255 255 255)'
+    cobj.fillRect(0,0,1280,720)
     // const height1 = document.getElementById("whiteboardDIV").getBoundingClientRect().height* window.screen.height / (document.body.clientHeight + 280)
 
     videoMedia.addEventListener('play', (event) =>{
       var $this = this; //cache
-      console.log('addEventListener',!$this.paused,!$this.ended)
+      console.log('addEventListener',!$this.paused,!$this.ended,x, y, width, height)
       loop()
       function loop() {
           if (!$this.paused && !$this.ended) {
             
             // console.log('addEventListener',x,y,width,height1,height)
-            cobj.drawImage(videoMedia, x, y, width, height, 0, 0,width, height);
+            
+            cobj.drawImage(videoMedia, x, y, width, height, 0, 0,1280, 720);
               setTimeout(loop, 1000 / 10); // drawing at 30fps
           }
       }
@@ -4044,16 +4031,16 @@ class Video extends Component {
         publish_config.degradationType=2
         publish_config.sid = document.getElementById('video20').name
         publish_config.stream = canvas.captureStream(10)
-        publish_config.video_profile_type=100
-        publish_config.video_profile_diy={width:1280, height:720, frameRate:8, bitrate:1500}
+        publish_config.video_profile_type=1
+        // publish_config.video_profile_diy={width:1280, height:720, frameRate:8, bitrate:1500}
         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=100
-        publish_config.video_profile_diy={width:1280, height:720, frameRate:8, bitrate:1500}
+        publish_config.video_profile_type=1
+        // publish_config.video_profile_diy={width:1280, height:720, frameRate:8, bitrate:1500}
         publish_config.degradationType=2
         publish_config.stream = canvas.captureStream(10)
         publish_config.publish_video_id = 'video20'
@@ -4992,6 +4979,7 @@ class Video extends Component {
           <Modal title="签字白板" width={600} destroyOnClose={true} closable={false} centered={true} visible={isTranscribing} footer={
             [
               <div key='okSign'>
+                <Button className="modelButtonCancel" onClick={this.handleCancelSign}>清除</Button>
               <Button className="modelButtonOk" type="primary" danger onClick={this.handleOkSign}>确定</Button>
               </div>
             ]