语音房bug修改

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

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

common/src/main/res/layout/dialog_sud_game_input.xml

@@ -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

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

@@ -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>

common/src/main/res/values/strings.xml

@@ -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>

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<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);
             }