hongshaorou/rustdesk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove alias and disable status in peer card sort

Browse Source
This commit is contained in:
rustdesk 2023-03-10 15:25:19 +08:00
parent 0fade39527
commit a6deacb92b
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
flutter/lib/common/widgets/peers_view.dart
View File

@ -19,16 +19,14 @@ typedef PeerCardBuilder = Widget Function(Peer peer);
class PeerSortType { class PeerSortType {
static const String remoteId = 'Remote ID'; static const String remoteId = 'Remote ID';
static const String remoteHost = 'Remote Host'; static const String remoteHost = 'Remote Host';
static const String alias = 'Alias';
static const String username = 'Username'; static const String username = 'Username';
static const String status = 'Status'; // static const String status = 'Status';
static List<String> values = [ static List<String> values = [
PeerSortType.remoteId, PeerSortType.remoteId,
PeerSortType.remoteHost, PeerSortType.remoteHost,
PeerSortType.alias,
PeerSortType.username, PeerSortType.username,
PeerSortType.status // PeerSortType.status
]; ];
} }
@ -226,23 +224,19 @@ class _PeersViewState extends State<_PeersView> with WindowListener {
if (widget.peers.loadEvent != 'load_recent_peers') { if (widget.peers.loadEvent != 'load_recent_peers') {
switch (sortedBy) { switch (sortedBy) {
case PeerSortType.remoteId: case PeerSortType.remoteId:
peers.sort((p1, p2) => p1.id.compareTo(p2.id)); peers.sort((p1, p2) => p1.getId().compareTo(p2.getId()));
break; break;
case PeerSortType.remoteHost: case PeerSortType.remoteHost:
peers.sort((p1, p2) => peers.sort((p1, p2) =>
p1.hostname.toLowerCase().compareTo(p2.hostname.toLowerCase())); p1.hostname.toLowerCase().compareTo(p2.hostname.toLowerCase()));
break; break;
case PeerSortType.alias:
peers.sort((p1, p2) =>
p1.alias.toLowerCase().compareTo(p2.alias.toLowerCase()));
break;
case PeerSortType.username: case PeerSortType.username:
peers.sort((p1, p2) => peers.sort((p1, p2) =>
p1.username.toLowerCase().compareTo(p2.username.toLowerCase())); p1.username.toLowerCase().compareTo(p2.username.toLowerCase()));
break; break;
case PeerSortType.status: // case PeerSortType.status:
peers.sort((p1, p2) => p1.online ? -1 : 1); // peers.sort((p1, p2) => p1.online ? -1 : 1);
break; // break;
} }
} }

7
flutter/lib/models/peer_model.dart
View File

@ -14,6 +14,13 @@ class Peer {
String rdpUsername; String rdpUsername;
bool online = false; bool online = false;
String getId() {
if (alias != '') {
return alias;
}
return id;
}
Peer.fromJson(Map<String, dynamic> json) Peer.fromJson(Map<String, dynamic> json)
: id = json['id'] ?? '', : id = json['id'] ?? '',
username = json['username'] ?? '', username = json['username'] ?? '',