From d1fba662b4c707919f9b0cd6c2c512f4268b60f1 Mon Sep 17 00:00:00 2001 From: qiji4215 Date: Sat, 6 May 2023 17:23:49 +0800 Subject: [PATCH] merge code --- .../library/map/handler/MarkHandler.kt | 2 +- .../src/main/res/mipmap-hdpi/marker.png | Bin 1653 -> 3331 bytes .../src/main/res/mipmap-hdpi/marker2.png | Bin 590 -> 1220 bytes .../res/mipmap-xxhdpi/map_icon_report.png | Bin 2731 -> 2313 bytes 4 files changed, 1 insertion(+), 1 deletion(-) diff --git a/collect-library/src/main/java/com/navinfo/collect/library/map/handler/MarkHandler.kt b/collect-library/src/main/java/com/navinfo/collect/library/map/handler/MarkHandler.kt index ca1e6a63..bc2f46e2 100644 --- a/collect-library/src/main/java/com/navinfo/collect/library/map/handler/MarkHandler.kt +++ b/collect-library/src/main/java/com/navinfo/collect/library/map/handler/MarkHandler.kt @@ -57,7 +57,7 @@ class MarkHandler(context: AppCompatActivity, mapView: NIMapView) : private lateinit var canvas: org.oscim.backend.canvas.Canvas private lateinit var itemizedLayer: MyItemizedLayer private lateinit var markerRendererFactory: MarkerRendererFactory - private var resId = R.mipmap.map_icon_point_add + private var resId = R.mipmap.map_icon_report private var itemListener: OnQsRecordItemClickListener? = null /** diff --git a/collect-library/src/main/res/mipmap-hdpi/marker.png b/collect-library/src/main/res/mipmap-hdpi/marker.png index 74f7edd6775fa66a4056dd5d2687e6f2b6040f8a..0f17894d23528c4e491050a22d7e4046cdd55a14 100644 GIT binary patch literal 3331 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 N002ovPDHLkV1gL`e-i)z literal 1653 zcmV-*28#KKP)FAjuPeWYm0`6uj)kfcIQ_ zM9;;yy47(FAf=j*gRseMVc+r?B``11^NEk#Xu1N>6w54CK%S3 z#h;0AWw0%HQ)l3?k<;!FRS^b|jGD_yf$Q~F)Q}%>#bRmZmafL5B3j}A)Qo+f|B#4i z2x3<2IcYX`D;kY~&NVlP4hn;dt(MYGuec(;D51zv`4F2q3$X6yEG4 z7N&83XMmbrM8qG5sX-?%47%6I#Xoh56Pf`n6Fa7rs*5L`#KJVL^i-*BztrcQJP84? zMN+ES4Z?UQ!7z+7^ACoVm@48$0zhUbh?a_oj(7~Sp<9WRh!0@^&C%?Atgx$%M-d~w z#`IyKen#6PqA3i(7E7v`Kf|^cIJ8M-{>!iuSBW%l$H)PQnVSh%DJnifacz1|6ZR+v zU~;;FB8v3Zb45XvP_O5;uSIK00T@^fz5(Gj(E=5XV;s^gZI(<;X#h>pOtYd;n@o{P z#WHAxk&C}4Q%@Q|3p%PxYT+fmF=H&to#(qen-HKZhrw!dCY0u zO3d}5;R!%_7O3VjB7ES*gxg%^$ZW%!bI@(R>s4TA!K7-YiIDJO#6|A=dQMyJBJZLU z&ojVQTQMnJ7m3h8B8qr5B$97`RtqXkGfp?26^S1%#uor~fs~rr2%=W6hD7qYM2{Nz zxc#ky=fgJuP2<0+RcfkE0El{aHJpGC7rqPSeFIRwAjYyw2)rvW0L(=$@GVAnqi-9u zz5?h!70k~-xF-+@Olx&3{(_&{z5{4cJErte;RJz3`)Snvbl$KMxB98++cG%Rl;6(@ z%wUvCnsKIa|NjC&{~e-vm_Rf9FwD%G3@Z`H3gi1JFxaqtZ%|dG9PtXke#uc&sGTA6 z?Vn7|zyOplh_TGG0KF(<=)zcg>NC;Y_FO#UR>LVTPyqc)Vp#RU*y+{6gvBEeu#u|6$8@Q>*&*nt5Mg&0rsbJm>!slR|Drd0eGF#zR@qMB(1<7|6AvAyD*4;1_tJMjEaq2~}d00000NkvXXu0mjf##|7= diff --git a/collect-library/src/main/res/mipmap-hdpi/marker2.png b/collect-library/src/main/res/mipmap-hdpi/marker2.png index c89af5736c3109e58a24ab42a4afb733e54e26d7..514d3fe5c83d494a44618897ad65b86ead4c2fdb 100644 GIT binary patch literal 1220 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