react_hsbc_teller 2.0.36 → 2.0.38

package/package.json

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

package/packages/pages/foot/foot.jsx

@@ -119,7 +119,7 @@ export default class foot extends Component {
                       <div className="one">
                           <img className="imgClass" src={require("../../assets/img/switchExternal.png").default} alt="" />
                           <div className="text">
-                          远程签署
+                            {this.props.recordMode == 1?'远程':''}签署 
                           </div>
                       </div>
                       </div>

package/packages/pages/video/video.jsx

@@ -60,7 +60,7 @@ import MultiModule from '../multiModule/multiModule'//签字、抄录
 import axios from 'axios';
 import CryptoJS from "crypto-js";
 
-const SDK_VERISON = '2.0.36'
+const SDK_VERISON = '2.0.38'
 const IDtypeFront = '请客户在其设备后置摄像头下展示证件正面（如：身份证照片页面）'
 const IDtypeBack = '请在后置摄像头下展示证件反面（如：身份证国徽页）'
 const { Option } = Select;
@@ -1734,6 +1734,12 @@ class Video extends Component {
       else if (Mival.typeId == 5006) { // 内网pib检测到敏感词
         this.messageClick(Mival.content, 'error', Mival.data.userId)
       }
+      else if (Mival.typeId == 5007) { // ipad充电状态
+        if (Mival.type == '1') { // 1充电 2不在充电
+          this.setState({ ipadLowPowerErrorModalVisible: false})
+          clearTimeout(this.ipadLowPowerPlay)
+        } 
+      }
       else if (Mival.typeId == 1220) {
         // 一炒多的图片  1214
         if (Mival.sessionId == this.state.sessionId) {
@@ -2072,7 +2078,7 @@ class Video extends Component {
       console.error(err)
     }
   }
-  saveVideoPoint = async (code, content) => {
+  saveVideoPoint = async (code, content, prohibitedWords) => {
     try {
       let result = await API.saveVideoPoint({
         title: POINT_TYPE[code],
@@ -2084,6 +2090,7 @@ class Video extends Component {
         appId: this.state.appId,
         recordId: this.state.recordId,
         client: 'rm',
+        prohibitedWords,
         customerId: this.props.tellerAccount
       });
     } catch (err) {
@@ -3984,9 +3991,9 @@ class Video extends Component {
         appCode: `HSBCCode`
       }).then((re) => {
         if (re.data.match) {
-          this.saveVideoPoint('pwd', `${resultValue}`)
           console.log('匹配到敏感词', re.data.matchRawTextItems)
           let matchArr = re.data.matchRawTextItems.map(el => el.matchedText);
+          this.saveVideoPoint('pwd', `${resultValue}`, matchArr.toString())
           if (matchArr.length>0) {
                 matchArr.forEach(el => {
                   this.messageClick('检测到敏感词:' + matchArr, 'error')
@@ -4374,8 +4381,12 @@ class Video extends Component {
     this.enableServerRecording(this.state.businessId)
   }
   handleOkLowPowerConfirm = () => {
-    this.setState({ ipadLowPowerErrorModalVisible: false})
-    clearTimeout(this.ipadLowPowerPlay)
+    // 通知ipad，获取是否在充电的状态
+    this.sendMessage({
+      'typeId': 1224,
+      'sessionId': this.state.sessionId,
+      'userId': this.props.tellerAccount
+    })
   }
   handleOkIpadLeaveConfirm = () => {
     // 检测ipad是否入会
@@ -6559,9 +6570,12 @@ class Video extends Component {
                               {otherAttendeesList}
                             </li>
                           }
+                          {
+                            this.props.recordMode != 2 &&
                           <li>
                             请注意，若会议中需要客户出示证件，请客户使用手机的后置摄像头展示证件，由客户经理拍摄证件照片以完成客户身份核实。客户可点击会议主页面上的”切换摄像头“按钮切换手机摄像头
                           </li>
+                          }
 
                         </ul>
                       </div>
@@ -6576,7 +6590,7 @@ class Video extends Component {
                             size={110} //二维码的宽高尺寸
                             fgColor="#000000"  //二维码的颜色
                         />
-                        <div className='sessionDiv'>{this.state.sessionId.slice(0, 4)}-{this.state.sessionId.slice(4-this.state.sessionId.length)}</div>
+                        <div className='sessionDiv' style={{marginTop: '20px'}}><span>会议号码</span><div className='num'>{this.state.sessionId}</div></div>
                       </div> : null}
                     </div>
                   }
@@ -6807,7 +6821,7 @@ 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 className='sessionDiv'><span>会议号码</span><div className='num'>{this.state.sessionId}</div></div>
             </div>
           </Modal>
           {/* 是否退出会议*/}
@@ -7205,8 +7219,8 @@ class Video extends Component {
               </Panel>
               {
                 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> 
+                <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':''}}>
                   <QRCode
                       value={JSON.stringify({
@@ -7218,7 +7232,7 @@ class Video extends Component {
                       size={100}
                       fgColor="#000000" 
                   />
-                  <div className='sessionDiv'>{this.state.sessionId.slice(0, 4)}-{this.state.sessionId.slice(4-this.state.sessionId.length)}</div>
+                  <div className='sessionDiv'><span>会议号码</span><div className='num'>{this.state.sessionId}</div></div>
                   </div>
                 </Panel>
               }

package/packages/pages/video/video.less

@@ -466,7 +466,7 @@
 }
 .ipadCode{
   margin-top: 16px;
-  margin-bottom: 20px;
+  margin-bottom: 16px;
   margin-left: 30px;
   position: relative;
 }
@@ -668,7 +668,7 @@ display: inline-flex;
   display: flex;
   flex-direction: column;
   align-items: center;
-  .sessionDiv{
+  .num{
     background: #DB0011;
     border-radius: 20px;
     padding: 0 15px;
@@ -676,14 +676,26 @@ display: inline-flex;
     line-height: 40px;
     height: 40px;
     color: white;
-    margin-top: 20px;
+    margin-top: 5px;
+  }
+  .sessionDiv{
+    display: flex;
+    flex-direction: column;
+    span{
+      margin-bottom: 3px;
+      font-size: 16px;
+      font-weight: bold;
+      text-align: center;
+    }
   }
   &.flex{
     position: initial;
     flex-direction: row;
     .sessionDiv{
       margin-left: 20px;
-      margin-top: 0;
+    }
+    .num{
+      margin-top: 0px;
       font-weight: 500;
       font-size: 1rem;
     }
@@ -693,8 +705,8 @@ display: inline-flex;
     .ipadCode{
       margin-left: 0px;
     }
-    .sessionDiv{
-      margin-top: 0;
+    .num{
+      margin-top: 0px;
       font-weight: 500;
       font-size: 1rem;
       margin-bottom: 0.5rem;