mirror of
https://gitee.com/sui-feng-cb/AzurLaneAutoScript1
synced 2026-03-13 12:37:01 +08:00
Rename configs in device, and research
This commit is contained in:
@@ -1,9 +1,11 @@
|
||||
import os
|
||||
import time
|
||||
from collections import deque
|
||||
from datetime import datetime
|
||||
from io import BytesIO
|
||||
|
||||
from PIL import Image
|
||||
from cached_property import cached_property
|
||||
from retrying import retry
|
||||
|
||||
from module.base.timer import Timer
|
||||
@@ -49,7 +51,7 @@ class Screenshot(AScreenCap):
|
||||
screenshot = self.adb_shell(['screencap', '-p'])
|
||||
return self._process_screenshot(screenshot)
|
||||
|
||||
@retry(wait_fixed=5000, stop_max_attempt_number=10)
|
||||
# @retry(wait_fixed=5000, stop_max_attempt_number=10)
|
||||
# @timer
|
||||
def screenshot(self):
|
||||
"""
|
||||
@@ -58,7 +60,7 @@ class Screenshot(AScreenCap):
|
||||
"""
|
||||
self._screenshot_interval_timer.wait()
|
||||
self._screenshot_interval_timer.reset()
|
||||
method = self.config.DEVICE_SCREENSHOT_METHOD
|
||||
method = self.config.Emulator_ControlMethod
|
||||
|
||||
if method == 'aScreenCap':
|
||||
self.image = self._screenshot_ascreencap()
|
||||
@@ -68,11 +70,15 @@ class Screenshot(AScreenCap):
|
||||
self.image = self._screenshot_adb()
|
||||
|
||||
self.image.load()
|
||||
if self.config.ENABLE_ERROR_LOG_AND_SCREENSHOT_SAVE:
|
||||
logger.screenshot_deque.append({'time': datetime.now(), 'image': self.image})
|
||||
if self.config.Error_SaveError:
|
||||
self.screenshot_deque.append({'time': datetime.now(), 'image': self.image})
|
||||
|
||||
return self.image
|
||||
|
||||
@cached_property
|
||||
def screenshot_deque(self):
|
||||
return deque(maxlen=int(self.config.Error_ScreenshotLength))
|
||||
|
||||
def save_screenshot(self, genre='items', interval=None, to_base_folder=False):
|
||||
"""Save a screenshot. Use millisecond timestamp as file name.
|
||||
|
||||
|
||||
Reference in New Issue
Block a user