From 342b2e913992ab73fb59b13de38662fb0ef9098e Mon Sep 17 00:00:00 2001 From: 18401019693 Date: Fri, 10 Mar 2023 11:05:19 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A4=9A=E4=BA=BAPK=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/views/weight/LiveFloatView.java | 2 +- config.gradle | 6 +++--- .../yunbao/live/views/LiveRoomViewHolder.java | 21 +++++++++++++------ .../main/res/layout/view_live_pk_details.xml | 8 +++---- 4 files changed, 23 insertions(+), 14 deletions(-) diff --git a/common/src/main/java/com/yunbao/common/views/weight/LiveFloatView.java b/common/src/main/java/com/yunbao/common/views/weight/LiveFloatView.java index 251818e8e..0f9efc7de 100644 --- a/common/src/main/java/com/yunbao/common/views/weight/LiveFloatView.java +++ b/common/src/main/java/com/yunbao/common/views/weight/LiveFloatView.java @@ -105,9 +105,9 @@ public class LiveFloatView implements Function1 { @Override public void onNetStatus(Bundle bundle) { + } }); - ViewClicksAntiShake.clicksAntiShake(magnetView.findViewById(R.id.btn_close), new ViewClicksAntiShake.ViewClicksCallBack() { @Override public void onViewClicks() { diff --git a/config.gradle b/config.gradle index a61159b50..3053f8a94 100644 --- a/config.gradle +++ b/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 ] diff --git a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java index b60f80bc4..e3d0e9c8d 100644 --- a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java @@ -4115,17 +4115,26 @@ 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 { + 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; - } else if (i == 3) { - linearGrade3.setVisibility(View.VISIBLE); - textPkName3.setText(userNiceName); - ImgLoader.display(mContext, resScore, imageGrade3); - textGrade3.setText(String.valueOf(userScore)); - userId3 = userId; } } diff --git a/live/src/main/res/layout/view_live_pk_details.xml b/live/src/main/res/layout/view_live_pk_details.xml index 926203165..5b714f872 100644 --- a/live/src/main/res/layout/view_live_pk_details.xml +++ b/live/src/main/res/layout/view_live_pk_details.xml @@ -8,7 +8,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="vertical" - android:visibility="gone"> + android:visibility="visible"> + android:visibility="visible"> + android:visibility="visible"> + android:visibility="visible"> Date: Fri, 10 Mar 2023 11:06:08 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=A4=9A=E4=BA=BAPK=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- live/src/main/res/layout/view_live_pk_details.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/live/src/main/res/layout/view_live_pk_details.xml b/live/src/main/res/layout/view_live_pk_details.xml index 5b714f872..926203165 100644 --- a/live/src/main/res/layout/view_live_pk_details.xml +++ b/live/src/main/res/layout/view_live_pk_details.xml @@ -8,7 +8,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="vertical" - android:visibility="visible"> + android:visibility="gone"> + android:visibility="gone"> + android:visibility="gone"> + android:visibility="gone">