Merge remote-tracking branch 'origin/master'

This commit is contained in:
18142669586 2023-06-02 10:27:48 +08:00
commit a7a9a28c09

View File

@ -790,9 +790,7 @@ public class LiveGiftDialogFragment extends AbsDialogFragment implements View.On
} catch (MalformedURLException e) { } catch (MalformedURLException e) {
e.printStackTrace(); e.printStackTrace();
} }
mArrow.setVisibility(View.GONE);
mBtnChooseCount.setEnabled(false);
mVipGold.setVisibility(View.GONE);
blindBox.setVisibility(View.VISIBLE); blindBox.setVisibility(View.VISIBLE);
String boxBlindName = ""; String boxBlindName = "";
switch (blindBoxType) { switch (blindBoxType) {
@ -1027,6 +1025,9 @@ public class LiveGiftDialogFragment extends AbsDialogFragment implements View.On
if (mLiveGiftBean.getType() == LiveGiftBean2.TYPE_NORMAL && !mLiveGiftBean.getSwf().contains("svga")) { if (mLiveGiftBean.getType() == LiveGiftBean2.TYPE_NORMAL && !mLiveGiftBean.getSwf().contains("svga")) {
showLianBtn(); showLianBtn();
} }
if (mLiveGiftBean.getType()==5){
showLianBtn();
}
//刷新包裹列表wrap_gift_num -1:表示数量没有变化 //刷新包裹列表wrap_gift_num -1:表示数量没有变化
mObjGiftSendback = obj; mObjGiftSendback = obj;
isGetNewWrap = true; isGetNewWrap = true;