react_hsbc_teller 1.6.1 → 1.6.2

package/package.json

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

package/packages/pages/foot/foot.jsx

@@ -50,8 +50,11 @@ export default class foot extends Component {
       switchExternal=()=>{
         this.props.switchExternal()
     }
+    beautyClick=()=>{
+        this.props.beautyClick()
+    }
     render() {
-        const {clickedOcr,clickedFacial,img,isWhiteboard,cameraImg,isTranscribing ,screenName,suspendName,customerList,menus,voiceName} = this.props
+        const {clickedOcr,clickedFacial,img,isWhiteboard,cameraImg,isTranscribing ,screenName,suspendName,customerList,menus,voiceName,beautyName} = this.props
         const content = (
             <div>
               {customerList.map((item,index)=>{
@@ -149,6 +152,14 @@ export default class foot extends Component {
                             
                       })
                   }
+                  {
+                              <div className="one" onClick={this.beautyClick.bind(this)}>
+                                  <img className="imgClass" src={require("../../assets/img/meiyan.png").default} alt="" />
+                                  <div className="text">
+                                  {beautyName}
+                                  </div>
+                              </div>
+                      }
               </div>
           );
         return (

package/packages/pages/video/video.jsx

@@ -39,7 +39,29 @@ let streamShare
 let muteJson = new Map()
 let dateTime = 0
 let messageValue = ''
+let beautyNum = 0  // 0-关闭  1--弱  2--中 5---高
 let rateList = []
+let beautyDiv = {};
+  function clearStreamRemain() {
+    if (!(beautyDiv.beauty_canvas == null || beautyDiv.beauty_canvas == undefined)) {
+      beautyDiv.beauty_canvas = null;
+    }
+    if (!(beautyDiv.beauty_player == null || beautyDiv.beauty_player == undefined)) {
+      beautyDiv.beauty_player.destroy();
+      beautyDiv.beauty_player = null;
+    }
+    if (!(beautyDiv.beauty_div == null || beautyDiv.beauty_div == undefined)) {
+      document.body.removeChild(beautyDiv.beauty_div);
+      beautyDiv.beauty_div = null;
+    }
+    beautyDiv = {};
+  };
+function startBeauty(stream) {
+  let newStream = stream;
+  beautyDiv = meetingBeautifyStream(newStream, beautyNum);
+  newStream = beautyDiv.stream;
+  return newStream
+}
 message.config({
   getContainer: ()=>document.getElementById('allHSBC')
 })
@@ -50,6 +72,7 @@ class Video extends Component {
 	}
   cancel = axios.CancelToken.source()
   state = {
+    beautyName: '开启美颜',
     signNoClick: false,
     listVideoPicture: [],
     isScreenSwitching: false,
@@ -1984,6 +2007,45 @@ class Video extends Component {
     this.test_controller.OnSendTextMsgFailed  =(msgId, code, msg)=>{
       console.log('发送失败',msgId,code, msg)
     }
+    this.test_controller.StreamFilterHandler = async function (publish_tag, stream, stream_type, publish_device, media_type) {
+      console.log(`stream processed by client, publish_device=${publish_device}, media_type=${media_type}, publish_tag=${publish_tag},stream_type=${stream_type}`);
+      if (stream_type == "subscribe") {
+        return stream
+      }
+      if (media_type == 2 || media_type == 4) {
+        return stream
+      }
+      // if (publish_device != 1) {
+      //   return stream
+      // }
+      if(publish_tag == 'tag1') {
+        let newStream = stream;
+      let beauty_strength = beautyNum;
+      if (beauty_strength != 0 && stream.getVideoTracks()[0]) {
+        newStream = new MediaStream([startBeauty(stream).getVideoTracks()[0]]);
+        // 清理原始流
+      newStream.oninactive = function () {
+        clearOriginStream(stream);
+      };
+      newStream.getVideoTracks()[0].onended = function () {
+        clearOriginStream(stream);
+      };
+      function clearOriginStream(stream) {
+        stream.getTracks().forEach((track) => {
+          track.stop();
+        });
+        stream = null;
+      }
+      };
+      if (stream.getAudioTracks()[0] && newStream.addTrack) {
+        newStream.addTrack(stream.getAudioTracks()[0])
+      }
+      return newStream
+      } else {
+        return stream
+      }
+      
+    }
     // 发布媒体流成功
     this.test_controller.OnPublishSucc = (sid) => {
       console.log('发布媒体流成功', sid)
@@ -2628,6 +2690,9 @@ class Video extends Component {
         // }
 
       }
+      if(sid == document.getElementById('publish_video1').name || !document.getElementById('publish_video1').name) {
+        clearStreamRemain()
+      }
     };
     // 取消订阅媒体流成功
     this.test_controller.OnUnSubscribeSucc = (sid) => {
@@ -3220,6 +3285,8 @@ userType:'1'
       this.finishSessionClick()
     }
     if (this.test_controller&&this.state.sessionType) {
+      clearStreamRemain()
+      beautyNum = 0
       this.test_controller.LeaveRoom()
       this.test_controller.Disconnect()
     }
@@ -4332,6 +4399,21 @@ userType:'1'
       microphoneValue: event.target.value
     })
   }
+  beautyClick = () =>{
+    const publish_config = {}
+    publish_config.sid = document.getElementById('publish_video1').name
+    publish_config.media_type = 1
+    publish_config.publish_device = 1
+    publish_config.videoSource = this.state.cameraValue
+    publish_config.audioSource = this.state.microphoneValue
+    publish_config.video_profile_type=100
+    publish_config.video_profile_diy={width:640, height:360, frameRate:15, bitrate:400}
+    this.test_controller.ChangeMediaStream(publish_config)
+    beautyNum =  beautyNum == 0 ? 2 : 0
+    this.setState({
+      beautyName: beautyNum == 0 ? '开启美颜' : '关闭美颜'
+    })
+  }
   componentDidMount() {
     var box=document.getElementById("whiteboardDIV");
        if(box){ //此处在加一层判断，更加严密，如果box存在的情况下获取
@@ -5085,6 +5167,7 @@ userType:'1'
           </div>
           </div>
           <Foot
+          beautyName={this.state.beautyName}
           voiceName={this.state.voiceName}
             img={this.state.voiceImg}
             screenName={this.state.screenName}
@@ -5110,6 +5193,7 @@ userType:'1'
             ocrClick={this.ocrClick}
             switchExternal={this.switchExternal}
             inspection={this.inspection}
+            beautyClick={this.beautyClick}
           ></Foot>
           <Modal cancelText="取消" okText="确定" visible={this.state.isModalVisible} onOk={this.handleOk}
             onCancel={this.handleCancel}>
@@ -5266,7 +5350,7 @@ sessionId: "",
   meetingInfo: {
     title: '--',
     host: '--',
-    customers: ['--','1','2'],
+    customers: ['--'],
     otherAttendees: undefined
   },
   isTranscribing: false,