From 3978f4cef30a59fd056c54025a5b13c07edeccb4 Mon Sep 17 00:00:00 2001 From: 251309-lirui Date: Mon, 5 Jul 2021 18:13:20 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=96=B0=E7=89=88=E6=9C=AC=E9=80=82?= =?UTF-8?q?=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 4 +-- entry/build.gradle | 4 +-- entry/src/main/config.json | 5 ---- .../Decode.java | 20 +++++++++++++++ .../Encode.java | 25 +++++++++++++++++++ entry/src/ohosTest/config.json | 5 ---- imagesteganographylibrary/build.gradle | 4 +-- .../src/main/config.json | 5 ---- .../Text/ImageSteganography.java | 3 --- .../view/CircleView.java | 13 ++++++++++ 10 files changed, 64 insertions(+), 24 deletions(-) diff --git a/build.gradle b/build.gradle index f2c66e2..67389e3 100644 --- a/build.gradle +++ b/build.gradle @@ -19,8 +19,8 @@ buildscript { jcenter() } dependencies { - classpath 'com.huawei.ohos:hap:2.4.4.2' - classpath 'com.huawei.ohos:decctest:1.0.0.7' + classpath 'com.huawei.ohos:hap:2.4.5.0' + classpath 'com.huawei.ohos:decctest:1.2.4.1' } } diff --git a/entry/build.gradle b/entry/build.gradle index 490ffc8..9b762ae 100644 --- a/entry/build.gradle +++ b/entry/build.gradle @@ -1,9 +1,9 @@ apply plugin: 'com.huawei.ohos.hap' apply plugin: 'com.huawei.ohos.decctest' ohos { - compileSdkVersion 5 + compileSdkVersion 6 defaultConfig { - compatibleSdkVersion 4 + compatibleSdkVersion 5 } buildTypes { release { diff --git a/entry/src/main/config.json b/entry/src/main/config.json index 49f5827..dea7689 100644 --- a/entry/src/main/config.json +++ b/entry/src/main/config.json @@ -5,11 +5,6 @@ "version": { "code": 1000000, "name": "1.0.0" - }, - "apiVersion": { - "compatible": 4, - "target": 5, - "releaseType": "Release" } }, "deviceConfig": {}, diff --git a/entry/src/main/java/com/example/image_steganography_library_master/Decode.java b/entry/src/main/java/com/example/image_steganography_library_master/Decode.java index a36ba49..412a0a5 100644 --- a/entry/src/main/java/com/example/image_steganography_library_master/Decode.java +++ b/entry/src/main/java/com/example/image_steganography_library_master/Decode.java @@ -30,6 +30,11 @@ public class Decode extends Ability implements TextDecodingCallback { private PixelMap original_image; private ProgressDialog progressDialog; + /** + * onStart + * + * @param intent onStart + * */ @Override public void onStart(Intent intent) { super.onStart(intent); @@ -71,6 +76,9 @@ public class Decode extends Ability implements TextDecodingCallback { }); } + /** + * onStartTextEncoding + * */ @Override public void onStartTextEncoding() { //Whatever you want to do by the start of textDecoding @@ -78,6 +86,11 @@ public class Decode extends Ability implements TextDecodingCallback { progressDialog.showDialog("Decoding Message","Loading, Please Wait..."); } + /** + * onCompleteTextEncoding + * + * @param result ImageSteganography + * */ @Override public void onCompleteTextEncoding(ImageSteganography result) { //By the end of textDecoding @@ -107,6 +120,13 @@ public class Decode extends Ability implements TextDecodingCallback { startAbilityForResult(intent, SELECT_PICTURE); } + /** + * onAbilityResult + * + * @param requestCode int + * @param resultCode int + * @param data Intent + * */ @Override protected void onAbilityResult(int requestCode, int resultCode, Intent data) { super.onAbilityResult(requestCode, resultCode, data); diff --git a/entry/src/main/java/com/example/image_steganography_library_master/Encode.java b/entry/src/main/java/com/example/image_steganography_library_master/Encode.java index 65ac130..7c3d910 100644 --- a/entry/src/main/java/com/example/image_steganography_library_master/Encode.java +++ b/entry/src/main/java/com/example/image_steganography_library_master/Encode.java @@ -47,6 +47,11 @@ public class Encode extends Ability implements TextEncodingCallback, Component.C private String filename = "encoding"; private ProgressDialog progressDialog; + /** + * onStart + * + * @param intent Intent + * */ @Override public void onStart(Intent intent) { super.onStart(intent); @@ -108,6 +113,9 @@ public class Encode extends Ability implements TextEncodingCallback, Component.C }); } + /** + * onStartTextEncoding + * */ @Override public void onStartTextEncoding() { //Whatever you want to do at the start of text encoding @@ -115,6 +123,11 @@ public class Encode extends Ability implements TextEncodingCallback, Component.C progressDialog.showDialog("Encoding Message","Loading, Please Wait..."); } + /** + * onCompleteTextEncoding + * + * @param result ImageSteganography + * */ @Override public void onCompleteTextEncoding(ImageSteganography result) { // By the end of textEncoding @@ -139,6 +152,11 @@ public class Encode extends Ability implements TextEncodingCallback, Component.C } } + /** + * onClick + * + * @param component Component + * */ @Override public void onClick(Component component) { @@ -188,6 +206,13 @@ public class Encode extends Ability implements TextEncodingCallback, Component.C startAbilityForResult(intent, IMAGE_SELECT_REQUEST); } + /** + * onAbilityResult + * + * @param resultCode int + * @param requestCode int + * @param resultData Intent + * */ @Override protected void onAbilityResult(int requestCode, int resultCode, Intent resultData) { super.onAbilityResult(requestCode, resultCode, resultData); diff --git a/entry/src/ohosTest/config.json b/entry/src/ohosTest/config.json index 648c11d..ec8f5a4 100644 --- a/entry/src/ohosTest/config.json +++ b/entry/src/ohosTest/config.json @@ -5,11 +5,6 @@ "version": { "code": 1000000, "name": "1.0.0" - }, - "apiVersion": { - "compatible": 4, - "target": 5, - "releaseType": "Release" } }, "deviceConfig": {}, diff --git a/imagesteganographylibrary/build.gradle b/imagesteganographylibrary/build.gradle index e1c0b27..7e1e475 100644 --- a/imagesteganographylibrary/build.gradle +++ b/imagesteganographylibrary/build.gradle @@ -1,8 +1,8 @@ apply plugin: 'com.huawei.ohos.library' ohos { - compileSdkVersion 5 + compileSdkVersion 6 defaultConfig { - compatibleSdkVersion 4 + compatibleSdkVersion 5 } buildTypes { release { diff --git a/imagesteganographylibrary/src/main/config.json b/imagesteganographylibrary/src/main/config.json index 3ad32fb..43e5f33 100644 --- a/imagesteganographylibrary/src/main/config.json +++ b/imagesteganographylibrary/src/main/config.json @@ -5,11 +5,6 @@ "version": { "code": 1000000, "name": "1.0.0" - }, - "apiVersion": { - "compatible": 4, - "target": 5, - "releaseType": "Release" } }, "deviceConfig": { diff --git a/imagesteganographylibrary/src/main/java/com/example/imagesteganographylibrary/Text/ImageSteganography.java b/imagesteganographylibrary/src/main/java/com/example/imagesteganographylibrary/Text/ImageSteganography.java index 43096ed..7ba2926 100644 --- a/imagesteganographylibrary/src/main/java/com/example/imagesteganographylibrary/Text/ImageSteganography.java +++ b/imagesteganographylibrary/src/main/java/com/example/imagesteganographylibrary/Text/ImageSteganography.java @@ -13,9 +13,6 @@ import ohos.media.image.common.Size; */ public class ImageSteganography { - //Tag for Log - private static final String TAG = ImageSteganography.class.getName(); - private String message; private String secret_key; private String encrypted_message; diff --git a/imagesteganographylibrary/src/main/java/com/example/imagesteganographylibrary/view/CircleView.java b/imagesteganographylibrary/src/main/java/com/example/imagesteganographylibrary/view/CircleView.java index c697598..652167b 100644 --- a/imagesteganographylibrary/src/main/java/com/example/imagesteganographylibrary/view/CircleView.java +++ b/imagesteganographylibrary/src/main/java/com/example/imagesteganographylibrary/view/CircleView.java @@ -135,6 +135,12 @@ public class CircleView extends Component implements Component.EstimateSizeListe invalidate(); } + /** + * onDraw + * + * @param component Component + * @param canvas Canvas + * */ @Override public void onDraw(Component component, Canvas canvas) { canvas.drawCircle(mWidth / drawCircle, mWidth / drawCircle, mWidth / drawCircle - mPadding, mPaintPro); @@ -142,6 +148,13 @@ public class CircleView extends Component implements Component.EstimateSizeListe canvas.drawArc(rectF, new Arc(startAngle, sweepAngle, false), mPaint); } + /** + * onEstimateSize + * + * @param i1 + * @param i + * @return boolean + * */ @Override public boolean onEstimateSize(int i, int i1) { if (EstimateSpec.getSize(i) > getHeight()) { -- Gitee From 7d818120857b5d671f2c87eb82ede49b4f842890 Mon Sep 17 00:00:00 2001 From: 251309-lirui Date: Mon, 5 Jul 2021 18:17:23 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=96=B0=E7=89=88=E6=9C=AC=E9=80=82?= =?UTF-8?q?=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 5 +++-- README.md | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2312fb6..03584ed 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,4 @@ +## 0.0.2-SNAPSHOT +ohos 第二个版本,更新SDK6 ## 0.0.1-SNAPSHOT - -ohos 第一个版本，完整实现了原库的全部 api \ No newline at end of file +ohos 第一个版本,实现了原库的全部api \ No newline at end of file diff --git a/README.md b/README.md index d67a88a..798a135 100644 --- a/README.md +++ b/README.md @@ -184,7 +184,7 @@ CloudTest代码测试无异常 ### 版本迭代 -- 0.0.1-SNAPSHOT +- 0.0.2-SNAPSHOT ### 版权和许可信息 -- Gitee From dfc6894c185caef324c8fb7014b0c6017e24f886 Mon Sep 17 00:00:00 2001 From: 251309-lirui Date: Mon, 5 Jul 2021 18:50:59 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=96=B0=E7=89=88=E6=9C=AC=E9=80=82?= =?UTF-8?q?=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 798a135..948cda5 100644 --- a/README.md +++ b/README.md @@ -178,7 +178,7 @@ CodeCheck代码测试无异常 CloudTest代码测试无异常 -火绒安全病毒安全检测通过 +病毒安全检测通过 当前版本demo功能与原组件基本无差异 -- Gitee From 2b83438d2527816c2a8f78f63c5ae7ff3088fdf5 Mon Sep 17 00:00:00 2001 From: 251309-lirui Date: Tue, 6 Jul 2021 09:04:44 +0800 Subject: [PATCH 4/4] =?UTF-8?q?maven=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- entry/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/entry/build.gradle b/entry/build.gradle index 9b762ae..6f8ec3f 100644 --- a/entry/build.gradle +++ b/entry/build.gradle @@ -20,7 +20,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar', '*.har']) testImplementation 'junit:junit:4.13' ohosTestImplementation 'com.huawei.ohos.testkit:runner:1.0.0.100' - implementation 'com.gitee.chinasoft_ohos:imagesteganographylibrary:0.0.1-SNAPSHOT' + implementation 'com.gitee.chinasoft_ohos:imagesteganographylibrary:0.0.2-SNAPSHOT' } decc { supportType = ['html', 'xml'] -- Gitee