LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-20 15:19:29 +08:00
Code Activity

Merge branch 'LmeSzinc:master' into 20230309

Browse Source
This commit is contained in:
Zuosizhu
2024-04-11 23:14:52 +08:00
committed by GitHub
parent 49b4547270 317dd90e84
commit f5b3d11eac
6 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
module/device/device.py
View File

@@ -107,20 +107,21 @@ class Device(Screenshot, Control, AppControl):
# Set
with self.config.multi_set():
self.config.Emulator_ScreenshotMethod = method
if method == 'nemu_ipc':
self.config.Emulator_ControlMethod = 'nemu_ipc'
# if method == 'nemu_ipc':
# self.config.Emulator_ControlMethod = 'nemu_ipc'
def method_check(self):
"""
Check combinations of screenshot method and control methods
"""
# nemu_ipc should be together
if self.config.Emulator_ScreenshotMethod == 'nemu_ipc' and self.config.Emulator_ControlMethod != 'nemu_ipc':
logger.warning('When using nemu_ipc, both screenshot and control should use nemu_ipc')
self.config.Emulator_ControlMethod = 'nemu_ipc'
if self.config.Emulator_ScreenshotMethod != 'nemu_ipc' and self.config.Emulator_ControlMethod == 'nemu_ipc':
logger.warning('When not using nemu_ipc, both screenshot and control should not use nemu_ipc')
self.config.Emulator_ControlMethod = 'minitouch'
# if self.config.Emulator_ScreenshotMethod == 'nemu_ipc' and self.config.Emulator_ControlMethod != 'nemu_ipc':
# logger.warning('When using nemu_ipc, both screenshot and control should use nemu_ipc')
# self.config.Emulator_ControlMethod = 'nemu_ipc'
# if self.config.Emulator_ScreenshotMethod != 'nemu_ipc' and self.config.Emulator_ControlMethod == 'nemu_ipc':
# logger.warning('When not using nemu_ipc, both screenshot and control should not use nemu_ipc')
# self.config.Emulator_ControlMethod = 'minitouch'
pass
def handle_night_commission(self, daily_trigger='21:00', threshold=30):
"""