update yosemite.apk

(cherry picked from commit 3751932)
AirtestProject · Feb 15, 2023 · 8707269 · 8707269
1 parent 95177c5
commit 8707269
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/airtest/core/android/android.py b/airtest/core/android/android.py
@@ -784,7 +784,7 @@ def get_render_resolution(self, refresh=False, package=None):
             x, y, w, h = y, x, h, w
         return x, y, w, h
 
-    def start_recording(self, max_time=1800, output=None, fps=10, write_mode="ffmpeg", 
+    def start_recording(self, max_time=1800, output=None, fps=10, write_mode="yosemite",
                         snapshot_sleep=0.001, orientation=0, bit_rate_level=None, bit_rate=None):
         """
         Start recording the device display

diff --git a/airtest/core/android/static/apks/Yosemite.apk b/airtest/core/android/static/apks/Yosemite.apk
diff --git a/airtest/core/android/touch_methods/touch_proxy.py b/airtest/core/android/touch_methods/touch_proxy.py
@@ -61,13 +61,17 @@ def auto_setup(cls, adb, default_method=None, ori_transformer=None, size_info=No
             >>> touch_proxy.touch((100, 100))
 
         """
+        print(111111111111111111111111111, default_method)
         if default_method and default_method in cls.TOUCH_METHODS:
             touch_method = cls.TOUCH_METHODS[default_method].METHOD_CLASS(adb, size_info=size_info,
                                                                           input_event=input_event)
             impl = cls.TOUCH_METHODS[default_method](touch_method, ori_transformer)
             if cls.check_touch(impl):
                 return TouchProxy(impl)
         # cls.TOUCH_METHODS中不包含ADBTOUCH，因此即使指定了default_method=ADBTOUCH，也优先尝试初始化其他点击方法
+        if default_method and default_method == "ADBTOUCH":
+            adb_touch = AdbTouchImplementation(adb)
+            return TouchProxy(adb_touch)
         for name, touch_impl in cls.TOUCH_METHODS.items():
             if default_method == name:
                 continue