From af7a8965a7389e264ea674690af6d1a4cae5a0e6 Mon Sep 17 00:00:00 2001 From: 18401019693 Date: Wed, 26 Oct 2022 14:45:39 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=B4=E6=92=AD=E9=97=B4UI=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yunbao/live/activity/LiveActivity.java | 6 ++- .../live/adapter/UserMoreInfoAdapter.java | 19 ++++++--- .../dialog/LiveUserMoreDialogFragment.java | 26 ++++++++++--- .../yunbao/live/views/LiveRoomViewHolder.java | 20 ++++++---- .../live/views/PortraitLiveManager.java | 2 +- .../main/res/layout/item_user_more_info.xml | 4 +- live/src/main/res/layout/view_live_room.xml | 23 ++++++++--- live/src/main/res/layout/view_noble_seat.xml | 36 ++++++++++++++++++ .../res/mipmap-xxxhdpi/live_icon_seat.png | Bin 0 -> 3396 bytes live/src/main/res/values/strings.xml | 1 + 10 files changed, 109 insertions(+), 28 deletions(-) create mode 100644 live/src/main/res/layout/view_noble_seat.xml create mode 100644 live/src/main/res/mipmap-xxxhdpi/live_icon_seat.png diff --git a/live/src/main/java/com/yunbao/live/activity/LiveActivity.java b/live/src/main/java/com/yunbao/live/activity/LiveActivity.java index e373e58ab..22538594a 100644 --- a/live/src/main/java/com/yunbao/live/activity/LiveActivity.java +++ b/live/src/main/java/com/yunbao/live/activity/LiveActivity.java @@ -23,6 +23,7 @@ import com.yunbao.common.Constants; import com.yunbao.common.activity.AbsActivity; import com.yunbao.common.activity.WebViewActivity; import com.yunbao.common.bean.ConfigBean; +import com.yunbao.common.bean.LiveBean; import com.yunbao.common.bean.LiveGiftBean; import com.yunbao.common.bean.NobleRankHideUserListModel; import com.yunbao.common.bean.UserBean; @@ -40,7 +41,6 @@ import com.yunbao.common.utils.WordUtil; import com.yunbao.common.utils.formatBigNum; import com.yunbao.live.R; import com.yunbao.live.bean.GuardUserBean; -import com.yunbao.common.bean.LiveBean; import com.yunbao.live.bean.LiveBuyGuardMsgBean; import com.yunbao.live.bean.LiveChatBean; import com.yunbao.live.bean.LiveDanMuBean; @@ -1245,7 +1245,7 @@ public abstract class LiveActivity extends AbsActivity implements SocketMessageL /** * 打开观看列表弹窗 */ - public void openUserMoreListWindow(int i, boolean isOnly) { + public void openUserMoreListWindow(int i, boolean isOnly, boolean noble) { if (outRankHideFirst) { //获取隐身的用户的ID @@ -1261,6 +1261,7 @@ public abstract class LiveActivity extends AbsActivity implements SocketMessageL bundle.putString(Constants.STREAM, mStream); bundle.putString("By", i + ""); bundle.putBoolean("only", isOnly); + bundle.putBoolean("noble", noble); bundle.putString("outRankHide", GsonUtils.toJson(outRankHide)); fragment.setArguments(bundle); fragment.show(getSupportFragmentManager(), "LiveUserMoreDialogFragment"); @@ -1281,6 +1282,7 @@ public abstract class LiveActivity extends AbsActivity implements SocketMessageL bundle.putString(Constants.STREAM, mStream); bundle.putString("By", i + ""); bundle.putBoolean("only", isOnly); + bundle.putBoolean("noble", noble); bundle.putString("outRankHide", GsonUtils.toJson(outRankHide)); fragment.setArguments(bundle); fragment.show(getSupportFragmentManager(), "LiveUserMoreDialogFragment"); diff --git a/live/src/main/java/com/yunbao/live/adapter/UserMoreInfoAdapter.java b/live/src/main/java/com/yunbao/live/adapter/UserMoreInfoAdapter.java index b4e64b886..a8bf3066b 100644 --- a/live/src/main/java/com/yunbao/live/adapter/UserMoreInfoAdapter.java +++ b/live/src/main/java/com/yunbao/live/adapter/UserMoreInfoAdapter.java @@ -52,6 +52,12 @@ public class UserMoreInfoAdapter extends RefreshAdapter { private Drawable mGuardDrawable2; private LiveUserMoreDialogFragment fragments; private List outRankHide = new ArrayList<>(); + private boolean noble = false; + + public UserMoreInfoAdapter setNoble(boolean noble) { + this.noble = noble; + return this; + } public UserMoreInfoAdapter(Context context, LiveUserMoreDialogFragment fragment) { super(context); @@ -149,14 +155,17 @@ public class UserMoreInfoAdapter extends RefreshAdapter { // title1.setText(R.string.noble); // title1.setVisibility(View.VISIBLE); // } - if (position == num && type.equals("1")) { + if (!noble && position == num && type.equals("1")) { title.setText(R.string.live_audience); title.setVisibility(View.VISIBLE); + } - - - mIcon.setImageBitmap(null); ivIcon.setVisibility(View.GONE); + if (noble) { + ivIcon.setVisibility(View.VISIBLE); + } + mIcon.setImageBitmap(null); + tvName.setVisibility(View.GONE); tvName.setTextSize(12); tvName.setTextColor(mContext.getResources().getColor(R.color.white)); @@ -254,7 +263,7 @@ public class UserMoreInfoAdapter extends RefreshAdapter { public void onComplete(SVGAVideoEntity videoItem) { SVGADrawable drawable = new SVGADrawable(videoItem); gift_svga.setImageDrawable(drawable); - SVGAViewUtils.playEndClear(gift_svga,false); + SVGAViewUtils.playEndClear(gift_svga, false); } @Override diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveUserMoreDialogFragment.java b/live/src/main/java/com/yunbao/live/dialog/LiveUserMoreDialogFragment.java index 24c6ff376..48ad13463 100644 --- a/live/src/main/java/com/yunbao/live/dialog/LiveUserMoreDialogFragment.java +++ b/live/src/main/java/com/yunbao/live/dialog/LiveUserMoreDialogFragment.java @@ -67,7 +67,7 @@ public class LiveUserMoreDialogFragment extends AbsDialogFragment implements Vie private RelativeLayout bottom_msg;//底部信息的布局，在榜单列表下不需要显示底部信息 private String Tips = "1"; private String type = "guanzhong"; - private boolean isOnly; + private boolean isOnly, noble; ImageView no_more; private List outRankHide = new ArrayList<>(); @@ -112,6 +112,7 @@ public class LiveUserMoreDialogFragment extends AbsDialogFragment implements Vie mLiveUid = bundle.getString(Constants.LIVE_UID); stream = bundle.getString(Constants.STREAM); isOnly = bundle.getBoolean("only", false); + noble = bundle.getBoolean("noble", false); String outRankHideString = bundle.getString("outRankHide"); outRankHide = GsonUtils.fromJson(outRankHideString, new TypeToken>() { }.getType()); @@ -269,9 +270,16 @@ public class LiveUserMoreDialogFragment extends AbsDialogFragment implements Vie List userGiftBeans = JSON.parseArray(json.getString("userlist"), LiveUserGiftBean.class); List data = new ArrayList<>(); for (LiveUserGiftBean model : userGiftBeans) { - if (TextUtils.equals(model.getNoble_id(), "0")) { - data.add(model); + if (noble) { + if (!TextUtils.equals(model.getNoble_id(), "0")) { + data.add(model); + } + } else { + if (TextUtils.equals(model.getNoble_id(), "0")) { + data.add(model); + } } + } Log.i("tag222", "ssss"); if (data.size() > 0 && pg == 1) { @@ -319,11 +327,19 @@ public class LiveUserMoreDialogFragment extends AbsDialogFragment implements Vie } }); mRefreshView.initData(); - if (isOnly) { + if (noble) { tabs.setVisibility(View.GONE); - title.setVisibility(View.GONE); + title.setVisibility(View.VISIBLE); + title.setText(R.string.noble); + userMoreInfoAdapter.setNoble(true); + } else { + if (isOnly) { + tabs.setVisibility(View.GONE); + title.setVisibility(View.GONE); + } } + } @Override diff --git a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java index ad2856128..3bac558da 100644 --- a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java @@ -882,6 +882,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis findViewById(R.id.btn_votes).setOnClickListener(this); findViewById(R.id.btn_medal_rank).setOnClickListener(this); findViewById(R.id.btn_noble).setOnClickListener(this); + findViewById(R.id.noble_seat).setOnClickListener(this); userMore.setOnClickListener(this); userGuard.setOnClickListener(this); @@ -1186,7 +1187,8 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis .append("&anchorUid=") .append(mLiveUid) .append("&t=") - .append(System.currentTimeMillis()); + .append(System.currentTimeMillis()) + .append("&g=Appapi&m=Wish&a=index"); } if (TextUtils.equals(type, "1")) { ZhuangBanActivity.forward(mContext, htmlUrl.toString(), false); @@ -1265,7 +1267,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis showBanner(); } catch (Exception e) { - e.printStackTrace(); + e.printStackTrace(); } } } @@ -1346,11 +1348,11 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis TextView wishIndex = wish.findViewById(R.id.wish_index); ImgLoader.display(mContext, wishlist.get(i).getWishlistIcon(), wishPic); wishIndex.setText(wishlist.get(i).getWishlistNumP()); - if(wishListFlipper!=null) { + if (wishListFlipper != null) { wishListFlipper.addView(wish); } } - if(wishListFlipper!=null) { + if (wishListFlipper != null) { wishListFlipper.startFlipping(); } }); @@ -1901,10 +1903,12 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis } else if (i == R.id.btn_prize_pool_level) { ((LiveActivity) mContext).openPrizePoolWindow(); } else if (i == R.id.user_more) { - ((LiveActivity) mContext).openUserMoreListWindow(1, false); + ((LiveActivity) mContext).openUserMoreListWindow(1, false, false); } else if (i == R.id.hot_btn) { - ((LiveActivity) mContext).openUserMoreListWindow(1, false); + ((LiveActivity) mContext).openUserMoreListWindow(1, false, false); + } else if (i == R.id.noble_seat) { + ((LiveActivity) mContext).openUserMoreListWindow(1, false, true); } else if (i == R.id.btn_close) { close(); //小屏 @@ -2799,9 +2803,9 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis * 切换美颜UI */ public void changeFaceUnityView() { - // faceUnityView.setVisibility(faceUnityView.getVisibility() == View.GONE ? View.VISIBLE : View.GONE); + // faceUnityView.setVisibility(faceUnityView.getVisibility() == View.GONE ? View.VISIBLE : View.GONE); LiveFaceUnityDialogFragment fragment = new LiveFaceUnityDialogFragment(mContext); - fragment.setManager(manager); + fragment.setManager(manager); fragment.show(((LiveActivity) mContext).getSupportFragmentManager(), "faceUi"); } diff --git a/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java b/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java index 49037a066..3e14ac6fd 100644 --- a/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java +++ b/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java @@ -279,7 +279,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe String json = info[0]; WishlistModel model = GsonUtils.fromJson(json, WishlistModel.class); if (mLiveRoomViewHolder != null && model != null) { - mLiveRoomViewHolder.initWishList(model.getWishlist()); +// mLiveRoomViewHolder.initWishList(model.getWishlist()); } diff --git a/live/src/main/res/layout/item_user_more_info.xml b/live/src/main/res/layout/item_user_more_info.xml index 2e378d483..493646708 100644 --- a/live/src/main/res/layout/item_user_more_info.xml +++ b/live/src/main/res/layout/item_user_more_info.xml @@ -175,11 +175,11 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentRight="true" - android:layout_marginEnd="25dp" android:layout_gravity="center" + android:layout_marginTop="25dp" + android:layout_marginEnd="25dp" android:paddingLeft="13dp" android:text="主播" - android:layout_marginTop="25dp" android:textColor="@color/white" android:textSize="10sp" /> diff --git a/live/src/main/res/layout/view_live_room.xml b/live/src/main/res/layout/view_live_room.xml index b5e2d8c67..54c8b9f66 100644 --- a/live/src/main/res/layout/view_live_room.xml +++ b/live/src/main/res/layout/view_live_room.xml @@ -355,6 +355,7 @@ android:id="@+id/wish_list_layout" android:layout_width="80dp" android:layout_height="21dp" + android:layout_alignTop="@id/hour_rank_layout" android:layout_marginStart="10dp" android:layout_toRightOf="@id/live_wks_layout" @@ -363,7 +364,7 @@ android:orientation="horizontal" android:paddingStart="5dp" android:paddingEnd="5dp" - android:visibility="visible"> + android:visibility="gone"> + + + + + + android:background="@drawable/bg_live_room_msg" + android:visibility="gone"> + android:layout_height="30dp" + android:visibility="visible"> \ No newline at end of file diff --git a/live/src/main/res/layout/view_noble_seat.xml b/live/src/main/res/layout/view_noble_seat.xml new file mode 100644 index 000000000..78524a409 --- /dev/null +++ b/live/src/main/res/layout/view_noble_seat.xml @@ -0,0 +1,36 @@ + + + + + + + + + + \ No newline at end of file diff --git a/live/src/main/res/mipmap-xxxhdpi/live_icon_seat.png b/live/src/main/res/mipmap-xxxhdpi/live_icon_seat.png new file mode 100644 index 0000000000000000000000000000000000000000..ee2205e350eec18aba3d021b11694cdf1564eba9 GIT binary patch literal 3396 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手指上滑，取消發送 松開取消發送 已超过10秒未识别到录音 + 貴族坐席