react_hsbc_teller 1.8.3 → 1.8.4

package/package.json

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

package/packages/api/api.js

@@ -1,9 +1,45 @@
 import Server from './server';
 
 class API extends Server{
+  //  /hsbc/getAuthorizeResult/{activityId}/{appAccount}
+  async getAuthorizeResult(params = {}){
+    try{
+      let result = await this.axios('get', '/hsbc/getAuthorizeResult/'+params.activityId + '/' + params.appAccount, params); 
+      if(result && 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 saveAuthorize(params = {}){
+    try{
+      let result = await this.axios('post', '/hsbc/saveAuthorize', params); 
+      if(result && 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;
+    }
+  }
   // /hsbc/getToken
   async getToken(params = {}){
-    //  return this.axios('get', '/lang/select/2', params); 
     try{
       let result = await this.axios('post', '/hsbc/getToken', params); 
       if(result && result.code === 200){

package/packages/api/server.js

@@ -28,6 +28,9 @@ export default class Server {
         timeout: 30000,
         params: null,
         data: params,
+        // headers: {
+        //   Authorization: window.sessionStorage.getItem('authTokenHSBC') ? window.sessionStorage.getItem('authTokenHSBC') : '',
+        // },
         withCredentials: true, //是否携带cookies发起请求
         validateStatus:(status)=>{
             return status >= 200 && status < 300;

package/packages/pages/foot/foot.jsx

@@ -137,14 +137,15 @@ export default class foot extends Component {
                                   </Popover>
                               }
                               {
-                                  item == 'OCR' && <Popover content={content} trigger="click" visible={clickedOcr} onVisibleChange={this.ocrHandleVisibleChange}>
+                                  item == 'OCR' && 
+                                //   <Popover content={content} trigger="click" visible={clickedOcr} onVisibleChange={this.ocrHandleVisibleChange}>
                                   <div className="one"  onClick={this.ocrClick.bind(this)}>
                                       <img className="imgClass" src={require("../../assets/img/icon_ocr.png").default} alt="" />
                                       <div className="text">
                                           OCR识别
                                       </div>
                                   </div>
-                                  </Popover>
+                                //   </Popover>
                               }
                               {
                                   item == 'INVITE' && <div className="one" onClick={this.invitationClick.bind(this)}>

package/packages/pages/video/video.jsx

@@ -26,6 +26,15 @@ import Spin from "antd/lib/spin";
 import 'antd/lib/spin/style'
 import Select  from "antd/lib/select";
 import 'antd/lib/select/style'
+
+import Radio  from "antd/lib/radio";
+import 'antd/lib/radio/style'
+
+
+import Space  from "antd/lib/space";
+import 'antd/lib/space/style'
+
+
 import styled from 'styled-components';
 import { Button } from '../../../node_modules/antd/lib/index';
 import SignMy from '../sign/signMy.jsx'
@@ -302,7 +311,14 @@ class Video extends Component {
       curryControl: 'pen', // 工具类型
     },
     zIndexNum: -1,
-    selectSpan: 'pen'
+    selectSpan: 'pen',
+    isModalVisibleCustomer: false,
+    customerSelect: '',
+    documentType: '',
+    isCustomerSelect: true,
+    customerTitleName: '客户身份识别',
+    certificateType: 'identityCard',
+    customerName: ''
   };
   // eslint-disable-next-line no-undef
   test_controller = '';
@@ -310,7 +326,7 @@ class Video extends Component {
   saveLog=(val)=>{
     axios({
       method: 'post',
-        baseURL: `http://${this.props.project}.${this.props.endpoint}/logstores/${this.props.logstore}/track`,
+        baseURL: this.props.logUrl,
         headers: {
           'x-log-apiversion': '0.6.0',
           'x-log-bodyrawsize': '1234',
@@ -383,6 +399,7 @@ class Video extends Component {
           roomId: this.state.channelId
         }
       })
+      // this.getToken()
       // this.saveLog()
     } catch (err) {
       console.error(err);
@@ -1028,10 +1045,17 @@ class Video extends Component {
         })
       }
     }
+    console.log(list)
+    this.setState({
+      customerList: list
+    })
     if (list.length > 0) {
       if (val == 'ocr') {
         this.setState({
-          clickedOcr: true
+          isModalVisibleCustomer: true,
+          isCustomerSelect: true,
+          customerSelect: '',
+          customerTitleName: '客户身份识别'
         })
       } else if (val == 'facial') {
         this.setState({
@@ -1041,9 +1065,6 @@ class Video extends Component {
     } else {
       this.messageClick('当前暂无客户','error')
     }
-    this.setState({
-      customerList: list
-    })
   }
   messageClick=(value,valueOne)=>{
     console.log(value,valueOne)
@@ -2021,9 +2042,6 @@ class Video extends Component {
     this.test_controller.OnGetDevicesSuccess = (devicesInfo) => {
       console.log('devicesInfo' + JSON.stringify(devicesInfo));
       const obj = [
-//         {actionid: '0133d06019b8fe9426818ae7573ccfc31c150e09138e7f5ccfda03d6e224ffd4', groupId: '9c0334ba5cba71b60acb3ec6669c3aac78371ec9d9e33d2e8af72a758d895d27', actionname: 'Integrated Camera (13d3:56fb)'},
-
-// {actionid: '4695c628677498d876074b941c16f6921d4e57534b50bfc2cb973da84e0e2622', groupId: '0d86c9467f096440ed74449192be5fafea59ac469866975f30b61fe964e2a80e', actionname: 'C2D Camera (0416:5035)'}
       ];
       const obj1 = [];
       const obj2 = [];
@@ -2261,6 +2279,15 @@ class Video extends Component {
     this.test_controller.OnSendTextMsgFailed  =(msgId, code, msg)=>{
       console.log('发送失败',msgId,code, msg)
     }
+    this.test_controller.OnReceiveTextMsg = (uid, msg)=>{
+      console.log('收到手机端消息',uid, msg, JSON.parse(msg).typeId,JSON.parse(msg).data.sessionId,this.state.sessionId)
+      if(JSON.parse(msg).typeId == 33001 && this.state.sessionId == JSON.parse(msg).data.sessionId) {
+        if(JSON.parse(msg).type == 1) {
+          this.saveAuthorize(JSON.parse(msg).data.userId)
+          this.customerFaceClick(this.state.customerList[this.state.customerSelect])
+        }
+      }
+    }
     this.test_controller.StreamFilterHandler = async (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") {
@@ -2388,16 +2415,6 @@ class Video extends Component {
         this.timer = setInterval(
           () => {
             if(!this.state.voiceStatue && this.state.analyserHeight.get(sid).toFixed(2) > 0.1) {
-              // this.test_controller.SendTextMsg(JSON.stringify({
-              //   'typeId': 3200,
-              //   'decibelValue': this.state.analyserHeight.get(sid).toFixed(2),
-              //   "data": {
-              //     'sessionId': this.state.sessionId,
-              //     'userId': this.props.tellerAccount,
-              //     'data': (new Date()).valueOf()
-              //   }
-
-              // }))
               callNimIM('sendCustomCmdMsg', {
                 customId: this.state.imRoomId,
                 content: JSON.stringify({
@@ -3692,12 +3709,31 @@ userType:'1'
     console.log('isSharedScreen', this.state.isSharedScreen,this.state.laveRoomSharedScreen)
     
   }
+  getToken = async () =>{
+    try{
+      let result = await API.getToken({
+        sessionId: this.state.sessionId ? this.state.sessionId : this.props.sessionId,
+        roomId: this.state.channelId ? this.state.channelId : this.props.roomId
+      })
+      window.sessionStorage.setItem('authTokenHSBC',result)
+      rateList = []
+    this.rateAll().then((res)=>{
+      Array.isArray(res) ? res.map((item)=>{
+        rateList.push(item.tag)
+      }) : rateList = []
+      console.log('rateList',rateList)
+    })
+    }catch (err) {
+      this.roomCallBack(2, '获取tiken失败','SYS-01')
+    }
+  }
   getRoomStatus = async data => {
     try {
       let result = await API.getRoomStatus({
         sessionId: data.sessionId
       });
       if (result.code == 200 && result.data.roomStatus == 1) {
+        // this.getToken()
         this.addToScript()
         
       } else {
@@ -4155,6 +4191,8 @@ userType:'1'
         appAccount: this.state.faceCustomerUid,
         idCardNumber: this.state.idCardNumber,
         sessionId: this.state.sessionId,
+        certificateType: this.state.certificateType,
+        customerName: this.state.customerName
       });
       console.log('confirmCallback',result)
       if (result.code == 200) {
@@ -4310,6 +4348,9 @@ userType:'1'
       
       if (result.code == 200) {
         this.messageClick('查询客户信息成功','success')
+        this.setState({
+          isModalVisibleCustomer: false
+        })
       } else {
         this.messageClick('查询客户信息失败','error')
       }
@@ -4368,6 +4409,7 @@ userType:'1'
     console.log(sid)
     this.state.customOcrSid = sid
     this.state.faceCustomerUid = item.customId,
+    this.state.customerName = item.name
     this.setState({
       clickedFacial: false,
       clickedOcr: false,
@@ -5137,25 +5179,123 @@ userType:'1'
       this.sendNotification()
     }
   }
-  // shouldComponentUpdate(nextProps,nextState){
-  //   console.log('componentDidUpdate',nextProps,nextState)
-  //   if(nextProps.shareMask != nextState.shareMaskState){
-  //     this.state.shareMaskState = nextProps.shareMask
-  //     this.sendNotification()
-  //   }
-  // }
-//   static  getDerivedStateFromProps(props, state) {
-//     console.log('getDerivedStateFromProps',props,state,props.shareMask)
-//     if(props.shareMask!==state.shareMaskState){
-//       // this.sendNotification()
-//         return {
-            
-//           shareMaskState:shareMask,
+  onChangeOCRCustomer=(e) => {
+    console.log(e)
+    this.setState({
+      customerSelect: e.target.value
+    })
+  }
+  handleCancelCustomer=()=>{
+    this.setState({
+      isModalVisibleCustomer: false
+    })
+  }
+  handleOkCustomer=()=>{
+    if(this.state.isCustomerSelect) {
+      if(this.state.customerList[this.state.customerSelect].tourist) {
+        this.customerFaceClick(this.state.customerList[this.state.customerSelect])
+      } else {
+        this.setState({
+          isCustomerSelect: false,
+          customerTitleName: this.state.customerList[this.state.customerSelect].name
+        })
+      }
+      
+    } else {
+      this.getAuthorizeResult(this.state.customerList[this.state.customerSelect].customId).then((res)=>{
+        if(res) {
+          this.customerFaceClick(this.state.customerList[this.state.customerSelect])
+        } else {
+          if(this.state.documentType == 0) {
+            this.test_controller.SendTextMsg(JSON.stringify({
+              'typeId': 3300,
+              "data": {
+                'sessionId': this.state.sessionId,
+                'title': '为了有效确认客户身份，请您配合进行我行的身份识别和核验。请您阅读以下内容，若您同意，请您之后在摄像头前出示您的身份证件，我行将对您的身份证件拍照并采集证件信息；同时，我行会对您进行脸部拍照，采集您的脸部图像。',
+                'list': [
+                  {
+                    'id': 1,
+                    'content': '您是否授权汇丰中国对您的证件以及脸部进行拍照，采集并留存您的证件信息以及脸部图像以便我行进行身份识别？'
+                  },
+                  {
+                    'id': 2,
+                    'content': '为了通过人脸对比进行身份识别和核验，我行需要将您的姓名、身份证件号码和脸部图像发送给中国人民银行或全国公民身份证号码查询服务中心授权的第三方，并由第三方进一步发送至中国人民银行或全国公民身份证号码查询服务中心进行人脸对比或信息核对。'
+                  }
+                ]
+              }
+    
+            }))
+          } else if(this.state.documentType == 1) {
+            this.test_controller.SendTextMsg(JSON.stringify({
+              'typeId': 3300,
+              "data": {
+                'sessionId': this.state.sessionId,
+                'title': '为了有效确认客户身份，请您配合进行我行的身份识别。请您阅读以下内容，若您同意，请您之后在摄像头前出示您的身份证件，我行将对您的身份证件拍照并采集证件信息；',
+                'list': [
+                  {
+                    'id': 1,
+                    'content': '您是否授权汇丰中国对您的证件进行拍照，采集并留存您的证件信息以便我行进行身份确认？'
+                  }
+                ]
+              }
+    
+            }))
+          }
+          
           
-//         }
-//     }
-//     return null
-// }
+        }
+      })
+      this.setState({
+        isModalVisibleCustomer: false,
+      })
+      // this.customerFaceClick(this.state.customerList[this.state.customerSelect])
+    }
+    
+  }
+  onChangeDocumentType=(e)=>{
+    this.setState({
+      documentType: e.target.value
+    })
+  }
+  getAuthorizeResult= async (appAccount) => {
+    try {
+      let result = await API.getAuthorizeResult({
+        activityId: this.props.businessNumber,
+        appAccount: appAccount,
+      });
+      console.log(result)
+      if (result.code == 200 && result.data.ifAuthorize) {
+        console.log('成功')
+        return true
+      } else {
+        
+        // this.messageClick('保存失败','error')
+        return false
+      }
+    } catch (err) {
+      console.log(err)
+      return false
+    }
+  }
+  saveAuthorize= async (appAccount) => {
+      try {
+        let result = await API.saveAuthorize({
+          activityId: this.props.businessNumber,
+          authorizeType: this.state.documentType==0 ? 'ID' : 'NID',
+          appAccount: appAccount,
+          idCardAuthorize: this.state.documentType==0 ? 'YES' : '',
+          pictureAuthorize: 'YES'
+        });
+        console.log(result)
+        if (result.code == 200) {
+          console.log('成功')
+        } else {
+          // this.messageClick('保存失败','error')
+        }
+      } catch (err) {
+        console.log(err)
+      }
+    }
   render() {
     const { meetingInfo,isTranscribing } = this.props
     var pdfChildren
@@ -5828,13 +5968,12 @@ userType:'1'
             <Option value="2">反面</Option>
           </Select>
             } */}
-            {
-              !this.state.idCardName &&<div className='faceCardImg'>
+            <div className='faceCardImg'>
               <img className="faceImg" src={this.state.facialImg} alt=""></img>
             </div>
-            }
             {
               this.state.idCardName &&<div className='resuleCard'>
+                <div>证件信息确认</div>
               <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>
@@ -5843,13 +5982,52 @@ userType:'1'
               
             </div>
           </Modal>
-          {/* <Modal title={this.state.titleModal} cancelText="取消" okText="确定" visible={this.state.isModalVisibleFacial}
-            onOk={this.handleOkFacial} onCancel={this.handleCancelFacial}>
-            <div className="faceBody">
-              <img className="faceImg" src={this.state.facialImg} alt=""></img>
+          <Modal title={this.state.customerTitleName} closable={false} centered={true} visible={this.state.isModalVisibleCustomer}
+            footer={[
+              <div key='end'>
+              <Button className="modelButtonCancel" onClick={this.handleCancelCustomer}>取消</Button>
+              <Button className="modelButtonOk" type="primary" danger onClick={this.handleOkCustomer}>下一步</Button>
+              </div>
+            ]}>
+            <div>
+              <div className='selectCustomer'>
+                {
+                  this.state.isCustomerSelect &&<div>
+                <div>
+                  请选择进行身份识别的客户
+                </div>
+                <div>
+                <Radio.Group onChange={this.onChangeOCRCustomer} value={this.state.customerSelect}>
+                  <Space direction="vertical">
+                  {
+          this.state.customerList.map((item,index)=>{
+            return <Radio value={index}>{item.name}</Radio>
+          })
+        }
+      </Space>
+    </Radio.Group>
+                </div>
+                </div>
+                }
+                {
+                !this.state.isCustomerSelect &&<div>
+                  <div>
+                    请您确认您的身份证件类型
+                  </div>
+                  <div>
+                  <Radio.Group onChange={this.onChangeDocumentType} value={this.state.documentType}>
+                  <Space direction="vertical">
+                     <Radio value={0}>身份证：或外国人永久居住证；或港澳台居民居住证</Radio>
+                     <Radio value={1}>护照：或台湾来往大陆通行证；或港澳来往大陆通行证</Radio>
+      </Space>
+    </Radio.Group>
+                  </div>
+                </div>
+  }
+              </div>
             </div>
 
-          </Modal> */}
+          </Modal>
           <Modal className="modelClass" title="邀请参会人员" closable={false} centered={true} visible={this.state.isModalVisibleInvitation} footer={[
              <div key='invitation'>
             <Button className="modelButtonCancel" onClick={this.handleCancelInvitation}>取消</Button>
@@ -5969,9 +6147,7 @@ sessionId: "",
   isTranscribing: false,
   shareMask: false,
   isOpenSound: false, // true开启进出音效   false不开启
-  endpoint: 'cn-shanghai.log.aliyuncs.com',
-  project: 'hsbc',
-  logstore: 'hsbc',
+  logUrl: 'http://hsbc.cn-shanghai.log.aliyuncs.com/logstores/hsbc/track',
   internalUrl: 'https://wp-staff-gateway.wealth-platform.uat.ali.cloud.cn.hsbc/meeting-ui/OHB/CN/HSBC?chnlID=OHB&locale=zh_CN&chnlCC=CN&chnlGMC=HSBC&targetFunc=supervisorMeeting&sourceFunc=rmMeeting'
 }
 export default Video

package/packages/pages/video/video.less

@@ -155,9 +155,9 @@
 }
 .faceBody{
   text-align: center;
-  height: 200px;
+  height: 100%;
   .faceCardImg{
-    height: 100%;
+    // height: 100%;
   }
   .resuleCard{
     text-align: -webkit-left;
@@ -519,4 +519,8 @@
 }
 .speakerTitle{
   color: red;
-}
+}
+.selectCustomer{
+  font-size: 16px;
+margin-left: 40px;
+}