diff --git a/common/build.gradle b/common/build.gradle index 664aa81d8..bc2719d4f 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -229,7 +229,7 @@ dependencies { //文字渐变色 api 'com.github.FlyJingFish:GradientTextView:1.2.4' //轮播 一屏显示多个 - api 'com.github.xiaohaibin:XBanner:androidx_v1.2.6' + api 'com.github.xiaohaibin:XBanner:androidx_v1.2.8' //声网SDK //api 'io.agora.rtc:agora-special-full:4.2.6.245' diff --git a/common/src/main/java/com/yunbao/common/dialog/GiftWallGiftInfoDialog.java b/common/src/main/java/com/yunbao/common/dialog/GiftWallGiftInfoDialog.java index b5966247b..b81e24e52 100644 --- a/common/src/main/java/com/yunbao/common/dialog/GiftWallGiftInfoDialog.java +++ b/common/src/main/java/com/yunbao/common/dialog/GiftWallGiftInfoDialog.java @@ -336,7 +336,7 @@ public class GiftWallGiftInfoDialog extends AbsDialogPopupWindow { String tmp = ""; if (giftBean.getGift_info().getIlluminate_status() == 0) {//未點亮 - btn_one.setText(WordUtil.getNewString(R.string.dialog_gift_wall_gfit_info_list_bottom_btn_one_light)); + btn_one.setText(R.string.dialog_gift_wall_gfit_info_list_bottom_btn_one_light); tmp = String.format(Locale.getDefault(), "%s", (giftBean.getGift_info().getIlluminate_num() - Integer.parseInt(giftBean.getGift_info().getGift_hall_send_num()))); setTips(tmp); } else {//冠名/摘星 diff --git a/common/src/main/res/layout/dialog_gift_wall_gift_info.xml b/common/src/main/res/layout/dialog_gift_wall_gift_info.xml index 3b17a135c..05e1dd297 100644 --- a/common/src/main/res/layout/dialog_gift_wall_gift_info.xml +++ b/common/src/main/res/layout/dialog_gift_wall_gift_info.xml @@ -222,7 +222,6 @@ android:layout_marginEnd="50dp" android:background="@drawable/gift_wall_gift_info_list_btn_down" android:gravity="center" - android:minWidth="70dp" android:text="@string/dialog_gift_wall_gfit_info_list_title_assistance" android:textAllCaps="false" android:textColor="#FFF" @@ -230,7 +229,7 @@