桌面对比误差5%，加上cppcrash和相机拦截

Signed-off-by: Nredjie <hongshaojie@h-partners.com>
Change-Id: I8868aa040e61dcf0063fa0e1b8ebf21792ddd4ce

screenshot/resource/app_capture_screen_test_config.json

@@ -58,7 +58,7 @@
           [1,"close_auto_log"], [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/el1/bundle/public/ohos.acts.multimedia.video.videoplayer/ohos.acts.multimedia.video.videoplayer/assets/entry/resources/rawfile/"],
           [15, "start_test"], [1, "recover_log"], [1, "stop_hilog"], [1, "check_result"], [1, "compress_log"],
-          [1, "get_file_from_dev", "/data/log/hilog/video_log.tar"], [2, "recent-x-y"], [2, "recent_del-x-y"], [2, "home-x-y"], [2, "recent-x-y"], [2, "recent_del-x-y"], [2, "home-x-y"]
+          [1, "get_file_from_dev", "/data/log/hilog/video_log.tar"], [2, "recent-x-y"], [2, "recent_del-x-y"], [2, "home-x-y"], [2, "recent-x-y"], [2, "recent_del-x-y"]
         ]
     },
     {
@@ -76,7 +76,7 @@
     {
         "app_name": "camera",
         "entry": "",
-        "check_result":["cd /data/log/hilog && grep -nr PreviewOutputCallback", ""],
+        "check_result":["cd /data/log/hilog && grep -nr PreviewOutputCallback", "OnFrameStarted"],
         "compress_log":["cd /data/log/hilog && tar -cf camera_log.tar *"],
         "close_auto_log":["hilog -w stop;rm /data/log/hilog/*"],
         "open_camera_log":["hilog -b X;hilog -b D -T CAMERA;hilog -r"],
@@ -84,7 +84,7 @@
         "recover_log":["cd data/log/hilog/;hilog -x > camera_log.txt;hilog -b D"],
         "all_actions": [
             [1, "close_auto_log"], [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"], [1, "recover_log"], [1, "check_result"],
-            [1, "shot_cmd"], [2, "recent-x-y"], [2, "recent_del-x-y"], [1, "compress_log"], [1, "get_file_from_dev", "/data/log/hilog/camera_log.tar"], [2, "home-x-y"], [2, "home-x-y"]
+            [1, "shot_cmd"], [2, "recent-x-y"], [2, "recent_del-x-y"], [1, "compress_log"], [1, "get_file_from_dev", "/data/log/hilog/camera_log.tar"]
         ]
     },
     {
@@ -93,7 +93,7 @@
         "compress_log":["cd /data/log/hilog && tar -cf settings_log.tar *"],
         "all_actions": [
             [2, "shot_cmd", "settings"], [1, "cmp_cmd-level"], [2, "recent-x-y"], [2, "recent_del-x-y"], [2, "home-x-y"], [2, "recent-x-y"], [2, "recent_del-x-y"], [1, "stop_hilog"],
-            [1, "compress_log"], [1, "get_file_from_dev", "/data/log/hilog/settings_log.tar"], [2, "home-x-y"]
+            [1, "compress_log"], [1, "get_file_from_dev", "/data/log/hilog/settings_log.tar"]
         ]
     },
     {
@@ -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, 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"]
+            [2, "shot_cmd", "photo_check_1"], [2, "permisson_ok-x-y"], [2, "shot_cmd", "photo_check_2"], [2, "permisson_ok-x-y"], [2, "shot_cmd", "photo_check_3"], [2, "permisson_ok-x-y"], [2, "shot_cmd"], [2, "recent-x-y"], [2, "shot_cmd", "photo_check_4"], [2, "recent_del-x-y"], [2, "cmp_cmd-level"],
+            [2, "shot_cmd", "photo_check_5"], [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"]
         ]
     },
     {
@@ -111,7 +111,7 @@
         "compress_log":["cd /data/log/hilog && tar -cf note_log.tar *"],
         "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, "home-x-y"],
-            [2, "recent-x-y"], [2, "recent_del-x-y"], [1, "cmp_cmd-level"], [1, "stop_hilog"], [1, "compress_log"], [1, "get_file_from_dev", "/data/log/hilog/note_log.tar"], [2, "home-x-y"]
+            [2, "recent-x-y"], [2, "recent_del-x-y"], [1, "cmp_cmd-level"], [1, "stop_hilog"], [1, "compress_log"], [1, "get_file_from_dev", "/data/log/hilog/note_log.tar"]
         ]
     }
 ]

screenshot/resource/capturescreentest.py

@@ -70,17 +70,17 @@ def EnterCmd(mycmd, waittime = 0, printresult = 1):
             cmd_file.close()
     return result
 
-def SysExit():
-    EnterShellCmd("cd /data/log/faultlog/temp && tar -cf after_test_crash_log_{}.tar cppcrash*".format(args.device_num))
-    GetFileFromDev("/data/log/faultlog/temp/after_test_crash_log_{}.tar".format(args.device_num), os.path.normpath(args.save_path))
-    sys.exit(99)
-
 def EnterShellCmd(shellcmd, waittime = 0, printresult = 1):
     if shellcmd == "":
         return
     cmd = "hdc_std -t {} shell \"{}\"".format(args.device_num, shellcmd)
     return EnterCmd(cmd, waittime, printresult)
 
+def SysExit():
+    EnterShellCmd("cd /data/log/faultlog/temp && tar -cf after_test_crash_log_{}.tar cppcrash*".format(args.device_num))
+    GetFileFromDev("/data/log/faultlog/temp/after_test_crash_log_{}.tar".format(args.device_num), os.path.normpath(args.save_path))
+    sys.exit(99)
+
 def SendFileToDev(src, dst):
     cmd = "hdc_std -t {} file send \"{}\" \"{}\"".format(args.device_num, src, dst)
     return EnterCmd(cmd, 1, 1)
@@ -173,7 +173,7 @@ if __name__ == "__main__":
         p = EnterShellCmd(cmp_launcher, 1)
         num = re.findall(r'[-+]?\d+', p)
         PrintToLog(num)
-        if type(num) == list and len(num) > 0 and int(num[0]) < 443200 and p.find('No such file or directory', 0, len(p)) == -1:
+        if type(num) == list and len(num) > 0 and int(num[0]) < 184320 and p.find('No such file or directory', 0, len(p)) == -1:
             PrintToLog("remove lock is ok!\n\n")
             break
         elif rebootcnt >= 1:
@@ -431,6 +431,14 @@ if __name__ == "__main__":
 
     EnterShellCmd("cd /data/log/faultlog/temp && tar -cf after_test_crash_log_{}.tar cppcrash*".format(args.device_num))
     GetFileFromDev("/data/log/faultlog/temp/after_test_crash_log_{}.tar".format(args.device_num), os.path.normpath(args.save_path))
+    crash_cnt = EnterShellCmd("cd /data/log/faultlog/temp && find . -name cppcrash*", 2)
+    result = "".join(crash_cnt)
+    findsome = result.find("cppcrash", 0, len(result))
+    if findsome != -1:
+        PrintToLog("ERROR:find cppcrash !\n")
+        PrintToLog("SmokeTest find some fatal problems!")
+        PrintToLog("End of check, test failed!")
+        SysExit()
     if len(fail_idx_list) != 0:
         PrintToLog("ERROR: name {}, index {}, these testcase is failed".format(fail_name_list, fail_idx_list))
         if fail_name_list.count('launcher') or fail_name_list.count('settings_keyboard'):