react_hsbc_teller 1.5.5 → 1.5.8

package/package.json

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

package/packages/api/api.js

@@ -358,16 +358,16 @@ class API extends Server{
   async contrastFaceVerify(params = {}){
     try{
       let result = await this.axios('post', '/hsbc/contrastFaceVerify', params); 
-      if(result && result.code === 200){
+      // if(result && result.code === 200){
         return result;
-      }else{
-        let err = {
-          tip: '上传图片失败',
-          response: result,
-          data: params,
-        }
-        throw err;
-      }
+      // }else{
+      //   let err = {
+      //     tip: '人脸识别失败',
+      //     response: result,
+      //     data: params,
+      //   }
+      //   throw err;
+      // }
     }catch(err){
       throw err;
     }

package/packages/pages/video/video.jsx

@@ -562,13 +562,12 @@ class Video extends Component {
       })
     }
   };
-  contrastFaceVerify = async data => {
-    console.log(data);
+  contrastFaceVerify = async () => {
     try {
       let result = await API.contrastFaceVerify({
         appAccount: this.state.faceCustomerUid,
         sessionId: this.state.sessionId,
-        imagePath: data
+        fileBase64: this.state.facialImg.replace(/^data:image\/\w+;base64,/,"")
       });
       console.log(result);
       if (result.code == 200) {
@@ -2246,7 +2245,8 @@ class Video extends Component {
             console.log(array, newArray, this.state.roomCustomerList);
               this.state.roomCustomerList = newArray
             let config_param
-            if (itemOne.tag == 'VIDEO_SOURCE_SCREEN') {
+            if (rateList.indexOf(itemOne.tag) > -1) {
+            // itemOne.tag == 'VIDEO_SOURCE_SCREEN'
               config_param = {
                 subscribe_video_id: 'video21',
                 subscribe_audio_id: 'audio21',
@@ -3179,32 +3179,6 @@ class Video extends Component {
       }
     }
   }
-  contrastFaceVerify = async data => {
-    console.log(data);
-    try {
-      let result = await API.contrastFaceVerify({
-        appAccount: this.state.faceCustomerUid,
-        sessionId: this.state.sessionId,
-        imagePath: data
-      });
-      console.log(result);
-      if (result.code == 200) {
-        this.messageClick('人脸识别成功','success')
-        this.setState({
-          isModalVisibleFacial: false
-        })
-      } else {
-        this.messageClick('人脸识别失败','error')
-      }
-
-
-    } catch (err) {
-      console.error(err);
-      if(err.status == 502 || err.status== 404) {
-        this.roomCallBack(2, '连接服务器失败','SYS-02')
-      }
-    }
-  };
   componentWillUnmount() {
     
     if (this.state.roomCustomerList.length == 0 && this.state.sessionType) {
@@ -3538,6 +3512,7 @@ class Video extends Component {
           // 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.sid = document.getElementById('video20').name
           this.test_controller.ChangeMediaStream(publish_config)
           this.state.isScreenSwitching = true
@@ -3549,6 +3524,7 @@ class Video extends Component {
             // 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.degradationType=2
             publish_config.sid = document.getElementById('video20').name;
             this.test_controller.ChangeMediaStream(publish_config);
@@ -3557,6 +3533,7 @@ class Video extends Component {
             publish_config.publish_device = 2
             publish_config.need_volume_analyser = true
             publish_config.video_profile_type = 1
+            publish_config.desktopStreamToCanvas=true
             // publish_config.video_profile_type=100
             // publish_config.video_profile_diy={width:1280, height:720, frameRate:8, bitrate:1500}
             publish_config.enableDesktopAudio=true
@@ -3726,11 +3703,12 @@ class Video extends Component {
       this.ocrCallback()
       
     } else {
-      const frontIdcard = new File([this.dataURLtoFile(this.state.facialImg, 'image/jpeg')], new Date() + '.png'); // 重命名了
-    const formData = new FormData();
-    formData.append('file', frontIdcard);
-    formData.append('sessionId', this.state.sessionId);
-    this.uploadImg(formData)
+      this.contrastFaceVerify()
+    //   const frontIdcard = new File([this.dataURLtoFile(this.state.facialImg, 'image/jpeg')], new Date() + '.png'); // 重命名了
+    // const formData = new FormData();
+    // formData.append('file', frontIdcard);
+    // formData.append('sessionId', this.state.sessionId);
+    // this.uploadImg(formData)
     }
     
   };
@@ -4109,6 +4087,14 @@ class Video extends Component {
       height = ((bottom - top)* window.screen.width / document.body.clientWidth) - 30
       x = (left * window.screen.width / document.body.clientWidth)
       y = (top* window.screen.width / document.body.clientWidth) + 8
+      // width = ((right - left)* 1280 / document.body.clientWidth) - 5
+      // height = ((bottom - top)* 1280 / document.body.clientWidth) - 30
+      // x = (left* 1280 / document.body.clientWidth)
+      // y = (top* 1280 / document.body.clientWidth) + 8
+      // width = ((right - left)) - 5
+      // height = ((bottom - top)) - 30
+      // x = (left)
+      // y = (top) + 8
     canvas.width = 960;
     canvas.height = 540;
     
@@ -4120,13 +4106,14 @@ class Video extends Component {
       function loop() {
           if (!$this.paused && !$this.ended) {
             // if(!that.state.tabTitles.find(el=>el.value == 'customerScreen')) {
+              console.log('addEventListener',x, y, width, height)
               cobj.drawImage(videoMedia, x, y, width, height, 0, 0,960, 540);
             // } else {
             //   cobj.fillStyle = 'rgb(0 0 0)'
             //   cobj.fillRect(0,0,960,540)
             // }
             
-              setTimeout(loop, 1000 / 10); // drawing at 30fps
+              setTimeout(loop, 1000 / 20); // drawing at 30fps
           }
       }
       
@@ -4156,6 +4143,10 @@ class Video extends Component {
     navigator.mediaDevices.getDisplayMedia({
       video: true,
       preferCurrentTab:true,
+      // video: {
+      //   width: document.body.clientWidth,
+      //   height: document.body.clientHeight
+      // }
   })
   .then((stream) => {
     if(streamShare) {
@@ -4164,6 +4155,8 @@ class Video extends Component {
     }
     videoMedia.srcObject = stream;
       stream.getVideoTracks()[0].applyConstraints({
+        // width: 1280,
+        // height: 720
         width: window.screen.width,
         height: window.screen.height
       })
@@ -4391,7 +4384,8 @@ class Video extends Component {
   sendNotification = () =>{
     console.log(this.props.shareMask,this.state.shareMaskState)
     this.state.shareMaskState = this.props.shareMask
-    // setTimeout(() => {
+    // 加延迟是因为在关闭的时候可以看到部分rm的操作
+    setTimeout(() => {
       callNimIM('sendCustomCmdMsg', {
         customId: this.state.imRoomId,
         content: JSON.stringify({
@@ -4400,7 +4394,7 @@ class Video extends Component {
           'type': this.state.shareMaskState ? 1 : 2
         })
       });
-    // },100)
+    },100)
     
   }
   componentDidUpdate(prevProps){