yinmeng/yinmeng-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat：调整装扮礼物banner字段

Browse Source
This commit is contained in:
Max
2024-01-30 11:03:53 +08:00
parent 950ce098dc
commit a8f12371a7
3 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/com/nnbc123/app/ui/utils/ImageLoadUtils.java
View File

@@ -427,6 +427,14 @@ public class ImageLoadUtils {
GlideApp.with(context.getApplicationContext()).load(url).dontAnimate().into(imageView);
}
public static void loadImage(ImageView imageView, String url, int cornerRadius) {
if (imageView == null) {
return;
}
GlideApp.with(imageView.getContext()).load(url).dontAnimate()
.transform(new CenterCrop(), new RoundedCorners(cornerRadius)).into(imageView);
}
public static void loadImage1(Context context, String url, ImageView imageView) {
GlideApp.with(context).load(url).optionalFitCenter().into(new SimpleTarget<Drawable>() {
@Override

4
app/src/main/java/com/nnbc123/app/ui/widget/GiftDialog.java
View File

@@ -931,13 +931,13 @@ public class GiftDialog extends BottomSheetDialog implements View.OnClickListene
dressUpBannerView.setVisibility(View.GONE);
return;
}
String banner = currentGiftInfo.getBanner();
String banner = currentGiftInfo.getBannerUrl();
if (banner == null || banner.length() == 0) {
dressUpBannerView.setVisibility(View.GONE);
return;
}
dressUpBannerView.setVisibility(View.VISIBLE);
ImageLoadUtilsV2.loadImage(dressUpBannerView, banner, R.drawable.default_banner, 8);
ImageLoadUtils.loadImage(dressUpBannerView, banner, UIUtil.dip2px(context, 8));
}
private void updateLuckyBagIntro() {

28
core/src/main/java/com/nnbc123/core/gift/bean/GiftInfo.java
View File

@@ -78,9 +78,17 @@ public class GiftInfo implements Serializable {
private GiftInfo baseGift;
private List<UnLockGiftInfo> unlockGiftList;
private String giftTag;
private String banner;
private String bannerUrl;
private String bannerSkipUrl;
public String getBannerUrl() {
return bannerUrl;
}
public void setBannerUrl(String bannerUrl) {
this.bannerUrl = bannerUrl;
}
public GiftInfo getBaseGift() {
return baseGift;
}
@@ -137,14 +145,6 @@ public class GiftInfo implements Serializable {
}
}
public String getBanner() {
return banner;
}
public void setBanner(String banner) {
this.banner = banner;
}
public String getBannerSkipUrl() {
return bannerSkipUrl;
}
@@ -588,9 +588,9 @@ public class GiftInfo implements Serializable {
final Object this$giftTag = this.getGiftTag();
final Object other$giftTag = other.getGiftTag();
if (this$giftTag == null ? other$giftTag != null : !this$giftTag.equals(other$giftTag)) return false;
final Object this$banner = this.getBanner();
final Object other$banner = other.getBanner();
if (this$banner == null ? other$banner != null : !this$banner.equals(other$banner)) return false;
final Object this$bannerUrl = this.getBannerUrl();
final Object other$bannerUrl = other.getBannerUrl();
if (this$bannerUrl == null ? other$bannerUrl != null : !this$bannerUrl.equals(other$bannerUrl)) return false;
final Object this$bannerSkipUrl = this.getBannerSkipUrl();
final Object other$bannerSkipUrl = other.getBannerSkipUrl();
if (this$bannerSkipUrl == null ? other$bannerSkipUrl != null : !this$bannerSkipUrl.equals(other$bannerSkipUrl)) return false;
@@ -657,8 +657,8 @@ public class GiftInfo implements Serializable {
result = result * PRIME + ($unlockGiftList == null ? 43 : $unlockGiftList.hashCode());
final Object $giftTag = this.getGiftTag();
result = result * PRIME + ($giftTag == null ? 43 : $giftTag.hashCode());
final Object $banner = this.getBanner();
result = result * PRIME + ($banner == null ? 43 : $banner.hashCode());
final Object $bannerUrl = this.getBannerUrl();
result = result * PRIME + ($bannerUrl == null ? 43 : $bannerUrl.hashCode());
final Object $bannerSkipUrl = this.getBannerSkipUrl();
result = result * PRIME + ($bannerSkipUrl == null ? 43 : $bannerSkipUrl.hashCode());
return result;