chore(gui): fix some widget length to match the design

This commit fixes memory management issues in the
ALMainWindow class where config window and
task threads were not properly deleted after use,
leading to continuously increasing memory usage.

The fix ensures that all GUI components are
deleted after close and background threads are
correctly terminated.

AutoLib.py

@@ -17,9 +17,11 @@ from selenium.webdriver.support import expected_conditions as EC
 from selenium.webdriver.edge.service import Service
 
 from MsgBase import MsgBase
+from LibChecker import LibChecker
 from LibLogin import LibLogin
 from LibLogout import LibLogout
 from LibReserve import LibReserve
+from LibCheckin import LibCheckin
 
 from ConfigReader import ConfigReader
 
@@ -29,7 +31,7 @@ class AutoLib(MsgBase):
     def __init__(
         self,
         input_queue: queue.Queue,
-        output_queue: queue.Queue,
+        output_queue: queue.Queue
     ):
         super().__init__(input_queue, output_queue)
 
@@ -51,7 +53,8 @@ class AutoLib(MsgBase):
             edge_options.add_argument("--no-sandbox")
             edge_options.add_argument("--disable-dev-shm-usage")
 
-        edge_options.add_argument("--window-size=1280,720")
+        # must be 1920x1080, otherwise the page will cause some elements not accessible
+        edge_options.add_argument("--window-size=1920,1080")
         edge_options.add_argument("--remote-allow-origins=*")
 
         # omit ssl errors and verbose log level
@@ -95,16 +98,26 @@ class AutoLib(MsgBase):
         except Exception as e:
             self._showTrace(f"浏览器驱动初始化失败: {e}")
             return False
-        # init library operators
-        self.__lib_login = LibLogin(self._input_queue, self._output_queue, self.__driver)
-        self.__lib_logout = LibLogout(self._input_queue, self._output_queue, self.__driver)
-        self.__lib_reserve = LibReserve(self._input_queue, self._output_queue, self.__driver)
         self._showTrace(f"浏览器驱动已初始化, 类型: {self.__driver_type}, 路径: {self.__driver_path}")
         return True
 
 
+    def __initLibOperators(
+        self
+    ):
+
+        if not self.__driver:
+            self._showTrace(f"浏览器驱动未初始化, 请先初始化浏览器驱动 !")
+            return
+        self.__lib_checker = LibChecker(self._input_queue, self._output_queue, self.__driver)
+        self.__lib_login = LibLogin(self._input_queue, self._output_queue, self.__driver)
+        self.__lib_logout = LibLogout(self._input_queue, self._output_queue, self.__driver)
+        self.__lib_reserve = LibReserve(self._input_queue, self._output_queue, self.__driver)
+        self.__lib_checkin = LibCheckin(self._input_queue, self._output_queue, self.__driver)
+
+
     def __waitResponseLoad(
-        self,
+        self
     ) -> bool:
 
         # wait for page load
@@ -144,11 +157,11 @@ class AutoLib(MsgBase):
         self,
         username: str,
         password: str,
-        reserve_info: dict,
+        reserve_info: dict
     ) -> int:
 
         # result : 0 - success, 1 - failed, 2 - passed
-        result = 1
+        result = 2
 
         # login
         if not self.__lib_login.login(
@@ -169,7 +182,7 @@ class AutoLib(MsgBase):
         }
         # reserve
         if run_mode["auto_reserve"]:
-            if self.__lib_reserve.canReserve(reserve_info.get("date")):
+            if self.__lib_checker.canReserve(reserve_info.get("date")):
                 if self.__lib_reserve.reserve(reserve_info):
                     self._showTrace(f"用户 {username} 预约成功 !")
                     result = 0
@@ -177,6 +190,26 @@ class AutoLib(MsgBase):
                     self._showTrace(f"用户 {username} 预约失败 !")
                     result = 1
             else:
+                self._showTrace(f"用户 {username} 无法预约，已跳过")
+                result = 2
+        # checkin
+        if run_mode["auto_checkin"] and result == 2:
+            if self.__lib_checker.canCheckin(reserve_info.get("date")):
+                if self.__lib_checkin.checkin(username):
+                    self._showTrace(f"用户 {username} 签到成功 !")
+                    result = 0
+                else:
+                    self._showTrace(f"用户 {username} 签到失败 !")
+                    result = 1
+            else:
+                self._showTrace(f"用户 {username} 无法签到，已跳过")
+                result = 2
+        # renewal
+        if run_mode["auto_renewal"] and result == 2:
+            if self.__lib_checker.canRenew(reserve_info.get("date")):
+                pass
+            else:
+                self._showTrace(f"用户 {username} 无法续约，已跳过")
                 result = 2
         # logout
         if not self.__lib_logout.logout(
@@ -192,7 +225,7 @@ class AutoLib(MsgBase):
     def run(
         self,
         system_config_reader: ConfigReader,
-        users_config_reader: ConfigReader,
+        users_config_reader: ConfigReader
     ):
 
         self.__system_config_reader = system_config_reader
@@ -202,6 +235,7 @@ class AutoLib(MsgBase):
         else:
             if not self.__initDriverUrl():
                 return
+            self.__initLibOperators()
 
         user_counter = {"current": 0, "success": 0, "failed": 0, "passed": 0}
         users = self.__users_config_reader.get("users")
@@ -234,7 +268,7 @@ class AutoLib(MsgBase):
 
 
     def close(
-        self,
+        self
     ) -> bool:
 
         if self.__driver:
@@ -243,5 +277,5 @@ class AutoLib(MsgBase):
             self._showTrace(f"浏览器驱动已关闭")
             return True
         else:
-            self._showTrace(f"浏览器驱动未初始化，无需关闭")
+            self._showTrace(f"浏览器驱动未初始化, 无需关闭")
             return False

LibChecker.py

@@ -39,6 +39,16 @@ class LibChecker(LibOperator):
 
         pass
 
+    @staticmethod
+    def __formatDiffTime(
+        seconds: float
+    ) -> str:
+
+        hours = int(seconds // 3600)
+        minutes = int(seconds % 3600 // 60)
+        seconds = int(seconds % 60)
+        return f"{hours} 时 {minutes} 分 {seconds} 秒"
+
 
     def __navigateToReserveRecordPage(
         self
@@ -57,6 +67,83 @@ class LibChecker(LibOperator):
         return True
 
 
+    def __decodeReserveInfo(
+        self,
+        info_elements
+    ) -> str:
+
+        location = ""
+        status = ""
+        for info in info_elements:
+            if "已预约" in info.text:
+                status = "已预约"
+            elif "使用中" in info.text:
+                status = "使用中"
+            elif "已完成" in info.text:
+                status = "已完成"
+            elif "已结束使用" in info.text:
+                status = "已结束使用"
+            elif "已取消" in info.text:
+                status = "已取消"
+            elif "失约" in info.text:
+                status = "失约"
+            elif "图书馆" in info.text:
+                location = info.text.strip()
+        return {
+            "location": location,
+            "status": status,
+        }
+
+
+    def __decodeReserveRecord(
+        self,
+        reservation
+    ) -> dict:
+
+        try:
+            time_element = reservation.find_element(
+                By.CSS_SELECTOR, "dt"
+            )
+            info_elements = reservation.find_elements(
+                By.CSS_SELECTOR, "a"
+            )
+        except:
+            return None
+        # process time element to get the date string
+        time_str = time_element.text.strip()
+        today = datetime.now().date()
+        if "明天" in time_str:
+            target_date = today + timedelta(days=1)
+            date_str = target_date.strftime("%Y-%m-%d")
+        elif "今天" in time_str:
+            target_date = today
+            date_str = target_date.strftime("%Y-%m-%d")
+        elif "昨天" in time_str:
+            target_date = today - timedelta(days=1)
+            date_str = target_date.strftime("%Y-%m-%d")
+        else:
+            date_match = re.search(r"(\d{4}-\d{1,2}-\d{1,2})", time_str)
+            if date_match:
+                date_str = date_match.group(1)
+            else:
+                date_str = ""
+        time_match = re.search(r"(\d{1,2}:\d{2}) -- (\d{1,2}:\d{2})", time_str)
+        if time_match:
+            begin_time = time_match.group(1)
+            end_time = time_match.group(2)
+        else:
+            time_str = ""
+        info = self.__decodeReserveInfo(info_elements)
+        return {
+            "date": date_str,
+            "time": {
+                "begin": begin_time,
+                "end": end_time,
+            },
+            "info": info
+        }
+
+
     def __getReserveRecord(
         self,
         wanted_date: str,
@@ -66,75 +153,57 @@ class LibChecker(LibOperator):
         if wanted_date is None:
             self._showTrace("日期未指定, 无法检查当前预约状态")
             return None
-        self._showTrace(f"正在检查用户在日期 {wanted_date} 是否有预约状态为 {wanted_status} 的预约记录......")
+        self._showTrace(f"正在检查用户在 {wanted_date} 是否有预约状态为 {wanted_status} 的预约记录......")
         date_obj = datetime.strptime(wanted_date, "%Y-%m-%d").date()
 
         checked_count = 0
-        max_check_times = 3 # we only check (3*4=)12 reservations
+        max_check_times = 6 # we only check (4*(6-1)=)20 reservations, the last time cant be checked
 
         if not self.__navigateToReserveRecordPage():
             return None
         for _ in range(max_check_times):
             try:
                 # check if there's any reservation on the date
+                WebDriverWait(self.__driver, 2).until(
+                    EC.presence_of_element_located((By.CSS_SELECTOR, ".myReserveList > dl"))
+                )
                 reservations = self.__driver.find_elements(
-                    By.CSS_SELECTOR, ".myReserveList dl"
+                    By.CSS_SELECTOR, ".myReserveList > dl:not(#moreBlock)"
                 )
             except:
                 self._showTrace("加载预约记录失败 !")
                 return None
-            for i in range(checked_count, len(reservations) - 1): # the last one is load button
+            for i in range(checked_count, len(reservations)): # the last one is load button
                 reservation = reservations[i]
-                try:
-                    time_element = reservation.find_element(
-                        By.CSS_SELECTOR, "dt"
-                    )
-                    info_elements = reservation.find_elements(
-                        By.CSS_SELECTOR, "a"
-                    )
-                except:
-                    self._showTrace(f"解析第 {i + 1} 条预约记录时发生未知错误 !")
+                record = self.__decodeReserveRecord(reservation)
+                if record is None:
                     continue
-                is_wanted = any(wanted_status in status.text for status in info_elements)
-                # process time element to get the date string
-                time_str = time_element.text.strip()
-                today = datetime.now().date()
-                if "明天" in time_str:
-                    target_date = today + timedelta(days=1)
-                    date_str = target_date.strftime("%Y-%m-%d")
-                elif "今天" in time_str:
-                    target_date = today
-                    date_str = target_date.strftime("%Y-%m-%d")
-                elif "昨天" in time_str:
-                    target_date = today - timedelta(days=1)
-                    date_str = target_date.strftime("%Y-%m-%d")
-                else:
-                    date_match = re.search(r'(\d{4}-\d{1,2}-\d{1,2})', time_str)
-                    if date_match:
-                        date_str = date_match.group(1)
-                    else:
-                        self._showTrace(f"无法解析第 {i + 1} 条预约记录的日期 ! 该记录的时间为 {time_str}")
-                        continue
+                record_date = record["date"]
+                record_time = record["time"]
+                status = record["info"]["status"]
+                location = record["info"]["location"]
+                if record_date == "" or record_time == {"begin": "", "end": ""}:
+                    continue
+                is_wanted = (status == wanted_status)
                 # reservation is later than the given date, check the next one
-                if datetime.strptime(date_str, "%Y-%m-%d").date() > date_obj:
+                if datetime.strptime(record_date, "%Y-%m-%d").date() > date_obj:
                     continue
                 # reservation is earlier than the given date, can reserve
-                if datetime.strptime(date_str, "%Y-%m-%d").date() < date_obj:
+                if datetime.strptime(record_date, "%Y-%m-%d").date() < date_obj:
                     return None
                 # query the wanted status
                 if is_wanted:
-                    self._showTrace(f"寻找到第 {i + 1} 条预约记录, 状态为 {wanted_status}")
-                    time_match = re.search(r"(\d{1,2}:\d{2}) -- (\d{1,2}:\d{2})", time_str)
-                    if time_match is None:
-                        self._showTrace(f"无法解析第 {i + 1} 条预约记录的时间 ! 该记录的时间为 {time_str}")
-                        continue
+                    self._showTrace(
+                        f"寻找到用户第 {i + 1} 条状态为 {wanted_status} 的预约记录, "
+                        f"详细信息: {record_date} {record_time['begin']} - {record_time['end']} {location}"
+                    )
                     return {
                         "index": i,
-                        "date": date_str,
-                        "time_str": time_match.group(0),
+                        "date": record_date,
+                        "time": record_time,
                         "status": wanted_status
                     }
-            checked_count = len(reservations) - 1
+            checked_count = len(reservations)
             # load new reservations if still not sure
             try:
                 more_btn = self.__driver.find_element(By.ID, "moreBtn")
@@ -142,7 +211,7 @@ class LibChecker(LibOperator):
                     self.__driver.execute_script("arguments[0].scrollIntoView(true);", more_btn)
                     self.__driver.execute_script("arguments[0].click();", more_btn)
                 else:
-                    self._showTrace("该用户无法加载更多预约记录")
+                    self._showTrace("用户无法加载更多预约记录")
                     break
             except:
                 self._showTrace("加载更多预约记录失败 !")
@@ -159,10 +228,11 @@ class LibChecker(LibOperator):
         # then can reserve
         if self.__getReserveRecord(date, "已预约") is None:
             if self.__getReserveRecord(date, "使用中") is None:
-                self._showTrace(f"用户在日期 {date} 可以预约")
+                self._showTrace(f"用户在 {date} 可以预约")
                 return True
-            self._showTrace(f"用户在日期 {date} 有使用中的预约, 无法预约")
-        self._showTrace(f"用户在日期 {date} 已存在有效预约, 无法预约")
+            self._showTrace(f"用户在 {date} 有使用中的预约, 无法预约")
+            return False
+        self._showTrace(f"用户在 {date} 已存在有效预约, 无法预约")
         return False
 
 
@@ -174,34 +244,59 @@ class LibChecker(LibOperator):
         # have a reserved record in the given date
         record = self.__getReserveRecord(date, "已预约")
         if record is not None:
-            time_match = re.search(r"(\d{1,2}:\d{2})", record["time_str"])
-            if time_match:
-                begin_time = time_match.group(0)
-                begin_time = datetime.strptime(f"{date} {begin_time}", "%Y-%m-%d %H:%M")
-                time_diff = datetime.now() - begin_time
-                time_diff_seconds = time_diff.total_seconds()
-                # before 30 minutes, cant checkin
-                if time_diff_seconds < -30*60:
-                    self._showTrace(
-                        f"用户在日期 {date} 的预约开始时间为 {begin_time}, "
-                        f"距离当前时间还有 {abs(time_diff_seconds)/60:.2f} 分钟, 无法签到"
-                    )
-                    return False
-                # before in 30 minutes, can checkin
-                elif -30*60 <= time_diff_seconds < 0:
-                    self._showTrace(
-                        f"用户在日期 {date} 的预约开始时间为 {begin_time}, "
-                        f"距离当前时间还有 {abs(time_diff_seconds)/60:.2f} 分钟, 可以签到"
-                    )
-                    return True
-                # past less than 30 minutes, can checkin
-                elif 0 <= time_diff_seconds < 30*60:
-                    self._showTrace(
-                        f"用户在日期 {date} 的预约开始时间为 {begin_time}, "
-                        f"当前时间已经 {abs(time_diff_seconds)/60:.2f} 分钟, 可以签到"
-                    )
-                    return True
-            else:
-                self._showTrace(f"用户在日期 {date} 的预约时间格式错误, 无法签到")
-        self._showTrace(f"用户在日期 {date} 有没有有效预约记录, 无法签到")
+            begin_time = record["time"]["begin"]
+            begin_time = datetime.strptime(f"{date} {begin_time}", "%Y-%m-%d %H:%M")
+            time_diff = datetime.now() - begin_time
+            time_diff_seconds = time_diff.total_seconds()
+            # before 30 minutes, cant checkin
+            if time_diff_seconds < -30*60:
+                self._showTrace(
+                    f"用户在 {date} 的预约开始时间为 {begin_time}, "
+                    f"距离当前时间还有 {self.__formatDiffTime(abs(time_diff_seconds))}, 无法签到"
+                )
+                return False
+            # before in 30 minutes, can checkin
+            elif -30*60 <= time_diff_seconds < 0:
+                self._showTrace(
+                    f"用户在 {date} 的预约开始时间为 {begin_time}, "
+                    f"距离当前时间还有 {self.__formatDiffTime(abs(time_diff_seconds))}, 可以签到"
+                )
+                return True
+            # past less than 30 minutes, can checkin
+            elif 0 <= time_diff_seconds < 30*60:
+                self._showTrace(
+                    f"用户在 {date} 的预约开始时间为 {begin_time}, "
+                    f"当前时间已经 {self.__formatDiffTime(abs(time_diff_seconds))}, 可以签到"
+                )
+                return True
+        self._showTrace(f"用户在 {date} 没有有效预约记录, 无法签到")
+        return False
+
+
+    def canRenew(
+        self,
+        date: str
+    ) -> bool:
+
+        # have a using record in the given date
+        record = self.__getReserveRecord(date, "使用中")
+        if record is not None:
+            end_time = record["time"]["end"]
+            end_time = datetime.strptime(f"{date} {end_time}", "%Y-%m-%d %H:%M")
+            time_diff = end_time - datetime.now()
+            time_diff_seconds = time_diff.total_seconds()
+            # a using record is definitely after the begin time
+            if abs(time_diff_seconds) < 120*60:
+                self._showTrace(
+                    f"用户在 {date} 的预约结束时间为 {end_time}, "
+                    f"距离当前时间还有 {self.__formatDiffTime(abs(time_diff_seconds))}, 可以续约"
+                )
+                return True
+            else:
+                self._showTrace(
+                    f"用户在 {date} 的预约结束时间为 {end_time}, "
+                    f"距离当前时间还有 {self.__formatDiffTime(abs(time_diff_seconds))}, 无法续约"
+                )
+                return False
+        self._showTrace(f"用户在 {date} 没有有效预约记录, 无法续约")
         return False

LibCheckin.py

@@ -34,7 +34,74 @@ class LibCheckin(LibOperator):
 
 
     def _waitResponseLoad(
-        self,
+        self
     ) -> bool:
 
-        pass
+        try:
+            WebDriverWait(self.__driver, 5).until(
+                EC.presence_of_element_located((By.CLASS_NAME, "ui_dialog"))
+            )
+            WebDriverWait(self.__driver, 2).until(
+                EC.presence_of_element_located((By.CLASS_NAME, "resultMessage"))
+            )
+            WebDriverWait(self.__driver, 2).until(
+                EC.element_to_be_clickable((By.CLASS_NAME, "btnOK"))
+            )
+            result_message_element = self.__driver.find_element(
+                By.CLASS_NAME, "resultMessage"
+            )
+            ok_btn = self.__driver.find_element(By.CLASS_NAME, "btnOK")
+        except:
+            self._showTrace("签到时发生未知错误 !")
+            return False
+        print(result_message_element)
+        result_message = result_message_element.text
+        if "签到成功" in result_message:
+            try:
+                detail_elements = self.__driver.find_elements(
+                    By.CSS_SELECTOR, ".resultMessage dd"
+                )
+            except:
+                pass
+            if detail_elements:
+                details = [element.text for element in detail_elements if element.text.strip()]
+                if len(details) >= 5:
+                    self._showTrace(f"\n"\
+                        f"      签到成功 !\n"\
+                        f"          {details[1]}\n"\
+                        f"          {details[2]}\n"\
+                        f"          {details[3]}\n"\
+                        f"          {details[4]}")
+            else:
+                self._showTrace(
+                         "      签到成功 !\n"\
+                         "          未获取到签到详情 !")
+            ok_btn.click()
+            return True
+        else:
+            failure_reason = result_message.replace("签到失败", "").strip()
+            self._showTrace(f"签到失败: {failure_reason}")
+            ok_btn.click()
+            return False
+
+
+    def checkin(
+        self,
+        username: str
+    ) -> bool:
+
+        if self.__driver is None:
+            self._showTrace("未提供有效 WebDriver 实例 !")
+            return False
+        try:
+            checkin_btn = WebDriverWait(self.__driver, 2).until(
+                EC.element_to_be_clickable((By.ID, "btnCheckIn"))
+            )
+        except:
+            self._showTrace(f"用户 {username} 签到界面加载失败 !")
+            return False
+        if "disabled" in checkin_btn.get_attribute("class"):
+            self._showTrace("签到按钮不可用, 可能不在场馆内, 请连接图书馆网络后重试")
+            return False
+        checkin_btn.click()
+        return self._waitResponseLoad()

LibCheckout.py

@@ -34,7 +34,7 @@ class LibCheckout(LibOperator):
 
 
     def _waitResponseLoad(
-        self,
+        self
     ) -> bool:
 
         pass

LibLogin.py

@@ -36,7 +36,7 @@ class LibLogin(LibOperator):
 
 
     def _waitResponseLoad(
-        self,
+        self
     ) -> bool:
 
         # wait to verify login success
@@ -51,15 +51,15 @@ class LibLogin(LibOperator):
                 EC.presence_of_element_located((By.CLASS_NAME, "selectContent"))
             )
             return True
-        except Exception as e:
-            self._showTrace(f"登录页面加载失败 ! : {e}")
+        except:
+            self._showTrace(f"登录页面加载失败 ! : 用户账号或者密码错误/验证码错误, 具体以页面提示为准")
             return False
 
 
     def __fillLogInElements(
         self,
         username: str,
-        password: str,
+        password: str
     ) -> bool:
 
         # ensure elements presence and fill them
@@ -77,7 +77,7 @@ class LibLogin(LibOperator):
 
 
     def __autoRecognizeCaptcha(
-        self,
+        self
     ) -> str:
 
         # auto recognize captcha
@@ -99,7 +99,7 @@ class LibLogin(LibOperator):
 
 
     def __manualRecognizeCaptcha(
-        self,
+        self
     ) -> str:
 
         # manual recognize captcha
@@ -117,7 +117,7 @@ class LibLogin(LibOperator):
 
 
     def __refreshCaptcha(
-        self,
+        self
     ):
 
         # refresh captcha
@@ -134,12 +134,47 @@ class LibLogin(LibOperator):
             return False
 
 
+    def __solveCaptcha(
+        self,
+        auto_captcha: bool = True
+    ) -> str:
+
+        max_attempts = 5
+
+        for _ in range(max_attempts):
+            if auto_captcha:
+                captcha_text = self.__autoRecognizeCaptcha()
+            else:
+                self._showTrace(f"用户未配置自动识别验证码, 请手动输入验证码 !")
+                captcha_text = self.__manualRecognizeCaptcha()
+            if captcha_text:
+                return captcha_text
+        self._showTrace(f"验证码识别失败 {max_attempts} 次, 请检查验证码是否正确 !")
+        return ""
+
+
+    def __fillCaptchaElement(
+        self,
+        captcha_text: str
+    ) -> bool:
+
+        try:
+            captcha_element = self.__driver.find_element(By.NAME, "answer")
+            captcha_element.clear()
+            captcha_element.send_keys(captcha_text)
+            return True
+        except Exception as e:
+            self._showTrace(f"验证码填写失败 ! : {e}")
+            self.__refreshCaptcha()
+            return False
+
+
     def login(
         self,
         username: str,
         password: str,
         max_attempts: int = 5,
-        auto_captcha: bool = True,
+        auto_captcha: bool = True
     ) -> bool:
 
         if self.__driver is None:
@@ -153,17 +188,11 @@ class LibLogin(LibOperator):
                 password,
             ):
                 continue
-            while True:
-                if auto_captcha:
-                    captcha_text = self.__autoRecognizeCaptcha()
-                else:
-                    self._showTrace(f"用户未配置自动识别验证码, 请手动输入验证码 !")
-                    captcha_text = self.__manualRecognizeCaptcha()
-                if captcha_text:
-                    break
-            captcha_element = self.__driver.find_element(By.NAME, "answer")
-            captcha_element.clear()
-            captcha_element.send_keys(captcha_text)
+            captcha_text = self.__solveCaptcha(auto_captcha)
+            if not captcha_text:
+                continue
+            if not self.__fillCaptchaElement(captcha_text):
+                continue
             self._showTrace("尝试登录...")
             try:
                 self.__driver.find_element(

LibLogout.py

@@ -22,7 +22,7 @@ class LibLogout(LibOperator):
         self,
         input_queue: queue.Queue,
         output_queue: queue.Queue,
-        driver,
+        driver
     ):
 
         super().__init__(input_queue, output_queue)
@@ -31,7 +31,7 @@ class LibLogout(LibOperator):
 
 
     def _waitResponseLoad(
-        self,
+        self
     ) -> bool:
 
         return True
@@ -39,24 +39,18 @@ class LibLogout(LibOperator):
 
     def logout(
         self,
-        username: str,
+        username: str
     ) -> bool:
 
         if self.__driver is None:
             self._showTrace("未提供有效 WebDriver 实例 !")
-
             return False
-
         try:
             self.__driver.find_element(
                 By.XPATH, "//a[@href='/logout']"
             ).click()
-
             self._showTrace(f"用户 {username} 注销成功 !")
-
             return True
-
         except Exception as e:
             self._showTrace(f"用户 {username} 注销失败 ! : {e}")
-
             return False

LibOperator.py

@@ -17,14 +17,14 @@ class LibOperator(MsgBase):
     def __init__(
         self,
         input_queue: queue.Queue,
-        output_queue: queue.Queue,
+        output_queue: queue.Queue
     ):
 
         super().__init__(input_queue, output_queue)
 
 
     def _waitResponseLoad(
-        self,
+        self
     ) -> bool:
 
         pass

LibRenew.py

@@ -28,7 +28,7 @@ class LibRenew(LibOperator):
 
 
     def _waitResponseLoad(
-        self,
+        self
     ) -> bool:
 
         pass

LibReserve.py

@@ -83,16 +83,12 @@ class LibReserve(LibOperator):
                    raise
             if "预定好了" in title or "预约成功" in title or "操作成功" in title:
                 if len(contents) >= 6:
-                    date_val = contents[1].split(" ： ")[1].strip() if " ： " in contents[1] else contents[1].strip()
-                    time_val = contents[2].split(" ： ")[1].strip() if " ： " in contents[2] else contents[2].strip()
-                    seat_val = contents[3].split(" ： ")[1].strip() if " ： " in contents[3] else contents[3].strip()
-                    checkin_val = contents[5].strip()
                     self._showTrace(f"\n"\
                         f"      预约成功 !\n"\
-                        f"          预约日期: {date_val}, \n"\
-                        f"          预约时间: {time_val}, \n"\
-                        f"          预约座位: {seat_val}, \n"\
-                        f"          签到时间: {checkin_val}")
+                        f"          {contents[1]}\n"\
+                        f"          {contents[2]}\n"\
+                        f"          {contents[3]}\n"\
+                        f"          签到时间 ：{contents[5]}")
                 else:
                     self._showTrace(f"\n"\
                         f"      预约成功 !\n"\
@@ -119,35 +115,41 @@ class LibReserve(LibOperator):
         return f"{hour:02d}:{minute:02d}"
 
 
-    def __checkReserveInfo(
+    def __containRequiredInfo(
         self,
         reserve_info: dict
     ) -> bool:
 
         try:
-            # check the required information
-            # reserve_info["place"]
-            if reserve_info.get("floor") is None:
+            # must contain the required infomation
+            if reserve_info.get("floor") is None: # if existence ?
                 raise ValueError("未指定楼层")
-            if reserve_info["floor"] not in self.__floor_map:
-                raise ValueError(f"楼层 '{reserve_info['floor']}' 不存在")
+            if reserve_info["floor"] not in self.__floor_map: # if in the mao ?
+                raise ValueError(f"该楼层 '{reserve_info['floor']}' 不存在")
             if reserve_info.get("room") is None:
                 raise ValueError("未指定房间")
             if reserve_info["room"] not in self.__room_map:
-                raise ValueError(f"房间 '{reserve_info['room']}' 不存在")
+                raise ValueError(f"该房间 '{reserve_info['room']}' 不存在")
             if reserve_info.get("seat_id") is None:
                 raise ValueError("未指定座位")
+            if reserve_info["seat_id"] == "":
+                raise ValueError("未指定座位号")
+            return True
         except ValueError as e:
             self._showTrace(
                 f"预约信息错误 ! : {e}, "\
-                f"由于缺少必要的预约信息， 无法开始预约流程, 请检查预约信息是否完整"
+                f"由于缺少必要的预约信息, 无法开始预约流程, 请检查预约信息是否完整"
             )
             return False
 
-        # check and try to fix the time errors
-        cur_time_str = time.strftime("%Y-%m-%d %H:%M", time.localtime())
-        cur_date, curr_time = cur_time_str.split()
-        if not reserve_info.get("date"):
+
+    def __isValidDate(
+        self,
+        reserve_info: dict
+    ) -> bool:
+
+        cur_date = time.strftime("%Y-%m-%d", time.localtime())
+        if reserve_info.get("date") is None:
             reserve_info["date"] = cur_date
             self._showTrace(f"预约日期未指定, 自动设置为当前日期: {cur_date}")
         else:
@@ -157,96 +159,135 @@ class LibReserve(LibOperator):
                     f"{reserve_info['date']} 早于当前日期 {cur_date}, 自动设置为当前日期"
                 )
                 reserve_info["date"] = cur_date
-        # check the begin time
-        begin_time = reserve_info.get("begin_time")
-        if not begin_time:
-            reserve_info["begin_time"] = {
-                "time": curr_time,
-                "max_diff": 30,
-                "prefer_early": True
-            }
-            self._showTrace(f"开始时间未指定, 自动设置为当前时间: {curr_time}, 最大时间差为 30 分钟, 优先选择更早预约时间")
-        else:
-            begin_time = reserve_info["begin_time"]
-            if "time" not in begin_time:
-                begin_time["time"] = curr_time
-                self._showTrace(f"开始时间未指定, 自动设置为当前时间: {curr_time}")
-            if "max_diff" not in begin_time:
-                begin_time["max_diff"] = 30
-                self._showTrace(f"最大时间差未指定, 自动设置为 30 分钟")
-            if "prefer_early" not in begin_time:
-                begin_time["prefer_early"] = True
-                self._showTrace(f"是否优先选择更早预约时间未指定, 自动设置为 True")
-        expect_duration = reserve_info.get("expect_duration")
-        if not expect_duration:
+        return True
+
+
+    def __isValidBeginTime(
+        self,
+        reserve_info: dict
+    ) -> bool:
+
+        cur_time = time.strftime("%H:%M", time.localtime())
+        if reserve_info.get("begin_time") is None:
+            reserve_info["begin_time"] = {}
+        if "time" not in reserve_info["begin_time"]:
+            reserve_info["begin_time"]["time"] = cur_time
+            self._showTrace(f"开始时间未指定, 自动设置为当前时间: {cur_time}")
+        if "max_diff" not in reserve_info["begin_time"]:
+            reserve_info["begin_time"]["max_diff"] = 30
+            self._showTrace(f"开始时间最大时间差未指定, 自动设置为 30 分钟")
+        if "prefer_early" not in reserve_info["begin_time"]:
+            reserve_info["begin_time"]["prefer_early"] = True
+            self._showTrace(f"是否优先选择更早开始时间未指定, 自动设置为 True")
+        return True
+
+
+    def __isValidExpectDuration(
+        self,
+        reserve_info: dict
+    ) -> bool:
+
+        if reserve_info.get("expect_duration") is None:
             reserve_info["expect_duration"] = 4
-            expect_duration = 4
             self._showTrace("预约持续时间未指定, 使用默认时长为 4 小时")
-        if not reserve_info.get("satisfy_duration"):
+        if reserve_info.get("satisfy_duration") is None:
             reserve_info["satisfy_duration"] = True
             self._showTrace("预约满足时长要求未指定, 默认满足")
-        # check the end time
-        if not reserve_info.get("end_time"):
-            begin_mins = self.__timeToMins(reserve_info["begin_time"]["time"])
-            end_mins = begin_mins + reserve_info["expect_duration"] * 60
-            end_time_str = self.__minsToTime(end_mins)
+        return True
+
+
+    def __isValidEndTime(
+        self,
+        reserve_info: dict
+    ) -> bool:
+
+        if reserve_info.get("end_time") is None:
+            reserve_info["end_time"] = {}
+        if "time" not in reserve_info["end_time"]:
+            end_mins = self.__timeToMins(reserve_info["begin_time"]["time"])
+            end_mins = end_mins + int(reserve_info["expect_duration"]*60)
             reserve_info["end_time"] = {
-                "time": end_time_str,
+                "time": self.__minsToTime(end_mins),
                 "max_diff": 30,
                 "prefer_early": False
             }
-            self._showTrace(f"结束时间未指定, 自动设置为开始时间加上期望时长: {end_time_str}, 最大时间差为 30 分钟, 优先选择较晚预约时间")
+            self._showTrace(
+                f"结束时间未指定, 自动设置为开始时间加上期望时长: {reserve_info['end_time']['time']}"
+            )
+        if "max_diff" not in reserve_info["end_time"]:
+            reserve_info["end_time"]["max_diff"] = 30
+            self._showTrace(f"结束时间最大时间差未指定, 自动设置为 30 分钟")
+        if "prefer_early" not in reserve_info["end_time"]:
+            reserve_info["end_time"]["prefer_early"] = False
+            self._showTrace(f"是否优先选择较晚结束时间未指定, 自动设置为 True")
+        return True
+
+
+    def __finalCheck(
+        self,
+        reserve_info: dict
+    ):
+
+        begin_time, end_time = reserve_info["begin_time"], reserve_info["end_time"]
+        begin_mins = self.__timeToMins(begin_time["time"])
+        end_mins = self.__timeToMins(end_time["time"])
+        # if end time is earlier than begin_time, exchange them
+        if end_mins < begin_mins:
+            self._showTrace(
+                f"结束时间 {end_time['time']} 早于开始时间 {begin_time['time']}, 自动交换"
+            )
+            reserve_info["end_time"] = begin_time
+            reserve_info["begin_time"] = end_time
+            begin_time, end_time = reserve_info["begin_time"], reserve_info["end_time"]
+            begin_mins = self.__timeToMins(begin_time["time"])
+            end_mins = self.__timeToMins(end_time["time"])
+        # ensure the end time is not later than 23:30
+        if end_mins > self.__timeToMins("23:30"):
+            self._showTrace(
+                f"结束时间 {end_time['time']} 晚于 23:30, 自动设置为 23:30"
+            )
+            reserve_info["end_time"]["time"] = "23:30"
+            end_mins = self.__timeToMins("23:30")
+        # ensure the duration is not longer than 8 hours
+        if reserve_info["satisfy_duration"]:
+            if reserve_info["expect_duration"] > 8:
+                self._showTrace(
+                    f"该用户设置了优先满足时长要求, 但是预约期望持续时间 "
+                    f"{reserve_info['expect_duration']} 小时 "
+                    f"超出最大时长 8 小时, 自动设置为 8 小时"
+                )
+                reserve_info["expect_duration"] = 8
         else:
-            end_time = reserve_info["end_time"]
-            if "time" not in end_time:
-                begin_mins = self.__timeToMins(reserve_info["begin_time"]["time"])
-                end_mins = begin_mins + reserve_info["expect_duration"] * 60
-                end_time["time"] = self.__minsToTime(end_mins)
-                self._showTrace(f"结束时间未指定, 自动设置为开始时间加上期望时长: {end_time['time']}")
-            if "max_diff" not in end_time:
-                end_time["max_diff"] = 30
-                self._showTrace(f"最大时间差未指定, 自动设置为 30 分钟")
-            if "prefer_early" not in end_time:
-                end_time["prefer_early"] = False
-                self._showTrace(f"是否优先选择较早预约时间未指定, 自动设置为 False")
-        # check the reserve time boundary and fix the errors
-        #
-        # get time string for message show
-        begin_time_str = reserve_info["begin_time"]["time"]
-        end_time_str = reserve_info["end_time"]["time"]
+            if end_mins - begin_mins > 8*60:
+                self._showTrace(
+                    f"该用户未设置优先满足时长要求, 但是检查到预约持续时间 "
+                    f"{int((end_mins - begin_mins)/60)} 小时 "
+                    f"超出最大时长 8 小时, 自动设置为 8 小时"
+                )
+                reserve_info["expect_duration"] = 8
+                reserve_info["end_time"]["time"] = self.__minsToTime(begin_mins + 8*60)
+        return True
 
-        # minute time for check and fix them
-        begin_mins = self.__timeToMins(begin_time_str)
-        end_mins = self.__timeToMins(end_time_str)
 
-        # ensure begin time is not later than end time
-        if begin_mins > end_mins:
-            reserve_info["begin_time"]["time"], reserve_info["end_time"]["time"] = end_time_str, begin_time_str
-            reserve_info["begin_time"]["prefer_early"], reserve_info["end_time"]["prefer_early"] = \
-                reserve_info["end_time"]["prefer_early"], reserve_info["begin_time"]["prefer_early"]
-            self._showTrace("预约开始时间晚于预约结束时间，自动调换开始时间和结束时间")
+    def __checkReserveInfo(
+        self,
+        reserve_info: dict
+    ) -> bool:
 
-            # update the begin_mins and end_mins after swap
-            begin_time_str, end_time_str = end_time_str, begin_time_str
-            begin_mins, end_mins = end_mins, begin_mins
-
-        # ensure end time is not later than 22:30
-        max_end_mins = self.__timeToMins("22:30")
-        if end_mins > max_end_mins:
-            reserve_info["end_time"]["time"] = "22:30"
-            end_time_str = "22:30"
-            end_mins = max_end_mins
-            self._showTrace("预约结束时间超过 22:30, 自动设置为 22:30")
-
-        # ensure expect duration is shorter than 8 hours
-        max_duration_mins = 8 * 60
-        duration_mins = end_mins - begin_mins
-        if duration_mins > max_duration_mins:
-            new_end_mins = begin_mins + max_duration_mins
-            reserve_info["end_time"]["time"] = self.__minsToTime(new_end_mins)
-            self._showTrace("预约持续时间超过8小时, 自动设置为 8 小时")
+        if not self.__containRequiredInfo(reserve_info):
+            return False
+        if not self.__isValidDate(reserve_info):
+            return False
+        if not self.__isValidBeginTime(reserve_info):
+            return False
+        if not self.__isValidExpectDuration(reserve_info):
+            return False
+        if not self.__isValidEndTime(reserve_info):
+            return False
+        if not self.__finalCheck(reserve_info):
+            return False
         self._showTrace(
-            f"预约信息检查完成，准备预约 "
+            f"预约信息检查完成, 准备预约 "
             f"{reserve_info['date']} "
             f"{reserve_info['begin_time']["time"]} - "
             f"{reserve_info['end_time']["time"]} "
@@ -263,7 +304,7 @@ class LibReserve(LibOperator):
         trigger_locator: tuple,
         fail_msg: str,
         success_msg: str,
-        option_locator: tuple = None,
+        option_locator: tuple = None
     ) -> bool:
 
         try:
@@ -489,97 +530,6 @@ class LibReserve(LibOperator):
         return True
 
 
-    def canReserve(
-        self,
-        date: str
-    ) -> bool:
-
-        if date is None:
-            self._showTrace("日期未指定, 无法检查预约状态")
-            return True
-        else:
-            self._showTrace(f"正在检查用户在日期 {date} 是否可预约......")
-            date_obj = datetime.strptime(date, "%Y-%m-%d").date()
-        try:
-            # we need to navigate to the history page to check if we can reserve
-            WebDriverWait(self.__driver, 5).until(
-                EC.element_to_be_clickable((By.XPATH, "//a[@href='/history?type=SEAT']"))
-            ).click()
-            WebDriverWait(self.__driver, 2).until(
-                EC.presence_of_element_located((By.CLASS_NAME, "myReserveList"))
-            )
-        except:
-            self._showTrace("加载预约记录页面失败 !")
-            return False
-        checked_count = 0
-        max_attemots = 3 # we only check (3*4=)12 reservations
-
-        for _ in range(max_attemots):
-            try:
-                # check if there's any reservation on the date
-                reservations = self.__driver.find_elements(
-                    By.CSS_SELECTOR, ".myReserveList dl"
-                )
-            except:
-                self._showTrace("加载预约记录失败 !")
-                return False
-            for i in range(checked_count, len(reservations) - 1): # the last one is load button
-                reservation = reservations[i]
-                try:
-                    time_element = reservation.find_element(
-                        By.CSS_SELECTOR, "dt"
-                    )
-                    status_elements = reservation.find_elements(
-                        By.CSS_SELECTOR, "a"
-                    )
-                    is_reserved = any("已预约" in status.text for status in status_elements)
-                    # process time element to get the date string
-                    time_str = time_element.text.strip()
-                    today = datetime.now().date()
-                    if "明天" in time_str:
-                        target_date = today + timedelta(days=1)
-                        date_str = target_date.strftime("%Y-%m-%d")
-                    elif "今天" in time_str:
-                        target_date = today
-                        date_str = target_date.strftime("%Y-%m-%d")
-                    elif "昨天" in time_str:
-                        target_date = today - timedelta(days=1)
-                        date_str = target_date.strftime("%Y-%m-%d")
-                    else:
-                        date_match = re.search(r'(\d{4}-\d{1,2}-\d{1,2})', time_str)
-                        if date_match:
-                            date_str = date_match.group(1)
-                        else:
-                            continue
-                    # reservation is earlier than the given date, can reserve
-                    if datetime.strptime(date_str, "%Y-%m-%d").date() < date_obj:
-                        self._showTrace(f"用户在 {date} 可预约")
-                        return True
-                    # reservation is later than the given date, check the next one
-                    elif datetime.strptime(date_str, "%Y-%m-%d").date() > date_obj:
-                        continue
-                    # compare with the given date
-                    if date_str == date and is_reserved:
-                        self._showTrace(f"用户在 {date} 已存在有效预约, 无法预约")
-                        return False
-                except:
-                    self._showTrace(f"解析第 {i + 1} 条预约记录时发生未知错误 !")
-                    continue
-            checked_count = len(reservations) - 1
-            # load new reservations if still not sure
-            try:
-                more_btn = self.__driver.find_element(By.ID, "moreBtn")
-                if more_btn.is_displayed() and more_btn.is_enabled():
-                    self.__driver.execute_script("arguments[0].scrollIntoView(true);", more_btn)
-                    self.__driver.execute_script("arguments[0].click();", more_btn)
-                else:
-                    break
-            except:
-                break
-        self._showTrace(f"用户在 {date} 可预约")
-        return True
-
-
     def reserve(
         self,
         reserve_info: dict

MsgBase.py

@@ -16,7 +16,7 @@ class MsgBase:
     def __init__(
         self,
         input_queue: queue.Queue,
-        output_queue: queue.Queue,
+        output_queue: queue.Queue
     ):
 
         self._class_name = self.__class__.__name__
@@ -43,7 +43,7 @@ class MsgBase:
 
     def _waitMsg(
         self,
-        timeout: float = 1.0,
+        timeout: float = 1.0
     ) -> str:
 
         try:
@@ -55,7 +55,7 @@ class MsgBase:
 
     def _inputMsg(
         self,
-        timeout: float = 1.0,
+        timeout: float = 1.0
     ) -> bool:
 
         try:

gui/ALConfigWidget.py

@@ -569,7 +569,7 @@ class ALConfigWidget(QWidget, Ui_ALConfigWidget):
 
     @Slot()
     def onFloorComboBoxCurrentIndexChanged(
-        self,
+        self
     ):
 
         floor = self.FloorComboBox.currentText()

gui/ALConfigWidget.ui

@@ -232,8 +232,8 @@
              <property name="spacing">
               <number>5</number>
              </property>
-             <item row="0" column="0">
-              <widget class="QLabel" name="UsernameKabel">
+             <item row="2" column="0">
+              <widget class="QLabel" name="PasswordLabel">
                <property name="minimumSize">
                 <size>
                  <width>100</width>
@@ -247,7 +247,7 @@
                 </size>
                </property>
                <property name="text">
-                <string>用户名：</string>
+                <string>密码：</string>
                </property>
               </widget>
              </item>
@@ -299,25 +299,6 @@
                </item>
               </layout>
              </item>
-             <item row="2" column="0">
-              <widget class="QLabel" name="PasswordLabel">
-               <property name="minimumSize">
-                <size>
-                 <width>100</width>
-                 <height>25</height>
-                </size>
-               </property>
-               <property name="maximumSize">
-                <size>
-                 <width>100</width>
-                 <height>25</height>
-                </size>
-               </property>
-               <property name="text">
-                <string>密码：</string>
-               </property>
-              </widget>
-             </item>
              <item row="0" column="1">
               <widget class="QLineEdit" name="UsernameEdit">
                <property name="minimumSize">
@@ -340,6 +321,25 @@
                </property>
               </widget>
              </item>
+             <item row="0" column="0">
+              <widget class="QLabel" name="UsernameKabel">
+               <property name="minimumSize">
+                <size>
+                 <width>100</width>
+                 <height>25</height>
+                </size>
+               </property>
+               <property name="maximumSize">
+                <size>
+                 <width>100</width>
+                 <height>25</height>
+                </size>
+               </property>
+               <property name="text">
+                <string>用户名：</string>
+               </property>
+              </widget>
+             </item>
             </layout>
            </widget>
           </item>
@@ -376,8 +376,65 @@
              <property name="spacing">
               <number>5</number>
              </property>
-             <item row="4" column="4">
-              <widget class="QLineEdit" name="SeatIDEdit">
+             <item row="0" column="1">
+              <widget class="QLabel" name="DateLabel">
+               <property name="minimumSize">
+                <size>
+                 <width>100</width>
+                 <height>25</height>
+                </size>
+               </property>
+               <property name="maximumSize">
+                <size>
+                 <width>100</width>
+                 <height>25</height>
+                </size>
+               </property>
+               <property name="text">
+                <string>日期：</string>
+               </property>
+              </widget>
+             </item>
+             <item row="7" column="1">
+              <widget class="QLabel" name="MaxBeginTimeDiffLabel">
+               <property name="minimumSize">
+                <size>
+                 <width>100</width>
+                 <height>25</height>
+                </size>
+               </property>
+               <property name="maximumSize">
+                <size>
+                 <width>100</width>
+                 <height>25</height>
+                </size>
+               </property>
+               <property name="text">
+                <string>最大时长偏差：</string>
+               </property>
+              </widget>
+             </item>
+             <item row="1" column="1">
+              <widget class="QLabel" name="PlaceLabel">
+               <property name="minimumSize">
+                <size>
+                 <width>100</width>
+                 <height>25</height>
+                </size>
+               </property>
+               <property name="maximumSize">
+                <size>
+                 <width>100</width>
+                 <height>25</height>
+                </size>
+               </property>
+               <property name="text">
+                <string>地点：</string>
+               </property>
+              </widget>
+             </item>
+             <item row="12" column="4">
+              <widget class="QDoubleSpinBox" name="ExpectDurationSpinBox">
                <property name="minimumSize">
                 <size>
                  <width>0</width>
@@ -390,6 +447,37 @@
                  <height>25</height>
                 </size>
                </property>
+               <property name="toolTip">
+                <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;期望的预约时长，脚本会尽量满足&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+               </property>
+               <property name="maximum">
+                <double>8.000000000000000</double>
+               </property>
+              </widget>
+             </item>
+             <item row="11" column="4">
+              <widget class="QCheckBox" name="PreferLateEndTimeCheckBox">
+               <property name="minimumSize">
+                <size>
+                 <width>0</width>
+                 <height>25</height>
+                </size>
+               </property>
+               <property name="maximumSize">
+                <size>
+                 <width>16777215</width>
+                 <height>25</height>
+                </size>
+               </property>
+               <property name="toolTip">
+                <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;勾选此项，如果有多个与目标&lt;span style=&quot; font-weight:700; font-style:italic;&quot;&gt;结束时间&lt;/span&gt;相近的可选时间，选择时间最晚项&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+               </property>
+               <property name="text">
+                <string>优先选择最晚</string>
+               </property>
+               <property name="checked">
+                <bool>true</bool>
+               </property>
               </widget>
              </item>
              <item row="9" column="1">
@@ -411,11 +499,27 @@
                </property>
               </widget>
              </item>
-             <item row="1" column="4">
-              <widget class="QComboBox" name="PlaceComboBox">
-               <property name="enabled">
-                <bool>false</bool>
+             <item row="5" column="1">
+              <widget class="QLabel" name="BeginTimeLabel">
+               <property name="minimumSize">
+                <size>
+                 <width>100</width>
+                 <height>25</height>
+                </size>
                </property>
+               <property name="maximumSize">
+                <size>
+                 <width>100</width>
+                 <height>25</height>
+                </size>
+               </property>
+               <property name="text">
+                <string>开始时间：</string>
+               </property>
+              </widget>
+             </item>
+             <item row="2" column="4">
+              <widget class="QComboBox" name="FloorComboBox">
                <property name="minimumSize">
                 <size>
                  <width>0</width>
@@ -430,13 +534,28 @@
                </property>
                <item>
                 <property name="text">
-                 <string>图书馆</string>
+                 <string>二层</string>
+                </property>
+               </item>
+               <item>
+                <property name="text">
+                 <string>三层</string>
+                </property>
+               </item>
+               <item>
+                <property name="text">
+                 <string>四层</string>
+                </property>
+               </item>
+               <item>
+                <property name="text">
+                 <string>五层</string>
                 </property>
                </item>
               </widget>
              </item>
-             <item row="12" column="1">
-              <widget class="QLabel" name="ExpectDurationLabel">
+             <item row="10" column="1">
+              <widget class="QLabel" name="MaxEndTimeDiffLabel">
                <property name="minimumSize">
                 <size>
                  <width>100</width>
@@ -450,7 +569,7 @@
                 </size>
                </property>
                <property name="text">
-                <string>期望时长：</string>
+                <string>最大时长偏差：</string>
                </property>
               </widget>
              </item>
@@ -487,8 +606,31 @@
                </property>
               </widget>
              </item>
-             <item row="0" column="1">
-              <widget class="QLabel" name="DateLabel">
+             <item row="0" column="4">
+              <widget class="QDateEdit" name="DateEdit">
+               <property name="minimumSize">
+                <size>
+                 <width>0</width>
+                 <height>25</height>
+                </size>
+               </property>
+               <property name="maximumSize">
+                <size>
+                 <width>16777215</width>
+                 <height>25</height>
+                </size>
+               </property>
+               <property name="date">
+                <date>
+                 <year>2025</year>
+                 <month>11</month>
+                 <day>1</day>
+                </date>
+               </property>
+              </widget>
+             </item>
+             <item row="12" column="1">
+              <widget class="QLabel" name="ExpectDurationLabel">
                <property name="minimumSize">
                 <size>
                  <width>100</width>
@@ -502,7 +644,26 @@
                 </size>
                </property>
                <property name="text">
-                <string>日期：</string>
+                <string>期望时长：</string>
+               </property>
+              </widget>
+             </item>
+             <item row="3" column="1">
+              <widget class="QLabel" name="RoomLabel">
+               <property name="minimumSize">
+                <size>
+                 <width>100</width>
+                 <height>25</height>
+                </size>
+               </property>
+               <property name="maximumSize">
+                <size>
+                 <width>100</width>
+                 <height>25</height>
+                </size>
+               </property>
+               <property name="text">
+                <string>区域：</string>
                </property>
               </widget>
              </item>
@@ -546,11 +707,11 @@
                </property>
               </widget>
              </item>
-             <item row="8" column="4">
-              <widget class="QCheckBox" name="PreferEarlyBeginTimeCheckBox">
+             <item row="13" column="4">
+              <widget class="QCheckBox" name="SatisfyDurationCheckBox">
                <property name="minimumSize">
                 <size>
-                 <width>100</width>
+                 <width>0</width>
                  <height>25</height>
                 </size>
                </property>
@@ -561,128 +722,16 @@
                 </size>
                </property>
                <property name="toolTip">
-                <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;勾选此项，如果有多个与目标&lt;span style=&quot; font-weight:700; font-style:italic;&quot;&gt;开始时间&lt;/span&gt;相近的可选时间，选择时间最早项&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;勾选此项，会优先满足预约时长限制，当座位紧张时可能会导致&lt;span style=&quot; font-weight:700; font-style:italic;&quot;&gt;预约失败&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
                </property>
                <property name="text">
-                <string>优先选择最早</string>
+                <string>优先满足时长要求</string>
                </property>
                <property name="checked">
                 <bool>true</bool>
                </property>
               </widget>
              </item>
-             <item row="10" column="1">
-              <widget class="QLabel" name="MaxEndTimeDiffLabel">
-               <property name="minimumSize">
-                <size>
-                 <width>100</width>
-                 <height>25</height>
-                </size>
-               </property>
-               <property name="maximumSize">
-                <size>
-                 <width>100</width>
-                 <height>25</height>
-                </size>
-               </property>
-               <property name="text">
-                <string>最大时长偏差：</string>
-               </property>
-              </widget>
-             </item>
-             <item row="10" column="4">
-              <widget class="QSpinBox" name="MaxEndTimeDiffSpinBox">
-               <property name="minimumSize">
-                <size>
-                 <width>0</width>
-                 <height>25</height>
-                </size>
-               </property>
-               <property name="maximumSize">
-                <size>
-                 <width>16777215</width>
-                 <height>25</height>
-                </size>
-               </property>
-               <property name="toolTip">
-                <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;期望的&lt;span style=&quot; font-weight:700; font-style:italic;&quot;&gt;结束时间&lt;/span&gt;不可用时，按照该偏差范围寻找最近可选时间&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-               </property>
-               <property name="maximum">
-                <number>120</number>
-               </property>
-              </widget>
-             </item>
-             <item row="3" column="1">
-              <widget class="QLabel" name="RoomLabel">
-               <property name="minimumSize">
-                <size>
-                 <width>100</width>
-                 <height>25</height>
-                </size>
-               </property>
-               <property name="maximumSize">
-                <size>
-                 <width>100</width>
-                 <height>25</height>
-                </size>
-               </property>
-               <property name="text">
-                <string>区域：</string>
-               </property>
-              </widget>
-             </item>
-             <item row="2" column="4">
-              <widget class="QComboBox" name="FloorComboBox">
-               <property name="minimumSize">
-                <size>
-                 <width>0</width>
-                 <height>25</height>
-                </size>
-               </property>
-               <property name="maximumSize">
-                <size>
-                 <width>16777215</width>
-                 <height>25</height>
-                </size>
-               </property>
-               <item>
-                <property name="text">
-                 <string>二层</string>
-                </property>
-               </item>
-               <item>
-                <property name="text">
-                 <string>三层</string>
-                </property>
-               </item>
-               <item>
-                <property name="text">
-                 <string>四层</string>
-                </property>
-               </item>
-               <item>
-                <property name="text">
-                 <string>五层</string>
-                </property>
-               </item>
-              </widget>
-             </item>
-             <item row="3" column="4">
-              <widget class="QComboBox" name="RoomComboBox">
-               <property name="minimumSize">
-                <size>
-                 <width>0</width>
-                 <height>25</height>
-                </size>
-               </property>
-               <property name="maximumSize">
-                <size>
-                 <width>16777215</width>
-                 <height>25</height>
-                </size>
-               </property>
-              </widget>
-             </item>
              <item row="7" column="4">
               <widget class="QSpinBox" name="MaxBeginTimeDiffSpinBox">
                <property name="minimumSize">
@@ -705,50 +754,6 @@
                </property>
               </widget>
              </item>
-             <item row="11" column="4">
-              <widget class="QCheckBox" name="PreferLateEndTimeCheckBox">
-               <property name="minimumSize">
-                <size>
-                 <width>0</width>
-                 <height>25</height>
-                </size>
-               </property>
-               <property name="maximumSize">
-                <size>
-                 <width>16777215</width>
-                 <height>25</height>
-                </size>
-               </property>
-               <property name="toolTip">
-                <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;勾选此项，如果有多个与目标&lt;span style=&quot; font-weight:700; font-style:italic;&quot;&gt;结束时间&lt;/span&gt;相近的可选时间，选择时间最晚项&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-               </property>
-               <property name="text">
-                <string>优先选择最晚</string>
-               </property>
-               <property name="checked">
-                <bool>true</bool>
-               </property>
-              </widget>
-             </item>
-             <item row="5" column="1">
-              <widget class="QLabel" name="BeginTimeLabel">
-               <property name="minimumSize">
-                <size>
-                 <width>100</width>
-                 <height>25</height>
-                </size>
-               </property>
-               <property name="maximumSize">
-                <size>
-                 <width>100</width>
-                 <height>25</height>
-                </size>
-               </property>
-               <property name="text">
-                <string>开始时间：</string>
-               </property>
-              </widget>
-             </item>
              <item row="2" column="1">
               <widget class="QLabel" name="FloorLabel">
                <property name="minimumSize">
@@ -768,6 +773,93 @@
                </property>
               </widget>
              </item>
+             <item row="1" column="4">
+              <widget class="QComboBox" name="PlaceComboBox">
+               <property name="enabled">
+                <bool>false</bool>
+               </property>
+               <property name="minimumSize">
+                <size>
+                 <width>0</width>
+                 <height>25</height>
+                </size>
+               </property>
+               <property name="maximumSize">
+                <size>
+                 <width>16777215</width>
+                 <height>25</height>
+                </size>
+               </property>
+               <item>
+                <property name="text">
+                 <string>图书馆</string>
+                </property>
+               </item>
+              </widget>
+             </item>
+             <item row="8" column="4">
+              <widget class="QCheckBox" name="PreferEarlyBeginTimeCheckBox">
+               <property name="minimumSize">
+                <size>
+                 <width>100</width>
+                 <height>25</height>
+                </size>
+               </property>
+               <property name="maximumSize">
+                <size>
+                 <width>16777215</width>
+                 <height>25</height>
+                </size>
+               </property>
+               <property name="toolTip">
+                <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;勾选此项，如果有多个与目标&lt;span style=&quot; font-weight:700; font-style:italic;&quot;&gt;开始时间&lt;/span&gt;相近的可选时间，选择时间最早项&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+               </property>
+               <property name="text">
+                <string>优先选择最早</string>
+               </property>
+               <property name="checked">
+                <bool>true</bool>
+               </property>
+              </widget>
+             </item>
+             <item row="10" column="4">
+              <widget class="QSpinBox" name="MaxEndTimeDiffSpinBox">
+               <property name="minimumSize">
+                <size>
+                 <width>0</width>
+                 <height>25</height>
+                </size>
+               </property>
+               <property name="maximumSize">
+                <size>
+                 <width>16777215</width>
+                 <height>25</height>
+                </size>
+               </property>
+               <property name="toolTip">
+                <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;期望的&lt;span style=&quot; font-weight:700; font-style:italic;&quot;&gt;结束时间&lt;/span&gt;不可用时，按照该偏差范围寻找最近可选时间&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+               </property>
+               <property name="maximum">
+                <number>120</number>
+               </property>
+              </widget>
+             </item>
+             <item row="3" column="4">
+              <widget class="QComboBox" name="RoomComboBox">
+               <property name="minimumSize">
+                <size>
+                 <width>0</width>
+                 <height>25</height>
+                </size>
+               </property>
+               <property name="maximumSize">
+                <size>
+                 <width>16777215</width>
+                 <height>25</height>
+                </size>
+               </property>
+              </widget>
+             </item>
              <item row="4" column="1">
               <widget class="QLabel" name="SeatIDLabel">
                <property name="minimumSize">
@@ -787,113 +879,47 @@
                </property>
               </widget>
              </item>
-             <item row="12" column="4">
-              <widget class="QDoubleSpinBox" name="ExpectDurationSpinBox">
-               <property name="minimumSize">
-                <size>
-                 <width>0</width>
-                 <height>25</height>
-                </size>
-               </property>
-               <property name="maximumSize">
-                <size>
-                 <width>16777215</width>
-                 <height>25</height>
-                </size>
-               </property>
-               <property name="toolTip">
-                <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;期望的预约时长，脚本会尽量满足&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-               </property>
-               <property name="maximum">
-                <double>8.000000000000000</double>
-               </property>
-              </widget>
-             </item>
-             <item row="0" column="4">
-              <widget class="QDateEdit" name="DateEdit">
-               <property name="minimumSize">
-                <size>
-                 <width>0</width>
-                 <height>25</height>
-                </size>
-               </property>
-               <property name="maximumSize">
-                <size>
-                 <width>16777215</width>
-                 <height>25</height>
-                </size>
-               </property>
-               <property name="date">
-                <date>
-                 <year>2025</year>
-                 <month>11</month>
-                 <day>1</day>
-                </date>
-               </property>
-              </widget>
-             </item>
-             <item row="7" column="1">
-              <widget class="QLabel" name="MaxBeginTimeDiffLabel">
-               <property name="minimumSize">
-                <size>
-                 <width>100</width>
-                 <height>25</height>
-                </size>
-               </property>
-               <property name="maximumSize">
-                <size>
-                 <width>100</width>
-                 <height>25</height>
-                </size>
-               </property>
-               <property name="text">
-                <string>最大时长偏差：</string>
-               </property>
-              </widget>
-             </item>
-             <item row="1" column="1">
-              <widget class="QLabel" name="PlaceLabel">
-               <property name="minimumSize">
-                <size>
-                 <width>100</width>
-                 <height>25</height>
-                </size>
-               </property>
-               <property name="maximumSize">
-                <size>
-                 <width>100</width>
-                 <height>25</height>
-                </size>
-               </property>
-               <property name="text">
-                <string>地点：</string>
-               </property>
-              </widget>
-             </item>
-             <item row="13" column="4">
-              <widget class="QCheckBox" name="SatisfyDurationCheckBox">
-               <property name="minimumSize">
-                <size>
-                 <width>0</width>
-                 <height>25</height>
-                </size>
-               </property>
-               <property name="maximumSize">
-                <size>
-                 <width>16777215</width>
-                 <height>25</height>
-                </size>
-               </property>
-               <property name="toolTip">
-                <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;勾选此项，会优先满足预约时长限制，当座位紧张时可能会导致&lt;span style=&quot; font-weight:700; font-style:italic;&quot;&gt;预约失败&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-               </property>
-               <property name="text">
-                <string>优先满足时长要求</string>
-               </property>
-               <property name="checked">
-                <bool>true</bool>
-               </property>
-              </widget>
+             <item row="4" column="4">
+              <layout class="QHBoxLayout" name="SeatIDLayout">
+               <item>
+                <widget class="QLineEdit" name="SeatIDEdit">
+                 <property name="minimumSize">
+                  <size>
+                   <width>0</width>
+                   <height>25</height>
+                  </size>
+                 </property>
+                 <property name="maximumSize">
+                  <size>
+                   <width>130</width>
+                   <height>25</height>
+                  </size>
+                 </property>
+                </widget>
+               </item>
+               <item>
+                <widget class="QPushButton" name="SelectSeatsButton">
+                 <property name="minimumSize">
+                  <size>
+                   <width>25</width>
+                   <height>25</height>
+                  </size>
+                 </property>
+                 <property name="maximumSize">
+                  <size>
+                   <width>25</width>
+                   <height>25</height>
+                  </size>
+                 </property>
+                 <property name="text">
+                  <string/>
+                 </property>
+                 <property name="icon">
+                  <iconset theme="edit-find"/>
+                 </property>
+                </widget>
+               </item>
+              </layout>
              </item>
             </layout>
            </widget>
@@ -1127,13 +1153,13 @@
              <widget class="QLineEdit" name="BrowseBrowserDriverEdit">
               <property name="minimumSize">
                <size>
-                <width>265</width>
+                <width>250</width>
                 <height>25</height>
                </size>
               </property>
               <property name="maximumSize">
                <size>
-                <width>260</width>
+                <width>300</width>
                 <height>25</height>
                </size>
               </property>

gui/ALMainWindow.py

@@ -70,7 +70,7 @@ class AutoLibWorker(QThread):
             os.path.exists(path) for path in self.__config_paths.values()
         ):
             self.showTraceSignal.emit(
-                "配置文件路径不存在，请检查配置文件路径是否正确。"
+                "配置文件路径不存在, 请检查配置文件路径是否正确。"
             )
             return False
         return True
@@ -102,7 +102,7 @@ class AutoLibWorker(QThread):
             self.showTraceSignal.emit("AutoLibrary 运行结束")
         except Exception as e:
             self.showTraceSignal.emit(
-                f"AutoLibrary 运行时发生异常：{e}"
+                f"AutoLibrary 运行时发生异常 : {e}"
             )
         finally:
             self.finishedSignal.emit()
@@ -127,10 +127,6 @@ class ALMainWindow(QMainWindow, Ui_ALMainWindow):
         self.setupUi(self)
         self.__input_queue = queue.Queue()
         self.__output_queue = queue.Queue()
-        self.__auto_lib = AutoLib(
-            self.__input_queue,
-            self.__output_queue,
-        )
         self.__config_paths = {
             "system":
             f"{QDir.toNativeSeparators(QFileInfo(sys.executable).absoluteDir().absoluteFilePath("system.json"))}",
@@ -167,13 +163,11 @@ class ALMainWindow(QMainWindow, Ui_ALMainWindow):
 
     def closeEvent(
         self,
-        event: QCloseEvent,
+        event: QCloseEvent
     ):
 
         if self.__timer and self.__timer.isActive():
             self.__timer.stop()
-        if self.__auto_lib:
-            self.__auto_lib.close()
         if self.__alConfigWidget:
             self.__alConfigWidget.close()
         super().closeEvent(event)
@@ -181,7 +175,7 @@ class ALMainWindow(QMainWindow, Ui_ALMainWindow):
 
     def appendToTextEdit(
         self,
-        text: str,
+        text: str
     ):
 
         cursor = self.MessageIOTextEdit.textCursor()
@@ -206,7 +200,7 @@ class ALMainWindow(QMainWindow, Ui_ALMainWindow):
         self,
         config_button_enabled: bool,
         start_button_enabled: bool,
-        stop_button_enabled: bool,
+        stop_button_enabled: bool
     ):
 
         self.ConfigButton.setEnabled(config_button_enabled)
@@ -216,7 +210,7 @@ class ALMainWindow(QMainWindow, Ui_ALMainWindow):
     @Slot()
     def showMsg(
         self,
-        msg: str,
+        msg: str
     ):
 
         self.appendToTextEdit(f"[{self.__class_name:<12}] >>> : {msg}")
@@ -224,7 +218,7 @@ class ALMainWindow(QMainWindow, Ui_ALMainWindow):
     @Slot()
     def showTrace(
         self,
-        msg: str,
+        msg: str
     ):
 
         timestamp = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime())
@@ -232,7 +226,7 @@ class ALMainWindow(QMainWindow, Ui_ALMainWindow):
 
     @Slot()
     def pollMsgQueue(
-        self,
+        self
     ):
 
         try:
@@ -245,9 +239,11 @@ class ALMainWindow(QMainWindow, Ui_ALMainWindow):
     @Slot(dict)
     def onConfigWidgetClosed(
         self,
-        config_paths: dict,
+        config_paths: dict
     ):
 
+        self.__alConfigWidget.configWidgetCloseSingal.disconnect(self.onConfigWidgetClosed)
+        self.__alConfigWidget.deleteLater()
         self.__alConfigWidget = None
         self.ConfigButton.setEnabled(True)
         self.StartButton.setEnabled(True)
@@ -256,7 +252,7 @@ class ALMainWindow(QMainWindow, Ui_ALMainWindow):
 
     @Slot()
     def onConfigButtonClicked(
-        self,
+        self
     ):
 
         if self.__alConfigWidget is None:
@@ -274,7 +270,7 @@ class ALMainWindow(QMainWindow, Ui_ALMainWindow):
 
     @Slot()
     def onStartButtonClicked(
-        self,
+        self
     ):
 
         self.setControlButtons(False, False, True)
@@ -294,8 +290,12 @@ class ALMainWindow(QMainWindow, Ui_ALMainWindow):
     ):
 
         if self.__auto_lib_thread and self.__auto_lib_thread.isRunning():
-            self.__auto_lib_thread.stop()
             self.showTrace("正在停止操作......")
+            self.__auto_lib_thread.stop()
+            self.__auto_lib_thread.wait()
+            self.showTrace("操作已停止")
+            self.__auto_lib_thread.finishedSignal.disconnect(self.onStopButtonClicked)
+            self.__auto_lib_thread.deleteLater()
         self.setControlButtons(True, True, False)
 
     @Slot()

license

@@ -0,0 +1,7 @@
+Copyright 2025 KenanZhu
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.