From 8e659b1d295f8364bd72927477c5f6b846e7c176 Mon Sep 17 00:00:00 2001 From: wushaocheng <15876365887@163.com> Date: Wed, 31 May 2023 14:16:06 +0800 Subject: [PATCH] =?UTF-8?q?[Modify]=E5=A4=9A=E8=AF=AD=E8=A8=80=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/res/drawable-ar-xhdpi/arrow_right_3.png | Bin 0 -> 292 bytes .../drawable-ar-xhdpi/arrow_right_more_room.png | Bin 0 -> 281 bytes .../ic_home_list_arrow_right.png | Bin 0 -> 326 bytes .../main/res/drawable-ar-xhdpi/ic_tag_arrow.png | Bin 0 -> 430 bytes .../drawable-ar-xhdpi/icon_arrow_left_black.png | Bin 0 -> 432 bytes .../drawable-ar-xhdpi/icon_arrow_right_small.png | Bin 0 -> 455 bytes .../main/res/drawable-ar-xhdpi/icon_user_back.png | Bin 0 -> 283 bytes .../drawable-ar-xhdpi/icon_user_back_black.png | Bin 0 -> 516 bytes app/src/main/res/drawable-xhdpi/ic_tag_arrow.png | Bin 0 -> 282 bytes app/src/main/res/drawable-xhdpi/ic_tag_arrow.webp | Bin 750 -> 0 bytes .../res/drawable-xhdpi/icon_arrow_left_black.png | Bin 0 -> 298 bytes .../res/drawable-xhdpi/icon_arrow_left_black.webp | Bin 182 -> 0 bytes .../res/drawable-xhdpi/icon_arrow_right_small.png | Bin 0 -> 428 bytes .../drawable-xhdpi/icon_arrow_right_small.webp | Bin 284 -> 0 bytes .../main/res/drawable-xhdpi/icon_user_back.png | Bin 0 -> 370 bytes .../main/res/drawable-xhdpi/icon_user_back.webp | Bin 192 -> 0 bytes .../res/drawable-xhdpi/icon_user_back_black.png | Bin 0 -> 598 bytes .../res/drawable-xhdpi/icon_user_back_black.webp | Bin 262 -> 0 bytes .../xchat_android_core/share/ShareModel.java | 4 ++-- .../res/drawable-ar-xhdpi/nim_arrow_right.png | Bin 0 -> 540 bytes nim_uikit/res/drawable-xhdpi/nim_arrow_right.png | Bin 0 -> 446 bytes nim_uikit/res/drawable-xhdpi/nim_arrow_right.webp | Bin 310 -> 0 bytes .../layout/nim_message_activity_text_layout.xml | 1 + 23 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 app/src/main/res/drawable-ar-xhdpi/arrow_right_3.png create mode 100644 app/src/main/res/drawable-ar-xhdpi/arrow_right_more_room.png create mode 100644 app/src/main/res/drawable-ar-xhdpi/ic_home_list_arrow_right.png create mode 100644 app/src/main/res/drawable-ar-xhdpi/ic_tag_arrow.png create mode 100644 app/src/main/res/drawable-ar-xhdpi/icon_arrow_left_black.png create mode 100644 app/src/main/res/drawable-ar-xhdpi/icon_arrow_right_small.png create mode 100644 app/src/main/res/drawable-ar-xhdpi/icon_user_back.png create mode 100644 app/src/main/res/drawable-ar-xhdpi/icon_user_back_black.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_tag_arrow.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_tag_arrow.webp create mode 100644 app/src/main/res/drawable-xhdpi/icon_arrow_left_black.png delete mode 100644 app/src/main/res/drawable-xhdpi/icon_arrow_left_black.webp create mode 100644 app/src/main/res/drawable-xhdpi/icon_arrow_right_small.png delete mode 100644 app/src/main/res/drawable-xhdpi/icon_arrow_right_small.webp create mode 100644 app/src/main/res/drawable-xhdpi/icon_user_back.png delete mode 100644 app/src/main/res/drawable-xhdpi/icon_user_back.webp create mode 100644 app/src/main/res/drawable-xhdpi/icon_user_back_black.png delete mode 100644 app/src/main/res/drawable-xhdpi/icon_user_back_black.webp create mode 100644 nim_uikit/res/drawable-ar-xhdpi/nim_arrow_right.png create mode 100644 nim_uikit/res/drawable-xhdpi/nim_arrow_right.png delete mode 100644 nim_uikit/res/drawable-xhdpi/nim_arrow_right.webp diff --git a/app/src/main/res/drawable-ar-xhdpi/arrow_right_3.png b/app/src/main/res/drawable-ar-xhdpi/arrow_right_3.png new file mode 100644 index 0000000000000000000000000000000000000000..3af39740e808305f49bc99fa8913eff082d7d629 GIT binary patch literal 292 zcmV+<0o(qGP)Px#1ZP1_K>z@;j|==^1poj5&PhZ;R5(wKlQ9m1AQXl{69-3RZ8$@()97N_TQyyp zp1>ZZV-w?!CQOEANF){46*P}PElZxXgqLM*FwtW{hgg@oZKNY+6OVhL|2N=y)O=*2mjJ``BsGNwEysq1D bBol*+!==iXn-5k1y~E(?>gTe~DWM4fq4r{Z literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-ar-xhdpi/ic_home_list_arrow_right.png b/app/src/main/res/drawable-ar-xhdpi/ic_home_list_arrow_right.png new file mode 100644 index 0000000000000000000000000000000000000000..ec067a9bcee56628f551f87d09c3d295540d4b54 GIT binary patch literal 326 zcmV-M0lEH(P){Q700004XF*Lt006O% z3;baP00001b5ch_0Itp)=>Px#@JU2LR47wpAOx79Gzt(G7q3-PQrgbQ$jHnH6@vp2 z5s@4j8JWo-_TRsMzcGPDp+HbjFd8Na0-rv8+6*^=hlj^aQBiR{Gcz+6i2wEL*OPbe z-gN~lK$raS*WGX5zMbLc=MM%-u(GhQhydN?^x?yYmGFQ9Df<2U_d@{z zfgli{jg3tPh?P)666nCofByV=%g4v(1>$2U00E#?r~d!{|Bs7{%ly@=R~=AcT!4WA Y0DHb%mj=`(*8l(j07*qoM6N<$f^-6lX#fBK literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-ar-xhdpi/ic_tag_arrow.png b/app/src/main/res/drawable-ar-xhdpi/ic_tag_arrow.png new file mode 100644 index 0000000000000000000000000000000000000000..cbf77f2330ef8c4244f549036b4b35e142ab5a9a GIT binary patch literal 430 zcmV;f0a5;mP)Px#1ZP1_K>z@;j|==^1poj6SV=@dR9Hu27zLwX6pVsVKwH4U!N~<>4lcmT%F5Q; zH+kjN>-YXQHn-1)3J(qda@>@uvo?Yp2g0Y$T>1o+A{j72X{rH`_S{9g2Cd`f&0n$?*>UL^+0{_#fd$wc zmzv{^E@v^l%(m<)D_9ju9Ih8#|QCuzlN>m2>CJ=!9~q z3YeiZN#OqddpGUv9KA$DL?u9cB_(CeM~@!exqa*AWw3(500aevMAvWJb_o{6m#*CY zBdhBOKWGSG|7PK4c7PX-@Q&s zh;hDk>jtPx$T1iAfR7gwB)=x`>Kpe(#9Yrxzq=R0BC_D&3(6v(( z(Q#i%r`T6fy^=Z=y@YxL9i+P#Po7F4)aH>vT6Wd>FPu@=^{4B)XSQu0 z;ebwhMJN20nGpA^Ez9zWfrmJh1^Wlkb=?mIA63B~LrZ`IhE%}~45@%y7?K5dVn_xY z#gHgCi6Iei7DK!s7lwF1ZVb(VdjBiI2qAk(lDv4HcfpRdEXz&_Tg&wKzjWxX5yse5 zuXL(&cBJKbzOJh3LkJs#ilTVHn){wjK=*9Rhw(sY7UPA`Bqjo(QA`vaistM08!ZDDPx#1ZP1_K>z@;j|==^1poj6aY;l$R47w@l3h!}P#DLpz^=OSwQaglOQ(oNMMO~_ z&l~Z^FW?)ZAS$TA6cOiz!ahMo8odx^)*98-NY-=Wks*itT|WOGXFLD%tl3uJ^?HSP zJbpQw&7L-JM&a>z_+&Dv@H{Ws?e;AkFXMK*{kdFjtSE}vZnr-qNjk#F0wiClR2mVf z*=*{;VDK0t3zy5qfpj|@4#`P+C=@!u$O0rbpU>ZPyIr%>>FAM2cl_0MoPe1?&Q!{OLYr_)!esuJld8jYS~v`i|MQt_X@;d2)_rdWrLHZ@JN8HVvQ zpU(}P(?GGlOeQmGwOW65z)k5o7Qj>ai^bxY+_+Y&>489iE_eZXGPu-Tzuzaa2J#_B zG-L@1g~Gio%Vwj|cnA3aBN~QbcB<9t1C&nWH&GP#F`{8vcDGzEKMn>1vr?(Nf*kvI xA3+w$nhAp7n@lFpD;JmJxV=OoAy22%mtQ9Fq*;^;j1K?+002ovPDHLkV1le;$cF#` literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-ar-xhdpi/icon_user_back.png b/app/src/main/res/drawable-ar-xhdpi/icon_user_back.png new file mode 100644 index 0000000000000000000000000000000000000000..77f0378189f50804f401abc81ef21152210379c0 GIT binary patch literal 283 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTCmUKs7M+SzC{oH>NS%G}U;vjb? zhIQv;UIIBsJzX3_GMwMu*v-piD8Lf%T7acPPJ@9nkVQyT;KDJ+yB{?>xqh5k*TyoD zL1?%3S?`){lO^5l%moF19&LDh{h2`{cfra&(K`>>tRED~N^fBDuYM55>ukaBd3TZO zu>z)NPx#1ZP1_K>z@;j|==^1poj6u1Q2eRA@u(nK4VlKorN5SS$@`p$^Sb5T&JqAhQG5_D{FNFJkCmv^YCC)xcDvo1 zG);$Gt6|iE)oS&gB*}5TUf)Me9XY2?EHpb|x(13Y%kEiX4-?uF#*4Tt%TJQHb0uLc z09;B~5df|vtO)=Y5>^F(wuE&7peZ3D0JJ2;1b~Kwr~r_b5ElTF5-I}VF9{kJ^ZC58 zM98BWbase)z20N9**rx}JKA708XYZ{%h&H4HpFNKr3P^_sVgefBfrx-scwk)s z;rspmukh39)OvVeRX{sDuqNOlJg_3*Dm*Y2&|I+VFxm@+VYp4GgZ-qvqaX=@mT`oNykH_<$2!b#26<~QH50m`>0000bp?B&GDVE>2EP3PNoaL7$F= zJmvi$Q@-IpB(<6lLI~jm*sKc%k6;qd_v045cTO9e7lHZXBs+GI5bb+K*oAeZjJ$(bU=hK^z`$St#Oh$=>FgYEf)U7NU_1dLS%6Zxc_l?b?oJ93 zkx>dDF&IcpE-rwvvCu$MzFlJgn{`fOr5g=P69m3WC zv6CQd8xXs^q@V<-CIG}P3JG!svQvO;jdUb-5)wPPpa`VC2dKs-H>VV27YKk{%#)fI z8Vsa4fLMm1m?4P4oxus=|NKP^3>IG*7?>v@#FAz*Fl=vSV34?l5K~#ez`)m$qafxmJu*g4H?XUG3@gLs8C=10H*-^!4O*>7H4^!@h2g=&+Q ztf*A_6Yb2MvUo+VvgX{xjej(CC;pZ+Wo%exDf6sKkm3E@Z~OImD*iosUoxfj{9Vaa z>W+si7pt6;*7jHBa`yb0oFvFMLm*(nK~Hz3PB)&31_pQBCN1%(Jb$L=@&4KWgY3Hm z|GHn;mb*;i;J0R=Lr4Z}&z;SUSFZ|Q_E7iQ3%Tq+)mCLnYgcDYGFZDR+dk#KcP8tZ hAhFP`-Z#zOC;wB~xZ$*O%Ky{1Oct`=`4?U91^`;XrK|t| diff --git a/app/src/main/res/drawable-xhdpi/icon_arrow_left_black.png b/app/src/main/res/drawable-xhdpi/icon_arrow_left_black.png new file mode 100644 index 0000000000000000000000000000000000000000..55203fc3cad6aa8e6b6251ecc896d5c7fd0a0d71 GIT binary patch literal 298 zcmV+_0oDGAP)8N%oB;^yosH$o#I1bJpM%$(TGSh6*DNX zRBJr*L9VlUtB>0AVUDZ%29CVo#i6^J^O6ULUTT3eUK|q*0WYT{L%{Loitgx`&HYh5#QM`M*M{LV%B*^ncYuDq?Vxe()&; z!SG9UkOx&kGmwg)8MKOmW)R2@ngPiQn!x~f&i_@%07*qoM6N<$g0HZ21poj5 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/icon_arrow_left_black.webp b/app/src/main/res/drawable-xhdpi/icon_arrow_left_black.webp deleted file mode 100644 index 4c456a735df24f5d37a436b03f4edcc06ad9daf5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 182 zcmWIYbaPwBz`zjh>J$(bU=hIuWD5YX5CelU1B0VafJXw5$9Q~!3Bv@lGi@$Wzk05A za0E=5rm*DEl<_A(HM^aH%Zf-Sce?_k^#?W@16ov24a6yU7vqp&_8vWIfvISa@t#2kis9}j)Vq#oMD{VmNc+MmpL3}u!xt(v$ z+(pXe@}=WAJ!n4&0#Qmy9LIWPJe^K;EC8Nct(K}(Do@z&g<)vGMG-sz^hy}}$9lcK zyXa~_+5Vj1*G6~4#&WCU3TCG@!AT6 zr_ONbBTt2bZsE8-9*;$mUNOK^r=3nmR}7asKpUoy{IGH)oW&SD=G163dT`xj2Mowj z0n+WjGzj(KoLYo5h@TlaeG)$;r&NA>t0h=|DX`iE0g@;&P|&4gf@g1F!?l5Ep@wr#)n&CNf!Tkj%;i2kc>+lFzJ z)#Z(P@+A7MxVW_ZI}V2?cwo0_!Y4M1CVF8tY2ptSgC-%&I!#JwX_bF8l!_mE`BeVJ zpq!r(>rrJaCrywOzu7f6&cdo=R!aa@P&goH0002c0|1=?DhdD+06vjAmq(?eA|Wsc z0I(7XX#fM_(f9JoZfAZj3_t+>@8hLVvVPJxeBQE?bo9_flw#SJTfq3hrq?hy<1Eq@ i?%N&HM;yQ+s4xmE1wa$|k)Lp)UdM*>@F!jX0002cH+t6q diff --git a/app/src/main/res/drawable-xhdpi/icon_user_back.png b/app/src/main/res/drawable-xhdpi/icon_user_back.png new file mode 100644 index 0000000000000000000000000000000000000000..9f0bd72b4f1b6fd063cde2bb0fe24920dbbe6549 GIT binary patch literal 370 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezr3(Fj{)LIEGZjUA9zSMf&CPv^qgIi`*rTVm?8@_Od4 zZW2&QscaWe$f<0<5c%R0-@?Top2|9@PXZF`o1V%Za=Qd1*ggTdixp2>x3C?aR?ac? zUhY3NVZHYPS~fTSUw?Rcw$GkD&MQ7-eEyz#lCNOCS^a%AJEnyPFDMI0@mez_HY>U- zf9^^4xRoA z+u5Pc0w3cGm){pUul>1Ok>jrD@2PRDaDPG=KbgxLGoN*|N>%~GlEKr}&t;ucLK6U+ CiIy_} literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/icon_user_back.webp b/app/src/main/res/drawable-xhdpi/icon_user_back.webp deleted file mode 100644 index dfd726df218da3127016b4f39a3d0eb35457b45c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 192 zcmWIYbaUImz`zjh>J$(bU=hIuWD5YXJ{URr1bCzad5p&wm@rH*JJaS8^{eM<2S>n^ zX$ngoP3i8C7nE1JabnxmC$lzBO8oDgx*~3AnBZUY8C%Zg+|b{X^SI~Q+)sUzG?&hK zVX{+h<}wR~&ym$vbR%V=|Hf6_*!4mCY$=E7?g>UaWiouV*NZa%U7(-^w9kN&+3xg)S8<8r!>-gEl)bZd5={0fA$)_JN zYuk2KGBhX+8k7bNN`nR|X_}_va5xbCYdw13P-svZG)T>Qz4oHFkA()Q*>1OETnRVB zZBMzCXb_7&qnfI!Ts#X0q1kLU_x+X7&qYWO4Pw#48i)K&XnQ2!u@5-q;if?>T3F+g z7xofxSxSJG{}AR9&~1mcCK>Rw2y?uK2fD87ZY?c8m4H!sfGaTN0Ixh4-a=YF zcff8S?vw{O`}m8swEVvWVA0iTHCrqe-Pu#`GTsN)vE4C1&qE@9lNYKI)0L~sk zf)+*qh>pN|dKL-^S_A}usED%$XguF0gCej$0k)(TI`)ToHTO|DvP-ije)EN(%t^71#Ziko_OBz6)94!_Gxr*Vn?`i6`I) z9WXTz^r3}fp#z>9Effnam=b(%0{UO9L$pvVbkNlF5o73EDi%6mYP7IM3&lbQOpO-S kXrWl>fT_{K8Z8vdH*DeoTr+-L!vFvP07*qoM6N<$f`SG5qyPW_ literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/icon_user_back_black.webp b/app/src/main/res/drawable-xhdpi/icon_user_back_black.webp deleted file mode 100644 index 0ac0dc4a199742591b886d3f6305b73b18eaa5c9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 262 zcmWIYbaVU1z`zjh>J$(bU=hIuWD5YXJ{URr1bCzad5p&wm@rH*JJaS8^{eM<2S>n^ zX$ngoP3i8C7nE1JabnxmC$lzBO8oDgx*~3AnBZUY8C%Zg+|b{X^SI~Q+)sUzG?&hK zVX{+h<}wR~&ym$vbR%V=|Hf6_*!4mCY$=E7?g>UaWiouV*NZa%U7%0^v@d{_VJ@SV z0fPa9-9(cmL8^#y`By@n`-|s0E z@5}%HDrfuuhOvHaXt??Rp9=H;T@tJhsxRRGFD!pGj$4QuQG diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/share/ShareModel.java b/core/src/main/java/com/yizhuan/xchat_android_core/share/ShareModel.java index a9838b2b7..413ea5d55 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/share/ShareModel.java +++ b/core/src/main/java/com/yizhuan/xchat_android_core/share/ShareModel.java @@ -80,7 +80,7 @@ public class ShareModel extends BaseModel implements IShareModel { sp.setImageUrl(webViewInfo.getImgUrl()); } String siteUrl = webViewInfo.getShowUrl(); - String params = "shareUid=" + AuthModel.get().getCurrentUid() + "&lang=" + Locale.getDefault().getLanguage(); + String params = "shareUid=" + AuthModel.get().getCurrentUid(); if (siteUrl.contains("?")) { if (siteUrl.endsWith("?")) { siteUrl += params; @@ -160,7 +160,7 @@ public class ShareModel extends BaseModel implements IShareModel { if (platform != null) { String name = platform.getName(); final String siteUrl = UriProvider.IM_SERVER_URL + XChatConstants.SHARE_ROOM_URL + - AuthModel.get().getCurrentUid() + "&uid=" + roomUid + "&room_name=" + + AuthModel.get().getCurrentUid() + "&lang=" + Locale.getDefault().getLanguage() + "&uid=" + roomUid + "&room_name=" + URLEncoder.encode(title, "utf8") + "&room_id=" + roomId + "&room_avatar=" + URLEncoder.encode(room_avatar, "utf8") + "&share_name=" + URLEncoder.encode(UserModel.get().getCacheLoginUserInfo().getNick(), "utf8"); diff --git a/nim_uikit/res/drawable-ar-xhdpi/nim_arrow_right.png b/nim_uikit/res/drawable-ar-xhdpi/nim_arrow_right.png new file mode 100644 index 0000000000000000000000000000000000000000..371232f8c4e6c2cab95223f395f78dea0e1b8229 GIT binary patch literal 540 zcmV+%0^|LOP)Px#1ZP1_K>z@;j|==^1poj6#z{m$R7gv;lvzu|KoG|_N0TNt38EIQ=aa8~1ASA} zPc4Xuh>CcCpcXt4-`b|Rn)sh~D6LI%JoE=)cP7h^&1PrBtWbC?i)>leo^9K^Ns=g0 z6n$}ih|FVQBuP>r+&2tk8)4Nn&7HxUaY~6HRUtjlG;M=Z!uS0ro{mvi45WG#q-EQ}$)9GAr zm`bJ?QWHBpRupBPQ^IxKOFUN`PGzbX(i%%0P6_Pt9J{^cFq2dTy6lTPuo z9yrV;^;Xc88j&WDo|KUig{~W_E9PloQcF4v!%tn;x9IL7lxQBuv5V6E9jwSFRg4{a zK@c=qt|KL(+BT8*A^#by%4TX4f+Ro@G^u>)E>jNkbqqax(Kp3eWOg@_gI5wlZcq*- zy-FkG6CG`o+_njM2>A;MAvY<9d4n1fO!)Qy0000U literal 0 HcmV?d00001 diff --git a/nim_uikit/res/drawable-xhdpi/nim_arrow_right.png b/nim_uikit/res/drawable-xhdpi/nim_arrow_right.png new file mode 100644 index 0000000000000000000000000000000000000000..d6c8f467e713c6c20e7235299bc2a6ea796a3320 GIT binary patch literal 446 zcmV;v0YUzWP)9HW)T&Ai6~-ZPTA%p2znE~kO(9q2qM~--^;yG^P%e+-E!}qPopLLLG+xT zXY+V;X0w^2TPzm2CX>m=WQ?7cLj`WP+oA9KpHUP&gke}i&bnHymNTEvvw73+sWTdl zobh;EggL0w=@5-Q&x`TAkLrl87b2dfX}0PlNtUZGz1y>vd0WY!li%L(ZVPQsym(O;AIVmvsGdfxY^Zu5B86O%SqT?!Hc5Cn# zbW#eoDcm*qD>|(LW>@G-;cw`?3Yc9Od{`BH`5*AL0_8rR{T043=yGQWtPi7Xd)ZdN zo;mrrz5}e$0cvQ} z!fY+fFrf!HR&XEHQ4ZCx+`?_}hk_qbjp#O*ZG>^id-!X5$HaRa1aD>sWEUAfx?@yf#?2*1G7Bk)&lgaw>MTZ4P4 zgd3P~7gYevrPixv<0>b$tETH$X#nbB-@w3pg6!4F;vWuHP&goV0001R1OS}@Di#11 z06vjEnn$IhqM{{1gM^)BsnN!OfAr8-tZ zlj3MUsos-x{jYTzKj){+alSwPf