Merge branch 'v2.2.0/red_package' into v2.2.0/test

2023-10-31 11:11:59 +08:00
parent 2b6d66c31e c04d3e283b
commit 1667dd3863
1 changed files with 13 additions and 1 deletions
--- a/app/src/main/java/com/yizhuan/erban/avroom/redpackage/RedPackageWidget.kt
+++ b/app/src/main/java/com/yizhuan/erban/avroom/redpackage/RedPackageWidget.kt
@@ -191,7 +191,19 @@ class RedPackageWidget : FrameLayoutRoomWidget, RoomWidget {
                        SingleToastUtil.showToast(R.string.red_package_result_empty_tips)
                    }

-                    6 -> {
+                    4 -> {
+                        val newData = item.result?.redEnvelopeVO
+                        if (newData != null && newData.pickNum == newData.totalNum) {
+                            redPackageHandler?.requestRefreshIcon()
+                            SingleToastUtil.showToast(R.string.red_package_result_empty_tips)
+                        } else {
+                            roomView?.getActivity().let {
+                                RedPackageOpenDialog.newInstance(item).show(it)
+                            }
+                        }
+                    }
+
+                    2, 6 -> {
                        redPackageHandler?.requestRefreshIcon()
                        SingleToastUtil.showToast(R.string.red_package_disabled_tips)
                    }