react_hsbc_teller 0.4.2 → 0.4.3

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) => {
@@ -1012,10 +1349,10 @@ class Video extends Component {
1012
1349
  if(feed.uid != this.state.tellerAccount) {
1013
1350
  if(feed.tag == 'VIDEO_SOURCE_SCREEN') {
1014
1351
  config_param = {
1015
- subscribe_video_id: 'video11',
1016
- subscribe_audio_id: 'audio11',
1017
- subscribe_streamId_id: 'subscribe_streamId11',
1018
- feedId_id: 'feedId11',
1352
+ subscribe_video_id: 'video21',
1353
+ subscribe_audio_id: 'audio21',
1354
+ subscribe_streamId_id: 'subscribe_streamId21',
1355
+ feedId_id: 'feedId21',
1019
1356
  feedId: feed.feedId
1020
1357
  }
1021
1358
 
@@ -1025,18 +1362,27 @@ class Video extends Component {
1025
1362
  name: '客户投屏'
1026
1363
  },'add'
1027
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
+ }
1028
1374
  } else {
1029
- // let data_param = {
1030
- // isVideo: true,
1031
- // videoIndex: this.state.videoList.length + 1,
1032
- // videoTwoName: ''
1033
- // }
1034
- // let videoList = []
1035
- // console.log(data_param)
1036
- // videoList.push(data_param)
1037
- // this.setState({
1038
- // videoList
1039
- // })
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
+ // },()=>{
1040
1386
  // config_param = {
1041
1387
  // subscribe_video_id: 'video' + this.state.videoList.length,
1042
1388
  // subscribe_audio_id: 'audio' + this.state.videoList.length,
@@ -1044,7 +1390,7 @@ class Video extends Component {
1044
1390
  // feedId_id: 'feedId' + this.state.videoList.length,
1045
1391
  // feedId: feed.feedId
1046
1392
  // }
1047
- if(!document.getElementById('video1').name) {
1393
+ if(!document.getElementById('video1').name) {
1048
1394
  config_param = {
1049
1395
  subscribe_video_id: 'video1',
1050
1396
  subscribe_audio_id: 'audio1',
@@ -1098,14 +1444,74 @@ class Video extends Component {
1098
1444
  feedId: feed.feedId
1099
1445
  }
1100
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
+
1101
1511
  }
1102
1512
 
1103
1513
  }
1104
- if (config_param !== undefined) {
1105
- config_param.need_volume_analyser = true
1106
- console.log(config_param)
1107
- this.test_controller.Subscribe(config_param)
1108
- }
1514
+
1109
1515
  };
1110
1516
  // 推送“有新订阅”给与会者
1111
1517
  this.test_controller.OnNewSubscribe = (subscriber, feed) => {
@@ -1140,7 +1546,7 @@ class Video extends Component {
1140
1546
  console.log('取消订阅媒体流成功', sid)
1141
1547
  this.state.tabTitles.map((item) => {
1142
1548
  if(item.value == 'customerScreen') {
1143
- if(!document.getElementById("video11").name) {
1549
+ if(!document.getElementById("video21").name) {
1144
1550
  this.tabTitlesClick('customerScreen','delect')
1145
1551
  }
1146
1552
  }
@@ -1181,12 +1587,49 @@ class Video extends Component {
1181
1587
  voiceVideoSix: false
1182
1588
  })
1183
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
1625
+ })
1626
+ }
1184
1627
  };
1185
1628
  // 推送“取消发布”给与会者
1186
1629
  this.test_controller.OnUnPublish = (feed) => {
1187
1630
  console.log('取消发布者', feed)
1188
1631
  for(let i=0;i<this.state.roomCustomerList.length;i++) {
1189
- if(this.state.roomCustomerList[i].uid == feed.uid) {
1632
+ if(this.state.roomCustomerList[i].feedId == feed.feedId) {
1190
1633
  this.state.roomCustomerList.splice(i, 1)
1191
1634
  }
1192
1635
  }
@@ -1240,7 +1683,7 @@ class Video extends Component {
1240
1683
  // 结束服务端录制成功
1241
1684
  this.test_controller.OnStopRemoteRecordSucc = (recordId) => {
1242
1685
  console.log('结束服务端录制成功', recordId);
1243
- this.endSessionValue()
1686
+ // this.endSessionValue()
1244
1687
  // 获取服务端录制结果
1245
1688
  };
1246
1689
  // 结束服务端录制失败
@@ -1400,6 +1843,13 @@ class Video extends Component {
1400
1843
  let subscribe_sid5 = document.getElementById('video5').name || document.getElementById('audio5').name;
1401
1844
  let subscribe_sid6 = document.getElementById('video6').name || document.getElementById('audio6').name;
1402
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
+
1403
1853
  let volumeView;
1404
1854
  switch (sid) {
1405
1855
  case publish_sid:
@@ -1423,6 +1873,25 @@ class Video extends Component {
1423
1873
  case subscribe_sid6:
1424
1874
  volumeView = "subscribe_volumeView6";
1425
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;
1426
1895
  }
1427
1896
  if (!volumeView) {
1428
1897
  return;
@@ -1489,11 +1958,18 @@ class Video extends Component {
1489
1958
  }
1490
1959
  };
1491
1960
  finishSession = async () => {
1492
- try {
1961
+
1962
+
1963
+ if(this.state.roomCustomerList.length == 0) {
1964
+ debugger
1965
+ try {
1493
1966
  let result = await API.finishSession({
1494
1967
  sessionId: this.state.sessionId,
1495
1968
  tellerId: this.props.tellerAccount
1496
1969
  });
1970
+ } catch (err) {
1971
+ }
1972
+ }
1497
1973
  this.setState({
1498
1974
  isCustomer: false,
1499
1975
  isWhiteboard: false,
@@ -1503,12 +1979,7 @@ class Video extends Component {
1503
1979
  code: LEAVE_TYPE.TELLER_EXIT,
1504
1980
  errMsg: '坐席退出'
1505
1981
  })
1506
- } catch (err) {
1507
- this.props.onLeaveRoom({
1508
- code: LEAVE_TYPE.TELLER_EXIT,
1509
- errMsg: '坐席退出'
1510
- })
1511
- }
1982
+
1512
1983
  }
1513
1984
  getRoomStatus = async data => {
1514
1985
  try {
@@ -1730,7 +2201,7 @@ class Video extends Component {
1730
2201
  if (this.state.isWhiteboard) {
1731
2202
  publish_config.publish_device = 4
1732
2203
  publish_config.media_type = 1
1733
- publish_config.sid = document.getElementById('video10').name
2204
+ publish_config.sid = document.getElementById('video20').name
1734
2205
  publish_config.part_of_screen_id = 'touBoxItem'
1735
2206
  publish_config.video_profile_type = 5
1736
2207
  this.test_controller.ChangeMediaStream(publish_config);
@@ -1738,7 +2209,7 @@ class Video extends Component {
1738
2209
  isPDF: true,
1739
2210
  })
1740
2211
  } else {
1741
- this.test_controller.UnPublish(document.getElementById('video10').name)
2212
+ this.test_controller.UnPublish(document.getElementById('video20').name)
1742
2213
  }
1743
2214
  this.setState({
1744
2215
  publishDevic: 1,
@@ -1751,19 +2222,19 @@ class Video extends Component {
1751
2222
  document.exitPictureInPicture()
1752
2223
  }
1753
2224
  } else {
1754
- if (document.getElementById('video10').name) {
2225
+ if (document.getElementById('video20').name) {
1755
2226
  publish_config.media_type = 1;
1756
2227
  publish_config.publish_device = 2;
1757
2228
  publish_config.video_profile_type = 5;
1758
- publish_config.sid = document.getElementById('video10').name;
2229
+ publish_config.sid = document.getElementById('video20').name;
1759
2230
  this.test_controller.ChangeMediaStream(publish_config);
1760
2231
  } else {
1761
2232
  publish_config.media_type = 1
1762
2233
  publish_config.publish_device = 2
1763
2234
  publish_config.need_volume_analyser = true
1764
2235
  publish_config.video_profile_type = 5
1765
- publish_config.publish_video_id = 'video10'
1766
- publish_config.publish_streamId_id = 'subscribe_streamId10'
2236
+ publish_config.publish_video_id = 'video20'
2237
+ publish_config.publish_streamId_id = 'subscribe_streamId20'
1767
2238
  publish_config.publish_tag = 'projectionWhiteboard'
1768
2239
  this.test_controller.Publish(publish_config)
1769
2240
  }
@@ -1960,6 +2431,18 @@ class Video extends Component {
1960
2431
  sid = document.getElementById('video5').name;
1961
2432
  } else if (item.feedId == document.getElementById("feedId6").innerText) {
1962
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;
1963
2446
  }
1964
2447
  console.log(sid)
1965
2448
  this.setState({
@@ -2017,43 +2500,88 @@ class Video extends Component {
2017
2500
  }if(document.getElementById('video6').name == sid){
2018
2501
  userId = this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId6").innerText).uid
2019
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
+ }
2020
2522
  try {
2021
2523
  let result = await API.appGetUsername({
2022
2524
  userId: userId
2023
2525
  });
2024
2526
  console.log(result)
2527
+ let data
2025
2528
  if (result.code == 200) {
2026
- let data = result.data.userInfo ? result.data.userInfo.userName ? result.data.userInfo.userName : '' : ''
2027
- if(document.getElementById('video1').name == sid){
2028
-
2029
- this.setState({
2030
- videoOneName: this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId1").innerText).tag == 'VIDEO_SOURCE_SCREEN' ? '共享屏幕' : data ? data : '客户1'
2031
- })
2032
- }
2033
- if(document.getElementById('video2').name == sid){
2034
- this.setState({
2035
- videoTwoName: this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId2").innerText).tag == 'VIDEO_SOURCE_SCREEN' ? '共享屏幕' :data? data : '客户2'
2036
- })
2037
- }if(document.getElementById('video3').name == sid){
2038
- this.setState({
2039
- videoThreeName: this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId3").innerText).tag == 'VIDEO_SOURCE_SCREEN' ? '共享屏幕' :data ? data : '客户3'
2040
- })
2041
- }if(document.getElementById('video4').name == sid){
2042
- this.setState({
2043
- videoFourName: this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId4").innerText).tag == 'VIDEO_SOURCE_SCREEN' ? '共享屏幕' :data ? data : '客户4'
2044
- })
2045
- }if(document.getElementById('video5').name == sid){
2046
- this.setState({
2047
- videoFiveName: this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId5").innerText).tag == 'VIDEO_SOURCE_SCREEN' ? '共享屏幕' :data? data : '客户5'
2048
- })
2049
- }if(document.getElementById('video6').name == sid){
2050
- this.setState({
2051
- videoSixName: this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById("feedId6").innerText).tag == 'VIDEO_SOURCE_SCREEN' ? '共享屏幕' :data ? data: '客户6'
2052
- })
2053
- }
2529
+ data = result.data.userInfo ? result.data.userInfo.userName ? result.data.userInfo.userName : '' : ''
2054
2530
  } else {
2055
2531
  message.success('查询失败')
2056
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
+ }
2057
2585
  } catch (err) {
2058
2586
 
2059
2587
  }
@@ -2109,11 +2637,11 @@ class Video extends Component {
2109
2637
  value: 'RMWhiteboard',
2110
2638
  name: 'RM白板'
2111
2639
  },'add')
2112
- if (document.getElementById('video10').name) {
2640
+ if (document.getElementById('video20').name) {
2113
2641
  // 代表已经有了进行切流
2114
2642
  publish_config.publish_device = 4
2115
2643
  publish_config.media_type = 1
2116
- publish_config.sid = document.getElementById('video10').name
2644
+ publish_config.sid = document.getElementById('video20').name
2117
2645
  publish_config.part_of_screen_id = 'touBoxItem'
2118
2646
  publish_config.video_profile_type = 5
2119
2647
  this.test_controller.ChangeMediaStream(publish_config);
@@ -2124,7 +2652,7 @@ class Video extends Component {
2124
2652
  publish_config.need_volume_analyser = true
2125
2653
  publish_config.video_profile_type = 5
2126
2654
  publish_config.part_of_screen_id = 'touBoxItem';
2127
- publish_config.publish_video_id = 'video10'
2655
+ publish_config.publish_video_id = 'video20'
2128
2656
  publish_config.publish_streamId_id = 'subscribe_streamId10'
2129
2657
  publish_config.publish_tag = 'projectionWhiteboard'
2130
2658
  this.test_controller.Publish(publish_config)
@@ -2139,20 +2667,6 @@ class Video extends Component {
2139
2667
  this.setState({
2140
2668
  isSelect: value,
2141
2669
  })
2142
- // if (this.state.isSelect == 'video') {
2143
- // if (document.getElementById('video10').name) {
2144
- // this.setState({
2145
- // isSelect: 'noVideo',
2146
- // })
2147
- // } else {
2148
- // message.success('当前无签字白板')
2149
- // }
2150
-
2151
- // } else {
2152
- // this.setState({
2153
- // isSelect: 'video',
2154
- // })
2155
- // }
2156
2670
  }
2157
2671
  facialHandleVisibleChange=(value)=>{
2158
2672
  if(!value) {
@@ -2200,25 +2714,25 @@ class Video extends Component {
2200
2714
  }
2201
2715
  </div>
2202
2716
  )
2203
- // const videoCustomer =
2204
- // this.state.videoList.map((item,index)=>{
2205
- // return <div className={`itemed`} style={{ display: (item.isVideo) ? '' : 'none', }}>
2206
- // <video
2207
- // id={'video' + item.videoIndex}
2208
- // autoPlay
2209
- // muted={true}
2210
- // className="video"
2211
- // />
2212
- // <audio id={'audio' + item.videoIndex} autoPlay />
2213
- // <label style={{ display: 'none' }} id={'feedId' + item.videoIndex} type="text" />
2214
- // <div className={`customerTitle titleSamlle`}>
2215
- // <div className='titleName' style={{ background: this.props.titleBackground,color: this.props.titleColor,'font-size': this.props.fontSize + 'px','font-family' : this.props.fontFamily}}>
2216
- // {this.state.videoTwoName}
2217
- // </div>
2218
- // </div>
2219
- // <canvas className="canvasClassOne" id={'subscribe_volumeView' + item.videoIndex} width="40" height="70"></canvas>
2220
- // </div>
2221
- // })
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
+ })
2222
2736
 
2223
2737
  return (
2224
2738
  <div className="all">
@@ -2230,13 +2744,13 @@ class Video extends Component {
2230
2744
  <div className="videoDiv" style={{ display: (this.state.isSelect == 'RMScreen') ? '' : 'none', }}>
2231
2745
  <div className="videoDiv">
2232
2746
  <video
2233
- id="video10"
2747
+ id="video20"
2234
2748
  autoPlay
2235
2749
  muted={true}
2236
2750
  className="video"
2237
2751
  />
2238
- <audio id="audio10" autoPlay />
2239
- <label style={{ display: 'none' }} id="feedId10" type="text" />
2752
+ <audio id="audio20" autoPlay />
2753
+ <label style={{ display: 'none' }} id="feedId20" type="text" />
2240
2754
  </div>
2241
2755
 
2242
2756
  </div>
@@ -2248,14 +2762,13 @@ class Video extends Component {
2248
2762
  <div className="videoDiv" style={{ display: (this.state.isSelect == 'customerScreen') ? '' : 'none', }}>
2249
2763
  <div className="videoDiv">
2250
2764
  <video
2251
- id="video11"
2765
+ id="video21"
2252
2766
  autoPlay
2253
2767
  muted={true}
2254
2768
  className="video"
2255
2769
  />
2256
- <audio id="audio11" autoPlay />
2257
- <label style={{ display: 'none' }} id="feedId11" type="text" />
2258
- {/* <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" />
2259
2772
  </div>
2260
2773
 
2261
2774
  </div>
@@ -2269,7 +2782,7 @@ class Video extends Component {
2269
2782
  <label>{meetingInfo.title}</label>
2270
2783
  </li>
2271
2784
  <li>
2272
- <span>支持人:</span>
2785
+ <span>主持人:</span>
2273
2786
  <label>{meetingInfo.host}</label>
2274
2787
  </li>
2275
2788
  <li>
@@ -2318,7 +2831,7 @@ class Video extends Component {
2318
2831
  <div style={{ display: (this.state.isCustomer) ? '' : 'none', }}>
2319
2832
  <div
2320
2833
  className={`itemed`}
2321
- style={{ position: "relative"}}
2834
+ style={{ position: "relative",display: (this.state.videoOneName) ? '' : 'none'}}
2322
2835
  >
2323
2836
  {
2324
2837
  this.state.customAudioed && <img
@@ -2327,7 +2840,7 @@ class Video extends Component {
2327
2840
  style={{ width: "100%", height: "100%",}}
2328
2841
  ></img>
2329
2842
  }
2330
- <div className="video1Div" style={{ display: (!this.state.customAudioed) ? '' : 'none', }}>
2843
+ <div className="video1Div">
2331
2844
  <video
2332
2845
  id="video1"
2333
2846
  autoPlay
@@ -2353,7 +2866,7 @@ class Video extends Component {
2353
2866
  <canvas style={{ display: (this.state.videoOneName&&!this.state.voiceVideoOne) ? '' : 'none', }} className="canvasClassOne" id="subscribe_volumeView1" width="40" height="70"></canvas>
2354
2867
  </div>
2355
2868
  </div>
2356
- <div className={`itemed`}>
2869
+ <div className={`itemed`} style={{ display: (this.state.videoTwoName) ? '' : 'none', }}>
2357
2870
  <video
2358
2871
  id="video2"
2359
2872
  autoPlay
@@ -2377,7 +2890,7 @@ class Video extends Component {
2377
2890
  <canvas style={{ display: (this.state.videoTwoName&&!this.state.voiceVideoTwo) ? '' : 'none', }} className="canvasClassOne" id="subscribe_volumeView2" width="40" height="70"></canvas>
2378
2891
  </div>
2379
2892
  <div className={`itemed`}
2380
- style={{'margin-top': '5px' }}>
2893
+ style={{display: (this.state.videoThreeName) ? '' : 'none' }}>
2381
2894
  <video
2382
2895
  id="video3"
2383
2896
  autoPlay
@@ -2398,9 +2911,9 @@ class Video extends Component {
2398
2911
  {this.state.videoThreeName}
2399
2912
  </div>
2400
2913
  </div>
2401
- <canvas style={{ display: (this.state.videoTwoName&&!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>
2402
2915
  </div>
2403
- <div className={`itemed`}>
2916
+ <div className={`itemed`} style={{ display: (this.state.videoFourName) ? '' : 'none', }}>
2404
2917
  <video
2405
2918
  id="video4"
2406
2919
  autoPlay
@@ -2424,7 +2937,7 @@ class Video extends Component {
2424
2937
  <canvas style={{ display: (this.state.videoFourName&&!this.state.voiceVideoFour) ? '' : 'none', }} className="canvasClassOne" id="subscribe_volumeView4" width="40" height="70"></canvas>
2425
2938
  </div>
2426
2939
  <div className={`itemed`}
2427
- style={{'margin-top': '5px' }}>
2940
+ style={{display: (this.state.videoFiveName) ? '' : 'none' }}>
2428
2941
  <video
2429
2942
  id="video5"
2430
2943
  autoPlay
@@ -2447,7 +2960,7 @@ class Video extends Component {
2447
2960
  </div>
2448
2961
  <canvas style={{ display: (this.state.videoFiveName&&!this.state.voiceVideoFive) ? '' : 'none', }} className="canvasClassOne" id="subscribe_volumeView5" width="40" height="70"></canvas>
2449
2962
  </div>
2450
- <div className={`itemed`}>
2963
+ <div className={`itemed`} style={{ display: (this.state.videoSixName) ? '' : 'none', }}>
2451
2964
  <video
2452
2965
  id="video6"
2453
2966
  autoPlay
@@ -2471,6 +2984,162 @@ class Video extends Component {
2471
2984
  <canvas style={{ display: (!this.state.voiceVideoSix) ? '' : 'none', }} className="canvasClassOne" id="subscribe_volumeView6" width="40" height="70"></canvas>
2472
2985
 
2473
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
+
2474
3143
  </div>
2475
3144
  </div>
2476
3145
  <img id="icon_huatong" style={{display:'none'}} src={require("../../assets/img/icon_huatong.png").default}></img>