react_hsbc_teller 1.2.0 → 1.2.1

package/package.json

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

package/packages/api/api.js

@@ -1,7 +1,26 @@
 import Server from './server';
 
 class API extends Server{
-  
+  async ocrCallback(params = {}){
+    //  return this.axios('get', '/lang/select/2', params); 
+    try{
+      let result = await this.axios('post', '/hsbc/identify/ocr/callback', params); 
+      console.log(result)
+      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 enterRoom(params = {}){
     //  return this.axios('get', '/lang/select/2', params); 
     try{

package/packages/common/websocket.js

@@ -54,17 +54,17 @@ function websocketonerror() { // 连接建立失败重连
   // initWebSocket()
 }
 function websocketonmessage(e) {
-  console.log('收到消息', e);
-  console.log('收到消息', e.data);
+  // console.log('收到消息', e);
+  // console.log('收到消息', e.data);
   const jsondata = xml2json(e.data);
   console.log('jsondata', jsondata);
   if (undefined != jsondata.message) {
     if (undefined != jsondata.message.body) {
-      console.log('收到的消息：', jsondata.message.body);
+      // console.log('收到的消息：', jsondata.message.body);
       const from = jsondata.message['-from'];
-      console.log('from', from);
+      // console.log('from', from);
       const type = jsondata.message['-type'];
-      console.log('type', type);
+      // console.log('type', type);
       if ((from.split('/').length > 0) && (from.split('/')[from.split('/').length - 1] == JSON.parse(window.sessionStorage.getItem('sigData')).account)) {
         // 自己的消息不做处理
       } else if ((type == 'chat' || type == 'groupchat') && jsondata.message.body.length > 0) {
@@ -217,7 +217,7 @@ function websocketclose(e) { // 关闭
 // 发消息
 // // 发送消息  to---接收者id，from---发送者id，type---消息类型（chat--单聊，groupchat--群聊）。message--发送的消息
 function sendMessage(to, from, type, message) {
-  console.log('发送聊天信息', to, from, type, message);
+  // console.log('发送聊天信息', to, from, type, message);
   if (islogin) {
     const temp = {
       message: {

package/packages/pages/video/video.jsx

@@ -19,10 +19,14 @@ import message from "antd/lib/message";
 import 'antd/lib/message/style'
 import Spin from "antd/lib/spin";
 import 'antd/lib/spin/style'
+import Select  from "antd/lib/select";
+import 'antd/lib/select/style'
+
 import { Button } from '../../../node_modules/antd/lib/index';
 import CanvasDraw from "react-canvas-draw";
 import { FormattedMessage, injectIntl } from 'react-intl';
 import axios from 'axios';
+const { Option } = Select;
 const LEAVE_TYPE = {
   TELLER_EXIT: 1, // 坐席退出
   ROOM_DESTROYED: -1, // 房间异常
@@ -141,6 +145,8 @@ class Video extends Component {
     noVideoEleven: false,
     noVideoTwelve: false,
     manualClose: false,
+    defaultValue: '1',
+    customOcrSid: ''
   };
   // eslint-disable-next-line no-undef
   test_controller = '';
@@ -164,6 +170,8 @@ class Video extends Component {
       let publish_config = {}
       publish_config.media_type = 1
       publish_config.publish_device = 1
+      publish_config.videoSource = this.state.cameraValue
+      publish_config.audioSource = this.state.microphoneValue
       publish_config.need_volume_analyser = true
       // publish_config.video_profile_type = 3
       publish_config.video_profile_type=100
@@ -267,7 +275,6 @@ class Video extends Component {
     const config_param = {};
     config_param.auto_publish_subscribe = 4;
     config_param.media_type = 1;
-    config_param.publish_device = 1;
     config_param.video_profile_type = '3';
     config_param.need_volume_analyser = true;
     config_param.initPublish = [
@@ -360,6 +367,106 @@ class Video extends Component {
         url: '' // ⽔印图⽚ HTTP 地址
       }
     ];
+  recordParam.tagPositions = [
+    {
+      tag: 'projectionWhiteboard',
+      xPosition: '0',
+      yPosition: '360',
+      width: '640',
+      height: '360'
+    },
+    {
+      tag: 'VIDEO_SOURCE_SCREEN',
+      xPosition: '0',
+      yPosition: '144',
+      width: '256',
+      height: '144'
+    },
+    {
+      tag: 'tag1',
+      xPosition: '0',
+      yPosition: '0',
+      width: '160',
+      height: '144'
+    },
+    {
+      tag: 'customer1',
+      xPosition: '160',
+      yPosition: '0',
+      width: '160',
+      height: '144'
+    },
+    {
+      tag: 'customer2',
+      xPosition: '320',
+      yPosition: '0',
+      width: '160',
+      height: '144'
+    },
+    {
+      tag: 'customer3',
+      xPosition: '480',
+      yPosition: '0',
+      width: '160',
+      height: '144'
+    },
+    {
+      tag: 'customer4',
+      xPosition: '640',
+      yPosition: '0',
+      width: '160',
+      height: '144'
+    },
+    {
+      tag: 'customer5',
+      xPosition: '800',
+      yPosition: '0',
+      width: '160',
+      height: '144'
+    },
+    {
+      tag: 'customer6',
+      xPosition: '960',
+      yPosition: '0',
+      width: '160',
+      height: '144'
+    },
+    {
+      tag: 'customer7',
+      xPosition: '1120',
+      yPosition: '0',
+      width: '160',
+      height: '144'
+    },
+    {
+      tag: 'customer8',
+      xPosition: '1120',
+      yPosition: '144',
+      width: '160',
+      height: '144'
+    },
+    {
+      tag: 'customer9',
+      xPosition: '1120',
+      yPosition: '288',
+      width: '160',
+      height: '144'
+    },
+    {
+      tag: 'customer10',
+      xPosition: '1120',
+      yPosition: '432',
+      width: '160',
+      height: '144'
+    },
+    {
+      tag: 'customer11',
+      xPosition: '1120',
+      yPosition: '576',
+      width: '160',
+      height: '144'
+    }
+  ]
     console.log('recordParam', recordParam);
     this.test_controller.StartRemoteRecord(filePath, recordParam, '')
 
@@ -408,11 +515,6 @@ class Video extends Component {
       console.log(result);
       if (this.state.faceCustomerType == 1) {
         this.contrastFaceVerify(result.data)
-      } else if (this.state.faceCustomerType == 2) {
-        // ocr
-        this.setState({
-          isModalVisibleFacial: false
-        })
       }
 
     } catch (err) {
@@ -1491,8 +1593,14 @@ class Video extends Component {
       })
       if (!this.state.appId && !this.state.sessionType) {
         this.mpaasSig(data);
+        let indexId = 0
+        obj.map((item,index)=>{
+          if(item.actionname.indexOf('Integrated Camera' != -1)) {
+            indexId = index
+          }
+        })
         this.setState({
-          cameraValue: obj[0].actionid,
+          cameraValue: obj[indexId].actionid,
           microphoneValue: obj1[0].actionid
         })
       } else {
@@ -1585,6 +1693,8 @@ class Video extends Component {
       publish_config.media_type = 1
       publish_config.publish_device = 1
       publish_config.need_volume_analyser = true
+      publish_config.videoSource = this.state.cameraValue
+      publish_config.audioSource = this.state.microphoneValue
       // publish_config.video_profile_type = 3
       publish_config.video_profile_type=100
       publish_config.video_profile_diy={width:640, height:360, frameRate:15, bitrate:400}
@@ -2494,7 +2604,7 @@ class Video extends Component {
       }
 
       for (var i = 0; i < 40; i++) {
-        let energy = (dataArray[step * i] / 256.0) * 100;
+        let energy = (dataArray[step * i] / 256.0) * 80;
         ctx.beginPath();
         ctx.fillStyle = this.props.voiceColor;
         const { x1, y1, x2, y2 } = drawArea
@@ -2535,9 +2645,9 @@ class Video extends Component {
         //   this.setState({
         //     isPDF: true,
         //   })
-        // } else {
+      // } else {
           document.getElementById('video20') && document.getElementById('video20').name ? this.test_controller.UnPublish(document.getElementById('video20').name) : ''
-        // }
+      // }
         this.state.isSharedScreen = false
         this.state.isScreenSwitching = false
         this.setState({
@@ -2550,11 +2660,11 @@ class Video extends Component {
         }
         // if (!this.state.laveRoomSharedScreen && this.state.isSharedScreen) {
         //   this.sharedScreen()
-        // }
+    // }
       }
         
       
-    }
+    };
   }
   enterRoom = async () =>{
     try {
@@ -3084,12 +3194,41 @@ class Video extends Component {
       isModalVisibleEnd: false
     })
   };
+  ocrCallback= async () => {
+    try {
+      let result = await API.ocrCallback({
+        sessionId: this.state.sessionId,
+        staffId: this.props.tellerAccount,
+        activityId: this.props.businessNumber,
+        appAccount: this.state.faceCustomerUid,
+        fileBase64: this.state.facialImg.replace(/^data:image\/\w+;base64,/,""),
+        type: this.state.defaultValue
+      });
+      if (result.code == 200) {
+        this.messageClick('识别成功','success')
+        this.setState({
+          isModalVisibleFacial: false
+        })
+      } else {
+        this.messageClick('识别失败','error')
+      }
+    } catch (err) {
+      this.messageClick('识别失败','error')
+    }
+  }
   handleOkFacial = () => {
-    const frontIdcard = new File([this.dataURLtoFile(this.state.facialImg, 'image/jpeg')], new Date() + '.png'); // 重命名了
+    if (this.state.faceCustomerType == 2) {
+      // ocr
+      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)
+    }
+    
   };
   handleCancelFacial = () => {
     this.setState({
@@ -3174,6 +3313,7 @@ class Video extends Component {
       sid = document.getElementById('video12').name;
     }
     console.log(sid)
+    this.state.customOcrSid = sid
     this.state.faceCustomerUid = item.customId,
     this.setState({
       clickedFacial: false,
@@ -3183,6 +3323,13 @@ class Video extends Component {
       facialImg: this.test_controller.TakePicture(1, undefined, undefined, sid, 'png')
     })
   }
+  handleChangeOcr =(val)=> {
+    console.log(val)
+    this.setState({
+      defaultValue: val,
+      facialImg: this.test_controller.TakePicture(1, undefined, undefined, this.state.customOcrSid, 'png')
+    })
+  }
   componentWillReceiveProps(props) {
       this.state.channelId = props.roomId,
       this.state.rtoken = props.mtoken,
@@ -3524,6 +3671,7 @@ class Video extends Component {
            console.log('whiteboardDIV', this.state.whiteboardHeight,box.clientHeight,this.state.whiteboardWidth)
        }
   }
+  
   render() {
     const { meetingInfo,isTranscribing } = this.props
     var pdfChildren
@@ -4132,7 +4280,16 @@ class Video extends Component {
             </div>
           ]}>
             <div className="faceBody">
-              <img className="faceImg" src={this.state.facialImg} alt=""></img>
+            {this.state.faceCustomerType == 2 && 
+            <Select defaultValue={this.state.defaultValue} style={{ width: 120,marginBottom: '20px' }} onChange={this.handleChangeOcr}>
+            <Option value="1">正面</Option>
+            <Option value="2">反面</Option>
+          </Select>
+            }
+            <div>
+            <img className="faceImg" src={this.state.facialImg} alt=""></img>
+            </div>
+              
             </div>
           </Modal>
           {/* <Modal title={this.state.titleModal} cancelText="取消" okText="确定" visible={this.state.isModalVisibleFacial}

package/packages/pages/video/video.less

@@ -151,8 +151,7 @@
 }
 }
 .faceImg{
-  width: 200px;
-  height: 300px;
+  width: 70%;
 }
 .faceBody{
   text-align: center;