From 45566001a7e8d9a748d8deeb9dc49021bda02821 Mon Sep 17 00:00:00 2001 From: 18401019693 Date: Fri, 6 Oct 2023 15:22:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B8=B8=E6=88=8F=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/dialog/CreateSudGamePopup.java | 20 +++++++--- .../res/layout/dialog_create_sud_game.xml | 1 + .../layout/dialog_home_create_sud_game.xml | 1 + .../res/layout/dialog_live_new_function.xml | 40 ++++++++++--------- .../src/main/res/layout/hint_custom_popup.xml | 1 + .../main/res/layout/item_sud_game_list.xml | 4 +- common/src/main/res/values-en-rUS/string.xml | 2 +- common/src/main/res/values/strings.xml | 2 +- .../main/views/MainHomeGameViewHolder.java | 2 +- 9 files changed, 44 insertions(+), 29 deletions(-) diff --git a/common/src/main/java/com/yunbao/common/dialog/CreateSudGamePopup.java b/common/src/main/java/com/yunbao/common/dialog/CreateSudGamePopup.java index d12f85fff..90b6630dc 100644 --- a/common/src/main/java/com/yunbao/common/dialog/CreateSudGamePopup.java +++ b/common/src/main/java/com/yunbao/common/dialog/CreateSudGamePopup.java @@ -87,7 +87,7 @@ public class CreateSudGamePopup extends BottomPopupView { ViewClicksAntiShake.clicksAntiShake(createGameType, new ViewClicksAntiShake.ViewClicksCallBack() { @Override public void onViewClicks() { - if (hasMoveUp){ + if (hasMoveUp) { InputMethodManager imm = getSystemService(getContext(), InputMethodManager.class); if (imm != null) { imm.hideSoftInputFromWindow(roomName.getWindowToken(), 0); @@ -104,8 +104,8 @@ public class CreateSudGamePopup extends BottomPopupView { .asCustom(new SudGameListSelectPopup(getContext(), 4, customSidebarChildModels, interactionID)) .show(); } - },1000); - }else { + }, 500); + } else { XPopup.Builder builder = new XPopup.Builder(getContext()).atView(createGameType); builder.hasShadowBg(false) .isDestroyOnDismiss(true) @@ -168,15 +168,25 @@ public class CreateSudGamePopup extends BottomPopupView { } return; } - int sillNumber = Integer.parseInt(sill); - if (sillNumber < 100 || sillNumber > 50000) { + if (sill.length() > 6 ){ if (IMLoginManager.get(getContext()).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) { ToastUtil.show("数量区间为100--5W"); } else { ToastUtil.show("The quantity range is 100 to 5 W"); } return; + }else { + int sillNumber = Integer.parseInt(sill); + if (sillNumber < 100 || sillNumber > 50000) { + if (IMLoginManager.get(getContext()).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) { + ToastUtil.show("数量区间为100--5W"); + } else { + ToastUtil.show("The quantity range is 100 to 5 W"); + } + return; + } } + LiveNetManager.get(getContext()) .createSudRoom(name, sill, id, new HttpCallback() { @Override 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 1e5c433b9..bff9c4ebb 100644 --- a/common/src/main/res/layout/dialog_create_sud_game.xml +++ b/common/src/main/res/layout/dialog_create_sud_game.xml @@ -118,6 +118,7 @@ android:inputType="numberDecimal" android:paddingStart="12dp" android:paddingTop="9dp" + android:maxEms="5" android:ellipsize="end" android:paddingBottom="9dp" android:textColor="@color/white" 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 8c2d98bb5..871ca2391 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 @@ -119,6 +119,7 @@ android:inputType="numberDecimal" android:paddingStart="12dp" android:ellipsize="end" + android:maxEms="5" android:paddingTop="9dp" android:paddingBottom="9dp" android:textColor="#E6000000" diff --git a/common/src/main/res/layout/dialog_live_new_function.xml b/common/src/main/res/layout/dialog_live_new_function.xml index d39091d5b..e9d7d76f0 100644 --- a/common/src/main/res/layout/dialog_live_new_function.xml +++ b/common/src/main/res/layout/dialog_live_new_function.xml @@ -255,26 +255,7 @@ android:layout_marginStart="16dp" android:layout_marginTop="20dp"> - - - - - @@ -389,6 +370,27 @@ android:textSize="12sp" /> + + + + + + diff --git a/common/src/main/res/layout/hint_custom_popup.xml b/common/src/main/res/layout/hint_custom_popup.xml index 3d77b201e..1c1d9433e 100644 --- a/common/src/main/res/layout/hint_custom_popup.xml +++ b/common/src/main/res/layout/hint_custom_popup.xml @@ -35,6 +35,7 @@ - 1K-2KGolden Bean 2K-5KGolden Bean 5 K or more gold beans - User + user In a team of %s people, let\'s play together~ %s people online Search for room diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml index ea04695e9..38f81f358 100644 --- a/common/src/main/res/values/strings.xml +++ b/common/src/main/res/values/strings.xml @@ -1341,7 +1341,7 @@ Limited ride And limited avatar frame 1K-2KGolden Bean 2K-5KGolden Bean 5 K or more gold beans - User + user In a team of %s people, let\'s play together~ %s people online Search for room 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 169398816..933794126 100644 --- a/main/src/main/java/com/yunbao/main/views/MainHomeGameViewHolder.java +++ b/main/src/main/java/com/yunbao/main/views/MainHomeGameViewHolder.java @@ -251,7 +251,7 @@ public class MainHomeGameViewHolder extends AbsMainHomeChildViewHolder implement public void onViewClicks() { new XPopup.Builder(mContext) .enableDrag(false) - .moveUpToKeyboard(false) + .moveUpToKeyboard(true) .asCustom(new CreateSudGamePopup(mContext, customSidebarChildModels, true).setHomeView(true)) .show();