1:修改礼物飘屏判断送的人和接收的人

2：修改所有盘在次点击的时候，初始化选中状态
3：修改礼物飘屏的文字大小
4：修改首页去围观展示的文字

BaseModule/src/main/java/com/xscm/moduleutil/bean/GiftBean.java

@@ -41,7 +41,8 @@ public class GiftBean {
     public boolean isSameGiftFromSameSender(GiftBean other) {
         if (other == null) return false;
         return Objects.equals(gift_id, other.gift_id) &&
-                Objects.equals(senderName, other.senderName);
+                Objects.equals(senderName, other.senderName) &&
+                Objects.equals(nickname,other.nickname);
     }
 
     // 生成礼物唯一键

BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java

@@ -2960,41 +2960,49 @@ public class RetrofitClient {
 
     public void roomAuctionJoin(String auctionId, String userId, String giftId, String
             num, String type, BaseObserver<RoomAuction.AuctionListBean> observer) {
-        sApiServer.roomAuctionJoin(auctionId, userId, giftId, num, type).enqueue(new ApiResponseCallback<RoomAuction.AuctionListBean>(CommonAppContext.getInstance()) {
+        sApiServer.roomAuctionJoin(auctionId, userId, giftId, num, type)
-            @Override
+//                .enqueue(new ApiResponseCallback<RoomAuction.AuctionListBean>(CommonAppContext.getInstance()) {
-            public void onSuccess(RoomAuction.AuctionListBean data) {
-                if (data != null) {
-                    observer.onNext(data);
-                } else {
-                    observer.onNext(new RoomAuction.AuctionListBean());
-                }
-            }
-
-            @Override
-            public void onFailure(Throwable t) {
-                t.printStackTrace();
-            }
-        });
-//                .enqueue(new Callback<BaseModel<RoomAuction.AuctionListBean>>() {
-//
 //            @Override
-//            public void onResponse(Call<BaseModel<RoomAuction.AuctionListBean>> call, Response<BaseModel<RoomAuction.AuctionListBean>> response) {
+//            public void onSuccess(RoomAuction.AuctionListBean data) {
-//                if (response.code() == 200) {
+//                if (data != null) {
-//                    BaseModel<RoomAuction.AuctionListBean> baseModel = response.body();
+//                    observer.onNext(data);
-//
+//                } else {
-//                    if (baseModel.getCode() == 1) {
+//                    observer.onNext(new RoomAuction.AuctionListBean());
-//                        observer.onNext( null);
-//                    } else {
-//                        ToastUtils.showShort(baseModel.getMsg());
-//                    }
 //                }
 //            }
 //
 //            @Override
-//            public void onFailure(Call<BaseModel<RoomAuction.AuctionListBean>> call, Throwable t) {
+//            public void onFailure(Throwable t) {
 //                t.printStackTrace();
 //            }
 //        });
+                .enqueue(new Callback<BaseModel<RoomAuction.AuctionListBean>>() {
+
+            @Override
+            public void onResponse(Call<BaseModel<RoomAuction.AuctionListBean>> call, Response<BaseModel<RoomAuction.AuctionListBean>> response) {
+                if (response.code() == 200) {
+                    BaseModel<RoomAuction.AuctionListBean> baseModel = response.body();
+
+                    if (baseModel.getCode() == 1) {
+                        observer.onNext( new RoomAuction.AuctionListBean());
+                    }else if (baseModel.getCode() == 0) {
+                        ToastUtils.showShort(baseModel.getMsg());
+                    }else if (baseModel.getCode() == 301) {
+                        try {
+                            ToastUtils.showShort(baseModel.getMsg());
+                            CommonAppContext.getInstance().clearLoginInfo();
+                        } catch (ClassNotFoundException e) {
+                            throw new RuntimeException(e);
+                        }
+                    }
+                }
+            }
+
+            @Override
+            public void onFailure(Call<BaseModel<RoomAuction.AuctionListBean>> call, Throwable t) {
+                t.printStackTrace();
+            }
+        });
     }
 
     public void auctionDelay(String auctionId, BaseObserver<String> observer) {

BaseModule/src/main/res/layout/item_piaoping.xml

@@ -34,7 +34,7 @@
             android:maxLines="2"
             android:text="礼品"
             android:textColor="#FFDE77"
-            android:textSize="14sp"
+            android:textSize="12sp"
             android:textStyle="bold" />
 
         <TextView
@@ -44,7 +44,7 @@
             android:layout_marginEnd="@dimen/dp_8"
             android:text="...."
             android:textColor="#FFDE77"
-            android:textSize="14sp"
+            android:textSize="12sp"
             android:textStyle="bold" />
     </LinearLayout>
 

MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt

@@ -1513,7 +1513,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
         } else if (msgType == EMMessageInfo.QXRoomMessageTypeSignTipText) {
             roomFragment?.handleRoomMessage(messageEvent)
         }else if (msgType == EMMessageInfo.QXRoomMessageTypeSignChat) {//暴币展示
-            QXGiftPlayerManager.getInstance(this).displayFullEffectView(messageEvent.text.play_image)
+            QXGiftPlayerManager.getInstance(this).displayChatEffectView(messageEvent.text.play_image)
         }
     }
 

MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/VoiceCategoryFragment.java

@@ -5,6 +5,7 @@ import static android.view.View.GONE;
 import android.content.Intent;
 import android.graphics.Color;
 import android.os.Bundle;
+import android.text.TextUtils;
 import android.util.DisplayMetrics;
 import android.util.TypedValue;
 import android.view.LayoutInflater;
@@ -233,7 +234,11 @@ public class VoiceCategoryFragment extends BaseMvpFragment<VoiceCategoryPresente
                 mqttList.addAll(cachedMqttBeans.get(i).getList());
             }
             for (int i = 0; i < mqttList.size(); i++) {
-                info.add(mqttList.get(i).getFromUserName() + "送给" + mqttList.get(i).getToUserName() + "\n" + mqttList.get(i).getGiftName());
+                if (TextUtils.isEmpty(mqttList.get(i).getToUserName())) {
+                    info.add(mqttList.get(i).getText());
+                } else {
+                    info.add(mqttList.get(i).getFromUserName() + "送给" + mqttList.get(i).getToUserName() + "\n" + mqttList.get(i).getGiftName());
+                }
             }
 
 

MainModule/src/main/java/com/xscm/modulemain/dialog/GiftLotteryDialog.java

@@ -372,6 +372,14 @@ public class GiftLotteryDialog extends BaseMvpDialogFragment<GiftLotteryPresente
         circularProgress.setProgress(0);
     }
 
+    private void setSelected(){
+        for (GiftCardView gridView : allViewsArray) {
+            gridView.setSelected(false);
+            gridView.stopPulseAnimationWithLayer();
+            gridView.setVisibilitymResultTextView(false);
+        }
+    }
+
     private void onClisk(View view) {
         int id = view.getId();
 
@@ -381,6 +389,7 @@ public class GiftLotteryDialog extends BaseMvpDialogFragment<GiftLotteryPresente
                 isDrawing = true;
 //                init(1);
                 startType = 1;
+                setSelected();
                 MvpPre.drawGiftList(giftBagId, userIds, roomId, "1", heart_id,auction_id);
             } else {
 //                com.hjq.toast.ToastUtils.show("正在抽奖中...");
@@ -391,6 +400,7 @@ public class GiftLotteryDialog extends BaseMvpDialogFragment<GiftLotteryPresente
                 isDrawing = true;
 //                init(2);
                 startType = 2;
+                setSelected();
                 MvpPre.drawGiftList(giftBagId, userIds, roomId, "6", heart_id,auction_id);
 
             } else {
@@ -401,6 +411,7 @@ public class GiftLotteryDialog extends BaseMvpDialogFragment<GiftLotteryPresente
                 isDrawing = true;
 //                init(3);
                 startType = 3;
+                setSelected();
                 MvpPre.drawGiftList(giftBagId, userIds, roomId, "9", heart_id,auction_id);
             } else {
 //                com.hjq.toast.ToastUtils.show("正在抽奖中...");