Skip to content

Commit

Permalink
fix #229
Browse files Browse the repository at this point in the history
  • Loading branch information
rafa0128 committed Oct 23, 2023
1 parent 1ff4dd0 commit 258be2d
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 3 deletions.
6 changes: 6 additions & 0 deletions FAQ.md
Original file line number Diff line number Diff line change
Expand Up @@ -106,3 +106,9 @@
* Cpu、Memory、Network、FPS
* 界面如果不选择进程就点击Start收集,那么默认使用的是这个包名的主进程。
* 界面选择了app的某个进程收集,如果收集过程中将app杀掉,然后再恢复后自动使用的是主进程,有可能和你界面选择的进程不一致。


## 2️⃣0️⃣ Android/iOS最高支持的系统版本?

- Android: 13.0
- iOS: 16.5
2 changes: 1 addition & 1 deletion solox/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

from __future__ import absolute_import

__version__ = '2.7.9'
__version__ = '2.8.0'
7 changes: 5 additions & 2 deletions solox/public/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,11 @@ def getDeviceIds(self):

def getDevicesName(self, deviceId):
"""Get the device name of the Android corresponding device ID"""
devices_name = os.popen(f'{self.adb} -s {deviceId} shell getprop ro.product.model').readlines()
return devices_name[0].strip()
try:
devices_name = os.popen(f'{self.adb} -s {deviceId} shell getprop ro.product.model').readlines()[0].strip()
except Exception:
devices_name = os.popen(f'{self.adb} -s {deviceId} shell getprop ro.product.model').buffer.readlines()[0].decode("utf-8").strip()
return devices_name

def getDevices(self):
"""Get all Android devices"""
Expand Down

0 comments on commit 258be2d

Please sign in to comment.