From 86465b99320484ffe05a066d33cfa597192c1998 Mon Sep 17 00:00:00 2001 From: huangjian Date: Mon, 6 Feb 2023 16:50:06 +0800 Subject: [PATCH] =?UTF-8?q?=E6=80=A7=E5=88=AB=E5=9B=BE=E6=A0=87=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../moshen/ui/im/adpter/SayHelloListAdapter.kt | 9 ++++++++- .../res/drawable-xhdpi/ic_gender_female.png | Bin 1257 -> 873 bytes .../main/res/drawable-xhdpi/ic_gender_male.png | Bin 1185 -> 861 bytes app/src/main/res/layout/attention_item_new.xml | 2 +- app/src/main/res/layout/dialog_user_info.xml | 2 +- .../main/res/layout/family_attention_item.xml | 4 ++-- .../main/res/layout/family_fans_list_item.xml | 4 ++-- .../res/layout/family_list_item_friend.xml | 4 ++-- app/src/main/res/layout/fans_list_item.xml | 4 ++-- app/src/main/res/layout/fans_list_item_new.xml | 2 +- .../res/layout/item_family_member_list.xml | 4 ++-- .../res/layout/item_home_single_anchor.xml | 2 +- .../main/res/layout/item_mic_queue_list.xml | 4 ++-- .../main/res/layout/item_pk_mic_queue_list.xml | 4 ++-- .../main/res/layout/item_team_member_list.xml | 4 ++-- app/src/main/res/layout/item_user.xml | 4 ++-- app/src/main/res/layout/list_item_friend.xml | 4 ++-- .../main/res/layout/list_item_friend_new.xml | 2 +- app/src/main/res/layout/list_item_search.xml | 4 ++-- app/src/main/res/layout/newbie_list_item.xml | 2 +- .../layout/nim_recent_contact_list_item.xml | 4 ++-- .../nim_recent_contact_list_item_new.xml | 2 +- app/src/main/res/layout/view_user_info.xml | 4 ++-- .../res/layout/item_community_notice_list.xml | 4 ++-- .../res/layout/item_member.xml | 2 +- .../item_public_chat_hall_attention_list.xml | 4 ++-- .../layout/item_public_chat_hall_fans_list.xml | 4 ++-- .../item_public_chat_hall_friend_list.xml | 4 ++-- .../room_msg_nim_recent_contact_list_item.xml | 4 ++-- 29 files changed, 52 insertions(+), 45 deletions(-) diff --git a/app/src/main/java/com/mango/moshen/ui/im/adpter/SayHelloListAdapter.kt b/app/src/main/java/com/mango/moshen/ui/im/adpter/SayHelloListAdapter.kt index 61359fbd2..37c4a5a71 100644 --- a/app/src/main/java/com/mango/moshen/ui/im/adpter/SayHelloListAdapter.kt +++ b/app/src/main/java/com/mango/moshen/ui/im/adpter/SayHelloListAdapter.kt @@ -3,10 +3,10 @@ package com.mango.moshen.ui.im.adpter import android.text.TextUtils import android.view.View import android.widget.ImageView +import androidx.appcompat.widget.AppCompatImageView import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder import com.mango.core.user.bean.HelloUserInfo -import com.mango.core.user.bean.UserInfo import com.mango.moshen.R import com.mango.moshen.ui.utils.ImageLoadUtils @@ -25,6 +25,13 @@ class SayHelloListAdapter : helper.setText(R.id.tv_send_text,item.content) helper.setText(R.id.tv_online_desc,item.onlineDesc) helper.setVisible(R.id.view_online,item.online) + + val ivGender = helper.getView(R.id.iv_gender) + if (item.gender == 1) { + ivGender.setImageResource(R.drawable.ic_gender_male) + } else { + ivGender.setImageResource(R.drawable.ic_gender_female) + } val ivUserCharm = helper.getView(R.id.iv_user_charm) val ivUserLevel = helper.getView(R.id.iv_user_level) ivUserCharm.visibility = View.GONE diff --git a/app/src/main/res/drawable-xhdpi/ic_gender_female.png b/app/src/main/res/drawable-xhdpi/ic_gender_female.png index c9a28fa2772119c1694cacaaf96ad0f3c9dc2e16..8c4b0c647d1d9796e07ae3dd52b1dd65f19abaf9 100644 GIT binary patch literal 873 zcmV-v1D5=WP)Px&BS}O-R7gv`mV0Q8aTv!x&lz%yv}o>5mfKv~BIeT4Hslhr5za;~rIbJ1W|A_O z%_X9g+>*_uTq7C_AyF<1xi2Fu63K?;avuH8YdhP{`<{29^Zxn1&+qyCp6C5O-``KD z$D^6K@u*AyhJm(6X%|=~l!3eft|EF;_GcHnrIT<0nz=p=zphcVyIUfQFHi8u3fZ4^ z)G6K;s2Ll*=&yr{4yq5RZj2x|kf>>rzoazuTb(zWu^|b59aAOxZ(vnxMEC$vlO%uX z<(heFRcOKdMXK8HUtmF~`~XjCO=vYR&_;gV{MX7tS{SIb!GNmv27$i3>-G9)@v)E` z58k%Wq!E0ofCn$&)D3w5$+j`(pGv{9L`ztJQKS0(N5ZzTX=BJtg~7exekqic!N+pw z*cy6wf#?=+_!3;OpA7MM(v5m8pfB&StMs#{LQE^zdDg0^=Hn3Pp8fX7}3{z{O%X zawWWYP3*ea@a#40DGZ4fksJfOsH(#qGkIf>oSEqA0(kn`eOi1ekPr(Cch~_hiDu+J zQKg$>rubN7VH!GjGgN+e2PXA}86#lUCL176MSZ#D3e6oeb!vmGorPxYg0c_pKqH)# z1em`q6bKdWzy?vUdlBp{ge&*lfr}>_-NUBPDHD-$_m&#OoY4^18M60;Z);o^$eIFM zjzMvWLrdL6W0tjS2Ak)>-RH3Lj6JkNYgn8Pk6*!#)Ao)dVnpLG7Ty?$Z4X7aVblO* zdNTU`2YmhtC$2%so1oM5>k4BAS}NXp0=`x{0dt%OzmKQ<)aAQy?v`~Le5r)ew|@l;Ii3Q*NFTr! zG=f)*s$NC(5*36-@S0dt6%o4#*OlV`yz2i3D=ct_hyB>400000NkvXXu0mjf*h`|U literal 1257 zcmV=P)R5TcPMUwi-| zYBVB{Ciq&Y1IkE-t;EU3%WyZ!Z6t`Olo$BMfmA zmBs`QfL*Gh3qYo!i~;h8(jDM?65%3flOX$1^L0gneS+v<_GF-snov_m@Vr4@2d3o+ z%2%z)qVHA_`&bfU`%~%{=;5_GIi45nKxK}vr(uy3tx5I7o|?T;T6){-1GF~Lv&dj} z0e1|G^X!eB7t9lt3Hdow^(LUTZ}%)VV)o?9KQW;F7A|YFNws!a)rP#iY0Voz53ki3 z@jP3DQsiqkzXZls3nQls`J+MN5L|<6ZOWAfxO7Bs1$bvFWvXXyl%oz$2z2L@8kRgT2o&ao40b81R>DcMCt{DZ1XWE zF(`Xh7&%$c04^O;Iu0vcr$JK?FM^_SVeCBNwvy<7Cq7rMwhTIb26Sz$zIgYB_%?BK zvLRvr^c_LtmkML5h13;j-C^l!>)(gV`uInM;`@Z)I<#!DBrp1;qK`~dWx|xpk+<~0 zSj_(9W1?U@OnJ$KnLPfHrR&rXS^^VS3ZrHUmm8InJ9Eow5ST^MkOq{)<@#wKjYy_!l~6cU zX!}yRRO=VuP1Z&CN&Whu9i`OAZN*xHYo^AHHY~sIDScQdSsIgjzQLKsyk zTsf+=eh~%dK)d73bJt7_>w`_Iyy_cgI;$=-t=k8tfV)b^Er~9NFtE*0U~X!ZJ!irj ztN8=J4JI5<*$jLajLCE3#&CNX*dFNkJ-R|e&ML%4Kw-I1GG8dT^Z)QWn>B2vNlzQ{ zM#0tN%HN;((I*`E*D*GXILcPE)BU(z|9~w6d`YP^ualI*>&CBaY#dOMU^mVg$aXl z_r5E6s?*QgjitniyEU(BR&Y>}YCrY9QjQW1Nbf9-nCP}GL#!a8ij#Aj)`?FoLD%5k zMEI?)&dj~B<~i{r37r|k)&PaMg6*y6%3S`633+?DK{@+_hWvI7<+iStt%EjGXMmY= zPeT3(>6U4{eqCw_Ms|DMRG!gHST5LZII}m}_T5}{U>%=ZJ{%Be606H+ZHRx9cGKs_ z-G5+r4rgXPV@iv4Vs&LE$UYfOOFA0F#eSyB{aHG>C2_~el$urPa%UPF`T;`Z4V0<3 zgkUITq1mdwll22crd{`9(g+I$`Tv_w6 T32yeC00000NkvXXu0mjfWD#FH diff --git a/app/src/main/res/drawable-xhdpi/ic_gender_male.png b/app/src/main/res/drawable-xhdpi/ic_gender_male.png index 1233742a0bc429ed631b0835eb1b255b93415990..96f93fa88c6154a23bfea38d5d019076699c5858 100644 GIT binary patch literal 861 zcmV-j1ETziP)Px&7fD1xR7gv`mRm@aK@`V-W13crqM%7eSteo8#Y7AhGu)L341DNf5J=QR1qESP zFR=yP=t3YtV1W=pNDx#+xsv6LOcb(^bBKNfCl9AQgxkb^8XqL((Dz_iCG{$0>fBg%n1M`A!)gkxeOra$uQN zUZd-7B->yva8l1I)nWu0Ub4RGlFVh-ao;{ zod%F>a}|mQ6XOH`{V=$LVD^8)GZ ziwuL3C9q{7*doTQMkF-%!gV)nO44BGUxRl9oNIJ}NZ2SGHS!{Y!+OA&2spbA=0`#G zN2vF}r$LC0fHkpDk_^c<5JH1J?t$!hV<3`C!r_wYcysg`^g;&2MM8Ny^m-?!G)usd z6_A|(`&*#euLVBz8_P*SD>A|3g%cg1gjAFSm2O?1UIiQm z!h@I3q-&x$_0n3qc?ocA6>P7EJ{8UQ^BDr~2jzQhD;w9qoYmbWH!7NbVsr_I~#hzGpLQY^jNLo-+YIY9q_}v z9n{@8I=rWFJ*n~*FM_pk5FZHxK6u*)uFp`{qheXgIPiK><{`a+$MOs56C(f`sz=lq nG^EeOF=$91!U39_;ivu|Vvj`%_RX)#00000NkvXXu0mjf9Y~0} literal 1185 zcmV;S1YY}zP) ze@xV67{EX8_ZYDxlSPV+Rft1t5|*H4FrgX?t=3YHW*joDt+lpVrCYV|*3adVvOlUn zqN!NvL9NYPIoUK14;i@@YyCie$Q&ih0w*XC_kG)Y?;Sh1JMKM*p8xLN=Y5~g`@GMO z_xlRsiIifqha%fzos`@yU@?$}AUWRDsN<4RpkG1<;B!d6-s{AR5OS*ZM65x#TUuSq zsFF4>A_8!;Cz1|f@z$cB*yDB!JDQ=Wpe~Qh0uCZ5m_52ED@$5|@;ayJo;(@>TJgCo z77pqWr2nswA!CvYmSp|ja&aQu{shp?2V|*jacJ7{7iDMFC9wFq$bmC|!E482xI)FT zDK--RO~y6lk8!n6w0J z%7fCdw44%Dfk|42;jVh8@CQIE8{`%#shz1O9RmDOicCrpJhcjzFN850k}Pd0E~rwn zc)V`Cs1-;lT=le1rvxobg?q9gF9Xu&Xn;#2(DgU8oP*|bF!w5Wt`KgT2ZN)q`y{+v zk^rcrqi!QP!sU@`5FAg$n+j;tZBUX8%8MaU-VFbJVF;3wG;H4>)Og{KA=tMe0Z<(R z#llrD-v+juf-1-t3gOoI`WTzeg7++R59r@%Df)=Zav&p^mc19@jqkKam8b+$@@lNC zkA&H&JnBVIXbM_&yFTuLE3n%Ko&C{gstrB45>{ry<$qwuQRusDY9&I?t3b~qSYWb5 z);w_E2Ywq~KL%YfAVX`ZsCZ^I+;IbZ-wW?In^=jWBk5D1Bc=s@>k3$t1>d&AXKiLi zRVeIQ3#vRldl&|W&E`$el8hzX!@EAS%}vVqj_jXNH#=~BA-7`lvB@$a zul8Sonx@zxpjxR*HHSsI;JX{){E&%-Njl?~lF&6za0aLXo>Hl5kW2k`;NqMbZ%GwzkL77^ ziQuKgmKt1L=|b}75PWbdcAK5jj%3hbQLtx&_*Lmm_!Ox;Aj_o1SEiln#<@_M1G)1d z?P_gyWK4V4*8?Yd605i4;HtpeJiPBw@lEKzh>yDfNyv~n8uWvKq00000NkvXXu0mjf diff --git a/app/src/main/res/layout/family_fans_list_item.xml b/app/src/main/res/layout/family_fans_list_item.xml index 67ee61ec7..d768abdfe 100644 --- a/app/src/main/res/layout/family_fans_list_item.xml +++ b/app/src/main/res/layout/family_fans_list_item.xml @@ -43,8 +43,8 @@ diff --git a/app/src/main/res/layout/family_list_item_friend.xml b/app/src/main/res/layout/family_list_item_friend.xml index 884bdc1be..794b298c1 100644 --- a/app/src/main/res/layout/family_list_item_friend.xml +++ b/app/src/main/res/layout/family_list_item_friend.xml @@ -41,8 +41,8 @@ diff --git a/app/src/main/res/layout/fans_list_item.xml b/app/src/main/res/layout/fans_list_item.xml index 52012bc71..80bdd91b3 100644 --- a/app/src/main/res/layout/fans_list_item.xml +++ b/app/src/main/res/layout/fans_list_item.xml @@ -82,8 +82,8 @@ diff --git a/app/src/main/res/layout/fans_list_item_new.xml b/app/src/main/res/layout/fans_list_item_new.xml index 1c4fa4560..3f6b18c40 100644 --- a/app/src/main/res/layout/fans_list_item_new.xml +++ b/app/src/main/res/layout/fans_list_item_new.xml @@ -53,7 +53,7 @@ diff --git a/app/src/main/res/layout/item_pk_mic_queue_list.xml b/app/src/main/res/layout/item_pk_mic_queue_list.xml index 4dd249d18..2c90f1bcb 100644 --- a/app/src/main/res/layout/item_pk_mic_queue_list.xml +++ b/app/src/main/res/layout/item_pk_mic_queue_list.xml @@ -86,8 +86,8 @@ diff --git a/app/src/main/res/layout/item_team_member_list.xml b/app/src/main/res/layout/item_team_member_list.xml index f6a22e12d..29bffddf5 100644 --- a/app/src/main/res/layout/item_team_member_list.xml +++ b/app/src/main/res/layout/item_team_member_list.xml @@ -97,8 +97,8 @@ diff --git a/app/src/main/res/layout/list_item_friend.xml b/app/src/main/res/layout/list_item_friend.xml index 6e8cfbc57..53c20672f 100644 --- a/app/src/main/res/layout/list_item_friend.xml +++ b/app/src/main/res/layout/list_item_friend.xml @@ -79,8 +79,8 @@ diff --git a/app/src/main/res/layout/list_item_friend_new.xml b/app/src/main/res/layout/list_item_friend_new.xml index 0384ef8e5..675072855 100644 --- a/app/src/main/res/layout/list_item_friend_new.xml +++ b/app/src/main/res/layout/list_item_friend_new.xml @@ -51,7 +51,7 @@ diff --git a/app/src/main/res/layout/newbie_list_item.xml b/app/src/main/res/layout/newbie_list_item.xml index b3854ce7d..cebd3a2b2 100644 --- a/app/src/main/res/layout/newbie_list_item.xml +++ b/app/src/main/res/layout/newbie_list_item.xml @@ -43,7 +43,7 @@ diff --git a/app/src/main/res/layout/nim_recent_contact_list_item.xml b/app/src/main/res/layout/nim_recent_contact_list_item.xml index 6b164e0b4..98e44b7ba 100644 --- a/app/src/main/res/layout/nim_recent_contact_list_item.xml +++ b/app/src/main/res/layout/nim_recent_contact_list_item.xml @@ -73,8 +73,8 @@ + android:layout_width="@dimen/dp_14" + android:layout_height="@dimen/dp_14" /> diff --git a/app/src/module_labour_union/res/layout/item_member.xml b/app/src/module_labour_union/res/layout/item_member.xml index 9e1a7854e..347685720 100644 --- a/app/src/module_labour_union/res/layout/item_member.xml +++ b/app/src/module_labour_union/res/layout/item_member.xml @@ -58,7 +58,7 @@ diff --git a/app/src/module_public_chat_hall/res/layout/item_public_chat_hall_attention_list.xml b/app/src/module_public_chat_hall/res/layout/item_public_chat_hall_attention_list.xml index 629229694..647cddf37 100644 --- a/app/src/module_public_chat_hall/res/layout/item_public_chat_hall_attention_list.xml +++ b/app/src/module_public_chat_hall/res/layout/item_public_chat_hall_attention_list.xml @@ -63,8 +63,8 @@ diff --git a/app/src/module_public_chat_hall/res/layout/item_public_chat_hall_fans_list.xml b/app/src/module_public_chat_hall/res/layout/item_public_chat_hall_fans_list.xml index 54c13d654..02157800e 100644 --- a/app/src/module_public_chat_hall/res/layout/item_public_chat_hall_fans_list.xml +++ b/app/src/module_public_chat_hall/res/layout/item_public_chat_hall_fans_list.xml @@ -64,8 +64,8 @@ diff --git a/app/src/module_public_chat_hall/res/layout/item_public_chat_hall_friend_list.xml b/app/src/module_public_chat_hall/res/layout/item_public_chat_hall_friend_list.xml index fa44a4b55..19f132b10 100644 --- a/app/src/module_public_chat_hall/res/layout/item_public_chat_hall_friend_list.xml +++ b/app/src/module_public_chat_hall/res/layout/item_public_chat_hall_friend_list.xml @@ -64,8 +64,8 @@ diff --git a/app/src/module_room_chat/res/layout/room_msg_nim_recent_contact_list_item.xml b/app/src/module_room_chat/res/layout/room_msg_nim_recent_contact_list_item.xml index 4f0a63373..8125c1596 100644 --- a/app/src/module_room_chat/res/layout/room_msg_nim_recent_contact_list_item.xml +++ b/app/src/module_room_chat/res/layout/room_msg_nim_recent_contact_list_item.xml @@ -50,8 +50,8 @@