react_hsbc_teller 2.0.97 → 2.0.99

package/package.json

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

package/packages/demo/demo.js

@@ -51,7 +51,7 @@ sessionId
   financialOffice: "defaultOfficeId", // 理财室
   audioinputNameList: ['默认值 - 外部麦克风 (Realtek(R) Audio)'],
   needPreSale: true,
-  needIpad: false,
+  needIpad: true,
 }
 componentWillMount() {
     // if(window.localStorage.getItem('sessionId') && window.localStorage.getItem('sessionId') != 'null' && window.localStorage.getItem('sessionId') != 'undefined') {

package/packages/pages/video/video.jsx

@@ -66,7 +66,7 @@ import axios from 'axios';
 import CryptoJS from "crypto-js";
 
 
-const SDK_VERISON = '2.0.97'
+const SDK_VERISON = '2.0.99'
 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
@@ -1975,10 +1979,10 @@ class Video extends Component {
                 isWhiteboard: false
               })
             } else {
-              if (document.getElementById('video20').name) {
+              if (document.getElementById('video20').name || this.state.publishScreenSid) {
                 this.saveLog('unPublish share, reason: receive stop whiteboard message 1218')
                 console.log('unPublish share, reason: receive stop whiteboard message 1218')
-                this.test_controller.UnPublish(document.getElementById('video20').name)
+                this.test_controller.UnPublish(document.getElementById('video20').name || this.state.publishScreenSid)
                 if(this.state.drawCanvasInterval) clearInterval(this.state.drawCanvasInterval)
               }
               this.setState({
@@ -3934,6 +3938,7 @@ class Video extends Component {
       }
       if (sid == document.getElementById('video20').name) {
         if (this.state.screenName == '切换共享') {
+          this.state.publishScreenSid = sid
           this.state.isSharedScreen = true
           this.state.isScreenSwitching = false
           this.setSharedScreenState(true)
@@ -3958,7 +3963,7 @@ class Video extends Component {
       } else if (this.state.screenName == '切换共享') {
         this.saveLog('unPublish share, reason: trigger OnChangeMediaStreamFailed')
         console.log('unPublish share, reason: trigger OnChangeMediaStreamFailed')
-        this.test_controller.UnPublish(document.getElementById('video20').name)
+        this.test_controller.UnPublish(document.getElementById('video20').name || sid)
         this.state.isSharedScreen = false
         this.state.isScreenSwitching = false
         this.setSharedScreenState(false)
@@ -4109,14 +4114,18 @@ class Video extends Component {
     // 停止共享
     this.test_controller.OnDesktopDisplayClosed = () => {
       console.log('OnDesktopDisplayClosed', this.state.isSharedScreen, this.state.laveRoomSharedScreen, streamShare)
-
       if (this.state.isScreenSwitching) {
         this.state.isScreenSwitching = false
       } else {
         if (!streamShare) {
+          let shareSid = (document.getElementById('video20') && document.getElementById('video20').name) ? document.getElementById('video20').name : this.state.publishScreenSid
           this.saveLog('unPublish share, reason: trigger OnDesktopDisplayClosed, manually click stop or stream onended')
+          this.saveLog('OnDesktopDisplayClosed: publishScreenSid:' + this.state.publishScreenSid + '---' + document.getElementById('video20') + '---' + document.getElementById('video20').name + '----' + 'shareSid:' + shareSid)
           console.log('unPublish share, reason: trigger OnDesktopDisplayClosed, manually click stop or stream onended')
-          document.getElementById('video20') && document.getElementById('video20').name ? this.test_controller.UnPublish(document.getElementById('video20').name) : ''
+          console.log('OnDesktopDisplayClosed: publishScreenSid:' + this.state.publishScreenSid + '---' + document.getElementById('video20') + '---' + document.getElementById('video20').name + '----' + 'shareSid:' + shareSid)
+          if(shareSid) {
+            this.test_controller.UnPublish(shareSid)
+          }
         } else {
           console.log('白板')
         }
@@ -4988,7 +4997,7 @@ class Video extends Component {
         if (this.state.isSharedScreen) {
           this.saveLog('unPublish share, reason: change screen content')
           console.log('unPublish share, reason: change screen content')
-          this.test_controller.UnPublish(document.getElementById('video20').name)
+          this.test_controller.UnPublish(document.getElementById('video20').name || this.state.publishScreenSid)
           this.state.shareLock = true;
           setTimeout(() => {
           publish_config.media_type = 1
@@ -5027,10 +5036,10 @@ class Video extends Component {
           // this.test_controller.ChangeMediaStream(publish_config)
           // this.state.isScreenSwitching = true
         } else {
-          if (document.getElementById('video20').name) {
+          if (document.getElementById('video20').name || this.state.publishScreenSid) {
             this.saveLog('unPublish share, reason: change screen content')
             console.log('unPublish share, reason: change screen content')
-            this.test_controller.UnPublish(document.getElementById('video20').name)
+            this.test_controller.UnPublish(document.getElementById('video20').name || this.state.publishScreenSid)
             this.state.shareLock = true;
             setTimeout(() => {
               publish_config.media_type = 1
@@ -6286,12 +6295,12 @@ class Video extends Component {
 
       this.state.drawCanvasInterval = setInterval($this.drawFunction , 1000/ 20);
 
-      if (document.getElementById('video20').name) {
+      if (document.getElementById('video20').name || this.state.publishScreenSid) {
         // 代表已经有了进行切流
         publish_config.publish_device = 5
         publish_config.media_type = 1
         publish_config.degradationType = 2
-        publish_config.sid = document.getElementById('video20').name
+        publish_config.sid = document.getElementById('video20').name || this.state.publishScreenSid
         publish_config.stream = canvas.captureStream(10)
         publish_config.video_profile_type = 1
         this.test_controller.ChangeMediaStream(publish_config);
@@ -6338,18 +6347,18 @@ class Video extends Component {
         stream.getVideoTracks()[0].onended = async () => {
           //单击停止共享按钮后，触发这个事件
           streamShare = ''
-          if (document.getElementById('video20').name && !this.state.isSharedScreen) {
+          if ((document.getElementById('video20').name || this.state.publishScreenSid) && !this.state.isSharedScreen) {
             console.log('unPublish share, reason: click stop sharing whiteboard or stream onended')
             that.saveLog('unPublish share, reason: click stop sharing whiteboard or stream onended')
-            that.test_controller.UnPublish(document.getElementById('video20').name)
+            that.test_controller.UnPublish(document.getElementById('video20').name  || this.state.publishScreenSid)
           }
         }
 
         // 关闭当前共享屏幕
-        if (document.getElementById('video20') && document.getElementById('video20').name) {
+        if ((document.getElementById('video20') && document.getElementById('video20').name) || this.state.publishScreenSid) {
           console.log('unPublish share, reason: going to share whiteboard, shared screen needs to be stopped')
           that.saveLog('unPublish share, reason: going to share whiteboard, shared screen needs to be stopped')
-          that.test_controller.UnPublish(document.getElementById('video20').name)
+          that.test_controller.UnPublish(document.getElementById('video20').name  || this.state.publishScreenSid)
         }
         that.state.isSharedScreen = false
         that.state.isScreenSwitching = false
@@ -7583,7 +7592,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({
@@ -8294,7 +8303,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':''}}>