From 7339f6ad1d912c8bcc25f5db5efbac7c9bff0eb1 Mon Sep 17 00:00:00 2001 From: md Date: Mon, 26 Jul 2021 10:07:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/navinfo/outdoor/api/Constant.java | 8 ++-- .../outdoor/fragment/GatherGetFragment.java | 2 + .../outdoor/fragment/TreasureFragment.java | 8 ++-- .../main/res/drawable/marker_charge_bg1.png | Bin 0 -> 2132 bytes .../main/res/drawable/marker_other_bg1.png | Bin 0 -> 1856 bytes app/src/main/res/drawable/marker_poi_bg1.png | Bin 0 -> 1895 bytes .../res/drawable/marker_poi_video_bg1.png | Bin 0 -> 2040 bytes app/src/main/res/drawable/marker_road_bg.png | Bin 1030 -> 1915 bytes .../main/res/layout/charging_pile_header.xml | 41 +++++----------- .../res/layout/charging_station_header.xml | 41 +++++----------- app/src/main/res/layout/poi_header.xml | 42 +++++------------ app/src/main/res/layout/poi_video_header.xml | 44 ++++++------------ app/src/main/res/layout/road_header.xml | 42 ++++++----------- 13 files changed, 74 insertions(+), 154 deletions(-) create mode 100644 app/src/main/res/drawable/marker_charge_bg1.png create mode 100644 app/src/main/res/drawable/marker_other_bg1.png create mode 100644 app/src/main/res/drawable/marker_poi_bg1.png create mode 100644 app/src/main/res/drawable/marker_poi_video_bg1.png diff --git a/app/src/main/java/com/navinfo/outdoor/api/Constant.java b/app/src/main/java/com/navinfo/outdoor/api/Constant.java index 3bc6bf7..df56833 100644 --- a/app/src/main/java/com/navinfo/outdoor/api/Constant.java +++ b/app/src/main/java/com/navinfo/outdoor/api/Constant.java @@ -97,10 +97,10 @@ public class Constant { public static LatLng markerLatlng; //marker 图标 - public static final BitmapDescriptor POI_ICON = BitmapDescriptorFactory.fromResource(R.drawable.marker_poi_bg); - public static BitmapDescriptor ROAD_ICON = BitmapDescriptorFactory.fromResource(R.drawable.marker_road_bg); - public static BitmapDescriptor STATION_ICON = BitmapDescriptorFactory.fromResource(R.drawable.marker_charge_bg); - public static BitmapDescriptor PLANAR_TASK_ICON = BitmapDescriptorFactory.fromResource(R.drawable.marker_other_bg); +// public static final BitmapDescriptor POI_ICON = BitmapDescriptorFactory.fromResource(R.drawable.marker_poi_bg); +// public static BitmapDescriptor ROAD_ICON = BitmapDescriptorFactory.fromResource(R.drawable.marker_road_bg); +// public static BitmapDescriptor STATION_ICON = BitmapDescriptorFactory.fromResource(R.drawable.marker_charge_bg); +// public static BitmapDescriptor PLANAR_TASK_ICON = BitmapDescriptorFactory.fromResource(R.drawable.marker_other_bg); public static JobSearchBean jobSearchBean;//数据 diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/GatherGetFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/GatherGetFragment.java index 3fd3764..e35a986 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/GatherGetFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/GatherGetFragment.java @@ -526,10 +526,12 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe getActivity().runOnUiThread(new Runnable() { @Override public void run() { +// onBackPressed(); // poiEntity.setTaskStatus(3); // initViewByTaskStatus(3); btnGather.setVisibility(View.GONE); btnFinishGather.setVisibility(View.VISIBLE); + } }); } diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java index ac05a08..971cb6e 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java @@ -373,7 +373,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen } switch (Integer.valueOf(list.get(i).getType())) { case 1://poi - BitmapDescriptor poiDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_poi_bg); + BitmapDescriptor poiDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_poi_bg1); Marker poiMarker = tencentMap.addMarker(new MarkerOptions(latLng).icon(poiDescriptor).alpha(0.9f) .flat(true) .clockwise(false)); @@ -382,7 +382,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen poiMarker.setClickable(true); break; case 2://充电站 - BitmapDescriptor chargeDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_charge_bg); + BitmapDescriptor chargeDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_charge_bg1); Marker stationMarker = tencentMap.addMarker(new MarkerOptions(latLng).icon(chargeDescriptor).alpha(0.9f) .flat(true) .clockwise(false)); @@ -391,7 +391,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen stationMarker.setClickable(true); break; case 3://poi录像 - BitmapDescriptor poiVideoDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.poi_video_bg); + BitmapDescriptor poiVideoDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_poi_video_bg1); Marker poiVideoMarker = tencentMap.addMarker(new MarkerOptions(latLng).icon(poiVideoDescriptor).alpha(0.9f) .flat(true) .clockwise(false)); @@ -409,7 +409,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen roadMarker.setClickable(true); break; case 5://其他 - BitmapDescriptor otherDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_other_bg); + BitmapDescriptor otherDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_other_bg1); Marker otherMarker = tencentMap.addMarker(new MarkerOptions(latLng).icon(otherDescriptor).alpha(0.9f) .flat(true) .clockwise(false)); diff --git a/app/src/main/res/drawable/marker_charge_bg1.png b/app/src/main/res/drawable/marker_charge_bg1.png new file mode 100644 index 0000000000000000000000000000000000000000..44560d8ed747991946e21c639d4f3ea855c1c59d GIT binary patch literal 2132 zcmV-a2&?yrP)Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91AfN*P1ONa40RR91DF6Tf0HKxuf&c&qzDYzuR9FeE7->wDS8(<|Sa!J< z6!BP)MesmD)LKimRIRmX<3UfGG#&-(RimI-#I`n3(I&0EVyp*hG}vl2*8a05RuI!- zy`myipo*d(!h-C*+nMM0aF^~b3+*Jc^S<}y`expnH{XgNNN~H|Vq_Hw$j6@2ZhUYd z5_OA2A{zGyq|h&*QEpIzOfp1;fO4c#L~?|Hj5!c(h*kmZNS%n}3_0Z!{5l}KF&QSK z8blqU7BLi2jY#vfPC$mpa3^9rqDjCGq!vV{zli+H0pYFb&FC%3U?gJnBip0c6ZcM} zUv9lP`mXt2yv1qJnw@5H3{(+ zScc}De}8j>xnVpRRY(+7dPUUfFj<8AW_#6pHdkh|iF#Uim~pnA~OZ!^B#k3zH=`{!2XuCHmY9*5&TL6X*Z>YKFh z)}rtRh8Sa^FnBUsfX(LJ>+M0(UW$@dBvojI-Bcp1G8m2@~fhjRBfWu{ntmrH_e7h8| zLVEE9^U!R4n1p=HHqWaFORGMR@S^xdkQMVHbUHd=eB=bc;|PT*>jR1ST|-+@xX4Z* zcfgGb>5}mYQ)8yWxXAHVwtLPaSX;F{?gEW5B2 zYC38Hrbn|7Xl6(Ym?SiXk?+}nO``0?a`o{gFWEB;&oSKF@o8ZzSj0PPUkr~TLH!gIwW5nd;0EGp?UNpR@ zY+l8@osE`zxn7#^;Zo~Gwh{M^D*#co#Pu)$RJ+fkHUL>sRw z^qiB`WB$M?Iw7s>tkiF)+)#$c&cNqAsUgI`N^z65i4`C^cAhXoHxf7M6;Mi*e{D_M z_FS?$xrrj-$wOm)3cAlb)79yZMu&}FNm1#(NYAy8YvJ^R)9f^KH%{wh9Cy8Ij4o|C z8gIcVuh0_@flmhnqxR26es(Hap)YyD+WTL8j>uYmX)cI zsq{7EGxVI<=O*NfM1`ZMezW4uoz0e}H$2z;jiZ&(B?l)QT88VL=uAKd{6@e-IZMTS z!~6ogTYKQ&+hSB+#P+JQdSorZo=JCanpijM6kJB6Ss|4f(u2LjB40 zm;x>+q$1??^6dRBww714YVV!i3q33cvMu0OSrBs;T8vJ%1wp6sayZ}Sr zm}6K>Hyyj@y%qyJ1nmG%#jF9dZYPEs3%lzau1m?A+;4It&Ic8GE+2FXxPXuf&7AUC zrENCTbefNlM;{o$(>I=&cfw^nP|ib{@_Jwd+0f z^nHj?ps#BA?DE+QvdgmP(wOG@qOsR0;6~6O$#VICf5mYbU-TbA&f0WhYWWKQ0000< KMNUMnLSTZ+>F&}1 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/marker_other_bg1.png b/app/src/main/res/drawable/marker_other_bg1.png new file mode 100644 index 0000000000000000000000000000000000000000..16665b45373f092c00e5ee16b0c7ddd2db4731b5 GIT binary patch literal 1856 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 Ba3uf$ literal 1030 zcmV+h1o``kP)Px#1ZP1_K>z@;j|==^1poj8ut`KgR5(v{Q(bHnRTMt=&UB{R-EP~pU0N)}nxMrW zs5~eU#IB~Am=ZvfqRC1WV`5);F&d)}>Vt_fCMYjPB3dBPHey#HE7nB$3o%fkLfcJg zp&_zcT6Tfi-R|tn&d>GS+v$?h`Xy)1&N<(A&(EDDa2I?{53j3Px1-yC-;)u!I^4*N zoK{SoKa>6Ehkdz;PptDJ-v*;X={^!v-*C#zwF9Y};fPv$v26 zP~Y*<9^XS-w{u~IOo02wz= zul+uxV6Tb{prE)CeXP4d9CYzo39`BayZ_8Xu>??Z&}_z%2ew71e{J+FLL^G~jQHSV z)&~eQVXOO2&q8xZhGXLfxHve)QFtCb3AVlR231yWi15k9@Cfd;A_KkT!qcl%I69(3 zcY6@(s!+l6f=Ix(;_(fX2AZ1rI{8L9xVN#jlUVJE78Tl7s8Hjhus3>-SRUg9d{BQw zBV|s>Dq5|NKZFTYlJv& zxZ-fmEsVtvQGK}gTUXDd*DROdn`kY3u{{LoSr^`qY0$Md1F<1pROdK+p$Hc4!^)9%w8P_(l!dGa^$g;|;L z5y>?y+Wgcrj!Ou3RbI@Mv;*;B1Nw&y&@IMhkAM75ek68~>x7uYObworm}!%HH%1ul zS#00i!~8zXk=~x$Cq8}8liU$=n90FY6`_{ZEY$kQeC7EA+*_9~X}|2;!d%<(=;aTq z3|bki3q+44plVqof1e{TX7s-lF_ULch*u8_DswQ~G)O6*XDgrEj0Ht?HW`l<&wc&b z9ODjfr;A}Ge*BIUrc!flGiDC%`NT^tz>;D - - - - - - - + - - - - - - - + - - - - - - - - + - + android:layout_height="wrap_content"> - - - - + app:layout_constraintTop_toTopOf="parent" /> + + - - - - - - - + /> +