GithubStar/Tangram-Android
1
0
Fork 0
mirror of https://github.com/alibaba/Tangram-Android.git synced 2026-10-29 06:46:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix default bgColor in Banner

Browse Source
This commit is contained in:
longerian
2018-01-30 16:07:57 +08:00
parent ba1ef700c1
commit 8020ef3265
3 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tangram/src/main/java/com/tmall/wireless/tangram/structure/card/BannerCard.java
+2 -1
View File
@@ -143,8 +143,9 @@ public class BannerCard extends Card {
@Override
public void parseStyle(@Nullable JSONObject data) {
super.parseStyle(data);
if (data == null)
if (data == null) {
return;
}
cell.setIndicatorRadius(Style.dp2px(data.optDouble(ATTR_INDICATOR_RADIUS)));
cell.setIndicatorColor(Style.parseColor(data.optString(ATTR_INDICATOR_COLOR, "#00000000")));
cell.setIndicatorDefaultColor(Style.parseColor(data.optString(ATTR_INDICATOR_DEFAULT_INDICATOR_COLOR, "#00000000")));
tangram/src/main/java/com/tmall/wireless/tangram/structure/entitycard/BannerEntityCard.java
+3 -6
View File
@@ -183,8 +183,9 @@ public class BannerEntityCard extends BannerCell {
resolver.parseCell(resolver, cell, data);
//noinspection unchecked
if (appended && !addCellInternal(resolver, cell, false)) {
if (TangramBuilder.isPrintLog())
if (TangramBuilder.isPrintLog()) {
LogUtils.w("BannerCell", "Parse invalid cell with data: " + data.toString());
}
}
}
@@ -219,11 +220,7 @@ public class BannerEntityCard extends BannerCell {
style = new Style();
style.parseWith(data);
setRatio(style.aspectRatio);
if (style.bgColor == 0) {
setBgColor(Color.WHITE);
} else {
setBgColor(style.bgColor);
}
setBgColor(style.bgColor);
margin = style.margin;
if (margin != null) {
for (int i = 0; i < margin.length; i++) {
tangram/src/main/java/com/tmall/wireless/tangram/view/BannerView.java
+18 -7
View File
@@ -151,6 +151,8 @@ public class BannerView extends RelativeLayout implements ViewPager.OnPageChange
mIndicator.setGravity(Gravity.RIGHT);
}
break;
default:
break;
}
}
@@ -180,8 +182,9 @@ public class BannerView extends RelativeLayout implements ViewPager.OnPageChange
}
public void setIndicatorMargin(int indicatorMargin) {
if (indicatorMargin > 0)
if (indicatorMargin > 0) {
this.mIndicatorMargin = indicatorMargin;
}
}
public void setIndicatorHeight(int indicatorHeight) {
@@ -259,8 +262,9 @@ public class BannerView extends RelativeLayout implements ViewPager.OnPageChange
public void postBindView(BaseCell cell) {
BannerCell bannerCell = (BannerCell) cell;
bannerCell.initAdapter();
if (cell.style != null)
if (cell.style != null) {
setPadding(cell.style.padding[3], cell.style.padding[0], cell.style.padding[1], cell.style.padding[2]);
}
setBackgroundColor(bannerCell.mBgColor);
setAdapter(bannerCell.mBannerAdapter);
getUltraViewPager().setAutoMeasureHeight(true);
@@ -317,10 +321,12 @@ public class BannerView extends RelativeLayout implements ViewPager.OnPageChange
}
private int getIndicatorGravity(String gravity) {
if ("left".equals(gravity))
if ("left".equals(gravity)) {
return BannerView.GRAVITY_LEFT;
if ("right".equals(gravity))
}
if ("right".equals(gravity)) {
return BannerView.GRAVITY_RIGHT;
}
return BannerView.GRAVITY_CENTER;
}
@@ -343,8 +349,9 @@ public class BannerView extends RelativeLayout implements ViewPager.OnPageChange
}
public void updateIndicators(String focusUrl, String norUrl, int radius, int focusColor, int norColor) {
if (mUltraViewPager.getAdapter() == null)
if (mUltraViewPager.getAdapter() == null) {
return;
}
this.focusUrl = focusUrl;
this.norUrl = norUrl;
@@ -421,10 +428,12 @@ public class BannerView extends RelativeLayout implements ViewPager.OnPageChange
LinearLayout.LayoutParams layoutParams = (LayoutParams) mImageViews[i].getLayoutParams();
if (style == STYLE_IMG || style == STYLE_DOT) {
layoutParams.setMargins(0, mIndicatorMargin, mIndicatorGap, mIndicatorMargin);
if (width > 0)
if (width > 0) {
layoutParams.width = width;
if (height > 0)
}
if (height > 0) {
layoutParams.height = height;
}
} else {
layoutParams.setMargins(0, 0, 0, 0);
}
@@ -515,6 +524,8 @@ public class BannerView extends RelativeLayout implements ViewPager.OnPageChange
case MotionEvent.ACTION_UP:
direction = 0;
break;
default:
break;
}
return false;