7.57 auto-commit

Author: rev1si0n

CHANGELOG.txt

@@ -1,3 +1,7 @@
+7.57
+* 新增特征及模板找图客户端接口
+* 其他一些优化及问题修复
+
 7.55
 * 修复屏幕旋转显示不正常的问题
 * 修复远程桌面初次连接断开的问题

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/client.py

@@ -242,6 +242,8 @@ def corner(b, position):
 Bound.width = property(width)
 Bound.height = property(height)
 
+FindImageMethod = protos.FindImageMethod
+
 Bound.center = center
 Bound.corner = corner
 
@@ -853,6 +855,19 @@ def get_clipboard(self):
         """
         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 @@ def wait_for_idle(self, timeout):
         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/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/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;
+}

tools/debugimage.py

@@ -0,0 +1,49 @@
+#!/usr/bin/env python3
+import os
+import argparse
+
+from PIL import Image, ImageDraw
+from lamda.client import *
+
+
+cert = os.environ.get("CERTIFICATE", None)
+port = int(os.environ.get("PORT", 65000))
+
+parser = argparse.ArgumentParser()
+parser.add_argument("-d", type=str, dest="device",
+                        help="service ip address", required=True)
+parser.add_argument("-p", type=str, dest="port",
+                        default=port,
+                        help="service port")
+parser.add_argument("-f", "--method", type=int,
+                        dest="method",
+                        help="find method", default=0)
+parser.add_argument("-i", "--image", type=argparse.FileType("rb"),
+                        dest="image",
+                        help="find image path", required=True)
+parser.add_argument("-t", "--threshold", type=float,
+                        dest="threshold",
+                        help="threshold", default=0)
+parser.add_argument("-m", "--max-distance", type=int,
+                        dest="distance",
+                        help="max distance", default=0)
+parser.add_argument("-cert", type=str, default=cert,
+                                help="ssl cert")
+args = parser.parse_args()
+
+
+d = Device(args.device, port=args.port,
+                certificate=args.cert)
+image = Image.open(d.screenshot(60))
+
+draw = ImageDraw.Draw(image)
+for r in d.find_similar_image(args.image.read(),
+                                method=args.method,
+                                max_distance=args.distance,
+                                threshold=args.threshold):
+    p1 = r.corner("top-left")
+    p2 = r.corner("bottom-right")
+    draw.rectangle(((p1.x, p1.y), (p2.x, p2.y)),
+                    outline="red", width=3)
+image.show()
+exit (0)

tools/requirements.txt

@@ -1,4 +1,5 @@
 mitmproxy>=9.0.0,<=10.2.0
 dnspython
 httpx[socks]
-packaging
+packaging
+Pillow