From e959b1b9354e5cff73233414123440b288fcdb4d Mon Sep 17 00:00:00 2001 From: renpengfei Date: Mon, 5 Jul 2021 19:59:07 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0JavaDoc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shadowlayout/v2/ShadowDrawable.java | 20 +++++++++++++++++++ .../shadowlayout/v2/ShadowLayout.java | 5 +++++ 2 files changed, 25 insertions(+) diff --git a/library/src/main/java/com/lijiankun24/shadowlayout/v2/ShadowDrawable.java b/library/src/main/java/com/lijiankun24/shadowlayout/v2/ShadowDrawable.java index 4bca809..42ccd47 100644 --- a/library/src/main/java/com/lijiankun24/shadowlayout/v2/ShadowDrawable.java +++ b/library/src/main/java/com/lijiankun24/shadowlayout/v2/ShadowDrawable.java @@ -158,21 +158,41 @@ public class ShadowDrawable extends ShapeElement implements Component.DrawTask, canvas.drawPath(path, mShadowPaint); } + /** + * setAlpha + * + * @param alpha + */ @Override public void setAlpha(int alpha) { mShadowPaint.setAlpha(alpha); } + /** + * setColorFilter + * + * @param colorFilter + */ @Override public void setColorFilter(ColorFilter colorFilter) { mShadowPaint.setColorFilter(colorFilter); } + /** + * getOpacity + * + * @return PixelFormat + */ @Override public PixelFormat getOpacity() { return PixelFormat.ARGB_8888; } + /** + * setRgbColor + * + * @param color + */ @Override public void setRgbColor(RgbColor color) { super.setRgbColor(color); diff --git a/library/src/main/java/com/lijiankun24/shadowlayout/v2/ShadowLayout.java b/library/src/main/java/com/lijiankun24/shadowlayout/v2/ShadowLayout.java index 60b58e8..9608b83 100644 --- a/library/src/main/java/com/lijiankun24/shadowlayout/v2/ShadowLayout.java +++ b/library/src/main/java/com/lijiankun24/shadowlayout/v2/ShadowLayout.java @@ -319,6 +319,11 @@ public class ShadowLayout extends StackLayout implements Component.EstimateSizeL canvas.drawPath(path, mShadowPaint); } + /** + * setAlpha + * + * @param alpha + */ @Override public void setAlpha(float alpha) { super.setAlpha(alpha); -- Gitee From 26dd254f9b955d305bffbea387fbe0af46b28f4f Mon Sep 17 00:00:00 2001 From: renpengfei Date: Mon, 5 Jul 2021 19:59:56 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=80=82=E9=85=8D=E6=9C=80=E6=96=B0?= =?UTF-8?q?=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 4 ++++ README.md | 12 ++++++------ build.gradle | 8 ++++---- library/build.gradle | 4 ++-- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 868edeb..8603932 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.0.2-SNAPSHOT +ohos 第二个版本 + * 适配最新版本 + ## 0.0.1-SNAPSHOT ohos 第一个版本 * 实现了原库的大部分 api diff --git a/README.md b/README.md index 34b3ad9..5d66309 100644 --- a/README.md +++ b/README.md @@ -5,10 +5,10 @@ - 项目名称：ShadowLayout - 所属系列：openharmony的第三方组件适配移植 - 功能：可以控制阴影的颜色、范围、显示边界 -- 基线版本： ShadowLayout Releases master - 项目移植状态：已完成 - 调用差异：无 -- 开发版本：sdk5，DevEco Studio2.1 Release +- 开发版本：sdk6，DevEco Studio2.2 Beta1 +- 基线版本： ShadowLayout Releases master ## 安装教程 @@ -25,12 +25,12 @@ 2.在entry模块的build.gradle文件中， ``` dependencies { - implementation('com.gitee.chinasoft_ohos:ShadowLayout:0.0.1-SNAPSHOT') + implementation('com.gitee.chinasoft_ohos:ShadowLayout:0.0.2-SNAPSHOT') ...... } ``` -在sdk5，DevEco Studio2.1 Release下项目可直接运行 +在sdk6，DevEco Studio2.2 Beta1下项目可直接运行 如无法运行，删除项目.gradle,.idea,build,gradle,build.gradle文件， 并依据自己的版本创建新项目，将新项目的对应文件复制到根目录下 @@ -117,13 +117,13 @@ CodeCheck代码测试无异常 CloudTest代码测试无异常 -火绒安全病毒安全检测通过 +病毒安全检测通过 当前版本demo功能与原组件基本无差异 ## 版本迭代 -- 0.0.1-SNAPSHOT +- 0.0.2-SNAPSHOT ## 版权和许可信息 ``` diff --git a/build.gradle b/build.gradle index f2c66e2..a4bbee5 100644 --- a/build.gradle +++ b/build.gradle @@ -2,9 +2,9 @@ apply plugin: 'com.huawei.ohos.app' ohos { - compileSdkVersion 5 + compileSdkVersion 6 defaultConfig { - compatibleSdkVersion 4 + compatibleSdkVersion 5 } } @@ -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/library/build.gradle b/library/build.gradle index e1c0b27..7e1e475 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -1,8 +1,8 @@ apply plugin: 'com.huawei.ohos.library' ohos { - compileSdkVersion 5 + compileSdkVersion 6 defaultConfig { - compatibleSdkVersion 4 + compatibleSdkVersion 5 } buildTypes { release { -- Gitee From 44c640c90aa5d36344ab05d7e0130985466c8d25 Mon Sep 17 00:00:00 2001 From: renpengfei Date: Mon, 5 Jul 2021 20:00:44 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E9=80=82=E9=85=8D=E6=9C=80=E6=96=B0?= =?UTF-8?q?=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- entry/build.gradle | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/entry/build.gradle b/entry/build.gradle index c7a48ec..b72afe7 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 { @@ -20,7 +20,8 @@ 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:ShadowLayout:0.0.1-SNAPSHOT') +// compile project(path: ':library') + implementation('com.gitee.chinasoft_ohos:ShadowLayout:0.0.2-SNAPSHOT') } decc { supportType = ['html','xml'] -- Gitee