react_hsbc_teller 1.8.0 → 1.8.3

package/package.json

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

package/packages/api/api.js

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

package/packages/api/server.js

@@ -28,7 +28,6 @@ export default class Server {
         timeout: 30000,
         params: null,
         data: params,
-        headers: null,
         withCredentials: true, //是否携带cookies发起请求
         validateStatus:(status)=>{
             return status >= 200 && status < 300;

package/packages/pages/foot/foot.jsx

@@ -164,14 +164,14 @@ export default class foot extends Component {
                                   </div>
                               </div>
                       }
-                      {/* {
+                      {
                           item == 'BEAUTY' && <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>
                             
                       })

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 beautyImg from '../../assets/img/whiteningLut.jpg'
 import ocrImage from '../../assets/img/jietu.png'
 import autod from '../../assets/mp3/joinmeeting.mp3'
 import leftMetting from '../../assets/mp3/leftmeeting.mp3'
@@ -42,7 +43,8 @@ let streamShare
 let muteJson = new Map()
 let dateTime = 0
 let messageValue = ''
-let beautyNum = 0  // 0-关闭  1--弱  2--中 5---高
+let beautyType = false
+// let beautyNum = 0  // 0-关闭  1--弱  2--中 5---高
 let rateList = []
 let beautyDiv = {};
 let isBackgroundBlur = true
@@ -91,12 +93,10 @@ const OpreateDiv = styled.div`
     }
     beautyDiv = {};
   };
-function startBeauty(stream) {
-  let newStream = stream;
-  beautyDiv = meetingBeautifyStream(newStream, beautyNum);
-  newStream = beautyDiv.stream;
-  return newStream
-}
+  async function startBeauty(stream) {
+    await beautyInit();
+    beautyStart(stream,"none");
+  }
 async function startMix(stream,onState) {
   var drawCanvas = document.getElementById('canvas');
   await mixInit(drawCanvas);
@@ -307,7 +307,32 @@ class Video extends Component {
   // eslint-disable-next-line no-undef
   test_controller = '';
   
-  
+  saveLog=(val)=>{
+    axios({
+      method: 'post',
+        baseURL: `http://${this.props.project}.${this.props.endpoint}/logstores/${this.props.logstore}/track`,
+        headers: {
+          'x-log-apiversion': '0.6.0',
+          'x-log-bodyrawsize': '1234',
+        },
+        data: {
+          "__logs__": [
+            {
+              "key": val + this.state.channelId
+            }
+          ]
+        },
+        
+    }).then(res => {
+      
+    },error => {
+      if(error.response){
+         
+      }else{
+         
+      }
+    })
+  }
   /**
    * 创建房间成功后回调后台
    * @param  {JSON} data 数据类型
@@ -319,7 +344,8 @@ class Video extends Component {
         activityId: this.props.businessNumber,
         callbackUrl: this.props.callbackUrl,
         roomId: this.state.channelId,
-        mtoken: this.state.rtoken
+        mtoken: this.state.rtoken,
+        type: 2
       });
       console.log(result);
       this.state.imRoomId = result.imRoomId,
@@ -342,6 +368,7 @@ class Video extends Component {
       if(this.state.imStatus && !this.state.imJoinRoom) {
         joinRoom((this.props.tellerAccount + '@' + JSON.parse(window.sessionStorage.getItem('sigData')).hostname), this.state.imRoomId)
           this.state.imJoinRoom =true
+          this.saveLog('加入IM房间')
         console.log('加入IM房间')
       }
     })
@@ -356,10 +383,12 @@ class Video extends Component {
           roomId: this.state.channelId
         }
       })
+      // this.saveLog()
     } catch (err) {
       console.error(err);
     
       this.state.sessionType = false
+      this.saveLog('创建房间---保存信息失败')
       if(err.status == 502 || err.status== 404) {
         this.roomCallBack(2, '连接服务器失败','SYS-02')
       } else {
@@ -436,6 +465,7 @@ class Video extends Component {
         this.handleEdit()
       }
     } catch (err) {
+      this.saveLog('签名失败')
       console.error(err);
       if(err.status == 502 || err.status== 404) {
         this.roomCallBack(2, '连接服务器失败','SYS-02')
@@ -453,7 +483,6 @@ class Video extends Component {
     if(!this.state.imStatus){
       this.state.manualClose = false
       initWebSocket('wss://' + JSON.parse(window.sessionStorage.getItem('sigData')).hostname + ':' + JSON.parse(window.sessionStorage.getItem('sigData')).webPort + '/ws/');
-
     }
     const config_param = {};
     config_param.workspaceId = this.state.workSpaceId;
@@ -1080,6 +1109,7 @@ class Video extends Component {
     }
   };
   endSessionValue = () => {
+    this.saveLog('主动退出会议')
     if(streamShare) {
       streamShare.getTracks().forEach(track => track.stop());
       streamShare=''
@@ -1412,6 +1442,7 @@ class Video extends Component {
     this.setState({
       loading: false,
     })
+    this.saveLog('失败的code：' + code)
     if (this.state.sessionId) {
       if(code == 'SYS-01' || code == 'SYS-02') {
         this.props.joinRoomCallback({
@@ -1948,6 +1979,7 @@ class Video extends Component {
       console.log('im登录', msg)
       if(msg.status == 'error') {
         this.state.imStatus = false
+        this.saveLog('im建立连接失败')
         this.roomCallBack(2, 'im建立连接失败',5)
       } else if (msg.status == 'success') {
         this.state.imStatus = true
@@ -1963,6 +1995,7 @@ class Video extends Component {
           this.timer && clearInterval(this.timer);
           this.state.imStatus = false
           console.log('IMOpenfireclose')
+          this.saveLog('账号重复登录')
           this.roomCallBack(2, '账号重复登录',9)
           
         }
@@ -2098,6 +2131,7 @@ class Video extends Component {
     // 获取设备失败
     this.test_controller.OnGetDevicesFailed = (code, msg) => {
       console.log('获取设备失败', code, msg)
+      this.saveLog('获取设备失败')
       this.state.sessionType = false
       this.messageClick('获取设备失败，请检查摄像头设备是否可用或是否禁用摄像头','error')
       this.roomCallBack(2, '获取设备失败',1)
@@ -2109,6 +2143,7 @@ class Video extends Component {
     };
     this.test_controller.OnConnectFailed = (code, msg) => {
       console.log('建立连接失败', code, msg)
+      this.saveLog('建立连接失败，'+ code)
       this.state.sessionType = false
       this.roomCallBack(2, '连接失败',2)
     };
@@ -2124,6 +2159,7 @@ class Video extends Component {
     // 初始化房间失败
     this.test_controller.OnInitRoomConfigFail = (err_code, err_msg) => {
       console.log('初始化房间失败', err_code, err_msg)
+      this.saveLog('初始化房间失败，' + err_code)
       this.state.sessionType = false
       this.roomCallBack(2, '初始化失败',3)
     };
@@ -2149,6 +2185,7 @@ class Video extends Component {
     // 创建房间失败
     this.test_controller.OnCreateRoomFailed = (err_code, err_msg) => {
       console.log('创建房间失败', err_code, err_msg)
+      this.saveLog('创建房间失败，' + err_code)
       this.state.sessionType = false
       this.roomCallBack(2, '创建房间失败',7)
     };
@@ -2165,6 +2202,7 @@ class Video extends Component {
       console.log(code, sid)
       if(code == 5003 || code == 5004 || code == 5005|| code == 5007|| code == 5009|| code == 5010 || code == 5011|| code == 5012) {
         if(sid == document.getElementById('publish_video1').name) {
+          this.saveLog('音视频关闭通知' + code)
         this.roomCallBack(2, '音视频异常关闭',8)
         } else {
           this.state.isScreenSwitching = false
@@ -2191,6 +2229,7 @@ class Video extends Component {
     };
     // 加入房间失败
     this.test_controller.OnJoinRoomFailed = (err_code, err_msg) => {
+      this.saveLog('加入房间失败' + err_code)
       console.log('加入房间失败', err_code, err_msg)
       // this.setState({
       //   sessionType: false,
@@ -2236,24 +2275,26 @@ class Video extends Component {
       if(publish_tag == 'tag1') {
         console.log('tag1',stream)
         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.getVideoTracks()[0]) {
+      //   await startBeauty(newStream);
+      //   newStream = beautyCaptureStream();
+      //   // 清理原始流
+      // 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.getVideoTracks()[0]) {
+        await startBeauty(newStream);
+      newStream = beautyCaptureStream();
         await startHs(newStream);
         newStream = hsCaptureStream();
           // 清理原始流
@@ -2378,18 +2419,22 @@ class Video extends Component {
         var box=document.getElementById("whiteboardDIV");
         var box1 = document.getElementById("operate")
         var height = box1 ? box1.offsetHeight : 40
+        var width = this.state.whiteboardHeight * document.getElementById("video20").videoWidth / document.getElementById("video20").videoHeight
        if(box){ //此处在加一层判断，更加严密，如果box存在的情况下获取
         this.setState({
+          widthVideo: width,
           whiteboardTop: box.getBoundingClientRect().top - height,
           whiteboardLeft: box.getBoundingClientRect().left,
-          leftVideo: (box.offsetWidth - this.state.widthVideo)/2 + box.getBoundingClientRect().left
+          leftVideo: (box.offsetWidth - width)/2 + box.getBoundingClientRect().left
         })
-           console.log('whiteboardDIV',this.state.whiteboardTop,this.state.whiteboardLeft)
+           console.log('whiteboardVideo20',this.state.whiteboardTop,this.state.whiteboardLeft,this.state.widthVideo,this.state.leftVideo)
+
        }
       }
     };
     // 发布媒体流失败
     this.test_controller.OnPublishFailed = (sid, err_code, err_msg) => {
+      this.saveLog('发布失败' + err_code)
       console.log('发布媒体流失败', sid, err_code, err_msg)
       if(sid == document.getElementById('publish_video1').name) {
         this.state.sessionType = false
@@ -2576,6 +2621,7 @@ class Video extends Component {
       err_msg
     ) => {
       console.log('订阅媒体流失败', sid, err_code, err_msg)
+      this.saveLog('订阅媒体流失败' + err_code)
     };
     // 推送“房间与会者列表”给新加⼊者
     this.test_controller.OnRoomAttendanceList = (participants) => {
@@ -3596,9 +3642,9 @@ userType:'1'
     }
   }
   componentWillUnmount() {
+    this.saveLog('退出会议')
     if (this.test_controller&&this.state.sessionType) {
       clearStreamRemain()
-      beautyNum = 0
       this.test_controller.LeaveRoom()
       this.test_controller.Disconnect()
     }
@@ -3653,7 +3699,9 @@ userType:'1'
       });
       if (result.code == 200 && result.data.roomStatus == 1) {
         this.addToScript()
+        
       } else {
+        console.log('123')
         this.state.channelId = '',
         this.state.rtoken = '',
         this.state.sessionId = '',
@@ -3669,6 +3717,7 @@ userType:'1'
         // })
       }
     } catch (err) {
+      console.log('456')
       this.state.channelId = '',
         this.state.rtoken = '',
         this.state.sessionId = '',
@@ -3689,7 +3738,7 @@ userType:'1'
       loading: true,
     })
     const that = this
-    axios.get(this.props.resourcePath + "/beauty/beauty.js")
+    axios.get(this.props.resourcePath + "/mcu.js")
     .then(response => this.addToScriptClick()).catch(function (error) {
       console.log(error);
       that.state.sessionType = false
@@ -3704,14 +3753,9 @@ userType:'1'
   }
   addToScriptClick=()=>{
     const _dependScripts = [
-      // https://counter-web.leimondata.cn:7199
-      this.props.resourcePath + "/beauty/beauty.js",
-      this.props.resourcePath + "/beauty/meeting_beautify_stream.js",
-      this.props.resourcePath + "/beauty/backgroundBlur.js",
-
+      this.props.resourcePath + "/beauty/beauty_frame_pkg.js",
       this.props.resourcePath + "/adapter.js",
       this.props.resourcePath + "/getMediaInfo.js",
-      // this.props.resourcePath + "/pdf.js",
       this.props.resourcePath + "/EBML.js",
       this.props.resourcePath + "/mcu.js",
       this.props.resourcePath + "/meeting_desk_stream.js",
@@ -3745,7 +3789,7 @@ userType:'1'
       if (i < _dependScripts.length) {
         const script = document.createElement("script");
         script.src = _dependScripts[i];
-        script.type = 'text/javascript'
+        // script.type = 'text/javascript'
         script.async = true;
         document.head.appendChild(script);
         if (i == _dependScripts.length - 1) {
@@ -3781,7 +3825,7 @@ userType:'1'
     }
   }
   componentWillMount() {
-    console.log('hsbc_teller_sdk', '1.8.0')
+    console.log('hsbc_teller_sdk', '1.8.1')
     if (this.props.sessionId) {
       this.getRoomStatus({
         sessionId: this.props.sessionId
@@ -4662,7 +4706,7 @@ userType:'1'
     navigator.mediaDevices.getDisplayMedia({
       video: true,
       preferCurrentTab:true,
-      audio: true
+      // audio: true
       // video: {
       //   width: document.body.clientWidth,
       //   height: document.body.clientHeight
@@ -4895,19 +4939,30 @@ userType:'1'
     })
   }
   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 ? 1 : 0
-    this.setState({
-      beautyName: beautyNum == 0 ? '开启美颜' : '关闭美颜'
-    })
+    // 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 ? 1 : 0
+    if(beautyType) {
+      beautyType = false
+      this.setState({
+        beautyName: '开启美颜'
+      })
+      beautySetMode('none')
+    } else {
+      beautyType = true
+      beautySetMode('beauty')
+      this.setState({
+        beautyName: '关闭美颜'
+      })
+    }
+    
   }
   componentDidMount() {
     var box=document.getElementById("whiteboardDIV");
@@ -5243,7 +5298,7 @@ userType:'1'
                     id="video20"
                     autoPlay
                     muted={true}
-                    style={{ height: this.state.whiteboardHeight + 'px',width: this.state.widthVideo + 'px'}}
+                    style={{ height: this.state.whiteboardHeight + 'px'}}
                     className="videoTab"
                     disablePictureInPicture
                   />
@@ -5914,6 +5969,9 @@ sessionId: "",
   isTranscribing: false,
   shareMask: false,
   isOpenSound: false, // true开启进出音效   false不开启
+  endpoint: 'cn-shanghai.log.aliyuncs.com',
+  project: 'hsbc',
+  logstore: 'hsbc',
   internalUrl: 'https://wp-staff-gateway.wealth-platform.uat.ali.cloud.cn.hsbc/meeting-ui/OHB/CN/HSBC?chnlID=OHB&locale=zh_CN&chnlCC=CN&chnlGMC=HSBC&targetFunc=supervisorMeeting&sourceFunc=rmMeeting'
 }
 export default Video