lee/rustdesk
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk.git synced 2025-12-13 11:35:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4680 from 21pages/visit

Browse Source 
fix group visit
This commit is contained in:
RustDesk
2023-06-17 23:45:57 +08:00
committed by GitHub
parent 9d541cd390 8b7a145c61
commit a5ffb5f512
6 changed files with 101 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
flutter/lib/common/hbbs/hbbs.dart
View File

@@ -15,19 +15,19 @@ class HttpType {
}
class UserPayload {
String id = '';
String name = '';
String email = '';
String note = '';
int? status;
String grp = '';
bool isAdmin = false;
UserPayload.fromJson(Map<String, dynamic> json)
: name = json['name'] ?? '',
: id = json['id'] ?? '',
name = json['name'] ?? '',
email = json['email'] ?? '',
note = json['note'] ?? '',
status = json['status'],
grp = json['grp'] ?? '',
isAdmin = json['is_admin'] == true;
}

14
flutter/lib/common/widgets/my_group.dart
View File

@@ -1,4 +1,5 @@
import 'package:flutter/material.dart';
import 'package:flutter_hbb/common/hbbs/hbbs.dart';
import 'package:flutter_hbb/common/widgets/peers_view.dart';
import 'package:get/get.dart';
@@ -37,13 +38,13 @@ class _MyGroupState extends State<MyGroup> {
Future<Widget> buildBody(BuildContext context) async {
return Obx(() {
if (gFFI.groupModel.userLoading.value) {
if (gFFI.groupModel.groupLoading.value) {
return const Center(
child: CircularProgressIndicator(),
);
}
if (gFFI.groupModel.userLoadError.isNotEmpty) {
return _buildShowError(gFFI.groupModel.userLoadError.value);
if (gFFI.groupModel.groupLoadError.isNotEmpty) {
return _buildShowError(gFFI.groupModel.groupLoadError.value);
}
if (isDesktop) {
return _buildDesktop();
@@ -187,16 +188,17 @@ class _MyGroupState extends State<MyGroup> {
}
return true;
})
.map((e) => _buildUserItem(e.name))
.map((e) => _buildUserItem(e))
.toList());
});
}
Widget _buildUserItem(String username) {
Widget _buildUserItem(UserPayload user) {
final username = user.name;
return InkWell(onTap: () {
if (selectedUser.value != username) {
selectedUser.value = username;
gFFI.groupModel.pullUserPeers(username);
gFFI.groupModel.pullUserPeers(user);
}
}, child: Obx(
() {

4
flutter/lib/common/widgets/peer_tab_page.dart
View File

@@ -231,7 +231,9 @@ class _PeerTabPageState extends State<PeerTabPage>
if (model.visibleOrderedTabs.contains(model.currentTab)) {
child = entries[model.currentTab].widget;
} else {
model.setCurrentTab(model.visibleOrderedTabs[0]);
Future.delayed(Duration.zero, () {
model.setCurrentTab(model.visibleOrderedTabs[0]);
});
child = entries[0].widget;
}
}