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

fix group visit

Browse Source 
Signed-off-by: 21pages <pages21@163.com>
This commit is contained in:
21pages 2023-06-17 20:48:58 +08:00
parent 5a14945666
commit 8b7a145c61
6 changed files with 99 additions and 47 deletions
Show Stats 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(
() {

2
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 {
Future.delayed(Duration.zero, () {
model.setCurrentTab(model.visibleOrderedTabs[0]);
});
child = entries[0].widget;
}
}

85
flutter/lib/models/group_model.dart
View File

@ -1,6 +1,5 @@
import 'package:flutter/widgets.dart';
import 'package:flutter_hbb/common.dart';
import 'package:flutter_hbb/common/widgets/peer_tab_page.dart';
import 'package:flutter_hbb/common/hbbs/hbbs.dart';
import 'package:flutter_hbb/models/model.dart';
import 'package:flutter_hbb/models/peer_model.dart';
@ -10,10 +9,12 @@ import 'dart:convert';
import 'package:http/http.dart' as http;
class GroupModel {
final RxBool userLoading = false.obs;
final RxString userLoadError = "".obs;
final RxBool groupLoading = false.obs;
final RxString groupLoadError = "".obs;
final RxBool peerLoading = false.obs; //to-do: not used
final RxString peerLoadError = "".obs;
final RxString groupName = ''.obs;
final RxString groupId = ''.obs;
final RxList<UserPayload> users = RxList.empty(growable: true);
final RxList<PeerPayload> peerPayloads = RxList.empty(growable: true);
final RxList<Peer> peersShow = RxList.empty(growable: true);
@ -22,10 +23,12 @@ class GroupModel {
GroupModel(this.parent);
Future<void> reset() async {
userLoading.value = false;
userLoadError.value = "";
groupLoading.value = false;
groupLoadError.value = "";
peerLoading.value = false;
peerLoadError.value = "";
groupName.value = '';
groupId.value = '';
users.clear();
peerPayloads.clear();
peersShow.clear();
@ -33,13 +36,26 @@ class GroupModel {
Future<void> pull() async {
await reset();
if (bind.mainGetLocalOption(key: 'access_token') == '') {
return;
}
try {
if (!await _getGroup()) {
reset();
return;
}
} catch (e) {
debugPrintStack(label: '$e');
reset();
return;
}
if (gFFI.userModel.userName.isEmpty ||
(gFFI.userModel.isAdmin.isFalse && gFFI.userModel.groupName.isEmpty)) {
(gFFI.userModel.isAdmin.isFalse && groupName.isEmpty)) {
gFFI.peerTabModel.check_dynamic_tabs();
return;
}
userLoading.value = true;
userLoadError.value = "";
groupLoading.value = true;
groupLoadError.value = "";
final api = "${await bind.mainGetApiServer()}/api/users";
try {
var uri0 = Uri.parse(api);
@ -56,8 +72,7 @@ class GroupModel {
queryParameters: {
'current': current.toString(),
'pageSize': pageSize.toString(),
if (gFFI.userModel.isAdmin.isFalse)
'grp': gFFI.userModel.groupName.value,
if (gFFI.userModel.isAdmin.isFalse) 'grp': groupId.value,
});
final resp = await http.get(uri, headers: getHttpHeaders());
if (resp.body.isNotEmpty && resp.body.toLowerCase() != "null") {
@ -65,12 +80,17 @@ class GroupModel {
if (json.containsKey('error')) {
throw json['error'];
} else {
if (json.containsKey('total')) {
if (total == 0) total = json['total'];
if (json.containsKey('data')) {
final data = json['data'];
if (data is List) {
for (final user in data) {
users.add(UserPayload.fromJson(user));
final u = UserPayload.fromJson(user);
if (!users.any((e) => e.name == u.name)) {
users.add(u);
}
}
}
}
}
@ -78,15 +98,43 @@ class GroupModel {
}
} while (current * pageSize < total);
} catch (err) {
debugPrint('$err');
userLoadError.value = err.toString();
debugPrintStack(label: '$err');
groupLoadError.value = err.toString();
} finally {
userLoading.value = false;
groupLoading.value = false;
gFFI.peerTabModel.check_dynamic_tabs();
}
}
Future<void> pullUserPeers(String username) async {
Future<bool> _getGroup() async {
final url = await bind.mainGetApiServer();
final body = {
'id': await bind.mainGetMyId(),
'uuid': await bind.mainGetUuid()
};
try {
final response = await http.post(Uri.parse('$url/api/currentGroup'),
headers: getHttpHeaders(), body: json.encode(body));
final status = response.statusCode;
if (status == 401 || status == 400) {
return false;
}
final data = json.decode(response.body);
final error = data['error'];
if (error != null) {
throw error;
}
groupName.value = data['name'] ?? '';
groupId.value = data['id'] ?? '';
return groupId.value.isNotEmpty && groupName.isNotEmpty;
} catch (e) {
debugPrintStack(label: '$e');
} finally {}
return false;
}
Future<void> pullUserPeers(UserPayload user) async {
peerPayloads.clear();
peersShow.clear();
peerLoading.value = true;
@ -107,8 +155,7 @@ class GroupModel {
queryParameters: {
'current': current.toString(),
'pageSize': pageSize.toString(),
'grp': gFFI.userModel.groupName.value,
'target_user': username
'target_user': user.id,
});
final resp = await http.get(uri, headers: getHttpHeaders());
if (resp.body.isNotEmpty && resp.body.toLowerCase() != "null") {
@ -116,6 +163,7 @@ class GroupModel {
if (json.containsKey('error')) {
throw json['error'];
} else {
if (json.containsKey('total')) {
if (total == 0) total = json['total'];
if (json.containsKey('data')) {
final data = json['data'];
@ -129,9 +177,10 @@ class GroupModel {
}
}
}
}
} while (current * pageSize < total);
} catch (err) {
debugPrint('$err');
debugPrintStack(label: '$err');
peerLoadError.value = err.toString();
} finally {
peerLoading.value = false;

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

@ -88,8 +88,9 @@ class PeerTabModel with ChangeNotifier {
groupTabIndex) {
_currentTab = groupTabIndex;
}
if (gFFI.userModel.isAdmin.isFalse && gFFI.userModel.groupName.isNotEmpty) {
tabNames[groupTabIndex] = gFFI.userModel.groupName.value;
if (gFFI.userModel.isAdmin.isFalse &&
gFFI.groupModel.groupName.isNotEmpty) {
tabNames[groupTabIndex] = gFFI.groupModel.groupName.value;
} else {
tabNames[groupTabIndex] = defaultGroupTabname;
}
@ -221,7 +222,7 @@ class PeerTabModel with ChangeNotifier {
// return true if hide group card
bool _filterGroupCard() {
if (gFFI.groupModel.users.isEmpty ||
(gFFI.userModel.isAdmin.isFalse && gFFI.userModel.groupName.isEmpty)) {
(gFFI.userModel.isAdmin.isFalse && gFFI.groupModel.groupName.isEmpty)) {
return true;
} else {
return false;

4
flutter/lib/models/user_model.dart
View File

@ -1,6 +1,7 @@
import 'dart:async';
import 'dart:convert';
import 'package:flutter/material.dart';
import 'package:flutter_hbb/common/hbbs/hbbs.dart';
import 'package:flutter_hbb/common/widgets/peer_tab_page.dart';
import 'package:get/get.dart';
@ -12,7 +13,6 @@ import 'platform_model.dart';
class UserModel {
final RxString userName = ''.obs;
final RxString groupName = ''.obs;
final RxBool isAdmin = false.obs;
WeakReference<FFI> parent;
@ -61,13 +61,11 @@ class UserModel {
await gFFI.abModel.reset();
await gFFI.groupModel.reset();
userName.value = '';
groupName.value = '';
gFFI.peerTabModel.check_dynamic_tabs();
}
Future<void> _parseAndUpdateUser(UserPayload user) async {
userName.value = user.name;
groupName.value = user.grp;
isAdmin.value = user.isAdmin;
}