react_hsbc_teller 2.0.98 → 2.1.0

package/package.json

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

package/packages/pages/video/video.jsx

@@ -66,7 +66,7 @@ import axios from 'axios';
 import CryptoJS from "crypto-js";
 
 
-const SDK_VERISON = '2.0.98'
+const SDK_VERISON = '2.1.0'
 const IDtypeFront = '请客户在其设备后置摄像头下展示证件正面（如：身份证照片页面）'
 const IDtypeBack = '请在后置摄像头下展示证件反面（如：身份证国徽页）'
 const { Option } = Select;
@@ -1392,19 +1392,23 @@ class Video extends Component {
   };
   // 画中画
   pictureInPicture = (val) => {
-    if (this.isFileSuccuse()) {
-      if (this.state.isPictureInPicture) {
-        if (!val) {
-          document.exitPictureInPicture()
+    // recordMode 为1   或者needIpad 为true 时，才支持画中画
+    if(this.props.recordMode == '1' || this.props.needIpad) {
+      if (this.isFileSuccuse()) {
+        if (this.state.isPictureInPicture) {
+          if (!val) {
+            document.exitPictureInPicture()
+          } else {
+            this.pictureInPictureClick('update')
+          }
         } else {
-          this.pictureInPictureClick('update')
-        }
-      } else {
-        if (!val) {
-          this.pictureInPictureClick('add')
+          if (!val) {
+            this.pictureInPictureClick('add')
+          }
         }
       }
     }
+    
   };
   pictureInPictureClick = (val) => {
     let interval
@@ -1959,6 +1963,7 @@ class Video extends Component {
         if (Mival.sessionId == this.state.sessionId) {
           // 1-开启，2-关闭
           if (Mival.type == 1) {
+            this.state.isSfpMeeting = true
             this.switchExternal()
             this.saveLog('whiteboard start, typeId=1218,')
             if (typeof this.props.sfpCallback === 'function'){
@@ -3310,7 +3315,17 @@ class Video extends Component {
         })
         this.state.isSharedScreen = false
         this.setSharedScreenState(false)
-        this.setSharedScreenTimer(false)
+        // 1218--sfp可以通过api去唤起meeting alisdk的白板进行文档签署
+        // 在这里要多判断一层，要是收到通知1218导致的取消发布的时候不去调用setSharedScreenTimer
+        
+        if(!this.state.isSfpMeeting){
+          this.setSharedScreenTimer(false)
+        } else {
+          console.log('isSfpMeeting: true')
+          this.saveLog('isSfpMeeting: true')
+          this.state.isSfpMeeting = false
+        }
+        
         this.saveLog('Stop share')
         this.setState({
 
@@ -4909,6 +4924,7 @@ class Video extends Component {
     }
   }
   setSharedScreenTimer = (state) => {
+    console.log('screenName',this.state.screenName)
       // 设置定时，如果x秒内没有重新开启投屏 则弹出提示
       if (!this.props.screenSharedInterval || typeof this.props.screenSharedInterval != 'number') return;
       if (state) {
@@ -7588,7 +7604,7 @@ class Video extends Component {
 
                         </ul>
                       </div>
-                      {!this.state.loading && this.state.sessionType && this.state.sessionId && this.props.recordMode == 2?
+                      {!this.state.loading && this.state.sessionType && this.state.sessionId && (this.props.recordMode == 2 && this.props.needIpad)?
                       <div className='QRCode'>
                         <QRCode
                             value={JSON.stringify({
@@ -8299,7 +8315,7 @@ class Video extends Component {
                 </div>
               </Panel>
               {
-                this.props.recordMode == 2 && 
+                this.props.recordMode == 2 && this.props.needIpad && 
                 <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> 
                   <div className='QRCode flex' style={{display: this.state.ipadTag? 'none':''}}>