From dcdf2c666d6eef89f25a1389bef0ed028a36ca8e Mon Sep 17 00:00:00 2001 From: Martin <13046765170@163.com> Date: Sat, 10 Aug 2024 17:59:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E6=92=AD=E5=87=86=E5=A4=87=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2-=E6=9A=82=E6=8F=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/mipmap-mdpi/icon_beauty.png | Bin 1244 -> 2373 bytes .../src/main/res/mipmap-xxhdpi/icon_fhd.png | Bin 1129 -> 1693 bytes .../res/mipmap-xxhdpi/icon_horizontally.png | Bin 1387 -> 2408 bytes .../mipmap-xxhdpi/icon_live_ready_camera.png | Bin 2771 -> 2737 bytes .../res/mipmap-xxhdpi/icon_protocol_check.png | Bin 1018 -> 1193 bytes .../src/main/res/mipmap-xxhdpi/icon_robot.png | Bin 2756 -> 3450 bytes .../live/views/LiveNewReadySwViewHolder.java | 57 +-- .../res/drawable/bg_live_upload_cover.xml | 2 +- .../main/res/layout/view_new_live_ready.xml | 401 +++++++----------- .../res/mipmap-mdpi/ic_live_ready_say.png | Bin 667 -> 1506 bytes .../res/mipmap-mdpi/ic_live_ready_xjd.png | Bin 676 -> 1260 bytes live/src/main/res/mipmap-mdpi/icon_tips.png | Bin 0 -> 1536 bytes 12 files changed, 184 insertions(+), 276 deletions(-) create mode 100644 live/src/main/res/mipmap-mdpi/icon_tips.png diff --git a/common/src/main/res/mipmap-mdpi/icon_beauty.png b/common/src/main/res/mipmap-mdpi/icon_beauty.png index 1e1b57098003a75435f55c6d2537b902a157a335..f619582a425e2565bf2a42d540c2b1eff957f3da 100644 GIT binary patch literal 2373 zcmV-L3A*-)P)Px-|4BqaRCr$PU1z8sMHD^9UO=&6H};4fV~JQ&eyB0nA^{Ed-dj|}f*K17HlhX< zJC=wM1r>V-8-f*46gyb4i(RjK9z*_rdrnYnXk?s>%jHWvXi zn;*bx0FDMQ8Nj*#J_hg{ceGp0rPqQ2Sohh{^2WIOF+$RQvgo`SOUPM08Y^e zis)=hMa=9500&ig`Nd=!81DnMc7VEh>>2=vxDI{|U;~o+w_}zWnVM2GXI8Zr0PIfk ztL%$)1a#x1p|9oUv71RAShdHY@)I3P6DvA``1^UK%I~sskH%AodmELfJfZi zneV_($^UbWs9V_0GdMbi|hv+sOJYh`Z$28B!B2Tpk}rwfQtZ(3XFh!AAU?$ z*=GP8nvS3tWFu)VFn7z(i)sC4CNDtVfY0s*uy5Z0O(>_4co%@JVgL!0*@mRtm?(>& zxmNCBBQsxd3H`_R6VL?!OagEmfbF9Y`LEC?0B#0wEy>S{-ff5G1&f;IR3H6k_YKet zjTY5PnQZxP0xUQ zPFX#XG*@tC*}(2lp*U?dz4R}kxtgcKknR+9Ub_OJ&9B56KsZ*FD>XhRTi z&4$rGg63K%_sF_kv4HA4B?VCqwTAbbJ-{sZiAb7z_vQ{%EiS(3(OmkQnS$IQ*Ge>3 z=x*28WV!PO$uD81S(9&$mtZmrNf->6I-Mf4B#WgeQx0J^XXshv=Q&__C%1n^cj z&wMhTMtV9~w4E#r!Fj+Hs3H32i+gEa3TUPSI+wn}MT64OtQGOw#Qm5-QqFfztsR<& z8tUkONfJR)1T17hnnweg0alS9{gSeu0gNH}Uayes1kKCZYGyA3*gR0Kkmjubx{5nE zTgJs8k0@(kr=GX7n#Z=m%yfZaN}zlx%_{?{7m`)~0s#9bk)X9m{vO-dPL%5g&0U`q zCX^R*R0zzh(;m~8C_mJFe08_=)Ok+Vtw%JURRCr*&089wT}LqUfkC5r?E!U+C~}Q- zZeDtz<{JcN)^VEG7SKVZc`X4QWSZ9!&_SkotpIHT&1(Z_Q)pfrK$}AIz607cn)emZ zCepmGfHslleF3z|H19c}O{aO!0c|?Xdj{x8p?OaL9Z59r37{j1=3NDJB+|TVfR0p} zcMZ^yO7o5b+BBLghl->U5-MBtsb{F>Ceqx@l=^sJ)r=Ei)Ha|^qq&)#ncVF^&z;ww zRQ1kQ%YZhG=5AoD>8^L{>bUNSZbDKQjiaq4K$}Q&2dHkxoSs4NX_6D8(QJqEgLFM6 z1`sn_$&F6kg$T&AiN<1NZ3&6G{zb`|y6woHq+zk@Ra_IK5uE7`CStR97 z6uBh9SimtBj#ZDuRF%e6|clnPI~rd)#?r9?qeI#WY751>t? zx!X=23t+i+QS`hom7XU7OjA}}XoNO`=4LiJS)HY+P1EB8Lx47s=2_HSdivT{AL8J)TI zDr~3lozE0)l4P+`7)won{^N1*^=q`0ZCrPnhY&Hdhb7zQc`ik8iOCGD;$T=IRGNE0m2SRN%uXMrv~1d>D+~RKpk|N`}&(198%xiM`~fwXr}XpnJo$6Hm8D1WYuahDNIBe^7dpqA4^FfGWk^XR6*B83yRka5NLB_ZH|iDWEFJ zUg_Y4Bp;*HW2*l0gHqlXVAkK?kgTIbuzd6{>RU^)5`zL(OglpX<}&*G>aL_76Vtds zEK{U?S4RJAe@8UUvp|#`BWv|noHVphsV?oRPOa)*4C3gEX>-gmvi#Js?igX$L>pOR rSlX^C?5{sL@k#oJMPfeK^fLbfT{Nd0)MhI*00000NkvXXu0mjfE6{TI literal 1244 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 diff --git a/common/src/main/res/mipmap-xxhdpi/icon_horizontally.png b/common/src/main/res/mipmap-xxhdpi/icon_horizontally.png index dfc6e39e079551c4f3357656705ceb6dae2b1f05..a9e550a19e9154b0feef1bb71a7941f2dfad876b 100644 GIT binary patch literal 2408 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 literal 2771 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 diff --git a/common/src/main/res/mipmap-xxhdpi/icon_protocol_check.png b/common/src/main/res/mipmap-xxhdpi/icon_protocol_check.png index a29310a9ae9180241e876a2ec6fa567788536514..a1e7876f91dbcbd114b1c65f71144539d660e8a0 100644 GIT binary patch literal 1193 zcmV;a1XlZrP)Px(V@X6oR7gv$mw!l|WfaFh=hf?vd)->NASbO~&^G2=M6FqAIVjdYl{%e&gvE#$ zM6?yf6e?ZJ3DJV^k0>Z+gFw9s{ZTP!D;YYAifvJ`P17bH3+%pL5Q0ULlR8-D}q1I2*w(N7)H%25trf7y>RJ97mlKSeX~4a(pC} zS)-VAY0zJQW4(ZA4Y?FyL*#P+jj9<77LXC$3+tZ<$FS^Aq+(_unen8+8Vo!SybG+2 zD93=(4n>EsZHn^d=+1 z&^|_$)J}96kqEGM-*h+5To1~+GznZnOkgeqnSOA>VEGoxjv%^4swV$-frEL6KpWD| z+@!DqvlCE$99D0FGjG6PH;AdVXqb+?CDjw}h<2^Y$8ml_SifRmwc-8`;g08AAbT1* zb0IU}0W0Uo@RfL11GR3kF>%YS%%(wUV-A4XnPZw{0mM!17p8| zxV1FD%yrxJh;|09AQUdTUt>@eoEbMm-2#YTM&|Zs;en4m(DC!oR|}(O<0+158Z*j> z0XD7dI;#q+Ho&%{uE*az;ySRohzHrz&9Nv{ydKuTBl{FhYJD)u!+_yb8sK zJ=NiU=-UM|SK*dYC~1c*^CTPUZ1{c;Tx#=5CmE>W)?v^j*LPTyElMs!-`2x$*NdKs zvGZ_xHbMR0*ta~c4|IV!2od!Nib*G-b zNr!3YfM{^_c5>`KrV`jTS#7Ae?}PZrW1>Irhl{OVa-~y_rj93P@0G|rWruqZwj^zt zRu*h+i3k62FZ^M$KH7)V0d;HV3}e2>+()7#?@cT{xMZ(3w3mDiYfIfIe>YRnk|Wz< zSB$t#i`0bbqpy>{0F`q<{*sP|LlC$PrvCxM!g81D5Vl<=wKD_WAkdLlNq``espc$m zzRXCCgJuwz(mJVfhrjrlt21x}i~aFq*>b~5AaByZ(MGA7Y>J&Oo-#Z9tz^neH~eT^ zj~l65ZIxYj@lgMWPd_@-LSDf=VwIUm?EBQZYK3il6@gwp@j6np7=l00000NkvXX Hu0mjf6-_OM literal 1018 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 Tz#@3_<^UZH!^c&yXHowHW8jQO diff --git a/live/src/main/java/com/yunbao/live/views/LiveNewReadySwViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveNewReadySwViewHolder.java index 3d949e264..06dc01d61 100644 --- a/live/src/main/java/com/yunbao/live/views/LiveNewReadySwViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LiveNewReadySwViewHolder.java @@ -87,7 +87,7 @@ public class LiveNewReadySwViewHolder extends AbsViewHolder implements View.OnCl private ProcessImageUtil mImageUtil; private File mAvatarFile; private TextView mLiveClass, anchorAgreement; - private TextView mLiveTypeTextView, liveClarity;//房间类型TextView + private TextView mLiveTypeTextView;//房间类型TextView private TextView mLiveWishListTextView;//心愿单TextView private int mLiveClassID;//直播频道id private int mLiveType;//房间类型 @@ -98,7 +98,7 @@ public class LiveNewReadySwViewHolder extends AbsViewHolder implements View.OnCl private LiveClassBean classBean; private FaceManager manager; private TextView faceTextView;//提示人脸未检测到的TextView - private ImageView imgClarity, selectorProtocol; + private ImageView selectorProtocol; private int selectClarity = 1; private LiveOpenCustomPopup liveOpenCustomPopup; private boolean selector = true; @@ -123,9 +123,7 @@ public class LiveNewReadySwViewHolder extends AbsViewHolder implements View.OnCl @Override public void init() { mRootView = (ConstraintLayout) findViewById(R.id.traceroute_rootview); - imgClarity = (ImageView) findViewById(R.id.img_clarity); selectorProtocol = (ImageView) findViewById(R.id.selector_protocol); - liveClarity = (TextView) findViewById(R.id.live_clarity); anchorAgreement = (TextView) findViewById(R.id.anchor_agreement); mRootView.setOnClickListener(new View.OnClickListener() { @Override @@ -155,7 +153,6 @@ public class LiveNewReadySwViewHolder extends AbsViewHolder implements View.OnCl findViewById(R.id.btn_room_type).setOnClickListener(this); mOpenLocation = true; mLiveClass = (TextView) findViewById(R.id.live_class); - mLiveTypeTextView = (TextView) findViewById(R.id.text_room_type); mLiveWishListTextView = (TextView) findViewById(R.id.text_wishlist); faceTextView = (TextView) findViewById(R.id.faceTextView); @@ -203,7 +200,6 @@ public class LiveNewReadySwViewHolder extends AbsViewHolder implements View.OnCl findViewById(R.id.btn_horizontally).setOnClickListener(this); findViewById(R.id.anchor_agreement_layout).setOnClickListener(this); findViewById(R.id.btn_live_anchor_say).setOnClickListener(this); - findViewById(R.id.btn_live_anchor_call_me).setOnClickListener(this); if (manager != null) { manager.setFaceStatusChanged(new FaceManager.FaceStatusChanged() { @@ -258,7 +254,6 @@ public class LiveNewReadySwViewHolder extends AbsViewHolder implements View.OnCl @Override public void onDismiss(BasePopupView popupView) { - setSelectClarity(liveClarityCustomPopup.getSelectClarity()); } @Override @@ -304,32 +299,6 @@ public class LiveNewReadySwViewHolder extends AbsViewHolder implements View.OnCl }); } - private void setSelectClarity(int selectClarity) { - this.selectClarity = selectClarity; - IMLoginManager.get(mContext).setSelectClarity(selectClarity); - switch (selectClarity) { - case 0: - imgClarity.setImageResource(R.mipmap.icon_sd); - liveClarity.setText(R.string.standard_clear); - break; - case 1: - imgClarity.setImageResource(R.mipmap.icon_hd); - liveClarity.setText(R.string.high_definition); - break; - case 2: - imgClarity.setImageResource(R.mipmap.icon_fhd); - liveClarity.setText(R.string.ultra_hd); - break; - } - if (liveOpenCustomPopup != null) { - liveOpenCustomPopup.setSelectClarity(selectClarity); - } - //SWManager.get().setDimensions(selectClarity); - Log.e("切换分辨率", "时间戳" + System.currentTimeMillis()); - //重新发布一下流 - Bus.get().post(new LivePushRyEvent()); - } - public void setManager(FaceManager manager) { this.manager = manager; } @@ -559,11 +528,27 @@ public class LiveNewReadySwViewHolder extends AbsViewHolder implements View.OnCl RouteUtil.forwardLiveZhuangBanActivity(url.toString(), false); } else if (i == R.id.btn_live_anchor_say) { openAnchorSayDialog(); - } else if (i == R.id.btn_live_anchor_call_me) { - openAnchorCallMeDialog(); } } - + private void setSelectClarity(int selectClarity) { + this.selectClarity = selectClarity; + IMLoginManager.get(mContext).setSelectClarity(selectClarity); + switch (selectClarity) { + case 0: + break; + case 1: + break; + case 2: + break; + } + if (liveOpenCustomPopup != null) { + liveOpenCustomPopup.setSelectClarity(selectClarity); + } + //SWManager.get().setDimensions(selectClarity); + Log.e("切换分辨率", "时间戳" + System.currentTimeMillis()); + //重新发布一下流 + Bus.get().post(new LivePushRyEvent()); + } /** * 新娱美颜 */ diff --git a/live/src/main/res/drawable/bg_live_upload_cover.xml b/live/src/main/res/drawable/bg_live_upload_cover.xml index e612dc685..ad97b6edf 100644 --- a/live/src/main/res/drawable/bg_live_upload_cover.xml +++ b/live/src/main/res/drawable/bg_live_upload_cover.xml @@ -3,7 +3,7 @@ - + \ No newline at end of file diff --git a/live/src/main/res/layout/view_new_live_ready.xml b/live/src/main/res/layout/view_new_live_ready.xml index 09fdf539e..b8b99118d 100644 --- a/live/src/main/res/layout/view_new_live_ready.xml +++ b/live/src/main/res/layout/view_new_live_ready.xml @@ -18,6 +18,18 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> + + + + app:layout_constraintTop_toBottomOf="@+id/btn_camera"> - - - - - - - - - - + android:layout_marginTop="15dp" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + app:srcCompat="@mipmap/icon_live_ready_add" /> + android:layout_marginBottom="12dp" + android:text="@string/live_cover" + android:textColor="#FFFFFF" + android:textSize="12sp" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" /> + - - + + - - - + - - - + - - - - - - - - - - - - - - - - - - - - - - - + + android:layout_marginStart="5dp" + android:layout_marginEnd="4dp" + android:layout_weight="1" + android:text="開播前發一條動態,將會給您的直播帶來更高人氣哦~" + android:textColor="@color/white" + android:textSize="12sp" /> - - + + + + + + + + + + + + + + + + + + + Px)oJmAMRA@uZnRlohRTPK6pS_`C1<}M38w7j7h$RTd0-7jMY#0k-Od{6UV~Q9{ zG!ZNjB?{5luon~&l}Hkektkxtf`1teme@-?&hK$&xo_Qlv%Bv}_QL+L=ia&V&ADez z8}UDkh}aLf95@0Acj?aK$lD;VgJ1NS%xWjA_T(!RZ*)8;<%v+C`q$$vkLHEg@?b5y;E336rb zw{|1NH_Leejlv}r*z=;V2x2M$h47XpV# z`Yi)LHl+eR#sEx|G{ex73&FK%p@GLpdZ<;Xs&#!p`_g%U!OAg5Qq4poVm;tFV0c=v zs5t4v4gDoBI0+X>IXU4rg_4G4&@L!mF1*@?NjA2}&t(@(mvm(nNIUaY&^^W)VMpLf z$K!_-P->AdBEAB)N%M2N1$uX2Y4%>7F6rS++iw)wF3omnw?J=Jgl^mMRtfY{dx;GC z=H$_OPNG|&H%b0~=L9-MlD%5bh=}Wp1nP?Nf44wyT2wY~0y`wIsYO~*x?w~2%162d zdW+;iHcCm_cu99^ihDLqlY8n36dOCO7n0~*+2cAUk^P^(xi4=TGiSX zU7nMpJ=0#!LxxEDF4?nlk1v2N)BG$$J5Sv_2^L8@pbDg&`6}qTG{RfoT_jHDW?FU# zcb{Z~BpYSu+ko?v;OD|$j+FFDJ79gStq9|;(C-JFX_jN{BEUHZDow*7yo}P84>I&V zMbB+Uz&I9$4Fd5Y0xwKVpJ4%upJSDKbitTww61@leZIJ2r6)`-){ z_xf5`1>NY{h;WwoEZ|64jw8y`ZB&gr1@zCIPv^U3MeeodWbG|)=Im>@q|cjyw+kH+ zLyJ9MuLJH?@we6YFjz#mTE8%ZeB2MxtfANebl&&yZLD$k{%q4dqZ4Si5*)3{E~xiu z+P>`oI?po~njK4xrulI393OJ+ILTb_AWk9XVa! zm4U&>H$sx_u{PR;u6p}BGLJeSdzweG&eMm$A(Fl=*L59q()f+;M`RDPSW?Ypb|rKI ze-$`11NY}QH+<}Ex}!hc;AL}T(v`<<+1yx3vr`w=&7U${+oiehyz0KWWVY+xn>D_D zk~uFPm)xp9BH813xFT_7lDCmtdH-r_I`$ro?h+ApRSz_1375<5VO*7T$9Kd`<8Hdw zf1WF+-EE!FmRcJu9#BnZ;Clo9kTg2w;jg9c{t`(}N&7Ya1+q8Jybq;Sn*aa+07*qo IM6N<$g16MmIRF3v literal 667 zcmV;M0%ZM(P)Px%RY^oaR9Hvtmd}fgQ5eTR-?FfqcXNI{pZEKmbDpoL zSyRn;=mWLNNME6zDP(4AfFWQISeCTdDtNQ;u2W`a4si?^2R0=^=7B?!zO@6^5l}!J z4T#Mp0VgG0?h44vjsORNwV90ufGrJUpMkr;Ebth32n+-BlJ*vJ&1_%vPv?|dp^%xK z0WPfaj~v3&G6O6~`jG^_6F>Dx(ypZc3$QNMjiqafIlqC-Y(4NHlvxIr8o+#fXY@@1 z*Cl;#25)9Lpo@U7^>#_p>BjXbkl&8yF=0f~({!?#rQ?H=Ugnf60rH!84;Tep(E&;C z(tUD3e+2v+Kpxo4HUe(|SA0g&@k)UL>O3$NDs7PD=kZtTxk3T74R{d@`z7746eyrR zMcSq$P1gbFl^<&0s-#nO0P=&qwN60ABe|lyRCTDmAU}&VjY?XmG-YOX1(*Qb3HY`D zS{aa;xkY&&CF+)>ldE|c|5fR52jQh-PpC62>2(gspYo4@*PFNTrE}Bb>T=)6S%{Ka zb`v-eo1T?)E?ZpVv1-SDc;4Lu-3As@xDue^F?8EfZa)fAGdlpd8_XFrulkKHu`p;3 z_XKzVi~w_z#*)2vgy+tx+o^@!9tO<8%Pj1Kq-!~w(yYHDpa!4haD~54P5vBkxF;sR z#F*`la;8IYlYg5*kVB+sFk99h5kE*egf0HdNk3k;>7>}002ovPDHLkV1i=@ BEt>!U diff --git a/live/src/main/res/mipmap-mdpi/ic_live_ready_xjd.png b/live/src/main/res/mipmap-mdpi/ic_live_ready_xjd.png index 3902b9b5ccffeef5bbecc1fe142c82d9bcbbe296..d9ca4a8f5bce5a2355edee8f7324448594104ccc 100644 GIT binary patch literal 1260 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 literal 0 HcmV?d00001