diff --git a/screenshot/rk_master/app_capture_screen_test_config.json b/screenshot/rk_master/app_capture_screen_test_config.json index 7974f4d19feb8747c79d7f1241e867d64719a199..9c24f3c51b9033fb9a2751e1775dfe71b2e9be9a 100644 --- a/screenshot/rk_master/app_capture_screen_test_config.json +++ b/screenshot/rk_master/app_capture_screen_test_config.json @@ -14,7 +14,7 @@ "app_name": "lock", "entry": "", "hdc_list_cmd":["hdc_std list targets"], - "rm_lock_cmd":["hdc_std shell input -T -m 350 900 350 300"], + "rm_lock_cmd":["hdc_std shell uinput -T -m 350 900 350 300"], "reboot_cmd":["hdc_std shell reboot"], "rm_data_cmd":["hdc_std shell rm -rf data/*"], "powermode_cmd":["hdc_std shell \"power-shell setmode 602\""], @@ -87,4 +87,4 @@ "entry": "aa start -a com.ohos.note.MainAbility -b com.ohos.note", "all_actions": [[2, "permisson_ok-x-y"], [2, "permisson_ok-x-y"], [2, "permisson_ok-x-y"], [2, "permisson_ok-x-y"], [2, "permisson_ok-x-y"], [2, "shot_cmd"], [2, "recent-x-y"], [2, "recent_del-x-y"], [2, "recent-x-y"], [2, "recent_del-x-y"], [2, "cmp_cmd-level"]] } -] \ No newline at end of file +] diff --git a/screenshot/rk_master/capturescreentest.py b/screenshot/rk_master/capturescreentest.py index 45b83f98e875a2f1e3ee3803aabcc00265313bea..6672b8aa152c152dea60b8b300fcaa6e658db887 100644 --- a/screenshot/rk_master/capturescreentest.py +++ b/screenshot/rk_master/capturescreentest.py @@ -43,10 +43,10 @@ if __name__ == "__main__": cmp_status = 0 global_pos = all_app[0] - return_cmd = "hdc_std shell input -M -m {} {} -c 0".format(global_pos['return-x-y'][0], global_pos['return-x-y'][1]) - recent_cmd = "hdc_std shell input -M -m {} {} -c 0".format(global_pos['recent-x-y'][0], global_pos['recent-x-y'][1]) - home_cmd = "hdc_std shell input -M -m {} {} -c 0".format(global_pos['home-x-y'][0], global_pos['home-x-y'][1]) - recent_del_cmd = "hdc_std shell input -M -m {} {} -c 0".format(global_pos['recent_del-x-y'][0], global_pos['recent_del-x-y'][1]) + return_cmd = "hdc_std shell uinput -M -m {} {} -c 0".format(global_pos['return-x-y'][0], global_pos['return-x-y'][1]) + recent_cmd = "hdc_std shell uinput -M -m {} {} -c 0".format(global_pos['recent-x-y'][0], global_pos['recent-x-y'][1]) + home_cmd = "hdc_std shell uinput -M -m {} {} -c 0".format(global_pos['home-x-y'][0], global_pos['home-x-y'][1]) + recent_del_cmd = "hdc_std shell uinput -M -m {} {} -c 0".format(global_pos['recent_del-x-y'][0], global_pos['recent_del-x-y'][1]) os.system("hdc_std kill") os.system("hdc_std start") EnterCmd("hdc_std list targets", 1) @@ -120,10 +120,10 @@ if __name__ == "__main__": sys.stdout.flush() #this cmd only is a name of x,y postion, to get x,y an click it else: - next_cmd = "hdc_std shell input -M -m {} {} -c 0".format(target_[0], target_[1]) - #input x,y postion, to click it + next_cmd = "hdc_std shell uinput -M -m {} {} -c 0".format(target_[0], target_[1]) + #uinput x,y postion, to click it else: - next_cmd = "hdc_std shell input -M -m {} {} -c 0".format(single_action[1], single_action[2]) + next_cmd = "hdc_std shell uinput -M -m {} {} -c 0".format(single_action[1], single_action[2]) EnterCmd(next_cmd, single_action[0]) if cmp_status != 0: diff --git a/screenshot/rk_weekly/capturescreentest.py b/screenshot/rk_weekly/capturescreentest.py index 45b83f98e875a2f1e3ee3803aabcc00265313bea..6672b8aa152c152dea60b8b300fcaa6e658db887 100644 --- a/screenshot/rk_weekly/capturescreentest.py +++ b/screenshot/rk_weekly/capturescreentest.py @@ -43,10 +43,10 @@ if __name__ == "__main__": cmp_status = 0 global_pos = all_app[0] - return_cmd = "hdc_std shell input -M -m {} {} -c 0".format(global_pos['return-x-y'][0], global_pos['return-x-y'][1]) - recent_cmd = "hdc_std shell input -M -m {} {} -c 0".format(global_pos['recent-x-y'][0], global_pos['recent-x-y'][1]) - home_cmd = "hdc_std shell input -M -m {} {} -c 0".format(global_pos['home-x-y'][0], global_pos['home-x-y'][1]) - recent_del_cmd = "hdc_std shell input -M -m {} {} -c 0".format(global_pos['recent_del-x-y'][0], global_pos['recent_del-x-y'][1]) + return_cmd = "hdc_std shell uinput -M -m {} {} -c 0".format(global_pos['return-x-y'][0], global_pos['return-x-y'][1]) + recent_cmd = "hdc_std shell uinput -M -m {} {} -c 0".format(global_pos['recent-x-y'][0], global_pos['recent-x-y'][1]) + home_cmd = "hdc_std shell uinput -M -m {} {} -c 0".format(global_pos['home-x-y'][0], global_pos['home-x-y'][1]) + recent_del_cmd = "hdc_std shell uinput -M -m {} {} -c 0".format(global_pos['recent_del-x-y'][0], global_pos['recent_del-x-y'][1]) os.system("hdc_std kill") os.system("hdc_std start") EnterCmd("hdc_std list targets", 1) @@ -120,10 +120,10 @@ if __name__ == "__main__": sys.stdout.flush() #this cmd only is a name of x,y postion, to get x,y an click it else: - next_cmd = "hdc_std shell input -M -m {} {} -c 0".format(target_[0], target_[1]) - #input x,y postion, to click it + next_cmd = "hdc_std shell uinput -M -m {} {} -c 0".format(target_[0], target_[1]) + #uinput x,y postion, to click it else: - next_cmd = "hdc_std shell input -M -m {} {} -c 0".format(single_action[1], single_action[2]) + next_cmd = "hdc_std shell uinput -M -m {} {} -c 0".format(single_action[1], single_action[2]) EnterCmd(next_cmd, single_action[0]) if cmp_status != 0: