diff --git a/screenshot/resource/process.txt b/screenshot/resource/process.txt index 131ecae4663468e17b48913010e46f052b55547e..4ef8d996a188e7507506885358c6f7ebbb5f2cff 100644 --- a/screenshot/resource/process.txt +++ b/screenshot/resource/process.txt @@ -42,7 +42,6 @@ distributedsche installs hiview telephony -usb_service camera_service thermal foundation diff --git a/screenshot32/DistributedTest/testcases/DistributedTest.py b/screenshot32/DistributedTest/testcases/DistributedTest.py index bbd1b5d920bfaf0fe3b76fbead8001f1f3ed23b8..4e9dc118db6a7ffa5965ea7617e4136dda7bedbe 100644 --- a/screenshot32/DistributedTest/testcases/DistributedTest.py +++ b/screenshot32/DistributedTest/testcases/DistributedTest.py @@ -91,16 +91,12 @@ class DistributedTest(TestCase): CommonOH.wake(self.Phone1) # 设置不息屏 CommonOH.hdc_std(self.Phone1, 'shell "power-shell setmode 602"') - # 设置 phone1 ip - CommonOH.hdc_std(self.Phone1, "shell ifconfig eth0 192.168.0.1") def net_connect2(self): # 点亮屏幕 CommonOH.wake(self.Phone2) # 设置不息屏 CommonOH.hdc_std(self.Phone2, 'shell "power-shell setmode 602"') - # 设置 phone1 ip - CommonOH.hdc_std(self.Phone2, "shell ifconfig eth0 192.168.0.2") def teardown(self): # 切入后台，结束进程 diff --git a/screenshot32/resource/app_capture_screen_test_config.json b/screenshot32/resource/app_capture_screen_test_config.json index 7e06a0189e80f3377e622d664fc5a0e95f7e536f..c0430bf87cc53587630005c443747a38f2393eda 100644 --- a/screenshot32/resource/app_capture_screen_test_config.json +++ b/screenshot32/resource/app_capture_screen_test_config.json @@ -1,7 +1,7 @@ [ { - "DEVICE_1":[2, 3, 4, 6, 8, 10, 11], - "DEVICE_2":[1, 5, 7, 9, 12, 13], + "DEVICE_1":[2, 3, 8, 9, 10, 12], + "DEVICE_2":[1, 4, 5, 6, 7, 11], "return-x-y":[210, 1240], "recent-x-y":[515, 1240], "home-x-y":[360, 1240], @@ -54,10 +54,10 @@ "start_screenshot": ["aa start -a com.ohos.screenshot.ServiceExtAbility -b com.ohos.screenshot"], "start_photos": ["aa start -a com.ohos.photos.MainAbility -b com.ohos.photos"], "cp_db": ["cp /data/app/el2/100/database/com.ohos.medialibrary.medialibrarydata/rdb/media_library.db /data/photo.db"], + "kill_photos": ["killall com.ohos.photos"], "all_actions": [ - [8, "start_screenshot"], [8, "start_screenshot"], [5, "start_photos"],[2, "permisson_ok-x-y"], [2, "permisson_ok-x-y"], [2, "permisson_ok-x-y"], [2, "album_click-x-y"], - [2, "last_photos-x-y"], [2, "last_photos-x-y"], [2, "shot_cmd"], [1, "cmp_cmd-level"], [2, "home-x-y"], [2, "recent-x-y"], [2, "recent_del-x-y"], [1, "cp_db"], - [1, "get_file_from_dev", "/data/photo.db"], [2, "photo_check"], [1, "process_check", "com.ohos.medialibrary.medialibrarydata"] + [8, "start_screenshot"], [8, "start_screenshot"], [5, "start_photos"], [2, "album_click-x-y"], [2, "last_photos-x-y"], [2, "last_photos-x-y"], [2, "shot_cmd"], [1, "cmp_cmd-level"], + [1, "cp_db"], [1, "get_file_from_dev", "/data/photo.db"], [2, "photo_check"], [1, "process_check", "com.ohos.medialibrary.medialibrarydata"], [1, "kill_photos"] ] }, { @@ -67,11 +67,11 @@ "start_video_log":["rm /data/log/hilog/* && hilog -r && hilog -Q pidoff;hilog -G 512M;hilog -w start -l 400000000 -m none"], "start_test":["aa test -p ohos.acts.multimedia.video.videoplayer -b ohos.acts.multimedia.video.videoplayer -s unittest OpenHarmonyTestRunner -w 2000000 -s timeout 60000", "Failure: 0, Error: 0, Pass: 1"], "compress_log":["cd /data/log/hilog && tar -cf video_log.tar *"], + "kill_video": ["killall ohos.acts.multimedia.video.videoplayer"], "all_actions": [ [1,"start_video_log"], [2, "install_hap", "vediotest/ActsVideoPlayerJsTest.hap"], [1, "mk_test_dir"], [1, "remount"], [1, "send_file_to_dev", "vediotest/H264_AAC.mp4", "/data/app/el2/100/base/ohos.acts.multimedia.video.videoplayer/haps/entry/files/"], - [15, "start_test"], [1, "stop_hilog"], [1, "compress_log"], [1, "get_file_from_dev", "/data/log/hilog/video_log.tar"], - [2, "recent-x-y"], [2, "recent_del-x-y"] + [15, "start_test"], [1, "stop_hilog"], [1, "compress_log"], [1, "get_file_from_dev", "/data/log/hilog/video_log.tar"], [1, "kill_video"] ] }, { @@ -94,56 +94,52 @@ "start_camera":["aa start -a com.ohos.camera.MainAbility -b com.ohos.camera"], "recover_log":["cd data/log/hilog/;hilog -x > camera_log.txt;hilog -b D"], "cp_db": ["cp /data/app/el2/100/database/com.ohos.medialibrary.medialibrarydata/rdb/media_library.db /data/camera_photo.db"], + "kill_camera": ["killall com.ohos.camera"], "all_actions": [ - [1, "open_camera_log"], [5, "start_camera"], [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, "permisson_ok-x-y"], - [2, "take_photos-x-y"], [2, "take_photos-x-y"], [2, "convert_to_video-x-y"], [5, "take_photos-x-y"], [2, "stop_video-x-y"], [5, "take_photos-x-y"], [2, "stop_video-x-y"], [6, "convert_to_photos-x-y"], - [2, "permisson_ok-x-y"], [2, "permisson_ok-x-y"], [1, "recover_log"], [1, "check_result"], [1, "shot_cmd", "camera_to_photos"], [1, "cmp_cmd-level", 921600], [2, "home-x-y"], [2, "recent-x-y"], - [2, "recent_del-x-y"], [1, "cp_db"], [1, "get_file_from_dev", "/data/camera_photo.db"], [2, "camera_photo_check"], [1, "compress_log"], [1, "get_file_from_dev", "/data/log/hilog/camera_log.tar"] + [1, "open_camera_log"], [5, "start_camera"], [2, "take_photos-x-y"], [2, "take_photos-x-y"], [2, "convert_to_video-x-y"], [5, "take_photos-x-y"], [2, "stop_video-x-y"], [5, "take_photos-x-y"], + [2, "stop_video-x-y"], [6, "convert_to_photos-x-y"], [1, "recover_log"], [1, "check_result"], [1, "shot_cmd", "camera_to_photos"], [1, "cmp_cmd-level", 921600], [1, "cp_db"], + [1, "get_file_from_dev", "/data/camera_photo.db"], [2, "camera_photo_check"], [1, "compress_log"], [1, "get_file_from_dev", "/data/log/hilog/camera_log.tar"], [1, "kill_camera"] ] }, { "app_name": "settings", "entry": "aa start -a com.ohos.settings.MainAbility -b com.ohos.settings", + "kill_settings": ["killall com.ohos.settings"], "all_actions": [ - [2, "shot_cmd", "settings"], [1, "cmp_cmd-level"], [2, "home-x-y"], [2, "recent-x-y"], [2, "recent_del-x-y"] + [2, "shot_cmd", "settings"], [1, "cmp_cmd-level"], [1, "kill_settings"] ] }, { "app_name": "note", "entry": "aa start -a MainAbility -b com.ohos.note", + "kill_note": ["killall 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"], [1, "cmp_cmd-level"], [2, "home-x-y"], - [2, "recent-x-y"], [2, "recent_del-x-y"] + [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"], [1, "cmp_cmd-level"], [1, "kill_note"] ] }, { "app_name": "contacts", "entry": "aa start -a com.ohos.contacts.MainAbility -b com.ohos.contacts", + "kill_contacts": ["killall com.ohos.contacts"], "all_actions": [ - [2, "permisson_ok-x-y"], [2, "permisson_ok-x-y"], [2, "permisson_ok-x-y"], [2, "permisson_ok-x-y"], [2, "phone-x-y"], [2, "phone-x-y"], [2, "shot_cmd"], [1, "cmp_cmd-level"], - [2, "home-x-y"], [2, "recent-x-y"], [2, "recent_del-x-y"] + [2, "permisson_ok-x-y"], [2, "permisson_ok-x-y"], [2, "permisson_ok-x-y"], [2, "permisson_ok-x-y"], [2, "phone-x-y"], [2, "phone-x-y"], [2, "shot_cmd"], [1, "cmp_cmd-level"], [1, "kill_contacts"] ] }, { "app_name": "mms", "entry": "aa start -a com.ohos.mms.MainAbility -b com.ohos.mms", + "kill_mms": ["killall com.ohos.mms"], "all_actions": [ - [2, "shot_cmd"], [1, "cmp_cmd-level"], [2, "home-x-y"], [2, "recent-x-y"], [2, "recent_del-x-y"] - ] - }, - { - "app_name": "distributedcalc", - "entry": "aa start -a ohos.samples.distributedcalc.MainAbility -b ohos.samples.distributedcalc", - "all_actions": [ - [2, "permisson_ok-x-y"], [2, "permisson_ok-x-y"], [2, "permisson_ok-x-y"], [2, "shot_cmd"], [1, "cmp_cmd-level"], [2, "home-x-y"], [2, "recent-x-y"], [2, "recent_del-x-y"] + [2, "shot_cmd"], [1, "cmp_cmd-level"], [1, "kill_mms"] ] }, { "app_name": "distributedmusicplayer", "entry": "aa start -a ohos.samples.distributedmusicplayer.MainAbility -b ohos.samples.distributedmusicplayer", + "kill_distributedmusicplayer": ["killall ohos.samples.distributedmusicplayer"], "all_actions": [ - [2, "permisson_ok-x-y"], [2, "permisson_ok-x-y"], [2, "permisson_ok-x-y"], [2, "shot_cmd"], [1, "cmp_cmd-level"], [2, "home-x-y"], [2, "recent-x-y"], [2, "recent_del-x-y"] + [2, "permisson_ok-x-y"], [2, "permisson_ok-x-y"], [2, "permisson_ok-x-y"], [2, "shot_cmd"], [1, "cmp_cmd-level"], [1, "kill_distributedmusicplayer"] ] } ] diff --git a/screenshot32/resource/capturescreentest.py b/screenshot32/resource/capturescreentest.py index 86b00abdbd6fc5fdb1dae8c05a74c58c8b8a3021..0e5e75bfa146dee75d287ad1fb1fda29c9562175 100644 --- a/screenshot32/resource/capturescreentest.py +++ b/screenshot32/resource/capturescreentest.py @@ -212,7 +212,7 @@ if __name__ == "__main__": EnterShellCmd("mkdir -p /data/screen_test/train_set") SendFileToDev(os.path.normpath(os.path.join(args.tools_path, "resource/printscreen")), "/data/screen_test/") EnterShellCmd("chmod 777 /data/screen_test/printscreen") - rmlockcnt = 5 + rmlockcnt = 3 while rmlockcnt: EnterShellCmd("uinput -T -m 425 1000 425 400;power-shell wakeup;uinput -T -m 425 400 425 1000;\ power-shell setmode 602;uinput -T -m 425 1000 425 400;", 1) diff --git a/screenshot32/resource/process.txt b/screenshot32/resource/process.txt index 131ecae4663468e17b48913010e46f052b55547e..4ef8d996a188e7507506885358c6f7ebbb5f2cff 100644 --- a/screenshot32/resource/process.txt +++ b/screenshot32/resource/process.txt @@ -42,7 +42,6 @@ distributedsche installs hiview telephony -usb_service camera_service thermal foundation