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

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

Browse Source
This commit is contained in:
GH Action - Upstream Sync
2025-02-03 16:24:34 +00:00
parent 8bb40eff6e 9a1129cf55
commit d9b4eaf2f5
10 changed files with 60 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
module/device/connection.py
View File

@@ -308,6 +308,23 @@ class Connection(ConnectionAttr):
logger.attr('ro.product.brand', res)
return 'waydroid' in res.lower()
@cached_property
@retry
def is_bluestacks_air(self):
# BlueStacks Air is the Mac version of BlueStacks
if not IS_MACINTOSH:
return False
if not self.is_ldplayer_bluestacks_family:
return False
# [bst.installed_images]: [Tiramisu64]
# [bst.instance]: [Tiramisu64]
# Tiramisu64 is Android 13 and BlueStacks Air is the only BlueStacks version that uses Android 13
res = self.adb_getprop('bst.installed_images')
logger.attr('bst.installed_images', res)
if 'Tiramisu64' in res:
return True
return False
@cached_property
@retry
def nemud_app_keep_alive(self) -> str:
@@ -401,11 +418,13 @@ class Connection(ConnectionAttr):
host = '127.0.0.1'
if IS_LINUX and host == '127.0.1.1':
host = '127.0.0.1'
if self.is_bluestacks_air:
host = '127.0.0.1'
logger.info(f'Connecting to local emulator, using host {host}')
port = random_port(self.config.FORWARD_PORT_RANGE)
# For AVD instance
if self.is_avd:
if self.is_avd or self.is_bluestacks_air:
return host, port, "10.0.2.2", port
return host, port, host, port