react_hsbc_teller 2.0.99 → 2.1.1

package/package.json

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

package/packages/demo/demo.js

@@ -51,7 +51,7 @@ sessionId
   financialOffice: "defaultOfficeId", // 理财室
   audioinputNameList: ['默认值 - 外部麦克风 (Realtek(R) Audio)'],
   needPreSale: true,
-  needIpad: true,
+  needIpad: false,
 }
 componentWillMount() {
     // if(window.localStorage.getItem('sessionId') && window.localStorage.getItem('sessionId') != 'null' && window.localStorage.getItem('sessionId') != 'undefined') {

package/packages/pages/video/video.jsx

@@ -66,7 +66,7 @@ import axios from 'axios';
 import CryptoJS from "crypto-js";
 
 
-const SDK_VERISON = '2.0.99'
+const SDK_VERISON = '2.1.1'
 const IDtypeFront = '请客户在其设备后置摄像头下展示证件正面（如：身份证照片页面）'
 const IDtypeBack = '请在后置摄像头下展示证件反面（如：身份证国徽页）'
 const { Option } = Select;
@@ -1963,6 +1963,7 @@ class Video extends Component {
         if (Mival.sessionId == this.state.sessionId) {
           // 1-开启，2-关闭
           if (Mival.type == 1) {
+            this.state.isSfpMeeting = true
             this.switchExternal()
             this.saveLog('whiteboard start, typeId=1218,')
             if (typeof this.props.sfpCallback === 'function'){
@@ -3314,7 +3315,17 @@ class Video extends Component {
         })
         this.state.isSharedScreen = false
         this.setSharedScreenState(false)
-        this.setSharedScreenTimer(false)
+        // 1218--sfp可以通过api去唤起meeting alisdk的白板进行文档签署
+        // 在这里要多判断一层，要是收到通知1218导致的取消发布的时候不去调用setSharedScreenTimer
+        
+        if(!this.state.isSfpMeeting){
+          this.setSharedScreenTimer(false)
+        } else {
+          console.log('isSfpMeeting: true')
+          this.saveLog('isSfpMeeting: true')
+          this.state.isSfpMeeting = false
+        }
+        
         this.saveLog('Stop share')
         this.setState({
 
@@ -4913,6 +4924,7 @@ class Video extends Component {
     }
   }
   setSharedScreenTimer = (state) => {
+    console.log('screenName',this.state.screenName)
       // 设置定时，如果x秒内没有重新开启投屏 则弹出提示
       if (!this.props.screenSharedInterval || typeof this.props.screenSharedInterval != 'number') return;
       if (state) {
@@ -7498,7 +7510,7 @@ class Video extends Component {
               <div className="projection" style={{ background: this.state.tabTitles.length > 0 ? '#f0f0f0' : '#ffffff' }}>
                 {tabTitleList}
                 {/* <img style={sectionStyle} src={require("../../assets/img/placeholder_bg.png").default} alt="" /> */}
-                <div id="whiteboardDIV" style={{ height: 'calc(100% - 33px)' }}>
+                <div id="whiteboardDIV" style={{ height: 'calc(100%)' }}>
                   <CanvasHome zIndexNum={this.state.zIndexNum} style={{ width: isGraffiti ? this.state.widthVideo + 'px' : this.state.whiteboardWidth + 'Px', height: this.state.whiteboardHeight + 'Px', top: this.state.whiteboardTop + 'Px', left: isGraffiti ? this.state.leftVideo + 'px' : this.state.whiteboardLeft + 'Px' }}>
                     {this.state.operateShow &&
                       <OpreateDiv id="operate">

package/packages/pages/video/video.css

@@ -1,667 +0,0 @@
-.publishVideo1 {
-  width: 100px;
-  height: 100px;
-}
-.mixedvideo {
-  display: none;
-  position: absolute;
-  object-fit: cover;
-}
-.imgClass {
-  width: 100%;
-  height: 100%;
-  float: right;
-}
-.imgClassVoice {
-  width: 25Px;
-  height: 24Px;
-  margin-bottom: 4Px;
-}
-.sharedScreen {
-  font-size: 10px;
-  position: absolute;
-  height: 30px;
-  line-height: 30px;
-  color: red;
-}
-.wrapper {
-  overflow: auto;
-  display: flex;
-  flex-direction: column;
-  height: 100%;
-  width: 20%;
-  background: #f3f3f3;
-  text-align: center;
-  margin-left: 20px;
-}
-.isNoVideo {
-  display: none;
-}
-.itemed {
-  text-align: center;
-  color: #fff;
-  font-weight: bold;
-  min-height: 170px;
-  position: relative;
-  background: #333;
-  margin-bottom: 20px;
-  border-radius: 6px;
-}
-.videoFit {
-  object-fit: cover !important;
-}
-.video1 {
-  width: 100%;
-  height: 100%;
-  object-fit: cover;
-  border-radius: 6px;
-}
-.videoTab {
-  width: 100%;
-  height: 100%;
-  object-fit: contain;
-  border-radius: 6px;
-}
-.video {
-  width: 100%;
-  height: 100%;
-  object-fit: cover;
-  border-radius: 6px;
-}
-.video1Div {
-  width: 100%;
-  height: 100%;
-}
-.health {
-  padding: 20Px;
-  background: #f0f0f0;
-}
-.healthVideo {
-  height: calc(100vh - 12.9125rem);
-  width: 100%;
-  display: inline-flex;
-}
-.all {
-  height: 100%;
-}
-.ownClass {
-  height: calc(100vh - 15px);
-  object-fit: cover;
-  width: 100%;
-}
-.publishVideoClass {
-  height: 100%;
-  width: 100%;
-  object-fit: cover;
-  border-radius: 6px;
-}
-.publishVideoDiv {
-  height: 100%;
-  width: 100%;
-  border-radius: 6px;
-}
-.invitationSpan {
-  margin-top: 5px;
-  margin-right: 15px;
-  float: right;
-  height: 37px !important;
-  width: 80px !important;
-  font-size: 16px !important;
-  border: 1px #3E505D solid !important;
-  background: #3E505D !important;
-  color: #fff !important;
-}
-.inputClick {
-  width: 65%;
-  height: 46px;
-  border-radius: 2px;
-  outline: none;
-  font-size: 17px;
-  padding: 0 5px;
-  border: 1px #707070 solid;
-}
-.modalSpan {
-  margin-right: 20px;
-  font-size: 17px;
-  color: #666666;
-}
-.invitationImg {
-  width: 20px;
-  height: 20px;
-}
-.invitationButton {
-  color: #1a9adc !important;
-  border: none !important;
-  background: #fff !important;
-}
-.invitationDiv {
-  margin-left: 40px;
-  margin-bottom: 15px;
-}
-.invitationDiv input::-webkit-inner-spin-button {
-  -webkit-appearance: none;
-  appearance: none;
-  margin: 0;
-}
-.faceImg {
-  width: 60%;
-  margin-bottom: 20Px;
-}
-.faceBody {
-  text-align: center;
-  height: 100%;
-  width: calc(100% - 150px);
-}
-.faceBody .resuleCard {
-  text-align: -webkit-left;
-  padding: 0Px 2Px;
-}
-.faceBody .resuleCard div {
-  font-size: 13Px;
-  color: #646464;
-  margin: 10Px 20Px;
-}
-.faceBody .resuleCard div input {
-  border: #DCDCDC 1px solid;
-  width: 15rem;
-  height: 2rem;
-  line-height: 2rem;
-  margin-left: 15px;
-}
-.faceBody .resuleCard div span {
-  display: inline-block;
-  min-width: 5rem;
-}
-.content {
-  height: 200px;
-  border-radius: 4px;
-  border: 1px dashed #DDDDDD;
-  margin: 24px;
-  margin-bottom: 3rem;
-  flex: 1;
-}
-.ant-spin-nested-loading,
-.ant-spin-container {
-  height: 100%;
-}
-.projection {
-  width: 80%;
-  position: relative;
-  color: #333;
-  border-radius: 0 4px 4px 4px;
-  text-align: left;
-}
-.projection .videoDiv {
-  width: 100%;
-  height: 100%;
-}
-.projection .videoDiv .video {
-  width: 100%;
-  height: 100%;
-  background: rgba(0, 0, 0, 0.65);
-}
-.customerTitle {
-  background: rgba(0, 0, 0, 0.65);
-  display: inline-flex;
-  position: absolute;
-  align-items: center;
-  left: 10px;
-  line-height: 40px;
-  bottom: 10px;
-  height: 40px;
-  border-radius: 4px;
-}
-.tellerTitle {
-  background: rgba(0, 0, 0, 0.65);
-  display: inline-flex;
-  position: absolute;
-  left: 10px;
-  line-height: 40px;
-  bottom: 10px;
-  height: 40px;
-  border-radius: 4px;
-  font-size: 14px;
-}
-.titleBig {
-  max-width: 30%;
-}
-.titleSamlle {
-  max-width: 70%;
-}
-.titleName {
-  white-space: nowrap;
-  text-overflow: ellipsis;
-  overflow: hidden;
-  padding-right: 10px;
-}
-.themeClass {
-  position: absolute;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  margin: auto;
-  width: 500px;
-  height: 300px;
-  font-size: 22px;
-  color: #222222;
-  font-weight: 600;
-  transform: translateX(-100px);
-}
-.themeClass ul li {
-  list-style: none;
-  margin: 21px 0;
-  text-align: left;
-}
-.themeClass ul li span {
-  font-size: 20px;
-  width: 143px;
-  text-align: left;
-  display: inline-block;
-}
-.themeClass ul li .labelClass {
-  font-size: 16px;
-  text-align: left;
-  display: inline-block;
-}
-.button {
-  display: inline-flex;
-}
-.button .selectSee {
-  max-width: 8rem;
-  height: 32px;
-  text-align: center;
-  background: #303D46;
-  border-radius: 0 0 0.104167rem 0.104167rem;
-  border: 0.052083rem solid #303D46;
-  color: #ffffff;
-  font-size: 14px;
-}
-.button .noSelest {
-  max-width: 8rem;
-  height: 32px;
-  text-align: center;
-  background: #D7D8D6;
-  border-radius: 0 0 0.104167rem 0.104167rem;
-  border: 0.052083rem solid #D7D8D6;
-  color: #303D46;
-  font-size: 14px;
-}
-.button div {
-  font-size: 16px;
-  color: #FFFFFF;
-  padding: 6px 13px;
-}
-.envClass {
-  margin-bottom: 0;
-  padding-left: 1.25rem;
-}
-.ant-collapse > .ant-collapse-item > .ant-collapse-header {
-  font-weight: bold;
-}
-.ant-collapse > .ant-collapse-item.panel-error > .ant-collapse-header {
-  color: #DA0110;
-}
-.ant-collapse-ghost > .ant-collapse-item > .ant-collapse-content > .ant-collapse-content-box {
-  padding-top: 0 !important;
-}
-.ant-collapse-header img {
-  width: 16px;
-  height: 16px;
-  margin-left: 10px;
-  margin-bottom: 1px;
-}
-.voiceClass {
-  width: 25Px;
-  height: 25.3Px;
-  margin-bottom: 1Px;
-}
-.cameraAnMicrophone {
-  margin: 10px 20px;
-}
-.ant-modal-header {
-  border-bottom: none !important;
-}
-.ant-modal-body {
-  padding: 0 !important;
-}
-.ant-modal-title {
-  font-size: 22px !important;
-  color: #333333 !important;
-}
-.ant-modal-footer {
-  margin-top: 0px!important;
-}
-.modelButtonCancel {
-  width: 100px!important;
-  height: 40px!important;
-  font-size: 16px!important;
-  color: #333 !important;
-  border: 1px #333 solid !important;
-  background: #fff !important;
-  border-spacing: 20px!important;
-}
-.modelNoButton {
-  margin-left: 10px;
-}
-.modelButtonCancelOne {
-  width: 170px!important;
-  height: 40px!important;
-  font-size: 16px!important;
-  color: #5C5C5C !important;
-  border: 1px #5C5C5C solid !important;
-  border-spacing: 20px!important;
-  background: #d9d9d9 !important;
-}
-.modelButtonOkInvitation {
-  width: 170px!important;
-  height: 40px!important;
-  font-size: 16px!important;
-  color: #ffffff !important;
-  border: 1px #DB0011 solid !important;
-  background: #DB0011 !important;
-  border-spacing: 20px!important;
-}
-.modelButtonOk {
-  width: 100px!important;
-  height: 40px!important;
-  font-size: 16px!important;
-  color: #ffffff !important;
-  border: 1px #DB0011 solid !important;
-  background: #DB0011 !important;
-  border-spacing: 20px!important;
-}
-.modelButtonNo {
-  width: 100px!important;
-  height: 40px!important;
-  font-size: 16px!important;
-  color: #5C5C5C !important;
-  border: 1px #5C5C5C solid !important;
-  background: #d9d9d9 !important;
-  border-spacing: 20px!important;
-}
-.modelButtonFaceOk {
-  width: 170px!important;
-  height: 40px!important;
-  font-size: 16px!important;
-  color: #333 !important;
-  border: 1px #333 solid !important;
-  background: #fff !important;
-  border-spacing: 20px!important;
-}
-.modelButtonFaceOkColor {
-  min-width: 170px!important;
-  height: 40px!important;
-  font-size: 16px!important;
-  color: #ffffff !important;
-  border: 1px #DB0011 solid !important;
-  background: #DB0011 !important;
-  border-spacing: 20px!important;
-}
-.modelButtonFaceOkColorFile {
-  min-width: 170px!important;
-  height: 40px!important;
-  font-size: 16px!important;
-  color: #5C5C5C !important;
-  border: 1px #5C5C5C solid !important;
-  background: #d9d9d9 !important;
-  border-spacing: 20px!important;
-}
-.endModal {
-  font-size: 16px;
-  padding: 56px 30px 0px 30px;
-  color: #333333;
-}
-.ipadModal {
-  font-size: 16px;
-  padding: 36px 30px 0px 30px;
-  color: #333333;
-}
-.ipadModal .ant-modal-body {
-  display: flex;
-  align-items: center;
-  flex-direction: column;
-}
-.ipadCode {
-  margin-top: 16px;
-  margin-bottom: 16px;
-  margin-left: 30px;
-  position: relative;
-}
-.inspection {
-  font-size: 16px;
-  margin: 20px 50px;
-}
-.CustomerSelectTitle {
-  margin-bottom: 10px;
-}
-.errorClassName .ant-message-notice-content {
-  min-width: 500px;
-  min-height: 44px;
-  background: #F9F2F3;
-  border: 1px #E5B2B5 solid;
-  font-size: 16px;
-  color: #252525;
-  text-align: center;
-  padding: 7px;
-}
-.errorClassName img {
-  margin-right: 8px;
-  width: 16px;
-  height: 16px;
-  margin-bottom: 3px;
-}
-.successClassName .ant-message-notice-content {
-  min-width: 500px;
-  height: 44px;
-  background: #E5F2F2;
-  border: 1px #99CECC solid;
-  font-size: 16px;
-  color: #252525;
-  text-align: center;
-  padding: 7px;
-}
-.successClassName img {
-  margin-right: 8px;
-  width: 16px;
-  height: 16px;
-  margin-bottom: 3px;
-}
-.errorClassFace {
-  min-width: 350px;
-  min-height: 44px;
-  background: #F9F2F3;
-  border: 1px #E5B2B5 solid;
-  font-size: 16px;
-  color: #252525;
-  text-align: center;
-  padding: 7px;
-}
-.errorClassFace img {
-  margin-right: 8px;
-  width: 16px;
-  height: 16px;
-  margin-bottom: 3px;
-}
-.videoErrorClass {
-  height: 60px;
-  margin: 15px;
-}
-.successClassFace {
-  min-width: 350px;
-  height: 44px;
-  background: #E5F2F2;
-  border: 1px #99CECC solid;
-  font-size: 16px;
-  color: #252525;
-  text-align: center;
-  padding: 7px;
-}
-.successClassFace img {
-  margin-right: 8px;
-  width: 16px;
-  height: 16px;
-  margin-bottom: 3px;
-}
-.radio {
-  position: relative;
-  display: inline-block;
-  font-weight: 400;
-  padding-left: 25px;
-  text-align: left;
-  width: 100%;
-  display: flex;
-}
-.radio input {
-  position: absolute;
-  left: -9999px;
-}
-.radio i {
-  display: block;
-  position: absolute;
-  top: 50%;
-  left: 2px;
-  width: 12px;
-  height: 12px;
-  transform: translateY(-50%);
-  outline: 0;
-  border: 1px solid #858585;
-  background: transparent;
-  border-radius: 50%;
-  transition: border-color 0.3s;
-  -webkit-transition: border-color 0.3s;
-  box-sizing: content-box;
-}
-.radio input + i:after {
-  position: absolute;
-  content: '';
-  top: 50%;
-  left: 50%;
-  transform: translate(-50%, -50%);
-  width: 50%;
-  height: 50%;
-  border-radius: 50%;
-  background-color: #269792;
-  opacity: 0;
-  transition: opacity 0.1s;
-  -webkit-transition: opacity 0.1s;
-  box-sizing: content-box;
-}
-.radio input:checked + i:after {
-  opacity: 1;
-}
-.errorClassInvitationColor {
-  background: #F9F2F3;
-  border: 1px #E5B2B5 solid;
-}
-.errorClassInvitation {
-  width: 90%;
-  height: 50px;
-  margin: 50px 30px 0px;
-}
-.errorClassInvitation img {
-  margin: 15px 20px;
-  width: 18px;
-  height: 18px;
-}
-.linkClass {
-  margin: 20px 40px;
-  font-size: 14px;
-  word-break: break-all;
-}
-.speakerTitle {
-  color: red;
-}
-.selectCustomer {
-  font-size: 16px;
-  margin: 20Px 40px;
-}
-.faceImgCard {
-  width: 25rem;
-  margin-bottom: 10px;
-  height: 13.5rem;
-}
-.faceImgCardTwo {
-  margin-bottom: 0px !important;
-}
-.titleDiv {
-  font-size: 1.2rem;
-  margin: 10px 0;
-}
-.videoListClass {
-  align-content: flex-start;
-  flex-wrap: wrap;
-  display: inline-flex;
-}
-.videoMinutuListClass {
-  width: 50%;
-}
-.videoMinutuClass {
-  width: 100%;
-}
-.imgDIV {
-  margin: 0 !important;
-  text-align: center;
-}
-.QRCode {
-  position: absolute;
-  right: -200px;
-  top: 30px;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-}
-.QRCode .num {
-  background: #DB0011;
-  border-radius: 20px;
-  padding: 0 15px;
-  text-align: center;
-  line-height: 40px;
-  height: 40px;
-  color: white;
-  margin-top: 5px;
-}
-.QRCode .sessionDiv {
-  display: flex;
-  flex-direction: column;
-}
-.QRCode .sessionDiv span {
-  margin-bottom: 3px;
-  font-size: 16px;
-  font-weight: bold;
-  text-align: center;
-}
-.QRCode.flex {
-  position: initial;
-  flex-direction: row;
-}
-.QRCode.flex .sessionDiv {
-  margin-left: 20px;
-}
-.QRCode.flex .num {
-  margin-top: 0px;
-  font-weight: 500;
-  font-size: 1rem;
-}
-.QRCode.center {
-  position: initial;
-}
-.QRCode.center .ipadCode {
-  margin-left: 0px;
-}
-.QRCode.center .num {
-  margin-top: 0px;
-  font-weight: 500;
-  font-size: 1rem;
-  margin-bottom: 0.5rem;
-}
-body {
-  font-size: 100%;
-}
-.currentDevice {
-  color: #DB0011;
-}
-.sliderClass {
-  width: 70%;
-  margin-left: 1.25rem;
-}