功能更新: BP阶段提示红蓝方; 自动重连

app/common/config.py

@@ -63,6 +63,10 @@ class Config(QConfig):
     enableAutoAcceptMatching = ConfigItem("Functions",
                                           "EnableAutoAcceptMatching", False,
                                           BoolValidator())
+    enableAutoReconnect = ConfigItem("Functions",
+                                     "EnableAutoReconnect", False,
+                                     BoolValidator())
+
     autoAcceptMatchingDelay = RangeConfigItem(
         "Functions", "AutoAcceptMatchingDelay", 0, RangeValidator(0, 11))
 
@@ -83,8 +87,8 @@ class Config(QConfig):
     )
 
     enableCheckUpdate = ConfigItem("General",
-                                          "EnableCheckUpdate", True,
-                                          BoolValidator())
+                                   "EnableCheckUpdate", True,
+                                   BoolValidator())
 
     # enableCopyPlayersInfo = ConfigItem("Functions", "EnableCopyPlayersInfo",
     #                                    False, BoolValidator())

app/common/icons.py

@@ -43,6 +43,7 @@ class Icon(FluentIconBase, Enum):
     SETTING = 'Setting'
     FILTER = 'Filter'
     UPDATE = 'Update'
+    CONNECTION = "Connection"
 
     def path(self, theme=Theme.AUTO):
         return f'./app/resource/icons/{self.value}_{getIconColor(theme)}.svg'

app/lol/connector.py

@@ -406,6 +406,15 @@ def setTierShowed(self, queue, tier, division):
 
         return res
 
+    @retry()
+    def reconnect(self):
+        """
+        重新连接
+
+        @return:
+        """
+        return self.__post("/lol-gameflow/v1/reconnect")
+
     @retry()
     def removeTokens(self):
         reference = self.__get("/lol-chat/v1/me").json()
@@ -498,6 +507,12 @@ def getGameStatus(self):
 
         return res
 
+    @retry()
+    def getMapSide(self):
+        js = self.__get("/lol-champ-select/v1/pin-drop-notification").json()
+
+        return js.get("mapSide", "")
+
     @retry()
     def getReadyCheckStatus(self):
         res = self.__get("/lol-matchmaking/v1/ready-check").json()

app/view/auxiliary_interface.py

@@ -71,6 +71,11 @@ def __init__(self, parent=None):
                 "Accept match making automatically after the number of seconds you set"),
             cfg.enableAutoAcceptMatching, cfg.autoAcceptMatchingDelay,
             self.gameGroup)
+        self.autoReconnectCard = SwitchSettingCard(
+            Icon.CONNECTION,
+            self.tr("Auto reconnect"),
+            self.tr("Automatically reconnect when disconnected"),
+            cfg.enableAutoReconnect, self.gameGroup)
         self.spectateCard = SpectateCard(
             self.tr("Spectate"),
             self.tr("Spectate live game of summoner in the same environment"),
@@ -115,6 +120,7 @@ def __initLayout(self):
 
         # 游戏
         self.gameGroup.addSettingCard(self.autoAcceptMatchingCard)
+        self.gameGroup.addSettingCard(self.autoReconnectCard)
         self.gameGroup.addSettingCard(self.autoSelectChampionCard)
         # self.gameGroup.addSettingCard(self.copyPlayersInfoCard)
         self.gameGroup.addSettingCard(self.createPracticeLobbyCard)
@@ -163,6 +169,7 @@ def setEnabled(self, a0: bool) -> None:
             self.autoSelectChampionCard.switchButton.setEnabled(True)
 
         self.lockConfigCard.setEnabled(a0)
+        self.autoReconnectCard.setEnabled(a0)
 
         return super().setEnabled(a0)
 

app/view/main_window.py

@@ -812,6 +812,13 @@ def __onGameStatusChanged(self, status):
             self.__onGameEnd()
         elif status == 'ChampSelect':
             title = self.tr("Selecting Champions")
+
+            # 在标题添加所处队伍
+            mapSide = connector.getMapSide()
+            if mapSide:
+                mapSide = self.tr("Blue Team") if mapSide == "blue" else self.tr("Red Team")
+                title = title + " - " + mapSide
+
             self.__onChampionSelectBegin()
             self.isChampSelected = True
         elif status == 'GameStart':
@@ -838,6 +845,9 @@ def __onGameStatusChanged(self, status):
         elif status == 'Matchmaking':
             title = self.tr("Match making")
             self.__onGameEnd()
+        elif status == "Reconnect":  # 等待重连
+            title = self.tr("Waiting reconnect")
+            self.__onReconnect()
 
         if not isGaming and self.isGaming:
             self.__updateCareerGames()
@@ -861,6 +871,19 @@ def _():
 
             threading.Thread(target=_).start()
 
+    def __onReconnect(self):
+        """
+        自动重连
+        @return:
+        """
+        if cfg.get(cfg.enableAutoReconnect):
+            def _():
+                while connector.getGameStatus() == "Reconnect":
+                    time.sleep(.3)  # 掉线立刻重连会无效;
+                    connector.reconnect()
+
+            threading.Thread(target=_).start()
+
     # 英雄选择界面触发事件
     def __onChampionSelectBegin(self):