房间寻爱活动 购买限制数量200调整至99999

This commit is contained in:
wzq
2023-10-10 14:33:07 +08:00
parent 6e9032bcb4
commit 59adea0674
5 changed files with 20 additions and 15 deletions

View File

@@ -4823,7 +4823,7 @@
<string name="erban_shipantics_radishrankingpresenter_02">已經到底啦</string> <string name="erban_shipantics_radishrankingpresenter_02">已經到底啦</string>
<string name="treasure_box_activity_boxrankingactivity_01">今日榜單</string> <string name="treasure_box_activity_boxrankingactivity_01">今日榜單</string>
<string name="treasure_box_activity_boxrankingactivity_02">昨日榜單</string> <string name="treasure_box_activity_boxrankingactivity_02">昨日榜單</string>
<string name="treasure_box_activity_treasureboxactivity_01">一次只能選擇200</string> <string name="treasure_box_activity_treasureboxactivity_01">一次只能選擇%d</string>
<string name="treasure_box_activity_treasureboxactivity_02">消耗 </string> <string name="treasure_box_activity_treasureboxactivity_02">消耗 </string>
<string name="treasure_box_activity_treasureboxactivity_03">開啟數量不能為0!</string> <string name="treasure_box_activity_treasureboxactivity_03">開啟數量不能為0!</string>
<string name="treasure_box_activity_treasureboxactivity_04">參與活動獲得信物</string> <string name="treasure_box_activity_treasureboxactivity_04">參與活動獲得信物</string>

View File

@@ -26,7 +26,6 @@ import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.view.WindowManager; import android.view.WindowManager;
import android.view.animation.AccelerateDecelerateInterpolator; import android.view.animation.AccelerateDecelerateInterpolator;
import android.widget.ImageView;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.TextView; import android.widget.TextView;
@@ -74,7 +73,6 @@ import com.yizhuan.xchat_android_library.utils.FormatUtils;
import com.yizhuan.xchat_android_library.utils.ResUtil; import com.yizhuan.xchat_android_library.utils.ResUtil;
import com.yizhuan.xchat_android_library.utils.SingleToastUtil; import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
import com.yizhuan.xchat_android_library.utils.TimeUtils; import com.yizhuan.xchat_android_library.utils.TimeUtils;
import com.yizhuan.xchat_android_library.utils.keyboard.KeyboardUtil;
import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.Subscribe;
@@ -86,10 +84,12 @@ import java.util.concurrent.TimeUnit;
import io.reactivex.Observable; import io.reactivex.Observable;
import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.functions.Consumer;
@ActLayoutRes(R.layout.activity_treasure_box) @ActLayoutRes(R.layout.activity_treasure_box)
public class TreasureBoxActivity extends BaseBindingActivity<ActivityTreasureBoxBinding> implements View.OnClickListener { public class TreasureBoxActivity extends BaseBindingActivity<ActivityTreasureBoxBinding> implements View.OnClickListener {
public static final int MAX_BUY_QUANTITY_LIMIT = 99999;
private final Runnable removeRunnable = () -> mBinding.llPrizeHint.removeAllViews(); private final Runnable removeRunnable = () -> mBinding.llPrizeHint.removeAllViews();
private ArrayList<PrizeNewInfo> cacheList = new ArrayList<>(); private ArrayList<PrizeNewInfo> cacheList = new ArrayList<>();
private ArrayList<PrizeNewInfo> hintPrizeCacheList = new ArrayList<>(); private ArrayList<PrizeNewInfo> hintPrizeCacheList = new ArrayList<>();
@@ -160,11 +160,11 @@ public class TreasureBoxActivity extends BaseBindingActivity<ActivityTreasureBox
public void afterTextChanged(Editable s) { public void afterTextChanged(Editable s) {
try { try {
mNum = Integer.parseInt(s.toString()); mNum = Integer.parseInt(s.toString());
if (mNum > 200) { if (mNum > MAX_BUY_QUANTITY_LIMIT) {
mNum = 200; mNum = MAX_BUY_QUANTITY_LIMIT;
mBinding.edInputNum.setText(String.valueOf(mNum)); mBinding.edInputNum.setText(String.valueOf(mNum));
mBinding.edInputNum.setSelection(mBinding.edInputNum.getText().length()); mBinding.edInputNum.setSelection(mBinding.edInputNum.getText().length());
SingleToastUtil.showToast(ResUtil.getString(R.string.treasure_box_activity_treasureboxactivity_01)); SingleToastUtil.showToast(getString(R.string.treasure_box_activity_treasureboxactivity_01, MAX_BUY_QUANTITY_LIMIT));
} }
setBoxPriceSelect(0); setBoxPriceSelect(0);
} catch (NumberFormatException e) { } catch (NumberFormatException e) {

View File

@@ -9,6 +9,7 @@ import com.hjq.toast.ToastUtils
import com.yizhuan.erban.R import com.yizhuan.erban.R
import com.yizhuan.erban.base.BaseDialog import com.yizhuan.erban.base.BaseDialog
import com.yizhuan.erban.databinding.TreasureBoxDialogLoveLackBinding import com.yizhuan.erban.databinding.TreasureBoxDialogLoveLackBinding
import com.yizhuan.erban.treasure_box.activity.TreasureBoxActivity.MAX_BUY_QUANTITY_LIMIT
import com.yizhuan.erban.treasure_box.widget.dialog.TreasureBoxDialog.Companion.newInstance import com.yizhuan.erban.treasure_box.widget.dialog.TreasureBoxDialog.Companion.newInstance
import com.yizhuan.treasure_box.bean.UserTicketInfo import com.yizhuan.treasure_box.bean.UserTicketInfo
import com.yizhuan.treasure_box.model.BoxModel import com.yizhuan.treasure_box.model.BoxModel
@@ -18,7 +19,6 @@ import com.yizhuan.xchat_android_library.common.SpConstants
import com.yizhuan.xchat_android_library.common.util.SPUtils import com.yizhuan.xchat_android_library.common.util.SPUtils
import com.yizhuan.xchat_android_library.common.util.SoftKeyboardStateHelper import com.yizhuan.xchat_android_library.common.util.SoftKeyboardStateHelper
import com.yizhuan.xchat_android_library.common.util.SoftKeyboardStateHelper.SoftKeyboardStateListener import com.yizhuan.xchat_android_library.common.util.SoftKeyboardStateHelper.SoftKeyboardStateListener
import com.yizhuan.xchat_android_library.utils.ResUtil
import com.yizhuan.xchat_android_library.utils.SingleToastUtil import com.yizhuan.xchat_android_library.utils.SingleToastUtil
import com.yizhuan.xchat_android_library.utils.TextWatcherWrapper import com.yizhuan.xchat_android_library.utils.TextWatcherWrapper
import com.yizhuan.xchat_android_library.utils.TimeUtils import com.yizhuan.xchat_android_library.utils.TimeUtils
@@ -65,7 +65,9 @@ class BoxLoveLackDialog : BaseDialog<TreasureBoxDialogLoveLackBinding>() {
binding?.ivAdd?.setOnClickListener { binding?.ivAdd?.setOnClickListener {
val editNum = val editNum =
(StringUtils.toInt(binding?.editNum?.text.toString(), 0) + 10).coerceAtMost(200) (StringUtils.toInt(binding?.editNum?.text.toString(), 0) + 10).coerceAtMost(
MAX_BUY_QUANTITY_LIMIT
)
binding?.editNum?.setText(editNum.toString()) binding?.editNum?.setText(editNum.toString())
binding?.tvPrizeName?.text = (editNum * ticketPrice).toString() binding?.tvPrizeName?.text = (editNum * ticketPrice).toString()
} }
@@ -94,11 +96,16 @@ class BoxLoveLackDialog : BaseDialog<TreasureBoxDialogLoveLackBinding>() {
binding?.editNum?.addTextChangedListener(object : TextWatcherWrapper() { binding?.editNum?.addTextChangedListener(object : TextWatcherWrapper() {
override fun afterTextChanged(editable: Editable) { override fun afterTextChanged(editable: Editable) {
var n = StringUtils.toInt(binding?.editNum?.text.toString(), 0) var n = StringUtils.toInt(binding?.editNum?.text.toString(), 0)
if (n > 200) { if (n > MAX_BUY_QUANTITY_LIMIT) {
n = 200 n = MAX_BUY_QUANTITY_LIMIT
binding?.editNum?.setText(n.toString()) binding?.editNum?.setText(n.toString())
binding?.editNum?.setSelection(3) binding?.editNum?.setSelection(3)
SingleToastUtil.showToast(ResUtil.getString(R.string.treasure_box_activity_treasureboxactivity_01)) SingleToastUtil.showToast(
getString(
R.string.treasure_box_activity_treasureboxactivity_01,
MAX_BUY_QUANTITY_LIMIT
)
)
} }
binding?.tvPrizeName?.text = (n * ticketPrice).toString() binding?.tvPrizeName?.text = (n * ticketPrice).toString()
num = n num = n

View File

@@ -234,7 +234,6 @@
android:gravity="center" android:gravity="center"
android:hint="輸入數量" android:hint="輸入數量"
android:inputType="number" android:inputType="number"
android:maxLength="4"
android:maxLines="1" android:maxLines="1"
android:textColor="@color/white" android:textColor="@color/white"
android:textColorHint="@color/white_tran_40" android:textColorHint="@color/white_tran_40"

View File

@@ -110,7 +110,6 @@
android:background="@null" android:background="@null"
android:gravity="center" android:gravity="center"
android:inputType="number" android:inputType="number"
android:maxLength="4"
android:minWidth="40dp" android:minWidth="40dp"
android:text="1" android:text="1"
android:textColor="@color/white" android:textColor="@color/white"