react_hsbc_teller 1.6.4 → 1.6.7

package/package.json

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

package/packages/api/api.js

@@ -241,24 +241,6 @@ class API extends Server{
       throw err;
     }
   }
-  async finishSession(params = {}){
-    try{
-      let result = await this.axios('post', '/teller/finish/session', params); 
-      if(result){
-        return result||[];
-      }else{
-        let err = {
-          tip: '',
-          response: result,
-          data: params,
-          // url: 'https://api.cangdu.org/shopro/data/products',
-        }
-        throw err;
-      }
-    }catch(err){
-      throw err;
-    }
-  }
   /**
    *  用途：发送客户姓名给行内
    *  返回200表示成功

package/packages/pages/foot/foot.jsx

@@ -148,14 +148,14 @@ export default class foot extends Component {
                                   </div>
                               </div>
                       }
-                      {
+                      {/* {
                           item == 'BEAUTY' && <div className="one" onClick={this.beautyClick.bind(this)}>
                           <img className="imgClass" src={require("../../assets/img/meiyan.png").default} alt="" />
                           <div className="text">
                           {beautyName}
                           </div>
                       </div>
-                      }
+                      } */}
                           </div>
                             
                       })

package/packages/pages/video/video.jsx

@@ -430,9 +430,9 @@ class Video extends Component {
         {
           tag: 'projectionWhiteboard',
           xPosition: 0,
-          yPosition: 270,
-          width: 1280,
-          height: 720
+          yPosition: 175,
+          width: 960,
+          height: 540
         },
         // {
         //   tag: 'VIDEO_SOURCE_SCREEN_ONE',
@@ -452,43 +452,43 @@ class Video extends Component {
           tag: 'tag1',
           xPosition: 0,
           yPosition: 0,
-          width: 310,
-          height: 180
+          width: 213,
+          height: 175
         },
         {
           tag: 'customer1',
-          xPosition: 320,
+          xPosition: 213,
           yPosition: 0,
-          width: 310,
-          height: 180
+          width: 213,
+          height: 175
         },
         {
           tag: 'customer2',
-          xPosition: 640,
+          xPosition: 426,
           yPosition: 0,
-          width: 310,
-          height: 180
+          width: 213,
+          height: 175
         },
         {
           tag: 'customer3',
-          xPosition: 960,
+          xPosition: 639,
           yPosition: 0,
-          width: 310,
-          height: 180
+          width: 213,
+          height: 175
         },
         {
           tag: 'customer4',
-          xPosition: 1280,
+          xPosition: 852,
           yPosition: 0,
-          width: 310,
-          height: 180
+          width: 213,
+          height: 175
         },
         {
           tag: 'customer5',
-          xPosition: 1600,
+          xPosition: 1065,
           yPosition: 0,
-          width: 310,
-          height: 180
+          width: 213,
+          height: 175
         },
         // {
         //   tag: 'customer6',
@@ -542,17 +542,25 @@ class Video extends Component {
           width: item.width,
           height: item.height
         })
-      }) : list.push({
+      }) : 
+      list.push({
         tag: 'VIDEO_SOURCE_SCREEN',
-          xPosition: 1290,
-          yPosition: 640,
-          width: 630,
-          height: 350
+          xPosition: 960,
+          yPosition: 535,
+          width: 320,
+          height: 180
       })
+      // 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 = 1920;
-      recordParam.height = 1080;
+      recordParam.width = 1280;
+      recordParam.height = 720;
       recordParam.recordTotalStream = 0;
       recordParam.startTimeout = 10;
       recordParam.splitType = 0;
@@ -564,7 +572,7 @@ class Video extends Component {
           type: 1, // 1 为时间戳⽔印；2 为⽂字⽔印；3 为图⽚⽔印
           id: 1, // ⽔印 ID
           enable: true,
-          xPosition: 10, // x 轴位置
+          xPosition: 1000, // x 轴位置
           yPosition: 10, // y 轴位置
           text: '', // ⽔印⽂字
           fontSize: 16, // 字体⼤⼩
@@ -614,6 +622,8 @@ class Video extends Component {
   contrastFaceVerify = async () => {
     try {
       let result = await API.contrastFaceVerify({
+        staffId: this.props.tellerAccount,
+        activityId: this.props.businessNumber,
         appAccount: this.state.faceCustomerUid,
         sessionId: this.state.sessionId,
         fileBase64: this.state.facialImg.replace(/^data:image\/\w+;base64,/,"")
@@ -2031,45 +2041,42 @@ class Video extends Component {
     this.test_controller.OnSendTextMsgFailed  =(msgId, code, msg)=>{
       console.log('发送失败',msgId,code, msg)
     }
-    this.test_controller.StreamFilterHandler = async function (publish_tag, stream, stream_type, publish_device, media_type) {
-      console.log(`stream processed by client, publish_device=${publish_device}, media_type=${media_type}, publish_tag=${publish_tag},stream_type=${stream_type}`);
-      if (stream_type == "subscribe") {
-        return stream
-      }
-      if (media_type == 2 || media_type == 4) {
-        return stream
-      }
-      // if (publish_device != 1) {
-      //   return stream
-      // }
-      if(publish_tag == 'tag1') {
-        let newStream = stream;
-      let beauty_strength = beautyNum;
-      if (beauty_strength != 0 && stream.getVideoTracks()[0]) {
-        newStream = new MediaStream([startBeauty(stream).getVideoTracks()[0]]);
-        // 清理原始流
-      newStream.oninactive = function () {
-        clearOriginStream(stream);
-      };
-      newStream.getVideoTracks()[0].onended = function () {
-        clearOriginStream(stream);
-      };
-      function clearOriginStream(stream) {
-        stream.getTracks().forEach((track) => {
-          track.stop();
-        });
-        stream = null;
-      }
-      };
-      if (stream.getAudioTracks()[0] && newStream.addTrack) {
-        newStream.addTrack(stream.getAudioTracks()[0])
-      }
-      return newStream
-      } else {
-        return stream
-      }
+    // this.test_controller.StreamFilterHandler = async function (publish_tag, stream, stream_type, publish_device, media_type) {
+    //   console.log(`stream processed by client, publish_device=${publish_device}, media_type=${media_type}, publish_tag=${publish_tag},stream_type=${stream_type}`);
+    //   if (stream_type == "subscribe") {
+    //     return stream
+    //   }
+    //   if (media_type == 2 || media_type == 4) {
+    //     return stream
+    //   }
+    //   if(publish_tag == 'tag1') {
+    //     let newStream = stream;
+    //   let beauty_strength = beautyNum;
+    //   if (beauty_strength != 0 && stream.getVideoTracks()[0]) {
+    //     newStream = new MediaStream([startBeauty(stream).getVideoTracks()[0]]);
+    //     // 清理原始流
+    //   newStream.oninactive = function () {
+    //     clearOriginStream(stream);
+    //   };
+    //   newStream.getVideoTracks()[0].onended = function () {
+    //     clearOriginStream(stream);
+    //   };
+    //   function clearOriginStream(stream) {
+    //     stream.getTracks().forEach((track) => {
+    //       track.stop();
+    //     });
+    //     stream = null;
+    //   }
+    //   };
+    //   if (stream.getAudioTracks()[0] && newStream.addTrack) {
+    //     newStream.addTrack(stream.getAudioTracks()[0])
+    //   }
+    //   return newStream
+    //   } else {
+    //     return stream
+    //   }
       
-    }
+    // }
     // 发布媒体流成功
     this.test_controller.OnPublishSucc = (sid) => {
       console.log('发布媒体流成功', sid)
@@ -2493,9 +2500,9 @@ class Video extends Component {
     this.test_controller.OnNewJoinerIn = (participant) => {
       console.log('新加⼊房间者', participant);
           this.state.isCustomer= true
-          let src = autod
-          let audio = new Audio(src)
-          audio.play()
+          // let src = autod
+          // let audio = new Audio(src)
+          // audio.play()
     };
     // 推送“有新发布”给与会者
     this.test_controller.OnNewPublish = (feed) => {
@@ -2880,9 +2887,9 @@ class Video extends Component {
       exitType
     ) => {
       console.log('退出房间者', participant, exitType)
-      let src = leftMetting
-      let audio = new Audio(src)
-      audio.play()
+      // let src = leftMetting
+      // let audio = new Audio(src)
+      // audio.play()
       this.appGetUsernameClick(participant).then((res)=>{
         console.log('退出房间者',res)
 let data = res? res.username ? res.username : '客户' : '客户'
@@ -3208,7 +3215,6 @@ userType:'1'
             this.state.analyserHeight = this.state.analyserHeight
         }
       }
-      
       this.state.OnVolumeAnalyserMap.set(sid,setInterval(
         this.test_controller.OnVolumeAnalyser.bind(this, sid, analyser),
       300
@@ -3320,10 +3326,6 @@ userType:'1'
     }
   }
   componentWillUnmount() {
-    
-    if (this.state.roomCustomerList.length == 0 && this.state.sessionType) {
-      this.finishSessionClick()
-    }
     if (this.test_controller&&this.state.sessionType) {
       clearStreamRemain()
       beautyNum = 0
@@ -3337,15 +3339,6 @@ userType:'1'
     }
     message.destroy()
   }
-  finishSessionClick= async () => {
-    try {
-      let result = await API.finishSession({
-        sessionId: this.state.sessionId,
-        tellerId: this.props.tellerAccount
-      });
-    } catch (err) {
-    }
-  }
   finishSession = () => {
     // clearInterval(this.state.OnVolumeAnalyserMap.get(sid))
     this.state.OnVolumeAnalyserMap.forEach((value,key,map)=>{
@@ -3818,25 +3811,43 @@ userType:'1'
       isModalVisibleEnd: false
     })
   };
-  confirmCallback=async()=>{
+  confirmCallback=async(data)=>{
     try {
-      let result = await API.ocrCallback({
+      let result = await API.confirmCallback({
         idCardName: this.state.idCardName,
         staffId: this.props.tellerAccount,
         activityId: this.props.businessNumber,
         appAccount: this.state.faceCustomerUid,
         idCardNumber: this.state.idCardNumber,
+        sessionId: this.state.sessionId,
       });
+      console.log('confirmCallback',result)
       if (result.code == 200) {
-        this.setState({
-          isModalVisibleFacial: false,
-          idCardNumber: '',
-          idCardName: ''
-        })
+        console.log(data)
+        if(data == 'noFace') {
+          this.setState({
+            isModalVisibleFacial: false,
+            idCardNumber: '',
+            idCardName: ''
+          })
+        } else {
+          console.log('data')
+          this.state.faceCustomerType = 1
+          this.setState({
+            idCardNumber: '',
+            idCardName: '',
+            titleModal: '人脸识别',
+            // clickedFacial: true,
+            facialImg: this.test_controller.TakePicture(1, undefined, undefined, this.state.customOcrSid, 'png')
+          })
+        }
+        
       } else {
+        console.log('1')
         this.messageClick('保持信息失败','error')
       }
     } catch (err) {
+      console.log('2')
       this.messageClick('保持信息失败','error')
     }
   }
@@ -3863,9 +3874,9 @@ userType:'1'
           })
         });
         this.setState({
-          isModalVisibleFacial: false
-          // idCardNumber: result.data.idCardNumber,
-          // idCardName: result.data.idCardName
+          // isModalVisibleFacial: false
+          idCardNumber: result.data.idCardNumber,
+          idCardName: result.data.idCardName
         })
       } else {
         this.messageClick('识别失败','error')
@@ -5289,7 +5300,8 @@ userType:'1'
             <Button className="modelButtonOk" type="primary" danger onClick={this.handleOkFacial}>确定</Button>
             </div>,
             this.state.idCardName && <div key='facial'>
-            <Button className="modelButtonOk" type="primary" danger onClick={this.confirmCallback}>确认</Button>
+              <Button className="modelButtonFaceOk" danger onClick={(e)=>this.confirmCallback('face')}>完成并发起人脸识别</Button>
+            <Button className="modelButtonOk" type="primary" danger onClick={(e)=>this.confirmCallback('noFace')}>完成</Button>
             </div>
           ]}>
             <div className="faceBody">

package/packages/pages/video/video.less

@@ -378,6 +378,15 @@
   background: #DB0011!important;
   border-spacing: 20px!important;
 }
+.modelButtonFaceOk{
+  width: 170px!important;
+  height: 40px!important;
+  font-size: 16px!important;
+  color: #333!important;
+  border: 1px #333 solid!important;
+  background: #fff!important;
+  border-spacing: 20px!important;
+}
 .endModal{
   font-size: 16px;
     padding: 56px 30px 0px 30px;