initHourRankList UI调整

2024-10-22 17:10:08 +08:00
parent 3ddcc944c0
commit 5c369f7215
11 changed files with 155 additions and 66 deletions
--- a/live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup2.java
+++ b/live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup2.java
@@ -61,6 +61,7 @@ import com.yunbao.common.event.GiftNumberEvent;
 import com.yunbao.common.event.LiveGiftDialogEvent;
 import com.yunbao.common.event.SendBlindGiftEvent;
 import com.yunbao.common.glide.ImgLoader;
+import com.yunbao.common.http.API;
 import com.yunbao.common.http.HttpCallback;
 import com.yunbao.common.http.HttpClient;
 import com.yunbao.common.http.LiveHttpUtil;
@@ -108,6 +109,9 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;

+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
+
 /**
 * 直播间新送礼弹窗
 */
@@ -380,14 +384,14 @@ public class LiveGiftPopup2 extends AbsDialogFragment {
                    }
                    if (number == 0) {
                        iterator.remove();
-                    }else {
+                    } else {
                        bean.setChecked(false);
                    }
                }

                if (mWrapGiftList != null && !mWrapGiftList.isEmpty()) {
                    //mWrapGiftList.get(0).setChecked(true);
-                    mFrameGiftNewAdapter = new FrameGiftNewAdapter(mWrapGiftList, mStream, mLiveUid, "",true);
+                    mFrameGiftNewAdapter = new FrameGiftNewAdapter(mWrapGiftList, mStream, mLiveUid, "", true);
                    giftRecyclerView.setAdapter(mFrameGiftNewAdapter);
                    emptyGroup.setVisibility(View.GONE);
 //                    mWrapGiftList.get(0).setChecked(true);
@@ -419,7 +423,7 @@ public class LiveGiftPopup2 extends AbsDialogFragment {
        ViewClicksAntiShake.clicksAntiShake(liveGiftSend, new ViewClicksAntiShake.ViewClicksCallBack() {
            @Override
            public void onViewClicks() {
-                if(!liveGiftSend.isSelected()){
+                if (!liveGiftSend.isSelected()) {
                    return;
                }
                MobclickAgent.onEvent(mContext, "gif_list_seed_gif", "用户送礼物");
@@ -539,7 +543,7 @@ public class LiveGiftPopup2 extends AbsDialogFragment {
        ViewClicksAntiShake.clicksAntiShake(giftSendBgV, new ViewClicksAntiShake.ViewClicksCallBack() {
            @Override
            public void onViewClicks() {
-                if (liveGiftModel.getType() == 7 ) return;
+                if (liveGiftModel.getType() == 7) return;
                new XPopup.Builder(getContext())
                        .enableDrag(false)
                        .asCustom(new GiftNumberPopup(getContext()))
@@ -750,19 +754,14 @@ public class LiveGiftPopup2 extends AbsDialogFragment {
        }
        if (liveGiftModel.getTag() != null) {
            if (mCount.equals("1")) {
-                LiveHttpUtil.setFrontTask("sendgift", mLiveUid, new HttpCallback() {
-                    @Override
-                    public void onSuccess(int code, String msg, String[] info) {
-                        EventBus.getDefault().post("stop_svga_new_user_gif");
-                        EventBus.getDefault().post("stop_new_user_gif");
-                        if (code == 0) {
-                            EventBus.getDefault().post("stop_new_user_gif1");
-                        }
-                        dismiss();
+                API.get().pdLiveApi(mContext).sendFreeGift(mLiveUid).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(listResponseModel -> {
+                    EventBus.getDefault().post("stop_svga_new_user_gif");
+                    EventBus.getDefault().post("stop_new_user_gif");
+                    if (listResponseModel.getData() != null && listResponseModel.getData().getCode() == 0) {
+                        EventBus.getDefault().post("stop_new_user_gif1");
                    }
-                });
-            } else {
-                ToastUtil.show(mContext.getString(com.yunbao.live.R.string.only_one));
+                    dismiss();
+                }, Throwable::printStackTrace).isDisposed();
            }
        } else {
            if (TextUtils.isEmpty(mLiveUid) || TextUtils.isEmpty(mStream) || liveGiftModel == null) {
--- a/live/src/main/java/com/yunbao/live/socket/SocketRyChatUtil.java
+++ b/live/src/main/java/com/yunbao/live/socket/SocketRyChatUtil.java
@@ -210,14 +210,14 @@ public class SocketRyChatUtil {
                    }
                });

-                LiveHttpUtil.setFrontTask("illumine", new HttpCallback() {
-                    @Override
-                    public void onSuccess(int code, String msg, String[] info) {
-                        if (code == 0) {
-                            EventBus.getDefault().post("stop_svga_new_user_double1");
-                        }
-                    }
-                });
+//                LiveHttpUtil.setFrontTask("illumine", new HttpCallback() {
+//                    @Override
+//                    public void onSuccess(int code, String msg, String[] info) {
+//                        if (code == 0) {
+//                            EventBus.getDefault().post("stop_svga_new_user_double1");
+//                        }
+//                    }
+//                });
                if (SocketRyClient.mSocketHandler != null)
                    SocketRyClient.mSocketHandler.processBroadcast(msg.mResult.toString() + "");
            }
--- a/live/src/main/java/com/yunbao/live/socket/SocketSwChatUtil.java
+++ b/live/src/main/java/com/yunbao/live/socket/SocketSwChatUtil.java
@@ -210,14 +210,14 @@ public class SocketSwChatUtil {
                    }
                });

-                LiveHttpUtil.setFrontTask("illumine", new HttpCallback() {
-                    @Override
-                    public void onSuccess(int code, String msg, String[] info) {
-                        if (code == 0) {
-                            EventBus.getDefault().post("stop_svga_new_user_double1");
-                        }
-                    }
-                });
+//                LiveHttpUtil.setFrontTask("illumine", new HttpCallback() {
+//                    @Override
+//                    public void onSuccess(int code, String msg, String[] info) {
+//                        if (code == 0) {
+//                            EventBus.getDefault().post("stop_svga_new_user_double1");
+//                        }
+//                    }
+//                });
                if (SocketSwClient.mSocketHandler != null)
                    SocketSwClient.mSocketHandler.processBroadcast(msg.mResult.toString() + "");
            }
--- a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
+++ b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
@@ -554,7 +554,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
    @Subscribe(threadMode = ThreadMode.MAIN)
    public void onUpdata(String str) {
        if ("svga_new_user_gif".equals(str)) {
-            svga_new_user_gif();
+           // svga_new_user_gif();
        } else if ("svga_new_user_double".equals(str)) {
            svga_new_user_double();
        } else if ("svga_new_user_follow".equals(str)) {
@@ -4832,15 +4832,15 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis

        EventBus.getDefault().post("stop_svga_new_user_follow");

-        LiveHttpUtil.setFrontTask("attent", new HttpCallback() {
-            @Override
-            public void onSuccess(int code, String msg, String[] info) {
-                if (code == 0) {
-                    isAttention = 1;
-                    EventBus.getDefault().post("stop_svga_new_user_follow1");
-                }
-            }
-        });
+//        LiveHttpUtil.setFrontTask("attent", new HttpCallback() {
+//            @Override
+//            public void onSuccess(int code, String msg, String[] info) {
+//                if (code == 0) {
+//                    isAttention = 1;
+//                    EventBus.getDefault().post("stop_svga_new_user_follow1");
+//                }
+//            }
+//        });

        if (TextUtils.isEmpty(mLiveUid)) {
            return;
@@ -5836,6 +5836,14 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
    public void configBanner3(NewPeopleTaskModel newPeopleTask) {
        TaskModel taskModel = newPeopleTask.getTask();

+        if (newPeopleTask.hasFreeGift()) {
+            IMLoginManager.get(mContext).setNewUserGif(true);
+            svga_new_user_gif();
+            EventBus.getDefault().post("svga_new_user_gif");
+        }else {
+            IMLoginManager.get(mContext).setNewUserGif(false);
+        }
+
        if (taskModel != null) {
            GiftModel giftModel = newPeopleTask.getGift();
            if (giftModel != null) {
@@ -5850,15 +5858,21 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
                bean1.setName(giftModel.getGiftname());
                bean1.setTag("1");
                bean1.setPrice(WordUtil.isNewZh() ? "免费" : "free");
-                if (!IMLoginManager.get(mContext).isisNewUserOne()) {
-                    if (TextUtils.equals(taskModel.getSendgift(), "0")) {
-                        IMLoginManager.get(mContext).setNewUserGif(true);
-                        EventBus.getDefault().post("svga_new_user_gif");
-                    }
-                }
+
+//                if (!IMLoginManager.get(mContext).isisNewUserOne()) {
+//
+//                }
+//                if (newPeopleTask.hasFreeGift()) {
+//                    IMLoginManager.get(mContext).setNewUserGif(true);
+//                    svga_new_user_gif();
+//                    EventBus.getDefault().post("svga_new_user_gif");
+//                }else {
+//                    IMLoginManager.get(mContext).setNewUserGif(false);
+//                }
+
                BannerBean banner3Bean = new BannerBean();
                banner3Bean.setImageUrl("https://downs.yaoulive.com/live_Mission_box.png");
-                banner3Bean.setLink(taskModel.getSendgift());
+                banner3Bean.setLink(newPeopleTask.getIsFreeGift());
                mBannerList3.add(banner3Bean);


@@ -5872,7 +5886,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
                banner3Bean2.setLink(taskModel.getIllumine());
                mBannerList3.add(banner3Bean2);

-                if (TextUtils.equals(taskModel.getSendgift(), "0") && !IMLoginManager.get(mContext).isisNewUserOne()) {
+                if (newPeopleTask.hasFreeGift() && !IMLoginManager.get(mContext).isisNewUserOne()) {
                    showBanner3(bean1);
                } else if (TextUtils.equals(taskModel.getAttent(), "0") && !IMLoginManager.get(mContext).isisNewUserOne()) {
                    showBanner3(bean1);
--- a/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java
+++ b/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java
@@ -924,7 +924,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
                                mLiveRoomViewHolder.firstLookLiveNotify();
                            }
                            //判断是否有免费礼物
-                            if("0".equals(data.getNewPeopleTask().getTask().getSendgift())){
+                            if(data.getNewPeopleTask().hasFreeGift()){
                                mLiveRoomViewHolder.firstLook5MinLiveNotify();
                            }
                            //观看200秒之后，推送活动入口im消息