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

语音房bug修改

Browse Source
This commit is contained in:
18401019693 2024-01-12 15:16:40 +08:00
parent 5ca13b770c
commit cf749d85c6
8 changed files with 36 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
common/src/main/java/com/yunbao/common/bean/CheckRemainingBalance.java
View File

@ -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 + '\'' +
'}';
}
}

19
common/src/main/res/layout/activity_sud_game.xml
View File

@ -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" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/user_list"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_marginTop="100dp"
android:layout_marginBottom="75dp" />
android:layout_marginTop="80dp"
android:gravity="center">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/user_list"
android:layout_width="wrap_content"
android:layout_height="50dp" />
</LinearLayout>
</FrameLayout>

7
common/src/main/res/layout/dialog_sud_game_input.xml
View File

@ -6,13 +6,14 @@
<EditText
android:id="@+id/text_message"
android:layout_width="260dp"
android:layout_width="match_parent"
android:layout_marginEnd="100dp"
android:layout_height="38dp"
android:layout_marginStart="15dp"
android:layout_marginTop="8dp"
android:paddingStart="8dp"
android:layout_gravity="center_vertical"
android:background="@drawable/background_sud_game_input_edit_text"
android:hint="@string/live_say_something"
android:paddingRight="10dp"
android:textColorHint="@color/gray3" />
<TextView

0
common/src/main/res/mipmap-b+en+us/icon_game_hang_up.png → common/src/main/res/mipmap-xxhdpi/icon_game_hang_up_en.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.9 KiB

After

Width:  |  Height:  |  Size: 7.9 KiB

0
common/src/main/res/mipmap-b+en+us/icon_game_seat.png → common/src/main/res/mipmap-xxhdpi/icon_game_seat_en.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.5 KiB

After

Width:  |  Height:  |  Size: 6.5 KiB

4
common/src/main/res/values-en-rUS/string.xml
View File

@ -666,7 +666,7 @@
<string name="receive_awards">ReceiveAwards</string>
<string name="one_free">One free gift privilege!</string>
<string name="send">Send out</string>
<string name="send">Send</string>
<string name="sorry">I am sorry</string>
<string name="video">video</string>
<string name="FILE_PROVIDER">myname.pdlive.shayu.fileprovider</string>
@ -1427,7 +1427,7 @@ Limited ride And limited avatar frame</string>
<string name="battlepass_zl_get">Successfully opened</string>
<string name="battlepass_buy_max">You have purchased the BattlePass</string>
<string name="game_review_input">Comment</string>
<string name="game_review_view_information">See Information</string>
<string name="game_review_view_information">Information</string>
<string name="game_review_view_unmute">Unmute</string>
<string name="game_review_view_sound_off">Mute</string>
</resources>

2
common/src/main/res/values/strings.xml
View File

@ -1429,7 +1429,7 @@ Limited ride And limited avatar frame</string>
<string name="battlepass_zl_get">Successfully opened</string>
<string name="battlepass_buy_max">You have purchased the BattlePass</string>
<string name="game_review_input">Comment</string>
<string name="game_review_view_information">See Information</string>
<string name="game_review_view_information">Information</string>
<string name="game_review_view_unmute">Unmute</string>
<string name="game_review_view_sound_off">Mute</string>
</resources>

10
live/src/main/java/com/yunbao/live/activity/SudGameActivity.java
View File

@ -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<CheckRemainingBalance>() {
@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);
}