react_hsbc_teller 2.0.28 → 2.0.30

package/package.json

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

package/packages/pages/video/video.jsx

@@ -58,7 +58,7 @@ import MultiModule from '../multiModule/multiModule'//签字、抄录
 import axios from 'axios';
 import CryptoJS from "crypto-js";
 
-const SDK_VERISON = '2.0.28'
+const SDK_VERISON = '2.0.30'
 const IDtypeFront = '请客户在其设备后置摄像头下展示证件正面（如：身份证照片页面）'
 const IDtypeBack = '请在后置摄像头下展示证件反面（如：身份证国徽页）'
 const { Option } = Select;
@@ -687,13 +687,13 @@ class Video extends Component {
           width: 213 * SCALE,
           height: 175 * SCALE
         },
-        // {
-        //   tag: 'sharedScreen', // 一期暂时不需要录制
-        //   xPosition: 960,
-        //   yPosition: 180,
-        //   width: 320,
-        //   height: 180
-        // }
+        {
+          tag: 'sharedScreen', // 一期暂时不需要录制
+          xPosition: 960 * SCALE,
+          yPosition: 180 * SCALE,
+          width: 320 * SCALE,
+          height: 180 * SCALE
+        }
       ]
       Array.isArray(res) ?
         res.map((item) => {
@@ -1711,6 +1711,9 @@ class Video extends Component {
         }
         this.messageClick(TITLE+'人脸数量发生变化', 'error', Mival.data.userId)
       }
+      else if (Mival.typeId == 5006) { // 内网pib检测到敏感词
+        this.messageClick(Mival.content, 'error', Mival.data.userId)
+      }
       else if (Mival.typeId == 1220) {
         // 一炒多的图片  1214
         if (Mival.sessionId == this.state.sessionId) {
@@ -2593,6 +2596,10 @@ class Video extends Component {
                 console.log('过滤订阅的tag:', itemOne.tag)
                 return
               }
+              if (itemOne.mediaSource == 'VIDEO_SOURCE_CAMERA' && item.uid.includes(IPAD_SUFFIX)) {
+                this.state.ipadTag = itemOne.tag;
+                console.log('ipadTag:', itemOne.tag)
+              }
               let array = this.state.roomCustomerList;
               let newArray = [...array];
               newArray.push({
@@ -2763,6 +2770,10 @@ class Video extends Component {
       // 记录ipad摄像头流，需要单独开启录制
       if (feed.mediaSource == 'VIDEO_SOURCE_CAMERA' && feed.uid.includes(IPAD_SUFFIX)) {
         this.state.ipadTag = feed.tag;
+        // 如果已经开启了业务录制且ipad未在录制，立即开启ipad录制（ipad后加入）
+        if (this.state.businessId && !this.state.ipadRecordId) {
+          this.enableIpadRecording(this.state.businessId)
+        } 
       }
     };
     // 推送“有新订阅”给与会者
@@ -2901,6 +2912,10 @@ class Video extends Component {
         }
         setTimeout(this.ipadLeavePlay, 0);
         return
+      } else if (participant.includes(IPAD_SUFFIX)) {
+        this.setState({
+          ipadTag: '',
+        })
       }
       
 
@@ -4030,6 +4045,7 @@ class Video extends Component {
           // 业务录制
           this.state.businessRecordId = result.businessRecordId;
           this.state.businessId = result.businessId;
+          this.state.ipadRecordId = result.businessIpadRecordId;
           third_id_Map.set(result.businessRecordId, result.businessId);
           console.log(third_id_Map)
           if (this.props.whetherDetectFace && this.props.recordMode != 2) this.startFaceDetection();
@@ -6329,7 +6345,8 @@ class Video extends Component {
                             this.state.envInfo.batteryResult=='合格' &&
                             (this.state.envInfo.cameraResult=='合格' || this.props.recordMode == 2) &&
                             this.state.envInfo.microResult=='合格' &&
-                            (this.state.envInfo.lightResult=='合格' || this.props.recordMode == 2 )
+                            (this.state.envInfo.lightResult=='合格' || this.props.recordMode == 2 ) &&
+                            (this.state.ipadTag || this.props.recordMode != 2)
 
     const sectionStyle = this.state.tabTitles.length > 0 ? {
       zIndex: '-1',
@@ -7088,6 +7105,22 @@ class Video extends Component {
                   {this.state.cameraList.length == 0 ? <p className="envClass">获取不到设备，请检查电脑“设置”中的麦克风权限是否开启，并重启浏览器再试</p> : null}
                 </div>
               </Panel>
+              {
+                this.props.recordMode == 2 && 
+                <Panel header={<span>iPad设备 - {this.state.ipadTag? '合格':'不合格'} {this.state.ipadTag? <img src={IconSuccess} />: <img src={IconFail} />}</span>} key="6" className={this.state.ipadTag? '':'panel-error'}>
+                  <p className="envClass">{this.state.ipadTag? 'iPad设备已加入':'未检测到iPad设备，请扫码加入会议'}</p> 
+                  <QRCode
+                      value={JSON.stringify({
+                        sessionId: this.state.sessionId,
+                        staffId: this.props.tellerAccount,
+                        staffName: this.props.staffName
+                      })}
+                      style={{marginTop: '8px', marginLeft: '20px', display: this.state.ipadTag? 'none':'block'}}
+                      size={100}
+                      fgColor="#000000" 
+                  />
+                </Panel>
+              }
               {
                 this.props.recordMode != 2 && 
               <Panel header={<span>背光、曝光 - {this.state.envInfo.lightResult} {this.state.envInfo.lightResult=='合格'? <img src={IconSuccess} />: <img src={IconFail} />}</span>} key="6" className={this.state.envInfo.lightResult=='合格'? '':'panel-error'}>