react_hsbc_teller 2.0.75 → 2.0.77

package/packages/pages/video/video.jsx

@@ -22,7 +22,8 @@ import { Collapse } from 'antd';
 import 'antd/lib/collapse/style'
 const { Panel } = Collapse;
 import { Button } from '../../../node_modules/antd/lib/index';
-
+import Slider from 'antd/lib/slider';
+import 'antd/lib/slider/style'
 import './video.less'
 import { compressImage, isLight, saveBase64Image, combineBase64Images } from '../../utils/utils'
 import Recorder from "js-audio-recorder";
@@ -63,7 +64,7 @@ import MultiModule from '../multiModule/multiModule'//签字、抄录
 import axios from 'axios';
 import CryptoJS from "crypto-js";
 
-const SDK_VERISON = '2.0.75'
+const SDK_VERISON = '2.0.77'
 const IDtypeFront = '请客户在其设备后置摄像头下展示证件正面（如：身份证照片页面）'
 const IDtypeBack = '请在后置摄像头下展示证件反面（如：身份证国徽页）'
 const { Option } = Select;
@@ -351,7 +352,10 @@ class Video extends Component {
     transcribeErrorCode: '',
     presaleRecordId: '',
     salePresaleRecordId: '',
-    supplesalePresaleRecordId: ''
+    supplesalePresaleRecordId: '',
+    gainNodeVolume: 1, // 音量增益节点-用于投屏
+    gainNodeVolumeNew: 1,
+    networkAnomalyModalVisible: false, // 网络异常弹窗
 
   };
   // eslint-disable-next-line no-undef
@@ -1789,6 +1793,9 @@ class Video extends Component {
             // 关闭录制
             this.saveLog('stop recording')
             this.test_controller.StopRemoteRecord(this.state.recordId)
+            if(this.state.presaleRecordId) {
+              this.test_controller.StopRemoteRecord(this.state.presaleRecordId)
+            }
           }
         }
       }
@@ -2166,6 +2173,12 @@ class Video extends Component {
           console.log('业务录制关闭', this.state.businessRecordId)
           this.saveLog('Stop business recording')
           this.test_controller.StopRemoteRecord(this.state.businessRecordId)
+          if(this.state.salePresaleRecordId) {
+              this.test_controller.StopRemoteRecord(this.state.salePresaleRecordId)
+          }
+          if(this.state.supplesalePresaleRecordId) {
+              this.test_controller.StopRemoteRecord(this.state.supplesalePresaleRecordId)
+          }
           if (this.state.ipadRecordId) this.test_controller.StopRemoteRecord(this.state.ipadRecordId)
 
           this.state.businessId = '';
@@ -2177,6 +2190,10 @@ class Video extends Component {
         // 会议到时间
         console.log('会议超过时间限制')
         this.endSessionValue();
+      } else if (Mival.typeId == 990002 && this.state.sessionId == Mival.sessionId) {
+        this.props.closePdfCallback({
+          step: Mival.data.step
+        })
       }
   }
   getUserTitle = (userId) => {
@@ -2465,10 +2482,18 @@ class Video extends Component {
           transcribeErrorCode: 30001,
           transcribeErrorModalVisible: true
         })
+        this.saveLog('Failed to establish connection，' + code)
       } else {
+        let message = '建立连接失败'
+        if(code == '-101') {
+          this.setState({
+            networkAnomalyModalVisible: true
+          })
+          message = '建立连接失败，网络异常，请检查网络后重试'
+        }
         
         this.saveLog('Failed to establish connection，' + code)
-        this.messageClick('建立连接失败', 'error')
+        this.messageClick(message, 'error')
         this.state.sessionType = false
         this.roomCallBack(2, '连接失败', '2-'+code)
       }
@@ -2520,6 +2545,11 @@ class Video extends Component {
       console.log('创建房间失败', err_code, err_msg)
       this.saveLog('Failed to create room，' + err_code)
       this.state.sessionType = false
+      let message = '创建房间失败-' + err_code
+      if(err_code == '-303' || err_code == '-304') {
+        message = '创建房间超时，请检查网络后重试-' + err_code
+      }
+      this.messageClick(message, 'error')
       this.roomCallBack(2, '创建房间失败', '7-' + err_code)
     };
     // 初始化⾳视频成功
@@ -2536,7 +2566,9 @@ class Video extends Component {
     const playAudioTip = (code) => {
       this.messageClick('媒体流服务异常断开，请刷新', 'error')
       if(code == 5003) {
-        this.state.mediaErrorModalMessage = '媒体流服务异常，请刷新('+ code + ')'
+        this.state.mediaErrorModalMessage = '媒体流获取失败，请刷新('+ code + ')'
+      } else if(code == 5004 || code == 5010) {
+        this.state.mediaErrorModalMessage = '媒体流网络异常，请刷新('+ code + ')'
       } else {
         this.state.mediaErrorModalMessage = '媒体流服务异常，请刷新('+ code + ')'
       }
@@ -2566,8 +2598,12 @@ class Video extends Component {
         if (sid == this.state.publishSid) { 
           this.saveLog('Audio and video close notification，' + code)
           this.roomCallBack(2, '音视频异常关闭', '8-' + code)
-          if (code == 5007 || code == 5007 || code == 5009 || code == 5010 || code == 5011) {
-            this.saveVideoPoint('conFail', `RM端媒体链路断开, err_code=${code}`)
+          if (code == 5004 || code == 5007 || code == 5009 || code == 5010 || code == 5011) {
+            let message = 'RM端媒体链路断开'
+            if(code == 5004 || code == 5010) {
+              message = 'RM端媒体链路断开，网络异常，请检查网络后重试'
+            }
+            this.saveVideoPoint('conFail', `${message}, err_code=${code}`)
             playAudioTip(code);
           }
           //5003：启动流失败（信令阶段）
@@ -2579,8 +2615,12 @@ class Video extends Component {
           this.state.isScreenSwitching = false
           this.setSharedScreenState(false)
           this.setSharedScreenTimer(false)
-          if (code == 5007 || code == 5007 || code == 5009 || code == 5010 || code == 5011) {
-            this.saveVideoPoint('conFail', `RM投屏媒体链路断开, err_code=${code}`)
+          if (code == 5004 || code == 5007 || code == 5009 || code == 5010 || code == 5011) {
+            let message = 'RM投屏媒体链路断开'
+            if(code == 5004 || code == 5010) {
+              message = 'RM投屏媒体链路断开，网络异常，请检查网络后重试'
+            }
+            this.saveVideoPoint('conFail', `${message}, err_code=${code}`)
             playAudioTip(code);
           }
           //5003：启动流失败（信令阶段）
@@ -2782,7 +2822,29 @@ class Video extends Component {
         if (stream.getAudioTracks()[0] && newStream1.addTrack) {
           newStream1.addTrack(stream.getAudioTracks()[0])
         }
-        return newStream1
+
+        if (publish_device == 2 && newStream1.getAudioTracks().length > 0) {
+          console.log('AudioContextAudioContext', this.state.gainNodeVolume)
+          const audioContext = new AudioContext();
+          const source = audioContext.createMediaStreamSource(newStream1);
+          const gainNode = audioContext.createGain();
+
+          // 设置增益倍数（2.0 = 提升100%）自定义选择1-5
+          gainNode.gain.value = this.state.gainNodeVolume;  // 根据需求调整
+          // 创建处理后的流
+          const dest = audioContext.createMediaStreamDestination();
+          source.connect(gainNode).connect(dest);
+
+          // 构建新流（视频+增强后音频）
+          const processedStream = new MediaStream([
+            ...newStream1.getVideoTracks(),
+            ...dest.stream.getAudioTracks()
+          ]);
+
+          return processedStream;
+        } else {
+          return newStream1
+        }
       }
       return stream
     }
@@ -2868,7 +2930,18 @@ class Video extends Component {
         this.roomCallBack(2, '发布失败', '4-' + err_code)
       } else {
         this.test_controller.UnPublish(sid)
-        this.messageClick('投屏失败请重新投屏', 'error')
+        let message = '投屏失败请重新投屏'
+        if(err_code == '-1073'){
+          message = '超出发布限额 请检查是否已经发布'
+        }
+        if(err_code == '-1074'){
+          message = '网络异常，请检查网络后重新投屏'
+        }
+        
+        if(err_code == '5103') {
+          message = '不⽀持当前媒体，请重新投屏'
+        }
+        this.messageClick(message, 'error')
         this.setSharedScreenState(false)
         this.setSharedScreenTimer(false)
         this.saveLog('Share fail, code=' + err_code)
@@ -5027,6 +5100,12 @@ class Video extends Component {
   handleOktranscribeErrorConfirm = () => {
     location.reload(false);
   }
+  networkAnomalyConfirm = () => {
+    location.reload(false);
+    this.setState({
+      networkAnomalyModalVisible: false
+    })
+  }
   handleCancelMediaError = () => {
     clearTimeout(this.mediaErrorPlayTimer)
     this.setState({ mediaErrorModalVisible: false })
@@ -6403,6 +6482,7 @@ class Video extends Component {
     this.envDetection()
     this.setState({
       isModalVisibleEnvironment: true,
+      gainNodeVolumeNew: this.state.gainNodeVolume
     })
   }
   
@@ -6490,18 +6570,22 @@ class Video extends Component {
   handleOkEnvDetection = async () => {
     this.setState({
       isModalVisibleEnvironment: false,
+      gainNodeVolume: this.state.gainNodeVolumeNew
+    }, () => {
+      const cMicrophone = this.state.microphoneList.find((item) => item.actionid === this.state.microphoneValue);
+      const cSpeaker = this.state.speakerList[0];
+      console.log(`当前麦克风设备: ${cMicrophone?.actionname || ''}, 当前扬声器设备: ${cSpeaker?.actionname || ''}`, `当前设置的投屏音量为：${this.state.gainNodeVolume}`);
+      this.saveLog(`当前麦克风设备: ${cMicrophone?.actionname || ''}, 当前扬声器设备: ${cSpeaker?.actionname || ''}`);    // 开启画中画
+      this.saveLog(`当前设置的投屏音量为：${this.state.gainNodeVolume}`)
+      if (!this.state.isPictureInPicture) {
+        this.pictureInPicture()
+      }
+      // 分行模式，需要自动开启业务录制
+      if (this.props.recordMode == 2) {
+        this.startBusinessRecord()
+      }
     })
-    const cMicrophone = this.state.microphoneList.find((item)=> item.actionid === this.state.microphoneValue);
-    const cSpeaker = this.state.speakerList[0];
-    console.log(`当前麦克风设备: ${cMicrophone?.actionname ||''}, 当前扬声器设备: ${cSpeaker?.actionname || ''}`);
-    this.saveLog(`当前麦克风设备: ${cMicrophone?.actionname ||''}, 当前扬声器设备: ${cSpeaker?.actionname || ''}`);    // 开启画中画
-    if (!this.state.isPictureInPicture) {
-      this.pictureInPicture()
-    }
-    // 分行模式，需要自动开启业务录制
-    if (this.props.recordMode == 2) {
-      this.startBusinessRecord()
-    }
+
   }
 
   async startBusinessRecord() {
@@ -7061,6 +7145,12 @@ class Video extends Component {
     //   })
     // }
   }
+  onChangeVolume = (value) => {
+    console.log('onChangeVolume', value)
+    this.setState({
+      gainNodeVolumeNew: value
+    })
+  }
   render() {
     const { meetingInfo, isTranscribing } = this.props
     var pdfChildren
@@ -7182,6 +7272,13 @@ class Video extends Component {
       bottom: 0,
       margin: 'auto'
     };
+    const marks = {
+      1: '1',
+      2: '2',
+      3: '3',
+      4: '4',
+      5: '5'
+    };
     return (
       <div className="all" id="allHSBC">
         <Spin spinning={this.state.loading} tip="视频初始化中...">
@@ -7566,7 +7663,7 @@ class Video extends Component {
           ]}>
             <div className='endModal'>{this.state.mediaErrorModalMessage}</div>
           </Modal>
-          {/* 30001(在信令链接失败回调中)/发布失败/音视频异常回调  相关事件印象双录失败提示 */}
+          {/* 30001(在信令链接失败回调中)/发布失败/音视频异常回调 相关事件双录失败提示 */}
           <Modal closable={false} centered={true} visible={this.state.transcribeErrorModalVisible} maskClosable={false} footer={[
             <div key='end'>
               <Button className="modelButtonOk" type="primary" danger onClick={this.handleOktranscribeErrorConfirm}>确定</Button>
@@ -7574,6 +7671,14 @@ class Video extends Component {
           ]}>
             <div className='endModal'>{'系统异常请刷新('+ this.state.transcribeErrorCode + ')'}</div>
           </Modal>
+          {/* 在网络异常的情况下弹窗提示后刷新后重试 */}
+          <Modal closable={false} centered={true} visible={this.state.networkAnomalyModalVisible} maskClosable={false} footer={[
+            <div key='end'>
+              <Button className="modelButtonOk" type="primary" danger onClick={this.networkAnomalyConfirm}>确定</Button>
+            </div>
+          ]}>
+            <div className='endModal'>{'当前网络异常，请检查网络后重试'}</div>
+          </Modal>
           {/* 是否退出会议*/}
           <Modal closable={false} centered={true} visible={this.state.isModalVisibleEnd} maskClosable={false} footer={[
             <div key='end'>
@@ -7933,7 +8038,7 @@ class Video extends Component {
               <Button className={isEnvironmentOK ?"modelButtonOk": "modelButtonNo"} type="primary" disabled={!isEnvironmentOK } danger onClick={this.handleOkEnvDetection}>确定</Button>
             </div>
           ]}>
-             <Collapse defaultActiveKey={['1', '2', '3', '4', '5', '6']} ghost>
+             <Collapse defaultActiveKey={['1', '2', '3', '4', '5', '6', '7']} ghost>
              
               <Panel header={<span>网络检测 - {this.state.envInfo.networkResult } {this.state.envInfo.networkResult=='不合格'? <img src={IconFail} />: <img src={IconSuccess} />}</span>} 
                 key="5" className={this.state.envInfo.networkResult=='不合格'? 'panel-error':''} >
@@ -8011,6 +8116,9 @@ class Video extends Component {
                  <p className="envClass">{this.state.envInfo.lightResult=='合格'? '无过度背光、曝光':'过度背光、曝光'}</p> 
               </Panel>
               }
+              <Panel header={<span>投屏音量</span>} key="7">
+                <Slider marks={marks} className="sliderClass" min={1} max={5} value={this.state.gainNodeVolumeNew} onChange={this.onChangeVolume} />
+              </Panel>
             </Collapse>
           </Modal>
           <video className="mixedvideo" id="mixedvideo" autoPlay muted={true} width="0" height="0"></video>

package/packages/pages/video/video.less

@@ -719,3 +719,7 @@ body {
 .currentDevice{
   color: #DB0011;
 }
+.sliderClass{
+  width: 70%;
+  margin-left: 1.25rem;
+}