diff --git a/BaseModule/src/main/res/mipmap-hdpi/icon_love_prize.png b/BaseModule/src/main/res/mipmap-hdpi/icon_love_prize.png deleted file mode 100644 index e69de29b..00000000 diff --git a/BaseModule/src/main/res/mipmap-hdpi/icon_love_station.png b/BaseModule/src/main/res/mipmap-hdpi/icon_love_station.png index e69de29b..af3532f9 100644 Binary files a/BaseModule/src/main/res/mipmap-hdpi/icon_love_station.png and b/BaseModule/src/main/res/mipmap-hdpi/icon_love_station.png differ diff --git a/BaseModule/src/main/res/mipmap-xhdpi/icon_love_prize.png b/BaseModule/src/main/res/mipmap-xhdpi/icon_love_prize.png deleted file mode 100644 index e69de29b..00000000 diff --git a/BaseModule/src/main/res/mipmap-xhdpi/icon_love_station.png b/BaseModule/src/main/res/mipmap-xhdpi/icon_love_station.png index e69de29b..aa8dd4a6 100644 Binary files a/BaseModule/src/main/res/mipmap-xhdpi/icon_love_station.png and b/BaseModule/src/main/res/mipmap-xhdpi/icon_love_station.png differ diff --git a/BaseModule/src/main/res/mipmap-xhdpi/icon_rule_love_bg.png b/BaseModule/src/main/res/mipmap-xhdpi/icon_rule_love_bg.png deleted file mode 100644 index e69de29b..00000000 diff --git a/BaseModule/src/main/res/mipmap-xhdpi/prize_call_box_rank.png b/BaseModule/src/main/res/mipmap-xhdpi/prize_call_box_rank.png deleted file mode 100644 index e69de29b..00000000 diff --git a/BaseModule/src/main/res/mipmap-xhdpi/prize_call_box_record.png b/BaseModule/src/main/res/mipmap-xhdpi/prize_call_box_record.png deleted file mode 100644 index e69de29b..00000000 diff --git a/BaseModule/src/main/res/mipmap-xhdpi/prize_call_open_box.png b/BaseModule/src/main/res/mipmap-xhdpi/prize_call_open_box.png deleted file mode 100644 index e69de29b..00000000 diff --git a/BaseModule/src/main/res/mipmap-xxhdpi/icon_love_prize.png b/BaseModule/src/main/res/mipmap-xxhdpi/icon_love_prize.png deleted file mode 100644 index e69de29b..00000000 diff --git a/BaseModule/src/main/res/mipmap-xxhdpi/icon_love_station.png b/BaseModule/src/main/res/mipmap-xxhdpi/icon_love_station.png index e69de29b..c4e66441 100644 Binary files a/BaseModule/src/main/res/mipmap-xxhdpi/icon_love_station.png and b/BaseModule/src/main/res/mipmap-xxhdpi/icon_love_station.png differ diff --git a/BaseModule/src/main/res/mipmap-xxhdpi/icon_rule_love_bg.png b/BaseModule/src/main/res/mipmap-xxhdpi/icon_rule_love_bg.png deleted file mode 100644 index e69de29b..00000000 diff --git a/MainModule/src/main/java/com/xscm/modulemain/dialog/DialogLoveStationDraw.kt b/MainModule/src/main/java/com/xscm/modulemain/dialog/DialogLoveStationDraw.kt index b52c146b..a4b07412 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/dialog/DialogLoveStationDraw.kt +++ b/MainModule/src/main/java/com/xscm/modulemain/dialog/DialogLoveStationDraw.kt @@ -29,7 +29,7 @@ import com.xscm.moduleutil.utils.ImageUtils import com.xscm.moduleutil.widget.dialog.BaseDialog import io.reactivex.disposables.Disposable -class DialogLoveStationDraw(context: Context,val fragmentManager: FragmentManager) : +class DialogLoveStationDraw(context: Context,val fragmentManager: FragmentManager,val roomSettingFragment: RoomSettingFragment) : BaseDialog(context) { init { @@ -154,6 +154,7 @@ class DialogLoveStationDraw(context: Context,val fragmentManager: FragmentManage super.show() mRoomId = roomId mGiftBagId = giftBagId + roomSettingFragment.dismiss() getUserWallet() startAnimDefault() getLottery() diff --git a/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomSettingFragment.java b/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomSettingFragment.java index deb7affc..dae803c3 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomSettingFragment.java +++ b/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomSettingFragment.java @@ -532,7 +532,7 @@ public class RoomSettingFragment extends BaseMvpDialogFragment