moliparty/peko-android
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'v2.1.1/fix' into v2.2.0/test_old_fix

Browse Source
This commit is contained in:
Max
2023-11-01 18:34:23 +08:00
parent d2f24c4457 5c7d2e9645
commit bdcfb21e6e
1 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
app/src/main/java/com/yizhuan/erban/avroom/widget/GiftV2View.java
View File

@@ -296,16 +296,24 @@ public class GiftV2View extends FrameLayout implements GiftEffectView.GiftEffect
if (roomInfo != null) { if (roomInfo != null) {
List<GiftReceiver> targetUsers = new ArrayList<>(); List<GiftReceiver> targetUsers = new ArrayList<>();
int totalCoin = 0; int totalCoin = 0;
drawLuckyGiftAnimation(roomInfo, giftReceiveInfos, totalCoin, targetUsers, giftReceiveType, isShowAnimation, pos); boolean isPlaySvga = false;
// if (AvRoomDataManager.get().mIsNeedGiftEffect && if (AvRoomDataManager.get().mIsNeedGiftEffect &&
// !AvRoomDataManager.get().isSelfGamePlaying()) { !AvRoomDataManager.get().isSelfGamePlaying()) {
// SVGAImageView imageView = playLuckyBagAnim(svgaUrl); if (svgaUrl != null && !svgaUrl.isEmpty()) {
// handler.postDelayed(() -> { isPlaySvga = true;
// removeView(imageView); SVGAImageView imageView = playLuckyBagAnim(svgaUrl);
// imageView.stopAnimation(true); handler.postDelayed(() -> {
// }, 1800); removeView(imageView);
// } imageView.stopAnimation(true);
// handler.postDelayed(() -> drawLuckyGiftAnimation(roomInfo, giftReceiveInfos, totalCoin, targetUsers, giftReceiveType, isShowAnimation, pos), 1200); }, 1800);
}
}
if (isPlaySvga) {
handler.postDelayed(() -> drawLuckyGiftAnimation(roomInfo, giftReceiveInfos, totalCoin, targetUsers, giftReceiveType, isShowAnimation, pos), 1200);
} else {
drawLuckyGiftAnimation(roomInfo, giftReceiveInfos, totalCoin, targetUsers, giftReceiveType, isShowAnimation, pos);
}
} }
} }
@@ -353,7 +361,7 @@ public class GiftV2View extends FrameLayout implements GiftEffectView.GiftEffect
targetUsers.add(giftReceiver); targetUsers.add(giftReceiver);
if (!isShowAnimation) return; if (!isShowAnimation) return;
giftInfo = giftReceiveInfo.getDisplayGift().get(pos); giftInfo = giftReceiveInfo.getDisplayGift().get(pos);
if (totalCoin >= 520 || (giftInfo != null && giftInfo.isHasEffect())) { if (giftInfo != null && giftInfo.isHasEffect()) {
Message msg = Message.obtain(); Message msg = Message.obtain();
msg.what = 0; msg.what = 0;
GiftEffectInfo giftEffectInfo = new GiftEffectInfo(); GiftEffectInfo giftEffectInfo = new GiftEffectInfo();