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

peer tab use icon

Browse Source 
Signed-off-by: 21pages <pages21@163.com>
This commit is contained in:
21pages
2023-06-21 16:04:52 +08:00
parent e6bade2c5f
commit c02a502a7f
10 changed files with 101 additions and 446 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,23 +11,17 @@ import 'package:http/http.dart' as http;
class GroupModel {
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;
RxString groupName = ''.obs;
final RxList<UserPayload> users = RxList.empty(growable: true);
final List<Peer> peersShow = List.empty(growable: true);
final RxList<Peer> peersShow = RxList.empty(growable: true);
final RxString selectedUser = ''.obs;
final RxString searchUserText = ''.obs;
WeakReference<FFI> parent;
GroupModel(this.parent);
Future<void> reset() async {
groupLoading.value = false;
groupLoadError.value = "";
peerLoading.value = false;
peerLoadError.value = "";
reset() {
groupName.value = '';
groupId.value = '';
users.clear();
@@ -35,7 +29,14 @@ class GroupModel {
}
Future<void> pull() async {
await reset();
groupLoading.value = true;
groupLoadError.value = "";
await _pull();
groupLoading.value = false;
}
Future<void> _pull() async {
reset();
if (bind.mainGetLocalOption(key: 'access_token') == '') {
return;
}
@@ -49,13 +50,6 @@ class GroupModel {
reset();
return;
}
if (gFFI.userModel.userName.isEmpty ||
(gFFI.userModel.isAdmin.isFalse && groupName.isEmpty)) {
gFFI.peerTabModel.check_dynamic_tabs();
return;
}
groupLoading.value = true;
groupLoadError.value = "";
final api = "${await bind.mainGetApiServer()}/api/users";
try {
var uri0 = Uri.parse(api);
@@ -101,8 +95,6 @@ class GroupModel {
debugPrint('$err');
groupLoadError.value = err.toString();
} finally {
groupLoading.value = false;
gFFI.peerTabModel.check_dynamic_tabs();
_pullUserPeers();
}
}
@@ -130,6 +122,7 @@ class GroupModel {
return groupId.value.isNotEmpty && groupName.isNotEmpty;
} catch (e) {
debugPrint('$e');
groupLoadError.value = e.toString();
} finally {}
return false;
@@ -137,9 +130,6 @@ class GroupModel {
Future<void> _pullUserPeers() async {
peersShow.clear();
peerLoading.value = true;
peerLoadError.value = "";
List<PeerPayload> peerPayloads = List.empty(growable: true);
final api = "${await bind.mainGetApiServer()}/api/peers";
try {
var uri0 = Uri.parse(api);
@@ -173,9 +163,11 @@ class GroupModel {
final data = json['data'];
if (data is List) {
for (final p in data) {
final peer = PeerPayload.fromJson(p);
peerPayloads.add(peer);
peersShow.add(PeerPayload.toPeer(peer));
final peerPayload = PeerPayload.fromJson(p);
final peer = PeerPayload.toPeer(peerPayload);
if (!peersShow.any((e) => e.id == peer.id)) {
peersShow.add(peer);
}
}
}
}
@@ -185,9 +177,7 @@ class GroupModel {
} while (current * pageSize < total);
} catch (err) {
debugPrint('$err');
peerLoadError.value = err.toString();
} finally {
peerLoading.value = false;
}
groupLoadError.value = err.toString();
} finally {}
}
}

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

@@ -1,9 +1,5 @@
import 'dart:convert';
import 'package:flutter/material.dart';
import 'package:flutter_hbb/models/platform_model.dart';
import 'package:get/get.dart';
import 'package:scroll_pos/scroll_pos.dart';
import '../common.dart';
import 'model.dart';
@@ -15,20 +11,6 @@ class PeerTabModel with ChangeNotifier {
WeakReference<FFI> parent;
int get currentTab => _currentTab;
int _currentTab = 0; // index in tabNames
List<int> get visibleOrderedTabs => _visibleOrderedTabs;
List<int> _visibleOrderedTabs = List.empty(growable: true);
List<int> get tabOrder => _tabOrder;
List<int> _tabOrder = List.from([0, 1, 2, 3, 4]); // constant length
int get tabHiddenFlag => _tabHiddenFlag;
int _tabHiddenFlag = 0;
bool get showScrollBtn => _showScrollBtn;
bool _showScrollBtn = false;
final List<bool> _fullyVisible = List.filled(5, false);
bool get leftFullyVisible => _leftFullyVisible;
bool _leftFullyVisible = false;
bool get rightFullyVisible => _rightFullyVisible;
bool _rightFullyVisible = false;
ScrollPosController sc = ScrollPosController();
List<String> tabNames = [
'Recent Sessions',
'Favorites',
@@ -36,66 +18,22 @@ class PeerTabModel with ChangeNotifier {
'Address Book',
defaultGroupTabname,
];
final List<IconData> icons = [
Icons.access_time,
Icons.star,
Icons.explore,
IconFont.addressBook,
Icons.group,
];
List<int> get indexs => List.generate(tabNames.length, (index) => index);
PeerTabModel(this.parent) {
// init tabHiddenFlag
_tabHiddenFlag = int.tryParse(
bind.getLocalFlutterConfig(k: 'hidden-peer-card'),
radix: 2) ??
0;
var tabs = _notHiddenTabs();
// remove dynamic tabs
tabs.remove(groupTabIndex);
// init tabOrder
try {
final conf = bind.getLocalFlutterConfig(k: 'peer-tab-order');
if (conf.isNotEmpty) {
final json = jsonDecode(conf);
if (json is List) {
final List<int> list =
json.map((e) => int.tryParse(e.toString()) ?? -1).toList();
if (list.length == _tabOrder.length &&
_tabOrder.every((e) => list.contains(e))) {
_tabOrder = list;
}
}
}
} catch (e) {
debugPrintStack(label: '$e');
}
// init visibleOrderedTabs
var tempList = _tabOrder.toList();
tempList.removeWhere((e) => !tabs.contains(e));
_visibleOrderedTabs = tempList;
// init currentTab
_currentTab =
int.tryParse(bind.getLocalFlutterConfig(k: 'peer-tab-index')) ?? 0;
if (!tabs.contains(_currentTab)) {
if (tabs.isNotEmpty) {
_currentTab = tabs[0];
} else {
_currentTab = 0;
}
if (_currentTab < 0 || _currentTab >= tabNames.length) {
_currentTab = 0;
}
sc.itemCount = _visibleOrderedTabs.length;
}
check_dynamic_tabs() {
var visible = visibleTabs();
_visibleOrderedTabs = _tabOrder.where((e) => visible.contains(e)).toList();
if (_visibleOrderedTabs.contains(groupTabIndex) &&
int.tryParse(bind.getLocalFlutterConfig(k: 'peer-tab-index')) ==
groupTabIndex) {
_currentTab = groupTabIndex;
}
if (gFFI.userModel.isAdmin.isFalse &&
gFFI.groupModel.groupName.isNotEmpty) {
tabNames[groupTabIndex] = gFFI.groupModel.groupName.value;
} else {
tabNames[groupTabIndex] = defaultGroupTabname;
}
sc.itemCount = _visibleOrderedTabs.length;
notifyListeners();
}
setCurrentTab(int index) {
@@ -105,172 +43,27 @@ class PeerTabModel with ChangeNotifier {
}
}
setTabFullyVisible(int index, bool visible) {
if (index >= 0 && index < _fullyVisible.length) {
if (visible != _fullyVisible[index]) {
_fullyVisible[index] = visible;
bool changed = false;
bool show = _visibleOrderedTabs.any((e) => !_fullyVisible[e]);
if (show != _showScrollBtn) {
_showScrollBtn = show;
changed = true;
}
if (_visibleOrderedTabs.isNotEmpty && _visibleOrderedTabs[0] == index) {
if (_leftFullyVisible != visible) {
_leftFullyVisible = visible;
changed = true;
}
}
if (_visibleOrderedTabs.isNotEmpty &&
_visibleOrderedTabs.last == index) {
if (_rightFullyVisible != visible) {
_rightFullyVisible = visible;
changed = true;
}
}
if (changed) {
notifyListeners();
}
}
}
}
onReorder(oldIndex, newIndex) {
if (oldIndex < newIndex) {
newIndex -= 1;
}
var list = _visibleOrderedTabs.toList();
final int item = list.removeAt(oldIndex);
list.insert(newIndex, item);
_visibleOrderedTabs = list;
var tmpTabOrder = _visibleOrderedTabs.toList();
var left = _tabOrder.where((e) => !tmpTabOrder.contains(e)).toList();
for (var t in left) {
_addTabInOrder(tmpTabOrder, t);
}
_tabOrder = tmpTabOrder;
bind.setLocalFlutterConfig(k: 'peer-tab-order', v: jsonEncode(tmpTabOrder));
notifyListeners();
}
onHideShow(int index, bool show) async {
int bitMask = 1 << index;
if (show) {
_tabHiddenFlag &= ~bitMask;
} else {
_tabHiddenFlag |= bitMask;
}
await bind.setLocalFlutterConfig(
k: 'hidden-peer-card', v: _tabHiddenFlag.toRadixString(2));
var visible = visibleTabs();
_visibleOrderedTabs = _tabOrder.where((e) => visible.contains(e)).toList();
if (_visibleOrderedTabs.isNotEmpty &&
!_visibleOrderedTabs.contains(_currentTab)) {
_currentTab = _visibleOrderedTabs[0];
}
notifyListeners();
}
List<int> orderedNotFilteredTabs() {
var list = tabOrder.toList();
if (_filterGroupCard()) {
list.remove(groupTabIndex);
}
return list;
}
// return index array of tabNames
List<int> visibleTabs() {
var v = List<int>.empty(growable: true);
for (int i = 0; i < tabNames.length; i++) {
if (!_isTabHidden(i) && !_isTabFilter(i)) {
v.add(i);
}
}
return v;
}
String translatedTabname(int index) {
String tabTooltip(int index, String groupName) {
if (index >= 0 && index < tabNames.length) {
final name = tabNames[index];
if (index == groupTabIndex) {
if (name == defaultGroupTabname) {
return translate(name);
if (gFFI.userModel.isAdmin.value || groupName.isEmpty) {
return translate(defaultGroupTabname);
} else {
return name;
return '${translate('Group')}: $groupName';
}
} else {
return translate(name);
return translate(tabNames[index]);
}
}
assert(false);
return index.toString();
}
bool _isTabHidden(int tabindex) {
return _tabHiddenFlag & (1 << tabindex) != 0;
}
bool _isTabFilter(int tabIndex) {
if (tabIndex == groupTabIndex) {
return _filterGroupCard();
}
return false;
}
// return true if hide group card
bool _filterGroupCard() {
if (gFFI.groupModel.users.isEmpty ||
(gFFI.userModel.isAdmin.isFalse && gFFI.groupModel.groupName.isEmpty)) {
return true;
} else {
return false;
}
}
List<int> _notHiddenTabs() {
var v = List<int>.empty(growable: true);
for (int i = 0; i < tabNames.length; i++) {
if (!_isTabHidden(i)) {
v.add(i);
}
}
return v;
}
// add tabIndex to list
_addTabInOrder(List<int> list, int tabIndex) {
if (!_tabOrder.contains(tabIndex) || list.contains(tabIndex)) {
return;
}
bool sameOrder = true;
int lastIndex = -1;
for (int i = 0; i < list.length; i++) {
var index = _tabOrder.lastIndexOf(list[i]);
if (index > lastIndex) {
lastIndex = index;
continue;
} else {
sameOrder = false;
break;
}
}
if (sameOrder) {
var indexInTabOrder = _tabOrder.indexOf(tabIndex);
var left = List.empty(growable: true);
for (int i = 0; i < indexInTabOrder; i++) {
left.add(_tabOrder[i]);
}
int insertIndex = list.lastIndexWhere((e) => left.contains(e));
if (insertIndex < 0) {
insertIndex = 0;
} else {
insertIndex += 1;
}
list.insert(insertIndex, tabIndex);
} else {
list.add(tabIndex);
IconData tabIcon(int index) {
if (index >= 0 && index < tabNames.length) {
return icons[index];
}
assert(false);
return Icons.help;
}
}

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

@@ -1,9 +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';
import 'package:http/http.dart' as http;
@@ -79,7 +77,6 @@ class UserModel {
await gFFI.abModel.reset();
await gFFI.groupModel.reset();
userName.value = '';
gFFI.peerTabModel.check_dynamic_tabs();
}
_parseAndUpdateUser(UserPayload user) {
@@ -89,8 +86,7 @@ class UserModel {
// update ab and group status
static Future<void> updateOtherModels() async {
await gFFI.abModel.pullAb();
await gFFI.groupModel.pull();
await Future.wait([gFFI.abModel.pullAb(), gFFI.groupModel.pull()]);
}
Future<void> logOut() async {