From 1d1fe13ab4a1249276330b730e6eca1cfe3b1efc Mon Sep 17 00:00:00 2001 From: qiji4215 Date: Sat, 6 May 2023 16:01:51 +0800 Subject: [PATCH] merge code --- ...wable_bg_blue_frame_white_bg_4_radius.xml} | 4 ++-- .../res/layout/adapter_qs_record_list.xml | 2 +- .../layout/cv_card_voice_rcd_hint_window.xml | 2 +- .../src/main/res/mipmap-hdpi/marker.png | Bin 1300 -> 1357 bytes .../src/main/res/mipmap-hdpi/marker2.png | Bin 0 -> 659 bytes .../res/mipmap-xxhdpi/map_icon_report.png | Bin 1374 -> 2731 bytes 6 files changed, 4 insertions(+), 4 deletions(-) rename app/src/main/res/drawable/{drawable_bg_blue_frame_black_bg_4_radius.xml => drawable_bg_blue_frame_white_bg_4_radius.xml} (83%) create mode 100644 collect-library/src/main/res/mipmap-hdpi/marker2.png diff --git a/app/src/main/res/drawable/drawable_bg_blue_frame_black_bg_4_radius.xml b/app/src/main/res/drawable/drawable_bg_blue_frame_white_bg_4_radius.xml similarity index 83% rename from app/src/main/res/drawable/drawable_bg_blue_frame_black_bg_4_radius.xml rename to app/src/main/res/drawable/drawable_bg_blue_frame_white_bg_4_radius.xml index b722d9fb..b3143d0b 100644 --- a/app/src/main/res/drawable/drawable_bg_blue_frame_black_bg_4_radius.xml +++ b/app/src/main/res/drawable/drawable_bg_blue_frame_white_bg_4_radius.xml @@ -1,9 +1,9 @@ - + + android:color="@color/highFontColor" /> Wyp6vy9VOiJ#i-W0I3sk~@Gt?Hbh_6d@nAl3=uoFK{xqMX3W3F@36>Itf@M6`=2 z8_7Tyl{c0|$$G_5qARBmIgj&(WB_p~%y8cP_Yn*;cd7&J~b?a=56xKyWSq z;FM`{pJ3IUy7TvW!pa4Z0`twX`Vt5)0pN%U=F8y|K^2g_}dU7QI z=Kr9a`_|~-&uc^A#nnNzu=y4NlxnP91kf3KgIBf|u%e(S)`W*wi16H&;oJ8mg6pX_ zZP{=+aX?YLSsZ@M5QI%x_V3*3xilnkK=shS0zj3e3b?2{@`9G+!lHocbH5FUuO$s+ z-;3zYs1mf<^L9)S19ZIb&m2PKT7_RLr1Kj$=t&qN2B;o3f6pFw=#~KbNDys`5Y8|v zB=Osfo9vIg!PAU$A59YhbR7B@4xp-aSQi1jo4V8XuE4skybs$5@RD_709XOFZoHt& zo%iK<5kR%M{|ONvou!ftBZAN5(1orWDEGw`b`jxw-3=4ba9jyabjR-+XAEdlDgUZ# z2oZdkdeaMTI^NV)3eq#(wZOUm#kA5k22=~19eo#|+dFsG;KGT4tZS_5P&YOy7an^9 zqe|W!5XZd)o+wAL5^iP$=)3TTQx^_Y_Da2!YmF-dk)ua#-n`azwUtXJHy8|44YW}Q zv1%Uy^~8JNsK~S?GExvHy_-JC?FW2Je#2SdCmmIorh6km`bP`89eIIiqwEonde|f# zKwxfEbPK*~Vv zYyvR3bEhX+j~OwHO^R2=sYX^b&z?pKQbu#CS_0~gz2IEu$?qCd3;mA>sFe{Vs&`{R zoMJJGnFg-LaV@o$X_2VzVGM|S!j6=I)E>FP8;+9d3;#6`GJ4HsorBmmV?a?H%GRv! zFJRgF+xx4Z1Zs02R^3Y8yL`j+E($11b3W`)TZw@&h9Ap8dK7<%o z2HGD^aM!TrVo@y0_*o2R6E@Xj)x{n%nne}aR!=T~Y^unl`KGH_M)j zk+hI?Kv71^)=*0ZB-qj@9FV+<@=;GNF(`gIk}8t;a;!8lC^m%kx;Vvp>6S*}F7}`z zk%pRlOQSS^BpPaYswdYNB%`8y)l&!{6BXHNX_Usr9*!TnUx#g3ZnLFPIzU+(YDK80 z5Esj$qN3DOC?JlCY_~K@=VF{zNFFVX(gM;^QBkochL+1|KIsW1^^1yht>(k}sZ52)MY3Rh4Tqw}1z2b4m44`>g_%pvy*O5yh}WQT@lY~t`3 P00000NkvXXu0mjfXCrx~ literal 1300 zcmV+v1?&2WP)51Q-Uy0AQ_resd6iJ~BWpRUM8I++rj&hNN;LU`W77nBUgA0t7`4 z^q}y2vK9q!Xn5g25g!#Np=4dl+kD(7JBk(*z5MH3i`MO6_7LD9FG7uV((qav@fm;p<||lff1^ zi%|j&aQ*(y$HgEZ0|CrvyJ}3Q4Tcn#Y%mnI#=14s&7V~N}pV?e6Ux8O@9Pt7?q`iE6GRzGt>LR){UD60qOSoPwzW2@a_4n zc~0Vv?Sm~1+8ValUD_XWCCc@}_*aK1E=+5&P1Zq!w7tHW81@qR&9mj2LU5)hi`%lA zAtvwD(~g!C2%yP;)QpvZZ9e#5{YfJ01u%PVs{n|%TAFLmVyhA+MDyYO!NS z?Ny5*zr1@ndb1#Dmn<5j*ErIUgAYdR2Te^Lz5BZ1$)0?_FN5-?$;nqa(bjSeq#s1g z-~ZQ}y}$q^i=;P9Ew;Lo2s24rE#B7Od94;|-py)Yfbzzx6R$K5_{ei63D^(D1f`c> ze(G4-y0bY@i0w_26Mrvqq`BZTNpC;MN!(re^WuDvfhiP&&4j7O;r~+=F2tGkelWmX zZ1sb%ji9JuX5&x{njpt_QcM>cQDzd3l>WXp8Yr|j!=VAnjZ>fR_&_5;RQx+}BqY_w(YQd*1-hmUVPL7Q43q0000< KMNUMnLSTZRKWIDv diff --git a/collect-library/src/main/res/mipmap-hdpi/marker2.png b/collect-library/src/main/res/mipmap-hdpi/marker2.png new file mode 100644 index 0000000000000000000000000000000000000000..8e325a8af5c2564935ac208af8291f6444491c87 GIT binary patch literal 659 zcmV;E0&M+>P)`!%UvK$3#$|~t6mS^%<2308d^Ypcc@|j~9?tsB^x*qNo`Zsb7AG^p zm#{K9%_F<(m!FCM%!6q~^{oZm+Dcz{4;Ez~? zVdL_P8L7aeWJV>>M41mwW(58`^;Fj+xRnE27b5>0ptnWjHrZPXkX^9L-dcdG89r5xDy!p*BwUO(y* t@qFPfd(zC`YY9y6xCySb1197qn14FjCNSa!h=BkA002ovPDHLkV1l}?E@A)x literal 0 HcmV?d00001 diff --git a/collect-library/src/main/res/mipmap-xxhdpi/map_icon_report.png b/collect-library/src/main/res/mipmap-xxhdpi/map_icon_report.png index 556d762280fb4eb8120dfbac570f6e5c85961594..e9f19b5866d6846e61aac46fd32969a1794ed1b8 100644 GIT binary patch literal 2731 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 literal 1374 zcmV-k1)=(hP)7|+UPHhApG zd)Wm{7Ku7m<#kJHTC${W{qPbtJdo5?U)5J%Rd*vi)6eWX*hAZX%a#|2KXU{C$rA-Ge22 zR~3j#0L)%}b&M7c0q`(%jELR=V}0?rZTAuJ?8#}Gl1IJvmwzT@fs_K^^V}H%!l~l; z4G{I?&T)`{$btMUohG;<=Jv|eM5=kAX4h5-BsbFu(@7LKpjI4i2NhTTCFG*f7W zBWLYi7O9Wi0DPV!cYIHAe(+-Lj!Yfk0r+dj=_0^|0(OBw{k-*I3_$Q4k*mwGLV;^y zZnr1}0t$`*;g_d1X+lH;)B4Z?5OjHI4+*iO82Lyq!fcado9JhGlH ztC;|9o6ZFRbyZm;g07C|I)~Gq&zm;y9sPKH94y^I+Bb;+ZX2~z!rD;fIe2tg|C9A~ z5h?0?_?>8kU)z1K@J*yXXwy4bZLZ?$M*w{K-ahm!7^*xcq8nhWQF%p1-Xm$djxMF6PTtgqc~%hpb~9v@NKD<%~& znt`U%=gp;R0Ij8~m1|v)=1uzppS1{J&|bQ70!ReF7b|O2%|O|;xIZB!GXeNI%%{r# zF8~1QwU%s@tU_Wew%+rH)`pH$xzeRL{=CWz2zjsJ2cbeSMT<~KG?5+Wk3g=@%XHi- z0r(RvitTBfj$6g0$W^4;|H}-_8ls_{L4v$*0gx{POF(V*(%w;p6+DF>FPTGxSW`IAOHJwGUk;t8eU?Xx2M2jLFT}B_^ zb9?E^Bb<1qGsoPrS;$K}g}!ohAWinQb9$L96a`=!eJzCqjg&zuK8t5LDD@j?N-leC zdMFUqj&Lr6`W#V9-1pqe^W`lrs gO=ck-RnngS3lno#UXW4)F8}}l07*qoM6N<$g32z1#{d8T