diff --git a/README.md b/README.md index da5ca96e..677e50de 100644 --- a/README.md +++ b/README.md @@ -6,28 +6,30 @@ [ ![JCenter](https://api.bintray.com/packages/zhpanvip/CircleViewPager/bannerview/images/download.svg) ](https://bintray.com/zhpanvip/CircleViewPager/bannerview/_latestVersion) [![Android Arsenal](https://img.shields.io/badge/Android%20Arsenal-BannerViewPager-brightgreen.svg?style=flat)](https://android-arsenal.com/details/1/7961) -> 腾讯视频、QQ音乐、酷狗音乐、支付宝、天猫、淘宝、优酷视频、喜马拉雅、网易云音乐、哔哩哔哩、全民K歌等App的Banner样式都可以通过BannerViewPager实现哦！ +## English | [中文](https://github.com/zhpanvip/BannerViewPager/blob/master/README_CN.md) +> Tencent Video,QQ Music,KuGou,AliPay,Tmall,TaoBao,YouKu,Himalaya,NetEase Music,Bilibili ect. All of above App's Banner can be implements By BannerViewPager. -## 效果预览 +## Preview - ### [点击或扫描二维码下载apk](https://github.com/zhpanvip/BannerViewPager/raw/master/download/app.apk) + ### [Click here or scan the QR code to download demo apk](https://github.com/zhpanvip/BannerViewPager/raw/master/download/app.apk) -![扫描下载Demo](https://github.com/zhpanvip/BannerViewPager/blob/master/image/qrcode.png) +![QRCode](https://github.com/zhpanvip/BannerViewPager/blob/master/image/qrcode.png) ### 1.setPageStyle -[一屏多页Demo](https://github.com/zhpanvip/BannerViewPager/blob/master/app/src/main/java/com/example/zhpan/circleviewpager/fragment/PageFragment.java) +[Sample Click Here](https://github.com/zhpanvip/BannerViewPager/blob/master/app/src/main/java/com/example/zhpan/circleviewpager/fragment/PageFragment.java) | MULTI_PAGE |MULTI_PAGE_SCALE | MULTI_PAGE_OVERLAP | |--|--|--| | ![MULTI_PAGE](https://github.com/zhpanvip/BannerViewPager/blob/master/image/page_style_multi.gif) |![MULTI_PAGE](https://github.com/zhpanvip/BannerViewPager/blob/master/image/page_style_multi_scale.gif) |![MULTI_PAGE](https://github.com/zhpanvip/BannerViewPager/blob/master/image/page_style_multi_overlay.gif) | ### 2.setIndicatorStyle -BannerViewPager支持多种IndicatorViewStyle,同时还提供了完全自定义IndicatorView的功能。只要继承BaseIndicatorView或者实现IIndicator接口，并重写相应方法，就可以为所欲为的打造任意的Indicator了。 -[IndicatorViewStyle Demo](https://github.com/zhpanvip/BannerViewPager/blob/master/app/src/main/java/com/example/zhpan/circleviewpager/fragment/IndicatorFragment.java) +BannerViewPager supports three Indicator Styles now. It's also support you to custom indicator style,just need extends BaseIndicatorView or implement the IIndicator and then override methods, you can draw Indicators for whatever you want. + +[Sample Click Here](https://github.com/zhpanvip/BannerViewPager/blob/master/app/src/main/java/com/example/zhpan/circleviewpager/fragment/IndicatorFragment.java) | CIRCLE | DASH | ROUND_RECT | |--|--|--| @@ -42,76 +44,75 @@ BannerViewPager支持多种IndicatorViewStyle,同时还提供了完全自定义I ### 4.setPageTransformerStyle -[TransformStyle Demo](https://github.com/zhpanvip/BannerViewPager/blob/master/app/src/main/java/com/example/zhpan/circleviewpager/activity/WelcomeActivity.java) +[Sample Click Here](https://github.com/zhpanvip/BannerViewPager/blob/master/app/src/main/java/com/example/zhpan/circleviewpager/activity/WelcomeActivity.java) -| 参数 | STACK | ROTATE | DEPTH | ACCORDION | +| parameters | STACK | ROTATE | DEPTH | ACCORDION | |--|--|--|--|--| -| 预览 | ![STACK](https://github.com/zhpanvip/BannerViewPager/blob/master/image/transform_stack.gif) | ![ROTATE_DOWN](https://github.com/zhpanvip/BannerViewPager/blob/master/image/transform_rotate.gif) | ![DEPTH](https://github.com/zhpanvip/BannerViewPager/blob/master/image/transform_depth.gif) |![ACCORDION](https://github.com/zhpanvip/BannerViewPager/blob/master/image/transform_accordion.gif) | - +| Preview | ![STACK](https://github.com/zhpanvip/BannerViewPager/blob/master/image/transform_stack.gif) | ![ROTATE_DOWN](https://github.com/zhpanvip/BannerViewPager/blob/master/image/transform_rotate.gif) | ![DEPTH](https://github.com/zhpanvip/BannerViewPager/blob/master/image/transform_depth.gif) |![ACCORDION](https://github.com/zhpanvip/BannerViewPager/blob/master/image/transform_accordion.gif) | +## API -## 开放API - -| 方法名 | 方法描述 | 说明 | +| Method | Description | Default | |--|--|--| -| BannerViewPager setCanLoop(boolean canLoop) | 是否开启循环 | 默认值true| -| BannerViewPager setAutoPlay(boolean autoPlay) | 是否开启自动轮播 | 默认值true| -| BannerViewPager setInterval(int interval) | 自动轮播时间间隔 |单位毫秒，默认值3000 | -| BannerViewPager setScrollDuration(int scrollDuration) | 设置页面滚动时间 | 设置页面滚动时间 |单位毫秒，默认值500 | -| BannerViewPager setRoundCorner(int radius) | 设置圆角 |默认无圆角 需要SDK_INT>=LOLLIPOP(API 21) | -| BannerViewPager setOnPageClickListener(OnPageClickListener onPageClickListener) | 设置页面点击事件 | | -| BannerViewPager setHolderCreator(HolderCreator\ holderCreator) |设置HolderCreator |必须设置HolderCreator，否则会抛出NullPointerException| -| BannerViewPager setIndicatorVisibility(@Visibility int visibility) | indicator visibility |默认值VISIBLE 2.4.2 新增| -| BannerViewPager setIndicatorStyle(int indicatorStyle) | 设置指示器样式 | 可选枚举(CIRCLE, DASH、ROUND_RECT) 默认CIRCLE | -| BannerViewPager setIndicatorGravity(int gravity) | 指示器位置 |可选值(CENTER、START、END)默认值CENTER | -| BannerViewPager setIndicatorColor(int normalColor,int checkedColor) | 指示器圆点颜色 |normalColor：未选中时颜色默认"#8C6C6D72"， checkedColor：选中时颜色 默认"#8C18171C" | -| BannerViewPager setIndicatorSlideMode(int slideMode) | 设置Indicator滑动模式 | 可选（NORMAL、SMOOTH），默认值NORMAL | -| BannerViewPager setIndicatorRadius(int radius) | 设置指示器圆点半径 | 默认值4dp| -| BannerViewPager setIndicatorRadius(int normalRadius,int checkRadius) |设置指示器圆点半径 | normalRadius:未选中时半径 checkedRadius:选中时的半径,默认值4dp | -| BannerViewPager setIndicatorWidth(int indicatorWidth) | 设置指示器宽度，如果是圆形指示器，则为直径 | 默认值8dp| -| BannerViewPager setIndicatorWidth(int normalWidth, int checkWidth) | 设置指示器宽度，如果是圆形指示器，则为直径 | 默认值8dp | -| BannerViewPager setIndicatorHeight(int indicatorHeight) | 设置指示器高度，仅在Indicator样式为DASH时有效 | 默认值normalIndicatorWidth/2 | -| BannerViewPager setIndicatorGap(int indicatorMargin) | 指示器圆点间距| 默认值为指示器宽度（或者是圆的直径）| -| BannerViewPager setIndicatorView(IIndicator indicatorView) | 设置自定义指示器|自定义View需要继承BaseIndicatorView或实现IIndicator | -| BannerViewPager setPageTransformerStyle(int style) | 设置页面Transformer内置样式 | | -| BannerViewPager setCurrentItem(int item) | Set the currently selected page. | 2.3.5新增 | -| int getCurrentItem() | 获取当前position | 2.3.5新增 | -| BannerViewPager setPageStyle(PageStyle pageStyle) | 设置页面样式 | 2.4.0新增 可选（MULTI_PAGE、MULTI_PAGE_SCALE、MULTI_PAGE_OVERLAP）| -| BannerViewPager setPageMargin(int pageMargin) | 设置页面间隔 | 2.4.0新增 | -| BannerViewPager setIndicatorMargin(int left, int top, int right, int bottom) | 设置Indicator边距 | 2.4.1新增 | -| BannerViewPager setOnPageChangeListener(OnPageChangeListener l) | 页面改变的监听事件 | 2.4.3新增 | -| void startLoop() |开启自动轮播 | 初始化BannerViewPager时不必调用该方法,设置setAutoPlay后会调用startLoop() | -| void stopLoop() | 停止自动轮播 | | -| List\ getList() | 获取Banner中的集合数据 | | -| void create(List list) |初始化并构造BannerViewPager |必须调用，否则前面设置的参数无效 | - -### xml支持的attrs +| BannerViewPager setCanLoop(boolean canLoop) | set is can loop | default value is true| +| BannerViewPager setAutoPlay(boolean autoPlay) | set is atuo play | default value true| +| BannerViewPager setInterval(int interval) | set the interval of item switch interval |The unit is millisecond，default value 3000ms | +| BannerViewPager setScrollDuration(int scrollDuration) | set page scroll duration | set page scroll duration |unit is millisecond，default is 500ms | +| BannerViewPager setRoundCorner(int radius) | set Round Corner for Banner | required SDK_INT>=LOLLIPOP(API 21) | +| BannerViewPager setOnPageClickListener(OnPageClickListener onPageClickListener) | set item click listener | | +| BannerViewPager setHolderCreator(HolderCreator\ holderCreator) |set Holder Creator |You must set HolderCreator for BannerViewPager，or will throw NullPointerException| +| BannerViewPager setIndicatorVisibility(@Visibility int visibility) | indicator visibility |default value is VISIBLE，added in version 2.4.2| +| BannerViewPager setIndicatorStyle(int indicatorStyle) | set indicator style | enum(CIRCLE, DASH、ROUND_RECT) default CIRCLE | +| BannerViewPager setIndicatorGravity(int gravity) | set indicator gravity |enum(CENTER、START、END) default value CENTER | +| BannerViewPager setIndicatorColor(int normalColor,int checkedColor) | set indicator color |normalColor：color of indicator dot not selected, default value "#8C6C6D72"， checkedColor：color of indicator selected default value is "#8C18171C" | +| BannerViewPager setIndicatorSlideMode(int slideMode) | set indicator slide mode | enum（NORMAL、SMOOTH），default value NORMAL | +| BannerViewPager setIndicatorRadius(int radius) | set indicator dot radius | default value is 4dp| +| BannerViewPager setIndicatorRadius(int normalRadius,int checkRadius) |set indicator dot radius | normalRadius:normal radius of indicator dot, checkedRadius:checked radius of indicator dot,default value is 4dp | +| BannerViewPager setIndicatorWidth(int indicatorWidth) | set indicator dot width，if it's Circle indicator the parameter is diameter of circle | default value is 8dp| +| BannerViewPager setIndicatorWidth(int normalWidth, int checkWidth) | set indicator dot width，if is circle style，the width is diameter of circle | default is 8dp | +| BannerViewPager setIndicatorHeight(int indicatorHeight) | set indicator hight，it's only used when the indicator style is dash | default value is normalIndicatorWidth/2 | +| BannerViewPager setIndicatorGap(int indicatorMargin) | set the gap of indicator dot| default value is indicator dot width（or the diameter of circle）| +| BannerViewPager setIndicatorView(IIndicator indicatorView) | set custom indicator|The custom indicator must extends BaseIndicatorView or implements IIndicator | +| BannerViewPager setPageTransformerStyle(int style) | set transform style | | +| BannerViewPager setCurrentItem(int item) | Set the currently selected page. | add in v2.3.5 | +| int getCurrentItem() | get the current page position | added in v2.3.5 | +| BannerViewPager setPageStyle(PageStyle pageStyle) | setPageStyle | support in v2.4.0. enum（MULTI_PAGE、MULTI_PAGE_SCALE、MULTI_PAGE_OVERLAP）| +| BannerViewPager setPageMargin(int pageMargin) | set item margin | added in v2.4.0 | +| BannerViewPager setIndicatorMargin(int left, int top, int right, int bottom) | set margin for indicator | added in v2.4.1 | +| BannerViewPager setOnPageChangeListener(OnPageChangeListener l) | set page change listener for BannerViewPager | added in v2.4.3 | +| void startLoop() |start loop | the method will be called when BannerViewPager was initialized | +| void stopLoop() | stop loop | | +| List\ getList() | get data in BannerViewPager | | +| void create(List list) |initialize BannerViewPager |You must call this method when data is set | + +### Attributes in xml | Attributes | format | description | |--|--|--| -| bvp_interval | integer | 自动轮播时间间隔 | -| bvp_scroll_duration | integer | 页面切换时滑动时间| -| bvp_can_loop | boolean| 是否循环 | -| bvp_auto_play | boolean | 是否自动播放 | -| bvp_indicator_checked_color | color | indicator选中时颜色 | -| bvp_indicator_normal_color | color | indicator未选中时颜色 | -| bvp_indicator_radius | dimension | indicator圆点半径或者Dash模式的1/2宽度 | -| bvp_round_corner| dimension | Banner圆角大小 | -| bvp_page_margin | dimension | 页面item间距 | -| bvp_reveal_width | dimension | 一屏多页模式下两边item漏出的宽度 | -| bvp_indicator_style | enum | indicator样式(circle/dash) | -| bvp_indicator_slide_mode | enum | indicator滑动模式(normal/smooth) | -| bvp_indicator_gravity | enum | indicator位置(center/start/end) | -| bvp_page_style | enum | page样式(normal/multi_page/multi_page_overlap/multi_page_scale) | -| bvp_transformer_style | enum | transform样式(normal/depth/stack/accordion) | +| bvp_interval | integer | set page switch interval | +| bvp_scroll_duration | integer | set page scroll duration| +| bvp_can_loop | boolean|set is can loop | +| bvp_auto_play | boolean | set is can auto play | +| bvp_indicator_checked_color | color | set checked color for indicator | +| bvp_indicator_normal_color | color | set normal color for indicator | +| bvp_indicator_radius | dimension | if it's circle style the value is radius of circle,if the indicator style is DASH or ROUND_RECT the value is width/2 | +| bvp_round_corner| dimension | set round corner for banner | +| bvp_page_margin | dimension | set item margin | +| bvp_reveal_width | dimension | it's only used when the page style is MULTI_PAGE/MULTI_PAGE_SCALE/MULTI_PAGE_OVERLAP,the value is two side item reveal width | +| bvp_indicator_style | enum | indicator style. enum(circle/dash) | +| bvp_indicator_slide_mode | enum | indicator slide mode.enum(normal/smooth) | +| bvp_indicator_gravity | enum | indicator gravity. enum(center/start/end) | +| bvp_page_style | enum | page style. enum(normal/multi_page/multi_page_overlap/multi_page_scale) | +| bvp_transformer_style | enum | transform style. enum(normal/depth/stack/accordion) | | bvp_indicator_visibility| enum | indicator visibility(visible/gone/invisible) | -## 如何使用 +## Usage -### 1.gradle中添加依赖 +### 1.Gradle dependency -如果您已迁移到AndroidX，请在项目的root build.gradle中添加如下配置： +If you have migrated to Androidx，please add it in your root build.gradle at the end of repositories: + ``` allprojects { repositories { @@ -121,7 +122,7 @@ allprojects { } ``` -Add the dependency +Then add the dependency in your app build.gradle ``` implementation 'com.github.zhpanvip:BannerViewPager:latestVersion' @@ -130,14 +131,14 @@ implementation 'com.github.zhpanvip:BannerViewPager:latestVersion' Androidx latestVersion:[![latestVersion](https://jitpack.io/v/zhpanvip/BannerViewPager.svg)](https://jitpack.io/#zhpanvip/BannerViewPager) -如果未迁移到AndroidX请使用（非Androidx的包托管在JCenter上）： +If you are still using android support library,you can add the dependency in your app build.gradle： ``` implementation 'com.zhpan.library:bannerview:latestVersion' ``` -非Androidx latestVersion: [ ![latestVersion](https://api.bintray.com/packages/zhpanvip/CircleViewPager/bannerview/images/download.svg) ](https://bintray.com/zhpanvip/CircleViewPager/bannerview/_latestVersion) +Android support latestVersion: [ ![latestVersion](https://api.bintray.com/packages/zhpanvip/CircleViewPager/bannerview/images/download.svg) ](https://bintray.com/zhpanvip/CircleViewPager/bannerview/_latestVersion) -### 2.在xml文件中添加如下代码： +### 2.Add BannerViewPager in layout.xml ``` ``` -### 3.Banner的Item页面布局 +### 3.The layout of banner item: ``` - - - + android:layout_height="wrap_content"> - - - - - - + android:scaleType="centerCrop" /> + + + + + + + ``` -### 4.自定义ViewHolder +### 4.Set ViewHolder for BannerViewPager,you must implements ViewHolder: ``` -public class NetViewHolder implements ViewHolder { - private ImageView mImageView; - private TextView mTextView; + public class NetViewHolder implements ViewHolder { - @Override - public View createView(ViewGroup viewGroup, Context context, int position) { - View view = LayoutInflater.from(context).inflate(R.layout.item_net, viewGroup, false); - mImageView = view.findViewById(R.id.banner_image); - mTextView = view.findViewById(R.id.tv_describe); - return view; - } + @Override + public int getLayoutId() { + return R.layout.item_net; + } - @Override - public void onBind(Context context, BannerData data, int position, int size) { - ImageLoaderOptions options = new ImageLoaderOptions.Builder().into(mImageView).load(data.getImagePath()).placeHolder(R.drawable.placeholder).build(); - ImageLoaderManager.getInstance().loadImage(options); - mTextView.setText(data.getTitle()); + @Override + public void onBind(View itemView, BannerData data, int position, int size) { + CornerImageView imageView = itemView.findViewById(R.id.banner_image); + imageView.setRoundCorner(BannerUtils.dp2px(5)); + ImageLoaderOptions options = new ImageLoaderOptions.Builder() + .into(imageView).load(data.getImagePath()) + .placeHolder(R.drawable.placeholder).build(); + ImageLoaderManager.getInstance().loadImage(options); + } } -} ``` -### 5.BannerViewPager参数配置 +### 5.Use BannerViewPager in Activity or Fragment: -Kotlin示例： +Kotlin： ``` private lateinit var mViewPager: BannerViewPager @@ -232,7 +231,7 @@ Kotlin示例： } ``` -Java示例： +Java： ``` private BannerViewPager mBannerViewPager; @@ -255,11 +254,11 @@ Java示例： }).create(mList); } ``` -### 6.开启与停止轮播 +### 6.startLoop and stopLoop -***2.5.0之后版本无需自行在Activity或Fragment中管理stopLoop和startLoop方法，但这两个方法依旧保留对外开放*** +***If the version you used is later than 2.5.0,you don't need care of startLoop and stopLoop in Activity or Fragment .But the two methods is still public.*** -~~如果开启了自动轮播功能，请务必在onDestroy中停止轮播，以免出现内存泄漏。~~ +~~If you set auto play for BannerViewPager,you must to call stopLoop() in onDestroy() to avoid memory leak~~ ``` @Override @@ -269,7 +268,7 @@ Java示例： mViewpager.stopLoop(); } ``` -~~为了节省性能也可以在onStop中停止轮播，在onResume中开启轮播：~~ +Or you can stop Loop in onStop() and startLoop in onResume() to improve performance： ``` @Override @@ -287,15 +286,15 @@ Java示例： } ``` -### 7.高级功能---自定义IndicatorView +### 7.Custom IndicatorView -在内置Indicator不满足需求时可以通过自定义IndicatorView实现,例子将实现一个如下图所示的IndicatorView。 +The example will implement an custom IndicatorView as the below gif shown . -| Custom IndicatorView| +| Custom IndicatorView Style| |--| | ![NORMAL](https://github.com/zhpanvip/BannerViewPager/blob/master/image/style_custum.gif) | -**(1)自定义View并继承BaseIndicatorView** +**(1)Custom View and extends BaseIndicatorView** ``` public class FigureIndicatorView extends BaseIndicatorView { @@ -359,7 +358,7 @@ public class FigureIndicatorView extends BaseIndicatorView { } } ``` -**(2)设置自定义指示器** +**(2)Set custom indicator for BannerViewPager** ``` FigureIndicatorView indicatorView = new FigureIndicatorView(mContext); @@ -373,32 +372,35 @@ public class FigureIndicatorView extends BaseIndicatorView { .create(mDrawableList); ``` -## TODO 版本计划 - - - [x] 优化及重构IndicatorView（2.0.1） +## TODO - - [x] 修复2.1.0以前版本循环滑动时第一张切换卡顿问题（2.1.0.1） + - [x] Optimization and Refactoring IndicatorView（2.0.1） - - [x] 增加页面滑动动画（2.1.2） + - [x] Fix a bug which page frozen sometimes when sliding in version 2.1.0 （2.1.0.1） - - [x] 迁移AndroidX（2.2.0） + - [x] support setTransformStyle（2.1.2） - - [x] 增加IndicatorView的滑动样式（2.2.2） + - [x] Migrate to Androidx（2.2.0） - - [x] 增添更多Indicator样式（2.3.+） - - [x] 支持一屏显示多页 （2.4.0） - - [x] v2.4.3版本着重优化提升性能 - - [x] 重构Indicator，~~尽量修复Indicator SMOOTH模式下滑动问题~~ - - [x] 目前Indicator部分代码比较乱，还有很大很大的优化空间，后续版本将持续优化(2.5.0对Indicator再次进行了重构，重构后代码已经很整洁，但仍然有优化空间) - - [ ] ViewPager更换为ViewPager2 （3.0.0） + - [x] Support indicator smooth slide（2.2.2） + + - [x] Support Dash IndicatorView（2.3.+） + + - [x] Support MULTI_PAGE Style （2.4.0） + + - [x] Optimize code and improve performance in version 2.4.3 + + - [x] Refactor Indicator again (2.5.0) + + - [ ] Change ViewPager to ViewPager2 （3.0.0） -## 有问题可以扫码加QQ群交流 +## If you have any question you can scan the QR code to join the QQ group to communicate. ![QQ交流群60902509](https://github.com/zhpanvip/BannerViewPager/blob/master/image/qq_group.png) -## 更多详情请参看以下链接 +## More details [《打造一个丝滑般自动轮播无限循环Android库》](https://juejin.im/post/5d6bce24f265da03db0790d1) @@ -406,7 +408,7 @@ public class FigureIndicatorView extends BaseIndicatorView { [《剖析BannerViewPager中Indicator的设计思想》](https://juejin.im/post/5dda0b6d518825731f569a8c) -## 感谢 +## Thanks [banner](https://github.com/youth5201314/banner) diff --git a/README_CN.md b/README_CN.md new file mode 100644 index 00000000..794afbaa --- /dev/null +++ b/README_CN.md @@ -0,0 +1,442 @@ +# BannerViewPager + +[![License](https://img.shields.io/badge/License%20-Apache%202-337ab7.svg)](https://www.apache.org/licenses/LICENSE-2.0) +![MinSdk](https://img.shields.io/badge/API-16%2B-brightgreen.svg?style=flat) +[![JitPack](https://jitpack.io/v/zhpanvip/BannerViewPager.svg)](https://jitpack.io/#zhpanvip/BannerViewPager) +[ ![JCenter](https://api.bintray.com/packages/zhpanvip/CircleViewPager/bannerview/images/download.svg) ](https://bintray.com/zhpanvip/CircleViewPager/bannerview/_latestVersion) +[![Android Arsenal](https://img.shields.io/badge/Android%20Arsenal-BannerViewPager-brightgreen.svg?style=flat)](https://android-arsenal.com/details/1/7961) + +## [English](https://github.com/zhpanvip/BannerViewPager) | 中文 + + +> 腾讯视频、QQ音乐、酷狗音乐、支付宝、天猫、淘宝、优酷视频、喜马拉雅、网易云音乐、哔哩哔哩、全民K歌等App的Banner样式都可以通过BannerViewPager实现哦！ + + +## 效果预览 + + ### [点击或扫描二维码下载apk](https://github.com/zhpanvip/BannerViewPager/raw/master/download/app.apk) + +![扫描下载Demo](https://github.com/zhpanvip/BannerViewPager/blob/master/image/qrcode.png) + + +### 1.setPageStyle + +[一屏多页Demo](https://github.com/zhpanvip/BannerViewPager/blob/master/app/src/main/java/com/example/zhpan/circleviewpager/fragment/PageFragment.java) + +| MULTI_PAGE |MULTI_PAGE_SCALE | MULTI_PAGE_OVERLAP | +|--|--|--| +| ![MULTI_PAGE](https://github.com/zhpanvip/BannerViewPager/blob/master/image/page_style_multi.gif) |![MULTI_PAGE](https://github.com/zhpanvip/BannerViewPager/blob/master/image/page_style_multi_scale.gif) |![MULTI_PAGE](https://github.com/zhpanvip/BannerViewPager/blob/master/image/page_style_multi_overlay.gif) | + +### 2.setIndicatorStyle +BannerViewPager支持多种IndicatorViewStyle,同时还提供了完全自定义IndicatorView的功能。只要继承BaseIndicatorView或者实现IIndicator接口，并重写相应方法，就可以为所欲为的打造任意的Indicator了。 + +[IndicatorViewStyle Demo](https://github.com/zhpanvip/BannerViewPager/blob/master/app/src/main/java/com/example/zhpan/circleviewpager/fragment/IndicatorFragment.java) + +| CIRCLE | DASH | ROUND_RECT | +|--|--|--| +| ![CIRCLE](https://github.com/zhpanvip/BannerViewPager/blob/master/image/style_circle.gif) | ![DASH](https://github.com/zhpanvip/BannerViewPager/blob/master/image/style_dash.gif) | ![NORMAL](https://github.com/zhpanvip/BannerViewPager/blob/master/image/style_round_rect.gif) | + +### 3.setIndicatorSlideMode + +| NORMAL | SMOOTH | +|--|--| +| ![NORMAL](https://github.com/zhpanvip/BannerViewPager/blob/master/image/slide_normal.gif) | ![SMOOTH](https://github.com/zhpanvip/BannerViewPager/blob/master/image/slide_smooth.gif) | + + +### 4.setPageTransformerStyle + +[TransformStyle Demo](https://github.com/zhpanvip/BannerViewPager/blob/master/app/src/main/java/com/example/zhpan/circleviewpager/activity/WelcomeActivity.java) + +| 参数 | STACK | ROTATE | DEPTH | ACCORDION | +|--|--|--|--|--| +| 预览 | ![STACK](https://github.com/zhpanvip/BannerViewPager/blob/master/image/transform_stack.gif) | ![ROTATE_DOWN](https://github.com/zhpanvip/BannerViewPager/blob/master/image/transform_rotate.gif) | ![DEPTH](https://github.com/zhpanvip/BannerViewPager/blob/master/image/transform_depth.gif) |![ACCORDION](https://github.com/zhpanvip/BannerViewPager/blob/master/image/transform_accordion.gif) | + + + +## 开放API + +| 方法名 | 方法描述 | 说明 | +|--|--|--| +| BannerViewPager setCanLoop(boolean canLoop) | 是否开启循环 | 默认值true| +| BannerViewPager setAutoPlay(boolean autoPlay) | 是否开启自动轮播 | 默认值true| +| BannerViewPager setInterval(int interval) | 自动轮播时间间隔 |单位毫秒，默认值3000 | +| BannerViewPager setScrollDuration(int scrollDuration) | 设置页面滚动时间 | 设置页面滚动时间 |单位毫秒，默认值500 | +| BannerViewPager setRoundCorner(int radius) | 设置圆角 |默认无圆角 需要SDK_INT>=LOLLIPOP(API 21) | +| BannerViewPager setOnPageClickListener(OnPageClickListener onPageClickListener) | 设置页面点击事件 | | +| BannerViewPager setHolderCreator(HolderCreator\ holderCreator) |设置HolderCreator |必须设置HolderCreator，否则会抛出NullPointerException| +| BannerViewPager setIndicatorVisibility(@Visibility int visibility) | indicator visibility |默认值VISIBLE 2.4.2 新增| +| BannerViewPager setIndicatorStyle(int indicatorStyle) | 设置指示器样式 | 可选枚举(CIRCLE, DASH、ROUND_RECT) 默认CIRCLE | +| BannerViewPager setIndicatorGravity(int gravity) | 指示器位置 |可选值(CENTER、START、END)默认值CENTER | +| BannerViewPager setIndicatorColor(int normalColor,int checkedColor) | 指示器圆点颜色 |normalColor：未选中时颜色默认"#8C6C6D72"， checkedColor：选中时颜色 默认"#8C18171C" | +| BannerViewPager setIndicatorSlideMode(int slideMode) | 设置Indicator滑动模式 | 可选（NORMAL、SMOOTH），默认值NORMAL | +| BannerViewPager setIndicatorRadius(int radius) | 设置指示器圆点半径 | 默认值4dp| +| BannerViewPager setIndicatorRadius(int normalRadius,int checkRadius) |设置指示器圆点半径 | normalRadius:未选中时半径 checkedRadius:选中时的半径,默认值4dp | +| BannerViewPager setIndicatorWidth(int indicatorWidth) | 设置指示器宽度，如果是圆形指示器，则为直径 | 默认值8dp| +| BannerViewPager setIndicatorWidth(int normalWidth, int checkWidth) | 设置指示器宽度，如果是圆形指示器，则为直径 | 默认值8dp | +| BannerViewPager setIndicatorHeight(int indicatorHeight) | 设置指示器高度，仅在Indicator样式为DASH时有效 | 默认值normalIndicatorWidth/2 | +| BannerViewPager setIndicatorGap(int indicatorMargin) | 指示器圆点间距| 默认值为指示器宽度（或者是圆的直径）| +| BannerViewPager setIndicatorView(IIndicator indicatorView) | 设置自定义指示器|自定义View需要继承BaseIndicatorView或实现IIndicator | +| BannerViewPager setPageTransformerStyle(int style) | 设置页面Transformer内置样式 | | +| BannerViewPager setCurrentItem(int item) | Set the currently selected page. | 2.3.5新增 | +| int getCurrentItem() | 获取当前position | 2.3.5新增 | +| BannerViewPager setPageStyle(PageStyle pageStyle) | 设置页面样式 | 2.4.0新增 可选（MULTI_PAGE、MULTI_PAGE_SCALE、MULTI_PAGE_OVERLAP）| +| BannerViewPager setPageMargin(int pageMargin) | 设置页面间隔 | 2.4.0新增 | +| BannerViewPager setIndicatorMargin(int left, int top, int right, int bottom) | 设置Indicator边距 | 2.4.1新增 | +| BannerViewPager setOnPageChangeListener(OnPageChangeListener l) | 页面改变的监听事件 | 2.4.3新增 | +| void startLoop() |开启自动轮播 | 初始化BannerViewPager时不必调用该方法,设置setAutoPlay后会调用startLoop() | +| void stopLoop() | 停止自动轮播 | | +| List\ getList() | 获取Banner中的集合数据 | | +| void create(List list) |初始化并构造BannerViewPager |必须调用，否则前面设置的参数无效 | + +### xml支持的attrs +| Attributes | format | description | +|--|--|--| +| bvp_interval | integer | 自动轮播时间间隔 | +| bvp_scroll_duration | integer | 页面切换时滑动时间| +| bvp_can_loop | boolean| 是否循环 | +| bvp_auto_play | boolean | 是否自动播放 | +| bvp_indicator_checked_color | color | indicator选中时颜色 | +| bvp_indicator_normal_color | color | indicator未选中时颜色 | +| bvp_indicator_radius | dimension | indicator圆点半径或者Dash模式的1/2宽度 | +| bvp_round_corner| dimension | Banner圆角大小 | +| bvp_page_margin | dimension | 页面item间距 | +| bvp_reveal_width | dimension | 一屏多页模式下两边item漏出的宽度 | +| bvp_indicator_style | enum | indicator样式(circle/dash) | +| bvp_indicator_slide_mode | enum | indicator滑动模式(normal/smooth) | +| bvp_indicator_gravity | enum | indicator位置(center/start/end) | +| bvp_page_style | enum | page样式(normal/multi_page/multi_page_overlap/multi_page_scale) | +| bvp_transformer_style | enum | transform样式(normal/depth/stack/accordion) | +| bvp_indicator_visibility| enum | indicator visibility(visible/gone/invisible) | + + +## 如何使用 + +### 1.gradle中添加依赖 + + +如果您已迁移到AndroidX，请在项目的root build.gradle中添加如下配置： +``` +allprojects { + repositories { + ... + maven { url 'https://jitpack.io' } + } + } + +``` +Add the dependency + +``` +implementation 'com.github.zhpanvip:BannerViewPager:latestVersion' + +``` + +Androidx latestVersion:[![latestVersion](https://jitpack.io/v/zhpanvip/BannerViewPager.svg)](https://jitpack.io/#zhpanvip/BannerViewPager) + +如果你仍在使用Android support请使用（非Androidx的包托管在JCenter上）： +``` +implementation 'com.zhpan.library:bannerview:latestVersion' +``` + +Android support latestVersion: [ ![latestVersion](https://api.bintray.com/packages/zhpanvip/CircleViewPager/bannerview/images/download.svg) ](https://bintray.com/zhpanvip/CircleViewPager/bannerview/_latestVersion) + +### 2.在xml文件中添加如下代码： + +``` + +``` + +### 3.Banner的Item页面布局 + +``` + + + + + + + + + + +``` + +### 4.自定义ViewHolder + +``` + public class NetViewHolder implements ViewHolder { + + @Override + public int getLayoutId() { + return R.layout.item_net; + } + + @Override + public void onBind(View itemView, BannerData data, int position, int size) { + CornerImageView imageView = itemView.findViewById(R.id.banner_image); + imageView.setRoundCorner(BannerUtils.dp2px(5)); + ImageLoaderOptions options = new ImageLoaderOptions.Builder() + .into(imageView).load(data.getImagePath()) + .placeHolder(R.drawable.placeholder).build(); + ImageLoaderManager.getInstance().loadImage(options); + } + } +``` + +### 5.BannerViewPager参数配置 + +Kotlin： + +``` + private lateinit var mViewPager: BannerViewPager + + private fun initViewPager() { + mBannerViewPager = findViewById(R.id.bannerView) + mBannerViewPager.setCanLoop(false) + .setIndicatorSlideMode(IndicatorSlideMode.SMOOTH) + .setIndicatorMargin(0, 0, 0, ConvertUtils.dp2px(40f)) + .setIndicatorGravity(IndicatorGravity.CENTER) + .setHolderCreator { CustomPageViewHolder() } + .setOnPageChangeListener( + object : OnPageChangeListenerAdapter() { + override fun onPageSelected(position: Int) { + pageSelect(position) + } + } + ) + .create(res.toList()) + } +``` + +Java： + +``` + private BannerViewPager mBannerViewPager; + ... + private void initViewPager() { + mBannerViewPager = findViewById(R.id.banner_view); + mBannerViewPager.showIndicator(true) + .setInterval(3000) + .setCanLoop(false) + .setAutoPlay(true) + .setRoundCorner(DpUtils.dp2px(7)) + .setIndicatorColor(Color.parseColor("#935656"), Color.parseColor("#FF4C39")) + .setIndicatorGravity(IndicatorGravity.END) + .setScrollDuration(1000).setHolderCreator(NetViewHolder::new) + .setOnPageClickListener(position -> { + BannerData bannerData = mBannerViewPager.getList().get(position); + Toast.makeText(NetworkBannerActivity.this, + "点击了图片" + position + " " + bannerData.getDesc(), Toast.LENGTH_SHORT).show(); + + }).create(mList); + } +``` +### 6.开启与停止轮播 + +***2.5.0之后版本无需自行在Activity或Fragment中管理stopLoop和startLoop方法，但这两个方法依旧保留对外开放*** + +~~如果开启了自动轮播功能，请务必在onDestroy中停止轮播，以免出现内存泄漏。~~ + +``` + @Override + protected void onDestroy() { + super.onDestroy(); + if (mBannerViewPager != null) + mViewpager.stopLoop(); + } +``` +为了节省性能也可以在onStop中停止轮播，在onResume中开启轮播： + +``` + @Override + protected void onStop() { + super.onStop(); + if (mBannerViewPager != null) + mBannerViewPager.stopLoop(); + } + + @Override + protected void onResume() { + super.onResume(); + if (mBannerViewPager != null) + mBannerViewPager.startLoop(); + } +``` + +### 7.高级功能---自定义IndicatorView + +在内置Indicator不满足需求时可以通过自定义IndicatorView实现,例子将实现一个如下图所示的IndicatorView。 + +| Custom IndicatorView| +|--| +| ![NORMAL](https://github.com/zhpanvip/BannerViewPager/blob/master/image/style_custum.gif) | + +**(1)自定义View并继承BaseIndicatorView** + +``` +public class FigureIndicatorView extends BaseIndicatorView { + + private int radius = DpUtils.dp2px(20); + + private int backgroundColor = Color.parseColor("#88FF5252"); + + private int textColor = Color.WHITE; + + private int textSize=DpUtils.dp2px(13); + + public FigureIndicatorView(Context context) { + this(context, null); + } + + public FigureIndicatorView(Context context, @Nullable AttributeSet attrs) { + this(context, attrs, 0); + } + + public FigureIndicatorView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) { + super(context, attrs, defStyleAttr); + mPaint = new Paint(); + } + + @Override + protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { + super.onMeasure(widthMeasureSpec, heightMeasureSpec); + setMeasuredDimension(2 * radius, 2 * radius); + } + + @Override + protected void onDraw(Canvas canvas) { + super.onDraw(canvas); + mPaint.setColor(backgroundColor); + canvas.drawCircle(getWidth() / 2, getHeight() / 2, radius, mPaint); + mPaint.setColor(textColor); + mPaint.setTextSize(textSize); + String text = currentPosition + 1 + "/" + pageSize; + int textWidth = (int) mPaint.measureText(text); + Paint.FontMetricsInt fontMetricsInt = mPaint.getFontMetricsInt(); + int baseline = (getMeasuredHeight() - fontMetricsInt.bottom + fontMetricsInt.top) / 2 - fontMetricsInt.top; + canvas.drawText(text, (getWidth() - textWidth) / 2, baseline, mPaint); + } + + public void setRadius(int radius) { + this.radius = radius; + } + + @Override + public void setBackgroundColor(@ColorInt int backgroundColor) { + this.backgroundColor = backgroundColor; + } + + public void setTextSize(int textSize) { + this.textSize = textSize; + } + + public void setTextColor(int textColor) { + this.textColor = textColor; + } +} +``` +**(2)设置自定义指示器** + +``` + FigureIndicatorView indicatorView = new FigureIndicatorView(mContext); + indicatorView.setRadius(BannerUtils.dp2px(18)); + indicatorView.setTextSize(BannerUtils.dp2px(13)); + indicatorView.setBackgroundColor(Color.parseColor("#aa118EEA")); + + mViewPager.setIndicatorGravity(IndicatorGravity.END) + .setIndicatorView(indicatorView) + .setHolderCreator(() -> new ImageResourceViewHolder(0)) + .create(mDrawableList); +``` + +## TODO 版本计划 + + - [x] 优化及重构IndicatorView（2.0.1） + + - [x] 修复2.1.0以前版本循环滑动时第一张切换卡顿问题（2.1.0.1） + + - [x] 增加页面滑动动画（2.1.2） + + - [x] 迁移AndroidX（2.2.0） + + - [x] 增加IndicatorView的滑动样式（2.2.2） + + - [x] 增添更多Indicator样式（2.3.+） + - [x] 支持一屏显示多页 （2.4.0） + - [x] v2.4.3版本着重优化提升性能 + - [x] 重构Indicator，~~尽量修复Indicator SMOOTH模式下滑动问题~~ (2.5.0) + - [x] 目前Indicator部分代码比较乱，还有很大很大的优化空间，后续版本将持续优化(2.5.0对Indicator再次进行了重构，重构后代码已经很整洁，但仍然有优化空间) + - [ ] ViewPager更换为ViewPager2 （3.0.0） + + +## 有问题可以扫码加QQ群交流 + + ![QQ交流群60902509](https://github.com/zhpanvip/BannerViewPager/blob/master/image/qq_group.png) + + +## 更多详情请参看以下链接 + +[《打造一个丝滑般自动轮播无限循环Android库》](https://juejin.im/post/5d6bce24f265da03db0790d1) + +[《BannerViewPager源码解析》](https://juejin.im/post/5d74d3faf265da03b5747015) + +[《剖析BannerViewPager中Indicator的设计思想》](https://juejin.im/post/5dda0b6d518825731f569a8c) + +## 感谢 + +[banner](https://github.com/youth5201314/banner) + +[Android-ConvenientBanner](https://github.com/saiwu-bigkoo/Android-ConvenientBanner) + +[ViewPagerTransforms](https://github.com/ToxicBakery/ViewPagerTransforms) + +[玩Android](https://wanandroid.com/) + + +License +------- + + Copyright 2019 zhpanvip + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + + + + + diff --git a/app/build.gradle b/app/build.gradle index 95606a64..16d13acf 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -57,4 +57,5 @@ dependencies { implementation project(path: ':ideahttp') implementation 'androidx.core:core-ktx:1.1.0' implementation 'androidx.cardview:cardview:1.0.0' + implementation 'androidx.viewpager2:viewpager2:1.0.0' } diff --git a/app/release/app-release.apk b/app/release/app-release.apk new file mode 100644 index 00000000..175ec313 Binary files /dev/null and b/app/release/app-release.apk differ diff --git a/download/key b/app/release/key similarity index 100% rename from download/key rename to app/release/key diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b23354d5..b2b8264e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -12,9 +12,10 @@ android:label="@string/app_name" android:supportsRtl="true" android:theme="@style/AppTheme"> + + android:theme="@style/FullScreenTheme"> @@ -22,13 +23,10 @@ - - - - + \ No newline at end of file diff --git a/app/src/main/java/com/example/zhpan/circleviewpager/activity/MainActivity.kt b/app/src/main/java/com/example/zhpan/circleviewpager/activity/MainActivity.kt index 03d00e13..47c7b5fa 100644 --- a/app/src/main/java/com/example/zhpan/circleviewpager/activity/MainActivity.kt +++ b/app/src/main/java/com/example/zhpan/circleviewpager/activity/MainActivity.kt @@ -5,8 +5,7 @@ import android.content.Intent import android.os.Bundle import androidx.appcompat.app.AppCompatActivity -import androidx.viewpager.widget.ViewPager - +import androidx.viewpager2.widget.ViewPager2 import com.example.zhpan.circleviewpager.R import com.example.zhpan.circleviewpager.adapter.AdapterFragmentPager @@ -24,22 +23,14 @@ class MainActivity : AppCompatActivity() { } private fun initData() { - val mAdapter = AdapterFragmentPager(supportFragmentManager) - vp_fragment?.adapter = mAdapter - vp_fragment?.disableTouchScroll(true) - vp_fragment?.offscreenPageLimit = 3 - vp_fragment?.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { - override fun onPageScrolled(position: Int, positionOffset: Float, positionOffsetPixels: Int) { - - } - + vp_fragment.adapter = AdapterFragmentPager(this) + vp_fragment.offscreenPageLimit = 3 + vp_fragment.isUserInputEnabled=false + vp_fragment.registerOnPageChangeCallback(object : ViewPager2.OnPageChangeCallback() { override fun onPageSelected(position: Int) { + super.onPageSelected(position) rg_tab?.check(getCheckedId(position)) } - - override fun onPageScrollStateChanged(state: Int) { - - } }) } @@ -55,17 +46,12 @@ class MainActivity : AppCompatActivity() { } private fun setListener() { - rg_tab?.setOnCheckedChangeListener { group, checkedId -> - if (checkedId == R.id.rb_home) { - vp_fragment?.setCurrentItem(AdapterFragmentPager.PAGE_HOME, false) - - } else if (checkedId == R.id.rb_find) { - vp_fragment?.setCurrentItem(AdapterFragmentPager.PAGE_FIND, false) - - } else if (checkedId == R.id.rb_add) { - vp_fragment?.setCurrentItem(AdapterFragmentPager.PAGE_INDICATOR, false) - } else if (checkedId == R.id.rb_others) { - vp_fragment?.setCurrentItem(AdapterFragmentPager.PAGE_OTHERS, false) + rg_tab?.setOnCheckedChangeListener { _, checkedId -> + when (checkedId) { + R.id.rb_home -> vp_fragment.setCurrentItem(AdapterFragmentPager.PAGE_HOME, false) + R.id.rb_find -> vp_fragment.setCurrentItem(AdapterFragmentPager.PAGE_FIND, false) + R.id.rb_add -> vp_fragment.setCurrentItem(AdapterFragmentPager.PAGE_INDICATOR, false) + R.id.rb_others -> vp_fragment.setCurrentItem(AdapterFragmentPager.PAGE_OTHERS, false) } } } diff --git a/app/src/main/java/com/example/zhpan/circleviewpager/adapter/AdapterFragmentPager.kt b/app/src/main/java/com/example/zhpan/circleviewpager/adapter/AdapterFragmentPager.kt index 30a324f0..4eb23ce8 100644 --- a/app/src/main/java/com/example/zhpan/circleviewpager/adapter/AdapterFragmentPager.kt +++ b/app/src/main/java/com/example/zhpan/circleviewpager/adapter/AdapterFragmentPager.kt @@ -1,42 +1,42 @@ package com.example.zhpan.circleviewpager.adapter + import android.util.SparseArray -import android.view.ViewGroup import androidx.fragment.app.Fragment -import androidx.fragment.app.FragmentManager -import androidx.fragment.app.FragmentPagerAdapter -import com.example.zhpan.circleviewpager.fragment.* +import androidx.fragment.app.FragmentActivity +import androidx.viewpager2.adapter.FragmentStateAdapter -class AdapterFragmentPager(fm: FragmentManager) : FragmentPagerAdapter(fm) { +import com.example.zhpan.circleviewpager.fragment.BaseFragment +import com.example.zhpan.circleviewpager.fragment.HomeFragment +import com.example.zhpan.circleviewpager.fragment.IndicatorFragment +import com.example.zhpan.circleviewpager.fragment.OthersFragment +import com.example.zhpan.circleviewpager.fragment.PageFragment - private val fragmentList: SparseArray? +import java.util.ArrayList - private val fragments: SparseArray - get() { - val fragmentList = SparseArray() - fragmentList.put(PAGE_HOME, HomeFragment.getInstance()) - fragmentList.put(PAGE_FIND, PageFragment.getInstance()) - fragmentList.put(PAGE_INDICATOR, IndicatorFragment.getInstance()) - fragmentList.put(PAGE_OTHERS, OthersFragment.getInstance()) - return fragmentList - } +/** + * 
+ * Created by zhangpan on 2019-12-05.
+ * Description:
+
* + */ +class AdapterFragmentPager(fragmentActivity: FragmentActivity) : FragmentStateAdapter(fragmentActivity) { - init { - fragmentList = fragments - } + private val fragments: SparseArray = SparseArray() - override fun instantiateItem(container: ViewGroup, position: Int): Any { - val fragment = super.instantiateItem(container, position) as Fragment - fragmentList?.put(position, fragment as BaseFragment) - return fragment + init { + fragments.put(PAGE_HOME, HomeFragment.getInstance()) + fragments.put(PAGE_FIND, PageFragment.getInstance()) + fragments.put(PAGE_INDICATOR, IndicatorFragment.getInstance()) + fragments.put(PAGE_OTHERS, OthersFragment.getInstance()) } - override fun getItem(position: Int): Fragment { - return fragmentList!!.get(position) + override fun createFragment(position: Int): Fragment { + return fragments[position] } - override fun getCount(): Int { - return fragmentList?.size() ?: 0 + override fun getItemCount(): Int { + return fragments.size() } companion object { diff --git a/app/src/main/java/com/example/zhpan/circleviewpager/fragment/IndicatorFragment.java b/app/src/main/java/com/example/zhpan/circleviewpager/fragment/IndicatorFragment.java index 9174022e..51afae49 100644 --- a/app/src/main/java/com/example/zhpan/circleviewpager/fragment/IndicatorFragment.java +++ b/app/src/main/java/com/example/zhpan/circleviewpager/fragment/IndicatorFragment.java @@ -60,11 +60,24 @@ private void initRadioGroup() { case R.id.rb_round_rect: setupRoundRectIndicator(); break; + case R.id.rb_tmall: + setupTmallIndicator(); + break; } }); radioButton.performClick(); } + private void setupTmallIndicator() { + mViewPager + .setIndicatorStyle(IndicatorStyle.DASH) + .setIndicatorGap(0) + .setIndicatorColor(getColor(R.color.white_alpha_75), getColor(R.color.white)) + .setIndicatorWidth(BannerUtils.dp2px(12), BannerUtils.dp2px(12)) + .setIndicatorHeight(BannerUtils.dp2px(1.5f)) + .create(getMDrawableList()); + } + private void setupRoundRectIndicator() { mViewPager.setIndicatorStyle(IndicatorStyle.ROUND_RECT) .setIndicatorGravity(IndicatorGravity.CENTER) diff --git a/app/src/main/java/com/example/zhpan/circleviewpager/viewholder/CustomPageViewHolder.java b/app/src/main/java/com/example/zhpan/circleviewpager/viewholder/CustomPageViewHolder.java index 8464d256..1a0cc7c9 100644 --- a/app/src/main/java/com/example/zhpan/circleviewpager/viewholder/CustomPageViewHolder.java +++ b/app/src/main/java/com/example/zhpan/circleviewpager/viewholder/CustomPageViewHolder.java @@ -1,10 +1,7 @@ package com.example.zhpan.circleviewpager.viewholder; import android.animation.ObjectAnimator; -import android.content.Context; -import android.view.LayoutInflater; import android.view.View; -import android.view.ViewGroup; import android.widget.ImageView; import com.example.zhpan.circleviewpager.R; @@ -12,20 +9,18 @@ import com.zhpan.bannerview.holder.ViewHolder; public class CustomPageViewHolder implements ViewHolder { - private ImageView mImageView; - private ImageView mImageStart; private OnSubViewClickListener mOnSubViewClickListener; @Override - public View createView(ViewGroup viewGroup, Context context, int position) { - View view = LayoutInflater.from(context).inflate(R.layout.item_custom_view, viewGroup, false); - mImageView = view.findViewById(R.id.banner_image); - mImageStart = view.findViewById(R.id.iv_logo); - return view; + public int getLayoutId() { + return R.layout.item_custom_view; } @Override - public void onBind(Context context, CustomBean data, int position, int size) { + public void onBind(View itemView, CustomBean data, int position, int size) { + ImageView mImageView = itemView.findViewById(R.id.banner_image); + ImageView mImageStart = itemView.findViewById(R.id.iv_logo); + mImageView.setImageResource(data.getImageRes()); mImageStart.setOnClickListener(view -> { if (null != mOnSubViewClickListener) @@ -34,7 +29,6 @@ public void onBind(Context context, CustomBean data, int position, int size) { ObjectAnimator alphaAnimator = ObjectAnimator.ofFloat(mImageStart, "alpha", 0, 1); alphaAnimator.setDuration(1500); alphaAnimator.start(); - } public void setOnSubViewClickListener(OnSubViewClickListener subViewClickListener) { diff --git a/app/src/main/java/com/example/zhpan/circleviewpager/viewholder/ImageResourceViewHolder.java b/app/src/main/java/com/example/zhpan/circleviewpager/viewholder/ImageResourceViewHolder.java index cfd4c7c8..be641cce 100644 --- a/app/src/main/java/com/example/zhpan/circleviewpager/viewholder/ImageResourceViewHolder.java +++ b/app/src/main/java/com/example/zhpan/circleviewpager/viewholder/ImageResourceViewHolder.java @@ -1,9 +1,6 @@ package com.example.zhpan.circleviewpager.viewholder; -import android.content.Context; -import android.view.LayoutInflater; import android.view.View; -import android.view.ViewGroup; import com.example.zhpan.circleviewpager.R; import com.example.zhpan.circleviewpager.view.CornerImageView; @@ -16,7 +13,7 @@ * */ public class ImageResourceViewHolder implements ViewHolder { - private CornerImageView mImageView; + private int roundCorner; public ImageResourceViewHolder(int roundCorner) { @@ -24,15 +21,15 @@ public ImageResourceViewHolder(int roundCorner) { } @Override - public View createView(ViewGroup viewGroup, Context context, int position) { - View view = LayoutInflater.from(context).inflate(R.layout.item_slide_mode, viewGroup, false); - mImageView = view.findViewById(R.id.banner_image); - return view; + public int getLayoutId() { + return R.layout.item_slide_mode; } @Override - public void onBind(Context context, Integer data, int position, int size) { - mImageView.setImageResource(data); - mImageView.setRoundCorner(roundCorner); + public void onBind(View itemView, Integer data, int position, int size) { + CornerImageView imageView = itemView.findViewById(R.id.banner_image); + imageView.setImageResource(data); + imageView.setRoundCorner(roundCorner); } + } diff --git a/app/src/main/java/com/example/zhpan/circleviewpager/viewholder/NetViewHolder.java b/app/src/main/java/com/example/zhpan/circleviewpager/viewholder/NetViewHolder.java index bbcd1aac..62627e9b 100644 --- a/app/src/main/java/com/example/zhpan/circleviewpager/viewholder/NetViewHolder.java +++ b/app/src/main/java/com/example/zhpan/circleviewpager/viewholder/NetViewHolder.java @@ -1,11 +1,6 @@ package com.example.zhpan.circleviewpager.viewholder; -import android.content.Context; -import android.view.LayoutInflater; import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; import com.example.zhpan.circleviewpager.R; import com.example.zhpan.circleviewpager.imageloader.ImageLoaderManager; @@ -22,22 +17,19 @@ * */ public class NetViewHolder implements ViewHolder { - private CornerImageView mImageView; -// private TextView mTextView; @Override - public View createView(ViewGroup viewGroup, Context context, int position) { - View view = LayoutInflater.from(context).inflate(R.layout.item_net, viewGroup, false); - mImageView = view.findViewById(R.id.banner_image); -// mTextView = view.findViewById(R.id.tv_describe); - mImageView.setRoundCorner(BannerUtils.dp2px(5)); - return view; + public int getLayoutId() { + return R.layout.item_net; } @Override - public void onBind(Context context, BannerData data, int position, int size) { - ImageLoaderOptions options = new ImageLoaderOptions.Builder().into(mImageView).load(data.getImagePath()).placeHolder(R.drawable.placeholder).build(); + public void onBind(View itemView, BannerData data, int position, int size) { + CornerImageView imageView = itemView.findViewById(R.id.banner_image); + imageView.setRoundCorner(BannerUtils.dp2px(5)); + ImageLoaderOptions options = new ImageLoaderOptions.Builder() + .into(imageView).load(data.getImagePath()) + .placeHolder(R.drawable.placeholder).build(); ImageLoaderManager.getInstance().loadImage(options); -// mTextView.setText(data.getTitle()); } } diff --git a/app/src/main/java/com/example/zhpan/circleviewpager/viewholder/PhotoViewHolder.java b/app/src/main/java/com/example/zhpan/circleviewpager/viewholder/PhotoViewHolder.java index f14f2a69..51e30007 100644 --- a/app/src/main/java/com/example/zhpan/circleviewpager/viewholder/PhotoViewHolder.java +++ b/app/src/main/java/com/example/zhpan/circleviewpager/viewholder/PhotoViewHolder.java @@ -1,9 +1,6 @@ package com.example.zhpan.circleviewpager.viewholder; -import android.content.Context; -import android.view.LayoutInflater; import android.view.View; -import android.view.ViewGroup; import android.widget.Toast; import com.example.zhpan.circleviewpager.R; @@ -16,20 +13,16 @@ */ public class PhotoViewHolder implements ViewHolder { - private PhotoView mImageView; @Override - public View createView(ViewGroup viewGroup, Context context, int position) { - // 返回页面布局文件 - View view = LayoutInflater.from(context).inflate(R.layout.item_photo_view, viewGroup, false); - mImageView = view.findViewById(R.id.banner_image); - return view; + public int getLayoutId() { + return R.layout.item_photo_view; } @Override - public void onBind(final Context context, Integer data, final int position, final int size) { - // 数据绑定 - mImageView.setImageResource(data); - mImageView.setOnClickListener(v -> Toast.makeText(context, position + " 页面数" + size, Toast.LENGTH_SHORT).show()); + public void onBind(View itemView, Integer data, int position, int size) { + PhotoView imageView = itemView.findViewById(R.id.banner_image); + imageView.setImageResource(data); + imageView.setOnClickListener(v -> Toast.makeText(itemView.getContext(), position + " 页面数" + size, Toast.LENGTH_SHORT).show()); } } diff --git a/app/src/main/java/com/example/zhpan/circleviewpager/viewholder/TransformerViewHolder.java b/app/src/main/java/com/example/zhpan/circleviewpager/viewholder/TransformerViewHolder.java deleted file mode 100644 index 328f0ea2..00000000 --- a/app/src/main/java/com/example/zhpan/circleviewpager/viewholder/TransformerViewHolder.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.example.zhpan.circleviewpager.viewholder; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import com.example.zhpan.circleviewpager.R; -import com.zhpan.bannerview.holder.ViewHolder; - -/** - * Created by zhpan on 2017/10/30. - * Description: - */ -public class TransformerViewHolder implements ViewHolder { - private ImageView mImageView; - private TextView mTextView; - - @Override - public View createView(ViewGroup viewGroup, Context context, int position) { - // 返回页面布局文件 - View view = LayoutInflater.from(context).inflate(R.layout.item_view, viewGroup, false); - mImageView = view.findViewById(R.id.banner_image); - mTextView = view.findViewById(R.id.btn_start); - - return view; - } - - @Override - public void onBind(final Context context, Integer data, final int position, final int size) { - mImageView.setImageResource(data); - mTextView.setVisibility(View.VISIBLE); - } -} diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 85725774..87b5e7b0 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -12,8 +12,8 @@ android:layout_width="match_parent" android:layout_height="55dp" android:layout_alignParentBottom="true" - android:background="@color/white" android:layout_centerInParent="true" + android:background="@color/white" android:orientation="horizontal"> - - - --> - diff --git a/app/src/main/res/layout/fragment_indicator.xml b/app/src/main/res/layout/fragment_indicator.xml index db11f5ce..1e87b84b 100644 --- a/app/src/main/res/layout/fragment_indicator.xml +++ b/app/src/main/res/layout/fragment_indicator.xml @@ -58,6 +58,16 @@ android:text="ROUND_RECT" android:textSize="16sp" /> + + + diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index fccf2297..7ee1a719 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -9,7 +9,7 @@ #88FF5252 #FFFFFF #BFFFFFFF - + #6FFFFFFF #000000 #000000 diff --git a/bannerview/build.gradle b/bannerview/build.gradle index b0025fdf..0e6c1d3c 100644 --- a/bannerview/build.gradle +++ b/bannerview/build.gradle @@ -37,7 +37,7 @@ dependencies { implementation 'androidx.appcompat:appcompat:1.0.2' } -version = "2.3.1" +version = "2.6.0" def siteUrl = 'https://github.com/zhpanvip/BannerViewPager' // 项目的主页 def gitUrl = 'https://github.com/zhpanvip/BannerViewPager.git' // Git仓库的url group = "com.zhpan.library" // Maven Group ID for the artifact，一般填你唯一的包名 diff --git a/bannerview/src/main/java/com/zhpan/bannerview/adapter/BannerPagerAdapter.java b/bannerview/src/main/java/com/zhpan/bannerview/adapter/BannerPagerAdapter.java index 3a0950cb..97b3cbfb 100644 --- a/bannerview/src/main/java/com/zhpan/bannerview/adapter/BannerPagerAdapter.java +++ b/bannerview/src/main/java/com/zhpan/bannerview/adapter/BannerPagerAdapter.java @@ -3,6 +3,7 @@ import androidx.annotation.NonNull; import androidx.viewpager.widget.PagerAdapter; +import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -27,7 +28,7 @@ public class BannerPagerAdapter extends PagerAdapter { private PageClickListener mPageClickListener; - private List mViewList = new ArrayList<>(); +// private List mViewList = new ArrayList<>(); public static final int MAX_VALUE = Integer.MAX_VALUE; @@ -54,7 +55,8 @@ public boolean isViewFromObject(@NonNull View view, @NonNull Object object) { @Override public @NonNull Object instantiateItem(@NonNull final ViewGroup container, final int position) { - View itemView = findViewByPosition(container, BannerUtils.getRealPosition(isCanLoop, position, mList.size())); + View itemView = getView(container, BannerUtils.getRealPosition(isCanLoop, position, mList.size())); + container.addView(itemView); return itemView; } @@ -63,21 +65,21 @@ Object instantiateItem(@NonNull final ViewGroup container, final int position) { // public int getItemPosition(@NonNull Object object) { // return POSITION_NONE; // } - - private View findViewByPosition(ViewGroup container, int position) { - for (View view : mViewList) { - if (((int) view.getTag()) == position && view.getParent() == null) { - return view; - } - } - View view = getView(position, container); - view.setTag(position); - mViewList.add(view); - return view; - } + // 没必要缓存 +// private View findViewByPosition(ViewGroup container, int position) { +// for (View view : mViewList) { +// if (((int) view.getTag()) == position && view.getParent() == null) { +// return view; +// } +// } +// View view = getView(container, position); +// view.setTag(position); +// mViewList.add(view); +// return view; +// } @SuppressWarnings("unchecked") - private View getView(final int position, ViewGroup container) { + private View getView(ViewGroup container, final int position) { ViewHolder holder = holderCreator.createViewHolder(); if (holder == null) { throw new NullPointerException("Can not return a null holder"); @@ -86,13 +88,13 @@ private View getView(final int position, ViewGroup container) { } private View createView(ViewHolder holder, int position, ViewGroup container) { - View view = null; + View itemView = LayoutInflater.from(container.getContext()).inflate(holder.getLayoutId(), container, false); if (mList != null && mList.size() > 0) { - view = holder.createView(container, container.getContext(), position); - holder.onBind(container.getContext(), mList.get(position), position, mList.size()); - setViewListener(view, position); +// holder.createView(itemView, position); + holder.onBind(itemView, mList.get(position), position, mList.size()); + setViewListener(itemView, position); } - return view; + return itemView; } private void setViewListener(View view, int position) { diff --git a/bannerview/src/main/java/com/zhpan/bannerview/annotation/AIndicatorStyle.java b/bannerview/src/main/java/com/zhpan/bannerview/annotation/AIndicatorStyle.java index 341d52f2..4d39f92a 100644 --- a/bannerview/src/main/java/com/zhpan/bannerview/annotation/AIndicatorStyle.java +++ b/bannerview/src/main/java/com/zhpan/bannerview/annotation/AIndicatorStyle.java @@ -9,6 +9,7 @@ import static com.zhpan.bannerview.constants.IndicatorStyle.CIRCLE; import static com.zhpan.bannerview.constants.IndicatorStyle.DASH; +import static com.zhpan.bannerview.constants.IndicatorStyle.ROUND_RECT; /** * 
@@ -16,7 +17,7 @@
  *   Description:
  *
*/ -@IntDef({CIRCLE, DASH}) +@IntDef({CIRCLE, DASH,ROUND_RECT}) @Retention(RetentionPolicy.SOURCE) @Target(ElementType.PARAMETER) public @interface AIndicatorStyle { diff --git a/bannerview/src/main/java/com/zhpan/bannerview/holder/ViewHolder.java b/bannerview/src/main/java/com/zhpan/bannerview/holder/ViewHolder.java index 26d04f80..6244ec8b 100644 --- a/bannerview/src/main/java/com/zhpan/bannerview/holder/ViewHolder.java +++ b/bannerview/src/main/java/com/zhpan/bannerview/holder/ViewHolder.java @@ -1,8 +1,8 @@ package com.zhpan.bannerview.holder; -import android.content.Context; import android.view.View; -import android.view.ViewGroup; + +import androidx.annotation.LayoutRes; /** * Created by zhpan on 2017/10/30. @@ -10,13 +10,16 @@ */ public interface ViewHolder { - View createView(ViewGroup viewGroup,Context context, int position); + + @LayoutRes int getLayoutId(); + +// void createView(View itemView,int position); /** - * @param context context - * @param data 实体类对象 + * @param itemView ViewPager item View + * @param data 实体类对象 * @param position 当前位置 - * @param size 页面个数 + * @param size 页面个数 */ - void onBind(Context context,T data,int position,int size); + void onBind(View itemView, T data, int position, int size); } diff --git a/download/app.apk b/download/app.apk index 9b6cd813..175ec313 100644 Binary files a/download/app.apk and b/download/app.apk differ diff --git a/image/qrcode.png b/image/qrcode.png index 344073ec..cce6dca7 100644 Binary files a/image/qrcode.png and b/image/qrcode.png differ