From cf749d85c6a2b855c12ce4f7503fb1e3e4aca410 Mon Sep 17 00:00:00 2001 From: 18401019693 Date: Fri, 12 Jan 2024 15:16:40 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=AD=E9=9F=B3=E6=88=BFbug=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/bean/CheckRemainingBalance.java | 9 +++++++++ .../src/main/res/layout/activity_sud_game.xml | 19 ++++++++++++------ .../main/res/layout/dialog_sud_game_input.xml | 7 ++++--- .../icon_game_hang_up_en.png} | Bin .../icon_game_seat_en.png} | Bin common/src/main/res/values-en-rUS/string.xml | 4 ++-- common/src/main/res/values/strings.xml | 2 +- .../yunbao/live/activity/SudGameActivity.java | 10 ++++++--- 8 files changed, 36 insertions(+), 15 deletions(-) rename common/src/main/res/{mipmap-b+en+us/icon_game_hang_up.png => mipmap-xxhdpi/icon_game_hang_up_en.png} (100%) rename common/src/main/res/{mipmap-b+en+us/icon_game_seat.png => mipmap-xxhdpi/icon_game_seat_en.png} (100%) diff --git a/common/src/main/java/com/yunbao/common/bean/CheckRemainingBalance.java b/common/src/main/java/com/yunbao/common/bean/CheckRemainingBalance.java index 611c289ef..49d49043a 100644 --- a/common/src/main/java/com/yunbao/common/bean/CheckRemainingBalance.java +++ b/common/src/main/java/com/yunbao/common/bean/CheckRemainingBalance.java @@ -36,4 +36,13 @@ public class CheckRemainingBalance extends BaseModel { public void setGoldenBeanRemainingBalance(int goldenBeanRemainingBalance) { this.goldenBeanRemainingBalance = goldenBeanRemainingBalance; } + + @Override + public String toString() { + return "CheckRemainingBalance{" + + "goldenBeanRemainingBalance=" + goldenBeanRemainingBalance + + ", status=" + status + + ", deductMoneyKey='" + deductMoneyKey + '\'' + + '}'; + } } diff --git a/common/src/main/res/layout/activity_sud_game.xml b/common/src/main/res/layout/activity_sud_game.xml index ddf4fbc31..e358ac494 100644 --- a/common/src/main/res/layout/activity_sud_game.xml +++ b/common/src/main/res/layout/activity_sud_game.xml @@ -21,7 +21,7 @@ android:layout_width="150dp" android:layout_height="50dp" android:layout_marginStart="23dp" - android:layout_marginTop="45dp" + android:layout_marginTop="25dp" android:background="@drawable/bg_live_sud_game_top_new" android:gravity="center"> @@ -72,7 +72,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="end" - android:layout_marginTop="49dp" + android:layout_marginTop="29dp" android:layout_marginEnd="20dp" android:gravity="center_vertical"> @@ -146,10 +146,17 @@ android:layout_gravity="bottom" android:layout_marginBottom="75dp" /> - + android:layout_marginTop="80dp" + android:gravity="center"> + + + + + \ No newline at end of file diff --git a/common/src/main/res/layout/dialog_sud_game_input.xml b/common/src/main/res/layout/dialog_sud_game_input.xml index 32515abd5..68236956b 100644 --- a/common/src/main/res/layout/dialog_sud_game_input.xml +++ b/common/src/main/res/layout/dialog_sud_game_input.xml @@ -6,13 +6,14 @@ ReceiveAwards One free gift privilege! - Send out + Send I am sorry video myname.pdlive.shayu.fileprovider @@ -1427,7 +1427,7 @@ Limited ride And limited avatar frame Successfully opened You have purchased the BattlePass Comment - See Information + Information Unmute Mute diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml index a1ea01a49..9062827a9 100644 --- a/common/src/main/res/values/strings.xml +++ b/common/src/main/res/values/strings.xml @@ -1429,7 +1429,7 @@ Limited ride And limited avatar frame Successfully opened You have purchased the BattlePass Comment - See Information + Information Unmute Mute diff --git a/live/src/main/java/com/yunbao/live/activity/SudGameActivity.java b/live/src/main/java/com/yunbao/live/activity/SudGameActivity.java index 5ffbe0506..6e2189d71 100644 --- a/live/src/main/java/com/yunbao/live/activity/SudGameActivity.java +++ b/live/src/main/java/com/yunbao/live/activity/SudGameActivity.java @@ -196,6 +196,7 @@ public class SudGameActivity extends AbsActivity implements GameMicManager.Meeti mLiveChatAdapter = new SudGameChatAdapter(mContext); chatList.setAdapter(mLiveChatAdapter); sudGameUserListAdapter = new SudGameUserListAdapter(new ArrayList<>()); + ImgLoader.display(mContext, WordUtil.isNewZh() ? R.mipmap.icon_game_seat : R.mipmap.icon_game_seat_en, gameSeat); sudGameUserListAdapter.setSudGameSmallCallBack(new SudGameUserListAdapter.SudGameSmallCallBack() { @Override public void unMute(String userID, int position) { @@ -405,7 +406,7 @@ public class SudGameActivity extends AbsActivity implements GameMicManager.Meeti LiveNetManager.get(mContext).checkRemainingBalance(mCreateSudRoomModel.getSudGameRoomId(), new HttpCallback() { @Override public void onSuccess(CheckRemainingBalance data) { - if (data.getGoldenBeanRemainingBalance() == 1) { + if (TextUtils.equals(String.valueOf(data.getGoldenBeanRemainingBalance() ),"1")) { gameViewModel.sudFSTAPPDecorator.notifyAPPCommonSelfIn(true, event.getSeatIndex(), true, 1); } else { if (IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) { @@ -415,6 +416,8 @@ public class SudGameActivity extends AbsActivity implements GameMicManager.Meeti } } +// ToastUtil.show(data.toString()); + } @Override @@ -424,6 +427,7 @@ public class SudGameActivity extends AbsActivity implements GameMicManager.Meeti } else { ToastUtil.show("Shortage of money"); } + } }); break; @@ -485,7 +489,7 @@ public class SudGameActivity extends AbsActivity implements GameMicManager.Meeti runOnUiThread(new Runnable() { @Override public void run() { - ImgLoader.display(mContext, R.mipmap.icon_game_hang_up, gameSeat); + ImgLoader.display(mContext, WordUtil.isNewZh() ? R.mipmap.icon_game_hang_up : R.mipmap.icon_game_hang_up_en, gameSeat); publishDefault = true; gameCloseWheat.setVisibility(View.VISIBLE); disable = false; @@ -570,7 +574,7 @@ public class SudGameActivity extends AbsActivity implements GameMicManager.Meeti runOnUiThread(new Runnable() { @Override public void run() { - ImgLoader.display(mContext, R.mipmap.icon_game_seat, gameSeat); + ImgLoader.display(mContext, WordUtil.isNewZh() ? R.mipmap.icon_game_seat : R.mipmap.icon_game_seat_en, gameSeat); publishDefault = false; gameCloseWheat.setVisibility(View.INVISIBLE); }