refactor: streamline platform imports and remove redundant type method

This commit is contained in:
2026-07-05 18:47:10 +08:00
parent d0e6c78cc1
commit ce8eb1c452
4 changed files with 9 additions and 16 deletions
+2 -7
View File
@@ -1,9 +1,9 @@
import collections
import sys
from module.base.timer import Timer
from module.device.app_control import AppControl
from module.device.control import Control
from module.device.platform import Platform
from module.device.screenshot import Screenshot
from module.exception import (
EmulatorNotRunningError,
@@ -14,11 +14,6 @@ from module.exception import (
)
from module.logger import logger
if sys.platform == 'win32':
from module.device.platform.platform_windows import PlatformWindows as Platform
else:
from module.device.platform.platform_base import PlatformBase as Platform
def show_function_call():
"""
@@ -85,7 +80,7 @@ class Device(Screenshot, Control, AppControl, Platform):
# Auto-fill emulator info
if self.config.EmulatorInfo_Emulator == 'auto':
_ = self.emulator_instance
self.screenshot_interval_set()
# Auto-select the fastest screenshot method
+6
View File
@@ -0,0 +1,6 @@
import sys
if sys.platform == 'win32':
from module.device.platform.platform_windows import PlatformWindows as Platform
else:
from module.device.platform.platform_base import PlatformBase as Platform
+1 -1
View File
@@ -54,7 +54,7 @@ class EmulatorInstanceBase:
Returns:
str: Emulator type, such as Emulator.NoxPlayer
"""
return EmulatorBase.path_to_type(self.path)
return self.emulator.type
@cached_property
def emulator(self):
@@ -56,14 +56,6 @@ def abspath(path):
class EmulatorInstance(EmulatorInstanceBase):
@cached_property
def type(self) -> str:
"""
Returns:
str: Emulator type, such as Emulator.NoxPlayer
"""
return Emulator.path_to_type(self.path)
@cached_property
def emulator(self):
"""