Эх сурвалжийг харах

perf: Update template.json of device interface

huangrunheng 3 жил өмнө
parent
commit
124e55e23d

+ 3 - 3
config/template.json

@@ -3,10 +3,10 @@
   "script": {
   "script": {
     "device": {
     "device": {
       "serial": "auto",
       "serial": "auto",
-      "handle": "auto",
+      "handle": "",
       "package_name": "auto",
       "package_name": "auto",
-      "screenshot_method": "window_background",
-      "control_method": "window_message",
+      "screenshot_method": "auto",
+      "control_method": "minitouch",
       "adb_restart": false
       "adb_restart": false
     },
     },
     "error": {
     "error": {

+ 3 - 1
module/daemon/benchmark.py

@@ -199,7 +199,7 @@ class Benchmark(DaemonBase):
 
 
     def run(self):
     def run(self):
         try:
         try:
-            self.config.override(script.device.screenshot_method='ADB')
+            self.config.override(self.device.screenshot_method == 'ADB')
             self.device.uninstall_minicap()
             self.device.uninstall_minicap()
 
 
         except RequestHumanTakeover:
         except RequestHumanTakeover:
@@ -227,6 +227,8 @@ class Benchmark(DaemonBase):
             screenshot = remove('aScreenCap', 'aScreenCap_nc')
             screenshot = remove('aScreenCap', 'aScreenCap_nc')
         if self.device.is_chinac_phone_cloud:
         if self.device.is_chinac_phone_cloud:
             screenshot = remove('ADB_nc', 'aScreenCap_nc')
             screenshot = remove('ADB_nc', 'aScreenCap_nc')
+        if self.config.script.device.handle == '':
+            screenshot = remove('window_background')
         screenshot = tuple(screenshot)
         screenshot = tuple(screenshot)
 
 
         self.TEST_TOTAL = 3
         self.TEST_TOTAL = 3

+ 3 - 3
tasks/Script/config_device.py

@@ -32,14 +32,14 @@ class ControlMethod(str, Enum):
 class Device(BaseModel):
 class Device(BaseModel):
     serial: str = Field(default="auto",
     serial: str = Field(default="auto",
                         description='serial_help')
                         description='serial_help')
-    handle: str = Field(default='auto',
+    handle: str = Field(default='',
                         description='handle_help')
                         description='handle_help')
     package_name: PackageName = Field(title='Package Name',
     package_name: PackageName = Field(title='Package Name',
                                       default=PackageName.AUTO,
                                       default=PackageName.AUTO,
                                       description='package_name_help')
                                       description='package_name_help')
-    screenshot_method: ScreenshotMethod = Field(default=ScreenshotMethod.WINDOW_BACKGROUND,
+    screenshot_method: ScreenshotMethod = Field(default=ScreenshotMethod.AUTO,
                                                 description='screenshot_method_help')
                                                 description='screenshot_method_help')
-    control_method: ControlMethod = Field(default=ControlMethod.WINDOW_MESSAGE,
+    control_method: ControlMethod = Field(default=ControlMethod.MINITOUCH,
                                           description='control_method_help')
                                           description='control_method_help')
     adb_restart: bool = Field(default=False,
     adb_restart: bool = Field(default=False,
                               description='adb_restart_help')
                               description='adb_restart_help')