diff --git a/module/device/device.py b/module/device/device.py index a764607..455960f 100644 --- a/module/device/device.py +++ b/module/device/device.py @@ -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 diff --git a/module/device/platform/__init__.py b/module/device/platform/__init__.py new file mode 100644 index 0000000..0dbc4b9 --- /dev/null +++ b/module/device/platform/__init__.py @@ -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 diff --git a/module/device/platform/emulator_base.py b/module/device/platform/emulator_base.py index 19262b0..ecd026b 100644 --- a/module/device/platform/emulator_base.py +++ b/module/device/platform/emulator_base.py @@ -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): diff --git a/module/device/platform/emulator_windows.py b/module/device/platform/emulator_windows.py index f941833..ff69127 100644 --- a/module/device/platform/emulator_windows.py +++ b/module/device/platform/emulator_windows.py @@ -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): """