From e925a0c2a5fb52744ea73015da6873c6d8f9b66a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E5=B0=8F=E6=B1=9F?= <461355754@qq.com> Date: Mon, 1 Dec 2025 15:35:22 +0800 Subject: [PATCH] =?UTF-8?q?1=EF=BC=9A=E4=BF=AE=E6=94=B9=E5=B8=88=E7=88=B6?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=202=EF=BC=9A=E4=BF=AE=E6=94=B9=E7=AD=BE?= =?UTF-8?q?=E7=BA=A6=E6=88=BF=E7=9A=84=E6=B8=85=E9=99=A4=E9=AD=85=E5=8A=9B?= =?UTF-8?q?=E6=88=91=E6=9B=B4=E6=96=B0=E9=AD=85=E5=8A=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/mipmap-hdpi/icon_master.png | Bin 2468 -> 2495 bytes .../src/main/res/mipmap-xhdpi/icon_master.png | Bin 3347 -> 3310 bytes .../main/res/mipmap-xxhdpi/icon_master.png | Bin 6173 -> 6204 bytes .../activity/room/activity/RoomActivity.kt | 2 +- .../activity/room/fragment/RoomFragment.java | 13 ++++- .../room/fragment/RoomMentorShipFragment.kt | 50 +++++++++++++++++- .../user/fragment/MyFamilyFragment.kt | 35 ++++++++---- .../modulemain/adapter/MyFamilyAdapter.kt | 12 ++++- .../modulemain/dialog/RoomTalentDialog.kt | 4 -- .../main/res/layout/item_family_members.xml | 6 +-- 10 files changed, 99 insertions(+), 23 deletions(-) diff --git a/BaseModule/src/main/res/mipmap-hdpi/icon_master.png b/BaseModule/src/main/res/mipmap-hdpi/icon_master.png index 7fcc242e4c80356cac39784cfc93c0918f035701..ff9149620b2c4805306f1a1db1bfb08bdb7c4440 100644 GIT binary patch delta 2485 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 YN)!Irvyy@~ diff --git a/BaseModule/src/main/res/mipmap-xhdpi/icon_master.png b/BaseModule/src/main/res/mipmap-xhdpi/icon_master.png index 4ca7cf69e2c710a25a77d7ffd3ea26dddce14ea9..fd291c34a20117ab809878e0ea05ffcbd61184b8 100644 GIT binary patch delta 3306 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 delta 3344 zcmV+r4e#>q8Iu~2B!AjTL_t(o!_Apnj9t}z#(&@1d(O-`b33-jcs#z2jlm8v*hHYv zkSc_vmw+MaL)BI^B`QK~Dm9@rl~5W9DT-2+w9uOpr8LmW>O)&-oFajgQlLSIyDb92 zHO6Cm#^bR)w$IF&Idjg;+3VkjwJ+z8q&R&^_RHRT?Y;J1-+%hwzV$6}iO0bQtvWQs zEx;#a>@nCVF~ZN_Fk==tE;uB3zEm z5AC>HZ~eajKl6z7ZAtiw!51WA^Pc9^Iafe_)0&1U;sZlBENARwqb1!+~Auh zC%NyY`_;T;z$YKI?d^mofSu+&i*HX^?WMQzwK@(%O2W|Oi7|5+kvx)Dgqb4+txn+K z9al_-93F=(0EzH&5|MdHMrecBvWWnPDSFS@;Rgmtu7BAs+pz(n2;eZruWY+ZC*BwE ziAU{2NdP;#e4)zov@6>1u4aB48$pxOK~&dhI6yKK8I}LA(fzE=-)|^nbi+ ztSkq&1b>UkXkbWIZRGjTkrr0T$rG4 zE6Y-AThxQU`D)m>24E(RxN-BHdN;%9I%5{`R0j6cfmh9z+ki>PkYRuXQOOYx_7D%2 zhzCnVrPzebWD?+z2@Jq68K$%;T!&mMQ@9o~S%2ss%wXy=Nja7VOSpkva|69*y-wjl z`ku)wdp$AJ({G_u7Y!I~Cp_`Y{nnR#F3-A~JzoQMwk|9%`JLB{q^(F6fZ)^ddoZkL zw5)3nddDt+R8MXIG3UHtl`*#(W4z?tPvQJ#`yV zCCu0P$B(e)*RHta8nU$iHEX{*$-vidlYipe$!NcM##+x!sQj6|0jXqWVT^9DRMg>C zf+dDa|8K2?#qXZ7iw_;a%cX7~nXMVZ_FXNL+D+JX)m=Io14M1UfatsU<|&rW&J%^1 zNPXC=vUz}2*M-z?ZBJB=bFcu7ADlNu?*uEFSMT^R<=yLwBKguJ$=L-&7=7#e?|-Ui z_j)?P0<``}B!XXA+n zt!m;9fO9V&Gg&~ZG+u?QylEi!hUWAleH#WWyH6S`oPYd?YLEYqrRB%g-FrRd-Rp7} ztbP4?Yact8r6Y4n)cXrt&7Y~ut$!QL2c1mK(L8Wi%Re|9(u;Ejj?%TG^nGeu{=NBc zyooJaIv)bkoZz=}aI$3A^=dY!_Z5YfXjJ_+^bXlbOM<0P!JB-h~7Qg(IHU9R$rGIh{eZRi9 zu-xRlm2TLi!7qL6|KthPKiS(&vtGZz(zCOKe53T7nr*&iHdB|zhT@?iZi&rvBZB#f z&;fjk*90CRtBeokKW?5{P~Z4K{1|h@CQY#@j z^O^0YYA`kg#wTJEdjvG5Y8GNlW+ZZ#NT%oM-8&ZCcCrSToMdjxs;)^&PS_MS3Rx6(GAo(pT7M}gU}Kyu@m3a_ax%b60d43Iqw-i0!%N5K>DxT;W2xHmbe*1c z{oR@O#GLhPFD#i%)-X(Nebu^3(&QX6S+u?gpMksg{79HoK0U6=r^ny(kA_)hCDJ66 zhOl9>RvQ=Gb)+NTTi`n#aR5f&SS2qX*7hW=L{X)uV+xhe=YPud0zI3Dx(2f{J*Rl< zsxAwI;WiC-yYti>T2q!fzTJH47_C=Mch~S|PSJdJy332&GYtu61zE`nn`Qo*Gc7Y_ zB}RJ6y=F_T47`+1RAqBvvDTR-${p5C8Y{Tor~r3-&PrRmfwYg;=-E`buAiJU2}K)M zbpi1w=Zx5?@qh5^W`-<*#Yf+?(zRo-%3!uEC8BNeY(f`SY8Kpnnl&hE_jtgOpBka=t}tw4#+0 zOV&ENAmPk}vhqZhbq9L0>*KMBLxMg1qr=uZbpfe}PQ$CRr63tAvrX3CUS#0&|N4$? zyzjca$I8h$hWB0Gm7$|GWjafeKU>EM+{P;1fa~=C;SIQI`I3|vfM`uGm0w)P+}|A~ zl%&F?3x8`PE*r?A_E79SPe+bB2e)6Q3$IUDK{>n}vJ>At%=AAUF(+f)?OPNN1y0+V zUZDQcX-Z>-2ec;V)H62Nm5Abv!yRR3K8-DiHoeECPs~~UzNgV;{fahK(<&p{$Li*5 z%b28iTb1E^3(_(Fk4I^~a)I{gW(UZ~!r5h|$$u2aAi?u-yucHFkaqv3)p1X?tafb? zqbLLIT8pF>6pA$;-_T{<(pY~tA8uo=(o@vO)ARJ-a%GW(o;;k@J>2@C4$H5QoL^LO zp=o`;v77$83Q)ECU(oWwvt~r*F6-~IeDjrAmJiMuL}^LQ#v;pBTnv=N`aytZtU=`m=ICtQvqF78n@Ul4ptu{R) z_^KHBCNw* za9;xBGFe!`?;g$EdH>#fREtyD^Q*ue)qf9ch--(Av3%yD!19FzGL8M_j>45*IBm&n z6O(6l|66jHIeD$RZAVwRXdOCD>p$PcDM@7?8F+0K0rdK+~`AS6#{B*thKgjDJ6F zU8pm;|2fmjN~$Dz#h4B58j?~0u6VEZ5)nFuJ!C=o z4TF;rS*Ao5>SQL-79w3H-gUMcPEwS9EA1b}aPux~!?1wEnq=>ID%<86XZ*8jdSf3j z(?7nB(c7+8g-YHaQR(28b#a+%v8ol8T;*y|M4|yL9xDw^}A1 zu|Dtln&9_Dw$pZlKoaAwFEKE;=5QC20&vSd54=vcCX%8+Wc9o)b zrnQmCYVt)*lfW^lG=L#1EfB*^oWxcu%ZXp4EK9aTJt&bPIphrIJ#(LP?>&3)1>alr5oz&6x#SR~86om!MixS}hT=h$==DQPdbKf+DzWCi?CE zDX0X33RVp2zflnt5sOjOh>BnlamPAa2MU5Bf*4ecf4o55S&axrRYbt3VsO8ub8I$; z9q1EVDq+V*(e0y9D4>NL1Sx--Mfpr-IC!0XqWG z{e}S5$m=Br6-3n=r(+~hQD+th6k@O-IFI$-ZXohz_1`JOc#!>Zk%92Xs~9wsMTh#a zHyl8>4TBLM!kM>*U*CU^eCZ7V{rsfn3cI)$<#PgkD1?nBOHaSb%BeFdVMqcb4=8FP za8y-9#Q_^iAd#P0i~(a+F;)WimpLbR_6q9{hA z5bJ!!BZMIC=a2QNXg^786jfBB-0nh>3pDBjjw)!YE%MxXg2k%ZYj=x|4*}8-JXF{P zz#nXc=Z1{o+#`C-dvY&8eP)^IuRTlcwb|r-t$P?zQ8WV00j`2X@QB;yj*}?KCch)V zysdCYsRzaVK_Wx?J>p~IH`#$0V;I>cI=2TgI!;uaU4+DW1ZT(SY8``0~X#Kb%9n?&K%eGtL0&VK2@bQy~M>oJ4th?;&0kNkVdzlu{W!zNG3os z29q&JRxp84lQA9i;^RA;Bngzb^AOp^zZD1){lNk04~yOh6(0&5_^Rsn>lh*i91x6( zcFv=!$-7It590ppFM~M$q1-?oe@>YzJ3N$r;J42{qPHcTrz=Lk@&`I*a(oeZABt2i z%rX7-AJJZ}B8luT*mdkd2FrTSmLN%QfSoMA*d;Xp+- zP$_))Z4~ahn)UBW@Jtl&b z8|V)&!h1?k$cn=4ZNq)QLtQ|hKcQEL@F|5rtulA=RVwG_-O1FVq8Jrbu_CGvz`_4; zT_=11xjTa(tyOZ40@w&CT9Kfgn&U!L*_*7&sH3A~F}s4C{tirUkch3j`A zB3V^F{i755=-WOj7vmUx?h!47$^$540F|jl7N5P)v7C=@QAz_SPL$YwY#-Z??PKED ze#VdOr|)fBG&@+(d;(;E)?A&;aN*7O9cnGYi;E(fNVQQ4RxqQzCKoLZ%|SeNWrH=wQg8q0ruj-@Z3 z@gdA{XTi$QFCC_EXe15FrB%w0J`2^RqE?*$sZeiWXRC@gxPW61;;2pGpItB6>n6Ic zZ&%l-oOp)t;%bbIXrSs7sGV!jczlY|hxT{!{{>BmNPh3I#bsVq6R|P79t8cLu zesD>-^`Hdbb=@x6wyb^gJZn$9MqH+QMy?SD5uy5(vlMUJiS*~vw5%sX>6WcDzBiB7ttVba z1;IN05%YFcfyIh2y$U-9Q5YA)&reS3Q<=N3Vu&_Jfvjy?s+X1{Z(di7_!k63L@8di z&ZAqF_R1OqZ%=niZKF+CZc;ojgbBn~eITM_2J-|xx$Y1VTC#hFV6E-zJaqwhxdw9; z#T61!6N&6~+og2xO&h-YYu~y+<#)g9%5&$z5*I58uHBxhO5-~-6mQ?vb&lLMLjF{aRIUF`Q^H%l!}VG zj`XYp+Sc2wU8+&IGaa9`8Il|CW#qwI2ol~RC>S9aDt0HJn|F~vyfw+WMFbjO{t>m~ z-xbp)e#NA}Acc<{!Hjh$+V+`6s=xnz)mlqj`R$XJi#muJjZ3O}o5r_iDE!O>(vvQj zGuw*v+`gUV&%fe%yN@EN0>~j|6xHc6G}?l5q8p{fa7GM=q9oX^HCbDzx@zBNR*5o= z#8sVUi&@Q$ZqPV|5ZGdJ786h{(gDGWyvfgbWLr_@P9Z*Hv7D5{rS7e0Z zFCHQHvwJsAo+}OVM|X>y%F%jZF)IEObT2BoMKe2kC9}H^)eUH;K;PZFDgW6;!ueKQ zgKFAsJkLh7yoOYoc%ZkoLk=4(H%7acFD#&;^;ARS6MDKIRfUor$&1OQGkaKRIeV}=ULUEQtZZ$Cugm#*LRnC#mp==rs`)Bl;H#KxL;?ano zlN&8y)&W;LyGnK_-?bg95D1cPoU`!xA86%?*SZ-(d5x9NpJMHq>2(=0M3?HWA{59R z9;bN!JCRcEb&V8E^wIZ;n+f*xORBMy4JdthKLZckKz9G&>z=3QecK2|@)7guD%U&x z7GS=b#PI5j!oH4IHhrRrJ82R(9Xu}*ps=kdK_LxjbGAlqOHoZONWFQD3uQ8c`L3H@ zc=S0L`}mC;0$u&eX^QXO)fMaQLM@JoC{q98Q*k+*y?Gb8ckO|U*|6LUw)ZjkJMUxZ z-#wx23#(#=iuC@gYbo8iZ&P6Ha+B&;r)W>tU1{D@$eM_MV?8s_b=4;Ti}fV)x+>$R z)hFw=>I@!^5!V8xh5Gt9WZqBW(5JHRT z%dZO^E$nPXBOhp=o}qpEO59go`|8VD{MR>2;h!At3SS-1?q%S!KO^-oze3@CyUATY zwh6*Y^Mz$rPn@Cg-TAm@9SsuHck>*`oz|+4vyMpATgfOho=Hjq!e+})GCX}YHfDC> z3l%X!ezed9=-TBfrJJ{jS(n6`mn!sJvn9Rn*=0;N&|s+8m3P|bS0JD52CEffmuq4) z=5|qOhpMQptx4?ny842`^&D+o;MV>6}zg!#`!YYErqTw(AxP`&1^~U-@Ler zDFkG;_HR*dv$69Gp{r&IJc>GmpZz91k;u7-)9W7gK zQTgI4y70-9gcqy+(WMKaxD_7t9HU-phntD7);ko@i$?kYf_w(nTJaOO_N#FnI{#_} zIYVY3x30u)K!|2XH}KGvh6L-Xt+lgDkTVhtbjR-2nR$YtVwcB-Gpq5mz?)nV5mBSK zcpEV*0 zVNOP18V_`~l%uuQisnMza5gz-P?HZNzb@w1FP4$Kk=(lN%}W)sLq(Oqqzuq}b&1@r z!3}wJ>&!g)YqlZlLQr^iF@8WlCyW@HZ_yf!nm*K8RR8cPSNweNt(%6CI8=OVT37zt zk0iWML#=eCG#EE>h^rExA|x6#L@`+;;^^@RERkbGnKlCF;)-mnKS_R4VJR|?$r*B6 z(w58IC+z3kb8DeVXE5-2=lBUXp zwKiLB+nL%{{ox$V%T;m{>4eu_YM{-K{K4UFpr=<|`Ms`h5nf&)T&_tx>?JY$OSiws zUN=tvZ{J4YuDATe@fo0abb|hmT`i_Ro0_D@BjIF05w(3V8oyw190vk}jCXoLHsq;H zCgAyY$Q58~ZlFkhs6=z29J3A2o?L~X=<*Nd<@?9}cPxgH0NM7Ty{U@OHba)5oWhoy zTG&4%>CjL|n<1I8ZpP7kc>&2~2)2~cK+jfE6f@PxiO5zyL++Nn^!%H5VMcp44iRgi zV;$KIVs;=De{MT!k)_Z55NhgUZm01bS4zI6VI2o{`y~sPfdUk>k?m*I@M1=@ED~}G z_&}zZr)Sp|nv3O5hsuklBKK)6H7PGQqQR+@CVF-7rmbl(m)EF1GfQ@&N6flcx4lqD zN?EeoyA{3dsTG3ZBEd)+==QUhoI8mogcuzOfEnwh@R1`F?z$S;q;VBaSEzpJMS`IM zrMnMp8d6HPZbxe&tABKcaIvNF+mqn#8qKm0)dc%+vBs!w>k}f!Q=V>RSu&5DVMT;f zfR&7)@2W8}`D}vTs2`5``aTX#&ff>$wUz9;m|b~hj>ef~^4oegNOpBH!j&!m$mZ8r?vLjOFuSA z_S~_P{`(J#>B+>!Ntzs_L?BV2;`-bf5ypC>WZn|x8;_l1DKj}K_FsHK|4M{kQP|$Q zdxXN)0cz*x5;GPz;c!_$5}u&hp{xwwxNWT>=h$FKR!6;}V# z-(r`WsET0QR8BmP^yVnuwQtif(sSod+L!CBe(5~YLe=JSZK`zcLq0Q#{35!IQRjd^E^wD?i@H(ouNcrS6 zg0lML6y+x`#sWs;!5aJ64c%V1Sf~E2^Hd*ucAe$}HNI?!-?CDk{IMfa{Ke~$!Qv(j zp$4_bo~QQM3ur9_m$*b#(N@Un!_R71X-n_j2R02O{rBz{0-^laMQErOK}xbhl!(K- zrgnfF*$#dYuzo<*_rHh7rjc`v3V}dhgyPk~Q(jN#jXlM78}}esDBN>t?mh zgVE}MR1!OPLO*Gh&kAJ2dXwp|exKU;D^C1Pq#Smh7NEN2=Oz-Oa#3xDRGyv@t+%{B z8n1V@2pxTN&pXBmda_nA45by}xqkX9Hgl_XY=y2NWhgKNgcjP%CZCQ+ji{Sq~b z2y3Tj#m+a}tX+(sQX22ov5M5qkFpu^|7c7pWkh{m6Ak=`%eZ)1wc0qnBD&@Wuqi>i zh!Ci59}wQN9|{?#omT$s-uvYDHdHEQEMI5|KMULu6ml~Bjst|tRc$X3)UbAMjAW*l52OckE6E&g;< zk>ig0SiBUaf1YHpSfB zPF5098R>`~H<1ndsyWhM7;zqsq(h&gVxw+rVuBPm>k_1YnQ)sJtDB^pFWRaR0<0V_CRy*R?g!KRuEni7gy~NpMy~a-cN{6_3 zi8@OCMd8-B!boo<=UTPOukXEIzP{ceHf(F{y;qJ~503kh{^vdD1Vib#-=l7UCWKSoM5mRm_emL{4~*wWpqObm%6(FjTb?(S1No-Bz@ zTVf8L67Z6Gw249V-TPpqC)%^3@WB52HeO<}X~(5G#TRlrzz7eDNMCX17`f2_$|ql> z`rKKFs9)RFQME!-1K%7{)uL;^E(b%8l z^+l6Ss7McMeUr#*4E;_~IW1k`NwWcZcqhDd0`l2-X$5|1#T#BMbnXj!OofNz#X{Dy zHZ{-cw|_{uxPr7=Dr!YQja!l?Ce~0VR#U|~XDfc;4mq*%`~o5p21tt0 zjTe~5OWLAUTWLdi;1kTiQ?;08ty?6dF{ShC2qkI0^wPKu7ZPF6AVB+j(D5y>V+5TT z>h#HlCd${aJiPb*pThFDC?mgef{_6320j%jn_MG5#Mal)T7%Zb8N#Ua3h127cYrH@`wF0zY0)DAB6N_*h~Ci9xej zv{Xcg2e6}qFgA$x7Tt<~^dO>YmH*tza{SOQv-ne6(3$+4IiXhv%D)G00VaSf|1dsQ zU|Qj;RpB#{!2BouyrD(+=N{35QTDc#I|Xi0xItj_? aNc>;Afi;%g;IoMU0000pkb>DyIzSryQGng67V2F(XB#NPAl0qa}2`R?3;*u3t7A4xMq7q5D>@0Hf#ZswC z_N0`Q7}=F_>{MK=;!<8>$x9qZkyIgRi;_~2Wl$hRGK4^Y*nt^f_L=VK^}T!Y;oY}& zHxx=#KG^Q6L3h8c-#ho*|M{PD{uja4kN8XkA-9K?`#r;LD2G&-6Bywy z(MzEw%Cf>a;5jVMso``9HXgsq*5abrANJbv!<_W&qWT9GxJwK_rOI*OI55j!!I#3S zz)7`y!}s`-70w^}n6&=C8~WuZ^p+vzGXn2bm;(%dJzia43HV0X<=-FuIXU$sH?*R1 z`nQ-YcX>#KUjl}beL+arY-4vCw6Cud+}I#k*+3f&=yVYjgT;s8a)V#O#b zViBwuK*SQgyK_MWMMTA*7*yS{Dgp`uCi+5j1PDlUBIump2v#DaEACnd77rA01K|cw++akHVL&`p z5W!Q$V1?ug(S89uz(j^cL@*i+pGbV=XkY|94;>#x=VmmVoe*7^hJqg(E>w6H%jXY& zT%LKuhCcteJ_LLY*b_aY(puVJ^UqIfXJtcZcNIcs02}#}C^(}=-k34EGqk6uNGL{7 zNIcb@8yPnC;&=v#y6s{`+_3`5Jc+zG{v2JE*l;R|mxHG^F>Jie07m24pdu1)S23!7 zL3CmS`}Q}XvlC#%K{#tx`NWZj<%>U*p+Q4k764R5SJ^h;*y1bu!(ezHkvZ8`2LcX8GwCXphndb zQR8J;h^G-I3mO8}Xa=J-z7zT&N6<o_UGx)-IkzK}~uM;2zDB$lw$2m}T<5xdbl^ifwjT`-4|8zK{m71Sw-W zr_rPiMTF$~F@{IKqe!EJY&R7LUlL<)(HEH=!OV@}&5zOg(yJOHer&7+b1NmvKXVjs zemG--$m46ja|V2m>fbwRcGW-k#W8FX|Aeb+IV9gD^SzEV&=ddtJI zF%Y9oiGL!>{R$GaI;=i-j_!6N@%HE%qLN^8gd3tZ!Q9s68Z+}fu?n8#lQ1P)#HJbnZdkJfZ z;5>8ncBsL*EgAjSZ_nL;-DDL)_8MAm#&gu&zlrGNP78hM z3fxVaTTtW&n1tZm{v zt&29p+2=#@ zYlO`}60#;)S_xQ`7p}nr#{|#d3GY3yz+J!ze{oTbU*LUenFpv{SfjOGM`BteQ8pMO zlOw-W4-9M8Lu@;weWS_HvGKn0SFqk<`%f>qM1+K07*BNaqi^f;vhMi}8ee`@wbqoB zfkdpv6UE;@soLm>REzyytx9ligW&XZ4sahNIsMu&glE-Alze;$>-c9r^X zpTUNtwUU^{bd_+egSa%`QOA4)5f#~}qsu$6Fpk2U7=CJTQNQDV;1ClU@NS@B1IzBU zO>8%G$$}CaIp)FfTlL^bo*H&7;dV!dj?d(_+g3nW>rg&2j`3V_>(X_9qAcD}p&ueb zi+^AoIzus=#fYL?4Opuao?DgO&pku+6Zc_e^YCD|+t{5JGFf5dm*0)IFqRFo3B@qe z{WGF`-#&_WPY*8IsUPujQNEw6Dr&-K-lb1 zzp@TCPKZ;L)+O^n5NaaW#yKToJo=}`0!c+^duXbDZ@ydQ5BoJ6cLr3y)<6JH8xfvr1q8d?} zXb|dcsCQyR&jum4`&f?0r_?U5qhV6#%1w+URTh=vo)V_$F2VrJ$>k#hgQ+4TmrL%f6Iee>Upmhk3=@un(>-!n)?FcU>Q1#fTvEC{YQ zoi!AVizJc(RhLLubp_PbIx-v4+0b&ok8nJ`SnbLNF5}W%VxduXhN}~m_LMOtFYhhq zcPLDhFuew~3Z5YO!a3`YK2Pb`B*XU~%pYEBQ~Sb8l#ee^x^pfQAw%qDBf&^BR)IqQ z;Mt7^+6g0!?|GH(*+=P~eK(m!9+d}f8MrUp>JYAWG<9Xk&^wa^M|DY~0E zibl+yp+0J-oe;a(jA}0jCi43Ni;NU8oWtsBS4>Y3YcJKP{*9?T zUp>EtDS3F4{fr~Hw2fCPs1)NoV-E@tnL^uj`LemyN1S9~!u10*Az z5WCU9>>U>A!Edd12$$=GH+Io(KP?Q`T7=6D!nJ-l(|Q1*l`O2rMXHG7N!(jV8DEbb ze1%%<)qb&{+Ua7%C|HSMB!lrt(cq62ds6HcstioO?RH1K(PHjr+vhehMI+u=KX!M| ztVP_qm%UuyA@1Tx!9xb5;MxwbYYhr-neC&7%`d-3;}1?FQ&q-)`CWJm`GMN{cP9xh z?`q+;2^sz8x2L{nmG1ev8yu5qWk{w!qpq-UfhS>17<9^IH`5j}GM3-LvbI?wF+)f`aqwsiTw& z4Dx8*X`?%Bx-Z{g^Fx26nrXn=%?@^}qilDj{(Gk}W2KZ6Bbc!w<$H#Oicj-vOCUn` ze4WkW&uOLw_O_0GM63qtD+HIr58(NPebT}^L%qJj(< zB)hbOnIENe?;$ApaSsa-6O~6Do{ET@8!1T}`-Qiiulk1r2ir9?~jjyesO`EAl zOO~NISjq6~N+DC8<(!Xj3V07db#9EEGs|wk9Mf>U2}kkNA1+YbQ|_T~b>=>DjBMQ^ ztaVuZ;;Za^Fdu+|8@p&T)bg=O>F290g4JE|2CxykTu;!@TbLMF?hLMOQ@CT6>d(Ht zcOc{@@89=TzI%%D-BUEbwMyfgYbZAMP}RgHCavPBYr`tAcO;uiJZA)+jW<;1#t|cN zlRDyv*rXbxqEgyhMS2K9xZ7pwJ^4!5?n|q5mv*%_3IRU)Suap?tKgH%oO_H46g_O8+A8d7~ZM9v~G?eQ65aaL2NBLl@P5rwo zQ6Z_)6V%olNVPy=-^jqJ?@d-PQAtuWl?L1_GYjK`J1bYVU^mq6sWmY(!wi4& zZ#f7_5u^FF%hLGcv$3cK6=CGTey9poTI_!1D#1!8u1kx=tV0BwQG^ibnp9O(4Z_|L zh#gOPzFT0^Jb9LF5uO9A_=b@~GkE1fwpWvW%+B}Qy@Po2 z&D&bR)on(9?r(}2D`$e>8m%wALfp_6M7;rqwo5zE=n_dyL@E0e-Zo3|t~rW#?R9^% z6yG$7B!!#k0S6V4>{bWcwxp5)$@#K-eogX?c%N@zW+)a#c18L6?_XfkUtARXPao6& zDZ>EC?hsw+tjZ3RBTU3d&`B+2ZdSr#MB2y3Cl824Jvie77P^);u1!{l3lwv>_ z()!*S<)Z_pzE!-53R3cDow$NH$Y}iD^VmxpNiEpFbz1TJ%cJ3H14m;8RHUn_wT{q} z%A46CGEycrqeUqk>mRuAMwE8Df$K^9lERV$<;c=13gZ=I-&nSd`sKw%u|B}1t2}>T zfv+NbTs*_{k00a8@+NdUjyuM+4jVawON1&1hZ%WWKBzTMZ?f|j*D(S+U%#rguV0o_ zYZnP+rvJs={fuL?N%MbSV)u(LC8|*qt4iZ~w18O{lfn4B7T0lIdA2Lv7p@at-^~$? z;Ou5v&HM2=ss4jo@elX(KRcH0xgE4)GwrY5z?YH4#h(iva@W4Js;GR^FK{mDg5SR= z!D~5KO8b4ZuuS8F}z_%715nRQ&H5y50YF ziN@1Qh|P;nA|OsFn7d@E-a9r8X=`o83wY$f!_n%1+)rG1LVwXJ|5l(7HajeR^*gjK ztwa*6tX$S*j(Z-M6G`H^qMeZ4lQ+;-H>)H?Bo>WFildQt%;8mwiG&wbbh}CSl^f6v zoMhKJNv{TaT4;mSSQeJ*o-qdh@C4rca4PRoaq=Lc zduoetz3aq~hE%#~6eFT)5`DEsxpE{Qn;(aJk3iXvwA0GJI{dKwr-3?$E05`9SNJX9 zr%|MFb&Zv$zN_JOJuw#jvfKeebK9exBcsrd2g}KG-7zF`-t>6M=1QW8m((><9bJ?)nnW+1$aURaq=I%&Nw-C?GFpLq4#Qj`3HvkK;Uhqrr7(_cZ;bOWzd3){7^*-QOWkdGBT_rT}`?QXwkIcY~qoFuQg%cde^^;fP85i^Ud8WjYo6yV;Y zFgF^XyB5N)-1_sZ-c+_Lh#vl!JQFIPR;VFDd2WKazkd(@*bs47oWv*4RF05o=DJRV zwtAnFqSyiy`gHR9fLMD61fRZ^pCT1ktgwn-5v(;$*mqAQZ=m_(i& z`$9b6BH3bpIyfp~R7cCAKXDsO54)8H)U4qXM<0@>d)KuL)JGqESRS*=rxfY{<-Oxf zKX50N12etiM9F%$WEzWk&rjuhj=xI0Jsuk&Kn<&WRZb-g% z9Al4h8AfUi)uiLE`F3<%IEorf@%`!ixbUu9A(YVw@IG-rQJcsSx5Nl9c3X-QY}3hhKNBMEVGwYJo1 zVtUsQE`M{nKcc&LL2F71og=`ODjT)jcK zv5nXuWfLhy>tFnnS)G**P*i736#vocEHRmFB>FkGaK|m~Nw!JMNMc!gyxJze^i7jx zaVAMfG%>VEm%({nBr>0yLKpU+^ApK>LxrxuQz87u(TC*e|EDPEb%|F{dF=`Ic<=$> zGiW65jZ*FqZMCtD7Tqh?39em-`YyV?gLJ!*F*RK`n5-Fe!O^3CwN~uexxvx6J?EB3 z2$Ea4Ie^kdOD5v&BA9d;T*8gBYYdA;v{FH*#?a~U=x?L~{R=vGRrzeGz+?M9%Epgu zL1*@L=?Q&HX!#Vvy}&$B;IGHaimT*$IN>UsPhGss$@>>2_(88DZ{#Kx7u9@V4-(), val typeId = mRoomInfoResp?.room_info?.type_id if ("2" == typeId) { roomFragment!!.handleRoomMessage(messageEvent) - } else if ("1" == typeId || "4" == typeId || "3" == typeId || "8" == typeId || "9" == typeId) { + } else if ("1" == typeId || "4" == typeId || "3" == typeId || "8" == typeId || "9" == typeId || "10" == typeId) { val labelId = mRoomInfoResp!!.room_info.label_id if ("2" == labelId) { roomFragment!!.handleRoomMessage(messageEvent) diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomFragment.java b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomFragment.java index 80edb364..71f2e9a9 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomFragment.java +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomFragment.java @@ -533,6 +533,7 @@ public class RoomFragment extends BaseMvpFragment - if (view.id == R.id.tv_renew) { + adapter?.setOnItemClickListener(object : MyFamilyAdapter.OnItemClickListener { + //点击头像展示用户主页 + override fun onItemClick(position: Int, item: MyFamilyBean.GroupMembersListsBean) { val item = dataList[position] + val intent = Intent(activity, UserHomepageActivity::class.java) + intent.putExtra("userId", item.user_id.toString()) + startActivity(intent) + } + // 检查点击的是否是续租按钮 + + override fun onRenewClick( + position: Int, + item: MyFamilyBean.GroupMembersListsBean + ) { +// if (item.free_renewal > 0) { queren1( 1, - onMessage(1, item.nickname, item.free_renewal, item.free_re_sign_day, null, null), + onMessage( + 1, + item.nickname, + item.free_renewal, + item.free_re_sign_day, + null, + null + ), item.user_id.toString() ) } else { @@ -180,14 +201,8 @@ class MyFamilyFragment(var data: MyFamilyBean) : BaseFragment(R.id.iv_head).setOnClickListener { val position = helper.adapterPosition if (position != RecyclerView.NO_POSITION) { onItemClickListener?.onItemClick(position, item) } } + + // 设置续租按钮的点击事件 + helper.getView(R.id.tv_renew).setOnClickListener { + val position = helper.adapterPosition + if (position != RecyclerView.NO_POSITION) { + onItemClickListener?.onRenewClick(position, item) + } + } var flex_entry: FlexboxLayout=helper.getView(R.id.flex_entry) var meHeadView : MeHeadView= helper.getView(R.id.iv_head) var tvName : ShineTextView =helper.getView(R.id.tv_name) diff --git a/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomTalentDialog.kt b/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomTalentDialog.kt index 65d930b0..a7b15984 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomTalentDialog.kt +++ b/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomTalentDialog.kt @@ -65,10 +65,6 @@ class RoomTalentDialog(context: Context, val roomId: String) : override fun onNext(t: MutableList) { if (t.isNotEmpty()) { - - t.addAll(t) - t.addAll(t) - t.addAll(t) adapter = RoomTalentAdapter(t) { selectedValue, position -> // 处理选中事件 LogUtils.e("选中了: $selectedValue, 位置: $position") diff --git a/MainModule/src/main/res/layout/item_family_members.xml b/MainModule/src/main/res/layout/item_family_members.xml index e662de2c..fc7da718 100644 --- a/MainModule/src/main/res/layout/item_family_members.xml +++ b/MainModule/src/main/res/layout/item_family_members.xml @@ -210,12 +210,12 @@ android:layout_marginBottom="@dimen/dp_12" app:layout_constraintEnd_toEndOf="parent" android:layout_marginEnd="@dimen/dp_8" - android:paddingHorizontal="@dimen/dp_18" + android:paddingHorizontal="@dimen/dp_5" android:paddingVertical="@dimen/dp_6" android:textColor="@color/white" android:background="@drawable/cs" - android:textSize="@dimen/sp_14" - app:layout_constraintHorizontal_weight="0.8" + android:textSize="@dimen/sp_12" + app:layout_constraintHorizontal_weight="0.7" android:gravity="center" android:visibility="invisible"/>