diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index 26d33521af10bcc7fd8cea344038eaaeb78d0ef5..0000000000000000000000000000000000000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser deleted file mode 100644 index 67ce56dd65ed993bee231bbacf8a94f3ccdb00e2..0000000000000000000000000000000000000000 Binary files a/.idea/caches/build_file_checksums.ser and /dev/null differ diff --git a/.idea/checkstyle-idea.xml b/.idea/checkstyle-idea.xml deleted file mode 100644 index bbd8e6feea6b21c4f008596ae2e3243a48afb559..0000000000000000000000000000000000000000 --- a/.idea/checkstyle-idea.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/checkstyleidea-libs/readme.txt b/.idea/checkstyleidea-libs/readme.txt deleted file mode 100644 index 9df49167792f17638756ecb5e23f240ba0eb763a..0000000000000000000000000000000000000000 --- a/.idea/checkstyleidea-libs/readme.txt +++ /dev/null @@ -1,6 +0,0 @@ -This folder contains libraries copied from the "QRCodeScanner" project. -It is managed by the CheckStyle-IDEA IDE plugin. -Do not modify this folder while the IDE is running. -When the IDE is stopped, you may delete this folder at any time. It will be recreated as needed. -In order to prevent the CheckStyle-IDEA IDE plugin from creating this folder, -uncheck the "Copy libraries from project directory" option in the CheckStyle-IDEA settings dialog. diff --git a/.idea/code-check/java/codemars.log b/.idea/code-check/java/codemars.log deleted file mode 100644 index 5e71ed1725c95cf11aa56f5787a793bf2189ab73..0000000000000000000000000000000000000000 --- a/.idea/code-check/java/codemars.log +++ /dev/null @@ -1,49 +0,0 @@ -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 deleted file mode 100644 index ccb7150279060521f9003bd9fd658f586b70fcd6..0000000000000000000000000000000000000000 --- a/.idea/code-check/java/detect.txt +++ /dev/null @@ -1,22 +0,0 @@ -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 deleted file mode 100644 index 1f4c5ec52cd85069968451f979cac50f4c55693b..0000000000000000000000000000000000000000 --- a/.idea/code-check/java/output.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - -20 -1283 -1 -0 - diff --git a/.idea/code-check/java/ruleclasspath.txt b/.idea/code-check/java/ruleclasspath.txt deleted file mode 100644 index 17d8c272314fc39872f57693dc6deab73ec86f02..0000000000000000000000000000000000000000 --- a/.idea/code-check/java/ruleclasspath.txt +++ /dev/null @@ -1 +0,0 @@ -C:\Program Files\Huawei\DevEco Studio 2.1.0.301\plugins\codecheck\lib\CodeMars\engines\SecFinder-J\rule\ diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index 61a9130cd9669c3843e6445dfe1fee2d493869bc..0000000000000000000000000000000000000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml deleted file mode 100644 index 5d60717e896c4276a9b35ff1b1f3f1c83047115f..0000000000000000000000000000000000000000 --- a/.idea/gradle.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml deleted file mode 100644 index 1dfcd020d2b2774ad414ac5c0acc344e9b9479b4..0000000000000000000000000000000000000000 --- a/.idea/jarRepositories.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 8a14290d011eafeb38e9abc5abac47df163a6d4f..0000000000000000000000000000000000000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index f45439cf0c5eae347dd708bafe2740d69f856896..0000000000000000000000000000000000000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/qaplug_profiles.xml b/.idea/qaplug_profiles.xml deleted file mode 100644 index 3dfd21f3217524e575f32113c93bdd238a03c1bc..0000000000000000000000000000000000000000 --- a/.idea/qaplug_profiles.xml +++ /dev/null @@ -1,465 +0,0 @@ - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 94a25f7f4cb416c083d265558da75d457237d671..0000000000000000000000000000000000000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/README.md b/README.md index 5138e5acce8e6613d021acb561772c125870b363..e47dfb6ca4aaa388bc54c282ff7e37eee79ef154 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -锘# QRCodeScanner_ohos +# QRCodeScanner_ohos **鏈」鐩熀浜庡紑婧愰」鐩甉RCodeScanner 杩涜openharmony鍖栫殑绉绘鍜屽紑鍙戯紝鍙互閫氳繃椤圭洰鏍囩浠ュ強github鍦板潃锛 https://github.com/blikoon/QRCodeScanner 锛夎拷韪埌鍘熼」鐩増鏈** @@ -9,14 +9,13 @@ - 鍩虹嚎鐗堟湰锛 QRCodeScanner Tags 0.1.2 - 椤圭洰绉绘鐘舵侊細涓诲姛鑳藉畬鎴 - 璋冪敤宸紓锛氭棤 -- 寮鍙戠増鏈細sdk5锛孌evEco Studio2.1 beta3 -- 椤圭洰浣滆呭拰缁存姢浜猴細鏉庝匠鏅 -- 鑱旂郴鏂瑰紡锛歭ijiaxiao073@chinasoftinc.com +- 寮鍙戠増鏈細sdk5锛孌evEco Studio2.1 beta4 - 鍘熼」鐩瓺oc鍦板潃锛歨ttps://github.com/blikoon/QRCodeScanner #### 鏁堟灉婕旂ず - + + #### 瀹夎鏁欑▼ @@ -38,10 +37,6 @@ } ``` -鍦╯dk5锛孌evEco Studio2.1 beta3涓嬮」鐩彲鐩存帴杩愯 -濡傛棤娉曡繍琛岋紝鍒犻櫎椤圭洰.gradle,.idea,build,gradle,build.gradle鏂囦欢锛 -骞朵緷鎹嚜宸辩殑鐗堟湰鍒涘缓鏂伴」鐩紝灏嗘柊椤圭洰鐨勫搴旀枃浠跺鍒跺埌鏍圭洰褰曚笅 - #### 浣跨敤璇存槑 缁勪欢涓昏鐢盦rCodeAbilitySlice瀹炵幇鎵爜鍜孮rManager鑾峰彇缁撴灉缁勬垚銆 @@ -84,8 +79,6 @@ CloudTest浠g爜娴嬭瘯鏃犲紓甯 褰撳墠鐗堟湰demo鍔熻兘涓庡師缁勪欢鍩烘湰鏃犲樊寮 -娴嬭瘯鍛橈細甯镐竾閲 - #### 鐗堟湰杩唬 - 0.0.1-SNAPSHOT diff --git a/build.gradle b/build.gradle index bbb5d8b3bebfa3a7c406747c636f6dc51ab06748..6cffe329a90226d3527cc46ceed016da6fa2d0bb 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ ohos { compatibleSdkVersion 5 } } - + buildscript { repositories { maven { @@ -16,7 +16,7 @@ buildscript { maven { url 'https://developer.huawei.com/repo/' } - jcenter() + jcenter() } dependencies { classpath 'com.huawei.ohos:hap:2.4.2.5' @@ -32,6 +32,6 @@ allprojects { maven { url 'https://developer.huawei.com/repo/' } - jcenter() + jcenter() } } diff --git a/entry-debug-rich-unsigned.hap b/entry-debug-rich-unsigned.hap new file mode 100644 index 0000000000000000000000000000000000000000..0398dfe4d63a502c9ba3f17d0b1bbd53f3a7f13d Binary files /dev/null and b/entry-debug-rich-unsigned.hap differ diff --git a/entry/src/main/config.json b/entry/src/main/config.json index a9429b52622d8553c0ba5e125abd82707d356c4a..313784dedcc377dbd2f81d0e3b8da7f801acd25e 100644 --- a/entry/src/main/config.json +++ b/entry/src/main/config.json @@ -9,7 +9,7 @@ "apiVersion": { "compatible": 5, "target": 5, - "releaseType": "Beta1" + "releaseType": "Release" } }, "deviceConfig": {}, diff --git a/img/icon3.jpg b/img/icon3.jpg new file mode 100644 index 0000000000000000000000000000000000000000..b98fd2b9351b17f6f190e39acea8e4e398f4359c Binary files /dev/null and b/img/icon3.jpg differ 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 179c3a1cbaea7e79710812ddd7ea2b083f509689..58982abcd46bcc3684fe705d9a4d82418fef3b4e 100644 --- a/qrcodescanner/src/main/java/com/blikoon/qrcodescanner/slice/QrCodeAbilitySlice.java +++ b/qrcodescanner/src/main/java/com/blikoon/qrcodescanner/slice/QrCodeAbilitySlice.java @@ -26,7 +26,6 @@ import ohos.aafwk.ability.AbilitySlice; import ohos.aafwk.ability.DataAbilityHelper; import ohos.aafwk.content.Intent; import ohos.agp.colors.RgbColor; -import ohos.agp.components.ComponentTreeObserver; import ohos.agp.components.DependentLayout; import ohos.agp.components.DirectionalLayout; import ohos.agp.components.Text;