diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 935578fce182c16ae6db03c55b9859b46c6598e6..67ce56dd65ed993bee231bbacf8a94f3ccdb00e2 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ diff --git a/.idea/code-check/java/codemars.log b/.idea/code-check/java/codemars.log index 4081ef3d3a6f7a4159fb323b99bd20c862335b66..5e71ed1725c95cf11aa56f5787a793bf2189ab73 100644 --- a/.idea/code-check/java/codemars.log +++ b/.idea/code-check/java/codemars.log @@ -1,50 +1,49 @@ -2021-04-14 17:03:50.480 [main] INFO . - user input: C:\Program Files\Huawei\DevEco Studio 2.1.0.301\tools\openjdk\bin\java,-j,-source,@D:/HW_HOS_Project/QRCodeScanner/.idea/code-check/java/detect.txt,-output,D:/HW_HOS_Project/QRCodeScanner/.idea/code-check/java/output.xml -2021-04-14 17:03:50.482 [main] INFO . - CodeMars Version:2.1.2.sp4 -2021-04-14 17:03:50.586 [main] INFO . - starting analyzing. -2021-04-14 17:03:50.595 [main] INFO . - start collecting report. -2021-04-14 17:03:50.597 [CodeMars1] INFO . - Command: "C:\Program Files\Huawei\DevEco Studio 2.1.0.301\plugins\codecheck\lib\CodeMars\engines\SecFinder-J\bin\run_SecFinder-J.bat",-filelist,D:\HW_HOS_Project\QRCodeScanner\.idea\code-check\java\filelist_2021_04_14_17_03_50_596_42.txt,-f,xml,-default,-progress,-r,D:\HW_HOS_Project\QRCodeScanner\.idea\code-check\java\\errorreport_2021_04_14_17_03_50_438_26.xml,-ruleclasspath,file:///D:\HW_HOS_Project\QRCodeScanner\.idea\code-check\java\ruleclasspath.txt -2021-04-14 17:03:50.741 [Thread-2] INFO . - 四月 14, 2021 5:03:50 下午 com.huawei.secfinderj.SecFinderJ needScan -2021-04-14 17:03:50.742 [Thread-2] INFO . - 信息: SecFinder-J Version: 2.1.3 -2021-04-14 17:03:50.819 [Thread-1] INFO . - 2021-04-14 17:03:50.780: SecFinder-J Output: Inspect start... -2021-04-14 17:03:50.895 [Thread-1] INFO . - 2021-04-14 17:03:50.895: SecFinder-J Output: Load checkers... -2021-04-14 17:03:51.032 [Thread-1] INFO . - 2021-04-14 17:03:51.032: SecFinder-J Output: Load config... -2021-04-14 17:03:51.058 [Thread-1] INFO . - 2021-04-14 17:03:51.058: SecFinder-J Output: step 1/4: Find files -2021-04-14 17:03:51.097 [Thread-1] INFO . - 2021-04-14 17:03:51.096: SecFinder-J Output: step 2/4: Process files -2021-04-14 17:03:51.134 [Thread-1] INFO . - 2021-04-14 17:03:51.134: SecFinder-J Output: step 3/4: Run analysis... -2021-04-14 17:03:51.135 [Thread-1] INFO . - 2021-04-14 17:03:51.135: SecFinder-J Output: [SecFinder-J--Thread--7] - during processing of [MainAbilityShellActivity.java] -2021-04-14 17:03:51.135 [Thread-1] INFO . - 2021-04-14 17:03:51.135: SecFinder-J Output: [SecFinder-J--Thread--3] - during processing of [ResourceTable.java] -2021-04-14 17:03:51.135 [Thread-1] INFO . - 2021-04-14 17:03:51.135: SecFinder-J Output: [SecFinder-J--Thread--4] - during processing of [R.java] -2021-04-14 17:03:51.135 [Thread-1] INFO . - 2021-04-14 17:03:51.135: SecFinder-J Output: [SecFinder-J--Thread--1] - during processing of [BuildConfig.java] -2021-04-14 17:03:51.137 [Thread-1] INFO . - 2021-04-14 17:03:51.137: SecFinder-J Output: [SecFinder-J--Thread--5] - during processing of [R.java] -2021-04-14 17:03:51.139 [Thread-1] INFO . - 2021-04-14 17:03:51.139: SecFinder-J Output: [SecFinder-J--Thread--6] - during processing of [QrCodeAbilityShellActivity.java] -2021-04-14 17:03:51.139 [Thread-1] INFO . - 2021-04-14 17:03:51.139: SecFinder-J Output: [SecFinder-J--Thread--2] - during processing of [ResourceTable.java] -2021-04-14 17:03:51.140 [Thread-1] INFO . - 2021-04-14 17:03:51.140: SecFinder-J Output: [SecFinder-J--Thread--8] - during processing of [ShellMyApplication.java] -2021-04-14 17:03:51.492 [Thread-1] INFO . - 2021-04-14 17:03:51.492: SecFinder-J Output: [SecFinder-J--Thread--8] - during processing of [MainAbility.java] -2021-04-14 17:03:51.495 [Thread-1] INFO . - 2021-04-14 17:03:51.495: SecFinder-J Output: [SecFinder-J--Thread--1] - during processing of [MyApplication.java] -2021-04-14 17:03:51.498 [Thread-1] INFO . - 2021-04-14 17:03:51.498: SecFinder-J Output: [SecFinder-J--Thread--2] - during processing of [MainAbilitySlice.java] -2021-04-14 17:03:51.514 [Thread-1] INFO . - 2021-04-14 17:03:51.514: SecFinder-J Output: [SecFinder-J--Thread--7] - during processing of [ExampleOhosTest.java] -2021-04-14 17:03:51.514 [Thread-1] INFO . - 2021-04-14 17:03:51.514: SecFinder-J Output: [SecFinder-J--Thread--4] - during processing of [BuildConfig.java] -2021-04-14 17:03:51.531 [Thread-1] INFO . - 2021-04-14 17:03:51.531: SecFinder-J Output: [SecFinder-J--Thread--3] - during processing of [ResourceTable.java] -2021-04-14 17:03:51.548 [Thread-1] INFO . - 2021-04-14 17:03:51.548: SecFinder-J Output: [SecFinder-J--Thread--5] - during processing of [QrCodeAbility.java] -2021-04-14 17:03:51.580 [Thread-1] INFO . - 2021-04-14 17:03:51.580: SecFinder-J Output: [SecFinder-J--Thread--6] - during processing of [DecodeImageCallback.java] -2021-04-14 17:03:51.626 [Thread-1] INFO . - 2021-04-14 17:03:51.625: SecFinder-J Output: [SecFinder-J--Thread--1] - during processing of [QrManager.java] -2021-04-14 17:03:51.627 [Thread-1] INFO . - 2021-04-14 17:03:51.627: SecFinder-J Output: [SecFinder-J--Thread--8] - during processing of [QrCodeAbilitySlice.java] -2021-04-14 17:03:51.634 [Thread-1] INFO . - 2021-04-14 17:03:51.634: SecFinder-J Output: [SecFinder-J--Thread--3] - during processing of [QrUtils.java] -2021-04-14 17:03:51.635 [Thread-1] INFO . - 2021-04-14 17:03:51.635: SecFinder-J Output: [SecFinder-J--Thread--4] - during processing of [ScreenUtils.java] -2021-04-14 17:03:51.641 [Thread-1] INFO . - 2021-04-14 17:03:51.641: SecFinder-J Output: [SecFinder-J--Thread--7] - during processing of [QrCodeFinderView.java] -2021-04-14 17:03:51.904 [Thread-1] INFO . - 2021-04-14 17:03:51.903: SecFinder-J Output: step 4/4: Result output... -2021-04-14 17:03:51.904 [Thread-1] INFO . - 2021-04-14 17:03:51.903: SecFinder-J Output: Inspect finish... -2021-04-14 17:03:51.904 [Thread-1] INFO . - Analysis result: -2021-04-14 17:03:51.904 [Thread-1] INFO . - files analyzed : 21 -2021-04-14 17:03:51.904 [Thread-1] INFO . - lines analyzed : 1253 -2021-04-14 17:03:51.904 [Thread-1] INFO . - rules used : 59 -2021-04-14 17:03:51.904 [Thread-1] INFO . - issues detected : 0 -2021-04-14 17:03:51.904 [Thread-1] INFO . - time cost(sec) : 1 -2021-04-14 17:03:51.904 [Thread-1] INFO . - -2021-04-14 17:03:51.904 [Thread-2] INFO . - 四月 14, 2021 5:03:51 下午 com.huawei.secfinderj.override.HwPmd end -2021-04-14 17:03:51.904 [Thread-2] INFO . - 信息: SecFinder-J run successed! -2021-04-14 17:03:51.952 [CodeMars1] INFO . - start parse errorreport xml -2021-04-14 17:03:51.954 [CodeMars1] INFO . - parse xml time : 5 -2021-04-14 17:03:51.954 [CodeMars1] INFO . - end parse errorreport xml -2021-04-14 17:03:51.955 [main] INFO . - end collecting report. -2021-04-14 17:03:51.955 [main] INFO . - end analyzing. +2021-04-20 09:54:12.910 [main] INFO . - user input: C:\Program Files\Huawei\DevEco Studio 2.1.0.301\tools\openjdk\bin\java,-j,-source,@D:/Gitee_Hos_Project/QRCodeScanner/.idea/code-check/java/detect.txt,-output,D:/Gitee_Hos_Project/QRCodeScanner/.idea/code-check/java/output.xml +2021-04-20 09:54:12.912 [main] INFO . - CodeMars Version:2.1.2.sp4 +2021-04-20 09:54:12.955 [main] INFO . - starting analyzing. +2021-04-20 09:54:12.963 [main] INFO . - start collecting report. +2021-04-20 09:54:12.966 [CodeMars1] INFO . - Command: "C:\Program Files\Huawei\DevEco Studio 2.1.0.301\plugins\codecheck\lib\CodeMars\engines\SecFinder-J\bin\run_SecFinder-J.bat",-filelist,D:\Gitee_Hos_Project\QRCodeScanner\.idea\code-check\java\filelist_2021_04_20_09_54_12_964_15.txt,-f,xml,-default,-progress,-r,D:\Gitee_Hos_Project\QRCodeScanner\.idea\code-check\java\\errorreport_2021_04_20_09_54_12_865_49.xml,-ruleclasspath,file:///D:\Gitee_Hos_Project\QRCodeScanner\.idea\code-check\java\ruleclasspath.txt +2021-04-20 09:54:13.093 [Thread-2] INFO . - 四月 20, 2021 9:54:13 上午 com.huawei.secfinderj.SecFinderJ needScan +2021-04-20 09:54:13.093 [Thread-2] INFO . - 信息: SecFinder-J Version: 2.1.3 +2021-04-20 09:54:13.165 [Thread-1] INFO . - 2021-04-20 09:54:13.128: SecFinder-J Output: Inspect start... +2021-04-20 09:54:13.225 [Thread-1] INFO . - 2021-04-20 09:54:13.225: SecFinder-J Output: Load checkers... +2021-04-20 09:54:13.358 [Thread-1] INFO . - 2021-04-20 09:54:13.358: SecFinder-J Output: Load config... +2021-04-20 09:54:13.384 [Thread-1] INFO . - 2021-04-20 09:54:13.384: SecFinder-J Output: step 1/4: Find files +2021-04-20 09:54:13.422 [Thread-1] INFO . - 2021-04-20 09:54:13.422: SecFinder-J Output: step 2/4: Process files +2021-04-20 09:54:13.460 [Thread-1] INFO . - 2021-04-20 09:54:13.460: SecFinder-J Output: step 3/4: Run analysis... +2021-04-20 09:54:13.461 [Thread-1] INFO . - 2021-04-20 09:54:13.461: SecFinder-J Output: [SecFinder-J--Thread--7] - during processing of [MainAbilityShellActivity.java] +2021-04-20 09:54:13.461 [Thread-1] INFO . - 2021-04-20 09:54:13.461: SecFinder-J Output: [SecFinder-J--Thread--5] - during processing of [R.java] +2021-04-20 09:54:13.461 [Thread-1] INFO . - 2021-04-20 09:54:13.461: SecFinder-J Output: [SecFinder-J--Thread--3] - during processing of [ResourceTable.java] +2021-04-20 09:54:13.461 [Thread-1] INFO . - 2021-04-20 09:54:13.461: SecFinder-J Output: [SecFinder-J--Thread--1] - during processing of [BuildConfig.java] +2021-04-20 09:54:13.461 [Thread-1] INFO . - 2021-04-20 09:54:13.461: SecFinder-J Output: [SecFinder-J--Thread--2] - during processing of [ResourceTable.java] +2021-04-20 09:54:13.461 [Thread-1] INFO . - 2021-04-20 09:54:13.461: SecFinder-J Output: [SecFinder-J--Thread--6] - during processing of [QrCodeAbilityShellActivity.java] +2021-04-20 09:54:13.461 [Thread-1] INFO . - 2021-04-20 09:54:13.461: SecFinder-J Output: [SecFinder-J--Thread--8] - during processing of [ShellMyApplication.java] +2021-04-20 09:54:13.461 [Thread-1] INFO . - 2021-04-20 09:54:13.461: SecFinder-J Output: [SecFinder-J--Thread--4] - during processing of [R.java] +2021-04-20 09:54:13.778 [Thread-1] INFO . - 2021-04-20 09:54:13.778: SecFinder-J Output: [SecFinder-J--Thread--3] - during processing of [MainAbility.java] +2021-04-20 09:54:13.783 [Thread-1] INFO . - 2021-04-20 09:54:13.782: SecFinder-J Output: [SecFinder-J--Thread--1] - during processing of [MyApplication.java] +2021-04-20 09:54:13.786 [Thread-1] INFO . - 2021-04-20 09:54:13.786: SecFinder-J Output: [SecFinder-J--Thread--8] - during processing of [MainAbilitySlice.java] +2021-04-20 09:54:13.828 [Thread-1] INFO . - 2021-04-20 09:54:13.828: SecFinder-J Output: [SecFinder-J--Thread--6] - during processing of [ExampleOhosTest.java] +2021-04-20 09:54:13.848 [Thread-1] INFO . - 2021-04-20 09:54:13.848: SecFinder-J Output: [SecFinder-J--Thread--7] - during processing of [BuildConfig.java] +2021-04-20 09:54:13.850 [Thread-1] INFO . - 2021-04-20 09:54:13.850: SecFinder-J Output: [SecFinder-J--Thread--4] - during processing of [ResourceTable.java] +2021-04-20 09:54:13.851 [Thread-1] INFO . - 2021-04-20 09:54:13.851: SecFinder-J Output: [SecFinder-J--Thread--2] - during processing of [QrCodeAbility.java] +2021-04-20 09:54:13.870 [Thread-1] INFO . - 2021-04-20 09:54:13.870: SecFinder-J Output: [SecFinder-J--Thread--1] - during processing of [QrManager.java] +2021-04-20 09:54:13.900 [Thread-1] INFO . - 2021-04-20 09:54:13.900: SecFinder-J Output: [SecFinder-J--Thread--5] - during processing of [QrCodeAbilitySlice.java] +2021-04-20 09:54:13.900 [Thread-1] INFO . - 2021-04-20 09:54:13.900: SecFinder-J Output: [SecFinder-J--Thread--3] - during processing of [QrUtils.java] +2021-04-20 09:54:13.924 [Thread-1] INFO . - 2021-04-20 09:54:13.924: SecFinder-J Output: [SecFinder-J--Thread--2] - during processing of [ScreenUtils.java] +2021-04-20 09:54:13.928 [Thread-1] INFO . - 2021-04-20 09:54:13.928: SecFinder-J Output: [SecFinder-J--Thread--8] - during processing of [QrCodeFinderView.java] +2021-04-20 09:54:14.154 [Thread-1] INFO . - 2021-04-20 09:54:14.154: SecFinder-J Output: step 4/4: Result output... +2021-04-20 09:54:14.154 [Thread-1] INFO . - 2021-04-20 09:54:14.154: SecFinder-J Output: Inspect finish... +2021-04-20 09:54:14.154 [Thread-1] INFO . - Analysis result: +2021-04-20 09:54:14.154 [Thread-1] INFO . - files analyzed : 20 +2021-04-20 09:54:14.154 [Thread-1] INFO . - lines analyzed : 1283 +2021-04-20 09:54:14.154 [Thread-1] INFO . - rules used : 59 +2021-04-20 09:54:14.154 [Thread-1] INFO . - issues detected : 0 +2021-04-20 09:54:14.154 [Thread-1] INFO . - time cost(sec) : 1 +2021-04-20 09:54:14.154 [Thread-1] INFO . - +2021-04-20 09:54:14.155 [Thread-2] INFO . - 四月 20, 2021 9:54:14 上午 com.huawei.secfinderj.override.HwPmd end +2021-04-20 09:54:14.155 [Thread-2] INFO . - 信息: SecFinder-J run successed! +2021-04-20 09:54:14.240 [CodeMars1] INFO . - start parse errorreport xml +2021-04-20 09:54:14.242 [CodeMars1] INFO . - parse xml time : 4 +2021-04-20 09:54:14.243 [CodeMars1] INFO . - end parse errorreport xml +2021-04-20 09:54:14.243 [main] INFO . - end collecting report. +2021-04-20 09:54:14.244 [main] INFO . - end analyzing. diff --git a/.idea/code-check/java/detect.txt b/.idea/code-check/java/detect.txt index 74ee6ed1fb2597622fc6db46c1886560fe0dbc9e..ccb7150279060521f9003bd9fd658f586b70fcd6 100644 --- a/.idea/code-check/java/detect.txt +++ b/.idea/code-check/java/detect.txt @@ -1,23 +1,22 @@ -D:/HW_HOS_Project/QRCodeScanner/entry/build/intermediates/shell/debug/src/main/java/com/blikoon/qrcodescannerlibrary/MainAbilityShellActivity.java -D:/HW_HOS_Project/QRCodeScanner/qrcodescanner/src/main/java/com/blikoon/qrcodescanner/utils/ScreenUtils.java -D:/HW_HOS_Project/QRCodeScanner/qrcodescanner/src/main/java/com/blikoon/qrcodescanner/decode/DecodeImageCallback.java -D:/HW_HOS_Project/QRCodeScanner/entry/build/generated/source/r/com/blikoon/qrcodescannerlibrary/ResourceTable.java -D:/HW_HOS_Project/QRCodeScanner/entry/src/ohosTest/java/com/blikoon/qrcodescannerlibrary/ExampleOhosTest.java -D:/HW_HOS_Project/QRCodeScanner/entry/build/generated/source/r/com/blikoon/qrcodescanner/ResourceTable.java -D:/HW_HOS_Project/QRCodeScanner/entry/build/generated/source/buildConfig/debug/com/blikoon/qrcodescannerlibrary/BuildConfig.java -D:/HW_HOS_Project/QRCodeScanner/entry/src/main/java/com/blikoon/qrcodescannerlibrary/MyApplication.java -D:/HW_HOS_Project/QRCodeScanner/entry/build/intermediates/shell/debug/src/main/java/com/blikoon/qrcodescannerlibrary/ShellMyApplication.java -D:/HW_HOS_Project/QRCodeScanner/qrcodescanner/src/main/java/com/blikoon/qrcodescanner/QrCodeAbility.java -D:/HW_HOS_Project/QRCodeScanner/entry/build/intermediates/shell/debug/build/res/r/com/blikoon/qrcodescannerlibrary/R.java -D:/HW_HOS_Project/QRCodeScanner/entry/build/intermediates/shell/debug/build/res/r/com/lijiaxiao/hw_wheelpicker2/R.java -D:/HW_HOS_Project/QRCodeScanner/qrcodescanner/src/main/java/com/blikoon/qrcodescanner/slice/QrCodeAbilitySlice.java -D:/HW_HOS_Project/QRCodeScanner/entry/src/main/java/com/blikoon/qrcodescannerlibrary/slice/MainAbilitySlice.java -D:/HW_HOS_Project/QRCodeScanner/qrcodescanner/src/main/java/com/blikoon/qrcodescanner/view/QrCodeFinderView.java -D:/HW_HOS_Project/QRCodeScanner/qrcodescanner/build/generated/source/r/com/blikoon/qrcodescanner/ResourceTable.java -D:/HW_HOS_Project/QRCodeScanner/entry/src/main/java/com/blikoon/qrcodescannerlibrary/MainAbility.java -D:/HW_HOS_Project/QRCodeScanner/qrcodescanner/src/main/java/com/blikoon/qrcodescanner/utils/QrUtils.java -D:/HW_HOS_Project/QRCodeScanner/qrcodescanner/src/main/java/com/blikoon/qrcodescanner/decode/QrManager.java -D:/HW_HOS_Project/QRCodeScanner/entry/build/intermediates/shell/debug/src/main/java/com/blikoon/qrcodescanner/QrCodeAbilityShellActivity.java -D:/HW_HOS_Project/QRCodeScanner/qrcodescanner/src/test/java/com/blikoon/qrcodescanner/ExampleTest.java -D:/HW_HOS_Project/QRCodeScanner/qrcodescanner/build/generated/source/buildConfig/debug/com/blikoon/qrcodescanner/BuildConfig.java -D:/HW_HOS_Project/QRCodeScanner/entry/src/test/java/com/blikoon/qrcodescannerlibrary/ExampleTest.java +D:/Gitee_Hos_Project/QRCodeScanner/qrcodescanner/src/main/java/com/blikoon/qrcodescanner/view/QrCodeFinderView.java +D:/Gitee_Hos_Project/QRCodeScanner/entry/src/main/java/com/blikoon/qrcodescannerlibrary/slice/MainAbilitySlice.java +D:/Gitee_Hos_Project/QRCodeScanner/entry/build/generated/source/r/com/blikoon/qrcodescannerlibrary/ResourceTable.java +D:/Gitee_Hos_Project/QRCodeScanner/qrcodescanner/src/main/java/com/blikoon/qrcodescanner/utils/ScreenUtils.java +D:/Gitee_Hos_Project/QRCodeScanner/entry/build/generated/source/buildConfig/debug/com/blikoon/qrcodescannerlibrary/BuildConfig.java +D:/Gitee_Hos_Project/QRCodeScanner/qrcodescanner/src/test/java/com/blikoon/qrcodescanner/ExampleTest.java +D:/Gitee_Hos_Project/QRCodeScanner/qrcodescanner/src/main/java/com/blikoon/qrcodescanner/QrCodeAbility.java +D:/Gitee_Hos_Project/QRCodeScanner/qrcodescanner/src/main/java/com/blikoon/qrcodescanner/slice/QrCodeAbilitySlice.java +D:/Gitee_Hos_Project/QRCodeScanner/qrcodescanner/src/main/java/com/blikoon/qrcodescanner/decode/QrManager.java +D:/Gitee_Hos_Project/QRCodeScanner/entry/src/main/java/com/blikoon/qrcodescannerlibrary/MainAbility.java +D:/Gitee_Hos_Project/QRCodeScanner/entry/build/intermediates/shell/debug/src/main/java/com/blikoon/qrcodescannerlibrary/ShellMyApplication.java +D:/Gitee_Hos_Project/QRCodeScanner/entry/build/intermediates/shell/debug/build/res/r/com/lijiaxiao/hw_wheelpicker2/R.java +D:/Gitee_Hos_Project/QRCodeScanner/entry/build/intermediates/shell/debug/src/main/java/com/blikoon/qrcodescannerlibrary/MainAbilityShellActivity.java +D:/Gitee_Hos_Project/QRCodeScanner/qrcodescanner/build/generated/source/r/com/blikoon/qrcodescanner/ResourceTable.java +D:/Gitee_Hos_Project/QRCodeScanner/entry/src/test/java/com/blikoon/qrcodescannerlibrary/ExampleTest.java +D:/Gitee_Hos_Project/QRCodeScanner/qrcodescanner/build/generated/source/buildConfig/debug/com/blikoon/qrcodescanner/BuildConfig.java +D:/Gitee_Hos_Project/QRCodeScanner/entry/build/generated/source/r/com/blikoon/qrcodescanner/ResourceTable.java +D:/Gitee_Hos_Project/QRCodeScanner/entry/build/intermediates/shell/debug/build/res/r/com/blikoon/qrcodescannerlibrary/R.java +D:/Gitee_Hos_Project/QRCodeScanner/entry/build/intermediates/shell/debug/src/main/java/com/blikoon/qrcodescanner/QrCodeAbilityShellActivity.java +D:/Gitee_Hos_Project/QRCodeScanner/entry/src/ohosTest/java/com/blikoon/qrcodescannerlibrary/ExampleOhosTest.java +D:/Gitee_Hos_Project/QRCodeScanner/entry/src/main/java/com/blikoon/qrcodescannerlibrary/MyApplication.java +D:/Gitee_Hos_Project/QRCodeScanner/qrcodescanner/src/main/java/com/blikoon/qrcodescanner/utils/QrUtils.java diff --git a/.idea/code-check/java/output.xml b/.idea/code-check/java/output.xml index 240d0cf9c2ba52940713f6e6fb72d57a6a56cba6..1f4c5ec52cd85069968451f979cac50f4c55693b 100644 --- a/.idea/code-check/java/output.xml +++ b/.idea/code-check/java/output.xml @@ -2,8 +2,8 @@ -21 -1253 +20 +1283 1 0 diff --git a/changeLog.md b/changeLog.md index 467c705f0ad4fed2398d2757686a6d5b2762338f..3f1c0431e0965432ed810aaf6306bf36e8d91e98 100644 --- a/changeLog.md +++ b/changeLog.md @@ -1,8 +1,9 @@ -# 鍩烘湰鍔熻兘锛 -- 瀹炵幇浜岀淮鐮佹壂鐮佸姛鑳 - -# 淇敼鐐癸細 -1. 鐩告満鐨勮皟鐢,棰勮鏁版嵁鐨勮幏鍙栧拰瑙ｆ瀽 - -# 閬楃暀闂锛堟殏涓嶆敮鎸佺殑鍔熻兘锛夛細 -1. 璺宠浆鍥惧簱,瀹炵幇鍥剧墖浜岀淮鐮佽瘑鍒殏鏈疄鐜 + +# 鍩烘湰鍔熻兘锛 +- 瀹炵幇浜岀淮鐮佹壂鐮佸姛鑳 + +# 淇敼鐐癸細 +1. 鐩告満鐨勮皟鐢,棰勮鏁版嵁鐨勮幏鍙栧拰瑙ｆ瀽 + +# 閬楃暀闂锛堟殏涓嶆敮鎸佺殑鍔熻兘锛夛細 +1. 璺宠浆鍥惧簱,瀹炵幇鍥剧墖浜岀淮鐮佽瘑鍒殏鏈疄鐜 \ No newline at end of file diff --git a/qrcodescanner/src/main/java/com/blikoon/qrcodescanner/slice/QrCodeAbilitySlice.java b/qrcodescanner/src/main/java/com/blikoon/qrcodescanner/slice/QrCodeAbilitySlice.java index 9bccc2310a11b712d4b92a14a17e404f60e2348f..9e2d6e9b079f644a87859adb01382d7380eceaf5 100644 --- a/qrcodescanner/src/main/java/com/blikoon/qrcodescanner/slice/QrCodeAbilitySlice.java +++ b/qrcodescanner/src/main/java/com/blikoon/qrcodescanner/slice/QrCodeAbilitySlice.java @@ -81,7 +81,6 @@ public class QrCodeAbilitySlice extends AbilitySlice { */ private static FrameConfig.Builder frameConfigBuilder; private Player mPlayer; - private boolean flash = false; @Override public void onStart(Intent intent) { @@ -158,12 +157,12 @@ public class QrCodeAbilitySlice extends AbilitySlice { * 闂厜鐏 */ public void setFlash(Text des) { - flash = !flash; // 鑾峰彇棰勮閰嶇疆妯℃澘 FrameConfig.Builder frameConfigBuilder = myCamera.getFrameConfigBuilder(FRAME_CONFIG_PREVIEW); // 閰嶇疆棰勮Surface frameConfigBuilder.addSurface(previewSurface); - if (flash) { + int flashMode = frameConfigBuilder.getFlashMode(); + if (flashMode == Metadata.FlashMode.FLASH_CLOSE) { frameConfigBuilder.setFlashMode(Metadata.FlashMode.FLASH_ALWAYS_OPEN); if (des != null) { des.setText("Close Flash Light"); @@ -180,7 +179,29 @@ public class QrCodeAbilitySlice extends AbilitySlice { // 鍚姩寰幆甯ф崟鑾 myCamera.triggerLoopingCapture(previewFrameConfig); } catch (Exception e) { + System.out.println(e); + } + } + /** + * 鍏抽棴闂厜鐏 + */ + public void closeFlash() { + // 鑾峰彇棰勮閰嶇疆妯℃澘 + FrameConfig.Builder frameConfigBuilder = myCamera.getFrameConfigBuilder(FRAME_CONFIG_PREVIEW); + // 閰嶇疆棰勮Surface + frameConfigBuilder.addSurface(previewSurface); + int flashMode = frameConfigBuilder.getFlashMode(); + if (flashMode == Metadata.FlashMode.FLASH_ALWAYS_OPEN) { + frameConfigBuilder.setFlashMode(Metadata.FlashMode.FLASH_CLOSE); + } + // 棰勮甯у彉鐒﹀煎彉鏇 + FrameConfig previewFrameConfig = frameConfigBuilder.build(); + try { + // 鍚姩寰幆甯ф崟鑾 + myCamera.triggerLoopingCapture(previewFrameConfig); + } catch (Exception e) { + System.out.println(e); } } @@ -358,9 +379,7 @@ public class QrCodeAbilitySlice extends AbilitySlice { mPlayer.prepare(); mPlayer.play(); QrManager.getInstance().getResultCallback().onScanSuccess(result.getText()); - if (flash) { - setFlash(null); - } + closeFlash(); terminate(); } }