sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-21 04:25:38 +08:00
Code Activity

Fix: Convert emulator-* when finding emulator instances

Browse Source
This commit is contained in:
LmeSzinc
2024-04-11 23:56:55 +08:00
parent 76da1ce139
commit 63b76fdb0e
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
module/device/platform/platform_base.py
View File

@@ -5,6 +5,7 @@ from pydantic import BaseModel
from module.base.decorator import cached_property, del_cached_property from module.base.decorator import cached_property, del_cached_property
from module.device.connection import Connection from module.device.connection import Connection
from module.device.method.utils import get_serial_pair
from module.device.platform.emulator_base import EmulatorInstanceBase, EmulatorManagerBase from module.device.platform.emulator_base import EmulatorInstanceBase, EmulatorManagerBase
from module.logger import logger from module.logger import logger
from module.map.map_grids import SelectedGrids from module.map.map_grids import SelectedGrids
@@ -80,8 +81,14 @@ class PlatformBase(Connection, EmulatorManagerBase):
path=data.path, path=data.path,
name=data.name, name=data.name,
) )
# Redirect emulator-5554 to 127.0.0.1:5555
serial = self.serial
port_serial, _ = get_serial_pair(self.serial)
if port_serial is not None:
serial = port_serial
instance = self.find_emulator_instance( instance = self.find_emulator_instance(
serial=str(self.config.Emulator_Serial).strip(), serial=serial,
name=data.name, name=data.name,
path=data.path, path=data.path,
emulator=data.emulator, emulator=data.emulator,