From 95e925176442f0b3594ce0f847ecc5e4b8fe5424 Mon Sep 17 00:00:00 2001 From: cuizhaofei Date: Wed, 9 Jun 2021 16:13:39 +0800 Subject: [PATCH 1/2] =?UTF-8?q?1.README.md=E6=96=87=E4=BB=B6=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=202.=E5=8E=BB=E9=99=A4@author=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 8 +++++--- README.md | 18 +++++++++--------- build.gradle | 11 +++++++---- entry/build.gradle | 2 +- .../sample/progressability/DetailsAbility.java | 1 - .../sample/progressability/MainAbility.java | 1 - .../sample/progressability/MyApplication.java | 1 - .../slice/DetailsAbilitySlice.java | 1 - .../slice/MainAbilitySlice.java | 1 - .../slice/MainAbilitySliceTest.java | 1 - .../vlonjatg/progressability/Constants.java | 1 - .../progressability/ParameterEntity.java | 1 - .../ProgressDependentLayout.java | 1 - .../ProgressDirectionalLayout.java | 1 - .../progressability/ProgressLayout.java | 1 - .../progressability/ProgressStackLayout.java | 1 - .../progressability/button/SuperButton.java | 1 - .../loading/LoadingBuilder.java | 1 - .../loading/LoadingDrawable.java | 1 - .../progressability/loading/LoadingView.java | 1 - .../progressability/util/AttrValue.java | 1 - .../progressability/util/AttrValueTest.java | 1 - 22 files changed, 22 insertions(+), 35 deletions(-) diff --git a/.gitignore b/.gitignore index 9c4de58..de63311 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,9 @@ +*.iml .gradle -/local.properties -/.idea/workspace.xml -/.idea/libraries +.idea/* .DS_Store /build /captures +.externalNativeBuild +/entry/.preview +.cxx \ No newline at end of file diff --git a/README.md b/README.md index c97e560..ffffcbe 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,15 @@ -# progress-activity +# progress-ability #### 项目介绍 -- 项目名称：progress-activity内容加载时的进度条，空视图，错误视图。 +- 项目名称：progress-ability - 所属系列：openharmony的第三方组件适配移植 - 功能：内容加载时的进度条，空视图，错误视图。 - 基线版本：Release v2.0.5 - 项目移植状态：主功能完成 - 调用差异：无 -- 开发版本：sdk5，DevEco Studio2.1 beta4 +- 开发版本：sdk5，DevEco Studio2.1 Release #### 效果演示 - + #### 安装教程 1.在项目根目录下的build.gradle文件中， @@ -27,20 +27,20 @@ ``` dependencies { - implementation('com.gitee.chinasoft_ohos:convenientbanner:0.0.1-SNAPSHOT') + implementation('com.gitee.chinasoft_ohos:progress-ability:0.0.1-SNAPSHOT') ...... } ``` -在sdk5，DevEco Studio2.1 beta4下项目可直接运行 +在sdk5，DevEco Studio2.1 Release下项目可直接运行 如无法运行，删除项目.gradle,.idea,build,gradle,build.gradle文件， 并依据自己的版本创建新项目，将新项目的对应文件复制到根目录下 #### 使用说明 -根据您的用例，在布局中添加com.vlonjatg.progressactivity.ProgressDirectionalLayout或com.vlonjatg.progressactivity.ProgressDependentLayout或com.vlonjatg.progressactivity.ProgressStackLayout： +根据您的用例，在布局中添加com.vlonjatg.progressability.ProgressDirectionalLayout或com.vlonjatg.progressability.ProgressDependentLayout或com.vlonjatg.progressability.ProgressStackLayout： - - + 然后在您的代码中： diff --git a/build.gradle b/build.gradle index 9ec29b0..a77d0e7 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ ohos { compatibleSdkVersion 4 } } - + buildscript { repositories { maven { @@ -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.7' } } @@ -32,6 +32,9 @@ allprojects { maven { url 'https://developer.huawei.com/repo/' } - jcenter() + maven { + url 'https://s01.oss.sonatype.org/content/repositories/snapshots/' + } + jcenter() } } diff --git a/entry/build.gradle b/entry/build.gradle index e1bd03d..cd69efd 100644 --- a/entry/build.gradle +++ b/entry/build.gradle @@ -21,7 +21,7 @@ dependencies { testImplementation 'junit:junit:4.13' ohosTestImplementation 'com.huawei.ohos.testkit:runner:1.0.0.100' compile 'com.android.support.constraint:constraint-layout:1.0.2' - compile project(path: ':library') + implementation('com.gitee.chinasoft_ohos:progress-ability:0.0.1-SNAPSHOT') } decc { supportType = ['html','xml'] diff --git a/entry/src/main/java/com/vlonjatg/sample/progressability/DetailsAbility.java b/entry/src/main/java/com/vlonjatg/sample/progressability/DetailsAbility.java index be2c2f6..365913a 100644 --- a/entry/src/main/java/com/vlonjatg/sample/progressability/DetailsAbility.java +++ b/entry/src/main/java/com/vlonjatg/sample/progressability/DetailsAbility.java @@ -8,7 +8,6 @@ import ohos.agp.window.service.WindowManager; /** * 各种状态下的Ability * - * @author czf * @since 2021-04-07 */ public class DetailsAbility extends Ability { diff --git a/entry/src/main/java/com/vlonjatg/sample/progressability/MainAbility.java b/entry/src/main/java/com/vlonjatg/sample/progressability/MainAbility.java index e2cce78..2a836ce 100644 --- a/entry/src/main/java/com/vlonjatg/sample/progressability/MainAbility.java +++ b/entry/src/main/java/com/vlonjatg/sample/progressability/MainAbility.java @@ -8,7 +8,6 @@ import ohos.agp.window.service.WindowManager; /** * 首页Ability * - * @author czf * @since 2021-04-07 */ public class MainAbility extends Ability { diff --git a/entry/src/main/java/com/vlonjatg/sample/progressability/MyApplication.java b/entry/src/main/java/com/vlonjatg/sample/progressability/MyApplication.java index 6725302..a7ee2b2 100644 --- a/entry/src/main/java/com/vlonjatg/sample/progressability/MyApplication.java +++ b/entry/src/main/java/com/vlonjatg/sample/progressability/MyApplication.java @@ -5,7 +5,6 @@ import ohos.aafwk.ability.AbilityPackage; /** * Application * - * @author czf * @since 2021-04-07 */ public class MyApplication extends AbilityPackage { diff --git a/entry/src/main/java/com/vlonjatg/sample/progressability/slice/DetailsAbilitySlice.java b/entry/src/main/java/com/vlonjatg/sample/progressability/slice/DetailsAbilitySlice.java index 83b9a33..d3c7f7e 100644 --- a/entry/src/main/java/com/vlonjatg/sample/progressability/slice/DetailsAbilitySlice.java +++ b/entry/src/main/java/com/vlonjatg/sample/progressability/slice/DetailsAbilitySlice.java @@ -18,7 +18,6 @@ import java.util.List; /** * 各种状态下显示的AbilitySlice * - * @author czf * @since 2021-04-07 */ public class DetailsAbilitySlice extends AbilitySlice { diff --git a/entry/src/main/java/com/vlonjatg/sample/progressability/slice/MainAbilitySlice.java b/entry/src/main/java/com/vlonjatg/sample/progressability/slice/MainAbilitySlice.java index 0f4bd01..403cd5c 100644 --- a/entry/src/main/java/com/vlonjatg/sample/progressability/slice/MainAbilitySlice.java +++ b/entry/src/main/java/com/vlonjatg/sample/progressability/slice/MainAbilitySlice.java @@ -10,7 +10,6 @@ import ohos.agp.components.Component; /** * 主界面AbilitySlice * - * @author czf * @since 2021-04-07 */ public class MainAbilitySlice extends AbilitySlice implements Component.ClickedListener { diff --git a/entry/src/ohosTest/java/com/vlonjatg/sample/progressability/slice/MainAbilitySliceTest.java b/entry/src/ohosTest/java/com/vlonjatg/sample/progressability/slice/MainAbilitySliceTest.java index 0445d26..5fb059e 100644 --- a/entry/src/ohosTest/java/com/vlonjatg/sample/progressability/slice/MainAbilitySliceTest.java +++ b/entry/src/ohosTest/java/com/vlonjatg/sample/progressability/slice/MainAbilitySliceTest.java @@ -27,7 +27,6 @@ import org.junit.Test; /** * 文件描述 * - * @author 姓名 * @since 2021-05-27 */ public class MainAbilitySliceTest { diff --git a/library/src/main/java/com/vlonjatg/progressability/Constants.java b/library/src/main/java/com/vlonjatg/progressability/Constants.java index a0be9b2..2438ed9 100644 --- a/library/src/main/java/com/vlonjatg/progressability/Constants.java +++ b/library/src/main/java/com/vlonjatg/progressability/Constants.java @@ -18,7 +18,6 @@ package com.vlonjatg.progressability; /** * 常量类 * - * @author 姓名 * @since 2021-04-08 */ public final class Constants { diff --git a/library/src/main/java/com/vlonjatg/progressability/ParameterEntity.java b/library/src/main/java/com/vlonjatg/progressability/ParameterEntity.java index 3c48c5a..60784d5 100644 --- a/library/src/main/java/com/vlonjatg/progressability/ParameterEntity.java +++ b/library/src/main/java/com/vlonjatg/progressability/ParameterEntity.java @@ -23,7 +23,6 @@ import java.util.List; /** * 实体类 * - * @author czf * @since 2021-04-08 */ public class ParameterEntity { diff --git a/library/src/main/java/com/vlonjatg/progressability/ProgressDependentLayout.java b/library/src/main/java/com/vlonjatg/progressability/ProgressDependentLayout.java index 2288eb8..0b32de0 100644 --- a/library/src/main/java/com/vlonjatg/progressability/ProgressDependentLayout.java +++ b/library/src/main/java/com/vlonjatg/progressability/ProgressDependentLayout.java @@ -24,7 +24,6 @@ import java.util.List; /** * 各种状态下的Ability * - * @author czf * @since 2021-04-07 */ public class ProgressDependentLayout extends DependentLayout implements ProgressLayout { diff --git a/library/src/main/java/com/vlonjatg/progressability/ProgressDirectionalLayout.java b/library/src/main/java/com/vlonjatg/progressability/ProgressDirectionalLayout.java index d93f359..6e92d55 100644 --- a/library/src/main/java/com/vlonjatg/progressability/ProgressDirectionalLayout.java +++ b/library/src/main/java/com/vlonjatg/progressability/ProgressDirectionalLayout.java @@ -24,7 +24,6 @@ import java.util.List; /** * 各种状态下的Ability * - * @author czf * @since 2021-04-07 */ public class ProgressDirectionalLayout extends DirectionalLayout implements ProgressLayout { diff --git a/library/src/main/java/com/vlonjatg/progressability/ProgressLayout.java b/library/src/main/java/com/vlonjatg/progressability/ProgressLayout.java index e0cb89b..ec4e490 100644 --- a/library/src/main/java/com/vlonjatg/progressability/ProgressLayout.java +++ b/library/src/main/java/com/vlonjatg/progressability/ProgressLayout.java @@ -3,7 +3,6 @@ package com.vlonjatg.progressability; /** * 显示对应布局接口 * - * @author czf * @since 2021-04-07 */ public interface ProgressLayout { diff --git a/library/src/main/java/com/vlonjatg/progressability/ProgressStackLayout.java b/library/src/main/java/com/vlonjatg/progressability/ProgressStackLayout.java index 4020526..9c40694 100644 --- a/library/src/main/java/com/vlonjatg/progressability/ProgressStackLayout.java +++ b/library/src/main/java/com/vlonjatg/progressability/ProgressStackLayout.java @@ -25,7 +25,6 @@ import java.util.List; /** * 各种状态下的Ability * - * @author czf * @since 2021-04-07 */ public class ProgressStackLayout extends StackLayout implements ProgressLayout { diff --git a/library/src/main/java/com/vlonjatg/progressability/button/SuperButton.java b/library/src/main/java/com/vlonjatg/progressability/button/SuperButton.java index d9bcbc2..ebe1311 100644 --- a/library/src/main/java/com/vlonjatg/progressability/button/SuperButton.java +++ b/library/src/main/java/com/vlonjatg/progressability/button/SuperButton.java @@ -32,7 +32,6 @@ import ohos.multimodalinput.event.TouchEvent; /** * button * - * @author: wjt * @since 2021-04-22 */ public class SuperButton extends Button implements Component.DrawTask, diff --git a/library/src/main/java/com/vlonjatg/progressability/loading/LoadingBuilder.java b/library/src/main/java/com/vlonjatg/progressability/loading/LoadingBuilder.java index 3d3f681..a9b8a3d 100644 --- a/library/src/main/java/com/vlonjatg/progressability/loading/LoadingBuilder.java +++ b/library/src/main/java/com/vlonjatg/progressability/loading/LoadingBuilder.java @@ -35,7 +35,6 @@ import java.util.Optional; /** * 加载Drawable * - * @author czf * @since 2021-05-12 */ public class LoadingBuilder implements AnimatorValue.ValueUpdateListener, Animator.LoopedListener, diff --git a/library/src/main/java/com/vlonjatg/progressability/loading/LoadingDrawable.java b/library/src/main/java/com/vlonjatg/progressability/loading/LoadingDrawable.java index 70996ca..ea65a1f 100644 --- a/library/src/main/java/com/vlonjatg/progressability/loading/LoadingDrawable.java +++ b/library/src/main/java/com/vlonjatg/progressability/loading/LoadingDrawable.java @@ -24,7 +24,6 @@ import ohos.app.Context; /** * 加载Drawable * - * @author czf * @since 2021-05-12 */ public class LoadingDrawable extends Image implements Component.DrawTask { diff --git a/library/src/main/java/com/vlonjatg/progressability/loading/LoadingView.java b/library/src/main/java/com/vlonjatg/progressability/loading/LoadingView.java index b308e3d..ef9f753 100644 --- a/library/src/main/java/com/vlonjatg/progressability/loading/LoadingView.java +++ b/library/src/main/java/com/vlonjatg/progressability/loading/LoadingView.java @@ -26,7 +26,6 @@ import ohos.app.Context; /** * 加载view * - * @author czf * @since 2021-05-12 */ public class LoadingView extends Image implements Component.BindStateChangedListener, diff --git a/library/src/main/java/com/vlonjatg/progressability/util/AttrValue.java b/library/src/main/java/com/vlonjatg/progressability/util/AttrValue.java index b73be27..150810d 100644 --- a/library/src/main/java/com/vlonjatg/progressability/util/AttrValue.java +++ b/library/src/main/java/com/vlonjatg/progressability/util/AttrValue.java @@ -23,7 +23,6 @@ import ohos.agp.utils.Color; /** * AttrValue * - * @author czf * @since 2021-05-12 */ public final class AttrValue { diff --git a/library/src/test/java/com/vlonjatg/progressability/util/AttrValueTest.java b/library/src/test/java/com/vlonjatg/progressability/util/AttrValueTest.java index d438d6f..4a45f9b 100644 --- a/library/src/test/java/com/vlonjatg/progressability/util/AttrValueTest.java +++ b/library/src/test/java/com/vlonjatg/progressability/util/AttrValueTest.java @@ -7,7 +7,6 @@ import org.junit.After; /** * AttrValue Tester. * - * @author * @version 1.0 * @since 
May 14, 2021
*/ -- Gitee From 72a3e31e9e91522bf3c760c7935c2593a4ccd9d8 Mon Sep 17 00:00:00 2001 From: cuizhaofei Date: Wed, 9 Jun 2021 16:14:31 +0800 Subject: [PATCH 2/2] =?UTF-8?q?gif=E5=9B=BE=E5=90=8D=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gif/{ProgressActivity.gif => progress-ability.gif} | Bin 1 file changed, 0 insertions(+), 0 deletions(-) rename gif/{ProgressActivity.gif => progress-ability.gif} (100%) diff --git a/gif/ProgressActivity.gif b/gif/progress-ability.gif similarity index 100% rename from gif/ProgressActivity.gif rename to gif/progress-ability.gif -- Gitee