直播间UI调整,修改悬浮

live/src/main/java/com/yunbao/live/activity/LiveRyAnchorActivity.java

@@ -628,22 +628,7 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl
                 mLiveRoomViewHolder.initHourRankList();
             }
             mLiveRoomViewHolder.startAnchorLight();
-            //心愿单
-            LiveHttpUtil.getWishList(mLiveUid, new HttpCallback() {
-                @Override
-                public void onSuccess(int code, String msg, String[] info) {
-                    if (info.length > 0) {
-                        String json = info[0];
-                        WishlistModel model = GsonUtils.fromJson(json, WishlistModel.class);
-                        if (mLiveRoomViewHolder != null && model != null) {
-                            mLiveRoomViewHolder.initWishList(model.getWishlist());
-                        }
-                    }
-                }
-                @Override
-                public void onFinish() {
-                }
-            });
+
         }
         if (mLiveAnchorViewHolder == null) {
             mLiveAnchorViewHolder = new LiveRyAnchorViewHolder(mContext, mContainer);

live/src/main/java/com/yunbao/live/views/LiveAudienceViewHolder.java

@@ -387,32 +387,9 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder {
                 LiveRoomViewHolder.insertChat(lvBean2, 1);
             }
         }, 10000);//3秒后执行Runnable中的run方法
-        getNewPeopleInfo(false);
     }
 
-    public void getNewPeopleInfo(boolean show) {
-        API.get().pdLiveApi(mContext)
-                .getNewPeopleInfo()
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(stringResponseModel -> {
-                    NewPeopleInfo peopleInfo = stringResponseModel.getData().getInfo();
-                    if (peopleInfo.getIsShow()) {
-                        liveNewPeople.setVisibility(View.VISIBLE);
-                        if (peopleInfo.getLink().startsWith("http")) {
-                            newPeopleUrl = peopleInfo.getLink() + "?";
-                        } else {
-                            newPeopleUrl = CommonAppConfig.HOST + "/" + peopleInfo.getLink();
-                        }
-                        setUserPreferentialRedDot(peopleInfo.getShowRed() == 1);
-                        if (show) {
-                            openNewPeopleDialog();
-                        }
-                    } else {
-                        liveNewPeople.setVisibility(View.GONE);
-                    }
-                }, Throwable::printStackTrace).isDisposed();
-    }
+
 
     @Override
     public void onClick(View v) {
@@ -448,7 +425,7 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder {
      */
     public void openNewPeopleDialog() {
         if (newPeopleUrl == null) {
-            getNewPeopleInfo(true);
+//            getNewPeopleInfo(true);
             return;
         }
         Bundle bundle = new Bundle();

live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java

@@ -1463,16 +1463,19 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
      * @param giftCount 礼物数量
      */
     public void updataWishList(String giftId, int giftCount) {
-        for (WishlistItemModel model : wishlist) {
-            if (TextUtils.equals(giftId, model.getLid())) {
-                int number = Integer.parseInt(model.getWishlistProgress()) + giftCount;
-                model.setWishlistProgress(String.valueOf(number));
+        if (!(mContext instanceof LiveAudienceActivity)){
+            for (WishlistItemModel model : wishlist) {
+                if (TextUtils.equals(giftId, model.getLid())) {
+                    int number = Integer.parseInt(model.getWishlistProgress()) + giftCount;
+                    model.setWishlistProgress(String.valueOf(number));
+                }
             }
+            if (wishListLayout != null) {
+                wishListLayout.removeAllViews();
+            }
+            initWishList(wishlist);
         }
-        if (wishListLayout != null) {
-            wishListLayout.removeAllViews();
-        }
-        initWishList(wishlist);
+
     }
 
     //点击头像