Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions uiautomator2/_selector.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import logging
import time
import warnings
from typing import Optional, Tuple
from typing import Optional, Tuple, List, Dict
Comment thread
codeskyblue marked this conversation as resolved.

from PIL import Image
from retry import retry
Expand Down Expand Up @@ -126,7 +126,11 @@ def exists(self):
def info(self):
'''ui object info.'''
return self.jsonrpc.objInfo(self.selector)


def info_list(self) -> List[Dict]:
'''all matched ui objects info list.'''
return self.jsonrpc.objInfoOfAllInstances(self.selector)

def screenshot(self, display_id: Optional[int] = None) -> Image.Image:
im = self.session.screenshot(display_id=display_id)
return im.crop(self.bounds())
Expand Down Expand Up @@ -477,10 +481,13 @@ def under(rect1, rect2):
def __view_beside(self, onsideof, **kwargs):
bounds = self.info["bounds"]
min_dist, found = -1, None
for ui in UiObject(self.session, Selector(**kwargs)):
dist = onsideof(bounds, ui.info["bounds"])
info_list = UiObject(self.session, Selector(**kwargs)).info_list()
for index, info in enumerate(info_list):
dist = onsideof(bounds, info["bounds"])
if dist >= 0 and (min_dist < 0 or dist < min_dist):
min_dist, found = dist, ui
ui_selector = Selector(**kwargs)
Comment thread
codeskyblue marked this conversation as resolved.
ui_selector.update_instance(index)
min_dist, found = dist, UiObject(self.session, ui_selector)
return found

@property
Expand Down
Loading