修改bug

common/src/main/java/com/yunbao/common/activity/SudGameActivity.java

@@ -44,7 +44,6 @@ public class SudGameActivity extends AbsActivity {
     private CreateSudRoomModel mCreateSudRoomModel;
     private TextView gameTitle, roomName, roomNumber;
     private RoundedImageView mAvatar;
-
     @Override
     protected int getLayoutId() {
         return R.layout.activity_sud_game;
@@ -164,9 +163,9 @@ public class SudGameActivity extends AbsActivity {
                             gameViewModel.sudFSTAPPDecorator.notifyAPPCommonSelfIn(true, event.getSeatIndex(), true, 1);
                         } else {
                             if (IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
-                                ToastUtil.show("金豆不够 ");
+                                ToastUtil.show("貨幣数量不足 ");
                             } else {
-                                ToastUtil.show("Insufficient money ");
+                                ToastUtil.show("Shortage of money");
                             }
 
                         }
@@ -175,9 +174,9 @@ public class SudGameActivity extends AbsActivity {
                     @Override
                     public void onError(String error) {
                         if (IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
-                            ToastUtil.show("金豆不够 ");
+                            ToastUtil.show("貨幣数量不足 ");
                         } else {
-                            ToastUtil.show("Insufficient money ");
+                            ToastUtil.show("Shortage of money");
                         }
                     }
                 });

common/src/main/java/com/yunbao/common/bean/CheckRemainingBalance.java

@@ -8,6 +8,17 @@ public class CheckRemainingBalance extends BaseModel {
     private int goldenBeanRemainingBalance;
     @SerializedName("status")
     private int status;
+    @SerializedName("deduct_money_key")
+    private String deductMoneyKey;
+
+    public String getDeductMoneyKey() {
+        return deductMoneyKey;
+    }
+
+    public CheckRemainingBalance setDeductMoneyKey(String deductMoneyKey) {
+        this.deductMoneyKey = deductMoneyKey;
+        return this;
+    }
 
     public int getStatus() {
         return status;

common/src/main/java/com/yunbao/common/dialog/CreateSudGamePopup.java

@@ -154,7 +154,7 @@ public class CreateSudGamePopup extends BottomPopupView {
                 String sill = gameSill.getText().toString();
                 String name = roomName.getText().toString();
                 if (IMLoginManager.get(getContext()).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
-                    if (name.length() > 10) {
+                    if (name.length() > 15) {
                         ToastUtil.show("房間名长度为[1-10]");
                         return;
                     }

common/src/main/java/com/yunbao/common/dialog/SudGameListPopup.java

@@ -100,7 +100,7 @@ public class SudGameListPopup extends BottomPopupView {
 
         for (CustomSidebarChildModel model : customSidebarChildModels) {
             if (TextUtils.equals(String.valueOf(interactionID), model.getSrc())) {
-                gameTitle.setText(model.getTitle().substring(0, 2));
+                gameTitle.setText(model.getTitle());
                 id = model.getId();
             }
         }
@@ -294,13 +294,13 @@ public class SudGameListPopup extends BottomPopupView {
     public void onSudGameListEvent(SudGameListEvent event) {
         interactionID = event.getInteractionID();
         if (IMLoginManager.get(getContext()).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
-            gameTitle.setText(event.getTitle().substring(0, 2));
+            gameTitle.setText(event.getTitle());
         } else {
             if (event.getTitle().contains("All")) {
                 gameTitle.setText("All");
             } else {
                 if ((event.getTitle().length() > 6)) {
-                    gameTitle.setText(event.getTitle().substring(0, 5));
+                    gameTitle.setText(event.getTitle());
                 } else {
                     gameTitle.setText(event.getTitle());
                 }

common/src/main/java/com/yunbao/common/sud/decorator/SudFSTAPPDecorator.java

@@ -94,7 +94,7 @@ public class SudFSTAPPDecorator {
         if (iSudFSTAPP != null) {
             SudMGPAPPState.APPCommonSelfPlaying state = new SudMGPAPPState.APPCommonSelfPlaying();
             state.isPlaying = isPlaying;
-//            state.reportGameInfoExtras = reportGameInfoExtras;
+//            state.reportGameInfoExtras = deductMoneyKey;
 //            state.reportGameInfoKey = reportGameInfoKey;
             iSudFSTAPP.notifyStateChange(SudMGPAPPState.APP_COMMON_SELF_PLAYING, SudJsonUtils.toJson(state), null);
         }

common/src/main/java/com/yunbao/common/views/LiveSudGamePopup.java

@@ -51,7 +51,7 @@ public class LiveSudGamePopup extends BottomPopupView {
     private CreateSudRoomModel mCreateSudRoomModel;
     private TextView gameTitle, roomName, roomNumber;
     private RoundedImageView mAvatar;
-
+    private boolean selfClick = false;
 
     public LiveSudGamePopup(@NonNull Context context, long interactionID, String liveUid) {
         super(context);
@@ -167,7 +167,9 @@ public class LiveSudGamePopup extends BottomPopupView {
         // SudMGP平台64bit游戏ID
         gameViewModel.switchGame((Activity) getContext(), mLiveUid, mInteractionID);
     }
+
     private List<CustomSidebarChildModel> customSidebarChildModels = new ArrayList<>();
+
     private void initDate() {
         LiveNetManager.get(getContext())
                 .getCustomSidebarInfo("1", new HttpCallback<List<CustomSidebarInfoModel>>() {
@@ -223,9 +225,9 @@ public class LiveSudGamePopup extends BottomPopupView {
                             gameViewModel.sudFSTAPPDecorator.notifyAPPCommonSelfIn(true, event.getSeatIndex(), true, 1);
                         } else {
                             if (IMLoginManager.get(getContext()).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
-                                ToastUtil.show("金豆不够 ");
+                                ToastUtil.show("貨幣数量不足 ");
                             } else {
-                                ToastUtil.show("Insufficient money ");
+                                ToastUtil.show("Shortage of money");
                             }
 
                         }
@@ -234,9 +236,9 @@ public class LiveSudGamePopup extends BottomPopupView {
                     @Override
                     public void onError(String error) {
                         if (IMLoginManager.get(getContext()).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
-                            ToastUtil.show("金豆不够 ");
+                            ToastUtil.show("貨幣数量不足 ");
                         } else {
-                            ToastUtil.show("Insufficient money ");
+                            ToastUtil.show("Shortage of money");
                         }
                     }
                 });
@@ -251,6 +253,7 @@ public class LiveSudGamePopup extends BottomPopupView {
                                     @Override
                                     public void onSuccess(CheckRemainingBalance data) {
                                         if (data.getStatus() == 1) {
+
                                             gameViewModel.sudFSTAPPDecorator.notifyAPPCommonSelfPlaying(true);
                                         } else {
 

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

@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="580dp"
+    android:layout_height="650dp"
     android:background="@drawable/bg_live_sud_list"
     android:orientation="vertical">
 

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

@@ -19,6 +19,10 @@
             android:textColor="#000000"
             android:textSize="16sp" />
 
+        <HorizontalScrollView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -145,6 +149,8 @@
                         android:src="@mipmap/icon_home_interactive_game_arrow" />
                 </LinearLayout>
             </LinearLayout>
+        </HorizontalScrollView>
+
 
         <LinearLayout
             android:layout_width="match_parent"

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

@@ -66,6 +66,10 @@
             android:visibility="visible" />
     </LinearLayout>
 
+    <HorizontalScrollView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -82,7 +86,7 @@
 
             <LinearLayout
                 android:id="@+id/interactive_game_room_game"
-            android:layout_width="58dp"
+                android:layout_width="wrap_content"
                 android:layout_height="28dp"
                 android:layout_marginStart="4dp"
                 android:background="@drawable/bg_live_sud_list_btn"
@@ -122,7 +126,7 @@
 
             <FrameLayout
                 android:id="@+id/room_sill"
-            android:layout_width="82dp"
+                android:layout_width="wrap_content"
                 android:layout_height="28dp"
                 android:layout_marginStart="4dp"
                 android:background="@drawable/bg_live_sud_list_btn">
@@ -158,7 +162,7 @@
 
             <LinearLayout
                 android:id="@+id/house_owner"
-            android:layout_width="70dp"
+                android:layout_width="wrap_content"
                 android:layout_height="28dp"
                 android:layout_marginStart="4dp"
                 android:background="@drawable/bg_live_sud_list_btn"
@@ -189,6 +193,8 @@
                     android:src="@mipmap/icon_interactive_game_arrow" />
             </LinearLayout>
         </LinearLayout>
+    </HorizontalScrollView>
+
 
     <FrameLayout
         android:layout_width="match_parent"

common/src/main/res/values-zh-rHK/strings.xml

@@ -1379,7 +1379,7 @@
     <string name="sud_in_game_game_currency">貨幣：</string>
     <string name="sud_in_game_game_time">時間：</string>
     <string name="sud_in_game_game_record">游戲記錄</string>
-    <string name="sud_in_game_random_name">随机</string>
+    <string name="sud_in_game_random_name">隨機</string>
     <string name="room_sill0_100">0-100星幣</string>
     <string name="room_sill100_500">100-500星幣</string>
     <string name="room_sill500_m">500以上星幣</string>

common/src/main/res/values-zh-rTW/strings.xml

@@ -1378,7 +1378,7 @@
     <string name="sud_in_game_game_currency">貨幣：</string>
     <string name="sud_in_game_game_time">時間：</string>
     <string name="sud_in_game_game_record">游戲記錄</string>
-    <string name="sud_in_game_random_name">随机</string>
+    <string name="sud_in_game_random_name">隨機</string>
     <string name="room_sill0_100">0-100星幣</string>
     <string name="room_sill100_500">100-500星幣</string>
     <string name="room_sill500_m">500以上星幣</string>

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

@@ -1378,7 +1378,7 @@
     <string name="sud_in_game_game_currency">貨幣：</string>
     <string name="sud_in_game_game_time">時間：</string>
     <string name="sud_in_game_game_record">游戲記錄</string>
-    <string name="sud_in_game_random_name">随机</string>
+    <string name="sud_in_game_random_name">隨機</string>
     <string name="room_sill0_100">0-100星幣</string>
     <string name="room_sill100_500">100-500星幣</string>
     <string name="room_sill500_m">500以上星幣</string>

main/src/main/java/com/yunbao/main/views/MainHomeGameViewHolder.java

@@ -328,13 +328,13 @@ public class MainHomeGameViewHolder extends AbsMainHomeChildViewHolder implement
     public void onSudGameListEvent(SudGameListEvent event) {
         interactionID = event.getInteractionID();
         if (IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
-            gameTitle.setText(event.getTitle().substring(0, 2));
+            gameTitle.setText(event.getTitle());
         } else {
             if (event.getTitle().contains("All")) {
                 gameTitle.setText("All");
             } else {
                 if ((event.getTitle().length() > 6)) {
-                    gameTitle.setText(event.getTitle().substring(0, 5));
+                    gameTitle.setText(event.getTitle());
                 } else {
                     gameTitle.setText(event.getTitle());
                 }

main/src/main/res/layout/view_main_home_sud_game_list.xml

@@ -59,6 +59,10 @@
             android:visibility="visible" />
     </LinearLayout>
 
+    <HorizontalScrollView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -76,7 +80,7 @@
 
             <LinearLayout
                 android:id="@+id/interactive_game_room_game"
-            android:layout_width="58dp"
+                android:layout_width="wrap_content"
                 android:layout_height="28dp"
                 android:layout_marginStart="4dp"
                 android:background="@drawable/bg_home_sud_list_btn"
@@ -112,7 +116,7 @@
 
             <FrameLayout
                 android:id="@+id/room_sill"
-            android:layout_width="74dp"
+                android:layout_width="wrap_content"
                 android:layout_height="28dp"
                 android:layout_marginStart="4dp"
                 android:background="@drawable/bg_home_sud_list_btn">
@@ -149,7 +153,7 @@
 
             <LinearLayout
                 android:id="@+id/house_owner"
-            android:layout_width="70dp"
+                android:layout_width="wrap_content"
                 android:layout_height="28dp"
                 android:layout_marginStart="4dp"
                 android:background="@drawable/bg_home_sud_list_btn"
@@ -179,6 +183,7 @@
                     android:src="@mipmap/icon_home_interactive_game_arrow" />
             </LinearLayout>
         </LinearLayout>
+    </HorizontalScrollView>
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"