From c45cc7a9904e024be01ed8cb13f682dd7bac4dbe Mon Sep 17 00:00:00 2001 From: zlzw <583819556@qq.com> Date: Wed, 28 Sep 2022 14:08:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88Banner=E5=92=8C=E5=BC=80?= =?UTF-8?q?=E7=9B=98=E5=9B=BE=E7=89=87=E7=9A=84=E8=A3=81=E5=88=87=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=BB=E6=92=AD=E7=9B=B4=E6=92=AD=E9=97=B4?= =?UTF-8?q?=E5=90=88=E9=9B=86=E5=90=8D=E5=AD=97=E3=80=81=E5=9B=BE=E6=A0=87?= =?UTF-8?q?=E9=94=99=E8=AF=AF=20=E8=B0=83=E6=95=B4=E7=9B=B4=E6=92=AD?= =?UTF-8?q?=E5=87=86=E5=A4=87=E9=97=B4=E6=96=87=E6=A1=88=20=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E7=9B=B4=E6=92=AD=E5=87=86=E5=A4=87=E5=BF=83=E6=84=BF?= =?UTF-8?q?=E5=8D=95=E5=88=97=E8=A1=A8=20=E8=B0=83=E6=95=B4=E7=9B=B4?= =?UTF-8?q?=E6=92=AD=E9=97=B4=E9=81=AE=E7=BD=A9=20=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E8=BF=9B=E5=9C=BA=E5=8A=A8=E7=94=BBsvga=E5=8A=A8=E7=94=BB=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=A7=82=E4=BC=97=E5=8F=8A=E4=B8=AA=E4=BA=BA?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E5=A4=B4=E5=83=8Fsvga=E9=97=AA=E7=83=81?= =?UTF-8?q?=E5=92=8C=E6=B6=88=E5=A4=B1=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../phonelive/activity/LauncherActivity.java | 2 +- .../yunbao/common/utils/SVGAViewUtils.java | 9 +++- .../yunbao/common/views/CustomViewHolder.java | 2 +- .../res/layout/dialog_live_new_function.xml | 4 +- .../mipmap-xxhdpi/icon_live_ready_camera.png | Bin 809 -> 6161 bytes .../main/res/mipmap-xxhdpi/icon_weekstar.png | Bin 3653 -> 14127 bytes .../res/mipmap-xxhdpi/icon_xinyuandan.png | Bin 9201 -> 12987 bytes .../main/res/mipmap-xxhdpi/icon_zhenggu.png | Bin 5964 -> 17873 bytes common/src/main/res/values/strings.xml | 2 +- .../live/adapter/LiveNewWishListAdapter.java | 10 +++-- .../yunbao/live/adapter/LiveUserAdapter.java | 2 +- .../live/dialog/LiveBeautyDialogFragment.java | 40 +++++++++++------- .../LiveNewRoomClassDialogFragment.java | 2 +- .../dialog/LiveNewRoomTypeDialogFragment.java | 2 +- .../dialog/LiveNewWishListDialogFragment.java | 8 ++-- .../res/layout/dialog_new_live_room_class.xml | 2 +- .../res/layout/dialog_new_live_room_type.xml | 10 ++--- .../res/layout/dialog_new_live_wishlist.xml | 8 ++-- .../res/layout/item_new_live_wish_list.xml | 14 +++--- live/src/main/res/layout/view_live_room.xml | 18 ++++---- .../main/res/layout/view_new_live_ready.xml | 2 +- .../PDLiveConversationListActivity.java | 2 +- .../main/views/MainHomeLiveViewHolder.java | 3 +- .../yunbao/main/views/MainMeViewHolder.java | 2 +- 24 files changed, 81 insertions(+), 63 deletions(-) diff --git a/app/src/main/java/com/shayu/phonelive/activity/LauncherActivity.java b/app/src/main/java/com/shayu/phonelive/activity/LauncherActivity.java index 6bfaea32b..963dab50f 100644 --- a/app/src/main/java/com/shayu/phonelive/activity/LauncherActivity.java +++ b/app/src/main/java/com/shayu/phonelive/activity/LauncherActivity.java @@ -386,7 +386,7 @@ public class LauncherActivity extends AppCompatActivity implements View.OnClickL imageView.setScaleType(ImageView.ScaleType.CENTER_CROP); imageView.setBackgroundColor(0xffffffff); mImageViewList.add(imageView); - ImgLoader.display(mContext, mAdList.get(i).getUrl(), imageView,480,960); + ImgLoader.display(mContext, mAdList.get(i).getUrl(), imageView); } for (int i = imgSize - 1; i >= 0; i--) { mContainer.addView(mImageViewList.get(i)); diff --git a/common/src/main/java/com/yunbao/common/utils/SVGAViewUtils.java b/common/src/main/java/com/yunbao/common/utils/SVGAViewUtils.java index e28e03ce9..40a2cbc05 100644 --- a/common/src/main/java/com/yunbao/common/utils/SVGAViewUtils.java +++ b/common/src/main/java/com/yunbao/common/utils/SVGAViewUtils.java @@ -4,7 +4,7 @@ import com.opensource.svgaplayer.SVGACallback; import com.opensource.svgaplayer.SVGAImageView; public class SVGAViewUtils { - public static void playEndClear(SVGAImageView svga){ + public static void playEndClear(SVGAImageView svga,boolean isClear){ svga.setCallback(new SVGACallback() { @Override public void onPause() { @@ -14,7 +14,9 @@ public class SVGAViewUtils { @Override public void onFinished() { //动画结束后调用clear释放资源 - svga.clear(); + if(isClear) { + svga.clear(); + } } @Override @@ -29,4 +31,7 @@ public class SVGAViewUtils { }); svga.startAnimation(); } + public static void playEndClear(SVGAImageView svga){ + playEndClear(svga,true); + } } diff --git a/common/src/main/java/com/yunbao/common/views/CustomViewHolder.java b/common/src/main/java/com/yunbao/common/views/CustomViewHolder.java index b52810567..680deb36e 100644 --- a/common/src/main/java/com/yunbao/common/views/CustomViewHolder.java +++ b/common/src/main/java/com/yunbao/common/views/CustomViewHolder.java @@ -22,7 +22,7 @@ public class CustomViewHolder implements BannerViewHolder { imageView.setLayoutParams(params); imageView.setScaleType(ImageView.ScaleType.FIT_XY); //Glide.with(context).load(data.getImageUrl()).into(imageView); - ImgLoader.display(context,data.getImageUrl(),imageView,600,170); + ImgLoader.display(context,data.getImageUrl(),imageView); return imageView; } diff --git a/common/src/main/res/layout/dialog_live_new_function.xml b/common/src/main/res/layout/dialog_live_new_function.xml index 262c9c0d2..71b870fd4 100644 --- a/common/src/main/res/layout/dialog_live_new_function.xml +++ b/common/src/main/res/layout/dialog_live_new_function.xml @@ -104,7 +104,7 @@ android:layout_height="wrap_content" android:layout_marginStart="16dp" android:layout_marginTop="30dp" - android:text="@string/basic_tools" + android:text="@string/live_config" android:textColor="@color/white" android:textSize="14sp" /> @@ -196,7 +196,7 @@ android:layout_height="wrap_content" android:layout_marginStart="16dp" android:layout_marginTop="24dp" - android:text="@string/live_config" + android:text="@string/basic_tools" android:textColor="@color/white" android:textSize="14sp" /> diff --git a/common/src/main/res/mipmap-xxhdpi/icon_live_ready_camera.png b/common/src/main/res/mipmap-xxhdpi/icon_live_ready_camera.png index 347948a9300027796f0eec69b10ad804fbd9f337..e56ec9c281a47bb849d1d7acfa96cbee7aff1d48 100644 GIT binary patch literal 6161 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 diff --git a/common/src/main/res/mipmap-xxhdpi/icon_weekstar.png b/common/src/main/res/mipmap-xxhdpi/icon_weekstar.png index b286ed219829a092d73aa6c1f7b610100691f2de..59643edceea02603811a13946147deb10ca18c4e 100644 GIT binary patch literal 14127 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 XmA=r>n6nx$00000NkvXXu0mjfcF>E4 diff --git a/common/src/main/res/mipmap-xxhdpi/icon_xinyuandan.png b/common/src/main/res/mipmap-xxhdpi/icon_xinyuandan.png index 9755610bf75ee71bedafd9aac8f69e74f54e1e91..b35fbf56511de9f5ee616b2207c70d40408ff562 100644 GIT binary patch literal 12987 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 literal 9201 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 Hu0mjfSVqiC diff --git a/common/src/main/res/mipmap-xxhdpi/icon_zhenggu.png b/common/src/main/res/mipmap-xxhdpi/icon_zhenggu.png index ab3497fde29cb7069160290cbaa9e6777d2a24c3..04b357b8c91b570382adb649cd7210b411d65684 100644 GIT binary patch literal 17873 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 A_W%F@ literal 5964 zcmV-S7qjSzP)j-F5w%@#9neH)WHing*SA;Iy>q^MtE59*UiW(qIds0EG!tdc;Lr;l3T-vU7O z)aq$S*z;lAN5i&~00vNUUqsozUCg}Tg(}CeUr!%#3sg`4@C#7Z3$Sg#v4MyK*cRZr zfa?KD{HK^PXW4$GP(|Y-5AgBtKMTv63d@3i6Jj(1tw0G-Dt3RKm_BD^730`%r;a?p z2X22I@#qn790QFIBM~5K15$1h3YkBSPS|bne z?pq#5%sBCV~;1)vmQ@jK_6V#+x;)M}7w)y+2`lbDbCbOVId4<#3hnHSww ztLyJOfUA~X3Wy&dl?0M8K+u&nut7jAAnN>9e7^0dS`1MAVCfnpW9Ol{!Ngo&n#)=^ zUd*`gxmvWb?*QJjFb+4e8?k5-4H+O7+2gjfNWNkY2dWUq7;#M7u4)FT?pk^^Ec;t% zu7|dIpD~tJE&$K}FEQ)lGpf1%-sg_E3$sD>!zItdagIY{of#CzdjZ@XzI0M*MYBjT93uD(%gmj54YaTJ>B|I&3S zo60V*vBTUr-o(}>pgzN!`KXxMcG^(d9DMA)0k~@E#jxzVkVyh{X_G`e-)KP&jB$zp zGw}uD*fSRo?x1>nqz%((f?dQXRxNiX7wd^?9;(6^_gh&~~ z!IfMfUohIRv7YYsH8K7CJHvsfdvCc8sl*Zug)Z3B2XyuP4rTv5Sn4-uZFJDmWRg*D zzX7GKDv(Ev5d53p6JB4|SUW9{35L?jD1%$Y)N}s*zy-Mamcsz?7E&=|9UMdma3E)_ zg%AJJ5|$BK6B0#qUoRY;;S4UBIE3MF$r-UQwZ z{!I%fK!T^0x9>3Rux-Li#LVxu0EAjCrd@F1feUc$O^xuJ4kY6VefL8PES8K_Fqtsu zZ*B)H2Rc^f@N+1)6>)1anj6i4X=U3w0g(pW0??X8t z$M{tOT3XD&`v!n*I{-Hh#BE?=Js@l#oiOo?*_PH<_RO0WM>E^ZbC^8hKtr85p1<*D z#^H|6Z;DH<8dGdpb!pw^42DxrP(AJ!u2R^%Fvpw zE@fc9y&16Lz~4^-gbPHY#-hSm4Xv5iE_vq0FmCSHZQ9WChHg$3Ak8^l-N3FM;NUUO zBVm0>%$VCZ6ieJU0Pp^8E7EEk(n&`Tm>sA4_UC~9ta0C59@w}Q7(don$v_rxqk!!L zO(}CsM<=x$@S%x7GHC!2F5Q$CMR>F{0;C&rbX#_qe>Y~#H3*X0kO1lK8@8HbCyt?I zzK&AsG2*0?N|i#~Hvre%dJIz0mvrZu`8cvd(ZCzXn}KzA8#n|=E9vhK00L+Z+@6*+ zrV)t646xQl1CMU1#kn+@o$gDxy#oM~PJJ4B7Q_tAq`~7jL!squ-exSbr2%Ma;LV*U zrnFTouJ;YVb+=xQWc*IV3Boahr+lGH=8I-7G_8$oCh?i+a2 zbR?%ko!aBNynbkX;jz3)3?KZB35Hg=p&g(KVEg=CODWtdj&Hl*z_P#xZvStj5~pej zp=E~L1CRq@%do{|lcVJ+^Ba#PFt$PA z%=pImNH~n4{9eaMAK2YzLI(Rp%Ve90IKAURF}3aN0}J5#@Ae`QtJm^{vk+!JT3$A9 z;t+-M)(#+7049zHni_!}JAj^o0os}b+#u)=hNtJcL1C7zOUu&9L;_nojT_T7!y<;R zD=4EIX?=8Y0wzFaaUKt`LY#2!l?Mz!^}uZ>BjP-vEhbd{1js=UA}xn^pBk`#02tG1 zpfY<-90wdU)?{SHE^Q@&8|uj~475_&0M@gP2++0LxTb~|Ozpxf&Et3V0&lk)D-Hqj z#`5KP7m8UIuRd@9uDk73M4iccU^?Ij7DLzNn<98@3(&O__~Tn9K`_=GIuWR6HqMz! zjkY3Y@L*`~Bn`r&>nam33k6{NZlfjXx_au!#1$kN-V7EMr~;UfI5XmPdA(w>gnV{_ zm_5JZ>h*{w5w-5yp9kz;=wQzRD)kp%%#w^%jD>{A*u!EgWeSD%*w!G?6wTl$fVBk& za)qO%^x$>$x{5S&TE2J z=0+Ca+FPH5ZJneCMEB(CSQuiHEfa;#x8W0yf zdH~^)W?0~)B@iIvQW%@~Nek0UpLBOtN`gYDUIqy6wJuWy&^hq%8qB(Mcg8ekbxzkp zi{kS)f{b+i9@yBMpL9qyf+x zXo2pYsT2VaG9mGkvVy>M6`6W2u%K}6sy_qmCpi011`6MV!dS^qwmJBQ5imtHEi+sz zAz+4(x3(DB!=%;Hut0qA!oR3Vz8}ny19<jm{-oq|=7ca}S8 zff3W+y?aJbx;QZC#bcNZ=$edylp^&hV_z)axwsyxbj)m0{#xM>>FSZA6Ou&Sx3!I_523lora3Mn;#+yMa zqSbP$$YjK8gsx84Wf?4-@i1W#9&aYaH04Yvk;XIwiR5B&+?fmZzYDLs)$B;ncRR8N z34bv*O08N)Xo=_$idbS7>p2L(_l0Q+GDEpUiwxyan6YVj%+`dbD>`~g z_%ku%g6SXBg}r|txg_%N?LUJQCurB<^h|5IpmM@l1T$plrbF%Z2OS?;Iok$z!n2Ceps_WkTf%30N|zsHb67Y{`@U6_Kq z8wr}!bJ;1(&2d(1N3ja>=o&{pHw9Rj6>!cpb9As5S9mFxqv7` z={g@EcjpS}qnajR`eDzZpgyWCFs#ait7xI1u67jfcD`Pj3+CC3d0{nNZ@9#4G4-5> zYtifw0A8+?SB5Nkkoh=Nz7eWa2dQjWmV^)`C<63pi9S@W1d(=*PX6=ZA3`$zFchsI zEQ*HHEmo!jtyYWCgx3g@2(#`x@Pam#yk1N>cS)_9s~q5>5TLJJSmhd_%8g)_Re}J^ z5GX)OS|VkN3$HW(Q2nz%I7|IFw zMo^q(eejQO0~@wX6F1yGtX-(@*PV)8ST4Hk2_@vo1gP@1Ng}0Y08Avobju|q>pGtg z<(8mI1<2w6{9+cWn1|cmvu4buN9L$k*SDi1dr-|>IfTa*I_?={1^SggXcd5u9|puy zJH*U6<4aec)#j(|7m^Ftw(l2!Y}8vk?;%Jzn-dOMOhDzD0k_e_L0xE(P*Q4uvRs5J zX5r=gp-Nf!yZd3sV@EYCn%a(*L>G3`l`D3DcOP^301ZVl3%9#_f!E$J?)#BRfQ$m| zJ6j8HycM$}9UG$%&El5F2lg94cj4UQg!G@+kjinWLW{}7l8+&TYaX7Cg9cy@vS6%G zx_S6pd&{jGABm}#*ItX9T!w=8*TsZThWyni!^}PC$s^tXmZu1i%afbh&7%6j;{RU85;q~XgB|Ui<{1{ZZ1#rhfpq^m7`P#*MQk7Sa;S1$Z6V7shOPbc*`@!%tvG{$#UlEf~_^GSoY9EnGAjq#p^6G9}@d zve>rWK+gcsP!BZM0VTOo%$zfiSIwRA)nAI1&7T$ZTOp7?EWYf|74JHz1oV)7sB~@H zm!Q;RkbDZV5pXBKQY`@Dkb3c3Ki#5Zq10M12bt@IpYMY#<@92X?2{{6-dua7`rSi6 z!_NE(CRp>5Wggh63f^t__0DWh#j0MEF?yCS> z^{5TrFV&m=>#9%u*0!Us;^WSr#q8O>`uYPC+@9j8eqYa(p4Sm`V; ze`IX&AAVmcoJx)x9>A;4nG9RLs{AN~*8(9YK%hzMK`A+D51z#2?1T{M%DKKEE9an; z2T>Lfu5(wzOW(UxJ$uiWQ5XL%q&OI{U>mMp!3(yr6=hN7@si4l=dE4VGkDGED0@!I zN?YSBI7bR8rpU7QIVp>+oKE_MK6w4x0JR;WZU?N^9T0Kuh82?%%ih>j37ATc85Tfo zg;$-uKuK|3&FRb71~fN63_y5Rt{uMnYz%#LnayFI1s*q8t{LY`B>{`#Oj5` z{1pp4=g=lwa6`GzHC!7gSU}#&q2RoRQX~&Aa8ro zYzGuJLM6Lk)pbFn`U>$f#)@11wEwd3-gl+=uV+6C8J!BhDF8?-j6u-~DQ1JDqV*wN zw`8(1+@kr7+Kt(}WJ4C*^(vqHiipM{cKsMwsU}#l6s&jxg6qmL2O?raurLrl?H+C* z(xKNkr8M0RZ`KYdxdAHH4mdd=QrM9C&aXaPsby7q+^{W>4NzPccSSbAOOJulEI!f| z{?8wJKXb5EPU}y)I%hzvFP8O9Qso{fY=^Qp09GH5`Brk}(_gO?Or^(F1(1yt=ACsY z5Pbt)CPs)tG(uQuy;j0lDEUkrt%I`0E$BD+w+0w&kYrUGMJSPj6={H#8V5Ty7FN6t zuwxpow!9D`;juKPQ!ztD0MIQ1UeP2gHxH$Hp}eh7R<~Ppt(NAsYx^q&Q|WP41Jqh; z-dX=3O34?YG7+Kp{B9itU0IjzO)QiIR?Y|3$Ff)16keGueEX+Xs`ptHD=ZPJ4pwvw z?D%+ycr%2P&=yEn*ATVk5nj00CP+5YgJdD2oYOH-aynV0blL^jg&FDfD}Gujl%X6~ z6M$?md(lOo6t4Xo+)RT~DF`bG!77cgpqQ08AfL5D7fP|{%Bfu0tg}ni*znluzQVjy zCE*C05XZubHA6)B{6-9d)~79y;UNzA{N#UN!6!eJ2@_0OOdz>#9V%oo+avtkIjP5P zerhOChH`Ap0BUzW?_d7T%UVByjDJK3K7q+9O(<*1P{KFR>^y{10Bmlzu-nq>A9z5Y zKY!MP%J%C({Nu2&zjl!e#7GpkDZ zyJcA}uKV%As{R*{4}w`!fI6|vx*|4Udk;c7Ul!7V(lan$m;41EU5ykWqD3IWwG(+w z`raRZdvGTU^S`(j@Y_T*rjv+>veFa63+LNOpm-4A)&YJTC`Fh+HY(qHS(S3nc=>_H zGY?<4^MeLoi{EPwFznR8ta+CyA@6`t7A=kNM1%m#P?p{!eMRQ}r|x*SL1eF)@u>*x z6A_Jk!ivTYfz9<$wG)Wtg|NDn@ARQ`P^T!hY*Xb(yXV_m6L(&+xfVc%dW{hS$d2@% zdeKL$NckE>N?(EPMhH>~`K0CB-%8#8#BYY$*#q(T5e0Z44!G8R8U{jqI0~>z0#%+qYJsBwt0Yk6>HiNqp_u1<&%QnY0000更換封面 直播標題 給直播寫個標題吧 - 頻道 + 選擇頻道 選擇直播頻道 注意選擇適合自己的頻道。 直播過程中，若運營人員發現選擇的頻道和直播內容不相符的情况，會調整您的直播頻道。 diff --git a/live/src/main/java/com/yunbao/live/adapter/LiveNewWishListAdapter.java b/live/src/main/java/com/yunbao/live/adapter/LiveNewWishListAdapter.java index 40a6358bd..ca1d30d70 100644 --- a/live/src/main/java/com/yunbao/live/adapter/LiveNewWishListAdapter.java +++ b/live/src/main/java/com/yunbao/live/adapter/LiveNewWishListAdapter.java @@ -106,7 +106,7 @@ public class LiveNewWishListAdapter extends RecyclerView.Adapter 1) { num--; mNum.setText("x"+num ); bean.setWishlist_num(num + ""); + tvProgress.setText(bean.getWishlist_progress() + "/" +num); } } catch (Exception e) { diff --git a/live/src/main/java/com/yunbao/live/adapter/LiveUserAdapter.java b/live/src/main/java/com/yunbao/live/adapter/LiveUserAdapter.java index aa12c832b..395e63200 100644 --- a/live/src/main/java/com/yunbao/live/adapter/LiveUserAdapter.java +++ b/live/src/main/java/com/yunbao/live/adapter/LiveUserAdapter.java @@ -126,7 +126,7 @@ public class LiveUserAdapter extends RecyclerView.Adapter { public void onComplete(SVGAVideoEntity videoItem) { SVGADrawable drawable = new SVGADrawable(videoItem); gift_svga.setImageDrawable(drawable); - SVGAViewUtils.playEndClear(gift_svga); + SVGAViewUtils.playEndClear(gift_svga,false); } @Override diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveBeautyDialogFragment.java b/live/src/main/java/com/yunbao/live/dialog/LiveBeautyDialogFragment.java index 603d7f462..f60896f8a 100644 --- a/live/src/main/java/com/yunbao/live/dialog/LiveBeautyDialogFragment.java +++ b/live/src/main/java/com/yunbao/live/dialog/LiveBeautyDialogFragment.java @@ -91,12 +91,12 @@ public class LiveBeautyDialogFragment extends AbsDialogFragment { @Override protected int getDialogStyle() { - return R.style.dialog2; + return R.style.dialog4; } @Override protected boolean canCancel() { - return false; + return true; } @Override @@ -250,19 +250,7 @@ public class LiveBeautyDialogFragment extends AbsDialogFragment { close_btn.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - Gson gson = new Gson(); - SharedPreferences.Editor editor = sharedPreferences.edit(); - editor.putString("face", gson.toJson(beautyFaceList)); - editor.putString("beautiful", gson.toJson(beautifulList)); - editor.putString("filter", gson.toJson(filterList)); - editor.commit(); - dismiss(); - if (LiveAnchorActivity.mLiveReadyViewHolder != null) { - LiveAnchorActivity.mLiveReadyViewHolder.show(); - } - if (LiveRyAnchorActivity.mLiveReadyViewHolder != null) { - LiveRyAnchorActivity.mLiveReadyViewHolder.show(); - } + close(); } }); LinearLayoutManager manager = new LinearLayoutManager(mContext, LinearLayoutManager.HORIZONTAL, false); @@ -584,4 +572,26 @@ public class LiveBeautyDialogFragment extends AbsDialogFragment { } + @Override + public void onDismiss(DialogInterface dialog) { + super.onDismiss(dialog); + close(); + } + + private void close(){ + Gson gson = new Gson(); + SharedPreferences.Editor editor = sharedPreferences.edit(); + editor.putString("face", gson.toJson(beautyFaceList)); + editor.putString("beautiful", gson.toJson(beautifulList)); + editor.putString("filter", gson.toJson(filterList)); + editor.commit(); + dismiss(); + if (LiveAnchorActivity.mLiveReadyViewHolder != null) { + LiveAnchorActivity.mLiveReadyViewHolder.show(); + } + if (LiveRyAnchorActivity.mLiveReadyViewHolder != null) { + LiveRyAnchorActivity.mLiveReadyViewHolder.show(); + } + } + } diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveNewRoomClassDialogFragment.java b/live/src/main/java/com/yunbao/live/dialog/LiveNewRoomClassDialogFragment.java index f0798a528..d44e0387c 100644 --- a/live/src/main/java/com/yunbao/live/dialog/LiveNewRoomClassDialogFragment.java +++ b/live/src/main/java/com/yunbao/live/dialog/LiveNewRoomClassDialogFragment.java @@ -36,7 +36,7 @@ public class LiveNewRoomClassDialogFragment extends AbsDialogFragment implements @Override protected int getDialogStyle() { - return R.style.dialog2; + return R.style.dialog4; } @Override diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveNewRoomTypeDialogFragment.java b/live/src/main/java/com/yunbao/live/dialog/LiveNewRoomTypeDialogFragment.java index 6de4ec229..7f853b10e 100644 --- a/live/src/main/java/com/yunbao/live/dialog/LiveNewRoomTypeDialogFragment.java +++ b/live/src/main/java/com/yunbao/live/dialog/LiveNewRoomTypeDialogFragment.java @@ -45,7 +45,7 @@ public class LiveNewRoomTypeDialogFragment extends AbsDialogFragment implements @Override protected int getDialogStyle() { - return R.style.dialog2; + return R.style.dialog4; } @Override diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveNewWishListDialogFragment.java b/live/src/main/java/com/yunbao/live/dialog/LiveNewWishListDialogFragment.java index 38834624e..7984e4079 100644 --- a/live/src/main/java/com/yunbao/live/dialog/LiveNewWishListDialogFragment.java +++ b/live/src/main/java/com/yunbao/live/dialog/LiveNewWishListDialogFragment.java @@ -14,6 +14,7 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; import com.yunbao.common.bean.LiveGiftBean; +import com.yunbao.common.custom.CommonRefreshView; import com.yunbao.common.dialog.AbsDialogFragment; import com.yunbao.common.http.HttpCallback; import com.yunbao.common.interfaces.OnItemClickListener; @@ -41,7 +42,7 @@ import java.util.List; public class LiveNewWishListDialogFragment extends AbsDialogFragment implements OnItemClickListener { - private RecyclerView mRecyclerView; + private CommonRefreshView mRecyclerView; private ActionListener mActionListener; private boolean mNoLink; private View mrlAdd, tvDone; @@ -78,8 +79,7 @@ public class LiveNewWishListDialogFragment extends AbsDialogFragment implements @Override public void onActivityCreated(Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); - mRecyclerView = (RecyclerView) mRootView.findViewById(R.id.recyclerView); - mRecyclerView.setHasFixedSize(true); + mRecyclerView = (CommonRefreshView) mRootView.findViewById(R.id.recyclerView); mRecyclerView.setLayoutManager(new LinearLayoutManager(mContext, LinearLayoutManager.VERTICAL, false)); mrlAdd = findViewById(R.id.rl_add); tvDone = findViewById(R.id.tvDone); @@ -145,7 +145,7 @@ public class LiveNewWishListDialogFragment extends AbsDialogFragment implements mWishlist = JSON.parseArray(giftJson, LiveWishlistBean.class); mAdapter = new LiveNewWishListAdapter(mContext, mNoLink); mAdapter.setData(mWishlist); - mRecyclerView.setAdapter(mAdapter); + mRecyclerView.mRecyclerView.setAdapter(mAdapter); mAdapter.setOnItemClickListener(new OnItemClickListener() { @Override public void onItemClick(LiveWishlistBean bean, int position) { diff --git a/live/src/main/res/layout/dialog_new_live_room_class.xml b/live/src/main/res/layout/dialog_new_live_room_class.xml index 9291aff61..90c572a97 100644 --- a/live/src/main/res/layout/dialog_new_live_room_class.xml +++ b/live/src/main/res/layout/dialog_new_live_room_class.xml @@ -22,7 +22,7 @@ android:id="@+id/textView2" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginStart="30dp" + android:layout_marginStart="5dp" android:layout_marginTop="10dp" android:text="@string/live_class_tip_title" android:textColor="#F6F7FB" diff --git a/live/src/main/res/layout/dialog_new_live_room_type.xml b/live/src/main/res/layout/dialog_new_live_room_type.xml index 816e30a83..ac20d7ab3 100644 --- a/live/src/main/res/layout/dialog_new_live_room_type.xml +++ b/live/src/main/res/layout/dialog_new_live_room_type.xml @@ -5,7 +5,7 @@ android:id="@+id/recyclerView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="#b3000000"> + android:background="#000000"> - @@ -77,7 +77,7 @@ + android:textSize="10sp" /> @@ -655,7 +655,7 @@ android:id="@+id/goto_room_view" android:layout_width="wrap_content" android:layout_height="27dp" - android:layout_below="@id/lin" + android:layout_below="@id/open_sidebar" android:layout_alignParentRight="true" android:layout_marginTop="16dp" android:layout_marginRight="9dp" @@ -948,7 +948,7 @@ @@ -1135,7 +1135,7 @@ android:id="@+id/gif_gift_tip_group_buy_zuoji" android:layout_width="wrap_content" android:layout_height="30dp" - android:visibility="gone" + android:visibility="invisible" android:layout_marginLeft="10dp" android:layout_marginTop="100dp" android:translationX="500dp"> @@ -1187,7 +1187,7 @@ android:id="@+id/gif_gift_tip_group_buy_liang_name" android:layout_width="wrap_content" android:layout_height="30dp" - android:visibility="gone" + android:visibility="invisible" android:layout_marginLeft="10dp" android:layout_marginTop="135dp" android:translationX="500dp"> @@ -1238,7 +1238,7 @@ @@ -1981,7 +1981,7 @@ android:id="@+id/enter_room_svg" android:layout_width="match_parent" android:layout_height="match_parent" - android:scaleType="centerCrop" /> + android:scaleType="fitCenter" /> diff --git a/main/src/main/java/com/yunbao/main/activity/PDLiveConversationListActivity.java b/main/src/main/java/com/yunbao/main/activity/PDLiveConversationListActivity.java index 5fe07d6c3..64a6459b1 100644 --- a/main/src/main/java/com/yunbao/main/activity/PDLiveConversationListActivity.java +++ b/main/src/main/java/com/yunbao/main/activity/PDLiveConversationListActivity.java @@ -146,7 +146,7 @@ public class PDLiveConversationListActivity extends AbsActivity implements View. public void onComplete(SVGAVideoEntity videoItem) { SVGADrawable drawable = new SVGADrawable(videoItem); guidSvga.setImageDrawable(drawable); - SVGAViewUtils.playEndClear(guidSvga); + SVGAViewUtils.playEndClear(guidSvga,false); } @Override diff --git a/main/src/main/java/com/yunbao/main/views/MainHomeLiveViewHolder.java b/main/src/main/java/com/yunbao/main/views/MainHomeLiveViewHolder.java index 36d4e899f..ed355aceb 100644 --- a/main/src/main/java/com/yunbao/main/views/MainHomeLiveViewHolder.java +++ b/main/src/main/java/com/yunbao/main/views/MainHomeLiveViewHolder.java @@ -211,7 +211,8 @@ public class MainHomeLiveViewHolder extends AbsMainHomeChildViewHolder implement new_data = JSON.parseArray(Arrays.toString(info), LiveBean.class); } } - + // new_data.clear(); + // mBannerList.clear(); return new_data; } diff --git a/main/src/main/java/com/yunbao/main/views/MainMeViewHolder.java b/main/src/main/java/com/yunbao/main/views/MainMeViewHolder.java index 35c9897c5..740285f63 100644 --- a/main/src/main/java/com/yunbao/main/views/MainMeViewHolder.java +++ b/main/src/main/java/com/yunbao/main/views/MainMeViewHolder.java @@ -313,7 +313,7 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi public void onComplete(SVGAVideoEntity videoItem) { SVGADrawable drawable = new SVGADrawable(videoItem); gift_svga.setImageDrawable(drawable); - SVGAViewUtils.playEndClear(gift_svga); + SVGAViewUtils.playEndClear(gift_svga,false); } @Override