fix(LibReserve): fix the failure to select nearest reserve time when the max time difference is 0

The previous implementation only considered the case when more than one nearest time exists,
so we introduced the prefer_early flag to decide which one to be selected.But the comparsion
mistakenly omitted the edge case when the difference is 0.

AutoLib.py

@@ -203,6 +203,7 @@ class AutoLib(MsgBase):
             f"用户配置文件路径: {self.__users_config_reader.configPath()}")
 
         for user in users:
+            user_counter["current"] += 1
             self._showTrace(f"正在处理第 {user_counter["current"]}/{len(users)} 个用户: {user['username']}......")
             if self.__run(
                 username=user["username"],

LibReserve.py

@@ -403,9 +403,9 @@ class LibReserve(LibOperator):
                 if abs_diff < best_time_diff or (
                     abs_diff == best_time_diff and (
                         # prefer earlier time
-                        (prefer_earlier and actual_diff < 0) or
+                        (prefer_earlier and actual_diff <= 0) or
                         # prefer later time
-                        (not prefer_earlier and actual_diff > 0)
+                        (not prefer_earlier and actual_diff >= 0)
                     )
                 ):
                     best_time_diff = abs_diff

gui/ALConfigWidget.py

@@ -268,7 +268,7 @@ class ALConfigWidget(QWidget, Ui_ALConfigWidget):
         self.DateEdit.setDate(QDate.currentDate())
         self.DateEdit.setMinimumDate(QDate.currentDate())
         self.DateEdit.setMaximumDate(QDate.currentDate())
-        if QTime.currentTime() > QTime(19, 0, 0) and QTime.currentTime() < QTime(23, 0, 0):
+        if QTime.currentTime() > QTime(18, 0, 0) and QTime.currentTime() < QTime(23, 0, 0):
             self.DateEdit.setMaximumDate(QDate.currentDate().addDays(1))
         self.BeginTimeEdit.setTime(QTime.currentTime())
         self.PreferEarlyBeginTimeCheckBox.setChecked(False)
@@ -479,7 +479,7 @@ class ALConfigWidget(QWidget, Ui_ALConfigWidget):
         if not config_path:
             config_path = QFileDialog.getOpenFileName(
                 self,
-                "选择配置文件 - AutoLibrary",
+                "从现有配置文件中加载 - AutoLibrary",
                 f"{QDir.toNativeSeparators(QDir.currentPath())}",
                 "JSON 文件 (*.json);;所有文件 (*)"
             )[0]
@@ -489,16 +489,12 @@ class ALConfigWidget(QWidget, Ui_ALConfigWidget):
             system_config = self.loadSystemConfig(config_path)
             users_config = self.loadUsersConfig(config_path)
             if system_config is not None:
-                self.__config_paths["system"] = config_path
                 self.__system_config_data.update(system_config)
                 self.setSystemConfigToWidget(self.__system_config_data)
-                self.CurrentSystemConfigEdit.setText(config_path)
                 return True
             if users_config is not None:
-                self.__config_paths["users"] = config_path
                 self.__users_config_data.update(users_config)
                 self.fillUsersList(self.__users_config_data)
-                self.CurrentUserConfigEdit.setText(config_path)
                 return True
         except:
             return False
@@ -644,7 +640,9 @@ class ALConfigWidget(QWidget, Ui_ALConfigWidget):
         )[0]
         if system_config_path:
             system_config_path = QDir.toNativeSeparators(system_config_path)
-            self.loadConfig(system_config_path)
+            if self.loadConfig(system_config_path):
+                self.__config_paths["system"] = system_config_path
+                self.CurrentSystemConfigEdit.setText(system_config_path)
 
     @Slot()
     def onBrowseCurrentUserConfigButtonClicked(
@@ -659,7 +657,9 @@ class ALConfigWidget(QWidget, Ui_ALConfigWidget):
         )[0]
         if users_config_path:
             users_config_path = QDir.toNativeSeparators(users_config_path)
-            self.loadConfig(users_config_path)
+            if self.loadConfig(users_config_path):
+                self.__config_paths["users"] = users_config_path
+                self.CurrentUserConfigEdit.setText(users_config_path)
 
     @Slot()
     def onBrowseExportSystemConfigButtonClicked(

gui/ALConfigWidget.ui

@@ -560,6 +560,9 @@
                  <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>
@@ -601,6 +604,9 @@
                  <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>
@@ -691,6 +697,9 @@
                  <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>
@@ -710,6 +719,9 @@
                  <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>
@@ -789,6 +801,9 @@
                  <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>
@@ -869,6 +884,9 @@
                  <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>
@@ -1046,6 +1064,12 @@
               <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="whatsThis">
+             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+            </property>
             <property name="currentText">
              <string>edge</string>
             </property>
@@ -1113,6 +1137,12 @@
                 <height>25</height>
                </size>
               </property>
+              <property name="toolTip">
+               <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;详情请参阅根目录中的 manual.html&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+              </property>
+              <property name="whatsThis">
+               <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+              </property>
              </widget>
             </item>
             <item>
@@ -1150,6 +1180,12 @@
               <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="whatsThis">
+             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+            </property>
             <property name="text">
              <string>无头模式</string>
             </property>
@@ -1237,6 +1273,9 @@
               <height>25</height>
              </size>
             </property>
+            <property name="whatsThis">
+             <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="text">
              <string>主机URL：</string>
             </property>
@@ -1758,7 +1797,7 @@
         </size>
        </property>
        <property name="text">
-        <string>载入配置</string>
+        <string>加载配置</string>
        </property>
       </widget>
      </item>

gui/ALMainWindow.ui

@@ -127,6 +127,12 @@
           <height>30</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="whatsThis">
+         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+        </property>
         <property name="styleSheet">
          <string notr="true">background-color: rgb(10, 170, 10);
 font: 12pt &quot;Microsoft YaHei UI&quot;;