react_hsbc_teller 1.0.3 → 1.0.4

package/package.json

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

package/packages/demo/demo.js

@@ -7,10 +7,10 @@ class Demo extends Component {
     // sessionId: "9K9ea1vOM",
     // mtoken: "d4e648858b03",
     // roomId: "645110140224386",
-    roomId: '645515863322767',
-    mtoken: 'bae147019f8a',
-    imRoomId: 'Ma9XWgf2k@conference.openfire2.leimondata.cn',
-    sessionId: 'Ma9XWgf2k',
+    roomId: '',
+    mtoken: '',
+    imRoomId: '',
+    sessionId: '',
     isVideo: false,
     tellerAccount: '00000000',
     callbackUrl: 'http://47.102.126.132:8720/hsbc/callback',
@@ -28,22 +28,23 @@ class Demo extends Component {
   titleColor: '#faad14',
   microphoneSize: 50,
   fontSize: 14,
-  fontFamily: 'auto'
+  fontFamily: 'auto',
+  isTranscribing: false
 }
 componentWillMount() {
-    if(window.localStorage.getItem('roomId')) {
-        this.setState({roomId: window.localStorage.getItem('roomId')});
-    }
-    if(window.localStorage.getItem('mtoken')) {
-        this.setState({mtoken: window.localStorage.getItem('mtoken')});
-    }
-    if(window.localStorage.getItem('sessionId')) {
-        this.setState({sessionId: window.localStorage.getItem('sessionId')});
-    }
-    if(window.localStorage.getItem('imRoomId')) {
-        this.setState({imRoomId: window.localStorage.getItem('imRoomId')});
-        this.startVideo()
-    }
+    // if(window.localStorage.getItem('roomId')) {
+    //     this.setState({roomId: window.localStorage.getItem('roomId')});
+    // }
+    // if(window.localStorage.getItem('mtoken')) {
+    //     this.setState({mtoken: window.localStorage.getItem('mtoken')});
+    // }
+    // if(window.localStorage.getItem('sessionId')) {
+    //     this.setState({sessionId: window.localStorage.getItem('sessionId')});
+    // }
+    // if(window.localStorage.getItem('imRoomId')) {
+    //     this.setState({imRoomId: window.localStorage.getItem('imRoomId')});
+    //     this.startVideo()
+    // }
     
 }
 handleChangeRoomId = (event) => {
@@ -99,11 +100,19 @@ handleBaseURL = (event) => {
         baseURL: event.target.value
     })
 }
+handleChangeisTranscribing = (event) => {
+    this.setState({
+        isTranscribing: event.target.value
+    })
+}
 handleResourcePath = (event) => {
     this.setState({
         resourcePath: event.target.value
     })
 }
+imgCallback=(file)=>{
+    console.log(file)
+}
 createRoomCallback=(data)=>{
     console.log('createRoomCallback', data)
     this.setState({roomId: data.data.roomId});
@@ -143,9 +152,13 @@ joinRoomCallback=(data)=>{
                             roomServerUrl={this.state.roomServerUrl}
                             baseURL={this.state.baseURL}
                             resourcePath={this.state.resourcePath}
+                            isTranscribing={this.state.isTranscribing}
                             onLeaveRoom={this.onLeaveRoom}
                             createRoomCallback={this.createRoomCallback}
-                            joinRoomCallback={this.joinRoomCallback}>
+                            joinRoomCallback={this.joinRoomCallback}
+                            imgCallback={this.imgCallback}
+                            >
+                                
                                 {/* <Pdf></Pdf> */}
                         </HSBC>
                         :
@@ -162,6 +175,8 @@ joinRoomCallback=(data)=>{
           <div>rtoken：  <input type="text" value={this.state.mtoken} onChange={this.handleChangeRToken} /></div>
           <div>sessionId：  <input type="text" value={this.state.sessionId} onChange={this.handleChangeSessionId} /></div>
           <div>imRoomId：  <input type="text" value={this.state.imRoomId} onChange={this.handleChangeImRoomId} /></div>
+          <div>isTranscribing:  <input type="text" value={this.state.isTranscribing} onChange={this.handleChangeisTranscribing} /></div>
+          
                             <button className="button" onClick={this.startVideo.bind(this)}>开启视频</button>
                         </div>
                 }

package/packages/pages/foot/foot.jsx

@@ -50,8 +50,11 @@ export default class foot extends Component {
       inspection = ()=>{
           this.props.inspection()
       }
+      screenSwitching =()=>{
+          this.props.screenSwitching()
+      }
     render() {
-        const {clickedOcr,clickedFacial,isTranscribing,img,cameraImg,screenName,suspendName,customerList,menus,voiceName} = this.props
+        const {clickedOcr,clickedFacial,img,cameraImg,isTranscribing ,screenName,suspendName,customerList,menus,voiceName} = this.props
         const content = (
             <div>
               {customerList.map((item,index)=>{
@@ -69,7 +72,7 @@ export default class foot extends Component {
                   {
                       menus.map((item,index)=>{
                           return <div key={index}className='footHover'>
-                          {
+                          {/* {
                                   isTranscribing &&
                                   <div className="one" onClick={this.transcribingClick.bind(this)}>
                                   <img className="imgClass"src={require("../../assets/img/icon_copy.png").default} alt="" />
@@ -77,7 +80,7 @@ export default class foot extends Component {
                                       签字
                                   </div>
                               </div>
-                              }
+                              } */}
                               {
                                  item == 'SHARE' && <div className="one" onClick={this.sharedScreen.bind(this)}>
                                   <img className="imgClass" src={require("../../assets/img/Projection_screen.png").default} alt="" />
@@ -150,6 +153,14 @@ export default class foot extends Component {
                         </div>
                     </div>
                     </div>
+                    {/* <div className='footHover' onClick={this.screenSwitching.bind(this)}>
+                    <div className="one">
+                        <img className="imgClass" src={require("../../assets/img/inspection.png").default} alt="" />
+                        <div className="text">
+                            切换投屏
+                        </div>
+                    </div>
+                    </div> */}
                 </div>
                 {defaultList}
                 

package/packages/pages/video/video.jsx

@@ -41,6 +41,7 @@ class Video extends Component {
   cancel = axios.CancelToken.source()
   signCanvas = React.createRef();
   state = {
+    isScreenSwitching: false,
     whiteboardWidth: '',
     whiteboardHeight: '',
     laveRoomSharedScreen: false,
@@ -49,7 +50,8 @@ class Video extends Component {
     isWhiteboard: false,
     isSelect: '',
     loading: false,
-    isModalVisibleSign: false,
+    // isModalVisibleSign: '',
+    isModalVisibleSign: this.props.isTranscribing,
     titleModal: '人脸识别',
     faceCustomerType: 1, // 1无感人脸，2ocr
     faceCustomerUid: '',
@@ -321,8 +323,8 @@ class Video extends Component {
   enableServerRecording = () => {
     const filePath = 'recordId_' + new Date().valueOf();
     const recordParam = {};
-    recordParam.width = 640;
-    recordParam.height = 480;
+    recordParam.width = 1280;
+    recordParam.height = 720;
     recordParam.recordTotalStream = 0;
     recordParam.startTimeout = 10;
     recordParam.splitType = 0;
@@ -2286,10 +2288,13 @@ class Video extends Component {
     // 切流成功通知
     this.test_controller.OnChangeMediaStreamSuccess = (sid) => {
       console.log('切流成功通知', sid);
-      this.messageClick('切换摄像头或麦克风成功','success')
-      this.setState({
-        isModalVisibleInspection: false
-      })
+      if(this.state.isModalVisibleInspection) {
+        this.messageClick('切换摄像头或麦克风成功','success')
+        this.setState({
+          isModalVisibleInspection: false
+        })
+      }
+      
     };
     // 切流失败通知
     this.test_controller.OnChangeMediaStreamFailed = (
@@ -2411,9 +2416,14 @@ class Video extends Component {
     // 停止共享
     this.test_controller.OnDesktopDisplayClosed = () => {
       console.log('OnDesktopDisplayClosed', this.state.isSharedScreen ,this.state.laveRoomSharedScreen)
+      if(this.state.isScreenSwitching) {
+        this.state.isScreenSwitching = false
+      } else {
         if (!this.state.laveRoomSharedScreen && this.state.isSharedScreen) {
           this.sharedScreen()
         }
+      }
+        
       
     }
   }
@@ -2766,6 +2776,20 @@ class Video extends Component {
       }
     }
   };
+  screenSwitching=()=>{
+    if (this.isFileSuccuse()) {
+      const publish_config = {};
+      if (this.state.isSharedScreen) {
+        const publish_config = {}
+        publish_config.media_type = 1
+        publish_config.publish_device = 2
+        publish_config.video_profile_type = 1
+        publish_config.sid = document.getElementById('video20').name
+        this.test_controller.ChangeMediaStream(publish_config)
+        this.state.isScreenSwitching = true
+      }
+    }
+  }
   sharedScreen = () => {
     console.log('投屏')
     if (this.isFileSuccuse()) {
@@ -2785,6 +2809,7 @@ class Video extends Component {
           this.test_controller.UnPublish(document.getElementById('video20').name)
         }
         this.state.isSharedScreen = false
+        this.state.isScreenSwitching = false
         this.setState({
           screenName: '投屏'
         });
@@ -2797,20 +2822,21 @@ class Video extends Component {
         if (document.getElementById('video20').name) {
           publish_config.media_type = 1;
           publish_config.publish_device = 2;
-          publish_config.video_profile_type = 5;
+          publish_config.video_profile_type = 1;
           publish_config.sid = document.getElementById('video20').name;
           this.test_controller.ChangeMediaStream(publish_config);
         } else {
           publish_config.media_type = 1
           publish_config.publish_device = 2
           publish_config.need_volume_analyser = true
-          publish_config.video_profile_type = 5
+          publish_config.video_profile_type = 1
           publish_config.publish_video_id = 'video20'
           publish_config.publish_streamId_id = 'subscribe_streamId20'
           publish_config.publish_tag = 'projectionWhiteboard'
           this.test_controller.Publish(publish_config)
         }
         this.state.isSharedScreen = true
+        this.state.isScreenSwitching = false
         this.setState({
           screenName: '取消共享',
           isPDF: false
@@ -3218,9 +3244,16 @@ class Video extends Component {
     }
   }
   handleOkSign = () => {
-    this.counterSign({
-      file: this.signCanvas.current.canvas.drawing.toDataURL('image/png')
+    this.setState({
+      isModalVisibleSign: false,
     })
+    console.log(this.signCanvas.current.canvas.drawing.toDataURL('image/png'))
+    this.props.imgCallback(
+      this.signCanvas.current.canvas.drawing.toDataURL('image/png').replace(/data.+?;base64,/, "")
+    )
+    // this.counterSign({
+    //   file: this.signCanvas.current.canvas.drawing.toDataURL('image/png')
+    // })
   }
   switchExternal = () => {
     if (!this.state.isWhiteboard) {
@@ -3869,6 +3902,7 @@ class Video extends Component {
             ocrClick={this.ocrClick}
             switchExternal={this.switchExternal}
             inspection={this.inspection}
+            screenSwitching={this.screenSwitching}
           ></Foot>
           <Modal cancelText="取消" okText="确定" visible={this.state.isModalVisible} onOk={this.handleOk}
             onCancel={this.handleCancel}>
@@ -3939,7 +3973,7 @@ class Video extends Component {
             }
             
           </Modal>
-          <Modal title="签字白板" closable={false} centered={true} visible={this.state.isModalVisibleSign} footer={
+          <Modal title="签字白板" width={600} destroyOnClose={true} closable={false} centered={true} visible={this.state.isModalVisibleSign} footer={
             [
               <div key='okSign'>
               <Button className="modelButtonOk" type="primary" danger onClick={this.handleOkSign}>确定</Button>
@@ -4010,6 +4044,7 @@ sessionId: "Fwua8kGB6",
     title: '--',
     host: '--',
     customers: ['--']
-  }
+  },
+  isTranscribing: false,
 }
 export default Video

package/packages/pages/video/video.less

@@ -152,7 +152,7 @@
   text-align: center;
 }
 .content{
-  height: 654px;
+  height: 200px;
   border-radius: 4px;
   border:1px dashed  #DDDDDD;
   margin: 24px;