From 720e6d08e0022f13190b73ec9588bf3f5529a97f Mon Sep 17 00:00:00 2001 From: xujianhong Date: Tue, 18 May 2021 17:13:12 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E8=A7=84=E8=8C=83=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ufreedom/floatingview/Floating.java | 2 +- .../main/java/com/ufreedom/floatingview/FloatingBuilder.java | 2 +- .../main/java/com/ufreedom/floatingview/FloatingElement.java | 2 +- .../floatingview/effect/CurveFloatingPathTransition.java | 2 +- .../ufreedom/floatingview/effect/ScaleFloatingTransition.java | 2 +- .../floatingview/effect/TranslateFloatingTransition.java | 2 +- .../com/ufreedom/floatingview/spring/ReboundListener.java | 2 +- .../ufreedom/floatingview/spring/SimpleReboundListener.java | 2 +- .../java/com/ufreedom/floatingview/spring/SpringHelper.java | 2 +- .../floatingview/transition/BaseFloatingPathTransition.java | 2 +- .../com/ufreedom/floatingview/transition/FloatingPath.java | 2 +- .../floatingview/transition/FloatingPathTransition.java | 2 +- .../ufreedom/floatingview/transition/FloatingTransition.java | 2 +- .../com/ufreedom/floatingview/transition/ITransition.java | 2 +- .../com/ufreedom/floatingview/transition/PathPosition.java | 2 +- .../java/com/ufreedom/floatingview/transition/Rebound.java | 2 +- .../com/ufreedom/floatingview/transition/YumFloating.java | 2 +- .../src/main/java/com/ufreedom/floatingview/util/LogUtil.java | 2 +- README.md | 4 ---- entry/src/main/config.json | 3 ++- entry/src/main/java/com/ufreedom/demo/MainAbility.java | 2 +- entry/src/main/java/com/ufreedom/demo/MyApplication.java | 2 +- entry/src/main/java/com/ufreedom/demo/UiUtils.java | 2 +- .../main/java/com/ufreedom/demo/slice/MainAbilitySlice.java | 2 +- .../main/java/com/ufreedom/demo/transition/BeerFloating.java | 2 +- .../main/java/com/ufreedom/demo/transition/PlaneFloating.java | 2 +- .../main/java/com/ufreedom/demo/transition/StarFloating.java | 2 +- .../com/ufreedom/demo/util/AnimatorStateChangedListener.java | 2 +- 28 files changed, 28 insertions(+), 31 deletions(-) diff --git a/FloatingViewLib/src/main/java/com/ufreedom/floatingview/Floating.java b/FloatingViewLib/src/main/java/com/ufreedom/floatingview/Floating.java index 0eb6406..3647c97 100644 --- a/FloatingViewLib/src/main/java/com/ufreedom/floatingview/Floating.java +++ b/FloatingViewLib/src/main/java/com/ufreedom/floatingview/Floating.java @@ -32,7 +32,7 @@ import ohos.app.Context; /** * Floating * - * @author xujianhong + * @author xjh * @since 2021-04-23 */ public class Floating { diff --git a/FloatingViewLib/src/main/java/com/ufreedom/floatingview/FloatingBuilder.java b/FloatingViewLib/src/main/java/com/ufreedom/floatingview/FloatingBuilder.java index 405922a..c17c29e 100644 --- a/FloatingViewLib/src/main/java/com/ufreedom/floatingview/FloatingBuilder.java +++ b/FloatingViewLib/src/main/java/com/ufreedom/floatingview/FloatingBuilder.java @@ -23,7 +23,7 @@ import ohos.agp.components.Component; /** * FloatingBuilder * - * @author xujianhong + * @author xjh * @since 2021-04-23 */ public class FloatingBuilder { diff --git a/FloatingViewLib/src/main/java/com/ufreedom/floatingview/FloatingElement.java b/FloatingViewLib/src/main/java/com/ufreedom/floatingview/FloatingElement.java index f74d7df..0cfb551 100644 --- a/FloatingViewLib/src/main/java/com/ufreedom/floatingview/FloatingElement.java +++ b/FloatingViewLib/src/main/java/com/ufreedom/floatingview/FloatingElement.java @@ -20,7 +20,7 @@ import com.ufreedom.floatingview.transition.FloatingTransition; import ohos.agp.components.Component; /** - * @author xujianhong + * @author xjh * @since 2021-03-31 */ public class FloatingElement { diff --git a/FloatingViewLib/src/main/java/com/ufreedom/floatingview/effect/CurveFloatingPathTransition.java b/FloatingViewLib/src/main/java/com/ufreedom/floatingview/effect/CurveFloatingPathTransition.java index 3529a82..8147303 100644 --- a/FloatingViewLib/src/main/java/com/ufreedom/floatingview/effect/CurveFloatingPathTransition.java +++ b/FloatingViewLib/src/main/java/com/ufreedom/floatingview/effect/CurveFloatingPathTransition.java @@ -29,7 +29,7 @@ import ohos.agp.render.Path; /** * CurveFloatingPathTransition * - * @author xujianhong + * @author xjh * @since 2021-03-31 */ public class CurveFloatingPathTransition extends BaseFloatingPathTransition { diff --git a/FloatingViewLib/src/main/java/com/ufreedom/floatingview/effect/ScaleFloatingTransition.java b/FloatingViewLib/src/main/java/com/ufreedom/floatingview/effect/ScaleFloatingTransition.java index 2b5e9e5..c4fd5be 100644 --- a/FloatingViewLib/src/main/java/com/ufreedom/floatingview/effect/ScaleFloatingTransition.java +++ b/FloatingViewLib/src/main/java/com/ufreedom/floatingview/effect/ScaleFloatingTransition.java @@ -25,7 +25,7 @@ import ohos.agp.animation.AnimatorValue; /** * ScaleFloatingTransition * - * @author xujianhong + * @author xjh * @since 2021-03-31 */ public class ScaleFloatingTransition implements FloatingTransition { diff --git a/FloatingViewLib/src/main/java/com/ufreedom/floatingview/effect/TranslateFloatingTransition.java b/FloatingViewLib/src/main/java/com/ufreedom/floatingview/effect/TranslateFloatingTransition.java index b544eb5..68e912a 100644 --- a/FloatingViewLib/src/main/java/com/ufreedom/floatingview/effect/TranslateFloatingTransition.java +++ b/FloatingViewLib/src/main/java/com/ufreedom/floatingview/effect/TranslateFloatingTransition.java @@ -26,7 +26,7 @@ import ohos.agp.animation.AnimatorValue; /** * TranslateFloatingTransition * - * @author xujianhong + * @author xjh * @since 2021-03-31 */ public class TranslateFloatingTransition implements FloatingTransition { diff --git a/FloatingViewLib/src/main/java/com/ufreedom/floatingview/spring/ReboundListener.java b/FloatingViewLib/src/main/java/com/ufreedom/floatingview/spring/ReboundListener.java index 0ca1a23..454c9bf 100644 --- a/FloatingViewLib/src/main/java/com/ufreedom/floatingview/spring/ReboundListener.java +++ b/FloatingViewLib/src/main/java/com/ufreedom/floatingview/spring/ReboundListener.java @@ -19,7 +19,7 @@ package com.ufreedom.floatingview.spring; /** * ReboundListener * - * @author xujianhong + * @author xjh * @since 2021-03-31 */ public interface ReboundListener { diff --git a/FloatingViewLib/src/main/java/com/ufreedom/floatingview/spring/SimpleReboundListener.java b/FloatingViewLib/src/main/java/com/ufreedom/floatingview/spring/SimpleReboundListener.java index ebc65bd..2c3607a 100644 --- a/FloatingViewLib/src/main/java/com/ufreedom/floatingview/spring/SimpleReboundListener.java +++ b/FloatingViewLib/src/main/java/com/ufreedom/floatingview/spring/SimpleReboundListener.java @@ -19,7 +19,7 @@ package com.ufreedom.floatingview.spring; /** * SimpleReboundListener * - * @author xujianhong + * @author xjh * @since 2021-03-31 */ public class SimpleReboundListener implements ReboundListener { diff --git a/FloatingViewLib/src/main/java/com/ufreedom/floatingview/spring/SpringHelper.java b/FloatingViewLib/src/main/java/com/ufreedom/floatingview/spring/SpringHelper.java index f257c91..017562e 100644 --- a/FloatingViewLib/src/main/java/com/ufreedom/floatingview/spring/SpringHelper.java +++ b/FloatingViewLib/src/main/java/com/ufreedom/floatingview/spring/SpringHelper.java @@ -12,7 +12,7 @@ import com.ufreedom.floatingview.transition.YumFloating; /** * SpringHelper * - * @author xujianhong + * @author xjh * @since 2021-03-31 */ public class SpringHelper { diff --git a/FloatingViewLib/src/main/java/com/ufreedom/floatingview/transition/BaseFloatingPathTransition.java b/FloatingViewLib/src/main/java/com/ufreedom/floatingview/transition/BaseFloatingPathTransition.java index 0684413..840485d 100644 --- a/FloatingViewLib/src/main/java/com/ufreedom/floatingview/transition/BaseFloatingPathTransition.java +++ b/FloatingViewLib/src/main/java/com/ufreedom/floatingview/transition/BaseFloatingPathTransition.java @@ -19,7 +19,7 @@ package com.ufreedom.floatingview.transition; /** * BaseFloatingPathTransition * - * @author xujianhong + * @author xjh * @since 2021-03-31 */ public abstract class BaseFloatingPathTransition implements FloatingPathTransition { diff --git a/FloatingViewLib/src/main/java/com/ufreedom/floatingview/transition/FloatingPath.java b/FloatingViewLib/src/main/java/com/ufreedom/floatingview/transition/FloatingPath.java index 01f43fa..3fd5e83 100644 --- a/FloatingViewLib/src/main/java/com/ufreedom/floatingview/transition/FloatingPath.java +++ b/FloatingViewLib/src/main/java/com/ufreedom/floatingview/transition/FloatingPath.java @@ -22,7 +22,7 @@ import ohos.agp.render.PathMeasure; /** * FloatingPath * - * @author xujianhong + * @author xjh * @since 2021-03-31 */ public class FloatingPath { diff --git a/FloatingViewLib/src/main/java/com/ufreedom/floatingview/transition/FloatingPathTransition.java b/FloatingViewLib/src/main/java/com/ufreedom/floatingview/transition/FloatingPathTransition.java index 4a2306d..f139ffc 100644 --- a/FloatingViewLib/src/main/java/com/ufreedom/floatingview/transition/FloatingPathTransition.java +++ b/FloatingViewLib/src/main/java/com/ufreedom/floatingview/transition/FloatingPathTransition.java @@ -19,7 +19,7 @@ package com.ufreedom.floatingview.transition; /** * FloatingPathTransition * - * @author xujianhong + * @author xjh * @since 2021-03-31 */ public interface FloatingPathTransition extends FloatingTransition { diff --git a/FloatingViewLib/src/main/java/com/ufreedom/floatingview/transition/FloatingTransition.java b/FloatingViewLib/src/main/java/com/ufreedom/floatingview/transition/FloatingTransition.java index b0ccf87..a00527b 100644 --- a/FloatingViewLib/src/main/java/com/ufreedom/floatingview/transition/FloatingTransition.java +++ b/FloatingViewLib/src/main/java/com/ufreedom/floatingview/transition/FloatingTransition.java @@ -19,7 +19,7 @@ package com.ufreedom.floatingview.transition; /** * FloatingTransition * - * @author xujianhong + * @author xjh * @since 2021-03-31 */ public interface FloatingTransition { diff --git a/FloatingViewLib/src/main/java/com/ufreedom/floatingview/transition/ITransition.java b/FloatingViewLib/src/main/java/com/ufreedom/floatingview/transition/ITransition.java index f341631..de53505 100644 --- a/FloatingViewLib/src/main/java/com/ufreedom/floatingview/transition/ITransition.java +++ b/FloatingViewLib/src/main/java/com/ufreedom/floatingview/transition/ITransition.java @@ -19,7 +19,7 @@ package com.ufreedom.floatingview.transition; /** * ITransition * - * @author xujianhong + * @author xjh * @since 2021-03-31 */ public interface ITransition { diff --git a/FloatingViewLib/src/main/java/com/ufreedom/floatingview/transition/PathPosition.java b/FloatingViewLib/src/main/java/com/ufreedom/floatingview/transition/PathPosition.java index a2066f1..0fc53d4 100644 --- a/FloatingViewLib/src/main/java/com/ufreedom/floatingview/transition/PathPosition.java +++ b/FloatingViewLib/src/main/java/com/ufreedom/floatingview/transition/PathPosition.java @@ -19,7 +19,7 @@ package com.ufreedom.floatingview.transition; /** * ITransition * - * @author xujianhong + * @author xjh * @since 2021-03-31 */ public class PathPosition { diff --git a/FloatingViewLib/src/main/java/com/ufreedom/floatingview/transition/Rebound.java b/FloatingViewLib/src/main/java/com/ufreedom/floatingview/transition/Rebound.java index 5e6ff26..5bf57e4 100644 --- a/FloatingViewLib/src/main/java/com/ufreedom/floatingview/transition/Rebound.java +++ b/FloatingViewLib/src/main/java/com/ufreedom/floatingview/transition/Rebound.java @@ -21,7 +21,7 @@ import com.facebook.rebound.Spring; /** * Rebound * - * @author xujianhong + * @author xjh * @since 2021-03-31 */ public interface Rebound { diff --git a/FloatingViewLib/src/main/java/com/ufreedom/floatingview/transition/YumFloating.java b/FloatingViewLib/src/main/java/com/ufreedom/floatingview/transition/YumFloating.java index b10250b..af5691f 100644 --- a/FloatingViewLib/src/main/java/com/ufreedom/floatingview/transition/YumFloating.java +++ b/FloatingViewLib/src/main/java/com/ufreedom/floatingview/transition/YumFloating.java @@ -28,7 +28,7 @@ import java.lang.ref.WeakReference; /** * YumFloating * - * @author xujianhong + * @author xjh * @since 2021-03-31 */ public class YumFloating implements ITransition, Rebound { diff --git a/FloatingViewLib/src/main/java/com/ufreedom/floatingview/util/LogUtil.java b/FloatingViewLib/src/main/java/com/ufreedom/floatingview/util/LogUtil.java index 6cea79c..311d78d 100644 --- a/FloatingViewLib/src/main/java/com/ufreedom/floatingview/util/LogUtil.java +++ b/FloatingViewLib/src/main/java/com/ufreedom/floatingview/util/LogUtil.java @@ -21,7 +21,7 @@ import ohos.hiviewdfx.HiLogLabel; /** * LogUtil 工具类 * - * @author xujianhong + * @author xjh * @since 2021-03-31 */ public final class LogUtil { diff --git a/README.md b/README.md index 8f30c52..fd80161 100644 --- a/README.md +++ b/README.md @@ -10,8 +10,6 @@ - 调用差异:有 - 基线版本:release 1.0.2 - 开发版本:sdk5,DevEco Studio2.1 beta3 -- 项目作者和维护人:许建宏 -- 联系方式:xujianhong050@chinasoftinc.com - 原项目Doc地址:https://github.com/UFreedom/FloatingView #### 效果演示 @@ -189,8 +187,6 @@ CloudTest代码测试无异常 当前版本demo功能与原组件基本无差异 -测试员:常小俊 - #### 版本迭代 - 0.0.1-SNAPSHOT diff --git a/entry/src/main/config.json b/entry/src/main/config.json index 13e88a4..bd7e0de 100644 --- a/entry/src/main/config.json +++ b/entry/src/main/config.json @@ -8,7 +8,8 @@ }, "apiVersion": { "compatible": 4, - "target": 5 + "target": 5, + "releaseType": "Release" } }, "deviceConfig": {}, diff --git a/entry/src/main/java/com/ufreedom/demo/MainAbility.java b/entry/src/main/java/com/ufreedom/demo/MainAbility.java index 2f67c89..8cbed10 100644 --- a/entry/src/main/java/com/ufreedom/demo/MainAbility.java +++ b/entry/src/main/java/com/ufreedom/demo/MainAbility.java @@ -22,7 +22,7 @@ import ohos.aafwk.content.Intent; /** * MainAbility * - * @author xujianhong + * @author xjh * @since 2021-03-31 */ public class MainAbility extends Ability { diff --git a/entry/src/main/java/com/ufreedom/demo/MyApplication.java b/entry/src/main/java/com/ufreedom/demo/MyApplication.java index a313465..e68bd66 100644 --- a/entry/src/main/java/com/ufreedom/demo/MyApplication.java +++ b/entry/src/main/java/com/ufreedom/demo/MyApplication.java @@ -20,7 +20,7 @@ import ohos.aafwk.ability.AbilityPackage; /** * MyApplication * - * @author xujianhong + * @author xjh * @since 2021-03-31 */ public class MyApplication extends AbilityPackage { diff --git a/entry/src/main/java/com/ufreedom/demo/UiUtils.java b/entry/src/main/java/com/ufreedom/demo/UiUtils.java index 9fce7eb..cbf4a7a 100644 --- a/entry/src/main/java/com/ufreedom/demo/UiUtils.java +++ b/entry/src/main/java/com/ufreedom/demo/UiUtils.java @@ -25,7 +25,7 @@ import java.util.Optional; /** * 尺寸转换 * - * @author xujianhong + * @author xjh * @since 2021-03-31 */ public final class UiUtils { diff --git a/entry/src/main/java/com/ufreedom/demo/slice/MainAbilitySlice.java b/entry/src/main/java/com/ufreedom/demo/slice/MainAbilitySlice.java index 736bd70..bfb2269 100644 --- a/entry/src/main/java/com/ufreedom/demo/slice/MainAbilitySlice.java +++ b/entry/src/main/java/com/ufreedom/demo/slice/MainAbilitySlice.java @@ -38,7 +38,7 @@ import ohos.agp.utils.Color; /** * MainAbilitySlice * - * @author xujianhong + * @author xjh * @since 2021-03-31 */ public class MainAbilitySlice extends AbilitySlice { diff --git a/entry/src/main/java/com/ufreedom/demo/transition/BeerFloating.java b/entry/src/main/java/com/ufreedom/demo/transition/BeerFloating.java index 33bce91..522e02a 100644 --- a/entry/src/main/java/com/ufreedom/demo/transition/BeerFloating.java +++ b/entry/src/main/java/com/ufreedom/demo/transition/BeerFloating.java @@ -28,7 +28,7 @@ import ohos.agp.render.Path; /** * BeerFloating * - * @author xujianhong + * @author xjh * @since 2021-03-31 */ public class BeerFloating extends BaseFloatingPathTransition { diff --git a/entry/src/main/java/com/ufreedom/demo/transition/PlaneFloating.java b/entry/src/main/java/com/ufreedom/demo/transition/PlaneFloating.java index 8167e62..7d325a9 100644 --- a/entry/src/main/java/com/ufreedom/demo/transition/PlaneFloating.java +++ b/entry/src/main/java/com/ufreedom/demo/transition/PlaneFloating.java @@ -33,7 +33,7 @@ import ohos.app.Context; /** * PlaneFloating * - * @author xujianhong + * @author xjh * @since 2021-03-31 */ public class PlaneFloating extends BaseFloatingPathTransition { diff --git a/entry/src/main/java/com/ufreedom/demo/transition/StarFloating.java b/entry/src/main/java/com/ufreedom/demo/transition/StarFloating.java index 205ca5c..fffad1e 100644 --- a/entry/src/main/java/com/ufreedom/demo/transition/StarFloating.java +++ b/entry/src/main/java/com/ufreedom/demo/transition/StarFloating.java @@ -27,7 +27,7 @@ import ohos.agp.animation.AnimatorValue; /** * StarFloating * - * @author xujianhong + * @author xjh * @since 2021-03-31 */ public class StarFloating implements FloatingTransition { diff --git a/entry/src/main/java/com/ufreedom/demo/util/AnimatorStateChangedListener.java b/entry/src/main/java/com/ufreedom/demo/util/AnimatorStateChangedListener.java index 9c61af7..7986392 100644 --- a/entry/src/main/java/com/ufreedom/demo/util/AnimatorStateChangedListener.java +++ b/entry/src/main/java/com/ufreedom/demo/util/AnimatorStateChangedListener.java @@ -20,7 +20,7 @@ import ohos.agp.animation.Animator; /** * AnimatorStateChanged * - * @author xujianhong + * @author xjh * @since 2021-04-23 */ public class AnimatorStateChangedListener implements Animator.StateChangedListener { -- Gitee From 2dc1e2b2f2bebe36385e0d9b47794d2b55e2adfe Mon Sep 17 00:00:00 2001 From: xujianhong Date: Tue, 18 May 2021 17:37:38 +0800 Subject: [PATCH 2/2] =?UTF-8?q?releaseType=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- FloatingViewLib/src/main/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FloatingViewLib/src/main/config.json b/FloatingViewLib/src/main/config.json index 0371319..fc27a92 100644 --- a/FloatingViewLib/src/main/config.json +++ b/FloatingViewLib/src/main/config.json @@ -9,7 +9,7 @@ "apiVersion": { "compatible": 5, "target": 5, - "releaseType": "Beta1" + "releaseType": "Release" } }, "deviceConfig": { -- Gitee