From 4d22e7c9376973ee3a5f3e3dcb9d3817328ef937 Mon Sep 17 00:00:00 2001 From: yu_xh <940151214@qq.com> Date: Mon, 18 Oct 2021 11:05:43 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=E6=B7=BB=E5=8A=A0ElasticEaseInOut?= =?UTF-8?q?=E5=8A=A8=E7=94=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 1 + build.gradle | 2 +- entry/src/main/config.json | 3 +-- library/src/main/java/com/daimajia/easing/Skill.java | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 519f373..7cbb192 100644 --- a/README.md +++ b/README.md @@ -25,6 +25,7 @@ - CubicEaseOut - CubicEaseInOut - ElasticEaseIn +- ElasticEaseInOut - ElasticEaseOut - ExpoEaseIn - ExpoEaseOut diff --git a/build.gradle b/build.gradle index cc5c2cd..42c0b80 100644 --- a/build.gradle +++ b/build.gradle @@ -19,7 +19,7 @@ buildscript { 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' } } diff --git a/entry/src/main/config.json b/entry/src/main/config.json index 82ba8e9..b62043f 100644 --- a/entry/src/main/config.json +++ b/entry/src/main/config.json @@ -40,11 +40,10 @@ } ], "orientation": "portrait", - "formEnabled": false, "name": "com.com.easing.MainAbility", "icon": "$media:icon", "description": "$string:mainability_description", - "label": "AnimationEasingDemo", + "label": "$string:app_name", "type": "page", "launchType": "standard" } diff --git a/library/src/main/java/com/daimajia/easing/Skill.java b/library/src/main/java/com/daimajia/easing/Skill.java index b0cc809..3cadd78 100644 --- a/library/src/main/java/com/daimajia/easing/Skill.java +++ b/library/src/main/java/com/daimajia/easing/Skill.java @@ -59,6 +59,7 @@ public enum Skill { CubicEaseInOut(com.daimajia.easing.cubic.CubicEaseInOut.class), ElasticEaseIn(com.daimajia.easing.elastic.ElasticEaseIn.class), + ElasticEaseInOut(com.daimajia.easing.elastic.ElasticEaseInOut.class), ElasticEaseOut(com.daimajia.easing.elastic.ElasticEaseOut.class), ExpoEaseIn(ExpoEaseIn.class), -- Gitee From 4bff52f8d96750cffa56070401ff2502050e59fd Mon Sep 17 00:00:00 2001 From: yu_xh <940151214@qq.com> Date: Mon, 18 Oct 2021 11:34:36 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- entry/src/main/config.json | 8 ++-- .../com/easing/DrawView.java | 2 +- .../com/easing/EasingAdapter.java | 3 +- .../com/easing/MainAbility.java | 3 +- .../main/resources/base/layout/ability_my.xml | 2 +- .../java/com/com/easing/MainAbilityTest.java | 2 +- .../main/java/com/daimajia/easing/Skill.java | 42 ++++++++++++------- 7 files changed, 39 insertions(+), 23 deletions(-) rename entry/src/main/java/{com => daimajia}/com/easing/DrawView.java (99%) rename entry/src/main/java/{com => daimajia}/com/easing/EasingAdapter.java (94%) rename entry/src/main/java/{com => daimajia}/com/easing/MainAbility.java (98%) diff --git a/entry/src/main/config.json b/entry/src/main/config.json index b62043f..1b0986f 100644 --- a/entry/src/main/config.json +++ b/entry/src/main/config.json @@ -1,7 +1,7 @@ { "app": { - "bundleName": "com.huawei.mydemoall", - "vendor": "huawei", + "bundleName": "daimajia.com.easing", + "vendor": "daimajia", "version": { "code": 1, "name": "1.0" @@ -13,7 +13,7 @@ }, "deviceConfig": {}, "module": { - "package": "com.com.easing", + "package": "daimajia.com.easing", "name": ".AnimationEasingDemo", "reqCapabilities": [ "video_support" @@ -40,7 +40,7 @@ } ], "orientation": "portrait", - "name": "com.com.easing.MainAbility", + "name": "daimajia.com.easing.MainAbility", "icon": "$media:icon", "description": "$string:mainability_description", "label": "$string:app_name", diff --git a/entry/src/main/java/com/com/easing/DrawView.java b/entry/src/main/java/daimajia/com/easing/DrawView.java similarity index 99% rename from entry/src/main/java/com/com/easing/DrawView.java rename to entry/src/main/java/daimajia/com/easing/DrawView.java index 1f99db7..876d64c 100644 --- a/entry/src/main/java/com/com/easing/DrawView.java +++ b/entry/src/main/java/daimajia/com/easing/DrawView.java @@ -24,7 +24,7 @@ * */ -package com.com.easing; +package daimajia.com.easing; import ohos.agp.components.AttrHelper; import ohos.agp.components.AttrSet; diff --git a/entry/src/main/java/com/com/easing/EasingAdapter.java b/entry/src/main/java/daimajia/com/easing/EasingAdapter.java similarity index 94% rename from entry/src/main/java/com/com/easing/EasingAdapter.java rename to entry/src/main/java/daimajia/com/easing/EasingAdapter.java index d79f25e..55a5b77 100644 --- a/entry/src/main/java/com/com/easing/EasingAdapter.java +++ b/entry/src/main/java/daimajia/com/easing/EasingAdapter.java @@ -1,7 +1,8 @@ -package com.com.easing; +package daimajia.com.easing; +import daimajia.com.easing.ResourceTable; import com.daimajia.easing.BaseEasingMethod; import com.daimajia.easing.Skill; diff --git a/entry/src/main/java/com/com/easing/MainAbility.java b/entry/src/main/java/daimajia/com/easing/MainAbility.java similarity index 98% rename from entry/src/main/java/com/com/easing/MainAbility.java rename to entry/src/main/java/daimajia/com/easing/MainAbility.java index b261c48..58425ad 100644 --- a/entry/src/main/java/com/com/easing/MainAbility.java +++ b/entry/src/main/java/daimajia/com/easing/MainAbility.java @@ -22,8 +22,9 @@ * SOFTWARE. */ -package com.com.easing; +package daimajia.com.easing; +import daimajia.com.easing.ResourceTable; import com.daimajia.easing.BaseEasingMethod; import com.daimajia.easing.Glider; import com.daimajia.easing.Skill; diff --git a/entry/src/main/resources/base/layout/ability_my.xml b/entry/src/main/resources/base/layout/ability_my.xml index 86ee6c9..44c182d 100644 --- a/entry/src/main/resources/base/layout/ability_my.xml +++ b/entry/src/main/resources/base/layout/ability_my.xml @@ -7,7 +7,7 @@ ohos:top_padding="16vp" ohos:bottom_padding="16vp"> - diff --git a/entry/src/test/java/com/com/easing/MainAbilityTest.java b/entry/src/test/java/com/com/easing/MainAbilityTest.java index dec08f5..cb8e796 100644 --- a/entry/src/test/java/com/com/easing/MainAbilityTest.java +++ b/entry/src/test/java/com/com/easing/MainAbilityTest.java @@ -1,4 +1,4 @@ -package com.com.easing; +package daimajia.com.easing; import org.junit.Test; diff --git a/library/src/main/java/com/daimajia/easing/Skill.java b/library/src/main/java/com/daimajia/easing/Skill.java index 3cadd78..711f9d9 100644 --- a/library/src/main/java/com/daimajia/easing/Skill.java +++ b/library/src/main/java/com/daimajia/easing/Skill.java @@ -27,15 +27,29 @@ package com.daimajia.easing; import com.daimajia.easing.back.BackEaseIn; import com.daimajia.easing.back.BackEaseInOut; import com.daimajia.easing.back.BackEaseOut; +import com.daimajia.easing.bounce.BounceEaseIn; +import com.daimajia.easing.bounce.BounceEaseInOut; +import com.daimajia.easing.bounce.BounceEaseOut; import com.daimajia.easing.circ.CircEaseIn; import com.daimajia.easing.circ.CircEaseInOut; import com.daimajia.easing.circ.CircEaseOut; +import com.daimajia.easing.cubic.CubicEaseIn; +import com.daimajia.easing.cubic.CubicEaseInOut; +import com.daimajia.easing.cubic.CubicEaseOut; +import com.daimajia.easing.elastic.ElasticEaseIn; +import com.daimajia.easing.elastic.ElasticEaseInOut; +import com.daimajia.easing.elastic.ElasticEaseOut; import com.daimajia.easing.expo.ExpoEaseIn; import com.daimajia.easing.expo.ExpoEaseInOut; import com.daimajia.easing.expo.ExpoEaseOut; +import com.daimajia.easing.linear.Linear; import com.daimajia.easing.quad.QuadEaseIn; import com.daimajia.easing.quad.QuadEaseInOut; import com.daimajia.easing.quad.QuadEaseOut; +import com.daimajia.easing.quint.QuintEaseIn; +import com.daimajia.easing.quint.QuintEaseInOut; +import com.daimajia.easing.quint.QuintEaseOut; +import com.daimajia.easing.sine.SineEaseIn; import com.daimajia.easing.sine.SineEaseInOut; import com.daimajia.easing.sine.SineEaseOut; @@ -46,21 +60,21 @@ public enum Skill { BackEaseOut(BackEaseOut.class), BackEaseInOut(BackEaseInOut.class), - BounceEaseIn(com.daimajia.easing.bounce.BounceEaseIn.class), - BounceEaseOut(com.daimajia.easing.bounce.BounceEaseOut.class), - BounceEaseInOut(com.daimajia.easing.bounce.BounceEaseInOut.class), + BounceEaseIn(BounceEaseIn.class), + BounceEaseOut(BounceEaseOut.class), + BounceEaseInOut(BounceEaseInOut.class), CircEaseIn(CircEaseIn.class), CircEaseOut(CircEaseOut.class), CircEaseInOut(CircEaseInOut.class), - CubicEaseIn(com.daimajia.easing.cubic.CubicEaseIn.class), - CubicEaseOut(com.daimajia.easing.cubic.CubicEaseOut.class), - CubicEaseInOut(com.daimajia.easing.cubic.CubicEaseInOut.class), + CubicEaseIn(CubicEaseIn.class), + CubicEaseOut(CubicEaseOut.class), + CubicEaseInOut(CubicEaseInOut.class), - ElasticEaseIn(com.daimajia.easing.elastic.ElasticEaseIn.class), - ElasticEaseInOut(com.daimajia.easing.elastic.ElasticEaseInOut.class), - ElasticEaseOut(com.daimajia.easing.elastic.ElasticEaseOut.class), + ElasticEaseIn(ElasticEaseIn.class), + ElasticEaseInOut(ElasticEaseInOut.class), + ElasticEaseOut(ElasticEaseOut.class), ExpoEaseIn(ExpoEaseIn.class), ExpoEaseOut(ExpoEaseOut.class), @@ -70,15 +84,15 @@ public enum Skill { QuadEaseOut(QuadEaseOut.class), QuadEaseInOut(QuadEaseInOut.class), - QuintEaseIn(com.daimajia.easing.quint.QuintEaseIn.class), - QuintEaseOut(com.daimajia.easing.quint.QuintEaseOut.class), - QuintEaseInOut(com.daimajia.easing.quint.QuintEaseInOut.class), + QuintEaseIn(QuintEaseIn.class), + QuintEaseOut(QuintEaseOut.class), + QuintEaseInOut(QuintEaseInOut.class), - SineEaseIn(com.daimajia.easing.sine.SineEaseIn.class), + SineEaseIn(SineEaseIn.class), SineEaseOut(SineEaseOut.class), SineEaseInOut(SineEaseInOut.class), - Linear(com.daimajia.easing.linear.Linear.class); + Linear(Linear.class); private Class easingMethod; -- Gitee