From 148c5ea0bb79771bed97726e0343e9512fc8a52f Mon Sep 17 00:00:00 2001 From: fjh Date: Wed, 19 May 2021 09:58:05 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0maven=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 176fe8f..1c9e615 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 #### 效果演示 @@ -73,9 +71,6 @@ CloudTest代码测试无异常 火绒安全病毒安全检测通过 当前版本demo功能与原组件基本无差异 - -测试员：常小俊 - #### 版本迭代 0.0.1-SNAPSHOT -- Gitee From 1a926bc02c2679ff139d4423b69bf127b87141e9 Mon Sep 17 00:00:00 2001 From: fjh Date: Wed, 19 May 2021 09:58:54 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20README?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1c9e615..9426059 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # mkloader -**本项目基于开源项目mkloader 进行openharmony的移植和开发，可以通过项目标签以及github地址（ https://github.com/nntuyen/mkloader ）追踪到原项目版本** +**本项目基于开源项目mkloader进行openharmony的移植和开发，可以通过项目标签以及github地址（ https://github.com/nntuyen/mkloader ）追踪到原项目版本** #### 项目介绍 - 项目名称：加载动画 -- Gitee From a1216bd273b965c4a91881dd8fcfe77417efc902 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A8=8A=E6=99=AF=E8=BE=89?= Date: Wed, 19 May 2021 09:59:27 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6=20.ide?= =?UTF-8?q?a?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/$PROJECT_FILE$ | 11 - .idea/.gitignore | 3 - .idea/checkstyle-idea.xml | 16 -- .idea/compiler.xml | 6 - .idea/gradle.xml | 23 -- .idea/jarRepositories.xml | 35 --- .idea/misc.xml | 13 -- .idea/qaplug_profiles.xml | 465 -------------------------------------- .idea/vcs.xml | 6 - 9 files changed, 578 deletions(-) delete mode 100644 .idea/$PROJECT_FILE$ delete mode 100644 .idea/.gitignore delete mode 100644 .idea/checkstyle-idea.xml delete mode 100644 .idea/compiler.xml delete mode 100644 .idea/gradle.xml delete mode 100644 .idea/jarRepositories.xml delete mode 100644 .idea/misc.xml delete mode 100644 .idea/qaplug_profiles.xml delete mode 100644 .idea/vcs.xml diff --git a/.idea/$PROJECT_FILE$ b/.idea/$PROJECT_FILE$ deleted file mode 100644 index 58b7e3e..0000000 --- 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 26d3352..0000000 --- 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 6eefe0e..0000000 --- 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 61a9130..0000000 --- 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 9108ab0..0000000 --- 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 dc31bf4..0000000 --- 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 8a14290..0000000 --- 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 3dfd21f..0000000 --- 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 35eb1dd..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file -- Gitee From fb95fedf62da36508005e6807ba9691e76768864 Mon Sep 17 00:00:00 2001 From: fjh Date: Thu, 20 May 2021 10:58:31 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20README?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 9426059..ca38489 100644 --- a/README.md +++ b/README.md @@ -71,6 +71,8 @@ CloudTest代码测试无异常 火绒安全病毒安全检测通过 当前版本demo功能与原组件基本无差异 + +当前版本demo，部分功能暂不支持模拟器运行 #### 版本迭代 0.0.1-SNAPSHOT -- Gitee From 8ead42e1db4bfde84198b95d188ef59ad232b70d Mon Sep 17 00:00:00 2001 From: fjh Date: Mon, 24 May 2021 10:04:44 +0800 Subject: [PATCH 5/6] add README.OPENSOURCE --- README.OPENSOURCE | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 README.OPENSOURCE diff --git a/README.OPENSOURCE b/README.OPENSOURCE new file mode 100644 index 0000000..c499778 --- /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 -- Gitee From 7b62132cc0483c6436ca7740c905edffa9d6faa7 Mon Sep 17 00:00:00 2001 From: fjh Date: Mon, 24 May 2021 10:42:06 +0800 Subject: [PATCH 6/6] =?UTF-8?q?bug=20=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mkloader/util/AnimatorValueUtil.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) 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 514b25d..603977e 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); + } + } } -- Gitee