diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a59ef2c54..92f6f0c5d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -4823,7 +4823,7 @@ 已經到底啦 今日榜單 昨日榜單 - 一次只能選擇200次 + 一次只能選擇%d次 消耗 開啟數量不能為0! 參與活動獲得信物 diff --git a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/TreasureBoxActivity.java b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/TreasureBoxActivity.java index 773f5209a..c87527535 100644 --- a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/TreasureBoxActivity.java +++ b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/TreasureBoxActivity.java @@ -26,7 +26,6 @@ import android.view.View; import android.view.ViewGroup; import android.view.WindowManager; import android.view.animation.AccelerateDecelerateInterpolator; -import android.widget.ImageView; import android.widget.LinearLayout; 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.SingleToastUtil; 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.Subscribe; @@ -86,10 +84,12 @@ import java.util.concurrent.TimeUnit; import io.reactivex.Observable; import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.functions.Consumer; @ActLayoutRes(R.layout.activity_treasure_box) public class TreasureBoxActivity extends BaseBindingActivity implements View.OnClickListener { + + public static final int MAX_BUY_QUANTITY_LIMIT = 99999; + private final Runnable removeRunnable = () -> mBinding.llPrizeHint.removeAllViews(); private ArrayList cacheList = new ArrayList<>(); private ArrayList hintPrizeCacheList = new ArrayList<>(); @@ -160,11 +160,11 @@ public class TreasureBoxActivity extends BaseBindingActivity 200) { - mNum = 200; + if (mNum > MAX_BUY_QUANTITY_LIMIT) { + mNum = MAX_BUY_QUANTITY_LIMIT; mBinding.edInputNum.setText(String.valueOf(mNum)); 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); } catch (NumberFormatException e) { diff --git a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/widget/dialog/BoxLoveLackDialog.kt b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/widget/dialog/BoxLoveLackDialog.kt index 7edfb4bc5..8e42ab524 100644 --- a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/widget/dialog/BoxLoveLackDialog.kt +++ b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/widget/dialog/BoxLoveLackDialog.kt @@ -9,6 +9,7 @@ import com.hjq.toast.ToastUtils import com.yizhuan.erban.R import com.yizhuan.erban.base.BaseDialog 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.treasure_box.bean.UserTicketInfo 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.SoftKeyboardStateHelper 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.TextWatcherWrapper import com.yizhuan.xchat_android_library.utils.TimeUtils @@ -33,7 +33,7 @@ class BoxLoveLackDialog : BaseDialog() { override var height = WindowManager.LayoutParams.WRAP_CONTENT override var gravity = Gravity.CENTER - private var num :Int = 0 + private var num: Int = 0 companion object { @JvmStatic @@ -65,7 +65,9 @@ class BoxLoveLackDialog : BaseDialog() { binding?.ivAdd?.setOnClickListener { 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?.tvPrizeName?.text = (editNum * ticketPrice).toString() } @@ -94,11 +96,16 @@ class BoxLoveLackDialog : BaseDialog() { binding?.editNum?.addTextChangedListener(object : TextWatcherWrapper() { override fun afterTextChanged(editable: Editable) { var n = StringUtils.toInt(binding?.editNum?.text.toString(), 0) - if (n > 200) { - n = 200 + if (n > MAX_BUY_QUANTITY_LIMIT) { + n = MAX_BUY_QUANTITY_LIMIT binding?.editNum?.setText(n.toString()) 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() num = n diff --git a/app/src/module_treasure_box/res/layout/activity_treasure_box.xml b/app/src/module_treasure_box/res/layout/activity_treasure_box.xml index 948f47275..3761fae52 100644 --- a/app/src/module_treasure_box/res/layout/activity_treasure_box.xml +++ b/app/src/module_treasure_box/res/layout/activity_treasure_box.xml @@ -234,7 +234,6 @@ android:gravity="center" android:hint="輸入數量" android:inputType="number" - android:maxLength="4" android:maxLines="1" android:textColor="@color/white" android:textColorHint="@color/white_tran_40" diff --git a/app/src/module_treasure_box/res/layout/treasure_box_dialog_love_lack.xml b/app/src/module_treasure_box/res/layout/treasure_box_dialog_love_lack.xml index daf075c9c..027dd32ff 100644 --- a/app/src/module_treasure_box/res/layout/treasure_box_dialog_love_lack.xml +++ b/app/src/module_treasure_box/res/layout/treasure_box_dialog_love_lack.xml @@ -110,7 +110,6 @@ android:background="@null" android:gravity="center" android:inputType="number" - android:maxLength="4" android:minWidth="40dp" android:text="1" android:textColor="@color/white"