From 9dcc23960eea3eeb29b91ccddf175db42eb098b3 Mon Sep 17 00:00:00 2001 From: 18401019693 Date: Fri, 11 Nov 2022 09:53:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E8=8F=9C=E5=8D=95=E7=9A=84=E5=B1=95?= =?UTF-8?q?=E5=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/views/CustomDrawerPopupView.java | 73 ++++++++++++++++ .../views/DrawerRecommendChildViewHolder.java | 30 +++++++ .../common/views/MoreMenuPopupView.java | 24 ++++++ .../main/res/layout/custom_drawer_popup.xml | 12 ++- common/src/main/res/layout/view_more_menu.xml | 79 ++++++++++++++++++ .../mipmap-xxhdpi/live_more_icon_report.png | Bin 2451 -> 2277 bytes .../mipmap-xxhdpi/live_more_icon_service.png | Bin 2690 -> 2428 bytes .../mipmap-xxhdpi/live_more_icon_system.png | Bin 2216 -> 1808 bytes common/src/main/res/values/strings.xml | 2 + .../live/activity/LiveAudienceActivity.java | 25 +++++- 10 files changed, 242 insertions(+), 3 deletions(-) create mode 100644 common/src/main/java/com/yunbao/common/views/MoreMenuPopupView.java create mode 100644 common/src/main/res/layout/view_more_menu.xml diff --git a/common/src/main/java/com/yunbao/common/views/CustomDrawerPopupView.java b/common/src/main/java/com/yunbao/common/views/CustomDrawerPopupView.java index bb1d81dab..0c93c300a 100644 --- a/common/src/main/java/com/yunbao/common/views/CustomDrawerPopupView.java +++ b/common/src/main/java/com/yunbao/common/views/CustomDrawerPopupView.java @@ -7,7 +7,9 @@ import androidx.annotation.NonNull; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; +import com.lxj.xpopup.XPopup; import com.lxj.xpopup.core.DrawerPopupView; +import com.lxj.xpopup.enums.PopupPosition; import com.yunbao.common.R; import com.yunbao.common.adapter.CustomDrawerPopupAdapter; import com.yunbao.common.bean.AnchorRecommendItemModel; @@ -16,6 +18,7 @@ import com.yunbao.common.event.CustomDrawerPopupEvent; import com.yunbao.common.http.live.LiveNetManager; import com.yunbao.common.utils.Bus; import com.yunbao.common.utils.ToastUtil; +import com.yunbao.common.views.weight.ViewClicksAntiShake; import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; @@ -80,6 +83,67 @@ public class CustomDrawerPopupView extends DrawerPopupView { } } }); + //连麦互动 + ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.live_link_mic), new ViewClicksAntiShake.ViewClicksCallBack() { + @Override + public void onViewClicks() { + dismiss(); + if (callBack != null) { + callBack.evenTheWheat(); + } + } + }); + //特效设置 + ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.effects_settings_layout), new ViewClicksAntiShake.ViewClicksCallBack() { + @Override + public void onViewClicks() { + dismiss(); + if (callBack != null) { + callBack.effectsSetting(); + } + } + }); + //滑动设置 + ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.slide_settings_layout), new ViewClicksAntiShake.ViewClicksCallBack() { + @Override + public void onViewClicks() { + dismiss(); + if (callBack != null) { + callBack.slideSetting(); + } + } + }); + //小窗设置 + ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.float_settings_layout), new ViewClicksAntiShake.ViewClicksCallBack() { + @Override + public void onViewClicks() { + dismiss(); + if (callBack != null) { + callBack.floatSetting(); + } + } + }); + //画质设置 + ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.system_notice), new ViewClicksAntiShake.ViewClicksCallBack() { + @Override + public void onViewClicks() { + + } + }); + //更多菜单 + ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.online), new ViewClicksAntiShake.ViewClicksCallBack() { + @Override + public void onViewClicks() { + XPopup.Builder builder = new XPopup.Builder(getContext()).atView(findViewById(R.id.more_menu)); + builder.hasShadowBg(false) + .isDestroyOnDismiss(true) + .isLightStatusBar(false) + .popupPosition(PopupPosition.Top) + .asCustom(new MoreMenuPopupView(mContext)) + + .show(); + } + }); } private void initData() { @@ -112,6 +176,15 @@ public class CustomDrawerPopupView extends DrawerPopupView { void funGamesID(int zfunGamesID); void showerHtml(String htmlUrl, boolean screen); + + //连麦 + void evenTheWheat(); + + void effectsSetting(); + + void slideSetting(); + + void floatSetting(); } @Subscribe(threadMode = ThreadMode.MAIN) diff --git a/common/src/main/java/com/yunbao/common/views/DrawerRecommendChildViewHolder.java b/common/src/main/java/com/yunbao/common/views/DrawerRecommendChildViewHolder.java index 044b6183f..ec401e018 100644 --- a/common/src/main/java/com/yunbao/common/views/DrawerRecommendChildViewHolder.java +++ b/common/src/main/java/com/yunbao/common/views/DrawerRecommendChildViewHolder.java @@ -1,5 +1,6 @@ package com.yunbao.common.views; +import android.text.TextUtils; import android.view.View; import android.widget.ImageView; import android.widget.TextView; @@ -7,9 +8,16 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; +import com.yunbao.common.CommonAppConfig; import com.yunbao.common.R; import com.yunbao.common.bean.CustomSidebarChildModel; +import com.yunbao.common.bean.IMLoginModel; +import com.yunbao.common.event.CustomDrawerPopupEvent; import com.yunbao.common.glide.ImgLoader; +import com.yunbao.common.manager.IMLoginManager; +import com.yunbao.common.utils.Bus; +import com.yunbao.common.utils.ToastUtil; +import com.yunbao.common.views.weight.ViewClicksAntiShake; public class DrawerRecommendChildViewHolder extends RecyclerView.ViewHolder { @@ -27,5 +35,27 @@ public class DrawerRecommendChildViewHolder extends RecyclerView.ViewHolder { ImgLoader.display2(itemView.getContext(), model.getIcon(), icon); title.setText(model.getTitle()); subtitle.setText(model.getSubtitle()); + ViewClicksAntiShake.clicksAntiShake(itemView, new ViewClicksAntiShake.ViewClicksCallBack() { + @Override + public void onViewClicks() { + if (TextUtils.isEmpty(model.getSrc())) { + ToastUtil.show("SHOWER_ERROR"); + } else { + IMLoginModel userInfo = IMLoginManager.get(itemView.getContext()).getUserInfo(); + StringBuffer htmlUrl = new StringBuffer(); + htmlUrl.append(CommonAppConfig.HOST) + .append("/") + .append(model.getSrc()) + .append("&uid=") + .append(userInfo.getId()) + .append("&token=") + .append(userInfo.getToken()); + Bus.get().post(new CustomDrawerPopupEvent() + .setDisMiss(true) + .setHtmlUrl(htmlUrl.toString()) + .setScreen(TextUtils.equals(model.getShowType(), "2"))); + } + } + }); } } diff --git a/common/src/main/java/com/yunbao/common/views/MoreMenuPopupView.java b/common/src/main/java/com/yunbao/common/views/MoreMenuPopupView.java new file mode 100644 index 000000000..87f9a0449 --- /dev/null +++ b/common/src/main/java/com/yunbao/common/views/MoreMenuPopupView.java @@ -0,0 +1,24 @@ +package com.yunbao.common.views; + +import android.content.Context; + +import androidx.annotation.NonNull; + +import com.lxj.xpopup.core.AttachPopupView; +import com.yunbao.common.R; + +public class MoreMenuPopupView extends AttachPopupView { + public MoreMenuPopupView(@NonNull Context context) { + super(context); + } + + @Override + protected int getImplLayoutId() { + return R.layout.view_more_menu; + } + + @Override + protected void onCreate() { + + } +} diff --git a/common/src/main/res/layout/custom_drawer_popup.xml b/common/src/main/res/layout/custom_drawer_popup.xml index a87f71f26..e7e390913 100644 --- a/common/src/main/res/layout/custom_drawer_popup.xml +++ b/common/src/main/res/layout/custom_drawer_popup.xml @@ -124,7 +124,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="6dp" - android:text="@string/system_notice" + android:text="@string/image_quality_selection" android:textColor="#FF9A9A9A" android:textSize="10sp" /> @@ -146,7 +146,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="6dp" - android:text="@string/online_service" + android:text="@string/more_settings" android:textColor="#FF9A9A9A" android:textSize="10sp" /> @@ -162,5 +162,13 @@ android:layout_above="@id/basic_tools_layout" android:layout_marginTop="48dp" /> + \ No newline at end of file diff --git a/common/src/main/res/layout/view_more_menu.xml b/common/src/main/res/layout/view_more_menu.xml new file mode 100644 index 000000000..d14a11dd9 --- /dev/null +++ b/common/src/main/res/layout/view_more_menu.xml @@ -0,0 +1,79 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/common/src/main/res/mipmap-xxhdpi/live_more_icon_report.png b/common/src/main/res/mipmap-xxhdpi/live_more_icon_report.png index 003a7de6921a4ee8f54b62497f25ecd2f2f972df..b329806f0e3c6f7c82ce6c3055ab09f73641d73e 100644 GIT binary patch literal 2277 zcmVPx-pGibPRCr$Pn|G{bRTaj+B`PRV1Pdsllz@P!2*v_v2xtsSXo`&xq7W2egb31R z5C)u~4I&^GS^|hM1Pc;-NGPFLD3)lXj7FMDN16)D{9rwD*|X2R`|Nw}eUIdw&98pmJL8aXoOA2vkn%J+23?5`oHTy~p*y zRU%M1ZO(X{yT3@%hLT<266&CEaRf|Ev7QiAykW;nTCH+n-oAxq_V>#9V^5npaPGc}q=O{Awc+#x zfqUbvTU`=YI<==HT`uVxX7=dVC{!#kRp25RY%l3kl3tuS@AZKK} zOWG~tJ^zsOWix}bEo1Kfdj2knYo6N0lFlFbr)EdZU=li?+OC&9jv}tDXzeqZGl*f#?vcHt{O*4DE^TRhRIB}12 z_ZLXoR?^;*0C3RYWXGG???-)b1eR?ieI~Qcza^b$W(1e1*ffB9c?5(vCSL@Z{i&q0 z%!~**(%hYEenbP6AuT&_S~=}BfZIvZr!%PhE9k_{BM}=I;O=k0yBglg3nX1M>e{#2 zuW9T=fphnDA{wrgIl#B!Y&8kHyOZC-?|23V?VgCvw{!u{ur($IoV!DCxmIt>9N<>C zS?y!)?ym@LhYU4nP!g{HIcE06B*B{qaPg48N7BBMUYdNsW0Hkuf8HnTt1u3s{5Qoun}zbNU=8IQP3(znbE0ISX2x&DWQG?lJ{{B+bLy>3##eK5Qs zP0;U;fY3-*gRgBV3H|LFGlQ~ZElBlA86kj(eXf~(zxtOMF|l*t+?{;%G)XIF_WpsH zojnAI_3)I?=om&S2G47ZyzaiIq@5cA#gUVeo;n52-Fa_5FKO!xIPk0^%zCq(xCy%^o*dfOOF2F-kMo37# zjvwxHGy8chNV$2P0O#)Hqo)o$>VtdzIOqp&PNQ`I99hI(l6J^!a!1rC?(7P@v4L~< z7fRYM6p-{>q(J)*yJj;J#sx0C?$wZANw3WWitkCfuqzRu3*a`7GGCgHlJcBpW)xLM zT1UXa8+VlS$;_4gXJjl{m3ia=lL2D^=k70yDEiKfD0+>guckGGrUP~XTzDNdien_9 zqNE0)Uep$(&fhq9hklS+r5VD*lD=YQM8qQN3b+989U%hnjHCvkzN+X@Lk3lQoV!y@ zriPI6F1AC;KBEl<2=86emdEA3Ekpo_ILdQs5OG8XvXW}60xk}Q^6`Pp&d?760(oh% z1(7{2(?^0#bY@%j@9uOx9T~OR!E;dXrgn?qIW*D_JA5s0^nDzhDc5l*h%O%2+T0yA zg?^HmGT>cNYi%t-MN`j5Bz;s;dSz*$KzgDsTV<_*b9eN$&qY3(&i`#R#PG&dStuS< z!yvB6L-fW~wRO2W^kjZRpy0Yz32M+NOHwrYVcS5_1~|GV zk*aCEN)77qlj<*fM&Y1XeOTymGv}iC^0O$uR9EREE&PO}T{4`L0D<61xw6=bfQtyl z#vjfotwg*NhDqEdr*U^$xd0C4KWIeO`DRASRBi4K--Mo|c`R$f1fV^|Rtg+s7s)1V z&!VaC3`tjv8xY(bSqO@Qt~Y211(XuUBCIUv?o`GQB+~E3>*lo~?4`i1P2QQ|L!DKV zBITl$E6p*l4%+aXzPV!87#JA;C19bXHzo6VPa*ApD_yq~I8rm~>Gd)fUc;3-8$nnPQ+a`A{1+J;bjmi-`i>{;A?0brsaYe~n>2kv3QsWJ!3A;G! zDFu!~2r2^`r>#|h2gjoR3Fqpx4A%j;RNY7sk@(3>a{q4v(UqQ-Vk-hJ9#wkX$Q*J6 zvUtNeHjpby4>Io?P1wa&3|xRmqD;{_ZQUx~aE=Wm$L8(6p)G-L3moI&K{P_A41bPc zGV(ZNJ&^kA+9vp{+zPnxI_99%($~wIk^6rOBTqex0}u-c2Jkjyr7CL;+{`Y~PD*}> zj1FBPIY&p!J-$_k>u3@R3msBKeNrk~F>Y%6rln`825taA4_qYzmDBzY;NQe;7e`=H00000NkvXXu0mjf0l`jQ literal 2451 zcmai0c{tST7awE^<08#ewzOEXgpf&yA2DW(C2NxmM$zJqCCUgXo5dCz;!dC&XL`^X+;1r|Ld3Ic(^ zaBB-kz~26~L<9gWQQO7>%$}=ewq_s@`H9%Jmmq-of*q~QLFK)2vmg+^oITRX5+IRC zB%uE;R=EE$1qB6v=l|7LQc{9IApg4c4{~j7ZE|w*ALRdqP$+bDb#-NBMOs=~Qc_Y! zN9XR{yP~4M?#<)zc6N3EZDV7jsi`S1FHa(oVq;^`X!N;r=YIbDxwW-rWMq__oD7s! zQBeUP3WaiZb`A&#$ji$sDk=hl!Rzbm%gf8c!oovCLwb68fL~o*-P6-kTwI)%mX?{B z37l$eZQb47-Q3&^3=9OyH8(dCiNuA!1b_f48r=Ld;Z! z#E!FjrFEc^hxbbf3X6#9nX$&VOKoH*Dgh}T~@rYH{+k! zFOH#V+`kh^$@lJa^Lfj^Z@!A9k8J()+-RKsBXFmCJ$TrEBdzjznNMiT#mRTY*FOYj zE-}A#K4iS_|1>f>7v7UqRp;0JsD5bt_M7O&xTcpCiRrC)YGP3k$L_^_p1L6jB;*3O zFmv)7Wj|Z{DL10-LGPUX zh-UR^sgX!!d&{*9?MFT{3p*-RES;VG;pvfix3TWmZv>nGmmZ?zHkBZ#2pQ+W2Jrq8 zki-|~f-dEL8V=S_sWqcPDMl`9S46L>`Z`O*lvy_r4@ulh_=JU9PrUIKrdmD- zk3XiW7Vb4*)09z^q6zQ0BxT6@X>HItE;cMYP2dDwxe zUZ8{AY6UJ~au)R5R+pnsZAhf#-f75e#uw_+Sx2-?3-6yHX>k;WA!8P=Av#SDKPb)+M#dans5;Cn{Ub2Une|C_X@ z*uX_AeRsv^C&3R5A&d+DqNuCoZ+^&}Gy1fPPhJ*L$fEa>zsz1?iB7pUU-$Aq-H>sZ z7o!oX(r(bTUzsH|b-$)tz_&oX?U;x1+td#&CEySowd)POj?hYxu6i{iL|-|oWI&gF z5rc5Qa?w2)bYN>d#E^S*fTZ*`ayH)yw{IT*k_1|A{NCRq{Z!|}OHW%pTtx=Cb=~Wv zWUp*NTz+`zpzYf=K%ORtX=QGexrkyJ?xOe()cu?%g zLhMrdI9a%MQDZwOFjG+Lbu>Z)tUrQa?qWWhSCc$>T>q#LSm?dTo0*u5d1+BYhVIO4 zlzF|E;pQFr=+jsW)6gU;DMuS=W@8|@P;upC~A4ABt5v$%`+g9=f9*RNENt<11p|b-JBg|ayFA0 zDL+Ab6q_aMlAiN6w9Sqq(xGjTAg^*tV2~%)A=fO#*!ht&?K)PoFHCahOzH{jIV4h9 z;h4d7QsA_?woiFmxN_h{+#GRETyk&9>fAP5R@3&Y_^bNnh)JXM>r}kO+ao-^ z|E3ey%*>gmK8@xE!n@KJt-Ybr@NTty5#%*Z<1$)bnQxcfGz3bhjwD#vNTrR5DO^h$ zPTnvfkBQ|oC*-S|*bR?bJ8j?a%Z|{Fit}8gG%6er@tqA-Di(z*Q#B`Yk6VUIInO_< zHPY?1GKT%QU8(p8>R{X1W_Z@9J`NFgm62Rlsblw&nO-3}dC67atyV+)bBZ`w>4AjD zE}B{-_Zs$j-L;F;%-pC+VO;wjv4Mn c#rRBk&i3P{{7-xF{rbPaEm0Qb=9rj20m`Gaxc~qF diff --git a/common/src/main/res/mipmap-xxhdpi/live_more_icon_service.png b/common/src/main/res/mipmap-xxhdpi/live_more_icon_service.png index 2d8db2d5bd238a03c50526972f341c4d03bdfc1f..f463839bd85076103eb7a035f782c332b40b0777 100644 GIT binary patch literal 2428 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 diff --git a/common/src/main/res/mipmap-xxhdpi/live_more_icon_system.png b/common/src/main/res/mipmap-xxhdpi/live_more_icon_system.png index 4fe48bf56c484ca78cf28a2a1ce0d933026af96d..9b8a0ab4666751b272c5df6cd9fbdb4f50f562bf 100644 GIT binary patch literal 1808 zcmbu=`y!QAcj$I1V|O<9VJx;rZe7e*N

HW(m`y9$g3917Hfj~-rz6kWb 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 hSP%ag2DzQJ2`NlKk=$1D(|}(L$odq{qRh領取 去完成 已領取 + 畫質選擇 + 更多設置 diff --git a/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java b/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java index 1b089a1e3..0683ea6e9 100644 --- a/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java +++ b/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java @@ -751,7 +751,6 @@ public class LiveAudienceActivity extends LiveActivity { .setType(LiveAudienceEvent.LiveAudienceType.FAN_CLUB)); } } - @Override public void showerHtml(String htmlUrl, boolean screen) { if (!screen) { @@ -764,6 +763,30 @@ public class LiveAudienceActivity extends LiveActivity { fragment.show(((LiveRyAnchorActivity) mContext).getSupportFragmentManager(), "LiveHDDialogFragment"); } } + + @Override + public void evenTheWheat() { + Bus.get().post(new LiveAudienceEvent() + .setType(LiveAudienceEvent.LiveAudienceType.LIAN_MAI)); + } + + @Override + public void effectsSetting() { + Bus.get().post(new LiveAudienceEvent() + .setType(LiveAudienceEvent.LiveAudienceType.EFFECTS_SETTINGS)); + } + + @Override + public void slideSetting() { + Bus.get().post(new LiveAudienceEvent() + .setType(LiveAudienceEvent.LiveAudienceType.SLIDE_SETTINGS)); + } + + @Override + public void floatSetting() { + Bus.get().post(new LiveAudienceEvent() + .setType(LiveAudienceEvent.LiveAudienceType.FLOAT_SETTING)); + } }); new XPopup.Builder(mContext) .hasShadowBg(false)