diff --git a/CHANGELOG.md b/CHANGELOG.md index 868edebd9a31421e5516562a81fd7178b79e30e7..8603932d9d185a7d41332522fae80419630d9393 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 34b3ad945178e24888e58f1301dd945380da79af..5d663097d43b43850f7fc71dbd58382e29ae6ca8 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 f2c66e2ddb0fc3188c44db244f524a7cbdf0e937..a4bbee50c84428507c792bf978676f0ff6fe17a8 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/entry/build.gradle b/entry/build.gradle index c7a48ec012bd00fc6af701ed90f0e239ab8ff7f6..b72afe7f142843dc3c3815ab5d7fd0961a427c36 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'] diff --git a/library/build.gradle b/library/build.gradle index e1c0b274a6c5cb35b197a177a17684addf760676..7e1e475c1296e7c6d200a45810598ddff583ee7f 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 { 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 4bca8091f56dbc59c7e4ada81ebd103fc5cb42ac..42ccd47b095d7dc3b5a6a9a8e81ce59e20d9a06c 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 60b58e893ff01c5adcc90211d995433534e9208f..9608b8317b5baa3727df89c0a1aa134eb9aa6ecc 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);