react_hsbc_teller 1.2.4 → 1.2.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react_hsbc_teller",
-  "version": "1.2.4",
+  "version": "1.2.5",
   "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/pages/foot/foot.jsx

@@ -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/video/video.jsx

@@ -1650,7 +1650,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;
@@ -1671,7 +1675,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';
@@ -1731,19 +1736,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
         })
@@ -1891,7 +1899,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({
@@ -2488,11 +2496,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 = (
@@ -2505,6 +2517,7 @@ class Video extends Component {
     // 结束服务端录制成功
     this.test_controller.OnStopRemoteRecordSucc = (recordId) => {
       console.log('结束服务端录制成功', recordId);
+      this.videoRecordCallback('2')
       // this.endSessionValue()
       // 获取服务端录制结果
     };
@@ -2766,9 +2779,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
@@ -2777,12 +2792,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
@@ -2830,6 +2846,21 @@ 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) {
+        this.roomCallBack(2, '连接服务器失败','SYS-02')
+      }
+    }
+  }
   enterRoom = async () =>{
     try {
       let result = await API.enterRoom({