react_hsbc_teller 1.5.4 → 1.5.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react_hsbc_teller",
-  "version": "1.5.4",
+  "version": "1.5.7",
   "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

@@ -38,23 +38,6 @@ let muteJson = new Map()
 let dateTime = 0
 let messageValue = ''
 let rateList = []
-var os = function() {
-  var ua = navigator.userAgent,
-  isWindowsPhone = /(?:Windows Phone)/.test(ua),
-  isSymbian = /(?:SymbianOS)/.test(ua) || isWindowsPhone,
-  isAndroid = /(?:Android)/.test(ua),
-  isFireFox = /(?:Firefox)/.test(ua),
-  isChrome = /(?:Chrome|CriOS)/.test(ua),
-  isTablet = /(?:iPad|PlayBook)/.test(ua) || (isAndroid && !/(?:Mobile)/.test(ua)) || (isFireFox && /(?:Tablet)/.test(ua)),
-  isPhone = /(?:iPhone)/.test(ua) && !isTablet,
-  isPc = !isPhone && !isAndroid && !isSymbian;
-  return {
-  isTablet: isTablet,
-  isPhone: isPhone,
-  isAndroid: isAndroid,
-  isPc: isPc
-  };
-  }();
 message.config({
   getContainer: ()=>document.getElementById('allHSBC')
 })
@@ -62,10 +45,8 @@ message.config({
 class Video extends Component {
   constructor(props) {
     super(props)
-		// this.cancel = axios.CancelToken.source()
 	}
   cancel = axios.CancelToken.source()
-  // signCanvas = React.createRef();
   state = {
     signNoClick: false,
     listVideoPicture: [],
@@ -525,6 +506,7 @@ class Video extends Component {
         //   height: 180
         // }
       ]
+      Array.isArray(res) ?
       res.map((item)=>{
         list.push({
           tag: item.tag,
@@ -533,6 +515,12 @@ class Video extends Component {
           width: item.width,
           height: item.height
         })
+      }) : list.push({
+        tag: 'VIDEO_SOURCE_SCREEN',
+          xPosition: 1290,
+          yPosition: 640,
+          width: 630,
+          height: 350
       })
       const filePath = 'recordId_' + new Date().valueOf();
       const recordParam = {};
@@ -574,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) {
@@ -1711,11 +1698,10 @@ class Video extends Component {
             errorType: -1
           })
         }
-      } else if (Mival.typeId == 4100 && Mival.data.sessionId == this.state.sessionId) {
+      } else if (Mival.typeId == 4001) {
         // 手机端停止投屏
-        if (!document.getElementById("video21").name) {
-          this.tabTitlesClick('customerScreen', 'delect')
-        }
+        this.tabTitlesClick('customerScreen', 'delect')
+        
       }
     };
     window.IMOpenfire = msg =>{
@@ -1752,9 +1738,9 @@ class Video extends Component {
     this.workerClick()
     rateList = []
     this.rateAll().then((res)=>{
-      res.map((item)=>{
+      Array.isArray(res) ? res.map((item)=>{
         rateList.push(item.tag)
-      })
+      }) : rateList = []
       console.log('rateList',rateList)
     })
     this.test_controller.GetDevices();
@@ -2259,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',
@@ -3192,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) {
@@ -3739,11 +3700,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)
     }
     
   };
@@ -4105,13 +4067,6 @@ class Video extends Component {
     }
   }
   navigatorClick=()=>{
-    if(os.isAndroid || os.isPhone) {
-      console.log("手机")
-      } else if(os.isTablet) {
-        console.log("平板")
-      } else if(os.isPc) {
-        console.log("电脑")
-      }
     const that = this
     const publish_config = {};
     const canvas = document.createElement('canvas');
@@ -4125,23 +4080,21 @@ class Video extends Component {
     let height = 0
     let x = 0
     let y = 0
-    // if(os.isTablet){
-      width = ((right - left)* window.screen.width / document.body.clientWidth) - 5
-      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
-    // }
-    // if(os.isPc) {
-    //   width = right - left
-    //   height = bottom - top
-    //   x = left
-    //   y = top
-    // }
+      // width = ((right - left)* window.screen.width / document.body.clientWidth) - 5
+      // 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;
-    // 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
@@ -4149,8 +4102,14 @@ class Video extends Component {
       loop()
       function loop() {
           if (!$this.paused && !$this.ended) {
-            cobj.drawImage(videoMedia, x, y, width, height, 0, 0,960, 540);
-              setTimeout(loop, 1000 / 10); // drawing at 30fps
+            // if(!that.state.tabTitles.find(el=>el.value == 'customerScreen')) {
+              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 / 20); // drawing at 30fps
           }
       }
       
@@ -4162,7 +4121,6 @@ class Video extends Component {
         publish_config.sid = document.getElementById('video20').name
         publish_config.stream = canvas.captureStream(10)
         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 {
 
@@ -4170,7 +4128,6 @@ class Video extends Component {
         publish_config.publish_device = 5
         publish_config.need_volume_analyser = true
         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'
@@ -4182,6 +4139,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) {
@@ -4189,18 +4150,12 @@ class Video extends Component {
       streamShare = ''
     }
     videoMedia.srcObject = stream;
-    // if(os.isTablet){
-      stream.getVideoTracks()[0].applyConstraints({
-        width: window.screen.width,
-        height: window.screen.height
-      })
-    // }
-    // if(os.isPc) {
-    //   stream.getVideoTracks()[0].applyConstraints({
-    //     width: document.body.clientWidth,
-    //     height: document.body.clientHeight - 50
-    //   })
-    // }
+      // stream.getVideoTracks()[0].applyConstraints({
+      //   width: 1280,
+      //   height: 720
+      //   // width: window.screen.width,
+      //   // height: window.screen.height
+      // })
     
     streamShare = stream
     stream.getVideoTracks()[0].onended = async ()=>{
@@ -4425,6 +4380,7 @@ class Video extends Component {
   sendNotification = () =>{
     console.log(this.props.shareMask,this.state.shareMaskState)
     this.state.shareMaskState = this.props.shareMask
+    // 加延迟是因为在关闭的时候可以看到部分rm的操作
     setTimeout(() => {
       callNimIM('sendCustomCmdMsg', {
         customId: this.state.imRoomId,