react_hsbc_teller 2.0.33 → 2.0.35

package/package.json

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

package/packages/api/api.js

@@ -81,6 +81,29 @@ class API extends Server{
       throw err;
     }
   }
+  /**
+   *  用途：保存共享状态
+   *  返回http_code为200表示成功
+   *  @method post
+   *  @return {promise}
+   */
+  async editRmScreenStatus(params = {}){
+    try{
+      let result = await this.axios('post', '/hsbc/editRmScreenStatus', params); 
+      if(result && result.code === 200){
+        return result.data||[];
+      }else{
+        let err = {
+          tip: '共享状态保存失败',
+          response: result,
+          data: params,
+        }
+        throw err;
+      }
+    }catch(err){
+      throw err;
+    }
+  }
   /**
    *  用途：敏感词检测
    *  @url https://api.cangdu.org/shopro/data/products

package/packages/demo/demo.js

@@ -203,6 +203,7 @@ userExit =(val)=>{
                     this.state.isVideo ?
                     <div>
                         <HSBC
+                        isOpenSound={true}
                         shareMask={this.state.shareMask}
                         pdfRendering={this.state.pdfRendering}
                         roomId={this.state.roomId} 

package/packages/pages/header/header.jsx

@@ -8,7 +8,7 @@ export default class header extends Component {
         return(
             <div className="Hamburger">
                 <div className="left-header">
-                    <div className="title">汇丰银行远程会议</div>
+                    <div className="title">汇丰银行{this.props.recordMode==2?'分行':'远程'}会议</div>
                 </div>
             </div>
         )

package/packages/pages/video/video.jsx

@@ -20,7 +20,9 @@ import cameraImgCloe from '../../assets/img/icon_cameraOne.png'
 import beautyImg from '../../assets/img/whiteningLut.jpg'
 import ocrImage from '../../assets/img/jietu.png'
 import faceImage from '../../assets/img/jietu_face.png'
-import autod from '../../assets/mp3/joinmeeting.mp3'
+import joinMeeting from '../../assets/mp3/joinmeeting.mp3'
+import ipadjoinMeeting from '../../assets/mp3/ipad_join_meeting.mp3'
+import ipadLeaveMeeting from '../../assets/mp3/ipad_leave_meeting.mp3'
 import recordErrorAudio from '../../assets/mp3/record_error.mp3'
 import IpadLeaveAudio from '../../assets/mp3/ipad_leave_error.mp3';
 import IpadLowPowerAudio from '../../assets/mp3/ipad_low_power.mp3'; 
@@ -58,7 +60,7 @@ import MultiModule from '../multiModule/multiModule'//签字、抄录
 import axios from 'axios';
 import CryptoJS from "crypto-js";
 
-const SDK_VERISON = '2.0.33'
+const SDK_VERISON = '2.0.35'
 const IDtypeFront = '请客户在其设备后置摄像头下展示证件正面（如：身份证照片页面）'
 const IDtypeBack = '请在后置摄像头下展示证件反面（如：身份证国徽页）'
 const { Option } = Select;
@@ -2336,6 +2338,9 @@ class Video extends Component {
       this.state.imStatus = true
       this.saveLog('Join im room')
       console.log('加入IM房间')
+      
+      // 如果重新加入房间，手动重置一下投屏状态
+      this.setSharedScreenState(false) 
     };
     // 加入房间失败
     this.test_controller.OnJoinRoomFailed = (err_code, err_msg) => {
@@ -2494,9 +2499,10 @@ class Video extends Component {
           'sharedScreen': 1,
           'tellerId': this.props.tellerAccount
         })
-        if (this.state.screenName == '共享屏幕') {
+        if (this.state.screenName == '切换共享') {
           this.state.isSharedScreen = true
           this.state.isScreenSwitching = false
+          this.setSharedScreenState(true)
         }
       }
       if (sid == document.getElementById('publish_streamId1').name) {
@@ -2803,6 +2809,7 @@ class Video extends Component {
             'tellerId': this.props.tellerAccount
         })
         this.state.isSharedScreen = false
+        this.setSharedScreenState(false)
         this.setState({
 
           screenName: '共享模式'
@@ -2906,9 +2913,7 @@ class Video extends Component {
       }
 
       if (participant.includes(IPAD_SUFFIX) && this.state.businessId){
-        // ipad单独处理，不需要加入和退出的提示。但双录过程中ipad如果离开，要提示+循环播报直到ipad重新入会
-        console.log('iPad退出房间', participant)
-        
+        // ipad单独处理，双录过程中ipad如果离开，要提示+循环播报直到ipad重新入会
         this.setState({
           IpadLeaveErrorModalVisible: true,
           ipadTag: '',
@@ -2925,9 +2930,17 @@ class Video extends Component {
         setTimeout(this.ipadLeavePlay, 0);
         return
       } else if (participant.includes(IPAD_SUFFIX)) {
+        // 非双录下ipad离开提示iPad已断开
         this.setState({
           ipadTag: '',
         })
+        this.messageClick(('iPad 已断开'), 'error')
+        this.saveLog('iPad leave room')
+        if (this.props.isOpenSound && !this.state.businessId) {
+          let audio = new Audio(ipadLeaveMeeting)
+          audio.play()
+        }
+        return
       }
       
 
@@ -3261,6 +3274,7 @@ class Video extends Component {
         if (this.state.screenName == '切换共享') {
           this.state.isSharedScreen = true
           this.state.isScreenSwitching = false
+          this.setSharedScreenState(true)
         }
       }
     };
@@ -3281,6 +3295,7 @@ class Video extends Component {
         this.test_controller.UnPublish(document.getElementById('video20').name)
         this.state.isSharedScreen = false
         this.state.isScreenSwitching = false
+        this.setSharedScreenState(false)
         this.setState({
           screenName: '共享模式'
         });
@@ -3420,6 +3435,7 @@ class Video extends Component {
         }
         this.state.isSharedScreen = false
         this.state.isScreenSwitching = false
+        this.setSharedScreenState(false)
         this.setState({
           screenName: '共享模式'
         });
@@ -3660,6 +3676,7 @@ class Video extends Component {
         screenName: '共享模式',
       })
       this.state.isSharedScreen = false
+      this.setSharedScreenState(false)
       this.state.laveRoomSharedScreen = true
       // this.test_controller.UnPublish(document.getElementById('video20').name)
 
@@ -3673,6 +3690,7 @@ class Video extends Component {
         screenName: '共享模式',
       });
       this.state.isSharedScreen = false
+      this.setSharedScreenState(false)
       this.state.laveRoomSharedScreen = true
       this.props.onLeaveRoom({
         code: LEAVE_TYPE.TELLER_EXIT,
@@ -4076,6 +4094,20 @@ class Video extends Component {
       }
     }
   }
+  setSharedScreenState = async (state) => {
+    const status = state? 'open' : 'close'
+    try {
+      let result = await API.editRmScreenStatus({
+        roomId: this.state.channelId + '',
+        status,
+        staffId: this.props.tellerAccount,
+      });
+    } catch (err) {
+      if(err.status == 502 || err.status== 404) {
+        this.roomCallBack(2, '连接服务器失败','SYS-02')
+      }
+    }
+  }
   isFileSuccuse = () => {
     if (!this.state.sessionId || !this.state.sessionType || !this.state.imStatus) {
       this.messageClick('当前程序异常请先退出重开', 'error')
@@ -5154,8 +5186,14 @@ class Video extends Component {
         this.messageClick('查询失败', 'error')
       }
       if (this.props.isOpenSound && sid != document.getElementById('publish_streamId1').name) {
-          if (result.data.userType == 1) {
-            let src = autod
+          if (userId.includes(IPAD_SUFFIX)) {
+            if (!this.state.businessId) {
+              let src = ipadjoinMeeting
+              let audio = new Audio(src)
+              audio.play()
+            }
+          } else if (result.data.userType == 1) {
+            let src = joinMeeting
             let audio = new Audio(src)
             audio.play()
           } else if (result.data.userType == 2) {
@@ -5385,6 +5423,7 @@ class Video extends Component {
         document.getElementById('video20') && document.getElementById('video20').name ? this.test_controller.UnPublish(document.getElementById('video20').name) : ''
         that.state.isSharedScreen = false
         that.state.isScreenSwitching = false
+        that.setSharedScreenState(false)
         that.setState({
           screenName: '共享模式'
         });
@@ -5495,6 +5534,7 @@ class Video extends Component {
           }, 'add')
           if (this.state.isSharedScreen) {
             this.state.isSharedScreen = false
+            this.setSharedScreenState(false)
             this.setState({
 
               screenName: '共享模式'
@@ -6415,7 +6455,7 @@ class Video extends Component {
     return (
       <div className="all" id="allHSBC">
         <Spin spinning={this.state.loading} tip="视频初始化中...">
-          <Header></Header>
+          <Header recordMode={this.props.recordMode}></Header>
           <div className="health">
             <div className="healthVideo">
               <div className="projection" style={{ background: this.state.tabTitles.length > 0 ? '#f0f0f0' : '#ffffff' }}>