Skip to content

Commit

Permalink
Merge pull request #39 from ant-media/addWebSupport
Browse files Browse the repository at this point in the history
Update dependencies and lint the project
  • Loading branch information
mustafaboleken authored Dec 27, 2023
2 parents 45ed4cf + 3fe851b commit 66d79dd
Show file tree
Hide file tree
Showing 25 changed files with 808 additions and 852 deletions.
5 changes: 4 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
## 1.0.6
- **ENHAN**: Update dependencies

## 1.0.5
- webrtc client lib updated added option to : force stream quality , fix IOS screen rotation and audio issues
- **FEAT**: Webrtc client lib updated added option to : force stream quality , fix IOS screen rotation and audio issues

## 1.0.4

Expand Down
166 changes: 81 additions & 85 deletions example/Conference/lib/conference.dart
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class Conference extends StatefulWidget {
String ip;
String id;
List<Map<String, String>> iceServers = [
{'url': 'stun:stun.l.google.com:19302'},
{'url': 'stun:stun.l.google.com:19302'},
];
String roomId;
bool userscreen;
Expand Down Expand Up @@ -57,90 +57,86 @@ class _ConferenceState extends State<Conference> {

void _connect() async {
AntMediaFlutter.connect(
//host
widget.ip,
//streamID
widget.id,
//roomID
widget.roomId,
AntMediaType.Conference,
widget.userscreen,

//onStateChange
(HelperState state) {
switch (state) {
case HelperState.CallStateNew:
setState(() {
_inCalling = true;
});
break;
case HelperState.CallStateBye:
setState(() {
_localRenderer.srcObject = null;
_inCalling = false;
Navigator.pop(context);
});
break;
case HelperState.ConnectionOpen:
break;
case HelperState.ConnectionClosed:
break;
case HelperState.ConnectionError:
break;
}
},

//onLocalStream
((stream) {
setState(() {
_localRenderer.srcObject = stream;
});
}),

//onAddRemoteStream
((stream) {}),

// onDataChannel
(dc) {},

(dc, message, isReceived) {
ScaffoldMessenger.of(context).showSnackBar(SnackBar(
content: Text(
(isReceived ? "Received:" : "Sent:") + " " + message.text,
style: const TextStyle(color: Colors.white),
),
backgroundColor: Colors.blue,
));
},

//onUpdateConferenceUser
(streams) {
List<Widget> widgetlist = [];
for (final stream in streams) {
SizedBox widget = SizedBox(
child: PlayWidget(
ip: this.widget.ip,
id: stream,
roomId: this.widget.roomId,
userscreen: false),
);
widgetlist.add(widget);
}

setState(() {
widgets = widgetlist;
});
},

//onRemoveRemoteStream
((stream) {
setState(() {});
}),
widget.iceServers,
(command , mapData){

}
);
//host
widget.ip,
//streamID
widget.id,
//roomID
widget.roomId,
AntMediaType.Conference,
widget.userscreen,

//onStateChange
(HelperState state) {
switch (state) {
case HelperState.CallStateNew:
setState(() {
_inCalling = true;
});
break;
case HelperState.CallStateBye:
setState(() {
_localRenderer.srcObject = null;
_inCalling = false;
Navigator.pop(context);
});
break;
case HelperState.ConnectionOpen:
break;
case HelperState.ConnectionClosed:
break;
case HelperState.ConnectionError:
break;
}
},

//onLocalStream
((stream) {
setState(() {
_localRenderer.srcObject = stream;
});
}),

//onAddRemoteStream
((stream) {}),

// onDataChannel
(dc) {},
(dc, message, isReceived) {
ScaffoldMessenger.of(context).showSnackBar(SnackBar(
content: Text(
(isReceived ? "Received:" : "Sent:") + " " + message.text,
style: const TextStyle(color: Colors.white),
),
backgroundColor: Colors.blue,
));
},

//onUpdateConferenceUser
(streams) {
List<Widget> widgetlist = [];
for (final stream in streams) {
SizedBox widget = SizedBox(
child: PlayWidget(
ip: this.widget.ip,
id: stream,
roomId: this.widget.roomId,
userscreen: false),
);
widgetlist.add(widget);
}

setState(() {
widgets = widgetlist;
});
},

//onRemoveRemoteStream
((stream) {
setState(() {});
}),
widget.iceServers,
(command, mapData) {});
}

_hangUp() {
Expand Down
18 changes: 9 additions & 9 deletions example/Conference/lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -110,15 +110,15 @@ class _MyAppState extends State<MyApp> {
_prefs.setString('streamId', _streamId);
_prefs.setString('roomId', _roomId);
if (settedIP != null) {
Navigator.push(
context,
MaterialPageRoute(
builder: (BuildContext context) => Conference(
ip: settedIP,
id: _streamId,
userscreen: false,
roomId: _roomId,
)));
Navigator.push(
context,
MaterialPageRoute(
builder: (BuildContext context) => Conference(
ip: settedIP,
id: _streamId,
userscreen: false,
roomId: _roomId,
)));
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion example/Conference/lib/route_item.dart
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ class RouteItem {
final String title;
final String subtitle;
final RouteCallback push;
}
}
149 changes: 73 additions & 76 deletions example/DataChannel/lib/datachannel.dart
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ class DataChannel extends StatefulWidget {
String ip;
String id;
List<Map<String, String>> iceServers = [
{'url': 'stun:stun.l.google.com:19302'},
{'url': 'stun:stun.l.google.com:19302'},
];
bool userscreen;

Expand Down Expand Up @@ -51,81 +51,78 @@ class _DataChannelState extends State<DataChannel> {

void _connect() async {
AntMediaFlutter.connect(
//host
widget.ip,

//streamID
widget.id,

//roomID
'',

//type
AntMediaType.DataChannelOnly,

//userScreen
false,

//onStateChange
(HelperState state) {
switch (state) {
case HelperState.CallStateNew:
setState(() {});
break;
case HelperState.CallStateBye:
setState(() {
_localRenderer.srcObject = null;
_remoteRenderer.srcObject = null;
Navigator.pop(context);
});
break;

case HelperState.ConnectionClosed:
case HelperState.ConnectionError:
case HelperState.ConnectionOpen:
break;
}
},

//onLocalStream
((stream) {
setState(() {
_remoteRenderer.srcObject = stream;
});
}),

//onAddRemoteStream
((stream) {
setState(() {
_remoteRenderer.srcObject = stream;
});
}),

// onDataChannel
(datachannel) {
print('');
},

// onDataChannelMessage
(channel, message, isRecieved) {
messages.add(DataChannelMessage(isRecieved, channel, message));
setState(() {});
},

// onupdateConferencePerson
(stream) {},

//onRemoveRemoteStream
((stream) {
setState(() {
_remoteRenderer.srcObject = null;
});
}),
widget.iceServers,
(command , mapData){

}
);
//host
widget.ip,

//streamID
widget.id,

//roomID
'',

//type
AntMediaType.DataChannelOnly,

//userScreen
false,

//onStateChange
(HelperState state) {
switch (state) {
case HelperState.CallStateNew:
setState(() {});
break;
case HelperState.CallStateBye:
setState(() {
_localRenderer.srcObject = null;
_remoteRenderer.srcObject = null;
Navigator.pop(context);
});
break;

case HelperState.ConnectionClosed:
case HelperState.ConnectionError:
case HelperState.ConnectionOpen:
break;
}
},

//onLocalStream
((stream) {
setState(() {
_remoteRenderer.srcObject = stream;
});
}),

//onAddRemoteStream
((stream) {
setState(() {
_remoteRenderer.srcObject = stream;
});
}),

// onDataChannel
(datachannel) {
print('');
},

// onDataChannelMessage
(channel, message, isRecieved) {
messages.add(DataChannelMessage(isRecieved, channel, message));
setState(() {});
},

// onupdateConferencePerson
(stream) {},

//onRemoveRemoteStream
((stream) {
setState(() {
_remoteRenderer.srcObject = null;
});
}),
widget.iceServers,
(command, mapData) {});
}

@override
Expand Down
Loading

0 comments on commit 66d79dd

Please sign in to comment.