diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/GiftDialog.java b/app/src/main/java/com/yizhuan/erban/ui/widget/GiftDialog.java index 1cbfd338a..fde158c6f 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/GiftDialog.java +++ b/app/src/main/java/com/yizhuan/erban/ui/widget/GiftDialog.java @@ -350,6 +350,8 @@ public class GiftDialog extends BottomSheetDialog implements View.OnClickListene params.height = WindowManager.LayoutParams.MATCH_PARENT; getWindow().setAttributes(params); mSubscribe = IMNetEaseManager.get().getChatRoomEventObservable().subscribe(this::onReceiveRoomEvent); + // 刷新礼物列表,获取房间专属礼物列表 + GiftModel.get().refreshGiftList(String.valueOf(AvRoomDataManager.get().getRoomUid())).subscribe(); } @Override @@ -666,6 +668,7 @@ public class GiftDialog extends BottomSheetDialog implements View.OnClickListene showEmptyView(); } else if (position == GiftIndicator.TYPE_LUCKY || position == GiftIndicator.TYPE_WEEK) { showEmptyView(); + updateWeekStarDesc(); } else { showLoadFailedView(); } @@ -675,9 +678,6 @@ public class GiftDialog extends BottomSheetDialog implements View.OnClickListene if (current.isSendMsg()) { etSendMessage.setVisibility(View.VISIBLE); } - if (!TextUtils.isEmpty(current.getGiftExplainUrl())) { - tvLuckyBagIntro.setVisibility(View.VISIBLE); - } pagerList = beanTransformVm(context, currentGiftInfoList, isKnap, position == GiftIndicator.TYPE_WEEK ? 4 : 8); setGridViewData(pagerList); if (isKnap) { @@ -688,9 +688,19 @@ public class GiftDialog extends BottomSheetDialog implements View.OnClickListene updateNumber(1); } } + updateLuckyBagIntro(); updateWeekStarDesc(); } + private void updateLuckyBagIntro() { + if (current == null || + (TextUtils.isEmpty(current.getGiftExplainUrl()) && current.getGiftType() != GiftType.GIFT_TYPE_LUCKY)) { + tvLuckyBagIntro.setVisibility(View.GONE); + } else { + tvLuckyBagIntro.setVisibility(View.VISIBLE); + } + } + private void updateWeekStarDesc() { if (giftIndicator.getCurrrentType() == GiftIndicator.TYPE_WEEK) { llWeekIn.setVisibility(View.VISIBLE); @@ -778,6 +788,7 @@ public class GiftDialog extends BottomSheetDialog implements View.OnClickListene btnSendMagic.setVisibility(View.GONE); ivOpenNoble.setVisibility(View.GONE); llWeekIn.setVisibility(View.GONE); + llStarWeek.setVisibility(View.GONE); gridView.setVisibility(View.VISIBLE); indicatorView.setVisibility(View.VISIBLE); @@ -842,7 +853,6 @@ public class GiftDialog extends BottomSheetDialog implements View.OnClickListene ((GiftInfoVm) LastSelectedItem).isSelect.set(false); } } - tvLuckyBagIntro.setVisibility(TextUtils.isEmpty(giftInfoVm.data.getGiftExplainUrl()) ? View.GONE : View.VISIBLE); giftInfoVm.isSelect.set(true); LastSelectedItem = item; current = giftInfoVm.data; @@ -858,6 +868,7 @@ public class GiftDialog extends BottomSheetDialog implements View.OnClickListene currentMagicInfo = magicInfoVm.data; } setGoldOrRadishText(LastSelectedItem); + updateLuckyBagIntro(); updateWeekStarDesc(); }); container.addView(recyclerView); @@ -1233,7 +1244,11 @@ public class GiftDialog extends BottomSheetDialog implements View.OnClickListene break; case R.id.tv_lucky_bag_intro: - DialogWebViewActivity.start(context, current.getGiftExplainUrl(), true); + if (current.getGiftType() == GiftType.GIFT_TYPE_LUCKY) { + DialogWebViewActivity.start(context, UriProvider.getLuckyGiftRule(current.getGiftId()), true); + } else { + DialogWebViewActivity.start(context, current.getGiftExplainUrl(), true); + } break; case R.id.tv_reload: @@ -1454,11 +1469,6 @@ public class GiftDialog extends BottomSheetDialog implements View.OnClickListene updateTotalPrice(); } - @Subscribe(threadMode = ThreadMode.MAIN) - public void onFirstRechargeEvent(FirstRechargeEvent event) { - //updateFirstRechargeStatus(); - } - private void onGiftOutOfDate(String message) { ((BaseActivity) getContext()).toast(message); } diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/UriProvider.java b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/UriProvider.java index 568c8f319..3547c1174 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/UriProvider.java +++ b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/UriProvider.java @@ -472,5 +472,10 @@ public class UriProvider { return JAVA_WEB_URL.concat("/yinyou/modules/weekStar/newWeekStar.html"); } - + /** + * 幸运礼物说明 + */ + public static String getLuckyGiftRule(int giftID) { + return JAVA_WEB_URL.concat("/yinyou/modules/rule/luckyGiftRule.html?giftID=" + giftID); + } }