Merge remote-tracking branch 'origin/master'

common/src/main/java/com/yunbao/common/views/weight/LiveFloatView.java

@@ -105,9 +105,9 @@ public class LiveFloatView implements Function1<FloatCallbacks.Builder, Unit> {
                             @Override
                             public void onNetStatus(Bundle bundle) {
 
+
                             }
                         });
-
                         ViewClicksAntiShake.clicksAntiShake(magnetView.findViewById(R.id.btn_close), new ViewClicksAntiShake.ViewClicksCallBack() {
                             @Override
                             public void onViewClicks() {

config.gradle

@@ -4,11 +4,11 @@ ext {
             buildToolsVersion: "29.0.2",
             minSdkVersion    : 21,
             targetSdkVersion : 31,
-            versionCode      : 411,
+            versionCode      : 412,
             versionName      : "6.4.9"
     ]
     manifestPlaceholders = [
-            //正式
+            //正式、
             serverHost       : "https://napi.yaoulive.com",
             //测试
 //            serverHost       : "https://ceshi.yaoulive.com",
@@ -23,7 +23,7 @@ ext {
             baiduAppKey      : "zgCgFhUKEOV7I3ZXDFpTfnRB",
             baiduAppSecretKey: "nEVSgmuGpU0pjPr6VleEGGAl0hzGW52S",
 //            true表示谷歌支付 false
-            isGooglePlay     :  false,
+            isGooglePlay     :  true,
             //是否上报异常日志
             isUploadLog      :  true
     ]

live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java

@@ -4115,18 +4115,27 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
                 textGrade2.setText(String.valueOf(userScore));
                 userId2 = userId;
             } else if (i == 2) {
+                if (pkScores.size() == 3) {
                     linearGrade4.setVisibility(View.VISIBLE);
                     textPkName4.setText(userNiceName);
                     ImgLoader.display(mContext, resScore, imageGrade4);
                     textGrade4.setText(String.valueOf(userScore));
                     userId4 = userId;
-            } else if (i == 3) {
+                } else {
                     linearGrade3.setVisibility(View.VISIBLE);
                     textPkName3.setText(userNiceName);
                     ImgLoader.display(mContext, resScore, imageGrade3);
                     textGrade3.setText(String.valueOf(userScore));
                     userId3 = userId;
                 }
+
+            } else if (i == 3) {
+                linearGrade4.setVisibility(View.VISIBLE);
+                textPkName4.setText(userNiceName);
+                ImgLoader.display(mContext, resScore, imageGrade4);
+                textGrade4.setText(String.valueOf(userScore));
+                userId4 = userId;
+            }
         }
 
         if (time > 0) {