Skip to content

Commit 307baf4

Browse files
author
finch
committed
Add: Waydroid emulator support
1 parent 4b85d18 commit 307baf4

File tree

12 files changed

+403
-11
lines changed

12 files changed

+403
-11
lines changed

module/config/argument/args.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,8 @@
163163
"MuMuPlayer",
164164
"MuMuPlayerX",
165165
"MuMuPlayer12",
166-
"MEmuPlayer"
166+
"MEmuPlayer",
167+
"Waydroid"
167168
]
168169
},
169170
"name": {

module/config/argument/argument.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ EmulatorInfo:
7373
MuMuPlayerX,
7474
MuMuPlayer12,
7575
MEmuPlayer,
76+
Waydroid,
7677
]
7778
name:
7879
value: null

module/config/config_generated.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class GeneratedConfig:
2727
Emulator_AdbRestart = False
2828

2929
# Group `EmulatorInfo`
30-
EmulatorInfo_Emulator = 'auto' # auto, NoxPlayer, NoxPlayer64, BlueStacks4, BlueStacks5, BlueStacks4HyperV, BlueStacks5HyperV, LDPlayer3, LDPlayer4, LDPlayer9, MuMuPlayer, MuMuPlayerX, MuMuPlayer12, MEmuPlayer
30+
EmulatorInfo_Emulator = 'auto' # auto, NoxPlayer, NoxPlayer64, BlueStacks4, BlueStacks5, BlueStacks4HyperV, BlueStacks5HyperV, LDPlayer3, LDPlayer4, LDPlayer9, MuMuPlayer, MuMuPlayerX, MuMuPlayer12, MEmuPlayer, Waydroid
3131
EmulatorInfo_name = None
3232
EmulatorInfo_path = None
3333

module/config/i18n/en-US.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,8 @@
472472
"MuMuPlayer": "MuMu Player",
473473
"MuMuPlayerX": "MuMu Player X",
474474
"MuMuPlayer12": "MuMu Player 12",
475-
"MEmuPlayer": "MEmu Player"
475+
"MEmuPlayer": "MEmu Player",
476+
"Waydroid": "Waydroid"
476477
},
477478
"name": {
478479
"name": "Emulator Instance Name",

module/config/i18n/ja-JP.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,8 @@
472472
"MuMuPlayer": "MuMuPlayer",
473473
"MuMuPlayerX": "MuMuPlayerX",
474474
"MuMuPlayer12": "MuMuPlayer12",
475-
"MEmuPlayer": "MEmuPlayer"
475+
"MEmuPlayer": "MEmuPlayer",
476+
"Waydroid": "Waydroid"
476477
},
477478
"name": {
478479
"name": "EmulatorInfo.name.name",

module/config/i18n/zh-CN.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,8 @@
472472
"MuMuPlayer": "MuMu模拟器",
473473
"MuMuPlayerX": "MuMu模拟器X",
474474
"MuMuPlayer12": "MuMu模拟器12",
475-
"MEmuPlayer": "逍遥模拟器"
475+
"MEmuPlayer": "逍遥模拟器",
476+
"Waydroid": "Waydroid模拟器"
476477
},
477478
"name": {
478479
"name": "模拟器实例名称",
@@ -2738,4 +2739,4 @@
27382739
"ChooseFile": "选择文件"
27392740
}
27402741
}
2741-
}
2742+
}

module/config/i18n/zh-TW.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,8 @@
472472
"MuMuPlayer": "MuMu模擬器",
473473
"MuMuPlayerX": "MuMu模擬器X",
474474
"MuMuPlayer12": "MuMu模擬器12",
475-
"MEmuPlayer": "逍遙模擬器"
475+
"MEmuPlayer": "逍遙模擬器",
476+
"Waydroid": "Waydroid模擬器"
476477
},
477478
"name": {
478479
"name": "模擬器實例名稱",
@@ -2738,4 +2739,4 @@
27382739
"ChooseFile": "選擇檔案"
27392740
}
27402741
}
2741-
}
2742+
}

module/device/device.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
from lxml import etree
55

6-
from module.device.env import IS_WINDOWS
6+
from module.device.env import IS_LINUX, IS_WINDOWS
77
# Patch pkg_resources before importing adbutils and uiautomator2
88
from module.device.pkg_resources import get_distribution
99

@@ -89,7 +89,7 @@ def __init__(self, *args, **kwargs):
8989
raise RequestHumanTakeover
9090

9191
# Auto-fill emulator info
92-
if IS_WINDOWS and self.config.EmulatorInfo_Emulator == 'auto':
92+
if (IS_WINDOWS or IS_LINUX) and self.config.EmulatorInfo_Emulator == 'auto':
9393
_ = self.emulator_instance
9494

9595
self.screenshot_interval_set()

module/device/platform/__init__.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
from module.device.env import IS_WINDOWS
1+
from module.device.env import IS_LINUX, IS_WINDOWS
22

33
if IS_WINDOWS:
44
from module.device.platform.platform_windows import PlatformWindows as Platform
5+
elif IS_LINUX:
6+
from module.device.platform.platform_linux import PlatformLinux as Platform
57
else:
68
from module.device.platform.platform_base import PlatformBase as Platform

module/device/platform/emulator_base.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,7 @@ class EmulatorBase:
161161
MuMuPlayer12 = 'MuMuPlayer12'
162162
MuMuPlayerFamily = [MuMuPlayer, MuMuPlayerX, MuMuPlayer12]
163163
MEmuPlayer = 'MEmuPlayer'
164+
Waydroid = 'Waydroid'
164165

165166
@classmethod
166167
def path_to_type(cls, path: str) -> str:

0 commit comments

Comments
 (0)