react_hsbc_teller 0.4.0 → 0.4.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -76,6 +76,12 @@ class Video extends Component {
76
76
  videoFourName: '',
77
77
  videoFiveName: '',
78
78
  videoSixName: '',
79
+ videoSevenName: '',
80
+ videoEightName:'',
81
+ videoTenName: '',
82
+ videoNineName: '',
83
+ videoTwelveName: '',
84
+ videoElevenName: '',
79
85
  tabTitles: [
80
86
  ],
81
87
  videoList: [],
@@ -85,9 +91,22 @@ class Video extends Component {
85
91
  voiceVideoFour: false,
86
92
  voiceVideoFive: false,
87
93
  voiceVideoSix: false,
94
+ voiceVideoSeven: false,
95
+ voiceVideoEight: false,
96
+ voiceVideoNine: false,
97
+ voiceVideoTen: false,
98
+ voiceVideoEleven: false,
99
+ voiceVideoTwelve: false
88
100
  };
89
101
  // eslint-disable-next-line no-undef
90
102
  test_controller = '';
103
+
104
+ componentDidMount() {
105
+ window.onbeforeunload = () =>{
106
+ this.finishSession()
107
+ }
108
+ };
109
+
91
110
  /**
92
111
  * 创建房间成功后回调后台
93
112
  * @param {JSON} data 数据类型
@@ -386,13 +405,54 @@ class Video extends Component {
386
405
  }
387
406
  if (document.getElementById('video6').name) {
388
407
  console.log(this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId6").innerText))
389
- // document.getElementById("feedId1").innerText
390
408
  list.push({
391
409
  feedId: this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId6").innerText).feedId,
392
410
  customId: this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId6").innerText).uid,
393
411
  name: this.state.videoSixName
394
412
  })
395
413
  }
414
+ if (document.getElementById('video7').name) {
415
+ list.push({
416
+ feedId: this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId7").innerText).feedId,
417
+ customId: this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId7").innerText).uid,
418
+ name: this.state.videoSevenName
419
+ })
420
+ }
421
+ if (document.getElementById('video8').name) {
422
+ list.push({
423
+ feedId: this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId8").innerText).feedId,
424
+ customId: this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId8").innerText).uid,
425
+ name: this.state.videoEightName
426
+ })
427
+ }
428
+ if (document.getElementById('video9').name) {
429
+ list.push({
430
+ feedId: this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId9").innerText).feedId,
431
+ customId: this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId9").innerText).uid,
432
+ name: this.state.videoNineName
433
+ })
434
+ }
435
+ if (document.getElementById('video10').name) {
436
+ list.push({
437
+ feedId: this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId10").innerText).feedId,
438
+ customId: this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId10").innerText).uid,
439
+ name: this.state.videoTenName
440
+ })
441
+ }
442
+ if (document.getElementById('video11').name) {
443
+ list.push({
444
+ feedId: this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId11").innerText).feedId,
445
+ customId: this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId11").innerText).uid,
446
+ name: this.state.videoElevenName
447
+ })
448
+ }
449
+ if (document.getElementById('video12').name) {
450
+ list.push({
451
+ feedId: this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId12").innerText).feedId,
452
+ customId: this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId12").innerText).uid,
453
+ name: this.state.videoTwelveName
454
+ })
455
+ }
396
456
  if(list.length > 0) {
397
457
  if(val == 'ocr') {
398
458
  this.setState({
@@ -482,12 +542,43 @@ class Video extends Component {
482
542
  title: this.state.videoSixName
483
543
  })
484
544
  }
485
- // if(document.getElementById('video10').name) {
486
- // list.push({
487
- // name: 'video10',
488
- // title: '互动白板'
489
- // })
490
- // }
545
+
546
+ if(document.getElementById('video7').name) {
547
+ list.push({
548
+ name: 'video7',
549
+ title: this.state.videoSevenName
550
+ })
551
+ }
552
+ if(document.getElementById('video8').name) {
553
+ list.push({
554
+ name: 'video8',
555
+ title: this.state.videoEightName
556
+ })
557
+ }
558
+ if(document.getElementById('video9').name) {
559
+ list.push({
560
+ name: 'video9',
561
+ title: this.state.videoNineName
562
+ })
563
+ }
564
+ if(document.getElementById('video10').name) {
565
+ list.push({
566
+ name: 'video10',
567
+ title: this.state.videoTenName
568
+ })
569
+ }
570
+ if(document.getElementById('video11').name) {
571
+ list.push({
572
+ name: 'video11',
573
+ title: this.state.videoElevenName
574
+ })
575
+ }
576
+ if(document.getElementById('video12').name) {
577
+ list.push({
578
+ name: 'video12',
579
+ title: this.state.videoTwelveName
580
+ })
581
+ }
491
582
  console.log(list)
492
583
  const width = 640;
493
584
  const height = 360 * list.length;
@@ -710,7 +801,7 @@ class Video extends Component {
710
801
  isWhiteboard: false,
711
802
  })
712
803
  }else {
713
- this.test_controller.UnPublish(document.getElementById('video10').name)
804
+ this.test_controller.UnPublish(document.getElementById('video20').name)
714
805
  this.setState({
715
806
  isWhiteboard: false,
716
807
  })
@@ -793,6 +884,103 @@ class Video extends Component {
793
884
  }
794
885
 
795
886
  }
887
+
888
+ if(Mival.data.userId == (document.getElementById("feedId6").innerText ? this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId6").innerText).uid : '')) {
889
+ if(Mival.muteStatus == 0) {
890
+ this.setState({
891
+ voiceVideoSix: false
892
+ })
893
+ } else if(Mival.muteStatus == 1) {
894
+ this.setState({
895
+ voiceVideoSix: true
896
+ })
897
+ }
898
+
899
+ }
900
+ if(Mival.data.userId == (document.getElementById("feedId6").innerText ? this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId6").innerText).uid : '')) {
901
+ if(Mival.muteStatus == 0) {
902
+ this.setState({
903
+ voiceVideoSix: false
904
+ })
905
+ } else if(Mival.muteStatus == 1) {
906
+ this.setState({
907
+ voiceVideoSix: true
908
+ })
909
+ }
910
+
911
+ }
912
+ if(Mival.data.userId == (document.getElementById("feedId7").innerText ? this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId7").innerText).uid : '')) {
913
+ if(Mival.muteStatus == 0) {
914
+ this.setState({
915
+ voiceVideoSeven: false
916
+ })
917
+ } else if(Mival.muteStatus == 1) {
918
+ this.setState({
919
+ voiceVideoSeven: true
920
+ })
921
+ }
922
+
923
+ }
924
+ if(Mival.data.userId == (document.getElementById("feedId8").innerText ? this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId8").innerText).uid : '')) {
925
+ if(Mival.muteStatus == 0) {
926
+ this.setState({
927
+ voiceVideoEight: false
928
+ })
929
+ } else if(Mival.muteStatus == 1) {
930
+ this.setState({
931
+ voiceVideoEight: true
932
+ })
933
+ }
934
+
935
+ }
936
+ if(Mival.data.userId == (document.getElementById("feedId9").innerText ? this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId9").innerText).uid : '')) {
937
+ if(Mival.muteStatus == 0) {
938
+ this.setState({
939
+ voiceVideoNine: false
940
+ })
941
+ } else if(Mival.muteStatus == 1) {
942
+ this.setState({
943
+ voiceVideoNine: true
944
+ })
945
+ }
946
+
947
+ }
948
+ if(Mival.data.userId == (document.getElementById("feedId10").innerText ? this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId10").innerText).uid : '')) {
949
+ if(Mival.muteStatus == 0) {
950
+ this.setState({
951
+ voiceVideoTen: false
952
+ })
953
+ } else if(Mival.muteStatus == 1) {
954
+ this.setState({
955
+ voiceVideoTen: true
956
+ })
957
+ }
958
+
959
+ }
960
+ if(Mival.data.userId == (document.getElementById("feedId11").innerText ? this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId11").innerText).uid : '')) {
961
+ if(Mival.muteStatus == 0) {
962
+ this.setState({
963
+ voiceVideoEleven: false
964
+ })
965
+ } else if(Mival.muteStatus == 1) {
966
+ this.setState({
967
+ voiceVideoEleven: true
968
+ })
969
+ }
970
+
971
+ }
972
+ if(Mival.data.userId == (document.getElementById("feedId12").innerText ? this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId12").innerText).uid : '')) {
973
+ if(Mival.muteStatus == 0) {
974
+ this.setState({
975
+ voiceVideoTwelve: false
976
+ })
977
+ } else if(Mival.muteStatus == 1) {
978
+ this.setState({
979
+ voiceVideoTwelve: true
980
+ })
981
+ }
982
+
983
+ }
796
984
  }
797
985
  }
798
986
  };
@@ -937,7 +1125,7 @@ class Video extends Component {
937
1125
  // 发布媒体流成功
938
1126
  this.test_controller.OnPublishSucc = (sid) => {
939
1127
  console.log('发布媒体流成功', sid)
940
- if(sid == document.getElementById('video10').name) {
1128
+ if(sid == document.getElementById('video20').name) {
941
1129
  callNimIM('sendCustomCmdMsg', {
942
1130
  customId: this.state.imRoomId,
943
1131
  content: JSON.stringify({
@@ -969,6 +1157,155 @@ class Video extends Component {
969
1157
  // 推送“房间与会者列表”给新加⼊者
970
1158
  this.test_controller.OnRoomAttendanceList = (participants) => {
971
1159
  console.log('房间与会者列表', participants)
1160
+ participants.map((item,index)=>{
1161
+ if(item.uid != this.state.tellerAccount) {
1162
+ item.publish.map((itemOne,indexOne)=>{
1163
+ let array = this.state.roomCustomerList;
1164
+ let newArray = [...array];
1165
+ newArray.push({
1166
+ feedId: itemOne.feedId,
1167
+ uid: item.uid,
1168
+ tag: itemOne.tag
1169
+ });
1170
+ console.log(array, newArray, this.state.roomCustomerList);
1171
+ this.setState({
1172
+ roomCustomerList: newArray
1173
+ })
1174
+ let config_param
1175
+ if(itemOne.tag == 'VIDEO_SOURCE_SCREEN') {
1176
+ config_param = {
1177
+ subscribe_video_id: 'video21',
1178
+ subscribe_audio_id: 'audio21',
1179
+ subscribe_streamId_id: 'subscribe_streamId21',
1180
+ feedId_id: 'feedId21',
1181
+ feedId: itemOne.feedId
1182
+ }
1183
+
1184
+ this.tabTitlesClick(
1185
+ {
1186
+ value: 'customerScreen',
1187
+ name: '客户投屏'
1188
+ },'add'
1189
+ )
1190
+ }else {
1191
+ if(!document.getElementById('video1').name) {
1192
+ config_param = {
1193
+ subscribe_video_id: 'video1',
1194
+ subscribe_audio_id: 'audio1',
1195
+ subscribe_streamId_id: 'subscribe_streamId1',
1196
+ feedId_id: 'feedId1',
1197
+ feedId: itemOne.feedId
1198
+ }
1199
+ }
1200
+ else if(!document.getElementById('video2').name) {
1201
+ config_param = {
1202
+ subscribe_video_id: 'video2',
1203
+ subscribe_audio_id: 'audio2',
1204
+ subscribe_streamId_id: 'subscribe_streamId2',
1205
+ feedId_id: 'feedId2',
1206
+ feedId: itemOne.feedId
1207
+ }
1208
+ }
1209
+ else if(!document.getElementById('video3').name) {
1210
+ config_param = {
1211
+ subscribe_video_id: 'video3',
1212
+ subscribe_audio_id: 'audio3',
1213
+ subscribe_streamId_id: 'subscribe_streamId3',
1214
+ feedId_id: 'feedId3',
1215
+ feedId: itemOne.feedId
1216
+ }
1217
+ }
1218
+ else if(!document.getElementById('video4').name) {
1219
+ config_param = {
1220
+ subscribe_video_id: 'video4',
1221
+ subscribe_audio_id: 'audio4',
1222
+ subscribe_streamId_id: 'subscribe_streamId4',
1223
+ feedId_id: 'feedId4',
1224
+ feedId: itemOne.feedId
1225
+ }
1226
+ }
1227
+ else if(!document.getElementById('video5').name) {
1228
+ config_param = {
1229
+ subscribe_video_id: 'video5',
1230
+ subscribe_audio_id: 'audio5',
1231
+ subscribe_streamId_id: 'subscribe_streamId5',
1232
+ feedId_id: 'feedId5',
1233
+ feedId: itemOne.feedId
1234
+ }
1235
+ }
1236
+ else if(!document.getElementById('video6').name) {
1237
+ config_param = {
1238
+ subscribe_video_id: 'video6',
1239
+ subscribe_audio_id: 'audio6',
1240
+ subscribe_streamId_id: 'subscribe_streamId6',
1241
+ feedId_id: 'feedId6',
1242
+ feedId: itemOne.feedId
1243
+ }
1244
+ }
1245
+
1246
+ else if(!document.getElementById('video7').name) {
1247
+ config_param = {
1248
+ subscribe_video_id: 'video7',
1249
+ subscribe_audio_id: 'audio7',
1250
+ subscribe_streamId_id: 'subscribe_streamId7',
1251
+ feedId_id: 'feedId7',
1252
+ feedId: itemOne.feedId
1253
+ }
1254
+ }
1255
+ else if(!document.getElementById('video8').name) {
1256
+ config_param = {
1257
+ subscribe_video_id: 'video8',
1258
+ subscribe_audio_id: 'audio8',
1259
+ subscribe_streamId_id: 'subscribe_streamId8',
1260
+ feedId_id: 'feedId8',
1261
+ feedId: itemOne.feedId
1262
+ }
1263
+ }
1264
+ else if(!document.getElementById('video9').name) {
1265
+ config_param = {
1266
+ subscribe_video_id: 'video9',
1267
+ subscribe_audio_id: 'audio9',
1268
+ subscribe_streamId_id: 'subscribe_streamId9',
1269
+ feedId_id: 'feedId9',
1270
+ feedId: itemOne.feedId
1271
+ }
1272
+ }
1273
+ else if(!document.getElementById('video10').name) {
1274
+ config_param = {
1275
+ subscribe_video_id: 'video10',
1276
+ subscribe_audio_id: 'audio10',
1277
+ subscribe_streamId_id: 'subscribe_streamId10',
1278
+ feedId_id: 'feedId10',
1279
+ feedId: itemOne.feedId
1280
+ }
1281
+ }
1282
+ else if(!document.getElementById('video11').name) {
1283
+ config_param = {
1284
+ subscribe_video_id: 'video11',
1285
+ subscribe_audio_id: 'audio11',
1286
+ subscribe_streamId_id: 'subscribe_streamId11',
1287
+ feedId_id: 'feedId11',
1288
+ feedId: itemOne.feedId
1289
+ }
1290
+ }
1291
+ else if(!document.getElementById('video12').name) {
1292
+ config_param = {
1293
+ subscribe_video_id: 'video12',
1294
+ subscribe_audio_id: 'audio12',
1295
+ subscribe_streamId_id: 'subscribe_streamId12',
1296
+ feedId_id: 'feedId12',
1297
+ feedId: itemOne.feedId
1298
+ }
1299
+ }
1300
+ }
1301
+ if (config_param !== undefined) {
1302
+ config_param.need_volume_analyser = true
1303
+ console.log(config_param)
1304
+ this.test_controller.Subscribe(config_param)
1305
+ }
1306
+ })
1307
+ }
1308
+ })
972
1309
  };
973
1310
  // 推送“新加⼊房间者”给与会者
974
1311
  this.test_controller.OnNewJoinerIn = (participant) => {
@@ -983,6 +1320,20 @@ class Video extends Component {
983
1320
  // 推送“有新发布”给与会者
984
1321
  this.test_controller.OnNewPublish = (feed) => {
985
1322
  console.log('有新发布者', feed);
1323
+ callNimIM('sendCustomCmdMsg', {
1324
+ customId: this.state.imRoomId,
1325
+ content: JSON.stringify({
1326
+ 'typeId': 1014,
1327
+ 'sessionId': this.state.sessionId,
1328
+ 'meetingInfo': {
1329
+ 'title': this.props.meetingInfo.title,
1330
+ 'host': this.props.meetingInfo.host,
1331
+ 'customers': this.props.meetingInfo.customers
1332
+ }
1333
+
1334
+ })
1335
+ }, function (code, message, data) {
1336
+ })
986
1337
  let array = this.state.roomCustomerList;
987
1338
  let newArray = [...array];
988
1339
  newArray.push({
@@ -998,10 +1349,10 @@ class Video extends Component {
998
1349
  if(feed.uid != this.state.tellerAccount) {
999
1350
  if(feed.tag == 'VIDEO_SOURCE_SCREEN') {
1000
1351
  config_param = {
1001
- subscribe_video_id: 'video11',
1002
- subscribe_audio_id: 'audio11',
1003
- subscribe_streamId_id: 'subscribe_streamId11',
1004
- feedId_id: 'feedId11',
1352
+ subscribe_video_id: 'video21',
1353
+ subscribe_audio_id: 'audio21',
1354
+ subscribe_streamId_id: 'subscribe_streamId21',
1355
+ feedId_id: 'feedId21',
1005
1356
  feedId: feed.feedId
1006
1357
  }
1007
1358
 
@@ -1011,18 +1362,27 @@ class Video extends Component {
1011
1362
  name: '客户投屏'
1012
1363
  },'add'
1013
1364
  )
1365
+ if (config_param !== undefined) {
1366
+ config_param.need_volume_analyser = false
1367
+ console.log(config_param)
1368
+ setTimeout(()=>{
1369
+
1370
+ this.test_controller.Subscribe(config_param)
1371
+ }, 1000)
1372
+
1373
+ }
1014
1374
  } else {
1015
- // let data_param = {
1016
- // isVideo: true,
1017
- // videoIndex: this.state.videoList.length + 1,
1018
- // videoTwoName: ''
1019
- // }
1020
- // let videoList = []
1021
- // console.log(data_param)
1022
- // videoList.push(data_param)
1023
- // this.setState({
1024
- // videoList
1025
- // })
1375
+ // let data_param = {
1376
+ // isVideo: true,
1377
+ // videoIndex: this.state.videoList.length + 1,
1378
+ // videoTwoName: ''
1379
+ // }
1380
+ // let videoList = this.state.videoList;
1381
+ // let newvideoList = [...videoList];
1382
+ // newvideoList.push(data_param);
1383
+ // this.setState({
1384
+ // videoList: newvideoList
1385
+ // },()=>{
1026
1386
  // config_param = {
1027
1387
  // subscribe_video_id: 'video' + this.state.videoList.length,
1028
1388
  // subscribe_audio_id: 'audio' + this.state.videoList.length,
@@ -1030,7 +1390,7 @@ class Video extends Component {
1030
1390
  // feedId_id: 'feedId' + this.state.videoList.length,
1031
1391
  // feedId: feed.feedId
1032
1392
  // }
1033
- if(!document.getElementById('video1').name) {
1393
+ if(!document.getElementById('video1').name) {
1034
1394
  config_param = {
1035
1395
  subscribe_video_id: 'video1',
1036
1396
  subscribe_audio_id: 'audio1',
@@ -1084,14 +1444,74 @@ class Video extends Component {
1084
1444
  feedId: feed.feedId
1085
1445
  }
1086
1446
  }
1447
+ else if(!document.getElementById('video7').name) {
1448
+ config_param = {
1449
+ subscribe_video_id: 'video7',
1450
+ subscribe_audio_id: 'audio7',
1451
+ subscribe_streamId_id: 'subscribe_streamId7',
1452
+ feedId_id: 'feedId7',
1453
+ feedId: feed.feedId
1454
+ }
1455
+ }
1456
+ else if(!document.getElementById('video8').name) {
1457
+ config_param = {
1458
+ subscribe_video_id: 'video8',
1459
+ subscribe_audio_id: 'audio8',
1460
+ subscribe_streamId_id: 'subscribe_streamId8',
1461
+ feedId_id: 'feedId8',
1462
+ feedId: feed.feedId
1463
+ }
1464
+ }
1465
+ else if(!document.getElementById('video9').name) {
1466
+ config_param = {
1467
+ subscribe_video_id: 'video9',
1468
+ subscribe_audio_id: 'audio9',
1469
+ subscribe_streamId_id: 'subscribe_streamId9',
1470
+ feedId_id: 'feedId9',
1471
+ feedId: feed.feedId
1472
+ }
1473
+ }
1474
+ else if(!document.getElementById('video10').name) {
1475
+ config_param = {
1476
+ subscribe_video_id: 'video10',
1477
+ subscribe_audio_id: 'audio10',
1478
+ subscribe_streamId_id: 'subscribe_streamId10',
1479
+ feedId_id: 'feedId10',
1480
+ feedId: feed.feedId
1481
+ }
1482
+ }
1483
+ else if(!document.getElementById('video11').name) {
1484
+ config_param = {
1485
+ subscribe_video_id: 'video11',
1486
+ subscribe_audio_id: 'audio11',
1487
+ subscribe_streamId_id: 'subscribe_streamId11',
1488
+ feedId_id: 'feedId11',
1489
+ feedId: feed.feedId
1490
+ }
1491
+ }
1492
+ else if(!document.getElementById('video12').name) {
1493
+ config_param = {
1494
+ subscribe_video_id: 'video12',
1495
+ subscribe_audio_id: 'audio12',
1496
+ subscribe_streamId_id: 'subscribe_streamId12',
1497
+ feedId_id: 'feedId12',
1498
+ feedId: feed.feedId
1499
+ }
1500
+ }
1501
+ if (config_param !== undefined) {
1502
+ config_param.need_volume_analyser = true
1503
+ console.log(config_param)
1504
+
1505
+ this.test_controller.Subscribe(config_param)
1506
+
1507
+ }
1508
+ // })
1509
+
1510
+
1087
1511
  }
1088
1512
 
1089
1513
  }
1090
- if (config_param !== undefined) {
1091
- config_param.need_volume_analyser = true
1092
- console.log(config_param)
1093
- this.test_controller.Subscribe(config_param)
1094
- }
1514
+
1095
1515
  };
1096
1516
  // 推送“有新订阅”给与会者
1097
1517
  this.test_controller.OnNewSubscribe = (subscriber, feed) => {
@@ -1126,39 +1546,82 @@ class Video extends Component {
1126
1546
  console.log('取消订阅媒体流成功', sid)
1127
1547
  this.state.tabTitles.map((item) => {
1128
1548
  if(item.value == 'customerScreen') {
1129
- if(!document.getElementById("video11").name) {
1549
+ if(!document.getElementById("video21").name) {
1130
1550
  this.tabTitlesClick('customerScreen','delect')
1131
1551
  }
1132
1552
  }
1133
1553
  })
1134
1554
  if(!document.getElementById("video1").name) {
1135
1555
  this.setState({
1136
- videoOneName: ''
1556
+ videoOneName: '',
1557
+ voiceVideoOne: false
1137
1558
  })
1138
1559
  }
1139
1560
  if(!document.getElementById("video2").name) {
1140
1561
  this.setState({
1141
- videoTwoName: ''
1562
+ videoTwoName: '',
1563
+ voiceVideoTwo: false
1142
1564
  })
1143
1565
  }
1144
1566
  if(!document.getElementById("video3").name) {
1145
1567
  this.setState({
1146
- videoThreeName: ''
1568
+ videoThreeName: '',
1569
+ voiceVideoThree: false
1147
1570
  })
1148
1571
  }
1149
1572
  if(!document.getElementById("video4").name) {
1150
1573
  this.setState({
1151
- videoFourName: ''
1574
+ videoFourName: '',
1575
+ voiceVideoFour: false,
1152
1576
  })
1153
1577
  }
1154
1578
  if(!document.getElementById("video5").name) {
1155
1579
  this.setState({
1156
- videoFiveName: ''
1580
+ videoFiveName: '',
1581
+ voiceVideoFive: false
1157
1582
  })
1158
1583
  }
1159
1584
  if(!document.getElementById("video6").name) {
1160
1585
  this.setState({
1161
- videoSixName: ''
1586
+ videoSixName: '',
1587
+ voiceVideoSix: false
1588
+ })
1589
+ }
1590
+
1591
+ if(!document.getElementById("video7").name) {
1592
+ this.setState({
1593
+ videoSevenName: '',
1594
+ voiceVideoSeven: false
1595
+ })
1596
+ }
1597
+ if(!document.getElementById("video8").name) {
1598
+ this.setState({
1599
+ videoEightName: '',
1600
+ voiceVideoEight: false
1601
+ })
1602
+ }
1603
+ if(!document.getElementById("video9").name) {
1604
+ this.setState({
1605
+ videoNineName: '',
1606
+ voiceVideoNine: false
1607
+ })
1608
+ }
1609
+ if(!document.getElementById("video10").name) {
1610
+ this.setState({
1611
+ videoTenName: '',
1612
+ voiceVideoTen: false
1613
+ })
1614
+ }
1615
+ if(!document.getElementById("video11").name) {
1616
+ this.setState({
1617
+ videoElevenName: '',
1618
+ voiceVideoEleven: false
1619
+ })
1620
+ }
1621
+ if(!document.getElementById("video12").name) {
1622
+ this.setState({
1623
+ videoTwelveName: '',
1624
+ voiceVideoTwelve: false
1162
1625
  })
1163
1626
  }
1164
1627
  };
@@ -1166,7 +1629,7 @@ class Video extends Component {
1166
1629
  this.test_controller.OnUnPublish = (feed) => {
1167
1630
  console.log('取消发布者', feed)
1168
1631
  for(let i=0;i<this.state.roomCustomerList.length;i++) {
1169
- if(this.state.roomCustomerList[i].uid == feed.uid) {
1632
+ if(this.state.roomCustomerList[i].feedId == feed.feedId) {
1170
1633
  this.state.roomCustomerList.splice(i, 1)
1171
1634
  }
1172
1635
  }
@@ -1220,7 +1683,7 @@ class Video extends Component {
1220
1683
  // 结束服务端录制成功
1221
1684
  this.test_controller.OnStopRemoteRecordSucc = (recordId) => {
1222
1685
  console.log('结束服务端录制成功', recordId);
1223
- this.endSessionValue()
1686
+ // this.endSessionValue()
1224
1687
  // 获取服务端录制结果
1225
1688
  };
1226
1689
  // 结束服务端录制失败
@@ -1380,6 +1843,13 @@ class Video extends Component {
1380
1843
  let subscribe_sid5 = document.getElementById('video5').name || document.getElementById('audio5').name;
1381
1844
  let subscribe_sid6 = document.getElementById('video6').name || document.getElementById('audio6').name;
1382
1845
 
1846
+ let subscribe_sid7 = document.getElementById('video7').name || document.getElementById('audio7').name;
1847
+ let subscribe_sid8 = document.getElementById('video8').name || document.getElementById('audio8').name;
1848
+ let subscribe_sid9 = document.getElementById('video9').name || document.getElementById('audio9').name;
1849
+ let subscribe_sid10 = document.getElementById('video10').name || document.getElementById('audio10').name;
1850
+ let subscribe_sid11 = document.getElementById('video11').name || document.getElementById('audio11').name;
1851
+ let subscribe_sid12 = document.getElementById('video12').name || document.getElementById('audio12').name;
1852
+
1383
1853
  let volumeView;
1384
1854
  switch (sid) {
1385
1855
  case publish_sid:
@@ -1403,6 +1873,25 @@ class Video extends Component {
1403
1873
  case subscribe_sid6:
1404
1874
  volumeView = "subscribe_volumeView6";
1405
1875
  break;
1876
+
1877
+ case subscribe_sid7:
1878
+ volumeView = "subscribe_volumeView7";
1879
+ break;
1880
+ case subscribe_sid8:
1881
+ volumeView = "subscribe_volumeView8";
1882
+ break;
1883
+ case subscribe_sid9:
1884
+ volumeView = "subscribe_volumeView9";
1885
+ break;
1886
+ case subscribe_sid10:
1887
+ volumeView = "subscribe_volumeView10";
1888
+ break;
1889
+ case subscribe_sid11:
1890
+ volumeView = "subscribe_volumeView11";
1891
+ break;
1892
+ case subscribe_sid12:
1893
+ volumeView = "subscribe_volumeView12";
1894
+ break;
1406
1895
  }
1407
1896
  if (!volumeView) {
1408
1897
  return;
@@ -1469,11 +1958,18 @@ class Video extends Component {
1469
1958
  }
1470
1959
  };
1471
1960
  finishSession = async () => {
1472
- try {
1961
+
1962
+
1963
+ if(this.state.roomCustomerList.length == 0) {
1964
+ debugger
1965
+ try {
1473
1966
  let result = await API.finishSession({
1474
1967
  sessionId: this.state.sessionId,
1475
1968
  tellerId: this.props.tellerAccount
1476
1969
  });
1970
+ } catch (err) {
1971
+ }
1972
+ }
1477
1973
  this.setState({
1478
1974
  isCustomer: false,
1479
1975
  isWhiteboard: false,
@@ -1483,12 +1979,7 @@ class Video extends Component {
1483
1979
  code: LEAVE_TYPE.TELLER_EXIT,
1484
1980
  errMsg: '坐席退出'
1485
1981
  })
1486
- } catch (err) {
1487
- this.props.onLeaveRoom({
1488
- code: LEAVE_TYPE.TELLER_EXIT,
1489
- errMsg: '坐席退出'
1490
- })
1491
- }
1982
+
1492
1983
  }
1493
1984
  getRoomStatus = async data => {
1494
1985
  try {
@@ -1609,8 +2100,11 @@ class Video extends Component {
1609
2100
  customId: this.state.imRoomId,
1610
2101
  content: JSON.stringify({
1611
2102
  'typeId': 1013,
1612
- 'state': 0,
1613
- 'sessionId': this.state.sessionId,
2103
+ 'muteStatus': 1,
2104
+ 'data': {
2105
+ 'sessionId': this.state.sessionId,
2106
+ 'userId': this.props.tellerAccount
2107
+ }
1614
2108
  })
1615
2109
  }, function (code, message, data) {
1616
2110
  console.log(data)
@@ -1632,8 +2126,11 @@ class Video extends Component {
1632
2126
  customId: this.state.imRoomId,
1633
2127
  content: JSON.stringify({
1634
2128
  'typeId': 1013,
1635
- 'state': 1,
1636
- 'sessionId': this.state.sessionId,
2129
+ 'muteStatus': 0,
2130
+ 'data': {
2131
+ 'sessionId': this.state.sessionId,
2132
+ 'userId': this.props.tellerAccount
2133
+ }
1637
2134
  })
1638
2135
  }, function (code, message, data) {
1639
2136
  console.log(data)
@@ -1704,7 +2201,7 @@ class Video extends Component {
1704
2201
  if (this.state.isWhiteboard) {
1705
2202
  publish_config.publish_device = 4
1706
2203
  publish_config.media_type = 1
1707
- publish_config.sid = document.getElementById('video10').name
2204
+ publish_config.sid = document.getElementById('video20').name
1708
2205
  publish_config.part_of_screen_id = 'touBoxItem'
1709
2206
  publish_config.video_profile_type = 5
1710
2207
  this.test_controller.ChangeMediaStream(publish_config);
@@ -1712,7 +2209,7 @@ class Video extends Component {
1712
2209
  isPDF: true,
1713
2210
  })
1714
2211
  } else {
1715
- this.test_controller.UnPublish(document.getElementById('video10').name)
2212
+ this.test_controller.UnPublish(document.getElementById('video20').name)
1716
2213
  }
1717
2214
  this.setState({
1718
2215
  publishDevic: 1,
@@ -1725,19 +2222,19 @@ class Video extends Component {
1725
2222
  document.exitPictureInPicture()
1726
2223
  }
1727
2224
  } else {
1728
- if (document.getElementById('video10').name) {
2225
+ if (document.getElementById('video20').name) {
1729
2226
  publish_config.media_type = 1;
1730
2227
  publish_config.publish_device = 2;
1731
2228
  publish_config.video_profile_type = 5;
1732
- publish_config.sid = document.getElementById('video10').name;
2229
+ publish_config.sid = document.getElementById('video20').name;
1733
2230
  this.test_controller.ChangeMediaStream(publish_config);
1734
2231
  } else {
1735
2232
  publish_config.media_type = 1
1736
2233
  publish_config.publish_device = 2
1737
2234
  publish_config.need_volume_analyser = true
1738
2235
  publish_config.video_profile_type = 5
1739
- publish_config.publish_video_id = 'video10'
1740
- publish_config.publish_streamId_id = 'subscribe_streamId10'
2236
+ publish_config.publish_video_id = 'video20'
2237
+ publish_config.publish_streamId_id = 'subscribe_streamId20'
1741
2238
  publish_config.publish_tag = 'projectionWhiteboard'
1742
2239
  this.test_controller.Publish(publish_config)
1743
2240
  }
@@ -1934,6 +2431,18 @@ class Video extends Component {
1934
2431
  sid = document.getElementById('video5').name;
1935
2432
  } else if (item.feedId == document.getElementById("feedId6").innerText) {
1936
2433
  sid = document.getElementById('video6').name;
2434
+ } else if (item.feedId == document.getElementById("feedId7").innerText) {
2435
+ sid = document.getElementById('video7').name;
2436
+ } else if (item.feedId == document.getElementById("feedId8").innerText) {
2437
+ sid = document.getElementById('video8').name;
2438
+ } else if (item.feedId == document.getElementById("feedId9").innerText) {
2439
+ sid = document.getElementById('video9').name;
2440
+ } else if (item.feedId == document.getElementById("feedId10").innerText) {
2441
+ sid = document.getElementById('video10').name;
2442
+ } else if (item.feedId == document.getElementById("feedId11").innerText) {
2443
+ sid = document.getElementById('video11').name;
2444
+ } else if (item.feedId == document.getElementById("feedId12").innerText) {
2445
+ sid = document.getElementById('video12').name;
1937
2446
  }
1938
2447
  console.log(sid)
1939
2448
  this.setState({
@@ -1991,43 +2500,88 @@ class Video extends Component {
1991
2500
  }if(document.getElementById('video6').name == sid){
1992
2501
  userId = this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId6").innerText).uid
1993
2502
  }
2503
+
2504
+ if(document.getElementById('video7').name == sid){
2505
+ userId = this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId7").innerText).uid
2506
+ }
2507
+ if(document.getElementById('video8').name == sid){
2508
+ userId = this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId8").innerText).uid
2509
+ }
2510
+ if(document.getElementById('video9').name == sid){
2511
+ userId = this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId9").innerText).uid
2512
+ }
2513
+ if(document.getElementById('video10').name == sid){
2514
+ userId = this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId10").innerText).uid
2515
+ }
2516
+ if(document.getElementById('video11').name == sid){
2517
+ userId = this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId11").innerText).uid
2518
+ }
2519
+ if(document.getElementById('video12').name == sid){
2520
+ userId = this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId12").innerText).uid
2521
+ }
1994
2522
  try {
1995
2523
  let result = await API.appGetUsername({
1996
2524
  userId: userId
1997
2525
  });
1998
2526
  console.log(result)
2527
+ let data
1999
2528
  if (result.code == 200) {
2000
- let data = result.data.userInfo ? result.data.userInfo.userName ? result.data.userInfo.userName : '' : ''
2001
- if(document.getElementById('video1').name == sid){
2002
-
2003
- this.setState({
2004
- videoOneName: this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId1").innerText).tag == 'VIDEO_SOURCE_SCREEN' ? '共享屏幕' : data ? data : '客户1'
2005
- })
2006
- }
2007
- if(document.getElementById('video2').name == sid){
2008
- this.setState({
2009
- videoTwoName: this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId2").innerText).tag == 'VIDEO_SOURCE_SCREEN' ? '共享屏幕' :data? data : '客户2'
2010
- })
2011
- }if(document.getElementById('video3').name == sid){
2012
- this.setState({
2013
- videoThreeName: this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId3").innerText).tag == 'VIDEO_SOURCE_SCREEN' ? '共享屏幕' :data ? data : '客户3'
2014
- })
2015
- }if(document.getElementById('video4').name == sid){
2016
- this.setState({
2017
- videoFourName: this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId4").innerText).tag == 'VIDEO_SOURCE_SCREEN' ? '共享屏幕' :data ? data : '客户4'
2018
- })
2019
- }if(document.getElementById('video5').name == sid){
2020
- this.setState({
2021
- videoFiveName: this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId5").innerText).tag == 'VIDEO_SOURCE_SCREEN' ? '共享屏幕' :data? data : '客户5'
2022
- })
2023
- }if(document.getElementById('video6').name == sid){
2024
- this.setState({
2025
- videoSixName: this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId6").innerText).tag == 'VIDEO_SOURCE_SCREEN' ? '共享屏幕' :data ? data: '客户6'
2026
- })
2027
- }
2529
+ data = result.data.userInfo ? result.data.userInfo.userName ? result.data.userInfo.userName : '' : ''
2028
2530
  } else {
2029
2531
  message.success('查询失败')
2030
2532
  }
2533
+ if(document.getElementById('video1').name == sid){
2534
+
2535
+ this.setState({
2536
+ videoOneName: this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId1").innerText).tag == 'VIDEO_SOURCE_SCREEN' ? '共享屏幕' : data ? data : '客户1'
2537
+ })
2538
+ }
2539
+ if(document.getElementById('video2').name == sid){
2540
+ this.setState({
2541
+ videoTwoName: this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId2").innerText).tag == 'VIDEO_SOURCE_SCREEN' ? '共享屏幕' :data? data : '客户2'
2542
+ })
2543
+ }if(document.getElementById('video3').name == sid){
2544
+ this.setState({
2545
+ videoThreeName: this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId3").innerText).tag == 'VIDEO_SOURCE_SCREEN' ? '共享屏幕' :data ? data : '客户3'
2546
+ })
2547
+ }if(document.getElementById('video4').name == sid){
2548
+ this.setState({
2549
+ videoFourName: this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId4").innerText).tag == 'VIDEO_SOURCE_SCREEN' ? '共享屏幕' :data ? data : '客户4'
2550
+ })
2551
+ }if(document.getElementById('video5').name == sid){
2552
+ this.setState({
2553
+ videoFiveName: this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId5").innerText).tag == 'VIDEO_SOURCE_SCREEN' ? '共享屏幕' :data? data : '客户5'
2554
+ })
2555
+ }if(document.getElementById('video6').name == sid){
2556
+ this.setState({
2557
+ videoSixName: this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId6").innerText).tag == 'VIDEO_SOURCE_SCREEN' ? '共享屏幕' :data ? data: '客户6'
2558
+ })
2559
+ }
2560
+ if(document.getElementById('video7').name == sid){
2561
+ this.setState({
2562
+ videoSevenName: this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId7").innerText).tag == 'VIDEO_SOURCE_SCREEN' ? '共享屏幕' :data ? data: '客户7'
2563
+ })
2564
+ }if(document.getElementById('video8').name == sid){
2565
+ this.setState({
2566
+ videoEightName: this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId8").innerText).tag == 'VIDEO_SOURCE_SCREEN' ? '共享屏幕' :data ? data: '客户8'
2567
+ })
2568
+ }if(document.getElementById('video9').name == sid){
2569
+ this.setState({
2570
+ videoNineName: this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId9").innerText).tag == 'VIDEO_SOURCE_SCREEN' ? '共享屏幕' :data ? data: '客户9'
2571
+ })
2572
+ }if(document.getElementById('video10').name == sid){
2573
+ this.setState({
2574
+ videoTenName: this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId10").innerText).tag == 'VIDEO_SOURCE_SCREEN' ? '共享屏幕' :data ? data: '客户10'
2575
+ })
2576
+ }if(document.getElementById('video11').name == sid){
2577
+ this.setState({
2578
+ videoElevenName: this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId11").innerText).tag == 'VIDEO_SOURCE_SCREEN' ? '共享屏幕' :data ? data: '客户11'
2579
+ })
2580
+ }if(document.getElementById('video12').name == sid){
2581
+ this.setState({
2582
+ videoTwelveName: this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId12").innerText).tag == 'VIDEO_SOURCE_SCREEN' ? '共享屏幕' :data ? data: '客户12'
2583
+ })
2584
+ }
2031
2585
  } catch (err) {
2032
2586
 
2033
2587
  }
@@ -2083,11 +2637,11 @@ class Video extends Component {
2083
2637
  value: 'RMWhiteboard',
2084
2638
  name: 'RM白板'
2085
2639
  },'add')
2086
- if (document.getElementById('video10').name) {
2640
+ if (document.getElementById('video20').name) {
2087
2641
  // 代表已经有了进行切流
2088
2642
  publish_config.publish_device = 4
2089
2643
  publish_config.media_type = 1
2090
- publish_config.sid = document.getElementById('video10').name
2644
+ publish_config.sid = document.getElementById('video20').name
2091
2645
  publish_config.part_of_screen_id = 'touBoxItem'
2092
2646
  publish_config.video_profile_type = 5
2093
2647
  this.test_controller.ChangeMediaStream(publish_config);
@@ -2098,7 +2652,7 @@ class Video extends Component {
2098
2652
  publish_config.need_volume_analyser = true
2099
2653
  publish_config.video_profile_type = 5
2100
2654
  publish_config.part_of_screen_id = 'touBoxItem';
2101
- publish_config.publish_video_id = 'video10'
2655
+ publish_config.publish_video_id = 'video20'
2102
2656
  publish_config.publish_streamId_id = 'subscribe_streamId10'
2103
2657
  publish_config.publish_tag = 'projectionWhiteboard'
2104
2658
  this.test_controller.Publish(publish_config)
@@ -2113,20 +2667,6 @@ class Video extends Component {
2113
2667
  this.setState({
2114
2668
  isSelect: value,
2115
2669
  })
2116
- // if (this.state.isSelect == 'video') {
2117
- // if (document.getElementById('video10').name) {
2118
- // this.setState({
2119
- // isSelect: 'noVideo',
2120
- // })
2121
- // } else {
2122
- // message.success('当前无签字白板')
2123
- // }
2124
-
2125
- // } else {
2126
- // this.setState({
2127
- // isSelect: 'video',
2128
- // })
2129
- // }
2130
2670
  }
2131
2671
  facialHandleVisibleChange=(value)=>{
2132
2672
  if(!value) {
@@ -2174,25 +2714,25 @@ class Video extends Component {
2174
2714
  }
2175
2715
  </div>
2176
2716
  )
2177
- // const videoCustomer =
2178
- // this.state.videoList.map((item,index)=>{
2179
- // return <div className={`itemed`} style={{ display: (item.isVideo) ? '' : 'none', }}>
2180
- // <video
2181
- // id={'video' + item.videoIndex}
2182
- // autoPlay
2183
- // muted={true}
2184
- // className="video"
2185
- // />
2186
- // <audio id={'audio' + item.videoIndex} autoPlay />
2187
- // <label style={{ display: 'none' }} id={'feedId' + item.videoIndex} type="text" />
2188
- // <div className={`customerTitle titleSamlle`}>
2189
- // <div className='titleName' style={{ background: this.props.titleBackground,color: this.props.titleColor,'font-size': this.props.fontSize + 'px','font-family' : this.props.fontFamily}}>
2190
- // {this.state.videoTwoName}
2191
- // </div>
2192
- // </div>
2193
- // <canvas className="canvasClassOne" id={'subscribe_volumeView' + item.videoIndex} width="40" height="70"></canvas>
2194
- // </div>
2195
- // })
2717
+ const videoCustomer =
2718
+ this.state.videoList.map((item,index)=>{
2719
+ return <div className={`itemed`} style={{ display: (item.isVideo) ? '' : 'none', }}>
2720
+ <video
2721
+ id={'video' + item.videoIndex}
2722
+ autoPlay
2723
+ muted={true}
2724
+ className="video"
2725
+ />
2726
+ <audio id={'audio' + item.videoIndex} autoPlay />
2727
+ <label style={{ display: 'none' }} id={'feedId' + item.videoIndex} type="text" />
2728
+ <div className={`customerTitle titleSamlle`}>
2729
+ <div className='titleName' style={{ background: this.props.titleBackground,color: this.props.titleColor,'font-size': this.props.fontSize + 'px','font-family' : this.props.fontFamily}}>
2730
+ {this.state.videoTwoName}
2731
+ </div>
2732
+ </div>
2733
+ <canvas className="canvasClassOne" id={'subscribe_volumeView' + item.videoIndex} width="40" height="70"></canvas>
2734
+ </div>
2735
+ })
2196
2736
 
2197
2737
  return (
2198
2738
  <div className="all">
@@ -2204,13 +2744,13 @@ class Video extends Component {
2204
2744
  <div className="videoDiv" style={{ display: (this.state.isSelect == 'RMScreen') ? '' : 'none', }}>
2205
2745
  <div className="videoDiv">
2206
2746
  <video
2207
- id="video10"
2747
+ id="video20"
2208
2748
  autoPlay
2209
2749
  muted={true}
2210
2750
  className="video"
2211
2751
  />
2212
- <audio id="audio10" autoPlay />
2213
- <label style={{ display: 'none' }} id="feedId10" type="text" />
2752
+ <audio id="audio20" autoPlay />
2753
+ <label style={{ display: 'none' }} id="feedId20" type="text" />
2214
2754
  </div>
2215
2755
 
2216
2756
  </div>
@@ -2222,14 +2762,13 @@ class Video extends Component {
2222
2762
  <div className="videoDiv" style={{ display: (this.state.isSelect == 'customerScreen') ? '' : 'none', }}>
2223
2763
  <div className="videoDiv">
2224
2764
  <video
2225
- id="video11"
2765
+ id="video21"
2226
2766
  autoPlay
2227
2767
  muted={true}
2228
2768
  className="video"
2229
2769
  />
2230
- <audio id="audio11" autoPlay />
2231
- <label style={{ display: 'none' }} id="feedId11" type="text" />
2232
- {/* <canvas style={{ display: (this.state.isCustomer) ? '' : 'none', }} className="canvasClass" id="subscribe_volumeView10" width="70" height="70"></canvas> */}
2770
+ <audio id="audio21" autoPlay />
2771
+ <label style={{ display: 'none' }} id="feedId21" type="text" />
2233
2772
  </div>
2234
2773
 
2235
2774
  </div>
@@ -2243,7 +2782,7 @@ class Video extends Component {
2243
2782
  <label>{meetingInfo.title}</label>
2244
2783
  </li>
2245
2784
  <li>
2246
- <span>支持人:</span>
2785
+ <span>主持人:</span>
2247
2786
  <label>{meetingInfo.host}</label>
2248
2787
  </li>
2249
2788
  <li>
@@ -2292,7 +2831,7 @@ class Video extends Component {
2292
2831
  <div style={{ display: (this.state.isCustomer) ? '' : 'none', }}>
2293
2832
  <div
2294
2833
  className={`itemed`}
2295
- style={{ position: "relative"}}
2834
+ style={{ position: "relative",display: (this.state.videoOneName) ? '' : 'none'}}
2296
2835
  >
2297
2836
  {
2298
2837
  this.state.customAudioed && <img
@@ -2301,7 +2840,7 @@ class Video extends Component {
2301
2840
  style={{ width: "100%", height: "100%",}}
2302
2841
  ></img>
2303
2842
  }
2304
- <div className="video1Div" style={{ display: (!this.state.customAudioed) ? '' : 'none', }}>
2843
+ <div className="video1Div">
2305
2844
  <video
2306
2845
  id="video1"
2307
2846
  autoPlay
@@ -2324,10 +2863,10 @@ class Video extends Component {
2324
2863
 
2325
2864
 
2326
2865
  </div>
2327
- <canvas style={{ display: (!this.state.voiceVideoOne) ? '' : 'none', }} className="canvasClassOne" id="subscribe_volumeView1" width="40" height="70"></canvas>
2866
+ <canvas style={{ display: (this.state.videoOneName&&!this.state.voiceVideoOne) ? '' : 'none', }} className="canvasClassOne" id="subscribe_volumeView1" width="40" height="70"></canvas>
2328
2867
  </div>
2329
2868
  </div>
2330
- <div className={`itemed`}>
2869
+ <div className={`itemed`} style={{ display: (this.state.videoTwoName) ? '' : 'none', }}>
2331
2870
  <video
2332
2871
  id="video2"
2333
2872
  autoPlay
@@ -2348,10 +2887,10 @@ class Video extends Component {
2348
2887
  {this.state.videoTwoName}
2349
2888
  </div>
2350
2889
  </div>
2351
- <canvas style={{ display: (!this.state.voiceVideoTwo) ? '' : 'none', }} className="canvasClassOne" id="subscribe_volumeView2" width="40" height="70"></canvas>
2890
+ <canvas style={{ display: (this.state.videoTwoName&&!this.state.voiceVideoTwo) ? '' : 'none', }} className="canvasClassOne" id="subscribe_volumeView2" width="40" height="70"></canvas>
2352
2891
  </div>
2353
2892
  <div className={`itemed`}
2354
- style={{'margin-top': '5px' }}>
2893
+ style={{display: (this.state.videoThreeName) ? '' : 'none' }}>
2355
2894
  <video
2356
2895
  id="video3"
2357
2896
  autoPlay
@@ -2372,9 +2911,9 @@ class Video extends Component {
2372
2911
  {this.state.videoThreeName}
2373
2912
  </div>
2374
2913
  </div>
2375
- <canvas style={{ display: (!this.state.voiceVideoThree) ? '' : 'none', }} className="canvasClassOne" id="subscribe_volumeView3" width="40" height="70"></canvas>
2914
+ <canvas style={{ display: (this.state.videoThreeName&&!this.state.voiceVideoThree) ? '' : 'none', }} className="canvasClassOne" id="subscribe_volumeView3" width="40" height="70"></canvas>
2376
2915
  </div>
2377
- <div className={`itemed`}>
2916
+ <div className={`itemed`} style={{ display: (this.state.videoFourName) ? '' : 'none', }}>
2378
2917
  <video
2379
2918
  id="video4"
2380
2919
  autoPlay
@@ -2395,10 +2934,10 @@ class Video extends Component {
2395
2934
  {this.state.videoFourName}
2396
2935
  </div>
2397
2936
  </div>
2398
- <canvas style={{ display: (!this.state.voiceVideoFour) ? '' : 'none', }} className="canvasClassOne" id="subscribe_volumeView4" width="40" height="70"></canvas>
2937
+ <canvas style={{ display: (this.state.videoFourName&&!this.state.voiceVideoFour) ? '' : 'none', }} className="canvasClassOne" id="subscribe_volumeView4" width="40" height="70"></canvas>
2399
2938
  </div>
2400
2939
  <div className={`itemed`}
2401
- style={{'margin-top': '5px' }}>
2940
+ style={{display: (this.state.videoFiveName) ? '' : 'none' }}>
2402
2941
  <video
2403
2942
  id="video5"
2404
2943
  autoPlay
@@ -2419,9 +2958,9 @@ class Video extends Component {
2419
2958
  {this.state.videoFiveName}
2420
2959
  </div>
2421
2960
  </div>
2422
- <canvas style={{ display: (!this.state.voiceVideoFive) ? '' : 'none', }} className="canvasClassOne" id="subscribe_volumeView5" width="40" height="70"></canvas>
2961
+ <canvas style={{ display: (this.state.videoFiveName&&!this.state.voiceVideoFive) ? '' : 'none', }} className="canvasClassOne" id="subscribe_volumeView5" width="40" height="70"></canvas>
2423
2962
  </div>
2424
- <div className={`itemed`}>
2963
+ <div className={`itemed`} style={{ display: (this.state.videoSixName) ? '' : 'none', }}>
2425
2964
  <video
2426
2965
  id="video6"
2427
2966
  autoPlay
@@ -2445,6 +2984,162 @@ class Video extends Component {
2445
2984
  <canvas style={{ display: (!this.state.voiceVideoSix) ? '' : 'none', }} className="canvasClassOne" id="subscribe_volumeView6" width="40" height="70"></canvas>
2446
2985
 
2447
2986
  </div>
2987
+ <div
2988
+ className={`itemed`}
2989
+ style={{ position: "relative",display: (this.state.videoSevenName) ? '' : 'none'}}
2990
+ >
2991
+ {
2992
+ this.state.customAudioed && <img
2993
+ alt=""
2994
+ src={require("../../assets/img/yingpin.png").default}
2995
+ style={{ width: "100%", height: "100%",}}
2996
+ ></img>
2997
+ }
2998
+ <div className="video1Div" style={{ display: (!this.state.customAudioed) ? '' : 'none', }}>
2999
+ <video
3000
+ id="video7"
3001
+ autoPlay
3002
+ muted={true}
3003
+ className="video"
3004
+ />
3005
+ <audio id="audio7" autoPlay />
3006
+ <label style={{ display: 'none' }} id="feedId7" type="text" />
3007
+ {
3008
+ this.state.voiceVideoSeven && <img
3009
+ alt=""
3010
+ src={require("../../assets/img/jingyin.png").default}
3011
+ className="imgClassVoice voiceVideoClass"
3012
+ />
3013
+ }
3014
+ <div style={{ display: (this.state.videoSevenName) ? '' : 'none'}} className={`customerTitle titleSamlle`}>
3015
+ <div className='titleName' style={{ background: this.props.titleBackground,color: this.props.titleColor,'font-size': this.props.fontSize + 'px','font-family' : this.props.fontFamily}}>
3016
+ {this.state.videoSevenName}
3017
+ </div>
3018
+
3019
+
3020
+ </div>
3021
+ <canvas style={{ display: (this.state.videoSevenName&&!this.state.voiceVideoSeven) ? '' : 'none', }} className="canvasClassOne" id="subscribe_volumeView7" width="40" height="70"></canvas>
3022
+ </div>
3023
+ </div>
3024
+ <div className={`itemed`} style={{ display: (this.state.videoEightName) ? '' : 'none', }}>
3025
+ <video
3026
+ id="video8"
3027
+ autoPlay
3028
+ muted={true}
3029
+ className="video"
3030
+ />
3031
+ <audio id="audio8" autoPlay />
3032
+ <label style={{ display: 'none' }} id="feedId8" type="text" />
3033
+ {
3034
+ this.state.voiceVideoEight && <img
3035
+ alt=""
3036
+ src={require("../../assets/img/jingyin.png").default}
3037
+ className="imgClassVoice voiceVideoClass"
3038
+ />
3039
+ }
3040
+ <div style={{ display: (this.state.videoEightName) ? '' : 'none'}} className={`customerTitle titleSamlle`}>
3041
+ <div className='titleName' style={{ background: this.props.titleBackground,color: this.props.titleColor,'font-size': this.props.fontSize + 'px','font-family' : this.props.fontFamily}}>
3042
+ {this.state.videoEightName}
3043
+ </div>
3044
+ </div>
3045
+ <canvas style={{ display: (this.state.videoEightName&&!this.state.voiceVideoEight) ? '' : 'none', }} className="canvasClassOne" id="subscribe_volumeView8" width="40" height="70"></canvas>
3046
+ </div>
3047
+ <div className={`itemed`} style={{ display: (this.state.videoNineName) ? '' : 'none', }}>
3048
+ <video
3049
+ id="video9"
3050
+ autoPlay
3051
+ muted={true}
3052
+ className="video"
3053
+ />
3054
+ <audio id="audio9" autoPlay />
3055
+ <label style={{ display: 'none' }} id="feedId9" type="text" />
3056
+ {
3057
+ this.state.voiceVideoNine && <img
3058
+ alt=""
3059
+ src={require("../../assets/img/jingyin.png").default}
3060
+ className="imgClassVoice voiceVideoClass"
3061
+ />
3062
+ }
3063
+ <div style={{ display: (this.state.videoNineName) ? '' : 'none', background: this.props.titleBackground,color: this.props.titleColor,'font-size': this.props.fontSize + 'px','font-family' : this.props.fontFamily }} className={`customerTitle titleSamlle`}>
3064
+ <div className='titleName' style={{ background: this.props.titleBackground,color: this.props.titleColor,'font-size': this.props.fontSize + 'px','font-family' : this.props.fontFamily}}>
3065
+ {this.state.videoNineName}
3066
+ </div>
3067
+ </div>
3068
+ <canvas style={{ display: (this.state.videoNineName && !this.state.voiceVideoSix) ? '' : 'none', }} className="canvasClassOne" id="subscribe_volumeView9" width="40" height="70"></canvas>
3069
+
3070
+ </div>
3071
+ <div className={`itemed`}
3072
+ style={{display: (this.state.videoTenName) ? '' : 'none' }}>
3073
+ <video
3074
+ id="video10"
3075
+ autoPlay
3076
+ muted={true}
3077
+ className="video"
3078
+ />
3079
+ <audio id="audio10" autoPlay />
3080
+ <label style={{ display: 'none' }} id="feedId10" type="text" />
3081
+ {
3082
+ this.state.voiceVideoTen && <img
3083
+ alt=""
3084
+ src={require("../../assets/img/jingyin.png").default}
3085
+ className="imgClassVoice voiceVideoClass"
3086
+ />
3087
+ }
3088
+ <div style={{ display: (this.state.videoTenName) ? '' : 'none', background: this.props.titleBackground,color: this.props.titleColor,'font-size': this.props.fontSize + 'px','font-family' : this.props.fontFamily }} className={`customerTitle titleSamlle`}>
3089
+ <div className='titleName' style={{ background: this.props.titleBackground,color: this.props.titleColor,'font-size': this.props.fontSize + 'px','font-family' : this.props.fontFamily}}>
3090
+ {this.state.videoTenName}
3091
+ </div>
3092
+ </div>
3093
+ <canvas style={{ display: (this.state.videoTenName&&!this.state.voiceVideoTen) ? '' : 'none', }} className="canvasClassOne" id="subscribe_volumeView10" width="40" height="70"></canvas>
3094
+ </div>
3095
+ <div className={`itemed`} style={{ display: (this.state.videoElevenName) ? '' : 'none', }}>
3096
+ <video
3097
+ id="video11"
3098
+ autoPlay
3099
+ muted={true}
3100
+ className="video"
3101
+ />
3102
+ <audio id="audio11" autoPlay />
3103
+ <label style={{ display: 'none' }} id="feedId11" type="text" />
3104
+ {
3105
+ this.state.voiceVideoEleven && <img
3106
+ alt=""
3107
+ src={require("../../assets/img/jingyin.png").default}
3108
+ className="imgClassVoice voiceVideoClass"
3109
+ />
3110
+ }
3111
+ <div style={{ display: (this.state.videoElevenName) ? '' : 'none', background: this.props.titleBackground,color: this.props.titleColor,'font-size': this.props.fontSize + 'px','font-family' : this.props.fontFamily }} className={`customerTitle titleSamlle`}>
3112
+ <div className='titleName' style={{ background: this.props.titleBackground,color: this.props.titleColor,'font-size': this.props.fontSize + 'px','font-family' : this.props.fontFamily}}>
3113
+ {this.state.videoElevenName}
3114
+ </div>
3115
+ </div>
3116
+ <canvas style={{ display: (this.state.videoElevenName&&!this.state.voiceVideoEleven) ? '' : 'none', }} className="canvasClassOne" id="subscribe_volumeView11" width="40" height="70"></canvas>
3117
+ </div>
3118
+ <div className={`itemed`}
3119
+ style={{display: (this.state.videoTwelveName) ? '' : 'none' }}>
3120
+ <video
3121
+ id="video12"
3122
+ autoPlay
3123
+ muted={true}
3124
+ className="video"
3125
+ />
3126
+ <audio id="audio12" autoPlay />
3127
+ <label style={{ display: 'none' }} id="feedId12" type="text" />
3128
+ {
3129
+ this.state.voiceVideoTwelve && <img
3130
+ alt=""
3131
+ src={require("../../assets/img/jingyin.png").default}
3132
+ className="imgClassVoice voiceVideoClass"
3133
+ />
3134
+ }
3135
+ <div style={{ display: (this.state.videoTwelveName) ? '' : 'none', background: this.props.titleBackground,color: this.props.titleColor,'font-size': this.props.fontSize + 'px','font-family' : this.props.fontFamily }} className={`customerTitle titleSamlle`}>
3136
+ <div className='titleName' style={{ background: this.props.titleBackground,color: this.props.titleColor,'font-size': this.props.fontSize + 'px','font-family' : this.props.fontFamily}}>
3137
+ {this.state.videoTwelveName}
3138
+ </div>
3139
+ </div>
3140
+ <canvas style={{ display: (this.state.videoTwelveName&&!this.state.voiceVideoTwelve) ? '' : 'none', }} className="canvasClassOne" id="subscribe_volumeView12" width="40" height="70"></canvas>
3141
+ </div>
3142
+
2448
3143
  </div>
2449
3144
  </div>
2450
3145
  <img id="icon_huatong" style={{display:'none'}} src={require("../../assets/img/icon_huatong.png").default}></img>
@@ -2542,7 +3237,7 @@ Video.defaultProps = {
2542
3237
  voiceColor: '#0AE544',
2543
3238
  titleBackground: 'rgba(0,0,0,0.65)',
2544
3239
  titleColor: '#fff',
2545
- microphoneSize: '50',
3240
+ microphoneSize: '40',
2546
3241
  fontSize: '14',
2547
3242
  fontFamily: 'auto',
2548
3243
  menus: ['SHARE', 'FRIES', 'OCR', 'INVITE', 'PIP'],