diff --git a/app/src/main/java/com/mango/moshen/avroom/activity/AVRoomActivity.java b/app/src/main/java/com/mango/moshen/avroom/activity/AVRoomActivity.java index 3e10dd430..2861f0320 100644 --- a/app/src/main/java/com/mango/moshen/avroom/activity/AVRoomActivity.java +++ b/app/src/main/java/com/mango/moshen/avroom/activity/AVRoomActivity.java @@ -1179,7 +1179,7 @@ public class AVRoomActivity extends BaseMvpActivity { + dismiss(); + }); + binding.setGiftBean(dataBean); + binding.tvGoRoom.setVisibility(dataBean.getRoomUid() == 0 + || (AvRoomDataManager.get().mCurrentRoomInfo != null && dataBean.getRoomUid() == AvRoomDataManager.get().mCurrentRoomInfo.getUid()) + ? View.GONE : View.VISIBLE); + binding.tvGoRoom.setOnClickListener(view -> AVRoomActivity.start(getContext(), dataBean.getRoomUid())); + } + } +} diff --git a/app/src/main/res/drawable-xhdpi/all_service_gift_ceremony_background.png b/app/src/main/res/drawable-xhdpi/all_service_gift_ceremony_background.png new file mode 100644 index 000000000..c436cab8e Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/all_service_gift_ceremony_background.png differ diff --git a/app/src/main/res/drawable-xhdpi/all_service_gift_ceremony_go_to.png b/app/src/main/res/drawable-xhdpi/all_service_gift_ceremony_go_to.png new file mode 100644 index 000000000..f807a768a Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/all_service_gift_ceremony_go_to.png differ diff --git a/app/src/main/res/layout/dialog_gift_all_service_ceremony.xml b/app/src/main/res/layout/dialog_gift_all_service_ceremony.xml new file mode 100644 index 000000000..60bcadca0 --- /dev/null +++ b/app/src/main/res/layout/dialog_gift_all_service_ceremony.xml @@ -0,0 +1,130 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/core/src/main/java/com/mango/core/noble/AllServiceGiftProtocol.java b/core/src/main/java/com/mango/core/noble/AllServiceGiftProtocol.java index 6c131d743..f52e56e69 100644 --- a/core/src/main/java/com/mango/core/noble/AllServiceGiftProtocol.java +++ b/core/src/main/java/com/mango/core/noble/AllServiceGiftProtocol.java @@ -43,6 +43,7 @@ public class AllServiceGiftProtocol extends BaseProtocol