!130 note对比，相机拍照上库

Merge pull request !130 from hongshaojie/pr

screenshot/resource/app_capture_screen_test_config.json

 [
     {
         "DEVICE_1":[1, 2, 3, 4, 6],
-        "DEVICE_2":[5, 7, 10, 11],
+        "DEVICE_2":[5, 7, 8, 10, 11],
         "return-x-y":[210, 1240],
         "recent-x-y":[515, 1240],
         "home-x-y":[360, 1240],
@@ -105,9 +105,9 @@
         "entry": "aa start -a com.ohos.camera.MainAbility -b com.ohos.camera",
         "compress_log":["cd /data/log/hilog && tar -cf photograph_log.tar *"],
         "chmodfile":["chmod 777 /data/NativeRdbTest"],
-        "start_photographtest":["cd /data && ./NativeRdbTest --gtest_filter=RdbStoreInsertTest.RdbStore_Insert_001 && rm *.xml", ""],
+        "start_photographtest":["cd /data && ./NativeRdbTest --gtest_filter=RdbStoreInsertTest.RdbStore_Insert_001 && rm *.xml", "[  PASSED  ] 1 test"],
         "all_actions": [
-            [2, "permisson_ok-x-y"], [2, "take_photos-x-y"], [2, "take_photos-x-y"], [1, "remount"], [1, "send_file_to_dev", "photographtest/NativeRdbTest", "/data/"], [2, "chmodfile"], [2, "start_photographtest"], [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, "permisson_ok-x-y"], [2, "take_photos-x-y"], [2, "take_photos-x-y"], [1, "remount"], [1, "send_file_to_dev", "photographtest/NativeRdbTest", "/data/"], [2, "chmodfile"], [2, "start_photographtest"], [2, "recent-x-y"], [2, "recent_del-x-y"],
             [1, "stop_hilog"], [1, "compress_log"],[1, "get_file_from_dev", "/data/log/hilog/photograph_log.tar"]
         ]
     },
@@ -135,7 +135,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, "stop_hilog"], [1, "compress_log"], [1, "get_file_from_dev", "/data/log/hilog/note_log.tar"]
+            [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

@@ -449,7 +449,7 @@ if __name__ == "__main__":
             f.seek(0)
             reboot_result = f.read()
         f.close()
-        if len(reboot_result) < 1:
+        if len(reboot_result) < 1 and rebootcnt >= 1:
             os.system("mkdir {}\\reboot".format(args.save_path))
             with open(os.path.normpath(os.path.join(args.tools_path, "reboot.txt")), mode='w') as f:
                 f.write("reboot")