Hydrogen/Solian
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

🐛 Bug fixes of sort participants

Browse Source
This commit is contained in:
LittleSheep 2024-04-28 19:36:06 +08:00
parent 0483e99a4c
commit db45764d42
2 changed files with 33 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/models/call.dart
View File

@ -64,5 +64,5 @@ class ParticipantTrack {
required this.isScreenShare}); required this.isScreenShare});
VideoTrack? videoTrack; VideoTrack? videoTrack;
Participant participant; Participant participant;
final bool isScreenShare; bool isScreenShare;
} }

60
lib/screens/chat/call.dart
View File

@ -8,6 +8,7 @@ import 'package:solian/models/call.dart';
import 'package:solian/providers/auth.dart'; import 'package:solian/providers/auth.dart';
import 'package:solian/router.dart'; import 'package:solian/router.dart';
import 'package:solian/utils/service_url.dart'; import 'package:solian/utils/service_url.dart';
import 'package:solian/widgets/chat/call/controls.dart';
import 'package:solian/widgets/chat/call/exts.dart'; import 'package:solian/widgets/chat/call/exts.dart';
import 'package:solian/widgets/chat/call/participant.dart'; import 'package:solian/widgets/chat/call/participant.dart';
import 'package:solian/widgets/indent_wrapper.dart'; import 'package:solian/widgets/indent_wrapper.dart';
@ -16,8 +17,6 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:wakelock_plus/wakelock_plus.dart'; import 'package:wakelock_plus/wakelock_plus.dart';
import 'dart:math' as math; import 'dart:math' as math;
import '../../widgets/chat/call/controls.dart';
class ChatCall extends StatefulWidget { class ChatCall extends StatefulWidget {
final Call call; final Call call;
@ -52,7 +51,6 @@ class _ChatCallState extends State<ChatCall> {
List<ParticipantTrack> _participantTracks = []; List<ParticipantTrack> _participantTracks = [];
Future<void> checkPermissions() async { Future<void> checkPermissions() async {
if (lkPlatformIs(PlatformType.macOS) || lkPlatformIs(PlatformType.linux)) return;
await Permission.camera.request(); await Permission.camera.request();
await Permission.microphone.request(); await Permission.microphone.request();
await Permission.bluetooth.request(); await Permission.bluetooth.request();
@ -201,32 +199,30 @@ class _ChatCallState extends State<ChatCall> {
} }
void sortParticipants() { void sortParticipants() {
List<ParticipantTrack> userMediaTracks = [];
List<ParticipantTrack> screenTracks = []; List<ParticipantTrack> screenTracks = [];
Map<String, ParticipantTrack> userMediaTracks = {};
for (var participant in _callRoom.remoteParticipants.values) { for (var participant in _callRoom.remoteParticipants.values) {
for (var t in participant.trackPublications.values) { userMediaTracks[participant.sid] = ParticipantTrack(
participant: participant,
videoTrack: null,
isScreenShare: false,
);
for (var t in participant.videoTrackPublications) {
if (t.isScreenShare) { if (t.isScreenShare) {
screenTracks.add(ParticipantTrack( screenTracks.add(ParticipantTrack(
participant: participant, participant: participant,
videoTrack: t.track as VideoTrack, videoTrack: t.track as VideoTrack,
isScreenShare: true, isScreenShare: true,
)); ));
} else if (t.track is VideoTrack) {
userMediaTracks.add(ParticipantTrack(
participant: participant,
videoTrack: t.track as VideoTrack,
isScreenShare: false,
));
} else { } else {
userMediaTracks.add(ParticipantTrack( userMediaTracks[participant.sid]?.videoTrack = t.track;
participant: participant,
videoTrack: null,
isScreenShare: false,
));
} }
} }
} }
userMediaTracks.sort((a, b) {
final userMediaTrackList = userMediaTracks.values.toList();
userMediaTrackList.sort((a, b) {
// Loudest people first // Loudest people first
if (a.participant.isSpeaking && b.participant.isSpeaking) { if (a.participant.isSpeaking && b.participant.isSpeaking) {
if (a.participant.audioLevel > b.participant.audioLevel) { if (a.participant.audioLevel > b.participant.audioLevel) {
@ -253,7 +249,13 @@ class _ChatCallState extends State<ChatCall> {
return a.participant.joinedAt.millisecondsSinceEpoch - b.participant.joinedAt.millisecondsSinceEpoch; return a.participant.joinedAt.millisecondsSinceEpoch - b.participant.joinedAt.millisecondsSinceEpoch;
}); });
final localParticipantTracks = _callRoom.localParticipant?.trackPublications.values; ParticipantTrack localTrack = ParticipantTrack(
participant: _callRoom.localParticipant!,
videoTrack: null,
isScreenShare: false,
);
if (_callRoom.localParticipant != null) {
final localParticipantTracks = _callRoom.localParticipant?.videoTrackPublications;
if (localParticipantTracks != null) { if (localParticipantTracks != null) {
for (var t in localParticipantTracks) { for (var t in localParticipantTracks) {
if (t.isScreenShare) { if (t.isScreenShare) {
@ -262,31 +264,15 @@ class _ChatCallState extends State<ChatCall> {
videoTrack: t.track as VideoTrack, videoTrack: t.track as VideoTrack,
isScreenShare: true, isScreenShare: true,
)); ));
} else if (t.track is VideoTrack) {
userMediaTracks.add(ParticipantTrack(
participant: _callRoom.localParticipant!,
videoTrack: t.track as VideoTrack,
isScreenShare: false,
));
} else { } else {
userMediaTracks.add(ParticipantTrack( localTrack.videoTrack = t.track;
participant: _callRoom.localParticipant!, }
videoTrack: null,
isScreenShare: false,
));
} }
} }
} }
var checklistIdx = List<String>.empty(growable: true);
userMediaTracks = userMediaTracks.where((element) {
if(checklistIdx.contains(element.participant.sid)) return false;
checklistIdx.add(element.participant.sid);
return true;
}).toList();
setState(() { setState(() {
_participantTracks = [...screenTracks, ...userMediaTracks]; _participantTracks = [...screenTracks, localTrack, ...userMediaTrackList];
}); });
} }