From 048c66736fcb82e95ee777a9441279842c77fe89 Mon Sep 17 00:00:00 2001 From: zlzw <583819556@qq.com> Date: Thu, 18 Jul 2024 16:39:06 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=E7=A4=BC=E7=89=A9?= =?UTF-8?q?=E5=A2=99=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adapter/GiftWallMainTab1List2Adapter.java | 2 +- .../com/yunbao/common/bean/GiftWallBean.java | 25 +++++++++++++------ .../yunbao/common/dialog/GiftWallDialog.java | 17 +++++++++---- .../common/dialog/GiftWallGiftInfoDialog.java | 4 +-- .../GiftWallMainTab1List2SpinnerDialog.java | 8 +++++- .../fragment/GiftWallMainTab1Fragment.java | 2 +- .../fragment/GiftWallMainTab2Fragment.java | 6 ++--- common/src/main/res/values-zh/strings.xml | 1 + common/src/main/res/values/strings.xml | 1 + .../live/views/LivePlaySwViewHolder.java | 3 ++- .../src/main/res/layout/view_live_push_sw.xml | 3 ++- 11 files changed, 49 insertions(+), 23 deletions(-) diff --git a/common/src/main/java/com/yunbao/common/adapter/GiftWallMainTab1List2Adapter.java b/common/src/main/java/com/yunbao/common/adapter/GiftWallMainTab1List2Adapter.java index d066c650c..dcbef6fcc 100644 --- a/common/src/main/java/com/yunbao/common/adapter/GiftWallMainTab1List2Adapter.java +++ b/common/src/main/java/com/yunbao/common/adapter/GiftWallMainTab1List2Adapter.java @@ -148,7 +148,7 @@ public class GiftWallMainTab1List2Adapter extends RecyclerView.Adapter 999) { + return "999+"; + } + return gift_hall_send_num + ""; + } + public void setGift_hall_send_num(int gift_hall_send_num) { this.gift_hall_send_num = gift_hall_send_num; } diff --git a/common/src/main/java/com/yunbao/common/dialog/GiftWallDialog.java b/common/src/main/java/com/yunbao/common/dialog/GiftWallDialog.java index 8b9bb6ad9..f34733efc 100644 --- a/common/src/main/java/com/yunbao/common/dialog/GiftWallDialog.java +++ b/common/src/main/java/com/yunbao/common/dialog/GiftWallDialog.java @@ -23,6 +23,7 @@ import com.yunbao.common.fragment.BaseFragment; import com.yunbao.common.fragment.GiftWallMainTab1Fragment; import com.yunbao.common.fragment.GiftWallMainTab2Fragment; import com.yunbao.common.interfaces.OnItemClickListener; +import com.yunbao.common.manager.IMLoginManager; import com.yunbao.common.utils.DpUtil; import com.yunbao.common.utils.ScreenDimenUtil; import com.yunbao.common.utils.WordUtil; @@ -78,7 +79,7 @@ public class GiftWallDialog extends AbsDialogPopupWindow { @Override protected int getPopupHeight() { if (isFullWindows) { - return super.getPopupHeight()-DpUtil.dp2px(10); + return super.getPopupHeight() - DpUtil.dp2px(10); } int screenHeight = ScreenDimenUtil.getInstance().getScreenHeight(); return (int) (screenHeight * 0.8); @@ -104,7 +105,11 @@ public class GiftWallDialog extends AbsDialogPopupWindow { @Override public void onItemClick(GiftWallBean bean, int position) { if (position == 1) { - mAchievement.setVisibility(View.INVISIBLE); + if (toUserId.equals(IMLoginManager.get(mContext).getUserInfo().getId() + "")) { + mAchievement.setVisibility(View.VISIBLE); + } else { + mAchievement.setVisibility(View.INVISIBLE); + } } else { mAchievement.setVisibility(View.VISIBLE); } @@ -175,13 +180,15 @@ public class GiftWallDialog extends AbsDialogPopupWindow { }); resetWindows(); } - private void resetWindows(){ - if(isFullWindows){ + + private void resetWindows() { + if (isFullWindows) { ConstraintLayout.LayoutParams params = (ConstraintLayout.LayoutParams) findViewById(R.id.v_achievement).getLayoutParams(); - params.topMargin=DpUtil.dp2px(47); + params.topMargin = DpUtil.dp2px(47); findViewById(R.id.v_achievement).setLayoutParams(params); } } + @Override protected void onCreate() { super.onCreate(); diff --git a/common/src/main/java/com/yunbao/common/dialog/GiftWallGiftInfoDialog.java b/common/src/main/java/com/yunbao/common/dialog/GiftWallGiftInfoDialog.java index d36701f44..c2627d991 100644 --- a/common/src/main/java/com/yunbao/common/dialog/GiftWallGiftInfoDialog.java +++ b/common/src/main/java/com/yunbao/common/dialog/GiftWallGiftInfoDialog.java @@ -239,8 +239,8 @@ public class GiftWallGiftInfoDialog extends AbsDialogPopupWindow { mIvBack.setVisibility(View.VISIBLE); mIvBg.setScaleType(ImageView.ScaleType.CENTER_CROP); } else { - params.width = DpUtil.dp2px(1); - mIvBack.setVisibility(View.INVISIBLE); + params.width = DpUtil.dp2px(20); + mIvBack.setVisibility(View.VISIBLE); mIvBg.setScaleType(ImageView.ScaleType.FIT_XY); } mIvBack.setLayoutParams(params); diff --git a/common/src/main/java/com/yunbao/common/dialog/GiftWallMainTab1List2SpinnerDialog.java b/common/src/main/java/com/yunbao/common/dialog/GiftWallMainTab1List2SpinnerDialog.java index b2d07a45c..1bc190d9f 100644 --- a/common/src/main/java/com/yunbao/common/dialog/GiftWallMainTab1List2SpinnerDialog.java +++ b/common/src/main/java/com/yunbao/common/dialog/GiftWallMainTab1List2SpinnerDialog.java @@ -13,10 +13,12 @@ import com.yunbao.common.views.weight.ViewClicksAntiShake; public class GiftWallMainTab1List2SpinnerDialog extends AttachPopupView { TextView all, up, down; OnItemClickListener listener; + int type=0; - public GiftWallMainTab1List2SpinnerDialog(@NonNull Context context, OnItemClickListener listener) { + public GiftWallMainTab1List2SpinnerDialog(@NonNull Context context,int type, OnItemClickListener listener) { super(context); this.listener = listener; + this.type=type; } @Override @@ -36,6 +38,10 @@ public class GiftWallMainTab1List2SpinnerDialog extends AttachPopupView { all = findViewById(R.id.spinner_all); up = findViewById(R.id.spinner_up); down = findViewById(R.id.spinner_down); + if(type==1){ + up.setText(R.string.dialog_gift_wall_gfit_info_list_bottom_btn_one_champion_get); + down.setText(R.string.dialog_gift_wall_gfit_info_list_bottom_btn_one_champion_get_un); + } ViewClicksAntiShake.clicksAntiShake(all, () -> { listener.onItemClick(0, 0); dismiss(); diff --git a/common/src/main/java/com/yunbao/common/fragment/GiftWallMainTab1Fragment.java b/common/src/main/java/com/yunbao/common/fragment/GiftWallMainTab1Fragment.java index ca83cedc0..15a3a1e8e 100644 --- a/common/src/main/java/com/yunbao/common/fragment/GiftWallMainTab1Fragment.java +++ b/common/src/main/java/com/yunbao/common/fragment/GiftWallMainTab1Fragment.java @@ -209,7 +209,7 @@ public class GiftWallMainTab1Fragment extends BaseFragment { @Override public void onViewClicks() { spinnerImage.setRotation(180); - ((XPopup.Builder) spinner.getTag()).asCustom(new GiftWallMainTab1List2SpinnerDialog(getContext(), new OnItemClickListener() { + ((XPopup.Builder) spinner.getTag()).asCustom(new GiftWallMainTab1List2SpinnerDialog(getContext(), 0, new OnItemClickListener() { @Override public void onItemClick(Integer bean, int position) { if (bean > -1) { diff --git a/common/src/main/java/com/yunbao/common/fragment/GiftWallMainTab2Fragment.java b/common/src/main/java/com/yunbao/common/fragment/GiftWallMainTab2Fragment.java index d5aae6dff..c7b2d4589 100644 --- a/common/src/main/java/com/yunbao/common/fragment/GiftWallMainTab2Fragment.java +++ b/common/src/main/java/com/yunbao/common/fragment/GiftWallMainTab2Fragment.java @@ -169,7 +169,7 @@ public class GiftWallMainTab2Fragment extends BaseFragment { @Override public void onViewClicks() { spinnerImage.setRotation(180); - ((XPopup.Builder) spinner.getTag()).asCustom(new GiftWallMainTab1List2SpinnerDialog(getContext(), new OnItemClickListener() { + ((XPopup.Builder) spinner.getTag()).asCustom(new GiftWallMainTab1List2SpinnerDialog(getContext(),1, new OnItemClickListener() { @Override public void onItemClick(Integer bean, int position) { if (bean > -1) { @@ -181,10 +181,10 @@ public class GiftWallMainTab2Fragment extends BaseFragment { spinnerText.setText(R.string.dialog_gift_wall_list_spinner_all); break; case 1: - spinnerText.setText(R.string.dialog_gift_wall_list_spinner_up); + spinnerText.setText(R.string.dialog_gift_wall_gfit_info_list_bottom_btn_one_champion_get); break; case 2: - spinnerText.setText(R.string.dialog_gift_wall_list_spinner_down); + spinnerText.setText(R.string.dialog_gift_wall_gfit_info_list_bottom_btn_one_champion_get_un); break; } spinnerImage.setRotation(0); diff --git a/common/src/main/res/values-zh/strings.xml b/common/src/main/res/values-zh/strings.xml index 74319d103..9791043a8 100644 --- a/common/src/main/res/values-zh/strings.xml +++ b/common/src/main/res/values-zh/strings.xml @@ -1522,6 +1522,7 @@ 已點亮 已摘星 已冠名 + 未冠名 排名 冠名歸屬 周星歸屬 diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml index 04979c6a8..64922bc1d 100644 --- a/common/src/main/res/values/strings.xml +++ b/common/src/main/res/values/strings.xml @@ -1526,6 +1526,7 @@ Lit up Picked Titled + Untitled Rank Title attribution Weekly star attribution diff --git a/live/src/main/java/com/yunbao/live/views/LivePlaySwViewHolder.java b/live/src/main/java/com/yunbao/live/views/LivePlaySwViewHolder.java index 7057feaeb..d7e1eed2a 100644 --- a/live/src/main/java/com/yunbao/live/views/LivePlaySwViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LivePlaySwViewHolder.java @@ -184,6 +184,7 @@ public class LivePlaySwViewHolder extends LiveRoomPlayViewHolder { } public void initSwEngine(String liveUid) { + dr_pk_view.setVisibility(View.GONE); this.liveUid = liveUid; //初始化声网SDK swAuManager = SWAuManager.get(); @@ -630,7 +631,7 @@ public class LivePlaySwViewHolder extends LiveRoomPlayViewHolder { mEnd = true; mStarted = false; Bus.getOff(this); - if(ry_view!=null){ + if (ry_view != null) { ry_view.removeAllViews(); } //swAuManager.release(); diff --git a/live/src/main/res/layout/view_live_push_sw.xml b/live/src/main/res/layout/view_live_push_sw.xml index bbe8f0a50..be9c1d054 100644 --- a/live/src/main/res/layout/view_live_push_sw.xml +++ b/live/src/main/res/layout/view_live_push_sw.xml @@ -44,7 +44,8 @@ android:layout_height="270dp" android:layout_marginTop="130dp" android:orientation="horizontal" - android:visibility="gone"> + android:visibility="gone" + tools:visibility="visible">