Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feature: 增加对iOS模拟器的支持 #22

Closed
wants to merge 26 commits into from

Conversation

Vancheung
Copy link

  1. 支持获取模拟器列表命令::xcrun simctl list devices
  2. 在list_devices()、udid2name()方法中支持获取已启动的模拟器udid、名称
  3. 在udid2product()方法中增加iPhone 12 机型,且在ideviceinfo获取不到ProductType时返回iPhone Simulator
  4. 调整run_webdriveragent方法,先指定self._wda_port和self._mjpeg_port,如果设备类型为模拟器,则xcodebuild wda时增加['USE_PORT=' + str(self._wda_port), 'MJPEG_SERVER_PORT=' + str(self._mjpeg_port)],且无需执行./iproxy.sh

Vancheung and others added 14 commits May 24, 2021 16:27
1. 支持获取模拟器列表命令::xcrun simctl list devices
2. 在list_devices()、udid2name()方法中支持获取已启动的模拟器udid、名称
3. 在udid2product()方法中增加iPhone 12 机型,且在ideviceinfo获取不到ProductType时返回iPhone Simulator
4. 调整run_webdriveragent方法,先指定self._wda_port和self._mjpeg_port,如果设备类型为模拟器,则xcodebuild wda时增加['USE_PORT=' + str(self._wda_port), 'MJPEG_SERVER_PORT=' + str(self._mjpeg_port)],且无需执行./iproxy.sh
存在以下几种情况:
    iPhone 8 (50E70CB1-3E3B-4C70-84A6-9A644D4266AF) (Booted) 
    iPod touch (7th generation) (24220742-1CC6-46F2-9554-0ABB77A37B7C) (Booted) 
    iPad Pro (11-inch) (2nd generation) (0B48618F-86B5-4A35-8C72-07E036A7321A) (Booted) 
因此,re.findall(p, i)[0]  ===>  re.findall(p, i)[-2]
修复误编辑
feat-leave-ios: 移除对iOS的依赖
@chenhengjie123
Copy link
Contributor

感谢提交,但目前代码存在冲突,无法合并。请先解决冲突?

Vancheung and others added 12 commits January 4, 2022 11:04
1. 支持获取模拟器列表命令::xcrun simctl list devices
2. 在list_devices()、udid2name()方法中支持获取已启动的模拟器udid、名称
3. 在udid2product()方法中增加iPhone 12 机型,且在ideviceinfo获取不到ProductType时返回iPhone Simulator
4. 调整run_webdriveragent方法,先指定self._wda_port和self._mjpeg_port,如果设备类型为模拟器,则xcodebuild wda时增加['USE_PORT=' + str(self._wda_port), 'MJPEG_SERVER_PORT=' + str(self._mjpeg_port)],且无需执行./iproxy.sh
存在以下几种情况:
    iPhone 8 (50E70CB1-3E3B-4C70-84A6-9A644D4266AF) (Booted) 
    iPod touch (7th generation) (24220742-1CC6-46F2-9554-0ABB77A37B7C) (Booted) 
    iPad Pro (11-inch) (2nd generation) (0B48618F-86B5-4A35-8C72-07E036A7321A) (Booted) 
因此,re.findall(p, i)[0]  ===>  re.findall(p, i)[-2]
修复误编辑
@Vancheung
Copy link
Author

感谢提交,但目前代码存在冲突,无法合并。请先解决冲突?

该分支commit比较混乱,重新提交了一个PR。#29 (comment)

@Vancheung Vancheung closed this Jan 4, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants