react_hsbc_teller 1.5.9 → 1.6.2

package/package.json

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

package/packages/api/api.js

@@ -2,6 +2,25 @@ import Server from './server';
 
 class API extends Server{
   
+  async updateMeetingInfo(params = {}){
+    //  return this.axios('get', '/lang/select/2', params); 
+    try{
+      let result = await this.axios('post', '/hsbc/updateMeetingInfo', params); 
+      if(result && (result.data instanceof Object) && result.code === 200){
+        return result||[];
+      }else{
+        let err = {
+          tip: '服务异常',
+          response: result,
+          data: params,
+          // url: 'https://api.cangdu.org/shopro/data/products',
+        }
+        throw err;
+      }
+    }catch(err){
+      throw err;
+    }
+  }
   async rateAll(params = {}){
     //  return this.axios('get', '/lang/select/2', params); 
     try{

package/packages/demo/demo.js

@@ -161,6 +161,9 @@ createRoomCallback=(data)=>{
 joinRoomCallback=(data)=>{
     console.log('joinRoomCallback', data)
 }
+userExit =(val)=>{
+        console.log(val)
+    }
   render() {
     return (
       <div className="test">
@@ -192,6 +195,7 @@ joinRoomCallback=(data)=>{
                             createRoomCallback={this.createRoomCallback}
                             joinRoomCallback={this.joinRoomCallback}
                             imgCallback={this.imgCallback}
+                            userExit={this.userExit}
                             >
                                 
                                 <Pdf></Pdf>

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

@@ -11,6 +11,8 @@ 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 autod from '../../assets/mp3/joinmeeting.mp3'
+import leftMetting from '../../assets/mp3/leftmeeting.mp3'
 import errorPng from '../../assets/img/tooltips2_fail.png'
 import { callNimIM } from '../../utils/cell.js'
 import Modal from "antd/lib/modal";
@@ -37,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')
 })
@@ -48,6 +72,7 @@ class Video extends Component {
 	}
   cancel = axios.CancelToken.source()
   state = {
+    beautyName: '开启美颜',
     signNoClick: false,
     listVideoPicture: [],
     isScreenSwitching: false,
@@ -1982,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)
@@ -2007,6 +2071,7 @@ class Video extends Component {
           loading: false,
         });
         this.enterRoom()
+        this.updateMeetingInfo()
         this.timer = setInterval(
           () => {
             if(!this.state.voiceStatue && this.state.analyserHeight.get(sid).toFixed(2) > 0.1) {
@@ -2403,29 +2468,14 @@ class Video extends Component {
     this.test_controller.OnNewJoinerIn = (participant) => {
       console.log('新加⼊房间者', participant);
           this.state.isCustomer= true
-        //   let audio = document.createElement('audio') //生成一个audio元素 
-        // audio.src = 'http://mp3.9ku.com/hot/2005/05-19/65937.mp3' //音乐的路径 
-        // audio.play()
+          let src = autod
+          let audio = new Audio(src)
+          audio.play()
     };
     // 推送“有新发布”给与会者
     this.test_controller.OnNewPublish = (feed) => {
       console.log('有新发布者', feed);
       console.log(new Date())
-      callNimIM('sendCustomCmdMsg', {
-        customId: this.state.imRoomId,
-        content: JSON.stringify({
-          'typeId': 1014,
-          'sessionId': this.state.sessionId,
-          'meetingInfo': {
-            'title': this.props.meetingInfo.title,
-            'host': this.props.meetingInfo.host,
-            'customers': this.props.meetingInfo.customers,
-            'otherAttendees': this.props.meetingInfo.otherAttendees
-          }
-
-        })
-      }, function (code, message, data) {
-      })
         callNimIM('sendCustomCmdMsg', {
           customId: this.state.imRoomId,
           content: JSON.stringify({
@@ -2619,7 +2669,7 @@ class Video extends Component {
     // 取消发布成功
     this.test_controller.OnUnPublishSucc = (sid) => {
       console.log('取消发布成功', sid, document.getElementById('publish_video1').name)
-      if (sid != document.getElementById('publish_video1').name) {
+      if (document.getElementById('publish_video1').name && sid != document.getElementById('publish_video1').name) {
         callNimIM('sendCustomCmdMsg', {
           customId: this.state.imRoomId,
           content: JSON.stringify({
@@ -2640,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) => {
@@ -2787,14 +2840,25 @@ class Video extends Component {
       exitType
     ) => {
       console.log('退出房间者', participant, exitType)
+      let src = leftMetting
+      let audio = new Audio(src)
+      audio.play()
       this.appGetUsernameClick(participant).then((res)=>{
         console.log('退出房间者',res)
-        let data = res? res : '客户'
-        console.log(data)
-        this.messageClick(( data + '已退出会议'),'error')
-        // let audio = document.createElement('audio') //生成一个audio元素 
-        // audio.src = 'http://mp3.9ku.com/hot/2005/05-19/65937.mp3' //音乐的路径 
-        // audio.play()
+let data = res? res.username ? res.username : '客户' : '客户'
+console.log(data)
+this.messageClick(( data + '已退出会议'),'error')
+if(res.userType == 1) {
+ // 2--坐席  1--客户
+this.props.userExit({
+userId: participant,
+userType:'1'
+})
+}
+        // console.log('退出房间者',res)
+        // let data = res? res : '客户'
+        // console.log(data)
+        // this.messageClick(( data + '已退出会议'),'error')
       })
       
     };
@@ -3162,6 +3226,42 @@ class Video extends Component {
       }
     }
   }
+  // 保存mettingInfo
+  // callNimIM('sendCustomCmdMsg', {
+  //   customId: this.state.imRoomId,
+  //   content: JSON.stringify({
+  //     'typeId': 1014,
+  //     'sessionId': this.state.sessionId,
+  //     'meetingInfo': {
+  //       'title': this.props.meetingInfo.title,
+  //       'host': this.props.meetingInfo.host,
+  //       'customers': this.props.meetingInfo.customers,
+  //       'otherAttendees': this.props.meetingInfo.otherAttendees
+  //     }
+
+  //   })
+  // }, function (code, message, data) {
+  // })
+  updateMeetingInfo= async()=>{
+    let customers
+    this.props.meetingInfo.customers.map((item, index) => {
+      customers = customers ? customers + ',' + item : item
+    })
+    try{
+      let result = await API.updateMeetingInfo({
+        title:this.props.meetingInfo.title,
+    host:this.props.meetingInfo.host,
+    customers:customers,
+    otherAttendees: this.props.meetingInfo.otherAttendees ? this.props.meetingInfo.otherAttendees : '',
+    sessionId:this.state.sessionId
+      })
+    } catch (err) {
+      console.error(err);
+      if(err.status == 502 || err.status== 404) {
+        this.roomCallBack(2, '连接服务器失败','SYS-02')
+      }
+    }
+  }
   enterRoom = async () =>{
     try {
       let result = await API.enterRoom({
@@ -3185,6 +3285,8 @@ class Video extends Component {
       this.finishSessionClick()
     }
     if (this.test_controller&&this.state.sessionType) {
+      clearStreamRemain()
+      beautyNum = 0
       this.test_controller.LeaveRoom()
       this.test_controller.Disconnect()
     }
@@ -3688,6 +3790,15 @@ class Video extends Component {
       });
       if (result.code == 200) {
         this.messageClick('识别成功','success')
+        callNimIM('sendCustomCmdMsg', {
+          customId: this.state.imRoomId,
+          content: JSON.stringify({
+            'typeId': 1020,
+            'sessionId': this.state.sessionId,
+            'cameraState': 1, // 1--打开前置  2--打开后置
+            "userId": this.state.faceCustomerUid
+          })
+        });
         this.setState({
           isModalVisibleFacial: false
         })
@@ -3714,6 +3825,15 @@ class Video extends Component {
     
   };
   handleCancelFacial = () => {
+    callNimIM('sendCustomCmdMsg', {
+      customId: this.state.imRoomId,
+      content: JSON.stringify({
+        'typeId': 1020,
+        'sessionId': this.state.sessionId,
+        'cameraState': 1, // 1--打开前置  2--打开后置
+        "userId": this.state.faceCustomerUid
+      })
+    });
     this.setState({
       isModalVisibleFacial: false
     })
@@ -3795,6 +3915,18 @@ class Video extends Component {
     if(item.tourist) {
       this.retrieveCustomerInfoByActivityId(item.customId)
     } else {
+    if(this.state.faceCustomerType == 2) {
+      // ocr
+      callNimIM('sendCustomCmdMsg', {
+        customId: this.state.imRoomId,
+        content: JSON.stringify({
+          'typeId': 1020,
+          'sessionId': this.state.sessionId,
+          'cameraState': 2, // 1--打开前置  2--打开后置
+          "userId": item.customId
+        })
+      });
+    }
     var sid
     if (item.feedId == document.getElementById("feedId1").innerText) {
       sid = document.getElementById('video1').name;
@@ -3827,12 +3959,21 @@ class Video extends Component {
     this.setState({
       clickedFacial: false,
       clickedOcr: false,
-      
       isModalVisibleFacial: true,
       facialImg: this.test_controller.TakePicture(1, undefined, undefined, sid, 'png')
     })
+    setTimeout(() => {
+      this.setState({
+        facialImg: this.test_controller.TakePicture(1, undefined, undefined, sid, 'png')
+      })
+    },1000)
   }
   }
+  sgsinImage=()=>{
+    this.setState({
+      facialImg: this.test_controller.TakePicture(1, undefined, undefined, this.state.customOcrSid, 'png')
+    })
+  }
   handleChangeOcr =(val)=> {
     console.log(val)
     this.setState({
@@ -3856,7 +3997,8 @@ class Video extends Component {
       console.log(result)
       
       if (result.code == 200) {
-        data = result.data.username ? result.data.username : ''
+        data = result.data ? result.data : ''
+        // data = result.data.username ? result.data.username : ''
       }
       return data
     }catch (err) {
@@ -4257,6 +4399,21 @@ class Video extends Component {
       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存在的情况下获取
@@ -5010,6 +5167,7 @@ class Video extends Component {
           </div>
           </div>
           <Foot
+          beautyName={this.state.beautyName}
           voiceName={this.state.voiceName}
             img={this.state.voiceImg}
             screenName={this.state.screenName}
@@ -5035,6 +5193,7 @@ class Video extends Component {
             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}>
@@ -5056,6 +5215,7 @@ class Video extends Component {
           <Modal title={this.state.titleModal}  closable={false} centered={true} visible={this.state.isModalVisibleFacial} footer={[
             <div key='facial'>
             <Button className="modelButtonCancel" onClick={this.handleCancelFacial}>取消</Button>
+            <Button className="modelButtonCancel" onClick={this.sgsinImage}>重新截图</Button>
             <Button className="modelButtonOk" type="primary" danger onClick={this.handleOkFacial}>确定</Button>
             </div>
           ]}>