From 754b0899edb22ebfc1619f9ec45e02b7323fbe4a Mon Sep 17 00:00:00 2001 From: wushaocheng <15876365887@163.com> Date: Sat, 7 Jan 2023 16:58:28 +0800 Subject: [PATCH] =?UTF-8?q?[Modify]=E5=A3=B0=E9=9F=B3=E7=AD=BE=E5=90=8D?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erban/ui/user/UserInfoModifyActivity.kt | 12 ++++ app/src/main/res/drawable-xhdpi/bg_sound.webp | Bin 0 -> 6568 bytes .../res/layout/activity_user_info_modify.xml | 54 ++++++++++++------ app/src/main/res/values/strings.xml | 1 + .../user/bean/UserInfo.java | 2 +- 5 files changed, 51 insertions(+), 18 deletions(-) create mode 100644 app/src/main/res/drawable-xhdpi/bg_sound.webp diff --git a/app/src/main/java/com/yizhuan/erban/ui/user/UserInfoModifyActivity.kt b/app/src/main/java/com/yizhuan/erban/ui/user/UserInfoModifyActivity.kt index f09b2da02..7b9d8dd29 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/user/UserInfoModifyActivity.kt +++ b/app/src/main/java/com/yizhuan/erban/ui/user/UserInfoModifyActivity.kt @@ -128,6 +128,15 @@ class UserInfoModifyActivity : BaseViewBindingActivity 0 + if (hasSound) { + binding.tvSoundTip.visibility = View.GONE + binding.llAudio.visibility = View.VISIBLE + binding.tvAudio.text = userInfo.audioCard.second.toString() + }else{ + binding.tvSoundTip.visibility = View.VISIBLE + binding.llAudio.visibility = View.GONE + } } } @@ -389,6 +398,9 @@ class UserInfoModifyActivity : BaseViewBindingActivityQWOC}=}qZfr5EYF_ab5iL=-`4P!JHL z3erQDB1M|ieA{!L^Zm{r_da*_o|$*n%(K?JX3fmrW1yj?R>TbeMyg7BxAd^a^Z)>$ z!TbUMWB@=zSy``x0&D^l9e+zG*yZfvl@w0_5ciKK6hUU<)7t4ZsDk2E;%l2?kXHkOm{H{gx8|#9y>9 zvM_pIC?OMbf}>~~$H!d8YMf1bGcP`N=GiBY*ElEYKQ52i2~TShf13BT7NYyXIk%?V z+4RNx_`1C+vGG0cwq9K<@sd~IXWMa~4xbLAjvD94wbh))54Wy?s=(J-WLTkn@pFyy z_|(yfc}tBqw%x&`3k^Wc0y4Sm9>u!&Dw2M$m5*s>+PAM(^X9;Er?u?f!=V};bJ8M( zl5}D|cv{vSh}_s-O>!xjOkD32{w?((XIE^+?~cO3N58kbi^e<$eXhwZ{E)PvN06>6 z=T|kkb;BnH3?7zc8KJjgiO8;&3+ST?5%ssuBiDx&_Pg#wVlbEJbj!FhZ_G=dvQ8y* zDXV-V@2_39yVxI9jQdoN=9T%>{5p!mM7}NmtRsYRd7r3? z9uN2*~Vw2TzP{^Q{V9;l1&eXLD4hNQmclQ;PL$= zoTvu{JEL6@0fmkFd;>RAkL&~HV^gXa~(M!FLs?AmWL zUgV_L{dNpNM;KN-2are#9E5_7P1{P*thsi*eA}n4QsHRxO5o~1?_Kg@D5s6o9cq=2 zMBIRP5-NPwK=XErO%#cx>hK$qSU%nfxF8x? z;m=-ozjUZ4tz|J(^HZmiLa7GK?moY@x8h=K<@)4G(A-=-gRoZS7tRGHSAxiibif;T zx1R`V%hLjXe#uSsw6hlt>Pq=FI$qET8)-6LMq}yoqLHe)LEC--dx+ftO1psqq2DGi zOnrLtEN=gKy{OI+k<4Ou->x3<=&8U`b5qdvyslC2V!)qS$DK2G?(V$}l^cn_M=n%| z)G7Q#Bq9m(EbO+A6(qCh1sBd%iT3emhgcUA1?Ukvg_KfUqBku?)r`;fa`rrA>XDLJ ztw6!(pMPI#pLj`Ho~pSgEtzcS*xC)6^Srl16mPa~^7p7;?-_BO<{ezHt*oRomw7l% zKe40WKI;j8*d#y`Nv0wc|Vh11Z)wd3cCh!Q&p zu)#pXpuFVv=BKP4d(Jls2`)@b0Y7j46Hk;Lb*R#<-r`X=BWcaYw;>{PGQ@NVEt$}U zZlUhs?%^6Uu|4=fkWiDqTm5p+zH1?(e}M{Q^Ksm?CUz?FYJiJVo)=RXo`oe;O*L#b z!Fz}m>*M5x&=Yk7ON5)#09$KoD-lBVrO&g-m}JZ)iqJ-!K^>s`)yGy5*Jw1C^mY&^ z>ae0dF3e+M*Y)Xd#Xk}BjHRBh2|i;SmHNV+E>M9|34O8Z-EWd9N9y|v55zCc*1FVo z?Zw4T)g~%nv0QTM+&1dP`2M~p%rpoZAJG&p${32aBw!$g!jb@BnWz{N@YYQ66kjY_ zBrMKgL-AG76e=?wcZ_Ewe2fI-!s7wfFc^f-|bX0T=VX7;|)c- z3#q22OY2VV9+Ls|W`5VrYpa$$v0R9c%*wZ`@x@OpXGtyLOfUw@gplZvga}F|7>$sC zb`}Y3+4{L9oDL?0q7LC+wXi};a1pc#(6E-zNCFhk0>uZ@(&I1C3Q!Y^B$C)s)_32R ziexNC%8Junl6u;a5F;D?W~$T4?!M_*M$J>-47^L=&ar;`l#Pr`1EK1b&x~w=`%G)` zlA9ZgG3!kXlh;oNL>3k_s$yOADg3%vOSnyn#4fy2RT_^b(Q3c8E+S}Ar>KNTD$LWe zv852T+0eXk{5lgjhGp+IY1w3K+BosT77Y4hGg0TrX(m^g<=yZj(K~o4F zHvvdCRg&Ii5u^YMn+{u*Ns(mgY(jB##Y=6a6!0`;iQ-$R0dVN_!V<`jKndO_lysJ@ zPUWD%Ly2AMkBCPNR}K$S>rY&p0|SZ&3JZ4*-);I}zeF%_iW$!(gfXUy5!k)5`iM#B zYYYQJ0dSQNpDu$8pGf_ z@y7a7LO4@&*kiirkZ7R?I+15r>qEom(|u2#`A+}QO5zP#J~=&(9MNL2K|<)Dd?XYB zN}ijB|Z%@Or=K12i!RN)BFs*RXpe}&_XFfpC=(ha5?Dec&3xAv5Z%q&wSzM zSupa(i$d;J2szVqiHL1T`UOt;CMP; zJdnh|kuHi9fZ-TBY#0nax#Dk#8g35$`W{Pvk<}T$ruEyqJ%RG77XnHIEKAU|f>}bFJI!m6 za9!U_#ZcV3*rT274?(JQ6^td{+rG~>z*ohRc!)O*3yK9}$jrESMEJ z$*Lev!@1QWlan6`lZ^lX=WjDpA!QMHPR8ZOC#I`ROm)J@$FmQ;U$d}sGeVK0Q8|xF zE@r)EUwT;s!&`~wT9J=flPHB?i~UNs-xX?60eEDAl2X40 zT{-sUD<6(t?JLaMBNdOoMILYIy54*a-}BjE=u@s_h*kG@kPfZH359z*yGonH&;op+ z!Qs!cdQ9cpZm31}6K}{1>aFj-cjg5I`r1H?a@T)?J5#AW+$NB)yQ8lPhc7~0o0omp zEBwG{_2ySLucsmp-0kNYnaSBlu{24M+l{?}v#*f$vvGQpit}?$EZ3uQhr9%SMA@)X zKmc|O->gV0XiUD%R4vl|%oEB?ir_+pdKM9UWI`C_IT|4^L`M?(Ny0lB&#sF)p|$n1 ztWXc%wkP6^^VLkYbm6IU7%i9S6}y3 zjCJ@%gCGx!T%lq>-r>NBsEZ2XXX&}HkhqX=oB=QA?+*)^aV?{Yx!Xs zyDl(phF&dcMPDSpv#TxT`nyi$D%~v6vIj*WQ3M7kl8;ryG(^u?^E=A_tq@G}7h0F= zQhTQ2PsJ(!?ZTqt!$#NL54;M#sB`ma6_t%`=Kh;^6`=>;DizlggMw0>9SS-pXb8eo zmkN3=iu_J(&V^~l654fKw=$w|@KOUyU+U3BzwMqNk4L+(j=^S^rtLUpS=!lZu^>>7 zSI|S?f$_e=R=%t0T2JEYU99zQl|_XMdm)Rlve$ivaqP*@U-Cb_d{&3m>Q(!%@4CpO z@mB@@a}vCUtyul;0JqyCM}w5K^QSu`Wpi@K-2NvzBb)V9)JXo#y?JVz6}b;31F~-{ z$}j(x=s<-?^z(kqk+r>V%iD5k=<>HP9rt_UdAd4}h$nqjBiTq19+rg@BxQHr+q_jf zwvTqNoY;OEKAN#G%D;#$(`FL&Uy|^CQ$j(eF;Y(`VRz&xZJGTHKlWUq;OCLf*r{em z+`r-;->Gv?Zn?{7P$k$x_ad#vci*(*pa*xOjZG@Om8m3FBQGfh34MZXJSAayckLzj z4TT4+=SnF^FD&{Z`-$qjXlhjjDH<}%X(V>IXTVY(}aZ`LOZ&*RPy zH@>1z2&>)`^5o?}*k|%EvU7*h_ZQ)nrCLlEB$%$Fu&CmB!>A5g7J!YLQImq4>)X&a zsOXAp4(v6>BPFcQEiuIvO-3I!76uM|`bcxIUa26|W=>tuzvT4mk#WFz>}&c6wVQwg z5=m4^cy>WYs)vAnKw8sxXjP^X#$bzyB43F(Jq{!CR{qH06ig9lgFFi#elheGN$4m4 zS&}&z%53h0sHakWdHiK{N7g)GJew!@_he~sSF*5-IHih8H|R7tlnrs)^@$x&o!Dh1+JRdfCD-N2Z!Z2mStlc2QaDa3*WYlblF(mTaPKIw?^k|hCilH@8eQ}Y2W%2@yWXR zL)&Jt;@1QbtS$#aO5oeDhcH6|6vxj8U|3Wl)DCeygrp=Pot%7~987^MGw|RS^QkBI zx~ZbpQrf0lIR6YCb2=g^@^@Y;=hIAOUGm4e#ud8xEk)m^t(S>cy;f()`|IM@g5~oz z(x)@_J?od=!0XFMKeqC(`rM|Y06)&)-xR35XSj4U$BVSloLE7Dn>{%>8LTcS->qS} zk{6ZpT!k@xGrY_*X&HfHL9i3h42`ITadCw|OuFPI{o`5wjWpW5>_v5Ra&YAKwGQUy z6Fk+>O;_cP7x?kKz=%%D!P4aN^b)1e#~7hfy6P*Y|9->rY7gE;Q{a#Rcg7K?2V^Dv zPtn*i*H+~SO}{fUbny_uEDPj={0|BiddML1mgltp@)zSGniI_=y9u22aUTPr{LrBmtHtrO8G(*CJ6m6dOQRBbbdTxni z(BDt4LQSYjJ~@2znt&t=$H#WuP}aWyh8n^~i-8GsJK2G5-Cr8`_B5ZN=QLL)cZ2HI z@kU^k`PQG8;#BV1pry~r*!HsC8J6>S+W6p5Hh5Z}U{=THI4XK5RoQiTo#2e(>HfFL zg+yc`xlyWnIO?@~6fC<#g<3f4n4`{u55}F>L4v~SRD`meK0;G3^QCnRQL)Rq7R1;m z-ls4~7EFRT^IdEyfh3)U1DG!NpYqJTVdINd_iKbs=JvHbZ`kgA7e74OpH@7wwf`xX zF!ep7YFH-Sj z;*lV~vls`FT~5<4Awf?cpup2nQ$00vH_W?|U2J|?2YI%I?cUX>S{%z+IEDZqlQ_<@ zeI+`}TDzDwyx*D3tb{OJstj6G)IHs7;H>vKao04{&TH4%_>>T@yo8QaQWBIe?k9;f zWlkvgeom1fAHK?L+8fsGH$H>9BtkX#T(9f(1R?jGB)@P(=QjQ!Z=6*Df~_6p&Vez( zr?DIVn6 zt8>Mm*TR_iSXDF@gk|pi&@gUn+1P>eKp~eV!ch<0-47z5Fl`%5vSXct
mIVSN7 zkQmz#OSvUmj}RywTaKzAp8zH{#!f$(gViznedlo~+VsBIzb+@QJin|xQ@kUa`{BdR z^q+x1^Md`iCEwTUuH&a8FS)~cauvAptTB?m$GnEZ)s+P?Ieh{K2pu#?h4H!rh8Rx$ z1wv&{Yo@|HUeLK+^_a=^&eB5zI%7`FlTYn zJ9Bb`HM2cFUZ;@%y42X^1-XYqs2s7JP2+GHLHU^~R0f4h*j zKy7zzU8!MHT`_7`Yje^X_Q_as4;XW$R<$%q4jhxJpFTeQb@b7FVxvL6$zfvATcqE0 zPUz_U)551rj4H`GdQ@s*gDWYQHwIqooEcrOY3ZzIbbGrSuTPqXJn=QX+WTOGSdko; z()f+1;HFqj{-~3%%NXej^X+Z#+@NxeHw}{Jv2HKPSC<+OemQ&DC)Qt~KKS)@x^L9$ z*G?XUhbFS%6B50w@b*e-{eAiEyKIb1F$$t?E0fH*2?2Y{_owT3a?7nTov^|-MqLax zEMlO_Ji2bCvuwoV==akRGmUO_dUpf6jOrlj*W6BB4l}$imjiaUzc4&Ar<&UN(VTyL z&{nDYsKNN{k+fy_8rK3zh=m8p14lm!|%#4UUj5-%T+; z`P>{7dAw%mD(075U{{bR)sp6dW`%~JH(qy?8{QRW9*4f8HL89z^~-yhHd?z zQ~HC2OH*f?>i!gFY zHN)i8p3c@SVYT7D)tjofUh2Yc>(SYK>_X+3bzjY08PaS&9v9VPRua7^0KH!9Q)^yk zZ#? + android:visibility="visible" /> + android:layout_marginEnd="@dimen/dp_15" + android:orientation="horizontal"> + android:gravity="center_vertical|end" + android:orientation="horizontal"> + + + android:orientation="horizontal" + android:visibility="gone" + tools:visibility="visible"> - + android:textColor="@color/white" + android:textSize="@dimen/sp_14" + tools:text="60" /> + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 61cbd662e..ef5b7cf1c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -5046,5 +5046,6 @@ 生日: 房間: 公會: + %d" \ No newline at end of file diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserInfo.java b/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserInfo.java index d130c28b8..362d5ac51 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserInfo.java +++ b/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserInfo.java @@ -293,7 +293,7 @@ public class UserInfo implements Serializable { */ @Getter @Setter - private SoundBean soundBean; + private SoundBean audioCard; /** * "用户自己的房间是否牌照房"