From 4269288754e1f49734f6ac049310b3e1553fa411 Mon Sep 17 00:00:00 2001 From: ningwenqiang Date: Wed, 30 Oct 2024 19:00:54 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=B4=E6=92=AD=E7=9A=84UI=E5=85=88=E4=BF=9D?= =?UTF-8?q?=E5=AD=98=E4=B8=80=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/res/drawable/bg_white_radius17.xml | 6 + live/src/main/res/mipmap-mdpi/ic_yola_cup.png | Bin 0 -> 677 bytes .../src/main/res/mipmap-mdpi/ic_yola_fire.png | Bin 0 -> 254 bytes .../res/mipmap-mdpi/ic_yola_search_small.png | Bin 0 -> 573 bytes .../src/main/res/mipmap-mdpi/ic_yola_vido.png | Bin 0 -> 1079 bytes .../main/res/mipmap-xxhdpi/ic_yola_cup.png | Bin 0 -> 2358 bytes .../main/res/mipmap-xxhdpi/ic_yola_fire.png | Bin 0 -> 750 bytes .../mipmap-xxhdpi/ic_yola_search_small.png | Bin 0 -> 2202 bytes .../main/res/mipmap-xxhdpi/ic_yola_vido.png | Bin 0 -> 6396 bytes .../main/res/mipmap-xxxhdpi/ic_yola_cup.png | Bin 0 -> 1955 bytes .../main/res/mipmap-xxxhdpi/ic_yola_fire.png | Bin 0 -> 788 bytes .../mipmap-xxxhdpi/ic_yola_search_small.png | Bin 0 -> 1536 bytes .../main/res/mipmap-xxxhdpi/ic_yola_vido.png | Bin 0 -> 9069 bytes .../yunbao/main/activity/MainActivity.java | 7 +- .../main/adapter/MainHomeComAdapter2.java | 7 + .../main/adapter/MainHomeLiveAdapter.java | 41 +- .../adapter/MainHomeLivesClassAdapter.java | 22 +- .../com/yunbao/main/views/LiveOptAgent.java | 29 + .../yunbao/main/views/LiveOptComAgent.java | 125 ++++ .../yunbao/main/views/LiveOptFollAgent.java | 130 ++++ .../main/views/MainHomeLiveViewHolder.java | 20 +- .../main/views/MainHomeNewViewHolder.java | 4 - .../views/MainHomeRecomLiveViewHolder.java | 4 - .../main/views/MainHomeViewHolder2.java | 683 ++++++++++++++++++ .../res/layout/item_main_live_com_class.xml | 35 + main/src/main/res/layout/view_main_home2.xml | 111 +++ 26 files changed, 1196 insertions(+), 28 deletions(-) create mode 100644 live/src/main/res/drawable/bg_white_radius17.xml create mode 100644 live/src/main/res/mipmap-mdpi/ic_yola_cup.png create mode 100644 live/src/main/res/mipmap-mdpi/ic_yola_fire.png create mode 100644 live/src/main/res/mipmap-mdpi/ic_yola_search_small.png create mode 100644 live/src/main/res/mipmap-mdpi/ic_yola_vido.png create mode 100644 live/src/main/res/mipmap-xxhdpi/ic_yola_cup.png create mode 100644 live/src/main/res/mipmap-xxhdpi/ic_yola_fire.png create mode 100644 live/src/main/res/mipmap-xxhdpi/ic_yola_search_small.png create mode 100644 live/src/main/res/mipmap-xxhdpi/ic_yola_vido.png create mode 100644 live/src/main/res/mipmap-xxxhdpi/ic_yola_cup.png create mode 100644 live/src/main/res/mipmap-xxxhdpi/ic_yola_fire.png create mode 100644 live/src/main/res/mipmap-xxxhdpi/ic_yola_search_small.png create mode 100644 live/src/main/res/mipmap-xxxhdpi/ic_yola_vido.png create mode 100644 main/src/main/java/com/yunbao/main/views/LiveOptAgent.java create mode 100644 main/src/main/java/com/yunbao/main/views/LiveOptComAgent.java create mode 100644 main/src/main/java/com/yunbao/main/views/LiveOptFollAgent.java create mode 100644 main/src/main/java/com/yunbao/main/views/MainHomeViewHolder2.java create mode 100644 main/src/main/res/layout/item_main_live_com_class.xml create mode 100644 main/src/main/res/layout/view_main_home2.xml diff --git a/live/src/main/res/drawable/bg_white_radius17.xml b/live/src/main/res/drawable/bg_white_radius17.xml new file mode 100644 index 000000000..fae1b862c --- /dev/null +++ b/live/src/main/res/drawable/bg_white_radius17.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/live/src/main/res/mipmap-mdpi/ic_yola_cup.png b/live/src/main/res/mipmap-mdpi/ic_yola_cup.png new file mode 100644 index 0000000000000000000000000000000000000000..9bc4970b2c6f22a5cc961e72599d66fd8bf26daa GIT binary patch literal 677 zcmV;W0$TlvP)Px%Ur9tkR7gw3l|M+9Q543X=anP}x#vQgG?Y}(CNyTyzeQ?@qNYlyP;n`OoFapW z8rn*Y2*Q?#YAC3oC`#NSnj$2mDF}l1T)#moy{GSrissQjDUasRv+YV*naR zw#FEbgb*Ij0iFWbuBux_X{m(gVjBy}@&^zBnvq2g} z279is`{}EKt$R|ewfwWRn;y4Y510|3g=uG$(sOfsp{F1fb{-MjPcyW#6tklE@OUS7u6E}Q-Fw^0C11hv91M8 z;|riuRfkvQfpczC`X7pBWl^967*^Hf%aXGy56afP@JFjhTt@Q;pL7~1EveYF00000 LNkvXXu0mjf3&Av% literal 0 HcmV?d00001 diff --git a/live/src/main/res/mipmap-mdpi/ic_yola_fire.png b/live/src/main/res/mipmap-mdpi/ic_yola_fire.png new file mode 100644 index 0000000000000000000000000000000000000000..3423d0bec00972734c80156ac79aa0f5a337da63 GIT binary patch literal 254 zcmVPx#xJg7oR47x8&@D~_Q4j#&Z^8*GY6uB}kRp*FIRSzLkksHfLem6+!;n-VQ8)ww zfkxIhbrpL7f})+aWFOhkrQykW-~5JuzWD7jvyYF6cxwK&!4a--84-^Kx4{Vx@rkol zQWX)iADEf@=;5`|@)>)p*y%US%r5S0c-(+IY)c^nh literal 0 HcmV?d00001 diff --git a/live/src/main/res/mipmap-mdpi/ic_yola_search_small.png b/live/src/main/res/mipmap-mdpi/ic_yola_search_small.png new file mode 100644 index 0000000000000000000000000000000000000000..608088fb90c8a0bef82e8abb5814693a6c198862 GIT binary patch literal 573 zcmV-D0>b@?P)Px$_en%SR5(wilQC-)Q51#GdBf)Cpx_ z;y(}n>~FPNPLd=yNL~SO3;;#s6M&^8N#=XK-uhtAZvfBp&RCZ9P(=2VTmkSJKnh?& zM9z`?k)~-F$MIqb*#ZPXa7sj80QjJkn(cPG?*}I}8jXXtZQlnlEh1NqF^}^5KEQR| zJ&xn70r+WI)>Nm{`Ldlf^?JQx+x9ZaG0U=HK@hwWk*~&>vwgtk`1k7&DyKvDA?zzoUNYPCAkZnwYx z^_dD=59Ln*FeW0K((q%JWly6hS_{MQqKGVzoXX?AEnqiRmNmZsE#Jox4nhwM00000 LNkvXXu0mjfOd9{R literal 0 HcmV?d00001 diff --git a/live/src/main/res/mipmap-mdpi/ic_yola_vido.png b/live/src/main/res/mipmap-mdpi/ic_yola_vido.png new file mode 100644 index 0000000000000000000000000000000000000000..681ce9139aef6971cc6535d73e603877b3867120 GIT binary patch literal 1079 zcmV-71jze|P)Px&@kvBMR7gw3mQQFLRUF5E@4cCMZ~m>hRPj(tup$*(F2_Uc<9NZ7f&J>6I|S;;wEX97H?vp=*dHgo1NM0%$q+?-kX^;`zI+u zsB@Z`-@M=F{eHji`|cvRPZzpR9OwfbK0HH*4g|AFoW3D9K?u3pyhAUpug`}AVqZ1y z&`UCQuMPKsj-QqiI6syoDF{h`Tqya2dXle^01zmfEs}Q#G(tc(j75`JFV||{ z`h$RK!RV=(A3Ix}X*ri9NkAx$%9^j)dEcEzA|;5KCYX$Vw(`sT#o~*xvFQg5gKyMo zwOC~usZ58y=jjV_b;l76N=O74g?R3?Gwug?Ice0PS7zT9s$M(Y}*9gq{BJrxeOHYu3cxTvia(26pXu8;y4D8rl9K@*tP|o>MWBAu5}#Z-01{HD9g|FTuIv0xh`!2s_@?ZRbPdyFK&Y09 z;iv@pzG_{n`rE6k-t)8VM`{+B5a|lwIPR_A8cQSPlh41N#9~eeF=QA9Pebugc3{in zp6B~^7zRDgu)Fo_+=`}2kSSe$`R0vlV=^{6K0QnTpF@Ct{&i`7QGv>pi7TB>@Q(bQ z$-J&GRpp=qm6x3?p*%>_G^IF7%}b4y>g=Ee8K_*ggjSl1m&*zFq# xh^B2AI{9*Kx%LqN3^dFC@6X9z4)9-M{{j{s-cC$__jUjP002ovPDHLkV1hO&1|a|d literal 0 HcmV?d00001 diff --git a/live/src/main/res/mipmap-xxhdpi/ic_yola_cup.png b/live/src/main/res/mipmap-xxhdpi/ic_yola_cup.png new file mode 100644 index 0000000000000000000000000000000000000000..0f409776784d8280ea22105c65d05a2fdabe1c52 GIT binary patch literal 2358 zcmV-63CZ?}P)Px-@JU2LRCr$Pn|+L2RTaR`xo>87Te>^%-kqjW&{n~iv|57!KT?&Hpz#AL){j(U zWKlvw)Cd|IwS~5#_!arkgntklH3W@{MPec!L8^#RBtZpAkm`!EQg`OwH`Cp1cRud% zoynW^?c151**9-?JDa)xb?4rD&i%b}&%O7YQ-pq7lmPbmEKZ;gsD*{}0rdfO=0y4y z)VH9%1$9QCZ$X{$>(mEfHk&=qT6+}{jUnP-XX+$2`oBbUKM`H$dEP$(fa1>F5g?`1 zej@rD0Gtt5fi91mLBwxptq;bP6C03H>f=Q8-ME66a~vXGskOc%j?7qqHf-2%MyXVK z9spDvp(`+^AcWYO&*xuQs_a;Rq?8{9fI|Q<5EA$}5#75~1(NQMh-mtZW8i!Mq^ z`5HugKM}nR0Jb9H2u~Oh3~WI?0H~&CpnnAsA0wh8*4o<(g~H#PfoclKb=}Jm@m2uH zw4~f4fSRm>uL66u*0(hJy&<5{(a~K*^s}g?G^O0zfCv%MT07=>-uI(xTmUGO$-F`c z@h1R~;m%?61OOX8!FptiO#?t05o;%JgO6VTfVUW9{yJ~nQDRccuL8j5BY!ViYxx9t zs9LT5E0s#^LB!AYn3MiysZ{!w<2WOZ<9rMNJ{5fd_?C1~Yki<8Af?m@5&a4P-W2X+ zjG1R?uIujit!8ebUa%nFVh(toH}~X_QnGL5cUsuTKH)p=9iHcTb00qpBAd;gS*=$2 zE|cQF^TMsQ*L$9KL%82+0L1IbWHNgk$N73_yOkZs*_6xW{?ibUQfeyzJXs&WfU4E% zxrIXE*eV5dj^jAbh1UxJuhv>W)ew;Dx^ERi90?JvI*#+QTrM}U8Ubaq*^R-DaY8%h zLeKMl(-6?e$jIwcsnj3B9$pA>cJz_ATDDjKXzl^aJEl^pyrEbu{;`<_Z4yF^hfOXz zfCsJ?K$%SDV#jeF2(Q;#yEzE5)fmk?oz|^ew|-z?;4ehsR9zQ%dpS zvo8eb#ZsxXZE9+2vY`cWoM(1+_Anw|90GF87;|oq0TN27YUDLP@0jQHNGbD?nAVY0 zDs{=^wJ`Mn{3w7iN-7S9nSiRhsJf;iy1 z?zMhg>!yec;S2FOjp9O0<3UQPn~CU}h!t^I;0htcWP!MXYtv!fR zd`W9Px1N?;Ea;GuQa%U(7lt7PW;qT3n|sNE7*3!w2dcw{@u)Fo2LNzje?eO`V_FnVFgQBw1`sH-8%*9)49ioqnc`fZsFKYIS?DSk%q*X&Gp5 z7m^U-effO;?rtu;-ML-Yy#f)x*P{Q6*4izFLcuKh@!Js^K;ol+dsEVghqTrlh+6R` zrMwdWICs~q{myZm4}`-Su`Q@RaCmq)n@*?svUpJw(|rLEx3rT==`um~ot&k3X+xia z_+UDnzU=t%;~au**;;O~=nTOTe;ojb$Zu0Zi1+04`G;Cc?P3R|6sM_v2mnJ7F;&je zXszc$#qFrEWI#Nr>$;aAB0~yaCi$m3jWJ{X1F+JL@GkU8ODTT<0J|e|bA;j=&-3nC zs?1n`0wJu-v*F`DsKa?}G&8VNrQ-INQf>o)KS##@c3@!Oo$YR^sO(Mv@oV@Jez!$@ z((}d`z9YphTIv80pGa`dstPLxHh(FOg?SQgT_# z2g5>$XjTZZQ)_*HC&D`h#KQf2+D$}sZ3Gbi^QS{YLzj2Uk~nNpE|(Aaw|zdj=5av8 zo9oes6$iu$NGWea#H&M!)^grN^fVFe^*rxzCyGYLN-4Sg=0-&1hja9Ob(=Bf6G_NR z#DW4vhNP5SbrwBhIS)RIh)*NpC$-j(cA~hHlB>r!4bH(Xt|p7NyZk~fzR{oRL{5Ed zl7MP+Dy8lwqW3PM+)>AIzKw{7XJ=FMdgfq{X+N~N+B z06q->Tbj&m5%C_a^{ynqbPZ6j-MBP(9{|(}uA(g{+2dHuvqW?h0JySZf{1Eg9TC^~ z5llX=Urt141;ty9Dl+O*7l~+}=Xu{r5>8E*q$jM;r<6Jy0DcYt=eH4dh^0mV`r&G| zdR4Jl{9CL^S`6wMpt@YwbwBFYCvjfw%;;4h?t%iJ_7tC-;WTmF`4$`3bwDADdPm@! z-UtBO>f5ZHMTPnvMZ^cJwGVrq$JW{Pwrqfcl?c~$N7Cu^P^naUw-Dld0JtEqu4vS9 z8WFip;5ln8hbSH?m&>OLg#y>^EZZ|?xdAo&;z6uwGMpnXm&@4`Cr)tYb4A-}0myaT z1w|9lB7&8o)CaWEr&v2*zHdP-DD?rg05mc(qEe|;K2o?fx>&xd9m`CjPvSmEDRqF; z()Gggc9o30$ZL^+cE@r*hMQD~BP@4GO0-gVbaZsgTFWo`m24mJOLaIemPkt!kd*R^ zehA_#iD(volD)Px%s7XXYR9HvVms^NVQ5462f0Lrzib5%&hBTT%O5{ayXO{N{_VBb-fR80=p$1f zarwW%X4VLd0ZvN#k!9C1MQmoPfmWa$*d^&+T6k9QHsEj!dk@T(^f(PXEBFwwy#VwR zs7nJ+4K}lZz!_j!5a9=4k)&HmBF_RI9szCw6N&(y0u7QrSAu5&JMc-FiCZLX^8aQw zNYa;LzFEKrfZY`$S}3XA%=UX)Bs~oMvw&X#BP)PAB-NT(Gq4kwA?an|n37;KtC94p z(Amt^0;ekF5BLhq2c`i>fU`i8q^|C<<-k*c7n0t^`RWIB0OJ#Y-DNK@IXVw(V*eeI z{2KnXa^O9{8%ZrOczskRj{`Lc!RLXQz^DTMDUu#k0(Syl3ReIFfQ!JKgiv>T3k(DL z7mT?NOqKMzXvAhV5qK0|n>t`Ca4-e5l&e>`4U$?*fiD0{;zP2Sx>Me6z2zCMI zT_sOD3N(jc?Sa zuu9UU?s4T5h|3mlVPjK5LidlrQc2eff0R|3W;Pmd=`$}-5=qwLTkB%NbJ{~RmfY%a zRx@kzSD{amgczxeXOTAB2b_>pv?wLk)n+z0%6l!a7?>L?$PrQRcFF4RraRGl>Ta~S ga}Ji|ugH@22k4UD5>3jMrT_o{07*qoM6N<$f;;wC3IG5A literal 0 HcmV?d00001 diff --git a/live/src/main/res/mipmap-xxhdpi/ic_yola_search_small.png b/live/src/main/res/mipmap-xxhdpi/ic_yola_search_small.png new file mode 100644 index 0000000000000000000000000000000000000000..cf917d352262ea505e33bf3396dfa89549808a6f GIT binary patch literal 2202 zcmV;L2xa$)P)Px-R7pfZRA@u(S$~WiRUQ9+-8`ecA}Jem2-Y`KA(TO8HuI@ zJn)A(=i9v#URcxLh=2Qf z?sOc7RAE7$Jc;YNKSjiQZQK6)a=-`YSeErQ0Js|wSNJ#Vd9;@qW1DT;CY1~w4GEa0 z`NjD~$*{OT+cVOfQtF;|jI9|-(=PV?n`qae4#8O@Jgz6HoEbA%& zcoG2C)_{N1w(UCI!YvY7T9VF}60J&zEY~2_;~f=FOU>{f69Sz+g$&KPZGCk8{yRZ*MPO zy?S*H04(1gJe&Kz5MpOb1T4!UU;h4puw;xS3WdV>MMEA~IGs+flT!W;04@*wO{f1p zA;jbok5vmOnM`g}N<9GpD+Ax2k3=HZjf{*?*zd?lrBVk0;0qM+0_t>+ZQI{&NWikJ zBmmGAG7_W+tCad&p-_0JBgnl?cJAC6i^XEE`2@VUbEHzKd}e%n{M>m`K~SFGKZJ;% z_w|nmbaiz_hlYmcI!S=`GEK9fXz}VJV#1-w{6?s zxfBHY`}?odb^W~2k}FqA-JZ+keilj~l}fF3U6-=Rg%LKPlSC}bx@D3&CVzHR6djp1HoD33> zQeKnK=byV21k&mBDk&w!q#OJjkWxM%gviwMLUB#go+s_`ZJ<)AY%dmzlqGh2kW(p_ z%YOlYD*`sKO9+t&cKBGgb@2Wj(*XNUcnff@`D*U71wp|%IEV( zLJ3gxi$Dfqdv0DdncIv9VV}3DBRWX$~Nw?H3gu>m`QM2?C_fuIs*1lhRW@ zHW=*Y{a-y`n&!2Pu_u*MYXU%D)--KhE|;S=Nk>L9nam?%DscJ|5tFuUj|BmQ7BrS+ zJ;WIMtUp;Pr4VuNa=Q=hGEO8C?`4cpJxPGiPd6n%NnIoonF(ZpG-p=R zwCi)Z+>7l3YDd1Wudgc-i5#Jv$Dik^u`Ps1)vnd3CjJKJ{Hs0*Z;{`|w>&!7{-RMf~qb7ih{1|{u%(@6RZtf*F9<&#*UGZk(n0o zv?XGi<}SwAXt4W7zF$hYtxzZ&4O^^XU&ykoJH1BkVx!+1h@d`frme;K4D~@o><^xbr%tCCV;?wm>eN5#E#3;jOeV9k zTrLk8hA~jvCk22Lu~_V;p`oGke!p!3G$ENxjxxq}1&!J}9cnj@DWyh>#p0h^0qo0o zjkA749N?T^6>MF4GF8s`yPGAFO>ck}>+S6|R;^k!%os}ty95Ei|4~Xk%{kBOx_-D( z_rkKQk0RnHT-WVI#JBqW);i=52_eiz2h$P(e*x1p_aWj}!X7t*&qvj2^*N=~)O;`L zCD(Ol5HYTldKV&YpqxJJZJ+_j{qcBwUp>#)76IDCvaGF$_+`e}tu=8XXygm+cmK79 z?8pCw0rlP(sA!s{mU?hq&))V6A@(lIh{GmXmZbv#>F)!ab3OQO(2gAtI3g*f+#iWV z4$jWb&Qb|U4~DfQlv0V>G=lbO`vz(Onx^^bc@SA@11hE7!WdiPa%<(4QWOL!r=mFW zNKa4C-U9~?%=&Ux^Hp3cX%8xZHK#B(U6* cd%foU7bxPpUa7!|lK=n!07*qoM6N<$f+qGLV*mgE literal 0 HcmV?d00001 diff --git a/live/src/main/res/mipmap-xxhdpi/ic_yola_vido.png b/live/src/main/res/mipmap-xxhdpi/ic_yola_vido.png new file mode 100644 index 0000000000000000000000000000000000000000..d16d80ed9f98dc94651a5ef0a1dbed4854022b8b GIT binary patch literal 6396 zcmVPy2wn;=mRCr$PTn&sJS9Lyj?#z2{oj3^)Qb+@hP=lbTp|FY9_O6{Z@lPBF2V|vx zBuGV25fceiT2ZMg3TXu-{gn!Z64XSZ2?=RwVjMe$#M#(hX9E}o3Zyhcy78>B^ZbRr^uJG~UuSK4kvE>abI%dcy=3eiFI{fGy?giW z-cs*T)@)ozuJd8eCf#(`NSAwQ%i|S$Q!@Y`1IB%W*<6mq8nSeX7i*k3trPXN3L|TruUR230Z6T zPh(g6jm$2rEt~tu@M+Rba$7oZ14j*2iOdiUhcyHyu{!^`8!GawrPL; z;G=u~Zm}DkShs1L>ASlMS2p9C-W&2*)5w~Mku?(ruxFa~9Zwu*%~3#E$~hweH#vRP zR8hD`io9qPrK7Sa*)qzq}FuY6)=q2*0XUo~Y4_i&yU z%>tX?oN;BzmgY+!=ZRN@)v4uS&D7dF&Fq!4L)Kgh0HYpr(!g!ryt#SgMfbObbJrAk z?hCOtDqU$xJRvLu_F)X%)F(DrUFx$eh5PR9jM3I_efi7B!c7mXSrk+hvL?QLSrTx= zqF9rGvx$e*r8cEBOHG#Ay~pOQIVvDaJ@2G}n^?DT+&J^~ez#ABD=5zkUzVkj2L*5? zKVc%kk+DV|Fij~-Q);xD}lbGS)fGdExF<$dDKD4Z!>DI4NTSh6<+)C^l& zBET74(>Gg9lTrHGeYG{03c#qxoiuQ()@=HVvh+7~yIr3bg#ZQ%fn~t8*ii|{NrFf$ z*%ZK82Cvm@;^F`1;Qohh2sgcI>Z(sTU%s!`?Gh}wC<^bKYz9E{h@JQ!HX}(4fJ<#^ zQv8`^rrB&#I&aNU0a@yKCk@=nwO2it_w$$Kd5#C9yeJen=Y8o7$8q>8qIg2y+SDM< z!P@w{(V#TTemJ*p_p8E9u3WqMCq+L$zn}MgQ4|KQ%2~RE)yZZUz=i~E5|gHI*VLye ztS+NQBg2|c&+Xg&>ZLyTsUCOIz)h{&;ydjw<$3P=01rXDaK0>^(T601{|r$g)BypU z-KvoxCS}xWjnVAP&UkIC+3s|x=;hRR1-mNND#hX?L6G;>Sm4HVB+V?=rAF2;X_hWn z^HhO3(fKD0+~o8%zT0Ks>K5l+SsHe$vg9@KaN!%Sn!#1GjIC~LY>W;(`lWd7YRv*M zj;)w8E7nAU&|D3AQ>|%vEr6D#8I6s#=)j}ZW}N83PxbdF4cw}=S3g}8`9=Lcf;il& z@C7m|2Xat{Qh5W%I0SMe2PVUu92yyAS@zt)$9BEE=BkHXQM^jm#D~C}$=R7*H-(#=ykg7eTq$ejoERL(xzahNH%j9?7ObtQF)k$}2W!p1 zno9*>)ZX^%cu)QZl-B!uo;Q518a^7$WqTcY2dK%u)roHFD%+3XCE)|4Pj$0CNlhfC}+Z+F8Q~KAJzD&sbpYdca@!ltr z@xoVhRgsoW!oNU<5w+((;o?B@Z@6p#9`CudFjhB~k_=T# znr7hON0Y?-@qxWNJ~9F}$30~MaFgq{y@9B|%Q^q*0)bjeALeHwid@K0R-8`QB4UN`Vdl1LjGkW z#L5IV^(n0YSZ`9qhx{pit4_#zQc&aOJvlB@S+GG3i%Ub1AM4+qR8l9JRzeXtd&m_0QC6 zHSS5IhKeEs@!oBhT|vPSlP7z{^S?3|&G zp4}*JsW+SkZg%zbTYayKvM2XNj(Snl*igJXR4e?8viC9f#9hwA!jcBDF?nN^5 zLQ_cL2D_>8-xqX|t7~A}I307bQw5SQ{j4@v7*b;+>KvY8DWJ zIX_*MMJ1Ki;-2ooP+Ai*M7&XTa>aV!9K8lx9(TgnT|;F74G;qA7+GVkpWV0fuKB>N zoZ9p!g)86deYuS3mgGO)AY^7_>MU(gZtW|ccx13%OrID+`iorxXY)neg*Z5KQGJjS43^rR;0!VZ45DZjb?+ap||g! z*?s>);MQ*Oolb{E%ACbSZN#vcSinm0<0tm7CIpYu$+Z@He;c)h5F+9xmf{jV)dqN&X>0l(Q6RXxxJ~PsfJ7G z3K#&t+stpH@LV?+a zYKqUQ5xWRN9TB8kSu74Fbzpb6Kg8Fws5YJl?AX@dxHNn3~j z55S=(`#a>_Rw7!{@8{%@{6rGd4jnGZ6o~KDq5=^W#HXsOa*Qd2%Bz5@N>aR$XvXDtcMt=6>hn_AZb^}=+p$H9h7GJp`B(V*xNNzN7-&-XyZU{jvZ9q%de(2!dg}_Zr zUG2MFSX_Y%aLEM~7OonV*cf91D1wFFdbHvgpoV9|$mJqik>D7EShUC(0%fN>F^7z0 zpPnWeOEo)WRO$A^Vp8A8GK1;?JIA1bV)+tHrZ9nk5Y8o|J^<4h&>D`BES5HL1KSVH z4Fztq?;<&%z-z!|HgD#X`-k-yH5-7!=RWYiF;R3(W8SiOj46GLsx8bMrF z#vw#mh!zq;2f*XrD<=nuaTZOYETyt=)XQ@ouTV=v%0mnfgh7f!1BnVEflMJ}S>{{K z2KMO2LvwpSy&%R-Ol@XYm3}Gc2&xBIoap{iG1QGBNEKCS#l|NF5jBqr<#@@uP@o^G z>LHb{q-@bu26O=VNw-L6RFoyfo&;!w0;gq{^j^^n>h*dulcEju@LU{5l@W2h%keES z8IM_H?5Y+qZm7kr+3Y**HWS}I(-CQ$u>XfHeV_^R46CkGguq>)tPN$%xS?w;6^77{ zpkLP1&H34-(ylZ-EJ{d__@Kw}n1m`LqL5_G2BA;V?Q}yoPAVeYn$lBdzF}BM2YZkh zF!RC`|SWG~WUDo_mZF14;9G*`K_Cd(jF@{b{)X*yS^L&gYn zPiTlFU>(finHAKTDP=aJMl+*h?KWWwK_>$^eo6_+i6IpA7_&fP(O$63yfhn_d0EU= zC$I9IF6fB!xyw20@YGNxod@nFEI~IPG2w+5lL14N-(xTFx$J3(Vgv9G5?PIXaqVEg z=$Y|{kOj{>2R+=Xw1@_%m4no(!ofI30la2|jvYNloo-iE9&IdDbtJPap0ElQ#}+FI zrrBy@@@hC8SuwTAciYIS)i4eEn+T+A(m}qi(RSSQ(RM=5&i(_n&Ij`zOa-U?r)5OT zU-d?R&e@JFtfq&`=4cZfGbR9y-4&HXqd`ZHwyE9jgr*Qj1<_??`T*Go-Bb^aHDYY^SH<2-ur%@Fw6mrFBiPWYYWDjO9c{+d&^p-zvE+v&6>-OEwR};0>CYzcm39@>A`)=$tE?) zJ)}jjM@|krA`vG+dBm)dQK!?TPPZrXC=!0u=w!l*rv)UdinXQ*Wh}o7k4ufY@vFlK z@QTTeDl2J>8yI5d$|0mv2`_<8h^XM-cIETt6CZwtQd`%{MgVA$Q=UI+Y4xxEJRNyH z4M)@&UF2X)U{P*?zgY|&@k;j`{aBk;u1vywz$+c8%-=dJjO9_T;xM~L6I*d z7vdZDp=)Cg15KHlB-<|xUAgk8|Lh+=ZI+*{rg19XszvvQZhIwt>hmx2XN^II*71p| z+Z{M0&mLP0ZmW=~3b4V{CK5(ppG!fDlkMT{9he=zxsw=5H8TTvkib!nZiiBR-2=9yqg zJn4?{G7%y9eTXb;VE&j@66vKt_4VAv(*bSonKelH#qtz}7}aW#RWa8`slD;g>{k}5 zBbQHZ038u^q{ibSaN(}&12<8@Voakd-0c}NHQuIAf8>Ys$_ol&0GFCGG?4!Ec}pL^ z{Q|n1K1Xmdt+*lqj=B%W@nSg0C5n zW1PxLl9d}M!*2ZQV!(yU0qwyYJqLZ?0JkjT4~sQRf*e#eS@Ocrxyv2BYugce`}!B? z7v9t*!aIbHB>n{;0V=>kvP_8n`$v|(@X)#b-reV!Z~jw@nweg=(v<2}9O~ej0<0n? z&y7e^8a;=ElD8!`d$IKHHt+p-Ui8B|8XE6h^`vPhYf#TO5OyTJPp-w^5a0ez$^Wggs{DlGGS}qepm{A8WOs zNL>Goxkv7rnAm(yX^UG7+4uMJ9={>PZw0~XgdH;@)^SW z&ncy4sDF`}na?GO$7FkA{d;C-_Iy^ja_wscVx06yX+RaZO%@V)84px4vJ20c%o=8+hia zO>Znqcbhfo#$LZ$%@lEVm8K0!uU4yNlCpov%*-Ahz!?B;VrnBwF5k}!%*Dw#zGj}N zmc}-E(7y(|^Ht3}Pmk2@kpiW4N7V(3P5xTDQ9JuOM#0w+Dl)Ho5ws^&Z$U-4UPYa% zZ}b?Ban@Y_wb@4&j6kefwQ8(Pmv13&?vsfHdFd`pxnqsQn#cF=eQs|g*1n3XF6tuvd!-^Jb47!}Jnm81=cc#R-; z;|%b(@FumyH&|VRTCFA$&rsk30ISw**+fP888V*V39F5c{U9T=cJJPu&kO}_#p)|x z=;y_91`c#2G^M%I73AhHuq5`X&3SPk6=LhN9f56yiY7E)qO@1jSYl+Xd}*NRB`#7; zVb(k*_Cj?8LYvXmd|Yd63<>+%x!JGmI3BT_p5A;>LCHIeF>f$LxlibO)OUC6-@p4O z_45W?_43v0AMjK1q*cTeOlNv3l$FJCM7MBZ@u(Hxveb(t- zP4@`dt~O2_?p|XdyB35c9=gF>*(?dMkO>}^k-zxh!M(Lt1r~>Je0)4xzI?f#nVBhu z9W?;l%E=8|OYa}R5K4TdvPuyAnwE}vNe&2|s<86lW6Gy>{bG?%=Etmg`yeX}fHZ%n zBnDL0ro+=o$_2WD_hdgS);&2h^V8#5+){rx0NnWaTbJ2p=P~EpWjb^dGAk3rP|t-P zLbRQr#fBcJbg{(rbdIS$JE9&Q$VF%q3JuWyi|&Dbq&YlFSxOkH^rr8QC81P`t}6c) zKvny)XZg z$ow3?l%~^)@=s(4>#B`tR%2dO*so8MS1*u+s3&jPOYbKDq(Wktm#tf9aL$kiM92`V z10CUh13=4Cc7?>+&$u!Fp+gTp{QRf@Eq2~eiwg&jkFP&BYndxbDnC$`?y|(#f)5lKV4n?`$@E|F&3G zJXIi%3*4zL{{Q*>Gr*0wyJvtq1KfxRjCk4^i#r3{hzN{$+W!F2ZhbjAe-StU0000< KMNUMnLSTYMCRHi` literal 0 HcmV?d00001 diff --git a/live/src/main/res/mipmap-xxxhdpi/ic_yola_cup.png b/live/src/main/res/mipmap-xxxhdpi/ic_yola_cup.png new file mode 100644 index 0000000000000000000000000000000000000000..c4db862d890152dc0fc8d617d7632d8cbdc629f2 GIT binary patch literal 1955 zcmV;U2VD4xP)Px+T}ebiRCr$PUE6isHW1}dNB+DikfmQ#1R(0{Y4R))5P17M}LscqZarfKFw2Ql^Yt^q;_k>~j}B3_0NIM$c|@KqAg_>{pb0R%n({E=nZiBBQ7 zXsjnhJZqZ98wp+sD9iH8uC4q&`J@R|RbBa76y69BLL39Y-@XLf=5Y=V4$hvRpC5h5 z=#7A~EWab-xeuYXeGCBjR#lZ38|RIHqA31S?fn37-?r_g&wXDzaX~4$Mm!P4+ z){S2jg>qq$9at$*NuX@QaeOIm>#{YHb5voJKW`!yk z)e&$B0AE}Jt9>S*!$}BnBD298+cp5)R#kP=$5cr`Q52L?-f%g|y{f9}LPbm>;6GHB zvFQx}Tq`hAZbLc(DE!`FQ5ut{M1bDCrtL^-K_8~3uIs|80Ymd2NdtaDTNH(E0dLrW z4Gl0DU}FX_5wJ!8or`REN2 zvMj$M;^z&QDa8SAkmw@(q9`bNNyTVuKixU9E)v%IveJ@o)Wx`}>X>a|s=lU_jEVr0 z3y+8&o2GfN#sM;#BSTD zfYcUB;cWQ-rWB6pJV3V%5pfT7U4L9vr+p{Dl)g6=av4v=bl%Xb>HyqSRdw5uu+Ibt zA+8AzjcwAN1sJy=X$wqRuy)+GuLKAoKFc$6CH}U$DC?oT&L!<;>&`s)kpNk+pp1*; zE}=XFSY^sefb;~EWry8Bq<)B~RKZ<65u@)lY&!%Et9+3~fXTw!d~%x#+WN=*{}C16 zb9s-zdaH&-fV2lxe(qc)VLHT#2`*=D!{LglI~#nf5$?}oI`h;?WXd0LK#18!2%$Y2 z*T_XN65XIto*Jt9ur;9T?7AKKtfilt42RO3*F9gR8`$7GYrsGfSjK2-a5?ko4ptO> zowglkFGwY^ip>0y;OXS-PEoL1(N-)|RO19~d2 ztea5?KL>!vJkRgPzRR=nb{##X!?|)h$;$7(c`^c4wj-*Yba~ROdxzmqdO!~V8r35i zw5QXfA>YPlz!uxE4i1ad|uC~YL zRBK~JAz*|ygaCq8J$YeHCt1D(iAKPRHrP_xzP`0T4gpWA-pku>Lxqe^zzPvmg-0IB zMs5AjkJI$q3gDv{VGfXFOv!jI%j4;-HZs;OMpQM$s}Wz8$NX5jpLg5#cHP!!fQ}qW zZxa!Do_C%N5u)>=$a^7A>7TZ3>EDmB_IA!J8U9=i&UU?iGV=Ba)(U>aFOb@E6cL`( z#M>Weu+2DG9Poeo>lz`eAo_$%Mu6@aFWU-<^#9tY1$@hs2v8%sdj#0-8~a{aW5)AQ z_s^YwG7TVsBngye-dZC}uL4hbG&v~&+*Pqp?Ggcz*-iu`0wN<2dHSRQiGaumM4mor pKq4SA0+FXr8juKxj6me+{{_z@7@eV3MGOD{002ovPDHLkV1lD?g0BDo literal 0 HcmV?d00001 diff --git a/live/src/main/res/mipmap-xxxhdpi/ic_yola_fire.png b/live/src/main/res/mipmap-xxxhdpi/ic_yola_fire.png new file mode 100644 index 0000000000000000000000000000000000000000..a6fd3e6713d9e22aed178da526c45d01d0da7af2 GIT binary patch literal 788 zcmV+v1MB>WP)Px%&PhZ;R9HvtncGzxF%X7lI!HRe9fS@-1waLa3V;e?Dgal2sUW0+xPznvoC@L& zCj0M^e6(6!SF;;GMCb5gq|v9*Xl~1N;)73|kNyL;-jJFGMPyAxJ7(UsLb>ZT0e^IW zpF81eW`5LyoC6SSzli9XnfI-rnt*?Z=z{|UxQkXu6+jUI7y$jz45H76$fPI*N}`RKoNoF zpuyVl$joa85bJUEh(Lpp1r(99STqokDcS?Tp|ib@BI3UOperf?#3KMC?BzH_1a1Wz zOdTt;{*xo%jhU}qfhB-&!Z*x(?g38Ko)v@i41fMWlJRDLECIA>6as&r>owS(3j=#| zwP*h~xauSz><@0htlV^=>fZbY=-QWCV+#Ev!h#&2`%1reuk1=hYW-dfn4JrU4p(%@ z0lIbu)gw$*g{moZW=$U!qksWB!>Qbav|;a}rG0Xd0{j^<;v(rvlU6~%$^<}(B`D@0 z2DrpSC^^`61emBVN(5@p*@pn9CIH%SkT-TS3;DU?!-Oq- S7zO+Q0000Px)x=BPqRCr$Pn@v(1ITXhwH3e8~oD)oPg5VPbPB6m>Vis1r*aS|HaDq4+aLbF3 z6TqAxo)g43h;J~S4MkDVZ~9T{s*YQqZJBfeybS)6r z8UUQ}JkLKbyLM~{*dC1tVr2ls;qWB@d|t*_<_xJagtE}-= z248wZr_(uUDwd4_2qE4V1Nh);0E$_u?u@b7_V)IoI_Tr$JA{dq)U?O9F-1^qfd3N3Qn00HkS( z`#g$K?fDtTmxFLY*x1Sb5E~yS01Ry@r5NG0%6K0Lxb?c0f)juc;=9T90iZXT zOss@mE*RtgX_}%insSc=Ddm+>FC1cHoPAV#DW!KH6vI$c8%m?TsWf}}wV9N%*9d@V z_Ho^3S@vq3MuoO5gg7RIeAN9;MTy#&#JB`h6o$%Qdl+LFuLz>i3pnR5bit7kfXV&aI{OHr-|u%fH#bqVYbQ_uaHvb2wE*x8@9ypn zMMdZSubO0CJ}w;N9aEHuhbUQ=9WM8w1z_6yefHHDMy%3?MZ4xw%9?PS0BB=vO6jL8 z%W$2w_EF2=U)=z8I-mt$2`sEZMO&zt^h*~SYXO8b&=#Ys<4Du=5&$rJ{o&CGp$P!G zP)$iqTS?m>2q7>=(H)-DGDH&q&>1DAbmk6ifMLlJYvKDd0NsogM_<3R2Ut#wygfjh z0yD;19R!t=8AAjy3dHmI<>!~!22Io#x`e!wlv;! zL~c6}v7NECayx8tie&^~TLzTUt1Qb7+Til#7}Uuy#xJ$Uc8X<V1U&m+Ve}FdrKz(^n$Iet#6h) z`42^!eEJy1F8ATOwI+l(Z-|`$uv6P5i5k?SLvR`Idw<~t0F87NB^2*G8U*F`Sgc_x zqFOMA2~VNz?Ql09Xqjk|a4eKR-9#2v_^|2B4M# z7Dc*hbg;O26k8Wm?eTk$g3O>>>mUFD5b)K9O3s~~oh#phC7o9U7>*^h^G>JZT_A=1 z1p^3#K(Gv+F?LlHQ~d2){;ov#O_6tC#d&DaHI~`$`$BI703j$%z|xu8`MYC%&+wZ7 z^bkS_ejD&#QG)Xa{szA#!0k3d>8&?}#sEqqU4=?b#V*3{ydbO$pt2-B>TY8q7@}(e zJqUv@+>vb6qfQ7>08}!vJ^-Ln`xZHe@&2ZGAnBcbq m5DN4eKq#@_?fob30sjMA1RibBtiR literal 0 HcmV?d00001 diff --git a/live/src/main/res/mipmap-xxxhdpi/ic_yola_vido.png b/live/src/main/res/mipmap-xxxhdpi/ic_yola_vido.png new file mode 100644 index 0000000000000000000000000000000000000000..149901d8f714286c106f63985a6b328c00a48ce5 GIT binary patch literal 9069 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 literal 0 HcmV?d00001 diff --git a/main/src/main/java/com/yunbao/main/activity/MainActivity.java b/main/src/main/java/com/yunbao/main/activity/MainActivity.java index cdcf77842..baf82436d 100644 --- a/main/src/main/java/com/yunbao/main/activity/MainActivity.java +++ b/main/src/main/java/com/yunbao/main/activity/MainActivity.java @@ -135,7 +135,8 @@ import com.yunbao.main.views.MainHomeComViewHolder; import com.yunbao.main.views.MainHomeCommunityViewHolder; import com.yunbao.main.views.MainHomeGameViewHolder; import com.yunbao.main.views.MainHomeLiveViewHolder; -import com.yunbao.main.views.MainHomeViewHolder; + +import com.yunbao.main.views.MainHomeViewHolder2; import com.yunbao.main.views.MainMeViewHolder; import com.yunbao.main.views.MainMessageViewHolder; import com.yunbao.video.utils.VideoStorge; @@ -180,7 +181,7 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene private ViewPager mViewPager; private List mViewList; private MainHomeComViewHolder mainHomeComViewHolder; - private MainHomeViewHolder mainHomeViewHolder; + private MainHomeViewHolder2 mainHomeViewHolder; private MainHomeCommunityViewHolder mMainHomeCommunityViewHolder; private MainHomeGameViewHolder mainHomeGameLiveViewHolder; private MainMessageViewHolder mainMessageViewHolder; @@ -1302,7 +1303,7 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene //mainHomeComViewHolder = new MainHomeComViewHolder(mContext, MainActivity.this, parent); vh = mainHomeComViewHolder; } else if (position == 1) { - mainHomeViewHolder = new MainHomeViewHolder(mContext, parent); + mainHomeViewHolder = new MainHomeViewHolder2(mContext, parent); vh = mainHomeViewHolder; /* mMainHomeCommunityViewHolder = new MainHomeCommunityViewHolder(mContext, parent, this);//直播 vh = mMainHomeCommunityViewHolder;*/ diff --git a/main/src/main/java/com/yunbao/main/adapter/MainHomeComAdapter2.java b/main/src/main/java/com/yunbao/main/adapter/MainHomeComAdapter2.java index 84ad73bcc..0748666eb 100644 --- a/main/src/main/java/com/yunbao/main/adapter/MainHomeComAdapter2.java +++ b/main/src/main/java/com/yunbao/main/adapter/MainHomeComAdapter2.java @@ -29,6 +29,7 @@ import com.yunbao.common.glide.ImgLoader; import com.yunbao.common.http.CommonHttpUtil; import com.yunbao.common.http.HttpCallback; import com.yunbao.common.interfaces.CommonCallback; +import com.yunbao.common.utils.RouteUtil; import com.yunbao.common.utils.StringUtil; import com.yunbao.common.utils.ToastUtil; import com.yunbao.common.views.NineGridLayout; @@ -156,6 +157,12 @@ public class MainHomeComAdapter2 extends RefreshAdapter { attentionImg.setImageResource(R.mipmap.ic_yola_attention); } + author.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + RouteUtil.forwardUserHome(bean.getUser_id()); + } + }); // likeImg.setOnClickListener(new View.OnClickListener() { // @Override // public void onClick(View v) { diff --git a/main/src/main/java/com/yunbao/main/adapter/MainHomeLiveAdapter.java b/main/src/main/java/com/yunbao/main/adapter/MainHomeLiveAdapter.java index 4f58b217e..78e6ad58b 100644 --- a/main/src/main/java/com/yunbao/main/adapter/MainHomeLiveAdapter.java +++ b/main/src/main/java/com/yunbao/main/adapter/MainHomeLiveAdapter.java @@ -19,6 +19,7 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; +import com.blankj.utilcode.util.LogUtils; import com.opensource.svgaplayer.SVGADrawable; import com.opensource.svgaplayer.SVGAImageView; import com.opensource.svgaplayer.SVGAParser; @@ -52,13 +53,18 @@ public class MainHomeLiveAdapter extends RefreshAdapter { private Context context; private int Height; private int getWeekIntIndex = 0; + private boolean showBaner =true; + + public void setShowBaner(boolean showBaner) { + // this.showBaner = showBaner; + } public MainHomeLiveAdapter(Context context, int h) { super(context); this.context = context; this.Height = h; mHeadView = mInflater.inflate(R.layout.item_main_home_live_head, null, false); - mHeadView.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, DpUtil.dp2px(120))); + mHeadView.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, DpUtil.dp2px(85))); } public View getHeadView() { @@ -67,10 +73,25 @@ public class MainHomeLiveAdapter extends RefreshAdapter { @Override public int getItemViewType(int position) { - if (position == 0) { + if (!showBaner){ + if (position % 2 == 1) { + return RIGHT; + }else { + return LEFT; + } + } + if (position == 4) { return HEAD; - } else if (position > 0) { - LiveBean mode = mList.get(position - 1); + } else{ + LiveBean mode; + if(mList.size()<4){ + if(position>=mList.size()){ + return HEAD; + } + mode= mList.get(position); + }else { + mode = mList.get(position > 4 ? position - 1 : position); + } if (TextUtils.equals(mode.getIs_week(), "1")) { return WEEKLAYOUT; } else { @@ -114,8 +135,9 @@ public class MainHomeLiveAdapter extends RefreshAdapter { @Override public void onBindViewHolder(@NonNull RecyclerView.ViewHolder vh, int position) { + int nowPosition = position>4?position-1:position; if (vh instanceof MainHomeLiveWeekItemViewHolder) { - ((MainHomeLiveWeekItemViewHolder) vh).loadViewDate(mList.get(position - 1), position - 1, Height, new MainHomeLiveWeekItemViewHolder.OnItemClickListener() { + ((MainHomeLiveWeekItemViewHolder) vh).loadViewDate(mList.get(nowPosition), nowPosition, Height, new MainHomeLiveWeekItemViewHolder.OnItemClickListener() { @Override public void onItemClick(LiveBean bean, int position) { if (mOnItemClickListener != null) { @@ -124,7 +146,7 @@ public class MainHomeLiveAdapter extends RefreshAdapter { } }); } else if (vh instanceof MainHomeLiveItemViewHolder) { - ((MainHomeLiveItemViewHolder) vh).loadViewDate(mList.get(position - 1), position - 1, Height, new MainHomeLiveItemViewHolder.OnItemClickListener() { + ((MainHomeLiveItemViewHolder) vh).loadViewDate(mList.get(nowPosition), nowPosition, Height, new MainHomeLiveItemViewHolder.OnItemClickListener() { @Override public void onItemClick(LiveBean bean, int position) { if (mOnItemClickListener != null) { @@ -137,7 +159,12 @@ public class MainHomeLiveAdapter extends RefreshAdapter { @Override public int getItemCount() { - return super.getItemCount() + 1; + if (!showBaner) + return super.getItemCount(); + if(mList.isEmpty()){ + return 0; + } + return super.getItemCount()+1; } class HeadVh extends RecyclerView.ViewHolder { diff --git a/main/src/main/java/com/yunbao/main/adapter/MainHomeLivesClassAdapter.java b/main/src/main/java/com/yunbao/main/adapter/MainHomeLivesClassAdapter.java index c082df357..b85baf801 100644 --- a/main/src/main/java/com/yunbao/main/adapter/MainHomeLivesClassAdapter.java +++ b/main/src/main/java/com/yunbao/main/adapter/MainHomeLivesClassAdapter.java @@ -3,13 +3,17 @@ package com.yunbao.main.adapter; import android.annotation.SuppressLint; import android.content.Context; import android.graphics.Color; +import android.graphics.Typeface; import android.os.Build; +import android.util.TypedValue; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.NonNull; +import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.RecyclerView; import com.yunbao.common.bean.LiveClassBean; @@ -57,7 +61,7 @@ public class MainHomeLivesClassAdapter extends RecyclerView.Adapter { + + + abstract public CommonRefreshView.DataHelper getDataHelper(); + + + abstract public void loadData(); + + + abstract public void release(); + +} + diff --git a/main/src/main/java/com/yunbao/main/views/LiveOptComAgent.java b/main/src/main/java/com/yunbao/main/views/LiveOptComAgent.java new file mode 100644 index 000000000..024b3b197 --- /dev/null +++ b/main/src/main/java/com/yunbao/main/views/LiveOptComAgent.java @@ -0,0 +1,125 @@ +package com.yunbao.main.views; + +import android.content.Context; +import android.util.Log; + +import com.alibaba.fastjson.JSON; +import com.yunbao.common.CommonAppConfig; +import com.yunbao.common.Constants; +import com.yunbao.common.adapter.RefreshAdapter; +import com.yunbao.common.bean.AnchorRecommendModel; +import com.yunbao.common.bean.LiveBean; +import com.yunbao.common.custom.CommonRefreshView; +import com.yunbao.common.http.HttpCallback; +import com.yunbao.common.interfaces.OnItemClickListener; +import com.yunbao.common.utils.RouteUtil; +import com.yunbao.main.activity.MainActivity; +import com.yunbao.main.activity.WeekWebViewActivity; +import com.yunbao.main.adapter.MainHomeLiveAdapter; +import com.yunbao.main.adapter.MainHomeRemFollLiveAdapter; +import com.yunbao.main.http.MainHttpConsts; +import com.yunbao.main.http.MainHttpUtil; + +import org.greenrobot.eventbus.EventBus; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import io.agora.beautyapi.faceunity.agora.SWAuManager; + +public class LiveOptComAgent implements LiveOptAgent { + + + private MainHomeLiveAdapter mAdapter; + private Context mContext; + public void watchLive(LiveBean liveBean, String key, int position) { + ((MainActivity) mContext).watchLive(liveBean, key, position); + } + + public LiveOptComAgent(Context context,MainHomeLiveAdapter adapter) { + mContext = context; + mAdapter = adapter; + } + + public static int pp; + + @Override + public void onItemClick(LiveBean bean, int position) { + if ("1".equals(bean.getIslive())) { + watchLive(bean, Constants.LIVE_HOME, position); + } else if (bean.getIs_week() != null && bean.getIs_week().equals("1")) { + String url = CommonAppConfig.HOST + bean.getUrl() + "?a=1"; + WeekWebViewActivity.forward(mContext, url, true); + } else { + RouteUtil.forwardUserHome(mContext, bean.getUid(), 0); + } + } + + public CommonRefreshView.DataHelper getDataHelper() { + return new CommonRefreshView.DataHelper() { + @Override + public RefreshAdapter getAdapter() { +// if (mAdapter == null) { +// mAdapter = new MainHomeRemFollLiveAdapter(mContext, MainActivity.Height); +// mAdapter.setOnItemClickListener(LiveOptComAgent.this); +// } +// Log.i("MainHomeViewHolder2", "LiveOptComAgent.getAdapter" ); + return null; + } + + @Override + public void loadData(int p, HttpCallback callback) { + pp = p; + Log.i("MainHomeViewHolder2", "LiveOptComAgent.loadData" ); + MainHttpUtil.getRandom(p, callback); + } + + @Override + public List processData(String[] info) { + if(pp == 1){ + return JSON.parseArray(Arrays.toString(info), LiveBean.class); + }else{ + return null; + } + } + + @Override + public void onRefreshSuccess(List list, int count) { + SWAuManager.get().preloadChannel(list); + EventBus.getDefault().post(new AnchorRecommendModel()); + } + + @Override + public void onRefreshFailure() { + + } + + @Override + public void onLoadMoreSuccess(List loadItemList, int loadItemCount) { + + } + + @Override + public void onLoadMoreFailure() { + + } + }; + } + + + public void loadData() { + if (mAdapter != null) { + SWAuManager.get().preloadChannel(mAdapter.getList()); + } + } + + + public void release() { + MainHttpUtil.cancel(MainHttpConsts.GET_RANDOM); + + } + + +} + diff --git a/main/src/main/java/com/yunbao/main/views/LiveOptFollAgent.java b/main/src/main/java/com/yunbao/main/views/LiveOptFollAgent.java new file mode 100644 index 000000000..46126a586 --- /dev/null +++ b/main/src/main/java/com/yunbao/main/views/LiveOptFollAgent.java @@ -0,0 +1,130 @@ +package com.yunbao.main.views; + +import android.content.Context; +import android.util.Log; + +import com.alibaba.fastjson.JSON; +import com.yunbao.common.CommonAppConfig; +import com.yunbao.common.Constants; +import com.yunbao.common.adapter.RefreshAdapter; +import com.yunbao.common.bean.AnchorRecommendModel; +import com.yunbao.common.bean.LiveBean; +import com.yunbao.common.custom.CommonRefreshView; +import com.yunbao.common.http.HttpCallback; +import com.yunbao.common.interfaces.OnItemClickListener; +import com.yunbao.common.utils.RouteUtil; +import com.yunbao.main.activity.MainActivity; +import com.yunbao.main.activity.WeekWebViewActivity; +import com.yunbao.main.adapter.MainHomeLiveAdapter; +import com.yunbao.main.adapter.MainHomeRemFollLiveAdapter; +import com.yunbao.main.http.MainHttpConsts; +import com.yunbao.main.http.MainHttpUtil; + +import org.greenrobot.eventbus.EventBus; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import io.agora.beautyapi.faceunity.agora.SWAuManager; + +public class LiveOptFollAgent implements LiveOptAgent { + + private MainHomeLiveAdapter mAdapter; + + private Context mContext; + public void watchLive(LiveBean liveBean, String key, int position) { + ((MainActivity) mContext).watchLive(liveBean, key, position); + } + + public LiveOptFollAgent(Context context,MainHomeLiveAdapter adapter) { + Log.i("MainHomeViewHolder2", "LiveOptFollAgent.LiveOptFollAgent"); + mContext = context; + mAdapter = adapter; + } + + + @Override + public void onItemClick(LiveBean bean, int position) { + if ("1".equals(bean.getIslive())) { + watchLive(bean, Constants.LIVE_HOME, position); + } else if (bean.getIs_week() != null && bean.getIs_week().equals("1")) { + String url = CommonAppConfig.HOST + bean.getUrl() + "?a=1"; + WeekWebViewActivity.forward(mContext, url, true); + } else { + RouteUtil.forwardUserHome(mContext, bean.getUid(), 0); + } + + + } + + public CommonRefreshView.DataHelper getDataHelper() { + return new CommonRefreshView.DataHelper() { + @Override + public RefreshAdapter getAdapter() { +// if (mAdapter == null) { +// mAdapter = new MainHomeRemFollLiveAdapter(mContext, MainActivity.Height); +// mAdapter.setOnItemClickListener(LiveOptFollAgent.this); +// } +// Log.i("MainHomeViewHolder2", "LiveOptFollAgent.getAdapter" ); + return null; + } + + @Override + public void loadData(int p, HttpCallback callback) { + Log.i("t2", "aaa" + p); + MainHttpUtil.getHomeFollow(p, callback); + Log.i("MainHomeViewHolder2", "LiveOptFollAgent.loadData" ); + } + + @Override + public List processData(String[] info) { + return JSON.parseArray(Arrays.toString(info), LiveBean.class); + } + + @Override + public void onRefreshSuccess(List list, int count) { + SWAuManager.get().preloadChannel(list); + EventBus.getDefault().post(new AnchorRecommendModel()); + } + + @Override + public void onRefreshFailure() { + Log.i("MainHomeViewHolder2", "LiveOptFollAgent.onRefreshFailure" ); + } + + @Override + public void onLoadMoreSuccess(List loadItemList, int loadItemCount) { + List new_data = new ArrayList<>(); + for (int j = 0; j < loadItemList.size(); j++) { + if (loadItemList.get(j).getUserNiceName() != null) { + new_data.add(loadItemList.get(j)); + } + } + SWAuManager.get().preloadChannel(new_data); + mAdapter.insertList(new_data); + } + + @Override + public void onLoadMoreFailure() { + Log.i("MainHomeViewHolder2", "LiveOptFollAgent.onLoadMoreFailure" ); + } + }; + } + + + public void loadData() { + if (mAdapter != null) { + SWAuManager.get().preloadChannel(mAdapter.getList()); + } + } + + + public void release() { + MainHttpUtil.cancel(MainHttpConsts.GET_HOME_FOLLOW); + + } + + +} + 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 1fe92a305..95d866d30 100644 --- a/main/src/main/java/com/yunbao/main/views/MainHomeLiveViewHolder.java +++ b/main/src/main/java/com/yunbao/main/views/MainHomeLiveViewHolder.java @@ -6,6 +6,8 @@ import android.app.Dialog; import android.content.Context; import android.graphics.Outline; import android.graphics.drawable.Drawable; +import android.os.Handler; +import android.os.Looper; import android.text.TextUtils; import android.util.Log; import android.view.View; @@ -163,14 +165,16 @@ public class MainHomeLiveViewHolder extends AbsMainHomeChildViewHolder implement gridLayoutManager.setSpanSizeLookup(new GridLayoutManager.SpanSizeLookup() { @Override public int getSpanSize(int position) { - if (position == 0) { + if (position == 4) { + return 2; + }else if(mAdapter.getList().size()<4&&position==mAdapter.getList().size()){ return 2; } return 1; } }); mRefreshView.setLayoutManager(gridLayoutManager); - ItemDecoration decoration = new ItemDecoration(mContext, 0x00000000, 5, 0); + ItemDecoration decoration = new ItemDecoration(mContext, 0x00000000, 7, 0); decoration.setOnlySetItemOffsetsButNoDraw(true); mRefreshView.setItemDecoration(decoration); mAdapter = new MainHomeLiveAdapter(mContext, MainActivity.Height); @@ -189,6 +193,7 @@ public class MainHomeLiveViewHolder extends AbsMainHomeChildViewHolder implement Log.i("t2", "aaa" + p); if (TextUtils.equals(typeHot, "Hot") || TextUtils.equals(typeHot, "hot") || TextUtils.equals(typeHot, "熱門")) { pp = 1; +// MainHttpUtil.getHot(p, callback); LiveHttpUtil.getAnchorLastWeekList(new HttpCallback() { @Override public void onSuccess(int code, String msg, String[] info) { @@ -226,7 +231,7 @@ public class MainHomeLiveViewHolder extends AbsMainHomeChildViewHolder implement if (info.length > 0) { JSONObject obj = JSON.parseObject(info[0]); - mBannerList = JSON.parseArray(obj.getString("slide"), BannerBean.class); + mBannerList = JSON.parseArray(obj.getString("slide_pic"), BannerBean.class); if (!obj.containsKey("list")) { return new_data; } @@ -330,9 +335,14 @@ public class MainHomeLiveViewHolder extends AbsMainHomeChildViewHolder implement if (!canClick()) { return; } + // mRefreshView.getRefreshView().scrollToPosition(0); + mAdapter.clearData(); select = bean.getId(); typeHot = bean.getEnglish(); - mRefreshView.initData(); + new Handler(Looper.getMainLooper()) + .postDelayed(() -> { + mRefreshView.initData(); + }, 100); topAdapter.choice = position; topAdapter.notifyDataSetChanged(); @@ -348,7 +358,7 @@ public class MainHomeLiveViewHolder extends AbsMainHomeChildViewHolder implement mBanner.setOutlineProvider(new ViewOutlineProvider() { @Override public void getOutline(View view, Outline outline) { - outline.setRoundRect(0, 0, view.getWidth(), view.getHeight(), 10); + outline.setRoundRect(0, 0, view.getWidth(), view.getHeight(), 30); } }); mBanner.setClipToOutline(true); diff --git a/main/src/main/java/com/yunbao/main/views/MainHomeNewViewHolder.java b/main/src/main/java/com/yunbao/main/views/MainHomeNewViewHolder.java index 6c4215c9a..7dda1f333 100644 --- a/main/src/main/java/com/yunbao/main/views/MainHomeNewViewHolder.java +++ b/main/src/main/java/com/yunbao/main/views/MainHomeNewViewHolder.java @@ -13,22 +13,18 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import com.alibaba.fastjson.JSON; -import com.google.gson.Gson; import com.yunbao.common.CommonAppConfig; import com.yunbao.common.Constants; import com.yunbao.common.adapter.RefreshAdapter; import com.yunbao.common.bean.ActiveBean; import com.yunbao.common.bean.NewCommunityType; import com.yunbao.common.custom.CommonRefreshView; -import com.yunbao.common.custom.CommonRefreshWaterfallView; import com.yunbao.common.http.CommonHttpUtil; import com.yunbao.common.http.HttpCallback; import com.yunbao.common.interfaces.OnItemClickListener; -import com.yunbao.common.manager.CommunityTypeManager; import com.yunbao.common.manager.OpenAdManager; import com.yunbao.common.utils.DialogUitl; import com.yunbao.common.utils.RouteUtil; -import com.yunbao.common.utils.StringUtil; import com.yunbao.main.R; import com.yunbao.main.adapter.MainHomeComAdapter2; import com.yunbao.main.adapter.MainHomeComClassAdapter; diff --git a/main/src/main/java/com/yunbao/main/views/MainHomeRecomLiveViewHolder.java b/main/src/main/java/com/yunbao/main/views/MainHomeRecomLiveViewHolder.java index ec5025544..12b2b3fb7 100644 --- a/main/src/main/java/com/yunbao/main/views/MainHomeRecomLiveViewHolder.java +++ b/main/src/main/java/com/yunbao/main/views/MainHomeRecomLiveViewHolder.java @@ -125,7 +125,6 @@ public class MainHomeRecomLiveViewHolder extends AbsMainHomeChildViewHolder impl } }); - mRefreshView.initData(); @@ -149,9 +148,6 @@ public class MainHomeRecomLiveViewHolder extends AbsMainHomeChildViewHolder impl @Override public void loadData() { -// if (mRefreshView != null) { -// mRefreshView.initData(); -// } if (mAdapter != null) { SWAuManager.get().preloadChannel(mAdapter.getList()); } diff --git a/main/src/main/java/com/yunbao/main/views/MainHomeViewHolder2.java b/main/src/main/java/com/yunbao/main/views/MainHomeViewHolder2.java new file mode 100644 index 000000000..297585b55 --- /dev/null +++ b/main/src/main/java/com/yunbao/main/views/MainHomeViewHolder2.java @@ -0,0 +1,683 @@ +package com.yunbao.main.views; + +import android.animation.ObjectAnimator; +import android.app.Activity; +import android.app.Dialog; +import android.content.Context; + +import android.graphics.Outline; +import android.graphics.drawable.Drawable; +import android.os.Handler; +import android.os.Looper; +import android.text.TextUtils; +import android.util.Log; +import android.view.View; +import android.view.ViewGroup; +import android.view.ViewOutlineProvider; +import android.widget.ImageView; + + +import androidx.annotation.Nullable; +import androidx.core.app.ActivityCompat; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.bumptech.glide.Glide; +import com.bumptech.glide.load.DataSource; +import com.bumptech.glide.load.engine.GlideException; +import com.bumptech.glide.request.RequestListener; +import com.bumptech.glide.request.target.DrawableImageViewTarget; +import com.bumptech.glide.request.target.Target; +import com.ms.banner.Banner; +import com.ms.banner.listener.OnBannerClickListener; +import com.yunbao.common.CommonAppConfig; +import com.yunbao.common.Constants; +import com.yunbao.common.activity.WebViewActivity; +import com.yunbao.common.adapter.RefreshAdapter; +import com.yunbao.common.bean.AnchorRecommendModel; +import com.yunbao.common.bean.BannerBean; +import com.yunbao.common.bean.LiveBean; +import com.yunbao.common.bean.LiveClassBean; +import com.yunbao.common.bean.WeekListBean; +import com.yunbao.common.custom.CommonRefreshView; +import com.yunbao.common.custom.ItemDecoration; +import com.yunbao.common.dialog.GiftWallDialog; +import com.yunbao.common.event.LiveRoomChangeEvent; +import com.yunbao.common.http.HttpCallback; +import com.yunbao.common.http.LiveHttpUtil; +import com.yunbao.common.interfaces.OnItemClickListener; +import com.yunbao.common.manager.IMLoginManager; +import com.yunbao.common.manager.LiveClassManager; +import com.yunbao.common.utils.DialogUitl; +import com.yunbao.common.utils.LiveRoomCheckLivePresenter; +import com.yunbao.common.utils.MicStatusManager; +import com.yunbao.common.utils.MobclickAgent; +import com.yunbao.common.utils.RouteUtil; +import com.yunbao.common.utils.StringUtil; +import com.yunbao.common.utils.ToastUtil; +import com.yunbao.common.views.CustomViewHolder; +import com.yunbao.live.utils.LiveStorge; +import com.yunbao.live.views.LiveRoomViewHolder; +import com.yunbao.main.R; +import com.yunbao.main.activity.MainActivity; +import com.yunbao.main.adapter.MainHomeLiveAdapter; +import com.yunbao.main.adapter.MainHomeLivesClassAdapter; +import com.yunbao.main.http.MainHttpConsts; +import com.yunbao.main.http.MainHttpUtil; + +import org.greenrobot.eventbus.EventBus; +import org.greenrobot.eventbus.Subscribe; +import org.greenrobot.eventbus.ThreadMode; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import io.agora.beautyapi.faceunity.agora.SWAuManager; + + +/** + * Created by cxf on 2018/9/22. + * MainActivity 新的直播首页 + */ + +public class MainHomeViewHolder2 extends AbsMainHomeChildViewHolder implements OnItemClickListener, LiveOptAgent { + + + private View mShadow; + private View mBtnDismiss; + public static CommonRefreshView mRefreshView; + private RecyclerView mClassRecyclerViewTop; + private MainHomeLiveAdapter mAdapter; + private ObjectAnimator mShowAnimator; + private ObjectAnimator mHideAnimator; + private Banner mBanner; + private boolean mBannerShowed; + private List mBannerList; + private List mWeekListBean; + public static ImageView btnUseIco; + private int select = 0; + //是否是首頁 + private int intoIndex = 0; + private List new_data; + private boolean isHave = false; + private Map gotoRoomKey = new HashMap<>(); + private Dialog mShowLoadingDialog; + private String typeHot; + + + private LiveOptAgent mLiveOptFollAgent, mLiveOptComAgent; + private LiveOptAgent nowLiveOptAgent = this; + + public MainHomeViewHolder2(Context context, ViewGroup parentView) { + super(context, parentView); + + } + + @Override + protected int getLayoutId() { + return R.layout.view_main_home2; + } + + public static int pp; + + //显示顶部商城tab时，显示底部tabGroup + @Subscribe(threadMode = ThreadMode.MAIN) + public void onUpdata(String str) { + if ("Updata".equals(str)) { + if (mRefreshView != null) { + mRefreshView.showRefreshBar(); + mRefreshView.mRecyclerView.scrollToPosition(0); + } + } else if ("blacklist".equals(str)) { + if (mRefreshView != null) { + mRefreshView.showRefreshBar(); + } + } + } + + @Override + public void init() { + List list = new LiveClassManager(mContext).getLiveClass(); + if (list != null && !list.isEmpty()) { + typeHot = list.get(0).getEnglish(); + select = list.get(0).getId(); + } + list.add(0, getAttentionLiveClass()); + if (list.size() > 2) { + list.add(2, getCoLiveClass()); + } else { + list.add(getCoLiveClass()); + } + + + mShadow = findViewById(R.id.shadow); + mBtnDismiss = findViewById(R.id.btn_dismiss); + mBtnDismiss.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (canClick()) { + if (mShowAnimator != null) { + mShowAnimator.cancel(); + } + if (mHideAnimator != null) { + mHideAnimator.start(); + } + } + } + }); + mRefreshView = (CommonRefreshView) findViewById(R.id.refreshView); + btnUseIco = (ImageView) findViewById(R.id.btn_use_ico); + mRefreshView.setEmptyLayoutId(R.layout.view_no_data_live); + EventBus.getDefault().register(this); + + GridLayoutManager gridLayoutManager = new GridLayoutManager(mContext, 2, GridLayoutManager.VERTICAL, false); + gridLayoutManager.setSpanSizeLookup(new GridLayoutManager.SpanSizeLookup() { + @Override + public int getSpanSize(int position) { +// if (nowLiveOptAgent!= MainHomeViewHolder2.this) +// return 1; + + if (position == 4) { + return 2; + } else if (mAdapter.getList().size() < 4 && position == mAdapter.getList().size()) { + return 2; + } + return 1; + } + }); + mRefreshView.setLayoutManager(gridLayoutManager); + ItemDecoration decoration = new ItemDecoration(mContext, 0x00000000, 5, 0); + decoration.setOnlySetItemOffsetsButNoDraw(true); + mRefreshView.setItemDecoration(decoration); + mAdapter = new MainHomeLiveAdapter(mContext, MainActivity.Height); + mAdapter.setOnItemClickListener(MainHomeViewHolder2.this); + mLiveOptFollAgent = new LiveOptFollAgent(mContext,mAdapter); + mLiveOptComAgent = new LiveOptComAgent(mContext,mAdapter); + mAdapter.setHasStableIds(true);// + mRefreshView.setLoadMoreEnable(true); + mRefreshView.setRecyclerViewAdapter(mAdapter); + mRefreshView.setDataHelper(getDataHelper()); + mClassRecyclerViewTop = (RecyclerView) findViewById(R.id.topTitleRecyclerView); + mClassRecyclerViewTop.setHasFixedSize(true); + mClassRecyclerViewTop.setLayoutManager(new LinearLayoutManager(mContext, LinearLayoutManager.HORIZONTAL, false)); + + if (list != null && list.size() > 0) { + List targetList = new ArrayList<>(); + if (list.size() <= 6) { + targetList.addAll(list); + } else { + targetList.addAll(list); + } + final MainHomeLivesClassAdapter topAdapter = new MainHomeLivesClassAdapter(mContext, targetList, false); + topAdapter.choice = 1; + topAdapter.setOnItemClickListener(new OnItemClickListener() { + @Override + public void onItemClick(LiveClassBean bean, int position) { + switch (bean.getEnglish()) { + case "Hot": + MobclickAgent.onEvent(mContext, "home_page_recommend_hot", "热门"); + break; + case "New": + MobclickAgent.onEvent(mContext, "home_page_recommend_new", "新秀"); + break; + case "Pretty": + MobclickAgent.onEvent(mContext, "home_page_recommend_pretty", "颜值"); + break; + case "Dance": + MobclickAgent.onEvent(mContext, "home_page_recommend_dance", "舞蹈"); + break; + case "Mr.Right": + MobclickAgent.onEvent(mContext, "home_page_recommend_mr.right", "男神"); + break; + case "Music": + MobclickAgent.onEvent(mContext, "home_page_recommend_music", "音乐"); + break; + default: + MobclickAgent.onEvent(mContext, "home_page_recommend_other", "其他"); + break; + } + if (!canClick()) { + return; + } + mAdapter.clearData(); + select = bean.getId(); + boolean flag = false; + if (position == 0) { + Log.i("MainHomeViewHolder2", "mLiveOptFollAgent:"); + flag= changeLiveOptAgent(mLiveOptFollAgent); + } else if (position == 2) { + Log.i("MainHomeViewHolder2", "mLiveOptComAgent:"); + flag= changeLiveOptAgent(mLiveOptComAgent); + } else { + Log.i("MainHomeViewHolder2", "MainHomeViewHolder2:"); + flag= changeLiveOptAgent(MainHomeViewHolder2.this); + } + typeHot = bean.getEnglish(); + if (!flag){ + new Handler(Looper.getMainLooper()) + .postDelayed(() -> { + mRefreshView.initData(); + }, 100); + } + topAdapter.choice = position; + topAdapter.notifyDataSetChanged(); + + } + }); + if (mClassRecyclerViewTop != null) { + mClassRecyclerViewTop.setAdapter(topAdapter); + } + } + View headView = mAdapter.getHeadView(); + mBanner = (Banner) headView.findViewById(R.id.banner); + mRefreshView.initData(); + mBanner.setOutlineProvider(new ViewOutlineProvider() { + @Override + public void getOutline(View view, Outline outline) { + outline.setRoundRect(0, 0, view.getWidth(), view.getHeight(), 10); + } + }); + mBanner.setClipToOutline(true); + String adUrl = ((Activity) mContext).getIntent().getStringExtra("ad_url"); + ImageView ad = headView.findViewById(R.id.ad_img); + if (StringUtil.isEmpty(adUrl)) { + ActivityCompat.startPostponedEnterTransition((Activity) mContext); + ad.setVisibility(View.GONE); + } else { + //ImgLoader.display(mContext, adUrl, ad); + + Glide.with(mContext) + .load(adUrl) + .listener(new RequestListener() { + @Override + public boolean onLoadFailed(@Nullable GlideException e, Object model, Target target, boolean isFirstResource) { + ActivityCompat.startPostponedEnterTransition((Activity) mContext); + return false; + } + + @Override + public boolean onResourceReady(Drawable resource, Object model, Target target, DataSource dataSource, boolean isFirstResource) { + ActivityCompat.startPostponedEnterTransition((Activity) mContext); + return false; + } + }) + /* .addListener(new RequestListener() { + @Override + public boolean onLoadFailed(@Nullable GlideException e, Object model, Target target, boolean isFirstResource) { + ActivityCompat.startPostponedEnterTransition((Activity) mContext); + return false; + } + + @Override + public boolean onResourceReady(Drawable resource, Object model, Target target, DataSource dataSource, boolean isFirstResource) { + ActivityCompat.startPostponedEnterTransition((Activity) mContext); + return false; + } + })*/ + .error(R.mipmap.ic_launcher) + .into(new DrawableImageViewTarget(ad)); + + } + } + + private boolean changeLiveOptAgent(LiveOptAgent liveOptAgent) { + if (nowLiveOptAgent == liveOptAgent) { + return false; + } + + nowLiveOptAgent= liveOptAgent; + if (liveOptAgent==this){ + // mRefreshView.setRecyclerViewAdapter(mAdapter); + mRefreshView.setDataHelper(getDataHelper()); + mAdapter.setOnItemClickListener(this); + mAdapter.setShowBaner(true); + }else { + // mRefreshView.setRecyclerViewAdapter(liveOptAgent.getDataHelper().getAdapter()); + mRefreshView.setDataHelper(liveOptAgent.getDataHelper()); + mAdapter.setOnItemClickListener(liveOptAgent); + mAdapter.setShowBaner(false); + } + new Handler(Looper.getMainLooper()) + .postDelayed(() -> { + mRefreshView.initData(); + }, 100); + return true; + } + + + private void gotoLive(final String live_id) { + LiveHttpUtil.getLiveInfo(live_id, new HttpCallback() { + @Override + public void onSuccess(int code, String msg, String[] info) { + if (code == 0 && info.length > 0) { + LiveBean liveBean = JSON.parseObject(info[0], LiveBean.class); + if (liveBean == null) { + return; + } + intoIndex = 1; + if (gotoRoomKey != null && gotoRoomKey.isEmpty()) { + gotoRoomKey = null; + } + liveBean.setParams(gotoRoomKey); + new LiveRoomCheckLivePresenter(mContext, liveBean.getUid(), liveBean.getStream(), new LiveRoomCheckLivePresenter.NewActionListener() { + @Override + public void onLiveRoomChanged(String liveUid, String stream, int liveType, String liveTypeVal, String liveSdk, boolean isSw) { + RouteUtil.forwardLiveAudienceActivity(liveBean, liveType, Integer.parseInt(liveSdk), Integer.parseInt(liveTypeVal), isSw); + } + + @Override + public void onCheckError(String contextError) { + + } + }); + + } else { + intoIndex = 1; + RouteUtil.forwardUserHome(mContext, live_id, 0); + } + } + }); + } + + private void showBanner() { + if (mBannerList == null || mBannerList.size() == 0 || mBanner == null) { + return; + } + if (mBannerShowed) { + return; + } + mBannerShowed = true; + mBanner.setAutoPlay(true) + .setPages(mBannerList, new CustomViewHolder()) + .setDelayTime(3000) + .setOnBannerClickListener(new OnBannerClickListener() { + @Override + public void onBannerClick(List datas, int p) { + if (mBannerList != null) { + if (p >= 0 && p < mBannerList.size()) { + BannerBean bean = mBannerList.get(p); + if (bean != null) { + String link = bean.getLink(); + if (bean.getType() == 2) { + if (bean.getLink().isEmpty()) { + ToastUtil.show("暫無法簽到，請稍後再試"); + return; + } else { + if (gotoRoomKey == null) { + gotoRoomKey = new HashMap<>(); + } + gotoRoomKey.put("OPEN", "NEWUSER"); + } + } + showLoadingDialog(); + + Map map_ekv = new HashMap(); + map_ekv.put("link", link); + MobclickAgent.onEvent(mContext, "home_page_recommend_banner", map_ekv); + + if (link.contains("http")) { + WebViewActivity.forward(mContext, link, true, false); + } else if ("home_page_banner_battle".equals(link)) { + RouteUtil.forwardBattlePass(); + } else if ("home_page_banner_giftwall".equals(link)) { + if (mShowLoadingDialog != null && mShowLoadingDialog.isShowing()) { + mShowLoadingDialog.dismiss(); + } + new GiftWallDialog(mContext, IMLoginManager.get(mContext).getUserInfo().getId() + "", + IMLoginManager.get(mContext).getUserInfo().getUserNicename(), null + , false).setFullWindows(true).setTab2(true).showDialog(); + } else { + gotoLive(link); + } + } + } + } + } + }) + .start(); + } + + /** + * Banner双击可能会导致进入两次直播间，点击Banner后需要展示加载中动画 + */ + private void showLoadingDialog() { + mShowLoadingDialog = DialogUitl.loadingDialog(mContext); + mShowLoadingDialog.show(); + } + + @Override + public void onItemClick(LiveBean bean, int position) { + if ("1".equals(bean.getIslive())) { + intoIndex = 1; + watchLive(bean, Constants.LIVE_HOME, position); + } else if (bean.getIs_week() != null && bean.getIs_week().equals("1")) { + String url = CommonAppConfig.HOST + bean.getUrl() + "?a=1"; + LiveHttpUtil.getLiveInfo(bean.getUid(), new HttpCallback() { + @Override + public void onSuccess(int code, String msg, String[] info) { + if (code == 0 && info.length > 0) { + LiveBean liveBean = JSON.parseObject(info[0], LiveBean.class); + + if (liveBean == null) { + return; + } + new LiveRoomCheckLivePresenter(mContext, liveBean.getUid(), liveBean.getStream(), new LiveRoomCheckLivePresenter.NewActionListener() { + @Override + public void onLiveRoomChanged(String liveUid, String stream, int liveType, String liveTypeVal, String liveSdk, boolean isSw) { + + if (LiveRoomViewHolder.mHandler != null) { + LiveRoomViewHolder.mHandler.removeCallbacksAndMessages(null); + } + if (!"".endsWith(Constants.mStream)) { + if (MicStatusManager.getInstance().isMic(liveUid)) { + MicStatusManager.getInstance().showDownMicDialog(mContext); + return; + } + EventBus.getDefault().post(new LiveRoomChangeEvent(liveBean, liveType, Integer.parseInt(liveTypeVal))); + } else { + RouteUtil.forwardLiveAudienceActivity(liveBean, liveType, Integer.parseInt(liveTypeVal), Integer.parseInt(liveSdk), isSw); + } + } + + @Override + public void onCheckError(String contextError) { + + } + }); + + } else { + ToastUtil.show(msg); + } + } + }); + } else { + intoIndex = 1; + RouteUtil.forwardUserHome(mContext, bean.getUid(), 0); + } + } + + + @Override + public CommonRefreshView.DataHelper getDataHelper() { + return new CommonRefreshView.DataHelper() { + @Override + public RefreshAdapter getAdapter() { + return null; + } + + @Override + public void loadData(int p, HttpCallback callback) { + Log.i("t2", "aaa" + p); + if (TextUtils.equals(typeHot, "Hot") || TextUtils.equals(typeHot, "hot") || TextUtils.equals(typeHot, "熱門")) { + pp = 1; + LiveHttpUtil.getAnchorLastWeekList(new HttpCallback() { + @Override + public void onSuccess(int code, String msg, String[] info) { + if (mWeekListBean != null) { + mWeekListBean.clear(); + } + if (code == 0 && info.length > 0) { + mWeekListBean = JSON.parseArray(Arrays.toString(info), WeekListBean.class); + } else { + mWeekListBean = null; + } + if (mWeekListBean != null && mWeekListBean.size() > 0) { + mAdapter.setWeekList(mWeekListBean); + isHave = true; + } else { + mAdapter.moveWeekList(); + isHave = false; + } + Constants.getWeekIntIndex = Constants.getWeekIntIndex + 1; + MainHttpUtil.getHot(p, callback); + } + }); + } else { + pp = 0; +// if (select == 0) { +// select = list.get(0).getId(); +// } + MainHttpUtil.getClassLive(select, p, callback); + } + } + + @Override + public List processData(String[] info) { + new_data = new ArrayList<>(); + if (info.length > 0) { + JSONObject obj = JSON.parseObject(info[0]); + + mBannerList = JSON.parseArray(obj.getString("slide"), BannerBean.class); + if (!obj.containsKey("list")) { + return new_data; + } + List old_data = JSON.parseArray(obj.getString("list"), LiveBean.class); + LiveBean liveModel = null; + if (old_data == null) { + return new_data; + } + for (LiveBean model : old_data) { + //判断周星榜数据 + if (TextUtils.equals(model.getIs_week(), "1")) { + if (mWeekListBean != null && mWeekListBean.size() > 0) { + model.setmWeekList(mWeekListBean); + } else { + liveModel = model; + } + } + } + //满足有周星榜字段但是没有周星榜数据的删掉 + if (liveModel != null) { + old_data.remove(liveModel); + } + SWAuManager.get().preloadChannel(old_data); + new_data.addAll(old_data); + + } + return new_data; + } + + @Override + public void onRefreshSuccess(List list, int count) { + if (CommonAppConfig.LIVE_ROOM_SCROLL) { + LiveStorge.getInstance().put(Constants.LIVE_HOME, list); + } + showBanner(); + EventBus.getDefault().post(new AnchorRecommendModel()); + } + + @Override + public void onRefreshFailure() { + + } + + @Override + public void onLoadMoreSuccess(List loadItemList, int loadItemCount) { + new_data = new ArrayList<>(); + for (int j = 0; j < loadItemList.size(); j++) { + if (loadItemList.get(j).getUserNiceName() != null) { + new_data.add(loadItemList.get(j)); + } + } + if (loadItemList.size() > 0) { + SWAuManager.get().preloadChannel(new_data); + mAdapter.insertList(new_data); + } + } + + @Override + public void onLoadMoreFailure() { + + } + }; + } + + @Override + public void loadData() { + if (nowLiveOptAgent != this) { + nowLiveOptAgent.loadData(); + } else { + if (mAdapter != null) { + SWAuManager.get().preloadChannel(mAdapter.getList()); + } + } + } + + @Override + public void release() { + MainHttpUtil.cancel(MainHttpConsts.GET_HOT); + if (mHideAnimator != null) { + mHideAnimator.cancel(); + } + if (mShowAnimator != null) { + mShowAnimator.cancel(); + } + if (mAdapter != null) { + mAdapter.clearAnimator(); + } + mShowAnimator = null; + mHideAnimator = null; + mLiveOptFollAgent.release(); + mLiveOptComAgent.release(); + } + + @Override + public void onDestroy() { + super.onDestroy(); + release(); + } + + @Override + public void onResume() { + super.onResume(); + } + + @Override + public void onPause() { + super.onPause(); + if (mShowLoadingDialog != null) { + mShowLoadingDialog.dismiss(); + mShowLoadingDialog = null; + } + } + + //获取关注的 + private LiveClassBean getAttentionLiveClass() { + LiveClassBean liveClassBean = new LiveClassBean("關注", "Follow"); + liveClassBean.setId(Integer.MAX_VALUE); + return liveClassBean; + } + + //获取推荐的 + private LiveClassBean getCoLiveClass() { + LiveClassBean liveClassBean = new LiveClassBean("推薦", "Recommend"); + liveClassBean.setId(Integer.MAX_VALUE); + return liveClassBean; + } +} diff --git a/main/src/main/res/layout/item_main_live_com_class.xml b/main/src/main/res/layout/item_main_live_com_class.xml new file mode 100644 index 000000000..540247ced --- /dev/null +++ b/main/src/main/res/layout/item_main_live_com_class.xml @@ -0,0 +1,35 @@ + + + + + + + + + \ No newline at end of file diff --git a/main/src/main/res/layout/view_main_home2.xml b/main/src/main/res/layout/view_main_home2.xml new file mode 100644 index 000000000..a1fa19e54 --- /dev/null +++ b/main/src/main/res/layout/view_main_home2.xml @@ -0,0 +1,111 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file