diff --git a/.idea/$PROJECT_FILE$ b/.idea/$PROJECT_FILE$ deleted file mode 100644 index 58b7e3e570f8289344d345f6e3634608e74c690d..0000000000000000000000000000000000000000 --- a/.idea/$PROJECT_FILE$ +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index 26d33521af10bcc7fd8cea344038eaaeb78d0ef5..0000000000000000000000000000000000000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml diff --git a/.idea/checkstyle-idea.xml b/.idea/checkstyle-idea.xml deleted file mode 100644 index 6eefe0e18e7f9b22e04bd7ae191213bd65c48515..0000000000000000000000000000000000000000 --- a/.idea/checkstyle-idea.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index 61a9130cd9669c3843e6445dfe1fee2d493869bc..0000000000000000000000000000000000000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml deleted file mode 100644 index 9108ab03b1e76b80feeeeb96d477196c11c82b00..0000000000000000000000000000000000000000 --- a/.idea/gradle.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml deleted file mode 100644 index dc31bf4ca80f663480e9b93fd8eb75b471cdeb9a..0000000000000000000000000000000000000000 --- a/.idea/jarRepositories.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 8a14290d011eafeb38e9abc5abac47df163a6d4f..0000000000000000000000000000000000000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/qaplug_profiles.xml b/.idea/qaplug_profiles.xml deleted file mode 100644 index 3dfd21f3217524e575f32113c93bdd238a03c1bc..0000000000000000000000000000000000000000 --- a/.idea/qaplug_profiles.xml +++ /dev/null @@ -1,465 +0,0 @@ - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1ddfbbc029bcab630581847471d7f238ec53..0000000000000000000000000000000000000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/README.OPENSOURCE b/README.OPENSOURCE new file mode 100644 index 0000000000000000000000000000000000000000..c49977868e39655895d774051959e176b4a28c93 --- /dev/null +++ b/README.OPENSOURCE @@ -0,0 +1,19 @@ +[ + + { + + "Name": "mkloader", + + "License": "Apache License", + + "License File": "https://github.com/nntuyen/mkloader/blob/master/LICENSE", + + "Version Number": "1.4.0", + + "Upstream URL": "https://github.com/nntuyen/mkloader", + + "Description": "美丽和平滑的自定义加载视图" + + } + +] \ No newline at end of file diff --git a/README.md b/README.md index 176fe8f25ba9e91052fa848a473df77c53ff34b3..ca38489099d0e52775f8b058bd35bed164bb5baf 100644 --- a/README.md +++ b/README.md @@ -1,17 +1,15 @@ # mkloader -**本项目基于开源项目mkloader 进行openharmony移植和开发,可以通过项目标签以及github地址( https://github.com/nntuyen/mkloader )追踪到原项目版本** +**本项目基于开源项目mkloader进行openharmony的移植和开发,可以通过项目标签以及github地址( https://github.com/nntuyen/mkloader )追踪到原项目版本** #### 项目介绍 - 项目名称:加载动画 -- 所属系列:openharmony第三方组件适配移植 +- 所属系列:openharmony的第三方组件适配移植 - 功能:一个自定义加载的动画组件。 - 基线版本: mkloader Tags 1.4.0 - 项目移植状态:主功能完成 - 调用差异:无 - 开发版本:sdk5,DevEco Studio2.1.0.301 beta3 -- 项目作者和维护人:樊景辉 -- 联系方式:fanjinghui073@chinasoftinc.com - 原项目Doc地址:https://github.com/nntuyen/mkloader #### 效果演示 @@ -74,8 +72,7 @@ CloudTest代码测试无异常 当前版本demo功能与原组件基本无差异 -测试员:常小俊 - +当前版本demo,部分功能暂不支持模拟器运行 #### 版本迭代 0.0.1-SNAPSHOT diff --git a/library/src/main/java/com/tuyenmonkey/mkloader/util/AnimatorValueUtil.java b/library/src/main/java/com/tuyenmonkey/mkloader/util/AnimatorValueUtil.java index 514b25dd2835932e3e53315036d4052597be6164..603977ed7628d1d8e591ba904319c83438f76ab4 100644 --- a/library/src/main/java/com/tuyenmonkey/mkloader/util/AnimatorValueUtil.java +++ b/library/src/main/java/com/tuyenmonkey/mkloader/util/AnimatorValueUtil.java @@ -52,11 +52,15 @@ public class AnimatorValueUtil { } // 计算每个变化值的占比和达到该变化值系数 - for (int i = 0; i < rate.length; i++) { - float tempRate = Math.abs((this.values[i + 1] - this.values[i]) / sum); - rate[i][0] = tempRate + (i == 0 ? 0 : rate[i - 1][0]); - float tempDuration = this.values[i + 1] - this.values[i]; - rate[i][1] = (this.values[i] > this.values[i + 1] ? negative : 1) * Math.abs(tempDuration / tempRate); + + if (sum != 0){ + for (int i = 0; i < rate.length; i++) { + float tempRate = Math.abs((this.values[i + 1] - this.values[i]) / sum); + rate[i][0] = tempRate + (i == 0 ? 0 : rate[i - 1][0]); + float tempDuration = this.values[i + 1] - this.values[i]; + rate[i][1] = (this.values[i] > this.values[i + 1] ? negative : 1) * Math.abs(tempDuration / tempRate); + } + } }