From 70a2ff072ebc5b9fbf5020936e81f6e76c025b92 Mon Sep 17 00:00:00 2001
From: qiji4215 <qiji4215@navinfo.com>
Date: Thu, 4 May 2023 14:53:54 +0800
Subject: [PATCH 1/2] =?UTF-8?q?ui=E8=B5=84=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../EvaluationResultFragment.kt               |   2 --
 .../EvaluationResultViewModel.kt              |   2 ++
 .../res/drawable-xhdpi/icon_page_video_a1.png | Bin 18884 -> 4608 bytes
 .../drawable-xxhdpi/icon_page_video_a1.png    | Bin 18884 -> 8652 bytes
 app/src/main/res/layout/activity_main.xml     |   3 +++
 5 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultFragment.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultFragment.kt
index b62df455..8cd094eb 100644
--- a/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultFragment.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultFragment.kt
@@ -47,8 +47,6 @@ class EvaluationResultFragment : BaseFragment(), View.OnClickListener {
         viewModel.listDataChatMsgEntityList.observe(viewLifecycleOwner) {
             adapter.refreshData(it)
         }
-
-        viewModel.getChatMsgEntityList()
         return binding.root
     }
 
diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultViewModel.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultViewModel.kt
index 81da9cd8..f56eb40b 100644
--- a/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultViewModel.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultViewModel.kt
@@ -337,6 +337,8 @@ class EvaluationResultViewModel @Inject constructor(
                             }
                         }
                     }
+                    //显示语音界面布局
+                    getChatMsgEntityList()
                 }
             }
         }
diff --git a/app/src/main/res/drawable-xhdpi/icon_page_video_a1.png b/app/src/main/res/drawable-xhdpi/icon_page_video_a1.png
index 221c49a7a724d25095e1676e57ec17df967b21cb..b9efa62b77e365ba620dd45031fbbfe862840045 100644
GIT binary patch
literal 4608
zcmV+b694UqP)<h;3K|Lk000e1NJLTq003YB003YJ1^@s6;+S_h000rkNkl<ZcwX&Y
z3v?7!n*Q&t>aOl|cRCL`2?=0C1fA$8B04h5OmrM|aL|K@tT?zZ=-|SlFrbXefy9kE
z4_$FQjN|M$xZ(qhsI0>3jys0e41&O{V-^Gq8G=C4B&5@?>h7vrdu~-%zdK$12u(uQ
z@thd?KB~U&-tWJ4)A#=n6t27?fb!aVp>rq@kmo^AAfP}%o)O4%_xYLu5&cT%5(H=c
zW(JagVB2T?nQ}~M2%-UbkO3e-O5SEeW5j2xatu_q%{7J_Xjs(`*zzOfjEr0nfa30n
z-eMyKJPdRL0JOF?C+KrVw&-P8zd5d6bKQ&>a2o+ut&-x`i@6~p2L!~7czKj7pw9?_
ztpIGdw?y<;pCM=iRjnn|u+3H<Btao4OiCj_-0VPE&4z3Uh#vJp;FVFXj28v)dig)+
ziM_$TCV=-$Yc~B36a!!^t&;%u%I#aKCrBW3(gG?Wb#)-o=L3i(BJ<ghArKLxJ_dLd
zbmv$Kco=NIi<A4h7y!JLY=->~81{0*#!f*x9PC1G_Q@k#CB<@Rf~1ns4-sk4h75p+
z1Ya5Hiqy;iyB!b(-h0M?RKQ16vdHH?i2z2*kLKr@P@jPkdj|dIo&;U5Edsa`pf^-X
z03E=YhD*mg1^F{dh_RHHC=oUr4Z_V~X=;cJ%IQf`ngApM9}pe&&asvd@FTn|^4VDA
z=Q|NVH7r}CE4k*flF=59ROxk084!d+FfzFZG_4lJh|*Xh{(#uy^x;#xzvyjy=7m5n
zfI<jo7o_7xK?)P$l&CZ{*9F1Pkc4yy2y1?WI`X5z_t@=txQ#=8z7{QiptyMI4W_xQ
zPP&z4(6s=-rUgv?3k#wMyZ8Xv^6pmtmDOt;4!xmWI%)SwMK&8zW<xR(w8w-r2nde;
zpytnLrQlP^0p#d7f)%M@(LF!37Tr7D^b>OtT80oR%Ri3U-+?4aJsywr%<tB_UTXfR
z&&!zvS(>aP#}LaQkR?f(36a5Bn-pmzAQAXfcIrdmJG(jD^q8^YrfaMlF-BKq|JdhV
z3q*o_n|Gd>*7(b|)0Xmb5+<P~LXOfSK??y<(nABT-ENaL-_c=}M?MArw@v1eS6ya)
zA7expI)md91Q7S_2Xgo@NM0`h!vG#p1I)yUfJ#adJ_8|ecz>(&w)u~{j#<imK@uE9
zkt4e#zcYm5L24<|KtOo(H^3@+jo((f7t@tag~@~|_)~8;86KZw`H*GM#KC~P<nuw`
z)pZbfdn16u5r4}J1I)K4fqu~<z#~V*eJ+a9o~Bovx4gf}%~KM(+-^B0j6O4gq$@?K
z2#6W|itcyWTCvA&!sV83>@^th{?{)3wO)_s4hHZ^$8q47Ed%NA$5P*}UJv?59tPbH
zZ;dO<`^g_B{OG_#MxH0#&T>*@bCU{t9SOw)jk6#H0nyrD-_n9r>9Ls&*lp;+|M~Pc
zuDzg!{UZQ`mzJp?EiWZVR~PVeehgAiPg?!!AN?8VZoe(I4rx2){qD3ChxeQKGGce}
z#5z)uqL%u4qBS6EBmj`2{WIjzuS$;r^)XxD8}~7T;F`3aC{KmGbAAlu;KBIbF_v{-
z{QPqO8Vh1Ch5_T+mjRC*8}*4GO1tatICLW~6^p7ADYKwCHWnm(LrzVA1klh3NY#EC
zc$Lww!*8uBzH;0}#vOUWGp%j|A8ZDH(~}A7uy;-eZrM@@yty9y&;L4M8D`?uV0a<^
zvx7&xlV(2A_qmA=gl0h~7OaBcE^6{6X+H$0@}rJ^y7H+<4(<rHwmTTFVHE!KmGXzp
zMR;XeNaU%o_a_ekp(8xOrMqt)=<k~c{gFhg8JpjV3(77JX}EUIfoEwfaMW5wtB<}L
z&}C`diYVbM&`5yt#@l7HMafUg#<3r=ESi)jOf`2a_4b12mMKZgYb8Lx^rxVkac8s)
z39zGn`j=CpWynrK+Z5qooB;uG^3#QF=F4UIF%l>9mvv+Qh7gR>j6|LaiU$q=KX+c%
z1h6yj0&dCTsCFa?+OL~^<O(mgh>8sTjaWxk5Gq6Ru4xJxN-_h2@)IPWCAj*j=&<5m
zvjIE6!5G2F?Ab8-Btl@!6Rw)O75DA~e&N3)Ct&uEK)-N7N(o}8OaX4?idX`i6KA%K
z^nzEkf>kVW@uVxb8mh0aCt(6;wfI=jKLHJZ=pP_d0xW(f<Ln-XEd~}l!O48~*63c%
zDCDuAc<2!D_s&Ur2dJtFs0<13z6YeWH91kU?gssXi{d`N`mVMT3s^)aFAz)lm&B>J
zh;%tB6F^J%BSR?(ke8ozHsm}}k1YNc#;G5N4X64TH|CiA@7A8lBd(gemOLIM2KfES
zNvNp-$!_nrOp^Bj7(cDO)I@wDUsWtx{FH!t(Nf(a*;-QvVhscUveyCXY7MUc^&B<`
zeT<H9%qMFH2LTjye(@3zcYT_W06cy?7++ii!Uvndmt?6*D;8~f4^U-ATpQQVZ7&UA
zpUAV60A*{UqOOkET7$c!+0B4x0(!(g#-gjnI^r5s1c<x$0RP}a2?;<oHDGx9DG03J
z0K%3n3CplI-vnHv@)zOQOCi84Is+$28B;9goB(z6%?f>t+b~*Q0qG<?v;Fl^>Ally
z7L9=^$UnRs#O>SDZ`^1E<Lj>ht{$GS?&N!pl?9MrR8~T5!~w-()aG2aGhnC?Kx2V-
z-u)mQJ*u4qjKT2iuYkGkx}<dq1Zam7C<(qt9|!T%#PJ}iDXSF>Pdy3Dg#Q1&R3IP?
z0@R|y)~yhD{mq2i6Ub%*_SPw&yJr?4izQ|2=M4cqzXYFr>W1T|goL0l48Ztr7~slF
z3@JfV3rOAFK)z}Nx>b!VW<V7cz+8H%=K8eYc|kyTuLuhoPr=_$1X6-C?M4eMzrQ?X
zxm*=EF9=xri%!_NFTq}Y5)@Z090ou5jyYEt_uI~pBVcoj3)XMxgSHMoh$Q;iCyh5k
z(_$MG8RGu{*Zy??=C3*l4rg>Fa}kEiF6LmttWp?TtIs(pLyCa4@ASe;8xn6ZSuGgW
z{h}Hw%9DS`>%X?SpmELVgdiI^1TQ@?Jm(|~83KCyM7V9iaqtHupriKNR~dl`ewDP`
ziecLKi=nzA^%v}R?DfcU<qIfV@QywacJ5c?>)I=f@cd(yIh_SVhJe5P)eB3W?v%lK
za)}MT_bpS-fLigq9X|fE8}vE^+g`gMXYCHDRnP}5E@*mDk&iVit6)N1^5rC5k{<6=
zRzxEzb-?MP_Z7G9@xZn{9+-W*6>4jA@cZUo`2E|8wC&nZTOc420$K<VL`jYjZ-3Ya
zUgazNK(+nOTZ&=+%o1ROk~RIo<M4H-0P2#oK!AoZmx=%i{^F-P;j=IJgsokDnE_Tm
zRw<LPesdpe-s*x!?kk7O$8v=kpaFkKMF3rzuKo{Y1Ga9A9%fFl%K!hy`wlpGRQY4e
z;(scGf1FYr*Ii)-XkZ`}0dszKLI%2~l7%;(sR`*mjR&)qeJxAQB^T=9m7iA^2+)9c
zT#-}+OuD-r2mv{;E}T^wRe#MJXJFkX2QV05=bQ0CwlD)UFp`RZo97(^hl{|J@0wxd
zf?-iDKJlB=uw|<YtY!=!y&V5dnF0YhAV6Kq(^3B1qm^*YH<fS1?EYMNf1ukIH%>A^
z(?hm`1ZluKZ3+77m>*^@KOxHyy)GH8?CTtCQv$GF2e9_3YPe`r{C-bi254X;l?2fy
z{%4mPntpRS^bVjlOWy@nEEtyb?YTfejtHR5bae~x&L5rd#bKY^D&6UvaZ53jmn1*)
zS|A{Y1ZZfg5Cbv+Ns9z!(k`u2m;oA)+uO>+!Y5A2C6~@ElVv3r7u~{G)YJ+4|Bsiq
zxj$Z;+b?tvneAx$Mtkf04sdytWzKM0>b-w01krYT97;}tsn?s~@du*cA+)s7Uzs68
z0DZ`<yWQ~UbN0|uGh1*X>sQ%Wc)4kKzri|_{)Q9*6o3O?`Q*O|clAVO(#QmwaGfj0
zad6L6D_BgqKg>Dg2*?iVvtPSFz}d$<s>cEW1p@MnK%ToV%zy#`c}5`5-Ji7?KyyS4
z)+0&-$x)&sN;y3t)6XG2`yk8(muoJB>*u!H2KbO(OY|{Sp^tI*aLm4UY7Za;Rk?nm
z!PK54!SSo^XusT4rk;|FJf<4Vs+ipwv2cpA*n`@;-nj5jEITyw!)YA^f*|et)~us9
zBs!?AC1FR3bHa^?rYVa}RltFRae|TA@oMdJ2E*XUl%*BWbj$HPdHEmiZC`2uujosZ
zsvt!s#bnu1lvHK?<O-rkRX6-<)QuMm*KbVsriW7bwy(vhvz8y-7EacoWX?*Etb;yw
zT*j3C)73-}pyrATt%MxaxT4Od-}q$BUlD@%%yvTw<s{ES^?&-JgI9KS4D&m!5r?!R
zbH`<tEk!0vA*Ugnu!-gi@|aAxyqgOp?D*)V+S%o$_=WQT@3=?oK0_AWJimRNs{h^P
zK2k)}6xeCLpwxLHXoIO!mNh7GAW_OPDnp~Ii2l`|U;Hu4qASiP5(Gi|-@8_x_}+<Q
z-au0M3F&`EDa&GKK}^z)ZVuC=eLSbb|Mp1L=*bg`K0yeSZ_5txO9F6g|IBm!Pk(u;
z&EN}=sBBpplXR#MrJeyn8G_bkR3DKsS54e!JndwB9E&%-IP#`ZRm_`%A$?_*<AWSK
zCEk7eKX?2$=M#u`n3^doB5kG3E<tn#-AuD4Qi%%Im199TajTlT(rf6!7CnbOy<TS1
zi(@C(j^O@)5S+b3x>=%`PIXCwp7!IuxpzExavNt7h|}*QM!t+hr>u-iQIl}>qj3f#
z4#wf+t#<5on6S^lVKb-0evcckUUAWdlP4Hg>vU*xIuCcQmkk7@?K}4MEqUl)kG1KG
zOvL325RUf|lhsY^E?X#RtJdI~J^`T>k?I+sWKNf*$k8K{P-3wmpSuqmbsqfcv*RX@
zti%gAJ^Bs+XwMyRZZX08{L<ErQ)JD(%f8&{4HOa1R7`rEc1ZzW&6umEs*K%wkk>i=
z+M1-w9UX)tv3CH?qD!qxR1yU1aAa{guwcfB&IWT)DY~H^o9>@BY_i3O$FO=_p~FBu
z1>}B70&}Q*;Ez%01xX4J=n?#+%jrc&{{7v~?SE<^ZkOkbL`OaAB9hZ=C9LD5q=HW!
zHKKAxr|BV}k$~7(5cG@*rZQ7Vuw&|+L1RLxk41uoL4qG6F@TY|i2igTQNVJ4qCxqo
zTuL?)BDl5QOHMe#tSLA$ouT#^p8lH?7?wzk&Mdh+^e2&6J&{<aD4pR1iE2J|(x9><
zgCAV=ggj+5Chbl`g4CkX{xOlpJ?czQT{Ngsk4gkUIS7{C5E(K7MNR}@jasu(f^vea
z#zrW>YEdPDy#pAJMFQvrMpqmJy+i`&hA{A=q`GHBj{JD=Q%g?<1VjYnP&`oGlVVJK
zf_5g92<nt1@C>Se3JCamWRU6Xh{Q?oJA%JQA3M^BWd_BRWRI-g8l}&4l+%CLab;2$
zbOCD+CF-!GH$(#;=^v8~_%coD-+lB<P>tJUCncu^c}E-MHmNK{T3D%$N@43NC0&5P
zpU&VO(!c9uHCV&2APLF|eZ|r$-pVTEE7rzK7K>uu6Y>+w&_O9f0%B)^VqF-PBxN?x
zQq*NbB_r0rP4O0^m*Ov$zpF#;ntFz*_n;cOh0WY}`7_luDeNH@=cso!jNH`QjF<_s
zac8Wln_^?AIO@?WnT25;_+3ZxG7I$PF%m$0rran?!w3hxDD$?^E~kozHrJ%sftKxq
zC-jq~orIlJV~sq6CZ19LlKC6|^2iSPM$+FDQ_o04&$_x9K@Um#N$z|kvyh-zz!G=}
zN4Toe(qU&+`M3Ncp0xL{y=}CuZ6X&{8NRe7C)YC|radiY&gYtub1Wo5W9Ou%&a!A^
z4SYzr25u<!L&m^$I)E)_KiU)BT(&VFod*u~m9xQ<PTy&i4MB2NZuD#tkOm0nPtgJa
qdFHx6K!JcfBar9r3o{_k1pGgbG!`?`@UtNR0000<MNUMnLSTYmsi)!q

literal 18884
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

diff --git a/app/src/main/res/drawable-xxhdpi/icon_page_video_a1.png b/app/src/main/res/drawable-xxhdpi/icon_page_video_a1.png
index 221c49a7a724d25095e1676e57ec17df967b21cb..17427efe0a70fc7531585810c660d6ada951cfc0 100644
GIT binary patch
literal 8652
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

literal 18884
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

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 8b315075..a57f6be5 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -44,6 +44,7 @@
                 android:layout_marginTop="20dp"
                 android:onClick="@{()->mainActivity.openMenu()}"
                 android:src="@drawable/baseline_person_24"
+                android:background="@null"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
@@ -118,6 +119,7 @@
                 android:layout_marginTop="20dp"
                 android:onClick="@{()->mainActivity.openCamera()}"
                 android:src="@drawable/icon_page_video_a1"
+                android:background="@null"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
@@ -129,6 +131,7 @@
                 android:layout_marginTop="20dp"
                 android:onClick="@{()->mainActivity.openCamera()}"
                 android:src="@drawable/baseline_person_24"
+                android:background="@null"
                 android:visibility="gone"
                 app:layout_constraintRight_toRightOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />

From dfbdc1500fef5b7c31ed13bf7cc5d584dfc66de6 Mon Sep 17 00:00:00 2001
From: qiji4215 <qiji4215@navinfo.com>
Date: Thu, 4 May 2023 18:03:11 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/res/drawable-xhdpi/icon_add_data.png | Bin 0 -> 3730 bytes
 .../res/drawable-xhdpi/icon_add_voice.png     | Bin 0 -> 3928 bytes
 .../main/res/drawable-xhdpi/icon_delete.png   | Bin 0 -> 504 bytes
 .../main/res/drawable-xhdpi/icon_delete_p.png | Bin 0 -> 511 bytes
 .../main/res/drawable-xhdpi/icon_location.png | Bin 0 -> 5174 bytes
 .../res/drawable-xxhdpi/icon_add_data.png     | Bin 0 -> 4994 bytes
 .../res/drawable-xxhdpi/icon_add_voice.png    | Bin 0 -> 5227 bytes
 .../main/res/drawable-xxhdpi/icon_delete.png  | Bin 0 -> 504 bytes
 .../res/drawable-xxhdpi/icon_delete_p.png     | Bin 0 -> 511 bytes
 .../res/drawable-xxhdpi/icon_location.png     | Bin 0 -> 5894 bytes
 app/src/main/res/drawable/btn_delete_xml.xml  |   6 ++
 app/src/main/res/layout/activity_main.xml     |  60 ++++++++++--------
 .../res/layout/fragment_evaluation_result.xml |   8 +--
 app/src/main/res/menu/evaluation_bar_mean.xml |   2 +-
 app/src/main/res/values/colors.xml            |   1 +
 app/src/main/res/values/dimens.xml            |   1 +
 app/src/main/res/values/styles.xml            |   9 +++
 .../collect/library/map/NIMapView.java        |   2 +-
 .../src/main/res/drawable/map_zoom_bg_xml.xml |  10 +++
 .../src/main/res/layout/base_map_layout.xml   |   7 +-
 .../src/main/res/mipmap-hdpi/icon_zoom_in.png | Bin 232 -> 195 bytes
 .../main/res/mipmap-hdpi/icon_zoom_in_p.png   | Bin 274 -> 191 bytes
 .../main/res/mipmap-hdpi/icon_zoom_out.png    | Bin 246 -> 156 bytes
 .../main/res/mipmap-hdpi/icon_zoom_out_p.png  | Bin 289 -> 155 bytes
 .../src/main/res/values/dimens.xml            |   2 +-
 25 files changed, 72 insertions(+), 36 deletions(-)
 create mode 100644 app/src/main/res/drawable-xhdpi/icon_add_data.png
 create mode 100644 app/src/main/res/drawable-xhdpi/icon_add_voice.png
 create mode 100644 app/src/main/res/drawable-xhdpi/icon_delete.png
 create mode 100644 app/src/main/res/drawable-xhdpi/icon_delete_p.png
 create mode 100644 app/src/main/res/drawable-xhdpi/icon_location.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/icon_add_data.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/icon_add_voice.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/icon_delete.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/icon_delete_p.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/icon_location.png
 create mode 100644 app/src/main/res/drawable/btn_delete_xml.xml
 create mode 100644 collect-library/src/main/res/drawable/map_zoom_bg_xml.xml

diff --git a/app/src/main/res/drawable-xhdpi/icon_add_data.png b/app/src/main/res/drawable-xhdpi/icon_add_data.png
new file mode 100644
index 0000000000000000000000000000000000000000..5461259d08f7a59adbf058b43481e18a81d9db0d
GIT binary patch
literal 3730
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/icon_add_voice.png b/app/src/main/res/drawable-xhdpi/icon_add_voice.png
new file mode 100644
index 0000000000000000000000000000000000000000..82f24c24fa1d21fa17863dda2180b2456e953e6d
GIT binary patch
literal 3928
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/icon_delete.png b/app/src/main/res/drawable-xhdpi/icon_delete.png
new file mode 100644
index 0000000000000000000000000000000000000000..53f101e5af964389652c879124a1052354cecc57
GIT binary patch
literal 504
zcmV<U0SEqxP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0005MNkl<ZXhZE;
z(NV)N41G2O@Lk$F$^@_hWfR8}lnH<dU;@XRP&R-GD0eO0!seW&ccFw-cHHX~l)ogB
zPESv=6h+|3FLC7lg8>|xL1rK@u++K)pd#6@Lt~0aogd=88TizC>Vd};M+9(tX3SHH
z?nb9KfJITvgb>%kp!fcT;!IP1RF)Hp&TleV0St{H*;{JuH-H&HANqoBGliIeglKl=
z>`JMLlkz#iZZ;L^+|9t+SyB-nJ%EK$R}i8)r-cw>0OxfiKD_tyY+>%Q@BMUS?Q0SP
zO{JyQ_W<tdXAeVT!hN<Y)jsLmuE&MH4<Mx6i4dm&@SrTeb>&r2RNcDmU7rADWnj}`
zgG1Xrq3az3pj0BI$e4kIQ;ut3t5;NGG8ZvGZj_utoI-U3D93c$anC8lDa0v68HCpB
z!=2v)JPYwG)R9jAB87<M)G9^^(B2yv1K4K~Z*A$w<1UqzW(w_ECpK-8XQ7o+V<+W%
zrR@FO19>-dz!>Z8AEa{^18Yh4$pBhbAJpK+%0;mo1t545{)st23E(o;vo3iLyh*^u
u{xgdPkkjcLwirN;DE6_z4D^X!4&5)D{TEM1QUbyN0000<MNUMnLSTaE7U5q2

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/icon_delete_p.png b/app/src/main/res/drawable-xhdpi/icon_delete_p.png
new file mode 100644
index 0000000000000000000000000000000000000000..2ee67fa888b5eca7c956fb6c2505223a6dd4b76a
GIT binary patch
literal 511
zcmV<b0RaAqP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0005TNkl<ZXhZE;
zO;W;83{H@C>(&_oaiP+c-axzw-T+S^oIr0NHxX~3D^M3=!5PocB5__@W(rek-jCxj
zrrRc&eEIUe^rZ+}{@|A94+7w?859N-1J8Buju1OKY#`C#WEx-U_!QY%Gcay=T>!i>
zON6dkVSH=mn|fIT7}dQYBA%;YMD)N(CT|~1<2J`<lZ{gVtuSK68#jDf0u}%^^eNwb
z3kd@T)hzAVQLWm>O6A@lt}_=}EG~lCd}wrtw;sUDzIXOjfmEjvn+R}_s0YA15KWww
zxg`G10=mZ^@uLv~d8bjs?;*f-2B05=QO_j+)A%giPSoZ<08lN5NV^K~(QLjlm0xSs
zWLg)!vnh~M29^_6CA2;h%H9b8&SB)70b#&E<>U<H+fQ0ZTBt;hM1`_zWYLh5K_-JN
ztANO;$f(F@x^a{H008^W?euGuBgdO;IFr7}R{+>l-No95&p>X?NE$uL1-Q~eKdck;
zG5G-YpozZ!mN`#;V>1T;O%<P_=rH&M*5;25VEv1cTUlK@U3RqqsAQ6VVgwyPJk?FE
z)Sl=G5C*#c%(MYGP1->)0pOsBRw0A|tMWN;{sw=tOi#>MU_bx>002ovPDHLkV1f-a
B-fsW^

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/icon_location.png b/app/src/main/res/drawable-xhdpi/icon_location.png
new file mode 100644
index 0000000000000000000000000000000000000000..d8eaac08500400ed827df80969751979ad9b40d8
GIT binary patch
literal 5174
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/icon_add_data.png b/app/src/main/res/drawable-xxhdpi/icon_add_data.png
new file mode 100644
index 0000000000000000000000000000000000000000..bf9a8e896e7caf859781ead93df51251584a92d7
GIT binary patch
literal 4994
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
M07*qoM6N<$f}s_r^8f$<

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/icon_add_voice.png b/app/src/main/res/drawable-xxhdpi/icon_add_voice.png
new file mode 100644
index 0000000000000000000000000000000000000000..8aa8f5a665ef99548061f70df053d37f04d89018
GIT binary patch
literal 5227
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/icon_delete.png b/app/src/main/res/drawable-xxhdpi/icon_delete.png
new file mode 100644
index 0000000000000000000000000000000000000000..53f101e5af964389652c879124a1052354cecc57
GIT binary patch
literal 504
zcmV<U0SEqxP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0005MNkl<ZXhZE;
z(NV)N41G2O@Lk$F$^@_hWfR8}lnH<dU;@XRP&R-GD0eO0!seW&ccFw-cHHX~l)ogB
zPESv=6h+|3FLC7lg8>|xL1rK@u++K)pd#6@Lt~0aogd=88TizC>Vd};M+9(tX3SHH
z?nb9KfJITvgb>%kp!fcT;!IP1RF)Hp&TleV0St{H*;{JuH-H&HANqoBGliIeglKl=
z>`JMLlkz#iZZ;L^+|9t+SyB-nJ%EK$R}i8)r-cw>0OxfiKD_tyY+>%Q@BMUS?Q0SP
zO{JyQ_W<tdXAeVT!hN<Y)jsLmuE&MH4<Mx6i4dm&@SrTeb>&r2RNcDmU7rADWnj}`
zgG1Xrq3az3pj0BI$e4kIQ;ut3t5;NGG8ZvGZj_utoI-U3D93c$anC8lDa0v68HCpB
z!=2v)JPYwG)R9jAB87<M)G9^^(B2yv1K4K~Z*A$w<1UqzW(w_ECpK-8XQ7o+V<+W%
zrR@FO19>-dz!>Z8AEa{^18Yh4$pBhbAJpK+%0;mo1t545{)st23E(o;vo3iLyh*^u
u{xgdPkkjcLwirN;DE6_z4D^X!4&5)D{TEM1QUbyN0000<MNUMnLSTaE7U5q2

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/icon_delete_p.png b/app/src/main/res/drawable-xxhdpi/icon_delete_p.png
new file mode 100644
index 0000000000000000000000000000000000000000..2ee67fa888b5eca7c956fb6c2505223a6dd4b76a
GIT binary patch
literal 511
zcmV<b0RaAqP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0005TNkl<ZXhZE;
zO;W;83{H@C>(&_oaiP+c-axzw-T+S^oIr0NHxX~3D^M3=!5PocB5__@W(rek-jCxj
zrrRc&eEIUe^rZ+}{@|A94+7w?859N-1J8Buju1OKY#`C#WEx-U_!QY%Gcay=T>!i>
zON6dkVSH=mn|fIT7}dQYBA%;YMD)N(CT|~1<2J`<lZ{gVtuSK68#jDf0u}%^^eNwb
z3kd@T)hzAVQLWm>O6A@lt}_=}EG~lCd}wrtw;sUDzIXOjfmEjvn+R}_s0YA15KWww
zxg`G10=mZ^@uLv~d8bjs?;*f-2B05=QO_j+)A%giPSoZ<08lN5NV^K~(QLjlm0xSs
zWLg)!vnh~M29^_6CA2;h%H9b8&SB)70b#&E<>U<H+fQ0ZTBt;hM1`_zWYLh5K_-JN
ztANO;$f(F@x^a{H008^W?euGuBgdO;IFr7}R{+>l-No95&p>X?NE$uL1-Q~eKdck;
zG5G-YpozZ!mN`#;V>1T;O%<P_=rH&M*5;25VEv1cTUlK@U3RqqsAQ6VVgwyPJk?FE
z)Sl=G5C*#c%(MYGP1->)0pOsBRw0A|tMWN;{sw=tOi#>MU_bx>002ovPDHLkV1f-a
B-fsW^

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/icon_location.png b/app/src/main/res/drawable-xxhdpi/icon_location.png
new file mode 100644
index 0000000000000000000000000000000000000000..0105061ff0b1b5704cdeaeea580c5baaafef683b
GIT binary patch
literal 5894
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable/btn_delete_xml.xml b/app/src/main/res/drawable/btn_delete_xml.xml
new file mode 100644
index 00000000..22730a78
--- /dev/null
+++ b/app/src/main/res/drawable/btn_delete_xml.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:state_enabled="true" android:state_pressed="false" android:drawable="@drawable/icon_delete"/>
+    <item android:state_pressed="true" android:drawable="@drawable/icon_delete_p"/>
+	<item android:state_enabled="false" android:drawable="@drawable/icon_delete"/>
+</selector>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index a57f6be5..159693fb 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -56,36 +56,42 @@
                 app:layout_constraintLeft_toLeftOf="@id/main_activity_person_center"
                 app:layout_constraintTop_toBottomOf="@id/main_activity_person_center" />
 
-            <ImageButton
-                android:id="@+id/main_activity_location"
-                android:layout_width="48dp"
-                android:layout_height="48dp"
-                android:layout_marginLeft="20dp"
-                android:layout_marginBottom="80dp"
-                android:onClick="@{()->viewModel.onClickLocationButton()}"
-                android:src="@drawable/baseline_my_location_24"
+            <LinearLayout
+                android:orientation="vertical"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="8dp"
+                android:layout_marginBottom="108dp"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintLeft_toLeftOf="parent" />
+                app:layout_constraintRight_toRightOf="parent"
+                tools:ignore="MissingConstraints">
 
-            <ImageButton
-                android:id="@+id/main_activity_voice"
-                android:layout_width="48dp"
-                android:layout_height="48dp"
-                android:layout_marginRight="20dp"
-                android:layout_marginBottom="120dp"
-                android:src="@drawable/baseline_keyboard_voice_24"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintRight_toRightOf="parent" />
 
-            <ImageButton
-                android:id="@+id/main_activity_line"
-                android:layout_width="48dp"
-                android:layout_height="48dp"
-                android:layout_marginBottom="10dp"
-                android:onClick="@{()->mainActivity.voiceOnclick()}"
-                android:src="@drawable/baseline_keyboard_voice_24"
-                app:layout_constraintBottom_toTopOf="@id/main_activity_voice"
-                app:layout_constraintRight_toRightOf="@id/main_activity_voice" />
+                <ImageButton
+                    android:id="@+id/main_activity_voice"
+                    android:layout_width="48dp"
+                    android:layout_height="48dp"
+                    android:src="@drawable/icon_add_voice"
+                    android:background="@null" />
+
+                <ImageButton
+                    android:id="@+id/main_activity_line"
+                    android:layout_width="48dp"
+                    android:layout_height="48dp"
+                    android:onClick="@{()->mainActivity.voiceOnclick()}"
+                    android:src="@drawable/icon_add_data"
+                    android:background="@null" />
+
+                <ImageButton
+                    android:id="@+id/main_activity_location"
+                    android:layout_width="48dp"
+                    android:layout_height="48dp"
+                    android:onClick="@{()->viewModel.onClickLocationButton()}"
+                    android:src="@drawable/icon_location"
+                    android:background="@null" />
+
+            </LinearLayout>
+
 
             <fragment
                 android:id="@+id/main_activity_middle_fragment"
diff --git a/app/src/main/res/layout/fragment_evaluation_result.xml b/app/src/main/res/layout/fragment_evaluation_result.xml
index 3708a3de..4510aa7e 100644
--- a/app/src/main/res/layout/fragment_evaluation_result.xml
+++ b/app/src/main/res/layout/fragment_evaluation_result.xml
@@ -28,13 +28,12 @@
 
             <com.google.android.material.appbar.MaterialToolbar
                 android:id="@+id/evaluation_bar"
-                style="@style/Widget.MaterialComponents.Toolbar.Surface"
+                style="@style/card_title_font_default"
                 android:layout_width="match_parent"
                 android:layout_height="?attr/actionBarSize"
-                android:background="@color/default_blue"
+                android:background="@color/white"
                 app:menu="@menu/evaluation_bar_mean"
-                app:navigationIcon="@drawable/btn_back_xml"
-                app:title="测评结果" />
+                app:title="Mark" />
 
         </com.google.android.material.appbar.AppBarLayout>
 
@@ -128,6 +127,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    style="@style/card_title_font_default"
                     android:text="多媒体" />
 
                 <androidx.recyclerview.widget.RecyclerView
diff --git a/app/src/main/res/menu/evaluation_bar_mean.xml b/app/src/main/res/menu/evaluation_bar_mean.xml
index 16c99b49..0523ce75 100644
--- a/app/src/main/res/menu/evaluation_bar_mean.xml
+++ b/app/src/main/res/menu/evaluation_bar_mean.xml
@@ -5,7 +5,7 @@
     <item
         android:id="@+id/delete"
         android:contentDescription="删除数据"
-        android:icon="@drawable/baseline_delete_forever_24"
+        android:icon="@drawable/btn_delete_xml"
         android:title="删除"
         app:showAsAction="ifRoom" />
     <item
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 7f540798..35f0d323 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -162,6 +162,7 @@
     <color name="cv_gray_153">#999999</color>
     <color name="cvm_red">#FF3B30</color>
     <color name="btn_blue_solid">#108ee9</color>
+    <color name="titleColor">#2631DD</color>
     <!-- 一键连接对话框背景色 -->
     <color name="bg_gray2">#d1d1d1</color>
     <!-- 一键连接时间显示区域背景色 -->
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 7785420d..3e1d59f9 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -7,6 +7,7 @@
     <dimen name="nav_header_height">176dp</dimen>
     <dimen name="default_widget_padding">10dp</dimen>
     <dimen name="default_font_size" comment="默认字体大小，style中父最顶层">15sp</dimen>
+    <dimen name="card_title_font_size">24sp</dimen>
     <dimen name="card_title_font_2size">13sp</dimen>
     <dimen name="card_title_font_3size">10sp</dimen>
     <dimen name="one">1dp</dimen>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index d74b2586..b9c7b87f 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -23,6 +23,15 @@
         <item name="android:layout_height">wrap_content</item>
     </style>
 
+    <!-- 默认字体 -->
+    <style name="card_title_font_default">
+        <item name="android:gravity">center_vertical</item>
+        <item name="android:textSize">@dimen/card_title_font_size</item>
+        <item name="android:textColor">@color/titleColor</item>
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+    </style>
+
     <!-- 默认字体 -->
     <style name="content_font_default_size_13sp">
         <item name="android:gravity">center_vertical</item>
diff --git a/collect-library/src/main/java/com/navinfo/collect/library/map/NIMapView.java b/collect-library/src/main/java/com/navinfo/collect/library/map/NIMapView.java
index e9c64238..60840398 100644
--- a/collect-library/src/main/java/com/navinfo/collect/library/map/NIMapView.java
+++ b/collect-library/src/main/java/com/navinfo/collect/library/map/NIMapView.java
@@ -249,7 +249,7 @@ public final class NIMapView extends RelativeLayout {
 
         // 增加比例尺图层
         NaviMapScaleBar naviMapScaleBar = new NaviMapScaleBar(getVtmMap());
-        naviMapScaleBar.initScaleBarLayer(GLViewport.Position.BOTTOM_LEFT, 25, 60);
+        naviMapScaleBar.initScaleBarLayer(GLViewport.Position.BOTTOM_LEFT, 20, 84);
 
 //        if (gridLayer == null) {
 //            gridLayer = new TileGridLayer(getVtmMap());
diff --git a/collect-library/src/main/res/drawable/map_zoom_bg_xml.xml b/collect-library/src/main/res/drawable/map_zoom_bg_xml.xml
new file mode 100644
index 00000000..ff7015eb
--- /dev/null
+++ b/collect-library/src/main/res/drawable/map_zoom_bg_xml.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:width="72dp" android:height="155dp">
+        <shape android:shape="rectangle">
+            <stroke android:width="3px" android:color="#FFFFF0" />
+            <solid android:color="#FFFFFFFF" />
+            <corners android:radius="36dp" />
+        </shape>
+    </item>
+</selector>
diff --git a/collect-library/src/main/res/layout/base_map_layout.xml b/collect-library/src/main/res/layout/base_map_layout.xml
index 26ddc2eb..63c866f4 100644
--- a/collect-library/src/main/res/layout/base_map_layout.xml
+++ b/collect-library/src/main/res/layout/base_map_layout.xml
@@ -32,6 +32,9 @@
         android:layout_height="wrap_content"
         android:layout_alignParentRight="true"
         android:layout_alignParentBottom="true"
+        android:layout_marginRight="20dp"
+        android:layout_marginBottom="48dp"
+        android:background="@drawable/map_zoom_bg_xml"
         android:orientation="vertical"
         android:padding="@dimen/nimap_defalut_padding">
 
@@ -39,7 +42,7 @@
             android:id="@+id/navinfo_map_zoom_in"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:background="@drawable/bg_nimap_default_button"
+            android:background="@null"
             android:clickable="true"
             android:focusable="true"
             android:src="@drawable/icon_map_zoom_in" />
@@ -52,7 +55,7 @@
             android:id="@+id/navinfo_map_zoom_out"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:background="@drawable/bg_nimap_default_button"
+            android:background="@null"
             android:clickable="true"
             android:focusable="true"
             android:src="@drawable/icon_map_zoom_out" />
diff --git a/collect-library/src/main/res/mipmap-hdpi/icon_zoom_in.png b/collect-library/src/main/res/mipmap-hdpi/icon_zoom_in.png
index 3b1fe57865f1d89afaeb42d318efbf3f4bd89a9b..e1265264cd0aca431dd0a94fc969ae4f5015af48 100644
GIT binary patch
literal 195
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJE>9Q7kO=p;(=YNiC<r*8X4%yF
zD1fKcnlo>a@SKB3ScL5bgm{<L+>f38{UTdy|NLJO^10FmWxN6%^S5ZKM!F_!neFoM
zX6e!LF7d?%yb~BWCmi_CaU>@^pf+>e^EaIy9=jh49bGTcpmXo#LzB~b3XDQPlrj6j
sM?=O5Y1Mv;ON~QW=5^gYd-(w0m8pe_>%%O60bRx5>FVdQ&MBb@0O0OO)&Kwi

literal 232
zcmeAS@N?(olHy`uVBq!ia0vp^8bGYZ!3HF^eYq(Mq}F@7IEF;DzP)ykx7k3zC2+cf
z=9EX1E-_AdCUmLM`^Qd;zBv+ln=eJ3vO5|6L!nVkmH7ahj6?2o2D9$$*$jSlbMM8*
zR%hQ|RUU5M$$Vh<>TZWnmQ_jtqK&IKLjIO3Jf0SPG(Fhpe$i@+_1o@fWiidWCu;7+
zw5j}P@1K7GWe*hRXrD4IpS<6p`hezU=@n3ot_!r7LIqbaom#TKqP+BsdFr=!QU-Zm
cn{~f4{eRS*-)wZs7wB{bPgg&ebxsLQ0N$5eiU0rr

diff --git a/collect-library/src/main/res/mipmap-hdpi/icon_zoom_in_p.png b/collect-library/src/main/res/mipmap-hdpi/icon_zoom_in_p.png
index 5f3b276728eeab6b4cad750f35647bfbe64f1be8..c7ad1ed772574e2031b2012d408b1d25b658cd7e 100644
GIT binary patch
literal 191
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJHcuDFkO=qW6p4fb76-l=^W?H~
zeA&0>z=0DV{yR_Hp}14gGmwMh%icfyn|?S?w7B_f!dk(Uk1LqnoD)n~fW(hhhAlbQ
z)wjo}2i<3VvWt1C#<Fhaf5tI?0(9~iir-|!8b~oMR)i2ooEfedGJfTraH>p6TV;n)
jms3N?=?yF8OBom{KIbS_e~WJdx`@Hk)z4*}Q$iB}qH9Jq

literal 274
zcmeAS@N?(olHy`uVBq!ia0vp^8bGYZ!3HF^eYq(Mq;7h;IEF;DzMZy_x5a?R)tG6q
z0hjV!whfLxYKznyck*7kalMGQt3jE!PjBLf$#vQGu3cZJo@)4(%`8@3AaNj(p?mMQ
z?8(VxV#iq9FJ7uT(d3-Dp2LDC-LXKztJ<|LF5f$IeFsO8prfAB30Ib#9SYOax!>)M
z$-20|_{EgzvFoPkSj3d=jAG(zHhTA2Pj^z+%*>!$!QoLVqHkB;w&U8ic&WJZO4aS@
zS^c@wv=>~t{62xtWkNT?z!3e6v{~nh(w42<68>aW@G-q`?%#ehH=nL$6#TicS&%{c
QDbSM)p00i_>zopr08lS$TmS$7

diff --git a/collect-library/src/main/res/mipmap-hdpi/icon_zoom_out.png b/collect-library/src/main/res/mipmap-hdpi/icon_zoom_out.png
index 73581b300b14d420bba56b12c2801ffe95cc4f36..2cce2ea111b87bbecd461856b2582f0fa6abcbd9 100644
GIT binary patch
literal 156
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJWKS2zkO=p;S2yxDIPf@MjA(kt
zWtPCw*PC%e+|0sk!4AG93L9Hy&u2}t)$TfEWAvV%Nuhy(i9=z*uBS^j>h~?5;%~Y2
zUHN2_XeJl4{Dw2H*DJKe$ufPM)~xNoz{n!tz|hDqx<^dgw!}9BXdQ#6tDnm{r-UW|
D8SXKG

literal 246
zcmeAS@N?(olHy`uVBq!ia0vp^8X(NU1|)m_?Z^dEdp%toLn7SYPC3YV*g(X2Deo@N
zO^&;r+)uE{D&AZ$bAjYS>5|sGFWrikDm$igB(Xo4Y}oO?B7Vk-KO2hdBm(YE;JvjV
z%i-+qX0sJi0iWM3;9bRb<<Cwl2|;lNeFk%emvvu$GR^SlJN;nl!Hyqi3f!A>pWpS|
zcloiHf!E}-pV=qX@)>C6X*Im@@UuK1c0l;RR)r@XpC-Oda9pu}@%gW3Z#>{*j{C@$
exw-?JJ^TXSq%?E4Zsq}cgu&C*&t;ucLK6VVC}>0g

diff --git a/collect-library/src/main/res/mipmap-hdpi/icon_zoom_out_p.png b/collect-library/src/main/res/mipmap-hdpi/icon_zoom_out_p.png
index 5b3a2c4142db10ca8df7f01e8a9a1360bbe82d25..6ff2389a0ab22dba6bdec9cdfe04a086f670e161 100644
GIT binary patch
literal 155
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJBu^K|kO=p;S2yxD81T4U-0b0a
zlI=p^p?}^iTBllcHJY3b3S6(ze{k74l5eK^ncuDqECLP;j4VkfQ@xyT%lNO{`?AM0
zK2&hCa>J5Wycd4|4PTI6&SBEa9^Syf#GwEr<YgK~EQ+%}JOtXt;OXk;vd$@?2>@C-
BGgSZp

literal 289
zcmV++0p9+JP)<h;3K|Lk000e1NJLTq001Ze001Zm1^@s6jQ+T70002!Nkl<ZSV!%Y
zu@Qnm5JmSJ3IRnRsdgYO*nl^5U<ulRQ~-8h2ev>AflYvs<2nWgh{>@x%rUbU@BjPn
z-Jb(_e&BgN(ty$zQi4iQN<gaD4k|$@0jXX)s05`1r22Vvu()%C=c6Fv6og26ds{s-
zRUnimS>|7Dk6_ufHxN==W7qR9&@PLE>&Lej@X~bbdf7<7lUW7FVZgep2(%t)>P!aa
zY@dYXAYf6qn+51hgsrn}wnpIG#Npv@2W`Ekn4i}-GX)Xb9ZJxa*zdd&RDx0hQoVLi
n2}%h__1ZxtC?z1(d*8t~HDn_xd}wg300000NkvXXu0mjf*s^#n

diff --git a/collect-library/src/main/res/values/dimens.xml b/collect-library/src/main/res/values/dimens.xml
index e4187507..29624066 100644
--- a/collect-library/src/main/res/values/dimens.xml
+++ b/collect-library/src/main/res/values/dimens.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="nimap_defalut_padding">12dp</dimen>
+    <dimen name="nimap_defalut_padding">5dp</dimen>
 </resources>
\ No newline at end of file