react_hsbc_teller 2.0.32 → 2.0.34

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react_hsbc_teller",
-  "version": "2.0.32",
+  "version": "2.0.34",
   "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/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

@@ -58,7 +58,7 @@ import MultiModule from '../multiModule/multiModule'//签字、抄录
 import axios from 'axios';
 import CryptoJS from "crypto-js";
 
-const SDK_VERISON = '2.0.32'
+const SDK_VERISON = '2.0.34'
 const IDtypeFront = '请客户在其设备后置摄像头下展示证件正面（如：身份证照片页面）'
 const IDtypeBack = '请在后置摄像头下展示证件反面（如：身份证国徽页）'
 const { Option } = Select;
@@ -401,7 +401,7 @@ class Video extends Component {
   
       // this.publishAllScreen();
       // 单独发布录制屏幕设备的流
-      this.publishRecorderDevice()
+      // this.publishRecorderDevice()
 
       this.props.createRoomCallback({
         type: 1,
@@ -688,13 +688,13 @@ class Video extends Component {
           width: 213 * SCALE,
           height: 175 * SCALE
         },
-        {
-          tag: 'sharedScreen', // 一期暂时不需要录制
-          xPosition: 960 * SCALE,
-          yPosition: 180 * SCALE,
-          width: 320 * SCALE,
-          height: 180 * SCALE
-        }
+        // {
+        //   tag: 'sharedScreen', // 一期暂时不需要录制
+        //   xPosition: 960 * SCALE,
+        //   yPosition: 180 * SCALE,
+        //   width: 320 * SCALE,
+        //   height: 180 * SCALE
+        // }
       ]
       Array.isArray(res) ?
         res.map((item) => {
@@ -1708,7 +1708,11 @@ class Video extends Component {
       else if (Mival.typeId == 5005) { // 客户端人脸数量变化
         let TITLE = '客户'
         if (Mival.data && Mival.data.userId) {
-          TITLE = this.getUserTitle(Mival.data.userId)
+          if (Mival.data.userId.includes(IPAD_SUFFIX)) {
+            TITLE = ''
+          } else {
+            TITLE = this.getUserTitle(Mival.data.userId)
+          }
         }
         this.messageClick(TITLE+'人脸数量发生变化', 'error', Mival.data.userId)
       }
@@ -2324,7 +2328,7 @@ class Video extends Component {
 
       // this.publishAllScreen();
       // 单独发布录制屏幕设备的流
-      this.publishRecorderDevice()
+      // this.publishRecorderDevice()
       
       this.roomCallBack(1, '', 0)
       this.saveLog('mrtc join room success')
@@ -2332,6 +2336,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) => {
@@ -2490,9 +2497,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) {
@@ -2799,6 +2807,7 @@ class Video extends Component {
             'tellerId': this.props.tellerAccount
         })
         this.state.isSharedScreen = false
+        this.setSharedScreenState(false)
         this.setState({
 
           screenName: '共享模式'
@@ -2924,6 +2933,9 @@ class Video extends Component {
         this.setState({
           ipadTag: '',
         })
+        this.messageClick(('iPad 已断开'), 'error')
+        this.saveLog('iPad leave room')
+        return
       }
       
 
@@ -3257,6 +3269,7 @@ class Video extends Component {
         if (this.state.screenName == '切换共享') {
           this.state.isSharedScreen = true
           this.state.isScreenSwitching = false
+          this.setSharedScreenState(true)
         }
       }
     };
@@ -3277,6 +3290,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: '共享模式'
         });
@@ -3416,6 +3430,7 @@ class Video extends Component {
         }
         this.state.isSharedScreen = false
         this.state.isScreenSwitching = false
+        this.setSharedScreenState(false)
         this.setState({
           screenName: '共享模式'
         });
@@ -3656,6 +3671,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)
 
@@ -3669,6 +3685,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,
@@ -4072,6 +4089,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')
@@ -5381,6 +5412,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: '共享模式'
         });
@@ -5491,6 +5523,7 @@ class Video extends Component {
           }, 'add')
           if (this.state.isSharedScreen) {
             this.state.isSharedScreen = false
+            this.setSharedScreenState(false)
             this.setState({
 
               screenName: '共享模式'
@@ -6411,7 +6444,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' }}>
@@ -6733,12 +6766,13 @@ class Video extends Component {
             <div className='endModal'>iPad电量过低，请检查</div>
           </Modal>
           {/* 双录中ipad退出确认 */}
-          <Modal closable={false} centered={true} visible={this.state.IpadLeaveErrorModalVisible} maskClosable={false}  width={320} footer={[
+          <Modal closable={false} centered={true} visible={this.state.IpadLeaveErrorModalVisible} maskClosable={false}  width={350} footer={[
             <div key='end'>
               <Button className="modelButtonOk" type="primary" danger onClick={this.handleOkIpadLeaveConfirm}>确定</Button>
             </div>
           ]}>
-            <div className='ipadModal'>iPad 摄像头异常退出，请扫码重新加入会议</div>
+            <div className='ipadModal'>iPad 摄像头异常退出，请扫码或输入会议号入会</div>
+            <div className='QRCode center'>
               <QRCode
                 value={JSON.stringify({
                   sessionId:this.state.sessionId,
@@ -6749,6 +6783,8 @@ class Video extends Component {
                 size={120} //二维码的宽高尺寸
                 fgColor="#000000"  //二维码的颜色
             />
+            <div className='sessionDiv'>{this.state.sessionId.slice(0, 4)}-{this.state.sessionId.slice(4-this.state.sessionId.length)}</div>
+            </div>
           </Modal>
           {/* 是否退出会议*/}
           <Modal closable={false} centered={true} visible={this.state.isModalVisibleEnd} maskClosable={false} footer={[
@@ -7146,17 +7182,20 @@ class Video extends Component {
               {
                 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> 
+                  <p className="envClass">{this.state.ipadTag? 'iPad设备已加入':'未检测到iPad设备，请扫码或输入会议号入会'}</p> 
+                  <div className='QRCode flex' style={{display: this.state.ipadTag? 'none':''}}>
                   <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'}}
+                      style={{marginTop: '8px', marginLeft: '20px'}}
                       size={100}
                       fgColor="#000000" 
                   />
+                  <div className='sessionDiv'>{this.state.sessionId.slice(0, 4)}-{this.state.sessionId.slice(4-this.state.sessionId.length)}</div>
+                  </div>
                 </Panel>
               }
               {

package/packages/pages/video/video.less

@@ -467,8 +467,7 @@
 .ipadCode{
   margin-top: 16px;
   margin-bottom: 20px;
-  transform: translateX(-50%);
-  left: 50%;
+  margin-left: 30px;
   position: relative;
 }
 .inspection{
@@ -679,4 +678,26 @@ display: inline-flex;
     color: white;
     margin-top: 20px;
   }
+  &.flex{
+    position: initial;
+    flex-direction: row;
+    .sessionDiv{
+      margin-left: 20px;
+      margin-top: 0;
+      font-weight: 500;
+      font-size: 1rem;
+    }
+  }
+  &.center{
+    position: initial;
+    .ipadCode{
+      margin-left: 0px;
+    }
+    .sessionDiv{
+      margin-top: 0;
+      font-weight: 500;
+      font-size: 1rem;
+      margin-bottom: 0.5rem;
+    }
+  }
 }