Skip to content

Commit a78b007

Browse files
bingoogolapplebingoogolapple
authored
Merge pull request bingoogolapple#74 from bingoogolapple/develop
upgrade banner
2 parents 06acd00 + 28cd481 commit a78b007

File tree

9 files changed

+45
-58
lines changed

9 files changed

+45
-58
lines changed

‎demo/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ dependencies {
2828
// compile project(':library')
2929
compile 'com.android.support:appcompat-v7:24.0.0'
3030
compile 'com.android.support:design:24.0.0'
31-
compile 'cn.bingoogolapple:bga-banner:2.0.4@aar'
31+
compile 'cn.bingoogolapple:bga-banner:2.0.9@aar'
3232
compile 'cn.bingoogolapple:bga-adapter:1.1.0@aar'
3333
compile 'cn.bingoogolapple:bga-swipeitemlayout:1.0.4@aar'
3434
compile 'cn.bingoogolapple:bga-indicator:1.0.1@aar'

‎demo/src/main/java/cn/bingoogolapple/refreshlayout/demo/engine/DataEngine.java

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@
66

77
import com.bumptech.glide.Glide;
88

9-
import java.util.ArrayList;
10-
import java.util.List;
11-
129
import cn.bingoogolapple.bgabanner.BGABanner;
1310
import cn.bingoogolapple.refreshlayout.demo.App;
1411
import cn.bingoogolapple.refreshlayout.demo.R;
@@ -27,19 +24,18 @@ public class DataEngine {
2724
public static View getCustomHeaderView(final Context context) {
2825
View headerView = View.inflate(context, R.layout.view_custom_header, null);
2926
final BGABanner banner = (BGABanner) headerView.findViewById(R.id.banner);
30-
final List<View> views = new ArrayList<>();
31-
for (int i = 0; i < 5; i++) {
32-
views.add(View.inflate(context, R.layout.view_image, null));
33-
}
34-
banner.setViews(views);
27+
banner.setAdapter(new BGABanner.Adapter() {
28+
@Override
29+
public void fillBannerItem(BGABanner banner, View view, Object model, int position) {
30+
Glide.with(banner.getContext()).load(model).placeholder(R.mipmap.holder).error(R.mipmap.holder).dontAnimate().thumbnail(0.1f).into((ImageView) view);
31+
}
32+
});
33+
3534
App.getInstance().getEngine().getBannerModel().enqueue(new Callback<BannerModel>() {
3635
@Override
3736
public void onResponse(Call<BannerModel> call, Response<BannerModel> response) {
3837
BannerModel bannerModel = response.body();
39-
for (int i = 0; i < views.size(); i++) {
40-
Glide.with(context).load(bannerModel.imgs.get(i)).placeholder(R.mipmap.holder).error(R.mipmap.holder).dontAnimate().thumbnail(0.1f).into((ImageView) views.get(i));
41-
}
42-
banner.setTips(bannerModel.tips);
38+
banner.setData(R.layout.view_image, bannerModel.imgs, bannerModel.tips);
4339
}
4440

4541
@Override

‎demo/src/main/java/cn/bingoogolapple/refreshlayout/demo/ui/activity/MainActivity.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,6 @@ private void setUpViewPager() {
119119
mViewPager.setAdapter(new ContentViewPagerAdapter(getSupportFragmentManager(), this));
120120
}
121121

122-
123122
@Override
124123
public void onBackPressed() {
125124
if (mDrawerLayout.isDrawerOpen(GravityCompat.START)) {

‎demo/src/main/java/cn/bingoogolapple/refreshlayout/demo/ui/activity/NormalRecyclerViewActivity.java

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
import com.bumptech.glide.Glide;
1111

12-
import java.util.ArrayList;
1312
import java.util.List;
1413

1514
import cn.bingoogolapple.androidcommon.adapter.BGAOnItemChildClickListener;
@@ -19,6 +18,7 @@
1918
import cn.bingoogolapple.bgabanner.BGABanner;
2019
import cn.bingoogolapple.refreshlayout.BGAMoocStyleRefreshViewHolder;
2120
import cn.bingoogolapple.refreshlayout.BGARefreshLayout;
21+
import cn.bingoogolapple.refreshlayout.demo.App;
2222
import cn.bingoogolapple.refreshlayout.demo.R;
2323
import cn.bingoogolapple.refreshlayout.demo.adapter.NormalRecyclerViewAdapter;
2424
import cn.bingoogolapple.refreshlayout.demo.model.BannerModel;
@@ -88,19 +88,18 @@ public void onFailure(Call<List<RefreshModel>> call, Throwable t) {
8888
}
8989

9090
private void initBanner() {
91-
final List<View> views = new ArrayList<>();
92-
for (int i = 0; i < 5; i++) {
93-
views.add(View.inflate(this, R.layout.view_image, null));
94-
}
95-
mBanner.setViews(views);
96-
mEngine.getBannerModel().enqueue(new Callback<BannerModel>() {
91+
mBanner.setAdapter(new BGABanner.Adapter() {
92+
@Override
93+
public void fillBannerItem(BGABanner banner, View view, Object model, int position) {
94+
Glide.with(banner.getContext()).load(model).placeholder(R.mipmap.holder).error(R.mipmap.holder).dontAnimate().thumbnail(0.1f).into((ImageView) view);
95+
}
96+
});
97+
98+
App.getInstance().getEngine().getBannerModel().enqueue(new Callback<BannerModel>() {
9799
@Override
98100
public void onResponse(Call<BannerModel> call, Response<BannerModel> response) {
99101
BannerModel bannerModel = response.body();
100-
for (int i = 0; i < views.size(); i++) {
101-
Glide.with(NormalRecyclerViewActivity.this).load(bannerModel.imgs.get(i)).placeholder(R.mipmap.holder).error(R.mipmap.holder).dontAnimate().thumbnail(0.1f).into((ImageView) views.get(i));
102-
}
103-
mBanner.setTips(bannerModel.tips);
102+
mBanner.setData(R.layout.view_image, bannerModel.imgs, bannerModel.tips);
104103
}
105104

106105
@Override

‎demo/src/main/java/cn/bingoogolapple/refreshlayout/demo/ui/activity/SwipeRecyclerViewActivity.java

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
import com.bumptech.glide.Glide;
1111

12-
import java.util.ArrayList;
1312
import java.util.List;
1413

1514
import cn.bingoogolapple.androidcommon.adapter.BGAOnItemChildClickListener;
@@ -19,6 +18,7 @@
1918
import cn.bingoogolapple.bgabanner.BGABanner;
2019
import cn.bingoogolapple.refreshlayout.BGANormalRefreshViewHolder;
2120
import cn.bingoogolapple.refreshlayout.BGARefreshLayout;
21+
import cn.bingoogolapple.refreshlayout.demo.App;
2222
import cn.bingoogolapple.refreshlayout.demo.R;
2323
import cn.bingoogolapple.refreshlayout.demo.adapter.SwipeRecyclerViewAdapter;
2424
import cn.bingoogolapple.refreshlayout.demo.model.BannerModel;
@@ -94,19 +94,18 @@ public void onFailure(Call<List<RefreshModel>> call, Throwable t) {
9494
}
9595

9696
private void initBanner() {
97-
final List<View> views = new ArrayList<>();
98-
for (int i = 0; i < 5; i++) {
99-
views.add(View.inflate(this, R.layout.view_image, null));
100-
}
101-
mBanner.setViews(views);
102-
mEngine.getBannerModel().enqueue(new Callback<BannerModel>() {
97+
mBanner.setAdapter(new BGABanner.Adapter() {
98+
@Override
99+
public void fillBannerItem(BGABanner banner, View view, Object model, int position) {
100+
Glide.with(banner.getContext()).load(model).placeholder(R.mipmap.holder).error(R.mipmap.holder).dontAnimate().thumbnail(0.1f).into((ImageView) view);
101+
}
102+
});
103+
104+
App.getInstance().getEngine().getBannerModel().enqueue(new Callback<BannerModel>() {
103105
@Override
104106
public void onResponse(Call<BannerModel> call, Response<BannerModel> response) {
105107
BannerModel bannerModel = response.body();
106-
for (int i = 0; i < views.size(); i++) {
107-
Glide.with(SwipeRecyclerViewActivity.this).load(bannerModel.imgs.get(i)).placeholder(R.mipmap.holder).error(R.mipmap.holder).dontAnimate().thumbnail(0.1f).into((ImageView) views.get(i));
108-
}
109-
mBanner.setTips(bannerModel.tips);
108+
mBanner.setData(R.layout.view_image, bannerModel.imgs, bannerModel.tips);
110109
}
111110

112111
@Override

‎demo/src/main/java/cn/bingoogolapple/refreshlayout/demo/ui/activity/ViewPagerActivity.java

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,11 @@
1010

1111
import com.bumptech.glide.Glide;
1212

13-
import java.util.ArrayList;
14-
import java.util.List;
15-
1613
import cn.bingoogolapple.bgabanner.BGABanner;
1714
import cn.bingoogolapple.bgaindicator.BGAFixedIndicator;
1815
import cn.bingoogolapple.refreshlayout.BGANormalRefreshViewHolder;
1916
import cn.bingoogolapple.refreshlayout.BGARefreshLayout;
17+
import cn.bingoogolapple.refreshlayout.demo.App;
2018
import cn.bingoogolapple.refreshlayout.demo.R;
2119
import cn.bingoogolapple.refreshlayout.demo.model.BannerModel;
2220
import cn.bingoogolapple.refreshlayout.demo.ui.fragment.StickyNavListViewFragment;
@@ -76,19 +74,18 @@ protected void processLogic(Bundle savedInstanceState) {
7674
}
7775

7876
private void initBanner() {
79-
final List<View> views = new ArrayList<>();
80-
for (int i = 0; i < 5; i++) {
81-
views.add(View.inflate(this, R.layout.view_image, null));
82-
}
83-
mBanner.setViews(views);
84-
mEngine.getBannerModel().enqueue(new Callback<BannerModel>() {
77+
mBanner.setAdapter(new BGABanner.Adapter() {
78+
@Override
79+
public void fillBannerItem(BGABanner banner, View view, Object model, int position) {
80+
Glide.with(banner.getContext()).load(model).placeholder(R.mipmap.holder).error(R.mipmap.holder).dontAnimate().thumbnail(0.1f).into((ImageView) view);
81+
}
82+
});
83+
84+
App.getInstance().getEngine().getBannerModel().enqueue(new Callback<BannerModel>() {
8585
@Override
8686
public void onResponse(Call<BannerModel> call, Response<BannerModel> response) {
8787
BannerModel bannerModel = response.body();
88-
for (int i = 0; i < views.size(); i++) {
89-
Glide.with(ViewPagerActivity.this).load(bannerModel.imgs.get(i)).placeholder(R.mipmap.holder).error(R.mipmap.holder).dontAnimate().thumbnail(0.1f).into((ImageView) views.get(i));
90-
}
91-
mBanner.setTips(bannerModel.tips);
88+
mBanner.setData(R.layout.view_image, bannerModel.imgs, bannerModel.tips);
9289
}
9390

9491
@Override

‎demo/src/main/res/layout/activity_recyclerview.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,8 @@
1818
android:id="@+id/banner"
1919
android:layout_width="match_parent"
2020
android:layout_height="100dp"
21-
app:banner_pointAutoPlayInterval="3000"
22-
app:banner_pointGravity="bottom|right"
23-
app:banner_pointTopBottomMargin="10dp"
21+
app:banner_indicatorGravity="bottom|right"
22+
app:banner_placeholderDrawable="@mipmap/holder"
2423
app:banner_tipTextSize="12sp"
2524
app:banner_transitionEffect="accordion" />
2625

‎demo/src/main/res/layout/activity_viewpager.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,8 @@
1111
android:id="@+id/banner"
1212
android:layout_width="match_parent"
1313
android:layout_height="100dp"
14-
app:banner_pointAutoPlayInterval="3000"
15-
app:banner_pointGravity="bottom|right"
16-
app:banner_pointTopBottomMargin="10dp"
14+
app:banner_indicatorGravity="bottom|right"
15+
app:banner_placeholderDrawable="@mipmap/holder"
1716
app:banner_tipTextSize="12sp"
1817
app:banner_transitionEffect="accordion" />
1918

‎demo/src/main/res/layout/view_custom_header.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,8 @@
99
android:id="@+id/banner"
1010
android:layout_width="match_parent"
1111
android:layout_height="100dp"
12-
app:banner_pointGravity="bottom|right"
13-
app:banner_pointTopBottomMargin="10dp"
12+
app:banner_indicatorGravity="bottom|right"
13+
app:banner_placeholderDrawable="@mipmap/holder"
1414
app:banner_tipTextSize="12sp"
15-
app:banner_pointAutoPlayInterval="3000"
1615
app:banner_transitionEffect="accordion" />
1716
</LinearLayout>

0 commit comments

Comments
 (0)