Просмотр исходного кода

fix(device): nemu_ipc screenshot could not be instantiated

huangrunheng 2 лет назад
Родитель
Сommit
87b7597ae1
2 измененных файлов с 7 добавлено и 6 удалено
  1. 4 4
      module/daemon/benchmark.py
  2. 3 2
      module/device/screenshot.py

+ 4 - 4
module/daemon/benchmark.py

@@ -216,7 +216,7 @@ class Benchmark(DaemonBase):
         Returns:
             str: The fastest screenshot method on current device.
         """
-        screenshot = ['ADB', 'ADB_nc', 'uiautomator2', 'DroidCast_raw', 'DroidCast', 'window_background']
+        screenshot = ['ADB', 'ADB_nc', 'uiautomator2', 'DroidCast_raw', 'DroidCast', 'window_background', 'nemu_ipc']
 
         def remove(*args):
             return [l for l in screenshot if l not in args]
@@ -242,6 +242,6 @@ if __name__ == '__main__':
     config = Config('oas1')
     device = Device(config)
     b = Benchmark(config=config, device=device)
-    # print(b.run_simple_screenshot_benchmark())
-    screenshot, click = b.get_test_methods()
-    b.benchmark(set(), click)
+    print(b.run_simple_screenshot_benchmark())
+    # screenshot, click = b.get_test_methods()
+    # b.benchmark(set(), click)

+ 3 - 2
module/device/screenshot.py

@@ -15,11 +15,12 @@ from module.device.method.adb import Adb
 from module.device.method.window import Window
 from module.device.method.droidcast import DroidCast
 from module.device.method.scrcpy import Scrcpy
+from module.device.method.nemu_ipc import NemuIpc
 from module.exception import RequestHumanTakeover, ScriptError
 from module.logger import logger
 
 
-class Screenshot(Adb, DroidCast, Scrcpy, Window):
+class Screenshot(Adb, DroidCast, Scrcpy, Window, NemuIpc):
     _screen_size_checked = False
     _screen_black_checked = False
     _minicap_uninstalled = False
@@ -43,7 +44,7 @@ class Screenshot(Adb, DroidCast, Scrcpy, Window):
             'DroidCast_raw': self.screenshot_droidcast_raw,
             'scrcpy': self.screenshot_scrcpy,
             'window_background': self.screenshot_window_background,
-            'nemu_ipc': self.nemu_ipc
+            'nemu_ipc': self.screenshot_nemu_ipc
         }
 
     def screenshot(self):