react_hsbc_teller 1.2.3 → 1.2.6

package/package.json

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

package/packages/api/api.js

@@ -2,6 +2,26 @@ import Server from './server';
 
 class API extends Server{
   
+  async videoRecordCallback(params = {}){
+    //  return this.axios('get', '/lang/select/2', params); 
+    try{
+      let result = await this.axios('post', '/hsbc/video/record/callback', params); 
+      console.log(result)
+      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 retrieveCustomerInfoByActivityId(params = {}){
     //  return this.axios('get', '/lang/select/2', params); 
     try{

package/packages/common/websocket.js

@@ -248,6 +248,9 @@ function joinRoom(from, to) {
         x: {
           '-xmlns': 'http://jabber.org/protocol/muc',
         },
+        history: {
+          'maxstanzas': '0'
+        }
       },
     };
     // 转化为xml

package/packages/pages/foot/foot.jsx

@@ -53,7 +53,7 @@ export default class foot extends Component {
     render() {
         const {clickedOcr,clickedFacial,img,isWhiteboard,cameraImg,isTranscribing ,screenName,suspendName,customerList,menus,voiceName} = this.props
         const content = (
-            <div style={{display: 'inline-grid'}}>
+            <div>
               {customerList.map((item,index)=>{
                   return  <div key={index}className="customer" onClick={this.customerFaceClick.bind(this,item)}>
                       <img className="imgClassFoot" alt="" src={require("../../assets/img/youke.png").default} />
@@ -69,7 +69,7 @@ export default class foot extends Component {
                   {
                       isWhiteboard&&<div className='footHover' onClick={this.switchExternal.bind(this)}>
                       <div className="one">
-                          <img className="imgClass" src={require("../../assets/img/Projection_screen.png").default} alt="" />
+                          <img className="imgClass" src={require("../../assets/img/switchExternal.png").default} alt="" />
                           <div className="text">
                               白板
                           </div>

package/packages/pages/foot/foot.less

@@ -67,6 +67,7 @@ color: #FFFFFF;
 .imgClassFoot{
     width: 25px;
     height: 25px;
+    margin-bottom: 3px;
 }
 .imgClass{
     width: 25px;
@@ -75,10 +76,6 @@ color: #FFFFFF;
 .listLi{
     margin-top: 4px;
 }
-.customer{
-    width: 150px;
-    height: 30px;
-}
 .customer:hover{
     background: #F3F3F3;
     border-radius: 8px;

package/packages/pages/video/video.jsx

@@ -310,6 +310,7 @@ class Video extends Component {
   // 初始化视频
   ConnectMRTC = () => {
     this.test_controller.SetLocalCodecType("H264")
+    this.test_controller.SetPublishWeakBitrateLimit(200);
     const config_param = {};
     config_param.auto_publish_subscribe = 4;
     config_param.media_type = 1;
@@ -400,100 +401,100 @@ class Video extends Component {
     {
       tag: 'projectionWhiteboard',
       xPosition: 0,
-      yPosition: 360,
-      width: 1120,
-      height: 360
+      yPosition: 540,
+      width: 960,
+      height: 540
     },
     {
       tag: 'VIDEO_SOURCE_SCREEN',
       xPosition: 0,
-      yPosition: 144,
-      width: 256,
-      height: 144
+      yPosition: 180,
+      width: 640,
+      height: 360
     },
     {
       tag: 'tag1',
       xPosition: 0,
       yPosition: 0,
-      width: 160,
-      height: 144
+      width: 240,
+      height: 180
     },
     {
       tag: 'customer1',
-      xPosition: 160,
+      xPosition: 240,
       yPosition: 0,
-      width: 160,
-      height: 144
+      width: 240,
+      height: 180
     },
     {
       tag: 'customer2',
-      xPosition: 320,
+      xPosition: 480,
       yPosition: 0,
-      width: 160,
-      height: 144
+      width: 240,
+      height: 180
     },
     {
       tag: 'customer3',
-      xPosition: 480,
+      xPosition: 720,
       yPosition: 0,
-      width: 160,
-      height: 144
+      width: 240,
+      height: 180
     },
     {
       tag: 'customer4',
-      xPosition: 640,
+      xPosition: 960,
       yPosition: 0,
-      width: 160,
-      height: 144
+      width: 240,
+      height: 180
     },
     {
       tag: 'customer5',
-      xPosition: 800,
+      xPosition: 1200,
       yPosition: 0,
-      width: 160,
-      height: 144
+      width: 240,
+      height: 180
     },
     {
       tag: 'customer6',
-      xPosition: 960,
+      xPosition: 1440,
       yPosition: 0,
-      width: 160,
-      height: 144
+      width: 240,
+      height: 180
     },
     {
       tag: 'customer7',
-      xPosition: 1120,
+      xPosition: 1680,
       yPosition: 0,
-      width: 160,
-      height: 144
+      width: 240,
+      height: 180
     },
     {
       tag: 'customer8',
-      xPosition: 1120,
-      yPosition: 144,
-      width: 160,
-      height: 144
+      xPosition: 1680,
+      yPosition: 180,
+      width: 240,
+      height: 180
     },
     {
       tag: 'customer9',
-      xPosition: 1120,
-      yPosition: 288,
-      width: 160,
-      height: 144
+      xPosition: 1680,
+      yPosition: 360,
+      width: 240,
+      height: 180
     },
     {
       tag: 'customer10',
-      xPosition: 1120,
-      yPosition: 432,
-      width: 160,
-      height: 144
+      xPosition: 1680,
+      yPosition: 540,
+      width: 240,
+      height: 180
     },
     {
       tag: 'customer11',
-      xPosition: 1120,
-      yPosition: 576,
-      width: 160,
-      height: 144
+      xPosition: 1680,
+      yPosition: 720,
+      width: 240,
+      height: 180
     }
   ]
     console.log('recordParam', recordParam);
@@ -793,6 +794,7 @@ class Video extends Component {
     })
   }
   messageClick=(value,valueOne)=>{
+    console.log(value,valueOne)
     if(valueOne == 'error') {
       message.error({
         content: value,
@@ -1649,7 +1651,11 @@ class Video extends Component {
     // 获取设备成功
     this.test_controller.OnGetDevicesSuccess = (devicesInfo) => {
       console.log('devicesInfo' + JSON.stringify(devicesInfo));
-      const obj = [];
+      const obj = [
+//         {actionid: '0133d06019b8fe9426818ae7573ccfc31c150e09138e7f5ccfda03d6e224ffd4', groupId: '9c0334ba5cba71b60acb3ec6669c3aac78371ec9d9e33d2e8af72a758d895d27', actionname: 'Integrated Camera (13d3:56fb)'},
+
+// {actionid: '4695c628677498d876074b941c16f6921d4e57534b50bfc2cb973da84e0e2622', groupId: '0d86c9467f096440ed74449192be5fafea59ac469866975f30b61fe964e2a80e', actionname: 'C2D Camera (0416:5035)'}
+      ];
       const obj1 = [];
       const obj2 = [];
       let num = 0;
@@ -1670,7 +1676,8 @@ class Video extends Component {
             b.actionname = devicesInfo[i].label
           }
           obj.push(b)
-        } else if (devicesInfo[i].kind === 'audioinput') {
+        } else 
+        if (devicesInfo[i].kind === 'audioinput') {
           // 麦克风
           b.actionid = devicesInfo[i].deviceId;
           b.groupId = devicesInfo[i].groupId || 'empty';
@@ -1730,19 +1737,22 @@ class Video extends Component {
         microphoneList: objList1,
         speakerList: objList2.length>0? [objList2[0]]: []
       })
+      let indexId = 0
+      objList.map((item,index)=>{
+        if(item.actionname.indexOf('Integrated Camera') != -1) {
+          indexId = index
+        }
+      })
+      console.log(indexId)
+      this.setState({
+        cameraValue: objList[indexId].actionid,
+        microphoneValue: objList1[0].actionid
+      })
       if (!this.state.appId && !this.state.sessionType) {
+        console.log('cameraValue',this.state.cameraValue)
         this.mpaasSig(data);
-        let indexId = 0
-        objList.map((item,index)=>{
-          if(item.actionname.indexOf('Integrated Camera' != -1)) {
-            indexId = index
-          }
-        })
-        this.setState({
-          cameraValue: objList[indexId].actionid,
-          microphoneValue: objList1[0].actionid
-        })
       } else {
+        console.log('cameraValue',this.state.cameraValue)
         this.setState({
           isModalVisibleInspection: true
         })
@@ -1890,7 +1900,7 @@ class Video extends Component {
         this.enterRoom()
         this.timer = setInterval(
           () => {
-            if(!this.state.voiceStatue && this.state.analyserHeight.get(sid).toFixed(2) > 0) {
+            if(!this.state.voiceStatue && this.state.analyserHeight.get(sid).toFixed(2) > 0.1) {
               callNimIM('sendCustomCmdMsg', {
                 customId: this.state.imRoomId,
                 content: JSON.stringify({
@@ -1898,7 +1908,8 @@ class Video extends Component {
                   'decibelValue': this.state.analyserHeight.get(sid).toFixed(2),
                   "data": {
                     'sessionId': this.state.sessionId,
-                    'userId': this.props.tellerAccount
+                    'userId': this.props.tellerAccount,
+                    'data': (new Date()).valueOf()
                   }
 
                 })
@@ -2476,6 +2487,7 @@ class Video extends Component {
       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' //音乐的路径 
@@ -2486,11 +2498,15 @@ class Video extends Component {
     // 弱网回调
     this.test_controller.OnNetworkWeak = (bpsSend, bpsRecv, sid) => {
       console.log('弱网回调', bpsSend, bpsRecv, sid)
+      if(sid == document.getElementById('publish_video1').name) {
+        this.messageClick('当前网络环境较差','error')
+      }
     };
     // 开始服务端录制成功
     this.test_controller.OnStartRemoteRecordSucc = (record_id) => {
       console.log('开始服务端录制成功', record_id);
       this.state.recordId = record_id
+      this.videoRecordCallback('1')
     };
     // 开始服务端录制失败
     this.test_controller.OnStartRemoteRecordFailed = (
@@ -2503,6 +2519,7 @@ class Video extends Component {
     // 结束服务端录制成功
     this.test_controller.OnStopRemoteRecordSucc = (recordId) => {
       console.log('结束服务端录制成功', recordId);
+      this.videoRecordCallback('2')
       // this.endSessionValue()
       // 获取服务端录制结果
     };
@@ -2764,9 +2781,11 @@ class Video extends Component {
         x2: 22 / 50 * canvas.width,  // 波动范围左上角的点坐标
         y2: 10 / 50 * canvas.height,
       }
-
+      let number = 0
       for (var i = 0; i < 40; i++) {
+        
         let energy = (dataArray[step * i] / 256.0) * 80;
+        number = number + energy
         ctx.beginPath();
         ctx.fillStyle = this.props.voiceColor;
         const { x1, y1, x2, y2 } = drawArea
@@ -2775,12 +2794,13 @@ class Video extends Component {
         let startX = x2 // 绘制起始点x
         let startY = y1 - height  // 绘制起始点y
         ctx.fillRect(startX, startY, width, height)
-        if(document.getElementById('publish_video1').name == sid) {
-          this.state.analyserHeight.set(sid,dataArray[step * 20] / 256.0)
+        if(document.getElementById('publish_video1').name == sid && i == 39) {
+          console.log(number / 40 / 70,number / 40)
+          this.state.analyserHeight.set(sid,number / 40 / 70)
             this.state.analyserHeight = this.state.analyserHeight
         }
-
       }
+      
       this.state.OnVolumeAnalyserMap.set(sid,setInterval(
         this.test_controller.OnVolumeAnalyser.bind(this, sid, analyser),
       300
@@ -2828,6 +2848,20 @@ class Video extends Component {
       
     };
   }
+  videoRecordCallback = async(type)=>{
+    try {
+      let result = await API.videoRecordCallback({
+        activityId: this.props.businessNumber,
+        sessionId: this.state.sessionId,
+        type: type
+      });
+      console.log(result);
+    } catch (err) {
+      console.error(err);
+      if(err.status == 502 || err.status== 404) {
+      }
+    }
+  }
   enterRoom = async () =>{
     try {
       let result = await API.enterRoom({
@@ -2885,7 +2919,7 @@ class Video extends Component {
       this.state.manualClose = true
       disconnect();
     }
-    
+    message.destroy()
   }
   finishSessionClick= async () => {
     try {
@@ -4163,6 +4197,7 @@ class Video extends Component {
                     autoPlay
                     muted={true}
                     className="videoTab"
+                    disablePictureInPicture
                   />
                   <audio id="audio20" autoPlay />
                   <label style={{ display: 'none' }} id="feedId20" type="text" />
@@ -4182,6 +4217,7 @@ class Video extends Component {
                     autoPlay
                     muted={true}
                     className="videoTab"
+                    disablePictureInPicture
                   />
                   <audio id="audio21" autoPlay />
                   <label style={{ display: 'none' }} id="feedId21" type="text" />
@@ -4232,18 +4268,21 @@ class Video extends Component {
                     className={`publishVideoClass`}
                     autoPlay
                     muted={true}
+                    disablePictureInPicture
                   />
                   <label style={{ display: 'none' }} id="publish_streamId1" type="text" />
                   
                   <div id="publish_video_div" className={`tellerTitle titleSamlle`}>
+                    <div>
                   {
                     this.state.voiceStatue && <img
                       alt=""
                       src={require("../../assets/img/jingyin.png").default}
-                      className="imgClassVoice voiceClass"
+                      className="voiceClass"
                     />
                   }
                   <canvas style={{ display: (!this.state.voiceStatue) ? '' : 'none',width: '25px',height:'25px',marginTop: '4px' }} className="canvasClass" id="publish_volumeView" width="40" height="70"></canvas>
+                  </div>
                     <div className='titleName' style={{ color: this.props.titleColor, fontSize: this.props.fontSize + 'px', fontFamily: this.props.fontFamily }}>{this.state.titleNameRm}</div>
                   </div>
                 </div>
@@ -4265,6 +4304,7 @@ class Video extends Component {
                     id="video1"
                     autoPlay
                     muted={true}
+                    disablePictureInPicture
                     className={`video1 ${this.state.noVideoOne ? 'isNoVideo' : ''}`}
                   />
                   <audio id="audio1" autoPlay />
@@ -4293,6 +4333,7 @@ class Video extends Component {
                 <video
                   id="video2"
                   autoPlay
+                  disablePictureInPicture
                   muted={true}
                   className={`video ${this.state.noVideoTwo ? 'isNoVideo' : ''}`}
                 />
@@ -4321,6 +4362,7 @@ class Video extends Component {
                   id="video3"
                   autoPlay
                   muted={true}
+                  disablePictureInPicture
                   className={`video ${this.state.noVideoThree ? 'isNoVideo' : ''}`}
                 />
                 <audio id="audio3" autoPlay />
@@ -4347,6 +4389,7 @@ class Video extends Component {
                   id="video4"
                   autoPlay
                   muted={true}
+                  disablePictureInPicture
                   className={`video ${this.state.noVideoFour ? 'isNoVideo' : ''}`}
                 />
                 <audio id="audio4" autoPlay />
@@ -4374,6 +4417,7 @@ class Video extends Component {
                   id="video5"
                   autoPlay
                   muted={true}
+                  disablePictureInPicture
                   className={`video ${this.state.noVideoFive ? 'isNoVideo' : ''}`}
                 />
                 <audio id="audio5" autoPlay />
@@ -4400,6 +4444,7 @@ class Video extends Component {
                   id="video6"
                   autoPlay
                   muted={true}
+                  disablePictureInPicture
                   className={`video ${this.state.noVideoSix ? 'isNoVideo' : ''}`}
                 />
                 <audio id="audio6" autoPlay />
@@ -4438,6 +4483,7 @@ class Video extends Component {
                     id="video7"
                     autoPlay
                     muted={true}
+                    disablePictureInPicture
                     className={`video ${this.state.noVideoSeven ? 'isNoVideo' : ''}`}
                   />
                   <audio id="audio7" autoPlay />
@@ -4467,6 +4513,7 @@ class Video extends Component {
                   id="video8"
                   autoPlay
                   muted={true}
+                  disablePictureInPicture
                   className={`video ${this.state.noVideoEight ? 'isNoVideo' : ''}`}
                 />
                 <audio id="audio8" autoPlay />
@@ -4493,6 +4540,7 @@ class Video extends Component {
                   id="video9"
                   autoPlay
                   muted={true}
+                  disablePictureInPicture
                   className={`video ${this.state.noVideoNine ? 'isNoVideo' : ''}`}
                 />
                 <audio id="audio9" autoPlay />
@@ -4521,6 +4569,7 @@ class Video extends Component {
                   id="video10"
                   autoPlay
                   muted={true}
+                  disablePictureInPicture
                   className={`video ${this.state.noVideoTen ? 'isNoVideo' : ''}`}
                 />
                 <audio id="audio10" autoPlay />
@@ -4547,6 +4596,7 @@ class Video extends Component {
                   id="video11"
                   autoPlay
                   muted={true}
+                  disablePictureInPicture
                   className={`video ${this.state.noVideoEleven ? 'isNoVideo' : ''}`}
                 />
                 <audio id="audio11" autoPlay />
@@ -4574,6 +4624,7 @@ class Video extends Component {
                   id="video12"
                   autoPlay
                   muted={true}
+                  disablePictureInPicture
                   className={`video ${this.state.noVideoTwelve ? 'isNoVideo' : ''}`}
                 />
                 <audio id="audio12" autoPlay />
@@ -4757,10 +4808,10 @@ class Video extends Component {
   }
 }
 Video.defaultProps = {
-  mtoken: "26364ded9b83",
-roomId: "645157287240850",
-imRoomId: "Fwua8kGB6@conference.openfire2.leimondata.cn",
-sessionId: "Fwua8kGB6",
+  mtoken: "",
+roomId: "",
+imRoomId: "",
+sessionId: "",
   tellerAccount: 't001',
   businessNumber: '123',
   callbackUrl: 'http://182.92.184.31:8720/hsbc/callback',

package/packages/pages/video/video.less

@@ -13,9 +13,9 @@
   float: right
 }
 .imgClassVoice{
-  width: 1.563rem;
-  height: 1.563rem;
-  margin-top: 0.25rem;
+  width: 25Px;
+  height: 24Px;
+  margin-bottom: 4Px;
 }
 .sharedScreen{
   font-size: 10px;
@@ -298,10 +298,9 @@
   }
 }
 .voiceClass{
-  // position: absolute;
-  // bottom: 0;
-  // left: 0;
-  // transform: rotateY(180deg);
+  width: 25Px;
+  height: 25.3Px;
+  margin-bottom: 1Px;
 }
 .cameraAnMicrophone{
   margin: 10px 20px;