From 60bb0f2a5609f7a5f36b9ef93ce58392043931be Mon Sep 17 00:00:00 2001
From: veadex <65024689+veadex@users.noreply.github.com>
Date: Thu, 12 Feb 2026 17:34:29 +0800
Subject: [PATCH 1/2] =?UTF-8?q?Revert=20"fix:=20=E4=BF=AE=E5=A4=8Dmumu=205?=
 =?UTF-8?q?.15.3=20info=E6=97=A0=E6=B3=95=E6=AD=A3=E7=A1=AE=E8=AF=86?=
 =?UTF-8?q?=E5=88=AB=20(#326)"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 3e5021401f782bc8446800f8c85e9c31ca1a5461.
---
 autowsgr/timer/controllers/os_controller.py | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/autowsgr/timer/controllers/os_controller.py b/autowsgr/timer/controllers/os_controller.py
index 6b6c7b00..e279a217 100644
--- a/autowsgr/timer/controllers/os_controller.py
+++ b/autowsgr/timer/controllers/os_controller.py
@@ -106,10 +106,7 @@ def is_android_online(self) -> bool:
                 return raw_res == 'running'
             case EmulatorType.mumu:
                 raw_res = self.__mumuconsole('is_android_started')
-                try:
-                    raw_res = json.loads(raw_res)['player_state'] == 'start_finished'
-                except KeyError:
-                    raw_res = False
+                raw_res = json.loads(raw_res)['is_android_started']
                 self.logger.debug('EmulatorType status: ' + f'{raw_res}')
                 return raw_res
             case EmulatorType.yunshouji:
@@ -215,7 +212,7 @@ def __mumuconsole(self, command, command_arg='', global_command=False) -> str:
         # :rtype: str
         console_dir = os.path.join(os.path.dirname(self.emulator_start_cmd), 'MuMuManager.exe')
         num = int(re.search(r'[:-]\s*(\d+)', self.emulator_name).group(1))
-        emulator_index = (num - 16384) // 32 if num >= 16384 else (num - 5555) // 2
+        emulator_index = (num - 16384) / 32 if num >= 16384 else (num - 5554) / 2
         order = 'info' if command == 'is_android_started' else 'control'
 
         if not global_command:

From e75c98a562c63a1483ddc2b3d96bf2b0caea72b7 Mon Sep 17 00:00:00 2001
From: veadex <65024689+veadex@users.noreply.github.com>
Date: Thu, 12 Feb 2026 17:35:44 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat=EF=BC=9A=E7=89=88=E6=9C=AC=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 autowsgr/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/autowsgr/__init__.py b/autowsgr/__init__.py
index 7bf38315..340fb6f2 100644
--- a/autowsgr/__init__.py
+++ b/autowsgr/__init__.py
@@ -1 +1 @@
-__version__ = '1.5.7'
+__version__ = '1.5.8'