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

多人PK问题修复

Browse Source
This commit is contained in:
18401019693 2023-03-10 11:05:19 +08:00
parent 0726c5dc1c
commit 342b2e9139
4 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/src/main/java/com/yunbao/common/views/weight/LiveFloatView.java
View File

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

6
config.gradle
View File

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

21
live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
View File

@ -4115,17 +4115,26 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
textGrade2.setText(String.valueOf(userScore)); textGrade2.setText(String.valueOf(userScore));
userId2 = userId; userId2 = userId;
} else if (i == 2) { } 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 {
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); linearGrade4.setVisibility(View.VISIBLE);
textPkName4.setText(userNiceName); textPkName4.setText(userNiceName);
ImgLoader.display(mContext, resScore, imageGrade4); ImgLoader.display(mContext, resScore, imageGrade4);
textGrade4.setText(String.valueOf(userScore)); textGrade4.setText(String.valueOf(userScore));
userId4 = userId; userId4 = userId;
} else if (i == 3) {
linearGrade3.setVisibility(View.VISIBLE);
textPkName3.setText(userNiceName);
ImgLoader.display(mContext, resScore, imageGrade3);
textGrade3.setText(String.valueOf(userScore));
userId3 = userId;
} }
} }

8
live/src/main/res/layout/view_live_pk_details.xml
View File

@ -8,7 +8,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:visibility="gone"> android:visibility="visible">
<LinearLayout <LinearLayout
android:id="@+id/linear_grade1" android:id="@+id/linear_grade1"
@ -65,7 +65,7 @@
android:layout_gravity="end" android:layout_gravity="end"
android:gravity="end" android:gravity="end"
android:orientation="vertical" android:orientation="vertical"
android:visibility="gone"> android:visibility="visible">
<LinearLayout <LinearLayout
android:id="@+id/linear_grade2" android:id="@+id/linear_grade2"
@ -121,7 +121,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="bottom" android:layout_gravity="bottom"
android:orientation="vertical" android:orientation="vertical"
android:visibility="gone"> android:visibility="visible">
<TextView <TextView
android:id="@+id/text_pk_name3" android:id="@+id/text_pk_name3"
@ -178,7 +178,7 @@
android:layout_gravity="bottom|end" android:layout_gravity="bottom|end"
android:gravity="end" android:gravity="end"
android:orientation="vertical" android:orientation="vertical"
android:visibility="gone"> android:visibility="visible">
<TextView <TextView
android:id="@+id/text_pk_name4" android:id="@+id/text_pk_name4"