sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-13 00:57:01 +08:00
Code Activity

Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript

Browse Source
This commit is contained in:
SevCrane
2024-06-05 23:53:03 +08:00
parent 5e482958f6 24aa3e00bd
commit 3cb29a9a37
179 changed files with 17873 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
module/device/method/adb.py
View File

@@ -11,7 +11,11 @@ from module.base.decorator import Config
from module.device.connection import Connection
from module.device.method.utils import (RETRY_TRIES, retry_sleep, remove_prefix, handle_adb_error,
ImageTruncated, PackageNotInstalled)
<<<<<<< HEAD
from module.exception import RequestHumanTakeover, ScriptError, EmulatorNotRunningError
=======
from module.exception import RequestHumanTakeover, ScriptError
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
from module.logger import logger
@@ -57,6 +61,7 @@ def retry(func):
def init():
pass
<<<<<<< HEAD
except AdbError as e:
logger.exception(e)
import sys
@@ -75,6 +80,8 @@ def retry(func):
def init():
pass
=======
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
# Unknown
except Exception as e:
logger.exception(e)