yutou/pdlivexp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev_6.5.3'

Browse Source
This commit is contained in:
18401019693 2023-06-05 14:09:42 +08:00
commit cd2e176f0a
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config.gradle
View File

@ -4,7 +4,7 @@ ext {
buildToolsVersion: "29.0.2", buildToolsVersion: "29.0.2",
minSdkVersion : 21, minSdkVersion : 21,
targetSdkVersion : 31, targetSdkVersion : 31,
versionCode : 422, versionCode : 423,
versionName : "6.5.2" versionName : "6.5.2"
] ]
manifestPlaceholders = [ manifestPlaceholders = [
@ -24,8 +24,8 @@ ext {
baiduAppKey : "zgCgFhUKEOV7I3ZXDFpTfnRB", baiduAppKey : "zgCgFhUKEOV7I3ZXDFpTfnRB",
baiduAppSecretKey: "nEVSgmuGpU0pjPr6VleEGGAl0hzGW52S", baiduAppSecretKey: "nEVSgmuGpU0pjPr6VleEGGAl0hzGW52S",
// true表示谷歌支付 false // true表示谷歌支付 false
isGooglePlay : true, isGooglePlay : false,
//是否上报异常日志 //是否上报异常日志
isUploadLog : true isUploadLog : false
] ]
} }

6
live/src/main/java/com/yunbao/live/dialog/LiveGiftDialogFragment.java
View File

@ -738,7 +738,7 @@ public class LiveGiftDialogFragment extends AbsDialogFragment implements View.On
mBtnSend.setBackground(mDrawable1); mBtnSend.setBackground(mDrawable1);
mBtnChooseCount.setEnabled(true); mBtnChooseCount.setEnabled(true);
} }
if (bean.getType() == 5) { if (bean.getType() == 7) {
showBlindProgress(bean.getBlind_box_type()); showBlindProgress(bean.getBlind_box_type());
} else { } else {
@ -790,6 +790,8 @@ 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); mVipGold.setVisibility(View.GONE);
blindBox.setVisibility(View.VISIBLE); blindBox.setVisibility(View.VISIBLE);
String boxBlindName = ""; String boxBlindName = "";
@ -1029,7 +1031,7 @@ 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){ if (mLiveGiftBean.getType()==7){
showLianBtn(); showLianBtn();
} }
//刷新包裹列表wrap_gift_num -1:表示数量没有变化 //刷新包裹列表wrap_gift_num -1:表示数量没有变化