diff --git a/screenshot/resource/app_capture_screen_test_config.json b/screenshot/resource/app_capture_screen_test_config.json index a02dc4a2db766ae5f02f3fb033a22e57f1c4f0a7..17d5624bb4c2d4f9244227a7f1fb823bb889baca 100644 --- a/screenshot/resource/app_capture_screen_test_config.json +++ b/screenshot/resource/app_capture_screen_test_config.json @@ -101,8 +101,8 @@ "entry": "aa start -a com.ohos.photos.MainAbility -b com.ohos.photos", "compress_log":["cd /data/log/hilog && tar -cf photos_log.tar *"], "all_actions": [ - [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"], [1, "cmp_cmd-level", 200000], - [2, "shot_cmd", "photo_check"], [2, "recent-x-y"], [2, "recent_del-x-y"], [1, "stop_hilog"], [1, "compress_log"], [1, "get_file_from_dev", "/data/log/hilog/photos_log.tar"], [2, "home-x-y"] + [2, "permisson_ok-x-y"], [2, "permisson_ok-x-y"], [2, "permisson_ok-x-y"], [2, 550, 700], [2, 550, 700], [2, 550, 700], [2, "shot_cmd"], [2, "recent-x-y"], [2, "recent_del-x-y"], + [2, "shot_cmd", "photo_check"], [2, "recent-x-y"], [2, "recent_del-x-y"], [1, "stop_hilog"], [1, "log_packaging"], [1, "get_photos_log_from_dev"], [2, "home-x-y"] ] }, { diff --git a/screenshot/resource/capturescreentest.py b/screenshot/resource/capturescreentest.py index 55e1ba656b2e2be093e6a4b1a9ebf35a1d1df3be..0ffa6db583a77bd7fd5699451ba62788d556b989 100644 --- a/screenshot/resource/capturescreentest.py +++ b/screenshot/resource/capturescreentest.py @@ -321,6 +321,12 @@ if __name__ == "__main__": elif type(single_action[1]) == str and single_action[1] == 'connect_wifi': next_cmd = "" ConnectToWifi(args.tools_path) + elif type(single_action[1]) == str and single_action[1] == 'log_packaging': + next_cmd = "" + EnterShellCmd("cd /data/log/hilog && tar -cf photos_log_{}.tar *".format(5 - testcnt)) + elif type(single_action[1]) == str and single_action[1] == 'get_photos_log_from_dev': + next_cmd = "" + EnterCmd("hdc_std -t {} file recv \"/data/log/hilog/photos_log_{}.tar\" \"{}\"".format(args.device_num, 5 - testcnt, os.path.normpath(args.save_path))) #process_crash_check elif type(single_action[1]) == str and single_action[1] == 'process_crash_check': next_cmd = "" diff --git a/screenshot/resource/note.png b/screenshot/resource/note.png index 914beca73d2ffccc0f49d937ccbbaf61560a2d34..536b2801544df85192f06efdbb940377907c4554 100644 Binary files a/screenshot/resource/note.png and b/screenshot/resource/note.png differ diff --git a/screenshot/resource/note.pngraw b/screenshot/resource/note.pngraw index 112d8ac83dbfba21320e5000e7be2d4bb14f80cf..db3a51895e9e9794107c46d6e07c772ce4832031 100644 Binary files a/screenshot/resource/note.pngraw and b/screenshot/resource/note.pngraw differ diff --git a/screenshot/resource/settings.png b/screenshot/resource/settings.png index b3e755ae0531bcf7e493c8de3f66c805882cf991..a11a5659205ec15d3807fa76ec197754504b6105 100644 Binary files a/screenshot/resource/settings.png and b/screenshot/resource/settings.png differ diff --git a/screenshot/resource/settings.pngraw b/screenshot/resource/settings.pngraw index e80110d2c2b7f7abcbccdeaf74a6ec3292c8bc67..8b678f94934b55ac64d992026a97cdf8c5f9aedd 100644 Binary files a/screenshot/resource/settings.pngraw and b/screenshot/resource/settings.pngraw differ