From bd56ed53074f08b5eef5f6718954e0bfcc67d118 Mon Sep 17 00:00:00 2001 From: zhaojun Date: Mon, 7 Jun 2021 14:40:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7IDE=EF=BC=8C=E4=BF=AE?= =?UTF-8?q?=E6=94=B92.2=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 ++-- build.gradle | 6 +++--- entry/src/main/config.json | 2 +- .../slidingrootnav/sample/slice/MainAbilitySlice.java | 6 +++++- entry/src/ohosTest/config.json | 2 +- library/src/main/config.json | 2 +- .../yarolegovich/slidingrootnav/SlidingRootNavBuilder.java | 7 ++++++- .../yarolegovich/slidingrootnav/SlidingRootNavLayout.java | 4 +++- 8 files changed, 22 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 6558419..4d25ffc 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ - 功能：一种类似于抽屉布局，并且可以使其“抽屉”隐藏在“内容”视图下，如果移动内容后可以显示底部抽屉 - 项目移植状态：主功能完成 - 调用差异：无 -- 开发版本：sdk5，DevEco Studio2.1 beta4 +- 开发版本：sdk5，DevEco Studio2.1 Release - 基线版本：Release v1.1.1 #### 效果演示 @@ -30,7 +30,7 @@ dependencies { ...... } ``` -在sdk5，DevEco Studio2.1 beta4下项目可直接运行 如无法运行，删除项目.gradle,.idea,build,gradle,build.gradle文件， 并依据自己的版本创建新项目，将新项目的对应文件复制到根目录下 +在sdk5，DevEco Studio2.1 Release下项目可直接运行 如无法运行，删除项目.gradle,.idea,build,gradle,build.gradle文件， 并依据自己的版本创建新项目，将新项目的对应文件复制到根目录下 #### 使用说明 diff --git a/build.gradle b/build.gradle index 713785b..83d884f 100644 --- a/build.gradle +++ b/build.gradle @@ -16,10 +16,10 @@ buildscript { maven { url 'https://developer.huawei.com/repo/' } - jcenter() + jcenter() } dependencies { - classpath 'com.huawei.ohos:hap:2.4.2.7' + classpath 'com.huawei.ohos:hap:2.4.4.2' classpath 'com.huawei.ohos:decctest:1.0.0.6' } } @@ -32,6 +32,6 @@ allprojects { maven { url 'https://developer.huawei.com/repo/' } - jcenter() + jcenter() } } diff --git a/entry/src/main/config.json b/entry/src/main/config.json index 5adbf06..bc98a73 100644 --- a/entry/src/main/config.json +++ b/entry/src/main/config.json @@ -3,7 +3,7 @@ "bundleName": "com.yarolegovich.slidingrootnav.sample", "vendor": "yarolegovich", "version": { - "code": 1, + "code": 1000000, "name": "1.0" }, "apiVersion": { diff --git a/entry/src/main/java/com/yarolegovich/slidingrootnav/sample/slice/MainAbilitySlice.java b/entry/src/main/java/com/yarolegovich/slidingrootnav/sample/slice/MainAbilitySlice.java index 82015f5..c571bf2 100644 --- a/entry/src/main/java/com/yarolegovich/slidingrootnav/sample/slice/MainAbilitySlice.java +++ b/entry/src/main/java/com/yarolegovich/slidingrootnav/sample/slice/MainAbilitySlice.java @@ -169,7 +169,11 @@ public class MainAbilitySlice extends AbilitySlice implements Component.ClickedL /** * 通过资源ID获取位图对象 - **/ + * + * @param context + * @param resourceId + * @return PixelMap + */ private PixelMap getPixelMapFromResource(Context context, int resourceId) { InputStream inputStream = null; try { diff --git a/entry/src/ohosTest/config.json b/entry/src/ohosTest/config.json index 76d38ed..2717fcf 100644 --- a/entry/src/ohosTest/config.json +++ b/entry/src/ohosTest/config.json @@ -3,7 +3,7 @@ "bundleName": "com.yarolegovich.slidingrootnav.sample", "vendor": "yarolegovich", "version": { - "code": 1, + "code": 1000000, "name": "1.0" }, "apiVersion": { diff --git a/library/src/main/config.json b/library/src/main/config.json index 239c92a..f14b856 100644 --- a/library/src/main/config.json +++ b/library/src/main/config.json @@ -3,7 +3,7 @@ "bundleName": "com.yarolegovich.slidingrootnav", "vendor": "yarolegovich", "version": { - "code": 1, + "code": 1000000, "name": "1.0" }, "apiVersion": { diff --git a/library/src/main/java/com/yarolegovich/slidingrootnav/SlidingRootNavBuilder.java b/library/src/main/java/com/yarolegovich/slidingrootnav/SlidingRootNavBuilder.java index 336df88..e203d19 100644 --- a/library/src/main/java/com/yarolegovich/slidingrootnav/SlidingRootNavBuilder.java +++ b/library/src/main/java/com/yarolegovich/slidingrootnav/SlidingRootNavBuilder.java @@ -123,7 +123,12 @@ public class SlidingRootNavBuilder { return newRoot; } - //增加Ability中任意一个Component + /** + * 增加Ability中任意一个Component + * + * @param component + * @return SlidingRootNavBuilder + */ public SlidingRootNavBuilder withArbitrarilyView(Component component) { arbitrarilyComponent = component; return this; diff --git a/library/src/main/java/com/yarolegovich/slidingrootnav/SlidingRootNavLayout.java b/library/src/main/java/com/yarolegovich/slidingrootnav/SlidingRootNavLayout.java index 515f88a..fb14595 100644 --- a/library/src/main/java/com/yarolegovich/slidingrootnav/SlidingRootNavLayout.java +++ b/library/src/main/java/com/yarolegovich/slidingrootnav/SlidingRootNavLayout.java @@ -217,7 +217,9 @@ public class SlidingRootNavLayout extends StackLayout implements SlidingRootNav }); } - //判断滑动到那边底部 + /** + * 判断滑动到那边底部 + */ private void judgeToSlideBottom() { int direation = slideDirection == SlideGravity.LEFT ? 1 : -1; if (maxDragDistance / 2 > moveTotalX * direation) { -- Gitee