Merge branch 'dev_6.5.3'

config.gradle

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

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 {
@@ -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 = "";
@@ -1029,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:表示数量没有变化