diff --git a/README.md b/README.md index 8f2d5f00ad2ed2d4dc689ec46f4a0f7385edf305..18574d96db8086e9b4465d2fcfb68f2257fa253b 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 f2aa6a9d7b32cd73ea76f6e342dd96a32bd4aaf0..1f260f217df896daadfc86b026c35d7de7c02569 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/entry/src/main/java/com/tmall/ultraviewpager/MainAbility.java b/entry/src/main/java/com/tmall/ultraviewpager/MainAbility.java index 066d7d43cf15ad16ddd7ecb56d61e7df4aa48f57..56587982bcc663110f728f8371e0bb329f6374a0 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 dbfd90ab780458d6974d47b2d8ef4d97c07497db..52c9f1efd51e88dd738118f6bcb25e6df56f1392 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 b36b7190740750296536a38d9b033d03fcbba3b3..943a2c2d4931766c7b1422cd849208dd9edcecef 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 55c509e84fad0ad2fd4790885600db0ce60c59d6..52eba0b1c9959259b32a61298fd14702cf22e443 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 0a6c16016835564fa34cb37cb220abef025110b6..abf0b8c7516a9eeec0c1e404c08c0da57c9a91f5 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 9091c2571ea4bf6470dfce7768258d71c87409b6..74977a911afa0f2dc68b1b0d701fd94e66626b53 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/UltraViewPagerIndicator.java b/ultraviewpager/src/main/java/com/tmall/ultraviewpager/UltraViewPagerIndicator.java index 67dcdc9e7df1d96e3e2efd5896dc1b5e6f9b08de..9eac49b6a29a216a0df80c4cc3e889bf5d5f9627 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); } } 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 a6eebf67f4d7f099c39102e4638852a68c6df67f..3d9832aa188ad680a2abdbee94edc00c9fa291e3 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 ee20c54378a176bd750b35d54e11fb47aa45258f..36830b5bbf668c8e27e4b8754f0e94b7d5aa23a7 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 37d92014c07ccfe155d11b46b7bd253b30d9389a..42361abd6d24fe8c9d0d0414bcb7c74fba16019f 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;