react_hsbc_teller 1.7.2 → 1.7.3

package/package.json

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

package/packages/demo/demo.js

@@ -5,11 +5,10 @@ import Pdf from './pdf.js'
 class Demo extends Component {
   state = {
     shareMask: false,
-    imRoomId: "AIByYlxRE@conference.openfire2.leimondata.cn",
-    sessionId: "AIByYlxRE",
-    mtoken: "101046e69f16",
-    roomId: "657007173551208",
-    
+    mtoken: "492948d0a7ec",
+roomId: "656467744508298",
+    imRoomId: "ACkhcdtat@conference.openfire2.leimondata.cn",
+    sessionId: "ACkhcdtat",
     // roomId: '',
     // mtoken: '',
     // imRoomId: '',

package/packages/pages/video/video.jsx

@@ -373,8 +373,8 @@ class Video extends Component {
   mpaasSig = async data => {
     console.log(data);
     try {
-      // let result = JSON.parse(this.decrypt(await API.mpaasSig({ ciphertext: this.encrypt({account: data.account, type: data.type})})));
-      let result = await API.mpaasSig({account: data.account, type: data.type});
+      let result = JSON.parse(this.decrypt(await API.mpaasSig({ ciphertext: this.encrypt({account: data.account, type: data.type})})));
+      // let result = await API.mpaasSig({account: data.account, type: data.type});
       console.log('mpaasSig',result,result.mpsSig);
       window.sessionStorage.setItem('alimpassSig', result.mpsSig);
         this.state.workSpaceId = result.workspaceId,
@@ -1817,6 +1817,72 @@ class Video extends Component {
         // 手机端停止投屏
         this.tabTitlesClick('customerScreen', 'delect')
         
+      } else if (Mival.typeId == 1401) {
+        if (Mival.sessionId == this.state.sessionId) {
+          if (Mival.userId == this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId1").innerText).uid) {
+            this.setState({
+              videoOneName: Mival.name
+            })
+
+          }
+          if (Mival.userId == (document.getElementById("feedId2").innerText ? this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId2").innerText).uid : '')) {
+            this.setState({
+              videoTwoName: Mival.name
+            })
+          }
+          if (Mival.userId == (document.getElementById("feedId3").innerText ? this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId3").innerText).uid : '')) {
+            this.setState({
+              videoThreeName: Mival.name
+            })
+          }
+          if (Mival.userId == (document.getElementById("feedId4").innerText ? this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId4").innerText).uid : '')) {
+            this.setState({
+              videoFourName: Mival.name
+            })
+          }
+          if (Mival.userId == (document.getElementById("feedId5").innerText ? this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId5").innerText).uid : '')) {
+            this.setState({
+              videoFiveName: Mival.name
+            })
+          }
+          if (Mival.userId == (document.getElementById("feedId6").innerText ? this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId6").innerText).uid : '')) {
+            this.setState({
+              videoSixName: Mival.name
+            })
+          }
+
+          if (Mival.userId == (document.getElementById("feedId7").innerText ? this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId7").innerText).uid : '')) {
+            this.setState({
+              videoSevenName: Mival.name
+            })
+          }
+          if (Mival.userId == (document.getElementById("feedId8").innerText ? this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId8").innerText).uid : '')) {
+            this.setState({
+              videoEightName: Mival.name
+            })
+          }
+          if (Mival.userId == (document.getElementById("feedId9").innerText ? this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId9").innerText).uid : '')) {
+            this.setState({
+              videoNineName: Mival.name
+            })
+          }
+          if (Mival.userId == (document.getElementById("feedId10").innerText ? this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId10").innerText).uid : '')) {
+            this.setState({
+              videoTenName: Mival.name
+            })
+          }
+          if (Mival.userId == (document.getElementById("feedId11").innerText ? this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId11").innerText).uid : '')) {
+            this.setState({
+              videoElevenName: Mival.name
+            })
+          }
+          if (Mival.userId == (document.getElementById("feedId12").innerText ? this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId12").innerText).uid : '')) {
+            this.setState({
+              videoTwelveName: Mival.name
+            })
+          }
+
+        }
       }
     };
     window.IMOpenfire = msg =>{
@@ -2153,6 +2219,14 @@ class Video extends Component {
         }
       } 
       if(sid == document.getElementById('publish_video1').name) {
+        var box=document.getElementById("whiteboardDIV");
+       if(box){ //此处在加一层判断，更加严密，如果box存在的情况下获取
+        this.setState({
+          whiteboardTop: box.getBoundingClientRect().top * 1.08 - 40,
+          whiteboardLeft: box.getBoundingClientRect().left
+        })
+           console.log('whiteboardDIV',this.state.whiteboardTop,this.state.whiteboardLeft)
+       }
         this.setState({
 
           loading: false,
@@ -4652,7 +4726,7 @@ userType:'1'
             this.state.whiteboardHeight = box.offsetHeight  * 0.92,
             this.state.whiteboardTop = box.getBoundingClientRect().top * 1.08 - 40
             this.state.whiteboardLeft = box.getBoundingClientRect().left
-           console.log('whiteboardDIV', this.state.whiteboardHeight,box.clientHeight,this.state.whiteboardWidth)
+           console.log('whiteboardDIV', this.state.whiteboardHeight,this.state.whiteboardWidth,this.state.whiteboardTop,this.state.whiteboardLeft)
        }
   }
   muteOpposite = (value) => {