react_hsbc_teller 1.6.3 → 1.6.6

package/package.json

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

package/packages/api/api.js

@@ -2,6 +2,25 @@ import Server from './server';
 
 class API extends Server{
   
+  async confirmCallback(params = {}){
+    //  return this.axios('get', '/lang/select/2', params); 
+    try{
+      let result = await this.axios('post', '/hsbc/identify/ocr/confirmCallback', params); 
+      if(result && (result.data instanceof Object) && result.code === 200){
+        return result||[];
+      }else{
+        let err = {
+          tip: '服务异常',
+          response: result,
+          data: params,
+          // url: 'https://api.cangdu.org/shopro/data/products',
+        }
+        throw err;
+      }
+    }catch(err){
+      throw err;
+    }
+  }
   async updateMeetingInfo(params = {}){
     //  return this.axios('get', '/lang/select/2', params); 
     try{
@@ -222,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,18 +148,18 @@ 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>
                             
                       })
                   }
-                  {
-                              <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>
           );
         return (

package/packages/pages/video/video.jsx

@@ -212,6 +212,8 @@ class Video extends Component {
       }
     ],
     shareMaskState: false,
+    idCardName: '',
+    idCardNumber: ''
   };
   // eslint-disable-next-line no-undef
   test_controller = '';
@@ -612,6 +614,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,/,"")
@@ -2029,45 +2033,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)
@@ -2491,9 +2492,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) => {
@@ -2878,9 +2879,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 : '客户' : '客户'
@@ -3318,10 +3319,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
@@ -3335,15 +3332,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)=>{
@@ -3816,6 +3804,29 @@ userType:'1'
       isModalVisibleEnd: false
     })
   };
+  confirmCallback=async()=>{
+    try {
+      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,
+      });
+      if (result.code == 200) {
+        this.setState({
+          isModalVisibleFacial: false,
+          idCardNumber: '',
+          idCardName: ''
+        })
+      } else {
+        this.messageClick('保持信息失败','error')
+      }
+    } catch (err) {
+      this.messageClick('保持信息失败','error')
+    }
+  }
   ocrCallback= async () => {
     try {
       let result = await API.ocrCallback({
@@ -3839,7 +3850,9 @@ userType:'1'
           })
         });
         this.setState({
-          isModalVisibleFacial: false
+          // isModalVisibleFacial: false
+          idCardNumber: result.data.idCardNumber,
+          idCardName: result.data.idCardName
         })
       } else {
         this.messageClick('识别失败','error')
@@ -4288,7 +4301,6 @@ userType:'1'
       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)'
@@ -4594,6 +4606,12 @@ userType:'1'
     },100)
     
   }
+  handleChangeIdCardName = (event) => {
+    this.setState({idCardName: event.target.value});
+  }
+  handleChangeIdCardNumber = (event) => {
+    this.setState({idCardNumber: event.target.value});
+  }
   componentDidUpdate(prevProps){
     console.log('componentDidUpdate',prevProps,prevProps.shareMask,this.props.shareMask)
     if(this.props.shareMask != prevProps.shareMask) {
@@ -5252,10 +5270,13 @@ userType:'1'
             <div className='endModal'>是否要结束并退出会议？</div>
           </Modal>
           <Modal title={this.state.titleModal}  closable={false} centered={true} visible={this.state.isModalVisibleFacial} footer={[
-            <div key='facial'>
+            !this.state.idCardName && <div key='facial'>
             <Button className="modelButtonCancel" onClick={this.handleCancelFacial}>取消</Button>
             <Button className="modelButtonCancel" onClick={this.sgsinImage}>重新截图</Button>
             <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>
             </div>
           ]}>
             <div className="faceBody">
@@ -5265,9 +5286,18 @@ userType:'1'
             <Option value="2">反面</Option>
           </Select>
             } */}
-            <div>
-            <img className="faceImg" src={this.state.facialImg} alt=""></img>
+            {
+              !this.state.idCardName &&<div className='faceCardImg'>
+              <img className="faceImg" src={this.state.facialImg} alt=""></img>
             </div>
+            }
+            {
+              this.state.idCardName &&<div className='resuleCard'>
+              <div><span>客户姓名</span>  <input type="text" value={this.state.idCardName} onChange={this.handleChangeIdCardName} /></div>
+          <div><span>身份证号</span>  <input type="text" value={this.state.idCardNumber} onChange={this.handleChangeIdCardNumber} /></div>
+            </div>
+            }
+            
               
             </div>
           </Modal>
@@ -5384,7 +5414,7 @@ sessionId: "",
   microphoneSize: 25,
   fontSize: '14',
   fontFamily: 'auto',
-  menus: ['BOARD','SHARE', 'FRIES', 'OCR', 'INVITE', 'PIP'],
+  menus: ['BOARD','SHARE', 'FRIES', 'OCR', 'INVITE', 'PIP', 'BEAUTY'],
   customLeaveRoom: '客户离开房间',
   meetingInfo: {
     title: '--',

package/packages/pages/video/video.less

@@ -155,6 +155,26 @@
 }
 .faceBody{
   text-align: center;
+  height: 200px;
+  .faceCardImg{
+    height: 100%;
+  }
+  .resuleCard{
+    text-align: -webkit-left;
+    padding: 25Px 20px;
+    div{
+      font-size: 16Px;
+      color: #646464;
+      margin: 20Px;
+      input{
+        border: #DCDCDC 1px solid;
+        width: 15rem;
+        height: 2.5rem;
+        line-height: 2.5rem;
+        margin-left: 15px;
+      }
+    }
+  }
 }
 .content{
   height: 200px;