房间心愿单:入口显示逻辑优化,是否开启心愿单判断方式修改

app/src/main/java/com/mango/moshen/avroom/fragment/BaseRoomFragment.kt

@@ -516,6 +516,10 @@ open class BaseRoomFragment<V : IBaseRoomView?, P : BaseRoomPresenter<V>?> :
         pagerViewWishList?.let { pagerViewWishList ->
             val adapter = object : StaticPagerAdapter() {
                 var wishGiftList: List<WishItemInfo>? = null
+                set(value) {
+                    pagerViewWishList.isVisible = !value.isNullOrEmpty()
+                    field = value
+                }
                 override fun getCount(): Int {
                     return wishGiftList?.size ?: 0
                 }

app/src/main/java/com/mango/moshen/avroom/wishlist/WishListCreateActivity.kt

@@ -53,7 +53,7 @@ class WishListCreateActivity : BaseViewBindingActivity<ActivityWishListCreateBin
             .setAdapter(WishListAdapter())
             .build()
         rvDelegate.adapter.setOnItemChildClickListener { _, view, position ->
-            if (isCreatedWishList()) {
+            if (AvRoomDataManager.get().isHasOpenWishGift) {
                 SingleToastUtil.showToast(tips)
                 return@setOnItemChildClickListener
             }
@@ -78,7 +78,7 @@ class WishListCreateActivity : BaseViewBindingActivity<ActivityWishListCreateBin
             }
         }
         binding.tvAddWish.setOnClickListener {
-            if (isCreatedWishList()) {
+            if (AvRoomDataManager.get().isHasOpenWishGift) {
                 SingleToastUtil.showToast(tips)
                 return@setOnClickListener
             }
@@ -86,7 +86,7 @@ class WishListCreateActivity : BaseViewBindingActivity<ActivityWishListCreateBin
         }
 
         binding.tvCreateWish.setOnClickListener {
-            if (isCreatedWishList()) {
+            if (AvRoomDataManager.get().isHasOpenWishGift) {
                 SingleToastUtil.showToast(tips)
                 return@setOnClickListener
             }
@@ -95,7 +95,7 @@ class WishListCreateActivity : BaseViewBindingActivity<ActivityWishListCreateBin
             }
         }
         binding.tvCleanWish.setOnClickListener {
-            if (isCreatedWishList()) {
+            if (AvRoomDataManager.get().isHasOpenWishGift) {
                 SingleToastUtil.showToast(tips)
                 return@setOnClickListener
             }
@@ -131,10 +131,6 @@ class WishListCreateActivity : BaseViewBindingActivity<ActivityWishListCreateBin
 
     }
 
-    private fun isCreatedWishList(): Boolean {
-        return !AvRoomDataManager.get().wishGiftLiveData.value.isNullOrEmpty()
-    }
-
     override fun onResume() {
         super.onResume()
         viewModel.getRoomWishGiftList()

app/src/module_mini_world/res/layout/fragment_av_room_game.xml

@@ -123,7 +123,8 @@
             android:layout_height="30dp"
             android:layout_below="@id/ll_room_pk_order"
             android:layout_alignParentEnd="true"
-            android:layout_marginTop="5dp" />
+            android:layout_marginTop="5dp"
+            android:visibility="gone" />
 
         <TextView
             android:id="@+id/tv_hour_rank"

app/src/module_mini_world/res/layout/fragment_single_room.xml

@@ -98,6 +98,7 @@
             android:layout_width="80dp"
             android:layout_height="30dp"
             android:layout_marginTop="5dp"
+            android:visibility="gone"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toBottomOf="@id/contribute_list" />
 

core/src/diff_src_erban/java/com/mango/core/manager/IMNetEaseManager.java

@@ -1370,8 +1370,9 @@ public final class IMNetEaseManager {
                         WishListAttachment wishListAttachment = (WishListAttachment) attachment;
                         switch (second) {
                             case CUSTOM_MSG_WISH_LIST_OPEN:
+                                AvRoomDataManager.get().setHasOpenWishGift(true);
                             case CUSTOM_MSG_WISH_LIST_UPDATE:
-                                AvRoomDataManager.get().wishGiftLiveData.setValue(wishListAttachment.getWishItemInfos());
+                                AvRoomDataManager.get().wishGiftLiveData.setValue(wishListAttachment.getGifts());
                                 break;
                             case CUSTOM_MSG_WISH_LIST_FINISH:
                                 addMessages(msg);

core/src/main/java/com/mango/core/im/custom/bean/WishListAttachment.java

@@ -13,7 +13,7 @@ import java.util.List;
 
 public class WishListAttachment extends CustomAttachment {
     private long roomUid;
-    private List<WishItemInfo> wishItemInfos;
+    private List<WishItemInfo> gifts;
 
 
     public WishListAttachment(int first, int second) {
@@ -28,20 +28,19 @@ public class WishListAttachment extends CustomAttachment {
         this.roomUid = roomUid;
     }
 
-    public List<WishItemInfo> getWishItemInfos() {
+    public List<WishItemInfo> getGifts() {
-        return wishItemInfos;
+        return gifts;
     }
 
-    public void setWishItemInfos(List<WishItemInfo> wishItemInfos) {
+    public void setGifts(List<WishItemInfo> gifts) {
-        this.wishItemInfos = wishItemInfos;
+        this.gifts = gifts;
     }
 
     @Override
     protected void parseData(JSONObject data) {
         roomUid = data.getLongValue("roomUid");
-        wishItemInfos = data.getObject("wishItemInfos", new TypeReference<List<List<Integer>>>() {
+        gifts = data.getObject("gifts", new TypeReference<List<List<Integer>>>() {
         }.getType());
-
     }
 
     @Override

core/src/main/java/com/mango/core/manager/AvRoomDataManager.java

@@ -1328,6 +1328,10 @@ public final class AvRoomDataManager {
         return hasOpenWishGift;
     }
 
+    public void setHasOpenWishGift(boolean hasOpenWishGift) {
+        this.hasOpenWishGift = hasOpenWishGift;
+    }
+
     public boolean isLimitEnterRoom(String roomUid) {
         initKickOutRoomUids();
         Long limitTime = kickOutRoomUids.get(roomUid);