lamda 7.55__tar.gz → 7.57__tar.gz

{lamda-7.55 → lamda-7.57}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lamda
-Version: 7.55
+Version: 7.57
 Summary: Android reverse engineering & automation framework
 Home-page: https://github.com/rev1si0n/lamda
 Author: rev1si0n

{lamda-7.55 → lamda-7.57}/lamda/__init__.py

@@ -2,4 +2,4 @@
 #
 # Distributed under MIT license.
 # See file LICENSE for detail or copy at https://opensource.org/licenses/MIT
-__version__ = "7.55"
+__version__ = "7.57"

{lamda-7.55 → lamda-7.57}/lamda/client.py

@@ -242,6 +242,8 @@ TouchSequence.__iter__ = touchSequenceIter
 Bound.width = property(width)
 Bound.height = property(height)
 
+FindImageMethod = protos.FindImageMethod
+
 Bound.center = center
 Bound.corner = corner
 
@@ -853,6 +855,19 @@ class UiAutomatorStub(BaseServiceStub):
         """
         r = self.stub.getClipboard(protos.Empty())
         return r.value
+    def find_similar_image(self, data, threshold=0,
+                           max_distance=0, bound=None,
+                           method=FindImageMethod.FI_TEMPLATE):
+        """
+        根据提供的目标图片从屏幕中获取相似图片位置
+        """
+        req = protos.FindImageRequest(bound=bound)
+        req.method = method
+        req.max_distance = max_distance
+        req.threshold = threshold
+        req.partial = data
+        r = self.stub.findSimilarImage(req)
+        return r.bounds
     def freeze_rotation(self, freeze=True):
         """
         锁定屏幕旋转
@@ -2022,6 +2037,11 @@ class Device(object):
         return self.stub("UiAutomator").wait_for_idle(timeout)
     def get_last_toast(self):
         return self.stub("UiAutomator").get_last_toast()
+    def find_similar_image(self, data, threshold=0,
+                                max_distance=0, bound=None,
+                                method=FindImageMethod.FI_TEMPLATE):
+        return self.stub("UiAutomator").find_similar_image(data, threshold=threshold,
+                                max_distance=max_distance, bound=bound, method=method)
     # watcher
     def remove_all_watchers(self):
         return self.stub("UiAutomator").remove_all_watchers()

{lamda-7.55 → lamda-7.57}/lamda/rpc/services.proto

@@ -186,6 +186,7 @@ service UiAutomator {
     rpc registerClickUiObjectWatcher(WatcherRegistRequest) returns (Boolean) {}
     rpc registerPressKeysWatcher(WatcherRegistRequest) returns (Boolean) {}
     rpc registerNoneOpWatcher(WatcherRegistRequest) returns (Boolean) {}
+    rpc findSimilarImage(FindImageRequest) returns (FindImageResponse) {}
 }
 
 service Wifi {

{lamda-7.55 → lamda-7.57}/lamda/rpc/uiautomator.proto

@@ -554,3 +554,20 @@ message WatcherRegistRequest {
                 Key key = 4;
         }
 }
+
+enum FindImageMethod {
+        FI_TEMPLATE             = 0;
+        FI_FEATURE_POINT        = 1;
+}
+
+message FindImageRequest {
+        FindImageMethod method  = 1;
+        Bound bound             = 2;
+        bytes partial           = 3;
+        uint32 max_distance     = 4;
+        float threshold         = 5;
+}
+
+message FindImageResponse {
+        repeated Bound bounds = 1;
+}

{lamda-7.55 → lamda-7.57}/lamda.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lamda
-Version: 7.55
+Version: 7.57
 Summary: Android reverse engineering & automation framework
 Home-page: https://github.com/rev1si0n/lamda
 Author: rev1si0n