From 18aaf306062ed9c33ea11f2d1fc526cdd1deb8f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=B1=E5=BB=BA=E6=96=87?= <709846645@qq.com> Date: Tue, 29 Jun 2021 15:00:26 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E7=B1=BB=E7=9A=84=E7=89=88=E6=9D=83=E5=A3=B0=E6=98=8E=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/tmall/ultraviewpager/MainAbility.java | 2 +- .../main/java/com/tmall/ultraviewpager/PageAbility.java | 2 +- .../java/com/tmall/ultraviewpager/UltraPagerAdapter.java | 8 ++++---- .../tmall/ultraviewpager/UltraViewPagerApplication.java | 2 +- .../com/tmall/ultraviewpager/slice/MainAbilitySlice.java | 2 +- .../java/com/tmall/ultraviewpager/slice/PagerSlice.java | 2 +- .../main/java/com/tmall/ultraviewpager/utils/LogUtil.java | 3 ++- .../main/java/com/tmall/ultraviewpager/utils/ResUtil.java | 3 ++- .../java/com/tmall/ultraviewpager/utils/TextUtils.java | 3 ++- 9 files changed, 15 insertions(+), 12 deletions(-) diff --git a/entry/src/main/java/com/tmall/ultraviewpager/MainAbility.java b/entry/src/main/java/com/tmall/ultraviewpager/MainAbility.java index 066d7d4..5658798 100644 --- a/entry/src/main/java/com/tmall/ultraviewpager/MainAbility.java +++ b/entry/src/main/java/com/tmall/ultraviewpager/MainAbility.java @@ -2,7 +2,7 @@ * * MIT License * - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2017 Alibaba Group * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/entry/src/main/java/com/tmall/ultraviewpager/PageAbility.java b/entry/src/main/java/com/tmall/ultraviewpager/PageAbility.java index dbfd90a..52c9f1e 100644 --- a/entry/src/main/java/com/tmall/ultraviewpager/PageAbility.java +++ b/entry/src/main/java/com/tmall/ultraviewpager/PageAbility.java @@ -2,7 +2,7 @@ * * MIT License * - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2017 Alibaba Group * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/entry/src/main/java/com/tmall/ultraviewpager/UltraPagerAdapter.java b/entry/src/main/java/com/tmall/ultraviewpager/UltraPagerAdapter.java index b36b719..943a2c2 100644 --- a/entry/src/main/java/com/tmall/ultraviewpager/UltraPagerAdapter.java +++ b/entry/src/main/java/com/tmall/ultraviewpager/UltraPagerAdapter.java @@ -89,15 +89,15 @@ public class UltraPagerAdapter extends PageSliderProvider { @Override - public void destroyPageFromContainer(ComponentContainer componentContainer, int i, Object o) { - DirectionalLayout view = (DirectionalLayout) o; + public void destroyPageFromContainer(ComponentContainer componentContainer, int i1, Object o1) { + DirectionalLayout view = (DirectionalLayout) o1; componentContainer.removeComponent(view); } @Override - public boolean isPageMatchToObject(Component component, Object o) { - return component==o; + public boolean isPageMatchToObject(Component component, Object o1) { + return component==o1; } } diff --git a/entry/src/main/java/com/tmall/ultraviewpager/UltraViewPagerApplication.java b/entry/src/main/java/com/tmall/ultraviewpager/UltraViewPagerApplication.java index 55c509e..52eba0b 100644 --- a/entry/src/main/java/com/tmall/ultraviewpager/UltraViewPagerApplication.java +++ b/entry/src/main/java/com/tmall/ultraviewpager/UltraViewPagerApplication.java @@ -2,7 +2,7 @@ * * MIT License * - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2017 Alibaba Group * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/entry/src/main/java/com/tmall/ultraviewpager/slice/MainAbilitySlice.java b/entry/src/main/java/com/tmall/ultraviewpager/slice/MainAbilitySlice.java index 0a6c160..abf0b8c 100644 --- a/entry/src/main/java/com/tmall/ultraviewpager/slice/MainAbilitySlice.java +++ b/entry/src/main/java/com/tmall/ultraviewpager/slice/MainAbilitySlice.java @@ -2,7 +2,7 @@ * * MIT License * - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2017 Alibaba Group * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/entry/src/main/java/com/tmall/ultraviewpager/slice/PagerSlice.java b/entry/src/main/java/com/tmall/ultraviewpager/slice/PagerSlice.java index 9091c25..74977a9 100644 --- a/entry/src/main/java/com/tmall/ultraviewpager/slice/PagerSlice.java +++ b/entry/src/main/java/com/tmall/ultraviewpager/slice/PagerSlice.java @@ -2,7 +2,7 @@ * * MIT License * - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2017 Alibaba Group * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/ultraviewpager/src/main/java/com/tmall/ultraviewpager/utils/LogUtil.java b/ultraviewpager/src/main/java/com/tmall/ultraviewpager/utils/LogUtil.java index a6eebf6..3d9832a 100644 --- a/ultraviewpager/src/main/java/com/tmall/ultraviewpager/utils/LogUtil.java +++ b/ultraviewpager/src/main/java/com/tmall/ultraviewpager/utils/LogUtil.java @@ -2,7 +2,7 @@ * * MIT License * - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2017 Alibaba Group * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,6 +23,7 @@ * SOFTWARE. * */ + package com.tmall.ultraviewpager.utils; import ohos.hiviewdfx.HiLog; diff --git a/ultraviewpager/src/main/java/com/tmall/ultraviewpager/utils/ResUtil.java b/ultraviewpager/src/main/java/com/tmall/ultraviewpager/utils/ResUtil.java index ee20c54..36830b5 100644 --- a/ultraviewpager/src/main/java/com/tmall/ultraviewpager/utils/ResUtil.java +++ b/ultraviewpager/src/main/java/com/tmall/ultraviewpager/utils/ResUtil.java @@ -2,7 +2,7 @@ * * MIT License * - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2017 Alibaba Group * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,6 +23,7 @@ * SOFTWARE. * */ + package com.tmall.ultraviewpager.utils; import ohos.app.Context; diff --git a/ultraviewpager/src/main/java/com/tmall/ultraviewpager/utils/TextUtils.java b/ultraviewpager/src/main/java/com/tmall/ultraviewpager/utils/TextUtils.java index 37d9201..42361ab 100644 --- a/ultraviewpager/src/main/java/com/tmall/ultraviewpager/utils/TextUtils.java +++ b/ultraviewpager/src/main/java/com/tmall/ultraviewpager/utils/TextUtils.java @@ -2,7 +2,7 @@ * * MIT License * - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2017 Alibaba Group * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,6 +23,7 @@ * SOFTWARE. * */ + package com.tmall.ultraviewpager.utils; import ohos.agp.text.Font; -- Gitee From 12e6a92ceddbe7a1bdf55ff0b97e00c0798308e0 Mon Sep 17 00:00:00 2001 From: 18758878167 <635547767@qq.com> Date: Wed, 30 Jun 2021 15:28:35 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=A7=A3=E5=86=B3findbug=E5=AD=98=E5=9C=A8?= =?UTF-8?q?=E7=9A=84=E9=AB=98=E9=A3=8E=E9=99=A9=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- build.gradle | 5 ++--- .../com/tmall/ultraviewpager/UltraViewPagerIndicator.java | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 8f2d5f0..18574d9 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ allprojects{ mavenCentral() } } -implementation 'io.openharmony.tpc.thirdlib:ultraviewpager:1.0.4' +implementation 'io.openharmony.tpc.thirdlib:UltraViewPager:1.0.5' ``` ## 使用 diff --git a/build.gradle b/build.gradle index f2aa6a9..1f260f2 100644 --- a/build.gradle +++ b/build.gradle @@ -32,14 +32,13 @@ allprojects { maven { url 'https://developer.huawei.com/repo/' } - jcenter() } } rootProject.ext { DEFAULT_GROUP_ID = "io.openharmony.tpc.thirdlib" - DEFAULT_ARTIFACT_ID = "ultraviewpager" - DEFAULT_VERSION = "1.0.4" + DEFAULT_ARTIFACT_ID = "UltraViewPager" + DEFAULT_VERSION = "1.0.5" DEFAULT_GITEE_URL = "https://gitee.com/openharmony-tpc/" + rootProject.ext.DEFAULT_ARTIFACT_ID HPM_NAME = "@opensource/" + rootProject.ext.DEFAULT_ARTIFACT_ID HPM_DESCRIPTION = "ultraviewpager is an extension for pageslider to provide multiple features in a single pageslider" diff --git a/ultraviewpager/src/main/java/com/tmall/ultraviewpager/UltraViewPagerIndicator.java b/ultraviewpager/src/main/java/com/tmall/ultraviewpager/UltraViewPagerIndicator.java index 67dcdc9..9eac49b 100644 --- a/ultraviewpager/src/main/java/com/tmall/ultraviewpager/UltraViewPagerIndicator.java +++ b/ultraviewpager/src/main/java/com/tmall/ultraviewpager/UltraViewPagerIndicator.java @@ -275,7 +275,7 @@ public class UltraViewPagerIndicator extends Component implements PageSlider.Pag } // Only paint stroke if a stroke width was non-zero - if (pageFillRadius != radius) { + if ((int)pageFillRadius != radius) { canvas.drawCircle(dX, dY, radius, paintStroke); } } -- Gitee