react_hsbc_teller 0.7.7 → 0.8.1

package/package.json

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

package/packages/pages/foot/foot.jsx

@@ -110,7 +110,7 @@ export default class foot extends Component {
                                   item == 'INVITE' && <div className="one" onClick={this.invitationClick.bind(this)}>
                                   <img className="imgClass" src={require("../../assets/img/icon_invitation.png").default} alt="" />
                                   <div className="text">
-                                      邀请
+                                      会议邀请
                                   </div>
                               </div>
                               }

package/packages/pages/video/video.jsx

@@ -37,7 +37,7 @@ class Video extends Component {
   cancel = axios.CancelToken.source()
   signCanvas = React.createRef();
   state = {
-    sessionType: true,
+    sessionType: false,
     isWhiteboard: false,
     isSelect: '',
     loading: false,
@@ -72,10 +72,10 @@ class Video extends Component {
     workSpaceId: '',
     bizName: '',
     appId: '',
-    channelId: this.props.roomId,
-    rtoken: this.props.mtoken,
-    sessionId: this.props.sessionId,
-    imRoomId: this.props.imRoomId,
+    channelId: '',
+    rtoken: '',
+    sessionId: '',
+    imRoomId: '',
     isPictureInPicture: false,
     clickedFacial: false,
     clickedOcr: false,
@@ -1140,7 +1140,7 @@ class Video extends Component {
           console.log('deviceId' + devicesInfo[i].deviceId);
 
           b.actionid = devicesInfo[i].deviceId;
-          b.groupId = devicesInfo[i].groupId;
+          b.groupId = devicesInfo[i].groupId || 'empty';
           if (
             devicesInfo[i].label === '' ||
             devicesInfo[i].label === undefined ||
@@ -1154,7 +1154,7 @@ class Video extends Component {
         } else if (devicesInfo[i].kind === 'audioinput') {
           // 麦克风
           b.actionid = devicesInfo[i].deviceId;
-          b.groupId = devicesInfo[i].groupId;
+          b.groupId = devicesInfo[i].groupId || 'empty';
           if (
             devicesInfo[i].label === '' ||
             devicesInfo[i].label === undefined ||
@@ -1168,7 +1168,7 @@ class Video extends Component {
         } else if (devicesInfo[i].kind === 'audiooutput') {
           // 喇叭
           b.actionid = devicesInfo[i].deviceId;
-          b.groupId = devicesInfo[i].groupId;
+          b.groupId = devicesInfo[i].groupId || 'empty';
           if (
             devicesInfo[i].label === '' ||
             devicesInfo[i].label === undefined ||
@@ -1205,12 +1205,13 @@ class Video extends Component {
          arr2[obj2[i].groupId] = true;
      }
  }
+ console.log(objList, objList1, objList2 )
       this.setState({
         cameraList: objList,
         microphoneList: objList1,
-        speakerList: [objList2[0]]
+        speakerList: [objList2.length>0? objList2[0]: []]
       })
-      if (!this.state.appId && this.state.sessionType) {
+      if (!this.state.appId && !this.state.sessionType) {
         this.mpaasSig(data);
         this.setState({
           cameraValue: obj[0].actionid,
@@ -1318,6 +1319,9 @@ class Video extends Component {
     // 发布媒体流成功
     this.test_controller.OnPublishSucc = (sid) => {
       console.log('发布媒体流成功', sid)
+      this.setState({
+        sessionType: true
+      })
       if (sid == document.getElementById('video20').name) {
         callNimIM('sendCustomCmdMsg', {
           customId: this.state.imRoomId,
@@ -1332,7 +1336,6 @@ class Video extends Component {
       if(sid == document.getElementById('publish_video1').name) {
         this.timer = setInterval(
           () => {
-            console.log('hhhhhh',this.state.analyserHeight.get(sid),this.state.analyserHeight.get(sid).toFixed(2))
             if(!this.state.voiceStatue) {
               callNimIM('sendCustomCmdMsg', {
                 customId: this.state.imRoomId,
@@ -2261,23 +2264,37 @@ class Video extends Component {
         this.addToScript()
       } else {
         this.setState({
-          sessionType: false
-        })
-        this.messageClick('当前房间状态异常','error')
-        this.props.onLeaveRoom({
-          code: LEAVE_TYPE.ROOM_DESTROYED,
-          errMsg: '当前房间状态异常'
-        })
+          channelId: '',
+          rtoken: '',
+          sessionId: '',
+          imRoomId: ''
+        });
+        this.addToScript()
+        // this.setState({
+        //   sessionType: false
+        // })
+        // this.messageClick('当前房间状态异常','error')
+        // this.props.onLeaveRoom({
+        //   code: LEAVE_TYPE.ROOM_DESTROYED,
+        //   errMsg: '当前房间状态异常'
+        // })
       }
     } catch (err) {
-      this.setState({
-        sessionType: false
-      })
-      this.messageClick('当前房间状态异常','error')
-      this.props.onLeaveRoom({
-        code: LEAVE_TYPE.ROOM_DESTROYED,
-        errMsg: '当前房间状态异常'
-      })
+        this.setState({
+          channelId: '',
+          rtoken: '',
+          sessionId: '',
+          imRoomId: ''
+        });
+        this.addToScript()
+      // this.setState({
+      //   sessionType: false
+      // })
+      // this.messageClick('当前房间状态异常','error')
+      // this.props.onLeaveRoom({
+      //   code: LEAVE_TYPE.ROOM_DESTROYED,
+      //   errMsg: '当前房间状态异常'
+      // })
     }
   }
   addToScript = () => {
@@ -3615,10 +3632,10 @@ class Video extends Component {
              <div key='invitation'>
             <Button className="modelButtonCancel" onClick={this.handleCancelInvitation}>取消</Button>
             {
-              this.state.employeeName &&<Button className='modelButtonOk'type="primary" danger onClick={this.handleOkInvitation}>发送邮件</Button>
+              this.state.employeeName &&<Button className='modelButtonOkInvitation'type="primary" danger onClick={this.handleOkInvitation}>邮件发送会议邀请</Button>
             }
             {
-              !this.state.employeeName &&<Button className='modelButtonCancelOne' type="primary" danger >发送邮件</Button>
+              !this.state.employeeName &&<Button className='modelButtonCancelOne' type="primary" danger >邮件发送会议邀请</Button>
             }
             </div>
           ]}>
@@ -3633,7 +3650,7 @@ class Video extends Component {
               </div>
               {
                 this.state.employeeName &&<div className='invitationDiv'>
-                <span className="modalSpan">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><Button className="invitationButton" onClick={this.linkClick}> <img className='invitationImg' src={require("../../assets/img/link.png").default} alt="" />复制链接</Button>
+                <span className="modalSpan">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><Button className="invitationButton" onClick={this.linkClick}> <img className='invitationImg' src={require("../../assets/img/link.png").default} alt="" />复制会议链接</Button>
                 </div>
               }
               

package/packages/pages/video/video.less

@@ -322,7 +322,7 @@
   border-spacing: 20px!important;
 }
 .modelButtonCancelOne{
-  width: 100px!important;
+  width: 170px!important;
   height: 40px!important;
   font-size: 16px!important;
   color: #5C5C5C!important;
@@ -330,6 +330,15 @@
   border-spacing: 20px!important;
   background: #d9d9d9!important;
 }
+.modelButtonOkInvitation{
+  width: 170px!important;
+  height: 40px!important;
+  font-size: 16px!important;
+  color: #ffffff!important;
+  border: 1px #DB0011 solid!important;
+  background: #DB0011!important;
+  border-spacing: 20px!important;
+}
 .modelButtonOk{
   width: 100px!important;
   height: 40px!important;