diff --git a/common/src/main/java/com/yunbao/common/dialog/SudGameListPopup.java b/common/src/main/java/com/yunbao/common/dialog/SudGameListPopup.java index 5234322c3..74c5634ae 100644 --- a/common/src/main/java/com/yunbao/common/dialog/SudGameListPopup.java +++ b/common/src/main/java/com/yunbao/common/dialog/SudGameListPopup.java @@ -174,9 +174,9 @@ public class SudGameListPopup extends BottomPopupView { @Override public void onError(String error) { if (IMLoginManager.get(getContext()).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) { - ToastUtil.show("房间不存在"); + ToastUtil.show("当前没有可加入的房间"); } else { - ToastUtil.show("The room does not exist"); + ToastUtil.show("There are currently no rooms to join"); } } }); diff --git a/common/src/main/res/layout/dialog_create_sud_game.xml b/common/src/main/res/layout/dialog_create_sud_game.xml index 7be9e36ef..fa9eccf57 100644 --- a/common/src/main/res/layout/dialog_create_sud_game.xml +++ b/common/src/main/res/layout/dialog_create_sud_game.xml @@ -123,8 +123,9 @@ android:maxEms="5" android:paddingStart="12dp" android:paddingTop="9dp" + android:singleLine="true" android:paddingBottom="9dp" - android:digits="123456789" + android:digits="1234567890" android:textColor="@color/white" android:textColorHint="#FFFFFF" android:textSize="10sp" /> diff --git a/common/src/main/res/layout/dialog_home_create_sud_game.xml b/common/src/main/res/layout/dialog_home_create_sud_game.xml index 01e461400..41018b6ba 100644 --- a/common/src/main/res/layout/dialog_home_create_sud_game.xml +++ b/common/src/main/res/layout/dialog_home_create_sud_game.xml @@ -117,11 +117,12 @@ android:id="@+id/game_sill" android:layout_width="175dp" android:layout_height="32dp" - android:digits="123456789" + android:digits="1234567890" android:background="@drawable/bg_live_sud_list_input_home" android:hint="@string/interactive_game_create_gold_bean_quantity" android:inputType="numberDecimal" android:paddingStart="12dp" + android:singleLine="true" android:ellipsize="end" android:maxEms="5" android:paddingTop="9dp" diff --git a/common/src/main/res/layout/dialog_sud_game_list.xml b/common/src/main/res/layout/dialog_sud_game_list.xml index ac12f7a65..883aad327 100644 --- a/common/src/main/res/layout/dialog_sud_game_list.xml +++ b/common/src/main/res/layout/dialog_sud_game_list.xml @@ -81,12 +81,12 @@ diff --git a/common/src/main/res/values-en-rUS/string.xml b/common/src/main/res/values-en-rUS/string.xml index 0c99b5908..f7c321767 100644 --- a/common/src/main/res/values-en-rUS/string.xml +++ b/common/src/main/res/values-en-rUS/string.xml @@ -1211,7 +1211,7 @@ Limited ride And limited avatar frame None Return to account Popularity Red packet - Game + Game Zone Popular red packets amount Diamonds @@ -1323,7 +1323,7 @@ Limited ride And limited avatar frame Game: All Threshold: - owner: + Owner: Random start All Game Create a room @@ -1334,11 +1334,11 @@ Limited ride And limited avatar frame Game threshold: Please select a game Please enter the number of golden beans - unlimited - 0K-1KGolden Bean - 1K-2KGolden Bean - 2K-5KGolden Bean - 5 K or more gold beans + No limit + 0K-1K beans + 1K-2K beans + 2K-5K beans + Above 5K beans user In a team of %s people, let\'s play together~ %s people online diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml index 1f534e695..ec55b70dc 100644 --- a/common/src/main/res/values/strings.xml +++ b/common/src/main/res/values/strings.xml @@ -1212,7 +1212,7 @@ Limited ride And limited avatar frame None Return to account Popularity Red packet - Game + Game Zone Popular red packets amount Diamonds @@ -1325,7 +1325,7 @@ Limited ride And limited avatar frame Game: All Threshold: - owner: + Owner: Random start All Game Create a room @@ -1336,11 +1336,11 @@ Limited ride And limited avatar frame Game threshold: Please select a game Please enter the number of golden beans - unlimited - 0K-1KGolden Bean - 1K-2KGolden Bean - 2K-5KGolden Bean - 5 K or more gold beans + No limit + 0K-1K beans + 1K-2K beans + 2K-5K beans + Above 5K beans user In a team of %s people, let\'s play together~ %s people online diff --git a/main/src/main/java/com/yunbao/main/views/MainHomeGameViewHolder.java b/main/src/main/java/com/yunbao/main/views/MainHomeGameViewHolder.java index ee27dabe0..b303cf652 100644 --- a/main/src/main/java/com/yunbao/main/views/MainHomeGameViewHolder.java +++ b/main/src/main/java/com/yunbao/main/views/MainHomeGameViewHolder.java @@ -38,6 +38,7 @@ import com.yunbao.common.http.live.LiveNetManager; import com.yunbao.common.interfaces.OnItemClickListener; import com.yunbao.common.manager.IMLoginManager; import com.yunbao.common.utils.Bus; +import com.yunbao.common.utils.ToastUtil; import com.yunbao.common.views.weight.ViewClicksAntiShake; import com.yunbao.main.R; @@ -159,7 +160,11 @@ public class MainHomeGameViewHolder extends AbsMainHomeChildViewHolder implement @Override public void onError(String error) { - + if (IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) { + ToastUtil.show("当前没有可加入的房间"); + } else { + ToastUtil.show("There are currently no rooms to join"); + } } }); // List sudRoomListModels = sudGameListAdapter.getList(); diff --git a/main/src/main/res/layout/view_main_home_sud_game_list.xml b/main/src/main/res/layout/view_main_home_sud_game_list.xml index a33947ca6..0b433e206 100644 --- a/main/src/main/res/layout/view_main_home_sud_game_list.xml +++ b/main/src/main/res/layout/view_main_home_sud_game_list.xml @@ -75,12 +75,12 @@