react_hsbc_teller 2.0.42 → 2.0.44

package/package.json

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

package/packages/pages/video/video.jsx

@@ -60,7 +60,7 @@ import MultiModule from '../multiModule/multiModule'//签字、抄录
 import axios from 'axios';
 import CryptoJS from "crypto-js";
 
-const SDK_VERISON = '2.0.42'
+const SDK_VERISON = '2.0.44'
 const IDtypeFront = '请客户在其设备后置摄像头下展示证件正面（如：身份证照片页面）'
 const IDtypeBack = '请在后置摄像头下展示证件反面（如：身份证国徽页）'
 const { Option } = Select;
@@ -85,6 +85,7 @@ const POINT_TYPE = {
 const RECORD_DEVICE_NAME = 'screen-capture-recorder'
 // const RECORD_DEVICE_NAME = 'Full HD webcam'
 const IPAD_SUFFIX = '_ipad'
+const H5_SUFFIX = '_h5'
 let media_status = 0
 let pictureInPictureVideo
 let mix_stream
@@ -1405,6 +1406,7 @@ class Video extends Component {
         let microphoneSize = 50
         var img = document.getElementById("icon_huatong");
         var img1 = document.getElementById("icon_huatong_close");
+        if (!this.state.listVideoPicture[i].title.includes(IPAD_SUFFIX)) {
         if (this.state.listVideoPicture[i].mute) {
           cobj.drawImage(img1, 10, 360 * (i + 1) - 60 + baseStartHeight, microphoneSize, microphoneSize);
         } else {
@@ -1451,9 +1453,7 @@ class Video extends Component {
               // requestAnimationFrame(aou.bind(this, analyser)) 
             )
           }
-
-
-
+        }
         }
 
         // 绘制消息
@@ -2465,7 +2465,7 @@ class Video extends Component {
         return newStream
       }
 
-      if (publish_tag == 'projectionWhiteboard' && publish_device == 2) {
+      if (publish_tag == 'projectionWhiteboard' && (publish_device == 2 || publish_device == 5)) {
         let newStream1 = stream;
         if (stream.getVideoTracks()[0]) {
           try {
@@ -2480,7 +2480,10 @@ class Video extends Component {
             } else if (stream.getVideoTracks()[0].label.includes('window')){
               console.log('窗口共享')
               this.saveLog('Share type = window')
-            } 
+            } else if (stream.getVideoTracks()[0] instanceof CanvasCaptureMediaStreamTrack){
+              console.log('白板共享')
+              this.saveLog('Share type = whiteboard')
+            }
           } catch (err) {
             console.log('不支持此浏览器记录投屏类型日志')
             console.log(navigator.userAgent)
@@ -2531,6 +2534,7 @@ class Video extends Component {
       this.state.sessionType = true
       if (sid == document.getElementById('video20').name) {
         this.setSharedScreenState(true)
+        this.saveLog('Share success')
         this.sendMessage({
           'typeId': 2030,
           'sessionId': this.state.sessionId,
@@ -2598,9 +2602,10 @@ class Video extends Component {
       if (sid == document.getElementById('publish_streamId1').name) {
         this.state.sessionType = false
         this.roomCallBack(2, '发布失败', 4)
-      } else if (sid == document.getElementById('video20').name) {
+      } else {
         this.messageClick('投屏失败请重新投屏', 'error')
         this.setSharedScreenState(false)
+        this.saveLog('Share fail')
       }
 
     };
@@ -2729,6 +2734,12 @@ class Video extends Component {
       if (participant.includes(IPAD_SUFFIX) && this.state.businessId){
         this.saveVideoPoint('padConnected', 'ipad已连接');
       }
+      if (participant.includes(H5_SUFFIX)){
+        this.messageClick('客户端已就绪，可进行签署', 'error')
+        if (typeof this.props.h5JoinCallback === 'function'){
+          this.props.h5JoinCallback()
+        }
+      }
     };
     // 推送“有新发布”给与会者
     this.test_controller.OnNewPublish = (feed) => {
@@ -2853,6 +2864,7 @@ class Video extends Component {
         })
         this.state.isSharedScreen = false
         this.setSharedScreenState(false)
+        this.saveLog('Stop share')
         this.setState({
 
           screenName: '共享模式'
@@ -3328,6 +3340,7 @@ class Video extends Component {
           this.state.isSharedScreen = true
           this.state.isScreenSwitching = false
           this.setSharedScreenState(true)
+          this.saveLog('Share changed')
         }
       }
     };
@@ -3349,6 +3362,7 @@ class Video extends Component {
         this.state.isSharedScreen = false
         this.state.isScreenSwitching = false
         this.setSharedScreenState(false)
+        this.saveLog('Share fail')
         this.setState({
           screenName: '共享模式'
         });
@@ -4024,9 +4038,13 @@ class Video extends Component {
         appCode: `HSBCCode`
       }).then((re) => {
         if (re.data.match) {
-          console.log('匹配到敏感词', re.data.matchRawTextItems)
-          let matchArr = re.data.matchRawTextItems.map(el => el.matchedText);
-          this.saveVideoPoint('pwd', `${resultValue}`, matchArr.toString())
+          let matchArr = re.data.matchRawTextItems.map(el => el.matchedRawKeywords);
+          let resultFormat = resultValue;
+          re.data.matchRawTextItems.sort((a,b)=> b.matchedText.length - a.matchedText.length).forEach(el => {
+            resultFormat = resultFormat.replace(el.matchedText, el.matchedRawKeywords)
+          })
+          console.log('敏感词：', resultValue, resultFormat)
+          this.saveVideoPoint('pwd', `${resultFormat}`, matchArr.toString())
           if (matchArr.length>0) {
             this.messageClick('检测到敏感词:' + matchArr, 'error')
           }
@@ -6750,6 +6768,7 @@ class Video extends Component {
                     <label style={{ display: 'none' }} id={'feedId'+(item.idIndex)} type="text" />
                     
                     <div onClick={this.muteOpposite.bind(this, 'video'+(item.idIndex))} style={{ display: (item.videoName) ? '' : 'none'}} className={`customerTitle titleSamlle`}>
+                    { item.videoName.includes(IPAD_SUFFIX) ? <span style={{paddingLeft: '8px'}}> </span>:<>
                     {
                       item.mute && <img
                         alt=""
@@ -6758,7 +6777,7 @@ class Video extends Component {
                       />
                     }
                     <canvas style={{ display: (item.videoName && !item.mute) ? '' : 'none',width: '25px',height:'25px',marginTop: '4px' }} className="canvasClassOne" id={"subscribe_volumeView"+(item.idIndex)} width="40" height="70"></canvas>
-
+                    </>}
                       <div className='titleName' style={{ color: this.props.titleColor,fontSize: this.props.fontSize + 'px',fontFamily : this.props.fontFamily}}>
                         {item.videoName}
                       </div>