From a0731331a8ebf7a91c9e4b2d4d8745603ecf0cb8 Mon Sep 17 00:00:00 2001
From: DLmaster <DLmaster_361@163.com>
Date: Tue, 4 Feb 2025 15:17:15 +0800
Subject: [PATCH] =?UTF-8?q?fix(gui):=20=E4=BF=AE=E5=A4=8D=E9=AB=98?=
 =?UTF-8?q?=E7=BA=A7MAA=E9=85=8D=E7=BD=AE=E5=BA=8F=E5=8F=B7=E9=94=99?=
 =?UTF-8?q?=E4=BD=8D=EF=BC=9B=E4=BF=AE=E5=A4=8D=E9=AB=98=E7=BA=A7=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E6=97=A0=E6=B3=95=E9=85=8D=E7=BD=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/MAA.py        | 16 +++++++++-------
 app/ui/member_manager.py | 12 ++++++++++++
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/app/models/MAA.py b/app/models/MAA.py
index 24b1b94..27b8fcb 100644
--- a/app/models/MAA.py
+++ b/app/models/MAA.py
@@ -113,13 +113,15 @@ class MaaManager(QObject):
             return None
 
         # 整理用户数据，筛选需代理的用户
-        self.data = sorted(self.data, key=lambda x: (-len(x[15]), x[16]))
-        user_list: List[List[str, str, int]] = [
-            [_[0], "等待", index]
-            for index, _ in enumerate(self.data)
-            if (_[3] != 0 and _[4] == "y")
-        ]
-        self.create_user_list.emit(user_list)
+        if "设置MAA" not in self.mode:
+
+            self.data = sorted(self.data, key=lambda x: (-len(x[15]), x[16]))
+            user_list: List[List[str, str, int]] = [
+                [_[0], "等待", index]
+                for index, _ in enumerate(self.data)
+                if (_[3] != 0 and _[4] == "y")
+            ]
+            self.create_user_list.emit(user_list)
 
         # 自动代理模式
         if self.mode == "自动代理":
diff --git a/app/ui/member_manager.py b/app/ui/member_manager.py
index 5a45589..ed60c90 100644
--- a/app/ui/member_manager.py
+++ b/app/ui/member_manager.py
@@ -683,6 +683,7 @@ class MaaSettingBox(QWidget):
 
             Config.cur.execute("SELECT * FROM adminx WHERE True")
             data = Config.cur.fetchall()
+            data = sorted(data, key=lambda x: (-len(x[15]), x[16]))
 
             if self.user_list.pivot.currentRouteKey() == f"{self.name}_简洁用户列表":
 
@@ -876,6 +877,9 @@ class MaaSettingBox(QWidget):
                 self.user_list_simple.itemChanged.connect(
                     lambda item: self.change_user_Item(item, "simple")
                 )
+                self.user_list_beta.itemChanged.connect(
+                    lambda item: self.change_user_Item(item, "beta")
+                )
 
                 self.stackedWidget.addWidget(self.user_list_simple)
                 self.pivot.addItem(
@@ -1353,6 +1357,10 @@ class MaaSettingBox(QWidget):
                     return None
 
                 if row == 0:
+                    logger.warning("向上移动用户时已到达最上端")
+                    MainInfoBar.push_info_bar(
+                        "warning", "已经是第一个用户", "无法向上移动", 5000
+                    )
                     return None
 
                 Config.cur.execute(
@@ -1450,6 +1458,10 @@ class MaaSettingBox(QWidget):
                     return None
 
                 if row == current_numb - 1:
+                    logger.warning("向下移动用户时已到达最下端")
+                    MainInfoBar.push_info_bar(
+                        "warning", "已经是最后一个用户", "无法向下移动", 5000
+                    )
                     return None
 
                 Config.cur.execute(