mirror of
https://github.com/0O0o0oOoO00/Alas.git
synced 2026-05-18 08:19:29 +08:00
Merge branch 'LmeSzinc:master' into 20230309
This commit is contained in:
@@ -1,6 +1,12 @@
|
||||
import collections
|
||||
from datetime import datetime
|
||||
|
||||
# Patch pkg_resources before importing adbutils and uiautomator2
|
||||
from module.device.pkg_resources import get_distribution
|
||||
|
||||
# Just avoid being removed by import optimization
|
||||
_ = get_distribution
|
||||
|
||||
from module.base.timer import Timer
|
||||
from module.config.utils import get_server_next_update
|
||||
from module.device.app_control import AppControl
|
||||
@@ -92,6 +98,13 @@ class Device(Screenshot, Control, AppControl):
|
||||
if not self.config.is_template_config and self.config.Emulator_ScreenshotMethod == 'auto':
|
||||
self.run_simple_screenshot_benchmark()
|
||||
|
||||
# Early init
|
||||
if self.config.is_actual_task:
|
||||
if self.config.Emulator_ControlMethod == 'MaaTouch':
|
||||
self.early_maatouch_init()
|
||||
if self.config.Emulator_ControlMethod == 'minitouch':
|
||||
self.early_minitouch_init()
|
||||
|
||||
def run_simple_screenshot_benchmark(self):
|
||||
"""
|
||||
Perform a screenshot method benchmark, test 3 times on each method.
|
||||
|
||||
Reference in New Issue
Block a user