react_hsbc_teller 1.7.3 → 1.7.4

package/package.json

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

package/packages/pages/video/video.jsx

@@ -12,6 +12,7 @@ import voiceImgOpen from '../../assets/img/icon_Mute.png'
 import voiceImgCloe from '../../assets/img/icon_MuteOne.png'
 import cameraImgOpen from '../../assets/img/icon_camera.png'
 import cameraImgCloe from '../../assets/img/icon_cameraOne.png'
+import ocrImage from '../../assets/img/jietu.png'
 import autod from '../../assets/mp3/joinmeeting.mp3'
 import leftMetting from '../../assets/mp3/leftmeeting.mp3'
 import errorPng from '../../assets/img/tooltips2_fail.png'
@@ -44,6 +45,8 @@ let messageValue = ''
 let beautyNum = 0  // 0-关闭  1--弱  2--中 5---高
 let rateList = []
 let beautyDiv = {};
+let isBackgroundBlur = false
+let isSuccuseHs = false
 let CanvasHome = styled.div`
   position: fixed;
   z-index: ${props=>props.zIndexNum};
@@ -71,6 +74,7 @@ const OpreateDiv = styled.div`
     cursor:pointer;
   }
 `;
+
   function clearStreamRemain() {
     if (!(beautyDiv.beauty_canvas == null || beautyDiv.beauty_canvas == undefined)) {
       beautyDiv.beauty_canvas = null;
@@ -90,6 +94,28 @@ function startBeauty(stream) {
   beautyDiv = meetingBeautifyStream(newStream, beautyNum);
   newStream = beautyDiv.stream;
   return newStream
+}
+async function startHs(stream) {
+  // var canvas =  document.getElementById('publish_video_canvas');
+  var video_src = document.getElementById("publish_video1");
+  var mode = 'blur';
+  video_src.srcObject = stream;
+
+  await hsInit();
+  isSuccuseHs = true;
+  hsStart(stream, mode);
+  
+}
+
+async function stopHs() {
+var video_src = document.getElementById("publish_video1");
+if(video_src) {
+  console.log('video_src',video_src)
+  video_src.srcObject = null;
+  isSuccuseHs = false
+  hsStop();
+}
+
 }
 message.config({
   getContainer: ()=>document.getElementById('allHSBC')
@@ -3015,6 +3041,10 @@ class Video extends Component {
     };
     // 退出房间回调
     this.test_controller.OnLeaveRoom = (leaveType) => {
+      if(isSuccuseHs) {
+        stopHs();
+      }
+      
       console.log('退出房间回调', leaveType);
     };
     // 推送“退出房间者”给与会者
@@ -3600,6 +3630,10 @@ userType:'1'
       this.props.resourcePath + "/iconfont.js",
       this.props.resourcePath + "/html2canvas.js",
       this.props.resourcePath + "/dom-to-image.js",
+
+      // this.props.resourcePath + "/hs/hs_human_segmentation_wrapper.js",
+      // this.props.resourcePath + "/hs/hs_human_segmentation.js",
+      // this.props.resourcePath + "/hs/hs_human_segmentation.wasm",
       
 
         
@@ -4191,14 +4225,12 @@ userType:'1'
     this.setState({
       clickedFacial: false,
       clickedOcr: false,
-      isModalVisibleFacial: true,
-      facialImg: this.test_controller.TakePicture(1, undefined, undefined, sid, 'png')
-    })
-    setTimeout(() => {
+      facialImg: ocrImage,
+    },()=>{
       this.setState({
-        facialImg: this.test_controller.TakePicture(1, undefined, undefined, sid, 'png')
+        isModalVisibleFacial: true,
       })
-    },1000)
+    })
   }
   }
   sgsinImage=()=>{
@@ -5541,7 +5573,7 @@ userType:'1'
           <Modal title={this.state.titleModal}  closable={false} centered={true} visible={this.state.isModalVisibleFacial} footer={[
             !this.state.idCardName && <div key='facial'>
             <Button className="modelButtonCancel" onClick={this.handleCancelFacial}>取消</Button>
-            <Button className="modelButtonCancel" onClick={this.sgsinImage}>重新截图</Button>
+            <Button className="modelButtonCancel" onClick={this.sgsinImage}>截图</Button>
             <Button className="modelButtonOk" type="primary" danger onClick={this.handleOkFacial}>确定</Button>
             </div>,
             this.state.idCardName && <div key='facial'>