react_hsbc_teller 2.0.95 → 2.0.97

package/package.json

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

package/packages/api/api.js

@@ -740,17 +740,7 @@ class API extends Server{
    async oneClickCopy(params = {}){
     try{
       let result = await this.axios('post', '/hsbc/oneClickCopy/callback', params); 
-      if (result && (result.data instanceof Object) && result.code === 200){
-        return result.data||[];
-      } else{
-        let err = {
-          tip: '服务异常',
-          response: result,
-          data: params,
-          // url: 'https://api.cangdu.org/shopro/data/products',
-        }
-        throw err;
-      }
+      return result
     }catch(err){
       throw err;
     }

package/packages/demo/demo.js

@@ -23,7 +23,7 @@ sessionId
     zeroVolAlert: false,
     isVideo: false,
     tellerAccount: '20250528',
-    // callbackUrl: 'http://182.92.184.31:8720/hsbc/callback',
+    // callbackUrl: 'https://zuul.uat.dsp.hsbcfts.com.cn/wealth/zuul/api/leimon-counter-api',
     callbackUrl: 'https://aag.wealth-platform.uat.ali.cloud.cn.hsbc/nosaml/api/appointment/wealth/api/v1/appointment/ali/createMeetingRoom',
     businessNumber: '123',
     lang: 'zh',
@@ -50,7 +50,8 @@ sessionId
   salesBranchCode: 'salesBranchCode', //网点编号(分行号)
   financialOffice: "defaultOfficeId", // 理财室
   audioinputNameList: ['默认值 - 外部麦克风 (Realtek(R) Audio)'],
-  needPreSale: true
+  needPreSale: true,
+  needIpad: false,
 }
 componentWillMount() {
     // if(window.localStorage.getItem('sessionId') && window.localStorage.getItem('sessionId') != 'null' && window.localStorage.getItem('sessionId') != 'undefined') {
@@ -226,6 +227,7 @@ userExit =(val)=>{
                     this.state.isVideo ?
                     <div>
                         <HSBC
+                        needIpad={this.state.needIpad}
                         needPreSale={this.state.needPreSale}
                         isOpenSound={true}
                         shareMask={this.state.shareMask}

package/packages/pages/multiModule/components/transcription/transcription.jsx

@@ -90,6 +90,7 @@ class Transcription extends Component {
 		index: 0,
 		isModalVisibleEnd: false,
 		isModalVisibleSubmitError: false,
+		isLoading: false,
 	}
 	componentWillMount() {
 		// 初始化数据
@@ -113,10 +114,36 @@ class Transcription extends Component {
 		}
 		return this.state.formData.file.every(item => item.copy && item.copy.trim() !== '');
 	}
+	// 高亮匹配文本的方法
+	highlightMatch(text, searchText) {
+		if (!searchText || !text) {
+			return text;
+		}
+
+		const parts = text.split(searchText);
+		if (parts.length === 1) {
+			return text;
+		}
+
+		return parts.map((part, index) => (
+			<span key={index}>
+				{part}
+				{index < parts.length - 1 && <strong style={{ color: '#000000' }}>{searchText}</strong>}
+			</span>
+		));
+	}
 	next() {
+		// 防止重复点击
+		if (this.state.isLoading) {
+			return;
+		}
+
 		if (this.state.index == this.state.data.list.length - 1) {
 			console.log('完成')
-			this.finishClick()
+			this.setState({ isLoading: true });
+			this.finishClick().finally(() => {
+				this.setState({ isLoading: false });
+			});
 		} else {
 			this.setState({
 				index: this.state.index + 1,
@@ -125,7 +152,7 @@ class Transcription extends Component {
 		}
 	}
 	sendMessage = () => {
-		this.props.sendMessage({
+		this.props.handleReceiveMsg({
 			'typeId': 952702,
 			'sessionId': window.imRoom.sessionId,
 		})
@@ -135,15 +162,16 @@ class Transcription extends Component {
 			let result = await API.oneClickCopy({
 				...this.props.data
 			});
-			console.log(result)
+			console.log('oneClickCopy', result)
 
-			if (result.code == 200) {
-				this.sendMessage()
-				this.props.finish()
-			} else {
+			if (result.code == 500) {
 				this.setState({
 					isModalVisibleSubmitError: true
 				})
+				
+			} else {
+				this.sendMessage()
+				this.props.finish()
 			}
 		} catch (err) {
 			this.setState({
@@ -194,16 +222,19 @@ class Transcription extends Component {
 				<div className="prompt">
 					交易流水号：{this.state.formData.transactionNumber}
 				</div>
-				<div className="prompt">产品：{this.state.formData.productCode}</div>
+				<div className="prompt">产品代码：{this.state.formData.productCode}</div>
+				<div className="prompt">{this.state.formData.reminderContent}</div>
 				{
 					this.state.formData.file && this.state.formData.file.map((item, index) => {
 						return (
 							<div className="item" key={index}>
-								<div className="item-content">{item.previewContent}</div>
-								<div className="item-button">
-									<div className="item-button-title">请输入抄写内容</div>
-									<button className="item-button-copy" onClick={() => this.copy(index, item.copyContent)}>一键抄录</button>
+								<div className="item-value">
+									<div className="item-content">{this.highlightMatch(item.previewContent, item.copyContent)}</div>
+									<div className="item-button">
+										<button className="item-button-copy" onClick={() => this.copy(index, item.copyContent)}>一键输入</button>
+									</div>
 								</div>
+
 								<div >
 									<div className="item-input">{item.copy}</div>
 								</div>
@@ -215,14 +246,16 @@ class Transcription extends Component {
 					<button
 						className="item-button-copy"
 						onClick={() => this.next()}
-						disabled={!this.isAllCopied()}
-						style={!this.isAllCopied() ? {
+						disabled={!this.isAllCopied() || this.state.isLoading}
+						style={!this.isAllCopied() || this.state.isLoading ? {
 							background: '#CCCCCC',
 							borderColor: '#CCCCCC',
 							color: '#999999',
 							cursor: 'not-allowed'
 						} : {}}
-					>确认</button>
+					>
+						{this.state.isLoading ? '提交中...' : '确认'}
+					</button>
 
 				</div>
 				<Modal transitionName="" maskTransitionName="" getContainer={document.getElementById('multiModule')} destroyOnClose={true} closable={false} centered={true} visible={this.state.isModalVisibleEnd} footer={[<div key='end'>

package/packages/pages/multiModule/components/transcription/transcription.less

@@ -52,20 +52,26 @@
         }
     }
     .prompt{
-        padding: 14px 24px ;
+        padding: 14px 24px 0;
         font-size: 1rem;
     }
     .item{
         padding: 14px 24px ;
+        .item-value{
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            margin-bottom: 20px;
+        }
         .item-content{
-            border: 1px #666666 solid;
-            padding: 14px 24px;
-            min-height: 50px;
+            // border: 1px #666666 solid;
+            // padding: 14px 24px;
+            // min-height: 50px;
         }
         .item-button{
             display: flex;
-        justify-content: space-between;
-        padding: 14px 0;
+        justify-content: flex-end;
+        // padding-bottom: 14px;
         }
         .item-button-title{
             font-size: 1rem;
@@ -78,6 +84,8 @@
             border: 1px #666666 solid;
             padding: 14px 24px;
             min-height: 50px;
+            color: #000000;
+            font-weight: bolder;
         }
     }
     .submit {

package/packages/pages/video/video.jsx

@@ -66,7 +66,7 @@ import axios from 'axios';
 import CryptoJS from "crypto-js";
 
 
-const SDK_VERISON = '2.0.95'
+const SDK_VERISON = '2.0.97'
 const IDtypeFront = '请客户在其设备后置摄像头下展示证件正面（如：身份证照片页面）'
 const IDtypeBack = '请在后置摄像头下展示证件反面（如：身份证国徽页）'
 const { Option } = Select;
@@ -3172,8 +3172,9 @@ class Video extends Component {
       console.log('新加⼊房间者', participant);
       this.saveLog('mrtc someone joined room, userId=' + participant)
       this.state.isCustomer = true
-
-      if (participant.includes(IPAD_SUFFIX) && this.state.businessId){
+      // 改为根据this.props.needIpad判断是否需要ipad
+      // if (participant.includes(IPAD_SUFFIX) && this.state.businessId){
+      if (participant.includes(IPAD_SUFFIX) && this.props.needIpad){
         this.saveVideoPoint('padConnected', 'ipad已连接');
       }
       if (participant.includes(H5_SUFFIX)){
@@ -3283,11 +3284,12 @@ class Video extends Component {
 
       }
 
-      // 记录ipad摄像头流，需要单独开启录制
-      if (feed.mediaSource == 'VIDEO_SOURCE_CAMERA' && feed.uid.includes(IPAD_SUFFIX)) {
+      // 记录ipad摄像头流，需要单独开启录制 额外需要判断是否要求ipad加入  this.props.needIpad
+      if (feed.mediaSource == 'VIDEO_SOURCE_CAMERA' && feed.uid.includes(IPAD_SUFFIX) && this.props.needIpad) {
         this.state.ipadTag = feed.tag;
-        // 如果已经开启了业务录制且ipad未在录制，立即开启ipad录制（ipad后加入）
-        if (this.state.businessId && !this.state.ipadRecordId) {
+        // ipad未在录制，立即开启ipad录制（ipad后加入）---不需要根据是否业务了，上面根据this.props.needIpad判断是否需要ipad
+        if (!this.state.ipadRecordId) {
+          // if (this.state.businessId && !this.state.ipadRecordId) {
           this.enableIpadRecording(this.state.businessId)
         } 
       }
@@ -3371,7 +3373,9 @@ class Video extends Component {
       console.log('取消发布者', feed)
 
       // ipad取消发布提醒
-      if (feed.uid.includes(IPAD_SUFFIX) && this.state.businessId){
+      // if (feed.uid.includes(IPAD_SUFFIX) && this.state.businessId){
+      // 现在不根据是否双录来判断，根据外部传入的this.props.needIpad
+      if (feed.uid.includes(IPAD_SUFFIX) && this.props.needIpad){
         // ipad单独处理，双录过程中ipad如果取消发布，要提示+循环播报直到ipad重新入会
         this.setState({
           IpadLeaveErrorModalVisible: true,
@@ -3392,7 +3396,7 @@ class Video extends Component {
         }
         setTimeout(this.ipadMediaClosePlay, 0);
       } else if (feed.uid.includes(IPAD_SUFFIX)) {
-        // 非双录下ipad离开提示iPad已断开
+        // 非双录下ipad离开提示iPad已断开-----this.props.needIpad为false
         this.setState({
           ipadTag: '',
         })
@@ -3456,7 +3460,10 @@ class Video extends Component {
         return
       }
 
-      if (participant.includes(IPAD_SUFFIX) && this.state.businessId){
+      // if (participant.includes(IPAD_SUFFIX) && this.state.businessId){
+      //判断条件从之前的是否双录过程中，改成--根据this.props.needIpad来判断，true是需要ipad，false是不需要ipad
+      if (participant.includes(IPAD_SUFFIX) && this.props.needIpad){
+      
         // ipad单独处理，双录过程中ipad如果离开，要提示+循环播报直到ipad重新入会
         this.setState({
           IpadLeaveErrorModalVisible: true,
@@ -3477,7 +3484,7 @@ class Video extends Component {
         this.saveLog('iPad leave room during recording')
         return
       } else if (participant.includes(IPAD_SUFFIX)) {
-        // 非双录下ipad离开提示iPad已断开
+        // 非双录下ipad离开提示iPad已断开 --this.props.needIpad为false
         this.setState({
           ipadTag: '',
         })
@@ -4001,7 +4008,6 @@ class Video extends Component {
           if(newanalyser) {
             analyser = newanalyser
           }
-          this.saveLog('zeroVolAlert: ' + this.props.zeroVolAlert)
           if(this.props.zeroVolAlert) {
             if (!this.volumeFunctionTimer && this.state.voiceStatue == false &&  this.state.analyserHeight.get(sid) == 0) {
               this.volumeFunctionTimer = setTimeout(this.volumeFunction.bind(this, sid), 15000)
@@ -7320,6 +7326,7 @@ class Video extends Component {
         })
       clearTimeout(this.volumePlayTimer)
       this.volumePlay = () => {
+        this.saveLog('zeroVolAlert: ' + this.props.zeroVolAlert)
         if (this.state.isModalVisibleVolume) {
           if (this.volumeAudio) this.volumeAudio.pause()
           this.volumeAudio = new Audio(volumeError)
@@ -7442,7 +7449,7 @@ class Video extends Component {
                             this.state.envInfo.microResult=='合格' &&
                             this.state.envInfo.speakerResult=='合格' &&
                             (this.state.envInfo.lightResult=='合格' || this.props.recordMode == 2 ) &&
-                            (this.state.ipadTag || this.props.recordMode != 2)
+                            (this.state.ipadTag || !this.props.needIpad)
 
     const sectionStyle = this.state.tabTitles.length > 0 ? {
       zIndex: '-1',
@@ -8398,6 +8405,7 @@ Video.defaultProps = {
   signalDisconnectedTime: 20, // 网络异常断开多久后异常弹窗提示
   zeroVolAlert: true, // true  开启音量持续提示，，false不开启
   isTagFilter: true, // 默认true 的时候是开启只录制标签是tag的（剔除掉小蜜的声音的），false是关闭录制全部的
+  needIpad: true,// 默认true 控制是否开启iPad（断连提示，弹窗关闭，录制判断），false不需要
   logUrl: 'http://hsbc.cn-shanghai.log.aliyuncs.com/logstores/hsbc/track?APIVersion=0.6.0&app=meeting-ui',
   internalUrl: 'https://wp-staff-gateway.wealth-platform.uat.ali.cloud.cn.hsbc/meeting-ui/OHB/CN/HSBC?chnlID=OHB&locale=zh_CN&chnlCC=CN&chnlGMC=HSBC&targetFunc=supervisorMeeting&sourceFunc=rmMeeting'
 }