From fa24d226eec25c37a6a9630f170f5935a9ffe55b Mon Sep 17 00:00:00 2001 From: 18401019693 Date: Sat, 3 Jun 2023 18:30:08 +0800 Subject: [PATCH 1/2] 6.5.2 --- config.gradle | 4 ++-- .../java/com/yunbao/live/dialog/LiveGiftDialogFragment.java | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/config.gradle b/config.gradle index f879a2f28..899256634 100644 --- a/config.gradle +++ b/config.gradle @@ -9,9 +9,9 @@ ext { ] manifestPlaceholders = [ //正式、 - serverHost : "https://napi.yaoulive.com", +// serverHost : "https://napi.yaoulive.com", // 测试 -// serverHost : "https://ceshi.yaoulive.com", + serverHost : "https://ceshi.yaoulive.com", //腾讯地图 txMapAppKey : "EOZBZ-ASLCU-4XPV3-BDCHZ-4E3Q7-H4BWB", diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveGiftDialogFragment.java b/live/src/main/java/com/yunbao/live/dialog/LiveGiftDialogFragment.java index b11871392..6843ac2b0 100644 --- a/live/src/main/java/com/yunbao/live/dialog/LiveGiftDialogFragment.java +++ b/live/src/main/java/com/yunbao/live/dialog/LiveGiftDialogFragment.java @@ -790,6 +790,8 @@ public class LiveGiftDialogFragment extends AbsDialogFragment implements View.On } catch (MalformedURLException e) { e.printStackTrace(); } + mArrow.setVisibility(View.GONE); + mBtnChooseCount.setEnabled(false); mVipGold.setVisibility(View.GONE); blindBox.setVisibility(View.VISIBLE); String boxBlindName = ""; From 06357088c122b4958950f847b1332c8ae38122e2 Mon Sep 17 00:00:00 2001 From: 18401019693 Date: Mon, 5 Jun 2023 10:36:27 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A4=BC=E7=89=A9?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config.gradle | 10 +++++----- .../com/yunbao/live/dialog/LiveGiftDialogFragment.java | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/config.gradle b/config.gradle index 899256634..62d6c7e7c 100644 --- a/config.gradle +++ b/config.gradle @@ -4,14 +4,14 @@ ext { buildToolsVersion: "29.0.2", minSdkVersion : 21, targetSdkVersion : 31, - versionCode : 422, + versionCode : 423, versionName : "6.5.2" ] manifestPlaceholders = [ //正式、 -// serverHost : "https://napi.yaoulive.com", + serverHost : "https://napi.yaoulive.com", // 测试 - serverHost : "https://ceshi.yaoulive.com", +// serverHost : "https://ceshi.yaoulive.com", //腾讯地图 txMapAppKey : "EOZBZ-ASLCU-4XPV3-BDCHZ-4E3Q7-H4BWB", @@ -24,8 +24,8 @@ ext { baiduAppKey : "zgCgFhUKEOV7I3ZXDFpTfnRB", baiduAppSecretKey: "nEVSgmuGpU0pjPr6VleEGGAl0hzGW52S", // true表示谷歌支付 false - isGooglePlay : true, + isGooglePlay : false, //是否上报异常日志 - isUploadLog : true + isUploadLog : false ] } \ No newline at end of file diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveGiftDialogFragment.java b/live/src/main/java/com/yunbao/live/dialog/LiveGiftDialogFragment.java index 6843ac2b0..72e2b8901 100644 --- a/live/src/main/java/com/yunbao/live/dialog/LiveGiftDialogFragment.java +++ b/live/src/main/java/com/yunbao/live/dialog/LiveGiftDialogFragment.java @@ -738,7 +738,7 @@ public class LiveGiftDialogFragment extends AbsDialogFragment implements View.On mBtnSend.setBackground(mDrawable1); mBtnChooseCount.setEnabled(true); } - if (bean.getType() == 5) { + if (bean.getType() == 7) { showBlindProgress(bean.getBlind_box_type()); } else { @@ -1031,7 +1031,7 @@ public class LiveGiftDialogFragment extends AbsDialogFragment implements View.On if (mLiveGiftBean.getType() == LiveGiftBean2.TYPE_NORMAL && !mLiveGiftBean.getSwf().contains("svga")) { showLianBtn(); } - if (mLiveGiftBean.getType()==5){ + if (mLiveGiftBean.getType()==7){ showLianBtn(); } //刷新包裹列表wrap_gift_num -1:表示数量没有变化