From ddb820f8d21eed0bee584ce9f227f9b7f3cff660 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=93=88=E5=93=88=E5=93=88?= Date: Fri, 6 Aug 2021 18:57:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/image/2x/icon_map_marker.png | Bin 4055 -> 5637 bytes assets/image/icon_map_marker.png | Bin 1871 -> 5637 bytes ios/Podfile.lock | 10 + ios/Runner.xcodeproj/project.pbxproj | 18 +- ios/Runner/{AppDelegate.m => AppDelegate.mm} | 0 ios/Runner/test.swift | 12 + lib/address/address_map_page.dart | 241 ++++++++---- lib/main.dart | 2 +- lib/main_page.dart | 7 +- lib/order/store_selector_page.dart | 18 +- lib/union/union_page.dart | 364 +++++++++---------- pubspec.lock | 15 +- pubspec.yaml | 2 +- 13 files changed, 389 insertions(+), 300 deletions(-) rename ios/Runner/{AppDelegate.m => AppDelegate.mm} (100%) create mode 100644 ios/Runner/test.swift diff --git a/assets/image/2x/icon_map_marker.png b/assets/image/2x/icon_map_marker.png index ab786207d9add6f540fb819993fae0695a9fb4da..01d2531993fc06d88e4b7770a78c8fb75f845f95 100644 GIT binary patch literal 5637 zcma)AML-k`uwGn{W)Y;jQIT4@ySqa=m+tPCF6r)OX;=hQ8tLxtMoMaV{+IWz@9@p{ z&CGY0xy)g{swhcgq7kD3002x`840z2?D8K_-u{aTYvKO?2*FiNS`1J(PI~k&k+9H_ zwNz9DeEg?T00@x~0OEg^e<1z`003Bk0091Dg#T&M3z;l$9 z5Y_NPI5R-^!kcR`^xfax-OWuzrozTqH+~;ZD^U7ad8>-oLapijMMbr~wzcKH=)?T$rQWV{^L8y9Ot?Q2r3T3MFFB*Ylks$1$>zo`g_}(a#;U3#1+0}Ai zAo=3-VkL8UG@zynzGPe9a+k#`(eQppBo@eq)yISV{}9G$z+ZO2q$;E5r>C9M#^j=5 zxvG!yx>Zcd*jX+gK5$6krbY&1QsGoe=;cU>;g|4U1>(XTsYN554L@_(*H?Yb<>M;?*Lw1JL6wNJQ3(z;u{BKF^HP{);p$m?e4e#p?&nwj{~QaB|w zdK|}^6xL)FwEW&kx$=3?sP4nEC&KDpfLz4mA1#@EhVa1` z@BX56;>%O(!t+U)CskDQqvJ>yI?n?;P0b#J23}lX3^zLu`iWantxM*i``ng}KHL4n z4t}e>thy@lZmRZqcB##=G8;^G2sJHs8YY#alG=?;JMs~q>GcQ9a;)t=nTS~IxZg`2 zl|#Z`Zq1qQI1}0ZNc>;;1#f_p2VtjwbtN^G$i7J$eh6uf^2=gB&pV3N7pP9U!&Je= z2abwVi;)a+-8&^$~h5$;V9ZSUkK7pB)S~YOW3c=`#PBR*(MuM8e3cg`^quTP-8S zJ2o!=+pbVV*&Y>*Gb*aE-soV7c1)ro4;)#S0Qgxyp1Y%iJr=j1Nq&;Lkw1@S=^cRy z$vT!O@tU0CrFDhzp^xU`zBaRt2h-o<0oyQlDZ`G(Li4u42Q$SP{5KNC%$z&LnEr}+ zgh*l)M7&KbFE@YnSGG1VmC;sW8P{C`zv!2ruw@W{jIEuwhzuosk|-??mMk8g1ooX& zvB@b5b4Pr?QHbWi`QN4y*8P-(QXuEFZlv9P6lR(k`SojOGG@M!9U`|@rH`li!qVQJ zLNm1L@B33WA-L|`Wc(9o~a{~WA8IKG|>c7-p?=tO(h+1 zDoG4`?M>QjFSpbtA+v`Rfa|pWR777nY)#^3wIjvfc^1@0O7ulw3_(~vf7CFCkX3Zg zG9qu&l8h01d>A7O)GwshvYm2?Ed8(+ab^_Dceg5R?( zSW%ZDO-ojeuoKTnjMhopmc&Jun#!)H<0)P!0mIF*F9ml@qts+^si&HfX@n3>d`Kl3 zxwbVqghKBx+t>6n4i38PjEJqu(BV?p(HfA%PY%huYDy=e^IGdPRRA}7EjbbJ0GIQ3 z?!gsrLFQep+is+tdXA|BMuk>XU9k!pbSGow)zZ{(8(4^WQy0E|-(`B7FIj>3toJwX zCNJISo)N&>ITsxT5QlT7W3ajmMa>@u++>0zzW;WwDpF*}RRy#8aww9iNz~?^-K@5@ zG+)mmgg%3HFy*)5WqLkkE|`|)%=3qKux_W1wUv*3?GlsL(N3}pAw_s^EC1+^xr}Ya z&v_29KBvEt=(WFI_PVaf+=VVdly|7A9Qd|90fpVpHML2tTpA~9U(|V!PTZ0+nRhgB zgqidVEOpc#PF7i)UO2rfXza1Lq6Qy3DTdq)Q{-G(ij?{l^B2xIXvW_h)h)2sY}(aq zpbk%p(oDNR{Pr&mf8Tqn&q&e1Y#ooAz9b?sAvIQ` z#rFn1Q{Jdks-c4D&IG)Jj`fvQ(VF)m;>`4&cGKZiRoA*My1exA!3yL_T;%9JNknhd zcT%kPp2{oM}jbUZ_SXkRo2i5@p#WVGm+Wf++vM^M`_S{<$w+bPkgECUcQ_m|5N{g**gmJhEo7Rs^k9Mb2vm+Kgj^%61G#8WkVLgC{EI#VqS>Wy z)c6YYbuZCJQ7X)X!kK`7M$++lMOGzbsC!LFP{1YiaXDoqa1tojxkC-A6Ja6CK+)}v zI3BE|9W|Pe1%X}-C-M{9ghI2kp{Dxm-`3d={AycKu)cde=s__!V(QyNiaTh8pS9at zOG@4}eJwI_&>qUpEdJ^ z#8QwGibqCTpu=jU(u}0Eq?)E8OtevHohP1-R3)F{<4d1Vt`t`S z+H?dVGR_urGCf}L%9zgq{j1IZo-VFrRRSSeT3t>F#+vHdWIz`2vXYU?OFd`yQE!%u z!LxzWOdk@@o#-v^)$sC%Cw1N@d4}a|w*$ZoKjF9^7&So<2$5~XkO{JuJMT9;+v$?R zw{R%6qLa4b%^(}z9bk^a1*b2#HN_*uG7MHV=#;f=AB}K}zXuLwnS^{^=Lj90oYFSn zpP!PL9O`7nsHmhxbVIZKx4Rf$CiStGFAd>N(QZ2;amZP*v6@;=s7p%7z4$IYW)bZT zfdVnwvR7!f=qUshrR;Oq4@BkWd@LrQ8ZPy^G6jNxklQ{X;Y>+3MUxwWfiVdp)B1jF zXLMf9Eg+8UeY*-_cvR@C6xqDm5*eY)_FBg8cMXZA%9Elsy!sR}Eruf!Td`p}?hbMz(J%)0*W4Z5XZqE&FDVF>1-t$T{`QR)K+2X80AKyGJ07|xcuCpghL7^vwf zcB6}m)c)MEIAWTABJG3)^{}Nk>EJ$SzCBuH2R%>LE5i|%Ico$O(3)Nq$PCiJSyCkj zTRah1n}L>E_iLb5XB;Y}p5#Cx|G;B0Q|V6R2;P{H)m??fKM&$FaH z=6}dIKG)0C_cqxbC&nDolJ4Br#$BEnR#-bPO3R+}JSIS582PDkTk|T)j2sR8^Wu(H zlz$wEam>AXuS~pQ-jEkP3Hok7O>@Xlncn^Qz5giznW~Q79RGM6V(IZ#Akc39Qo$lA z4e49HXg4~wv*^?o%GiYk&LuPRo$A<+%uQviI=M~3j-(g=_LKncjC&ujLh#rhkU{0^J zkRUAXtr@;>SbI)&gmT1ruw#=~j?WFL?c}Mdi-`E155_r{1ln`eA7vOpl)X|DD)Uc8 zl%yPoRS@`lG$u*GAIi=jcb@A`QIDl0I6h?x~KH)SHcY)57-{ zl*+M3`POUXl+s>BYCv>}2+_WU!!xALJi~s*&VT*LI6)n)6{H)}$~Y(ITm=d6hBVko z`3T5;B3`?&Up!1AICDk6@0d$isEcBt;5DP-L^dGXe&se$#F}QOw3j8a`gs$WRU%z~ z-plZI?&NXl;SQ|-aKk^KSlIBF2Aw?*T?t~b7 z<~8OpGtgnn7jo3y)|iGcoQqOu*H6WR*Tj8XbegBhBgSBty4yZcOPW_IQnhooQs{Qx zl>Ecm`owR_CXbq`Vn31(st-tH(H9hx4>sRU7C6=;jn`AO zZf>^HiiuD*G1{jb^wmljbfH{e30OichC{Gz7&lY;3He8Ouapokj3xM%psz!KKdm~- z=UtSCuJVmH5{%u{L^#Zl*1v76=WC)E&}v3-w1JD?=pZsBPcwD$R|@)omz;ZHUide% zi-;8LJuhZq_Afo@(PA3zb4`i(M2K9nfzhy+ZN5f3iDUuYT3zxybwF z#!kRbXg8>;LT-Cbl-!)JO+I9c!pWP~fBKik?LKQwZ#(&SHO{i2EF<{0QAe;BndpkJ z&`N6a_Klgc5uq96DoC7Juj?jltF!hZp6?HFTAn_Y!|D17@Fprh4tv5;xBYp_DUM~g zXpSEnP+8S@mW|C_FFKm#_td{)qd~q#xKXwHe($T38bK@35t+tS)l(C#H;r5{WULvlkV}7WC z>uP&UHwh8i5)lNDZF;?FwfjP_z%k&L;@KdFwUA zY306tvR}Bn%W;4qNq2{+7()GC^Cnnn@vmu9-0VfE6}@(ZY3Snb7~_Pg0mfYT_S}6r zYWe{`z=h3)d6VN-&ljq2ROm-yU6Ca7tOrTgmXs?z3a+b@S4AyJ=Ubnlm4sn#1m$8{ zSQFPpF452~#{PYO@%eip>QU`TXSy!__61q7=3vF!WaMFridt7bc7s$_Eu0a5zzvp6 zyF@kNq#3{1kE!}vXp((x6(1;lA=VD9p9Ofc*!D9<6=Z(ze8uu}pnu6>T2MU8gY&%H zjm2y?P=J#8d+Kv5(_#45U0P3VX6Jy)WkynWZNs5AvQ=MU3 zFrjF4rTgz5xGd|d${rk@mXOQ2KZLdu>L{WzF9CiI4V;yY{-V}!7;a#>{MCFds{OEr znAKMe`yTfGEYq9lElW;x`6D=LbRqzg79;|}%igSkqbmVHLtD`XvKq_H?Ry5VcQYvg zAX+<^rRcFd^qLsccrxO!b&tf>C4s1dL{sxoFmba?Yt#CLkUSj}dQh`iHn0MJe^w?* zxpTZQ5`O`>4YCILM`UIm_^w@a6lfui81`7eUF0{^Z&r+=95KR(Dw`@y*D0`mZNU+P zFsy6)e&jE)U-V;A?K>`JQLu`z51Nnwq=V6{pAbmY{HdJTG${0(20_A;h*<>d-x;FWplv(_CqK~B$=S3QW( zVvwIwDDAu7g@S}vVC>8}1<*r|c1@@IvR~QnHz@47A_|*zSY~}$PJCQyTynhHs7>)V zBlEuv(^&CeJxlLs%7s_qmsKFA;2yfX_?)0o0b}Hje9t?la*C3~?l`<(SJzUmR4zj7 zp}%%EM++`psOD-bR|U3zev;dz!o3m`~C0rLZPltbf z`8^;9-E+eh?Mw?>u+_K1*sJt|7+0awv7>RoH?Xl>%!$IX#RKm9 z^e2V0>OIE}rB=l4FIG;-G)-o~8l14en>J9jZ?g4AMlAzJW-cwt9TAXZClM0a!;8ra?V}?zN2#Drr)NC_j?VOG-P4BA4#$s^j=r~`J(YqPr6YRYKCFeae!!MJu;V%!Xl9J~DMzXfLUf1e){AxN)P zb-;K8r6r($S5cI$1=E+7M-#ND0hYOH_5k6cTnu!QaJ#zkAR$%AI&K^e8K4QppJjbj zJ8CGd4T`QUEzDlN+aZ^*$eJ9mK`ZX>;c~kk!8q>&P;CrNC(e;b5u#8vcv{B-NmM_G+5( z5X8N2 zh0x!vxaxQ5s(bDmV!(+Mr_RR1m#-oSq980AmbrRXANcXlgb*EN#2%nw1}Y`7Gi4?9 zqjs^a9S8STEV<*SYtB*8kKfY4Qx&$L$&f>*DqU4Z6wh4zf2|c?yYjFk43m_<2(PQ7 zUK7|OGFa(ddef7)&ZVSQ9qC-{1@tT2a6?dnH;ztSJWEgPSWX`w*+rfJlE$$h=B%BC zt}Q_0*>=EKJr7yJvex7d(*H>RJu#HC`5$z;_8ekmYqJbZAVbi3x1kTu&t6et+35feLY6R1Hy%>F zN}O&pFZAgu4Tc&H?vh5&?OaQrmhYihk2gSScDo0s?V4Yk{K3c0gJ7<2dH+_>e;DyS$AUYe-?ns|A-~&*Vo@HRp+C_#S$!* zxJcwUx0ec!?WMzKDrtPLo5|y{fB)QPVbGl!d2@Q%cD@mUkN{H+F&?(79WT!WN}8cj z_tsr#Z1*9w^+*v_oIf5=WdiYP>=~=y&oKNS9@;6LNm{!Uc;UeIl>02a?)HjH9n%<3 zyRwh~e=|s*U6Sd4oaO4d=A z6JMDR58JIM2rG_Ke#O@`{`#A!LtGpAToPLRf00sV(4dUfb5krxEQ{@xzCl&I!G4Nc z>0}#sX&Pmv^rN0_l4$u?o9LoiOR!|0}@ z0rY(F>vZ0CK?cK{5AL9+N2JqGIG8QC4`}>ZEfu8$#*m68j?`<$_BLq1;1v6b7=?_Q zf4~x^V1&a{(y8Ly3Hto#Zp27#sgOwt9Vj`mQ}BRcD4pWk$pN*EX+>QVJ4%UV4dh6F z=do|-=(*$ctK?tO2W16;2aZax!7g#ZHvoj&0ux{PG-$vuY8HqZAo zmD8!3^Q2%^l$Geo{FSh2F}MppT~KQve>rY?>$^|r?e9M&6;6d;4D&i$TP;73Tr&iqjH9$k6qj~T28nn>|Jb4i0TR_9?!{UxpRZz#J0EbvbBCZMepDun}3 zVL$D_;_e_G^XoYHIZdGe7Go>!Xk9~(K0@r(4HNDOsl%y8^Ic)L*!|b2KDwhv7QHz3 zPjqkJu~dr~iY3rY>mrSC={hkz7u#FOc6N-Vqx|e~c*$g%e8VU?;Vy+eVWL)z)q=<&`z|aEMEdK zFa0<4SXMSoysZqJe|G3Wz1k+z_8&^uh$aC>i6A;)Qbg)W741!9ugl$<=}EUdaZ7{pQLN z>t8GZ@t#r87eg3S@)BrCLYq# z1EEDyLPz|l!lrG;e@c@f0T!>RUtlt~M{Zp?Y}K67I3#yW#(a4WX*v(vidgd(8kL-E>kVlW zBqYGL&&<0B!}+qE7Vscyb)TH>@O)C||KR>3mHn#~3T6axa&}L>Jr}&2a>Kb=c*`*=FX=oQ87?YvuYr zyTe8jd&nMGbzL-K9;ITfiZ@E<>MEFnz^3tG4XQLzXaRY}9zxk)lpfysimW2T@!IEXz(Gqj_7OrQzKM z$(7Rj5_2`qmw|88?$tdOm?`*Z-^s&NP_b9e8Uk(N@>EE#@x3~(tovIw>#+ebvwyt- ztK-}__9zu$d;(Y9)k-y)1>3DiA4KtYP1H@Df2_KSgD9+uhupE=TX#%(`KT40lk%_u z<3=)H&Al6pUWd_*0Wwb7jT()N>V-H*ntE?hPTqUrHXM?dY}jbgeM{fQMDEWBpK;g5i*uT0R7M+(Lnl-Ux!OmkR%~()8 ze`EOzk?Ksu0OJl}^)kQfgu!QUdpm+!bhmj>lL5657x2>lP?Wv=`AC7qe40dmhOC)6 z9X|YDSlsHsM<%10;IVlnq7uhQA1ax#d_$z$j))Cw*r}be1AR zr3yhb76tXqnl45+1z0?Wh^l0LP%1X=f2wRZCUw2ne4fh?wP;l$8h;t)o=P&kCrp?X7o~A?gxNYHf9E05R&=7Vhb?@krK-i z1*?v|g~Pa6;?ZjJcFb56R*Yo@QvLF%0A@Crj*~wg!?+7LO@$A;5h|4EbTh@|e<2OJ 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 { - //加载自定义地图样式 void _loadCustomData() async { setState(() { @@ -57,7 +60,6 @@ class _AddressMapPage extends State { }); if (aMapFlutterLocation == null) { - aMapFlutterLocation = LocationFlutterPlugin(); aMapFlutterLocation.onResultCallback().listen((event) { print("event: ${jsonEncode(event)}"); @@ -72,72 +74,113 @@ class _AddressMapPage extends State { } else { latLng = BMFCoordinate(event["latitude"], event["longitude"]); } - saveLatLng(latLng); - if (_mapController != null) - _mapController.updateMapOptions( - BMFMapOptions( - center: latLng, - zoomLevel: 15, - ), - ); - searchPoi(latLng); + BMFCalculateUtils.coordConvert( + coordinate: latLng, + fromType: BMF_COORD_TYPE.COMMON, + toType: BMF_COORD_TYPE.BD09LL) + .then((value) { + saveLatLng(value); + if (_mapController != null) { + this.latLng = value; + addMarker(); + _mapController.updateMapOptions( + BMFMapOptions( + center: latLng, + zoomLevel: 15, + ), + ); + } + searchPoi(latLng); + }); } }); } - aMapFlutterLocation.prepareLoc({ - "coorType": "bd09ll", - "isNeedAddres": false, - "isNeedAltitude": false, - "isNeedLocationPoiList": false, - "isNeedLocationDescribe": false, - "isNeedNewVersionRgc": false, - "scanspan": 0, - "openGps": true, - "locationMode": 2, - }, { - "locationMode": "kCLLocationAccuracyBest", - "locationTimeout": 10, - "reGeocodeTimeout": 10, - "activityType": "CLActivityTypeAutomotiveNavigation", - "BMKLocationCoordinateType": "BMKLocationCoordinateTypeBMK09LL", - "BMKLocationCoordinateType": "BMKLocationCoordinateTypeBMK09LL", - "isNeedNewVersionRgc": false, - }); - - _loadCustomData(); + _setLocOption(); getLatLng(); startLocation(); } + /// 设置android端和ios端定位参数 + void _setLocOption() { + /// android 端设置定位参数 + BaiduLocationAndroidOption androidOption = new BaiduLocationAndroidOption(); + androidOption.setCoorType("GCJ02"); // 设置返回的位置坐标系类型 + androidOption.setIsNeedAltitude(true); // 设置是否需要返回海拔高度信息 + androidOption.setIsNeedAddres(true); // 设置是否需要返回地址信息 + androidOption.setIsNeedLocationPoiList(true); // 设置是否需要返回周边poi信息 + androidOption.setIsNeedNewVersionRgc(true); // 设置是否需要返回最新版本rgc信息 + androidOption.setIsNeedLocationDescribe(true); // 设置是否需要返回位置描述 + androidOption.setOpenGps(true); // 设置是否需要使用gps + androidOption.setLocationMode(LocationMode.Hight_Accuracy); // 设置定位模式 + androidOption.setScanspan(0); // 设置发起定位请求时间间隔 + + Map androidMap = androidOption.getMap(); + + /// ios 端设置定位参数 + BaiduLocationIOSOption iosOption = new BaiduLocationIOSOption(); + iosOption.setIsNeedNewVersionRgc(true); // 设置是否需要返回最新版本rgc信息 + iosOption.setBMKLocationCoordinateType( + "BMKLocationCoordinateTypeGCJ02"); // 设置返回的位置坐标系类型 + iosOption.setActivityType("CLActivityTypeAutomotiveNavigation"); // 设置应用位置类型 + iosOption.setLocationTimeout(10); // 设置位置获取超时时间 + iosOption.setDesiredAccuracy("kCLLocationAccuracyBest"); // 设置预期精度参数 + iosOption.setReGeocodeTimeout(10); // 设置获取地址信息超时时间 + iosOption.setDistanceFilter(1000); // 设置定位最小更新距离 + iosOption.setAllowsBackgroundLocationUpdates(true); // 是否允许后台定位 + iosOption.setPauseLocUpdateAutomatically(true); // 定位是否会被系统自动暂停 + + Map iosMap = iosOption.getMap(); + + aMapFlutterLocation.prepareLoc(androidMap, iosMap); + } + List
poiList; searchPoi(BMFCoordinate latLng) async { keyWord = textEditingController.text; - var addressPoi = await apiService.searchPoi( - "${latLng.latitude}", "${latLng.longitude}", keyWord, 20, 1); - List poi = addressPoi['pois']; - poiList = poi - .map((e) => Address.fromJson({ - "address": e["address"] is List ? "" : e["address"], - "area": e["adname"], - "city": e["cityname"], - "province": e["pname"], - "latitude": e["location"].toString().split(",")[0], - "longitude": e["location"].toString().split(",")[1], - "cityInfo": e["name"], - "id": "", - "mid": "", - "phone": "", - "tag": "", - "username": "", - "isDefault": true, - })) - .toList(); - setState(() {}); + + BMFPoiNearbySearch bmfPoiNearbySearch = BMFPoiNearbySearch(); + bmfPoiNearbySearch.onGetPoiNearbySearchResult( + callback: (BMFPoiSearchResult result, BMFSearchErrorCode errorCode) { + if ((DateTime.now().millisecondsSinceEpoch - time) > 2000) { + result.poiInfoList.map((e) => print("sssssssssss:${e.toMap()}")); + poiList = result.poiInfoList + .map((e) => Address.fromJson({ + "address": e.address, + "area": e.name, + "city": e.city, + "province": e.province, + "latitude": e.pt.latitude, + "longitude": e.pt.longitude, + "cityInfo": e.name, + "id": "", + "mid": "", + "phone": "", + "tag": "", + "username": "", + "isDefault": true, + })) + .toList(); + print("object112221: ${poiList.length}"); + setState(() { + time = DateTime.now().millisecondsSinceEpoch; + }); + } + }); + bmfPoiNearbySearch.poiNearbySearch(BMFPoiNearbySearchOption( + keywords: ["all"], + radius: 100000, + location: latLng, + pageSize: 20, + pageIndex: 0, + isRadiusLimit: true, + )); } + int time = 0; + startLocation() async { if (!(await Permission.locationWhenInUse.serviceStatus.isEnabled)) { enableLocation(); @@ -173,7 +216,7 @@ class _AddressMapPage extends State { S.of(context).nindingweigongnengweikaiqi, S.of(context).weilexiangnintuijianfujindemendianxinxi, S.of(context).dakaidingwei, - (result) async { + (result) async { if (result) { final AndroidIntent intent = AndroidIntent( action: 'action_location_source_settings', @@ -197,7 +240,7 @@ class _AddressMapPage extends State { S.of(context).nindingweiquanxianweiyunxu, S.of(context).weilexiangnintuijianfujindemendianxinxi, S.of(context).kaiqiquanxian, - (result) async { + (result) async { if (result) { await openAppSettings(); if (await Permission.location.isGranted) { @@ -213,11 +256,47 @@ class _AddressMapPage extends State { BMFMapController _mapController; void onMapCreated(BMFMapController controller) { + controller.setMapRegionDidChangeCallback(callback: (status) { + center = status.targetGeoPt; + searchPoi(center); + }); + setState(() { _mapController = controller; + _mapController.showUserLocation(true); + + _loadCustomData(); + addMarker(); }); } + BMFCoordinate latLng; + BMFMarker bmfMarker; + + addMarker() { + if (latLng == null) return; + if (bmfMarker == null && _mapController != null) { + print("map_wid: ${MediaQuery.of(context).size.width}"); + print("map_hei: ${MediaQuery.of(context).size.height}"); + + bmfMarker = BMFMarker( + position: latLng, + screenPointToLock: BMFPoint(MediaQuery.of(context).size.width / 2, + MediaQuery.of(context).size.height / 4), + isLockedToScreen: true, + centerOffset: BMFPoint(0.5, 0.9), + enabled: false, + icon: "assets/image/icon_map_marker.png", + draggable: false, + ); + _mapController.addMarker(bmfMarker); + } + bmfMarker.updateIsLockedToScreen( + true, + BMFPoint(MediaQuery.of(context).size.width / 2, + MediaQuery.of(context).size.height / 4)); + } + saveLatLng(BMFCoordinate latLng) async { SharedPreferences prefs = await SharedPreferences.getInstance(); await prefs.setString("latitude", "${latLng.latitude}"); @@ -231,8 +310,9 @@ class _AddressMapPage extends State { _mapController.updateMapOptions( BMFMapOptions( center: BMFCoordinate( - double.tryParse(value.getString("latitude")), - double.tryParse(value.getString("longitude"))), + double.tryParse(value.getString("latitude")), + double.tryParse(value.getString("longitude")), + ), zoomLevel: 15, ), ); @@ -277,18 +357,18 @@ class _AddressMapPage extends State { // ].toSet(), ), ), - Center( - child: IgnorePointer( - child: Container( - margin: EdgeInsets.only(bottom: 44.h), - child: Image.asset( - "assets/image/icon_address_location.png", - width: 66.w, - height: 75.h, - ), - ), - ), - ), + // Center( + // child: IgnorePointer( + // child: Container( + // margin: EdgeInsets.only(bottom: 44.h), + // child: Image.asset( + // "assets/image/icon_address_location.png", + // width: 66.w, + // height: 75.h, + // ), + // ), + // ), + // ), searchWidget(), Positioned( right: 17, @@ -372,7 +452,7 @@ class _AddressMapPage extends State { color: Color(0xFF4C4C4C), fontSize: 14.sp, ), - ) + ), ], ), ); @@ -386,16 +466,17 @@ class _AddressMapPage extends State { margin: EdgeInsets.fromLTRB(16, 48, 16, 8), padding: EdgeInsets.fromLTRB(10, 6, 16, 6), decoration: BoxDecoration( - color: Colors.white, - borderRadius: BorderRadius.all(Radius.circular(4)), - boxShadow: [ - BoxShadow( - color: Colors.black.withAlpha(12), - offset: Offset(0, 3), - blurRadius: 14, - spreadRadius: 0, - ) - ]), + color: Colors.white, + borderRadius: BorderRadius.all(Radius.circular(4)), + boxShadow: [ + BoxShadow( + color: Colors.black.withAlpha(12), + offset: Offset(0, 3), + blurRadius: 14, + spreadRadius: 0, + ) + ], + ), child: Row( mainAxisSize: MainAxisSize.max, children: [ diff --git a/lib/main.dart b/lib/main.dart index 091f68a7..ebed8b0e 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -121,7 +121,7 @@ initSdk() async { BMFMapSDK.setApiKeyAndCoordType( '7IACaFNxOX2EMauupIZisjI8XSxe09ER', BMF_COORD_TYPE.BD09LL); } else if(Platform.isAndroid) { - BMFMapSDK.setCoordType(BMF_COORD_TYPE.BD09LL); + BMFMapSDK.setCoordType(BMF_COORD_TYPE.COMMON); } } diff --git a/lib/main_page.dart b/lib/main_page.dart index 096369a2..9c783691 100644 --- a/lib/main_page.dart +++ b/lib/main_page.dart @@ -123,12 +123,7 @@ class _MainPage extends State { BaseData baseDate = await ApiService(Dio(), context: context, token: sharedPreferences.getString('token')) .queryInfo(); - - SharedPreferences.getInstance().then( - (value) => { - value.setString('user', jsonEncode(baseDate.data)), - }, - ); + sharedPreferences.setString('user', jsonEncode(baseDate.data)); } requestPermission() async { diff --git a/lib/order/store_selector_page.dart b/lib/order/store_selector_page.dart index 1b706de7..3dd8027f 100644 --- a/lib/order/store_selector_page.dart +++ b/lib/order/store_selector_page.dart @@ -5,6 +5,7 @@ import 'package:dio/dio.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_baidu_mapapi_base/flutter_baidu_mapapi_base.dart'; +import 'package:flutter_baidu_mapapi_utils/flutter_baidu_mapapi_utils.dart'; import 'package:flutter_bmflocation/bdmap_location_flutter_plugin.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:huixiang/generated/l10n.dart'; @@ -60,13 +61,16 @@ class _StoreSelectorPage extends State { } else { latLng = BMFCoordinate(event["latitude"], event["longitude"]); } - if (Navigator.of(context).canPop()) { - Navigator.of(context).pop(); - } - saveLatLng( - latLng, event["province"], event["city"], event["district"]); - queryStore("${event["latitude"]}", "${event["longitude"]}", - event["province"], event["city"], event["district"]); + BMFCalculateUtils.coordConvert( + coordinate: latLng, + fromType: BMF_COORD_TYPE.COMMON, + toType: BMF_COORD_TYPE.BD09LL).then((value) { + this.latLng = value; + saveLatLng( + value, event["province"], event["city"], event["district"]); + queryStore("${value.latitude}", "${value.longitude}", + event["province"], event["city"], event["district"]); + }); } }); } diff --git a/lib/union/union_page.dart b/lib/union/union_page.dart index 586b1c7c..f600d5aa 100644 --- a/lib/union/union_page.dart +++ b/lib/union/union_page.dart @@ -1,15 +1,15 @@ import 'dart:io'; import 'dart:ui'; -import 'package:amap_flutter_location/amap_flutter_location.dart'; -import 'package:amap_flutter_location/amap_location_option.dart'; import 'package:android_intent_plus/android_intent.dart'; import 'package:dio/dio.dart'; import 'package:flutter/cupertino.dart'; -import 'package:flutter/foundation.dart'; import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; +import 'package:flutter_baidu_mapapi_map/flutter_baidu_mapapi_map.dart'; +import 'package:flutter_baidu_mapapi_utils/flutter_baidu_mapapi_utils.dart'; +import 'package:flutter_bmflocation/bdmap_location_flutter_plugin.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:huixiang/generated/l10n.dart'; import 'package:huixiang/main.dart'; @@ -21,8 +21,6 @@ import 'package:huixiang/view_widget/classic_header.dart'; import 'package:huixiang/view_widget/custom_image.dart'; import 'package:huixiang/view_widget/icon_text.dart'; import 'package:huixiang/view_widget/item_title.dart'; -import 'package:amap_flutter_base/amap_flutter_base.dart'; -import 'package:amap_flutter_map/amap_flutter_map.dart'; import 'package:huixiang/view_widget/request_permission.dart'; import 'package:permission_handler/permission_handler.dart'; import 'package:pull_to_refresh/pull_to_refresh.dart'; @@ -30,6 +28,7 @@ import 'package:shared_preferences/shared_preferences.dart'; import 'dart:typed_data'; import 'package:flutter/rendering.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:flutter_baidu_mapapi_base/flutter_baidu_mapapi_base.dart'; class UnionPage extends StatefulWidget { @override @@ -40,28 +39,15 @@ class UnionPage extends StatefulWidget { class _UnionPage extends State with AutomaticKeepAliveClientMixin, WidgetsBindingObserver { - //默认设置为不使用自定义地图，如果需要直接显示，在初始化是设置为true - CustomStyleOptions _customStyleOptions = CustomStyleOptions(false); //加载自定义地图样式 void _loadCustomData() async { - if (null == _customStyleOptions) { - _customStyleOptions = CustomStyleOptions(false); - } - ByteData styleByteData = - await rootBundle.load('assets/map_style/style.data'); - _customStyleOptions.styleData = styleByteData.buffer.asUint8List(); - ByteData styleExtraByteData = - await rootBundle.load('assets/map_style/style_extra.data'); - _customStyleOptions.styleExtraData = - styleExtraByteData.buffer.asUint8List(); - //如果需要加载完成后直接展示自定义地图，可以通过setState修改CustomStyleOptions的enable为true setState(() { - _customStyleOptions.enabled = true; + _mapController.setCustomMapStyle('assets/map_style/chatian.sty', 0); }); } - AMapFlutterLocation aMapFlutterLocation; + LocationFlutterPlugin aMapFlutterLocation; RefreshController refreshController = RefreshController(initialRefresh: false); @@ -70,7 +56,6 @@ class _UnionPage extends State super.dispose(); WidgetsBinding.instance.removeObserver(this); aMapFlutterLocation.stopLocation(); - aMapFlutterLocation.destroy(); refreshController.dispose(); } @@ -105,36 +90,38 @@ class _UnionPage extends State WidgetsBinding.instance.addObserver(this); if (aMapFlutterLocation == null) { - AMapFlutterLocation.setApiKey("f39d1daa020a56f208eb2519f63e9534", - "feaae7986201b571cace1b83728be5bb"); - aMapFlutterLocation = AMapFlutterLocation(); - aMapFlutterLocation.onLocationChanged().listen((event) { + aMapFlutterLocation = LocationFlutterPlugin(); + aMapFlutterLocation.onResultCallback().listen((event) { if (event != null && event["latitude"] != null && event["longitude"] != null) { print("location: $event"); if (event["latitude"] is String && event["longitude"] is String) { - latLng = LatLng(double.tryParse(event["latitude"]), + latLng = BMFCoordinate(double.tryParse(event["latitude"]), double.tryParse(event["longitude"])); } else { - latLng = LatLng(event["latitude"], event["longitude"]); + latLng = BMFCoordinate(event["latitude"], event["longitude"]); } - saveLatLng( - latLng, event["province"], event["city"], event["district"]); - queryStore( - "${event["latitude"]}", - "${event["longitude"]}", - event["province"], - event["city"], - event["district"], - editingController.text); - if (_mapController != null) - _mapController.moveCamera( - CameraUpdate.newCameraPosition(CameraPosition( - target: latLng, - zoom: 15.0, - )), - ); + BMFCalculateUtils.coordConvert( + coordinate: latLng, + fromType: BMF_COORD_TYPE.COMMON, + toType: BMF_COORD_TYPE.BD09LL).then((value) { + this.latLng = value; + saveLatLng( + value, event["province"], event["city"], event["district"]); + queryStore( + "${value.latitude}", + "${value.longitude}", + event["province"], + event["city"], + event["district"], + editingController.text); + if (_mapController != null) + _mapController.updateMapOptions(BMFMapOptions( + center: value, + zoomLevel: 15, + )); + }); } }); @@ -146,15 +133,25 @@ class _UnionPage extends State }); } - aMapFlutterLocation.setLocationOption(AMapLocationOption( - needAddress: true, - onceLocation: true, - locationMode: AMapLocationMode.Hight_Accuracy, - desiredAccuracy: DesiredAccuracy.HundredMeters, - desiredLocationAccuracyAuthorizationMode: - AMapLocationAccuracyAuthorizationMode.FullAndReduceAccuracy, - pausesLocationUpdatesAutomatically: true, - )); + aMapFlutterLocation.prepareLoc({ + "coorType": "bd09ll", + "isNeedAddres": false, + "isNeedAltitude": false, + "isNeedLocationPoiList": false, + "isNeedLocationDescribe": false, + "isNeedNewVersionRgc": false, + "scanspan": 0, + "openGps": true, + "locationMode": 2, + }, { + "locationMode": "kCLLocationAccuracyBest", + "locationTimeout": 10, + "reGeocodeTimeout": 10, + "activityType": "CLActivityTypeAutomotiveNavigation", + "BMKLocationCoordinateType": "BMKLocationCoordinateTypeBMK09LL", + "BMKLocationCoordinateType": "BMKLocationCoordinateTypeBMK09LL", + "isNeedNewVersionRgc": false, + }); _loadCustomData(); @@ -162,9 +159,9 @@ class _UnionPage extends State startLocation(); } - LatLng latLng; + BMFCoordinate latLng; - saveLatLng(LatLng latLng, province, city, district) async { + saveLatLng(BMFCoordinate latLng, province, city, district) async { SharedPreferences prefs = await SharedPreferences.getInstance(); await prefs.setString("latitude", "${latLng.latitude}"); await prefs.setString("longitude", "${latLng.longitude}"); @@ -186,7 +183,7 @@ class _UnionPage extends State value.containsKey("city") && value.containsKey("district")) { - latLng = LatLng(double.tryParse(value.getString("latitude")), + latLng = BMFCoordinate(double.tryParse(value.getString("latitude")), double.tryParse(value.getString("longitude"))), queryStore( value.getString("latitude"), @@ -198,14 +195,10 @@ class _UnionPage extends State ), setState(() { if (_mapController != null) { - _mapController.moveCamera( - CameraUpdate.newCameraPosition( - CameraPosition( - target: latLng, - zoom: 15.0, - ), - ), - ); + _mapController.updateMapOptions(BMFMapOptions( + center: latLng, + zoomLevel: 15, + )); } }) } @@ -235,7 +228,7 @@ class _UnionPage extends State storeList = (baseData.data as List) .map((e) => Store.fromJson(e)) .toList(); - buildMarker(); + // buildMarker(); refreshController.refreshCompleted(); if (mounted) setState(() {}); } else { @@ -243,34 +236,20 @@ class _UnionPage extends State } } - RepaintBoundary repaintBoundary; - - buildMarker() async { - markers.clear(); - - BitmapDescriptor bitmapDescriptor = await BitmapDescriptor.fromAssetImage( - ImageConfiguration( - bundle: DefaultAssetBundle.of(context), - devicePixelRatio: MediaQuery.of(context)?.devicePixelRatio ?? 1.0, - locale: Localizations.localeOf(context), - textDirection: Directionality.of(context), - size: Size(35.w, 35.h), - platform: defaultTargetPlatform, - ), - "assets/image/icon_map_marker.png"); - - markers.addAll(storeList.map((element) => Marker( - position: LatLng(double.tryParse(element.latitude), - double.tryParse(element.longitude)), - anchor: Offset(0.5, 0.9), - clickable: false, - icon: bitmapDescriptor, - infoWindowEnable: true, - ))); - if (mounted) setState(() {}); - } - - List markers = []; + // buildMarker() async { + // markers.clear(); + // markers.addAll(storeList.map((element) => BMFMarker( + // position: BMFCoordinate(double.tryParse(element.latitude), + // double.tryParse(element.longitude)), + // centerOffset: BMFPoint(0.5, 0.9), + // enabled: false, + // icon: "assets/image/icon_map_marker.png", + // draggable: false, + // ))); + // if (mounted) setState(() {}); + // } + // + // List markers = []; @override Widget build(BuildContext context) { @@ -306,24 +285,17 @@ class _UnionPage extends State // headerSliverBuilder: (context, inner) { // return [ // SliverOverlapAbsorber( - // sliver: buildSliverAppBar(AMapWidget( - // initialCameraPosition: CameraPosition( - // target: LatLng(30.553111, 114.342366), - // zoom: 12.0, + // sliver: buildSliverAppBar(BMFMapWidget( + // mapOptions: BMFMapOptions( + // center: BMFCoordinate(30.553111, 114.342366), + // zoomLevel: 12, // ), - // onMapCreated: onMapCreated, - // apiKey: aMapApiKeys, - // touchPoiEnabled: true, - // markers: markers.toSet(), - // scrollGesturesEnabled: true, - // customStyleOptions: _customStyleOptions, - // onPoiTouched: (poiTouch) { - // FocusScope.of(context).requestFocus(FocusNode()); - // }, - // gestureRecognizers: >[ - // Factory( - // () => EagerGestureRecognizer()), - // ].toSet(), + // onBMFMapCreated: onMapCreated, + // // customStyleOptions: _customStyleOptions, + // // gestureRecognizers: >[ + // // Factory( + // // () => EagerGestureRecognizer()), + // // ].toSet(), // )), // handle: // NestedScrollView.sliverOverlapAbsorberHandleFor(context), @@ -368,7 +340,7 @@ class _UnionPage extends State itemCount: storeList == null ? 0 : storeList.length, // padding: EdgeInsets.only(top: 8.h, bottom: 84.h + (375.h - 88.h) + 4.h), padding: EdgeInsets.only( - top: 17.h, bottom: 84.h /* + (375.h - 88.h) + 4.h*/), + top: 8.h, bottom: 84.h /* + (375.h - 88.h) + 4.h*/), physics: NeverScrollableScrollPhysics(), itemBuilder: (context, position) { return GestureDetector( @@ -460,10 +432,10 @@ class _UnionPage extends State }); } - AMapController _mapController; + BMFMapController _mapController; TextEditingController editingController = TextEditingController(); - void onMapCreated(AMapController controller) { + void onMapCreated(BMFMapController controller) { _mapController = controller; } @@ -473,16 +445,17 @@ class _UnionPage extends State margin: EdgeInsets.fromLTRB(16.w, 40, 16.w, 0), padding: EdgeInsets.fromLTRB(0, 6.h, 0, 6.h), decoration: BoxDecoration( - color: Colors.white, - borderRadius: BorderRadius.all(Radius.circular(4)), - boxShadow: [ - BoxShadow( - color: Colors.black.withAlpha(12), - offset: Offset(0, 3), - blurRadius: 14, - spreadRadius: 0, - ) - ]), + color: Colors.white, + borderRadius: BorderRadius.all(Radius.circular(4)), + boxShadow: [ + BoxShadow( + color: Colors.black.withAlpha(12), + offset: Offset(0, 3), + blurRadius: 14, + spreadRadius: 0, + ) + ], + ), child: TextField( textInputAction: TextInputAction.search, onEditingComplete: () { @@ -513,81 +486,81 @@ class _UnionPage extends State ); } - Widget buildSliverAppBar(AMapWidget map) { - return SliverAppBar( - // 滑上去时搜索隐藏 - // floating: true, - // snap: true, - pinned: true, - backgroundColor: Color(0xFFFAFAFA), - elevation: 0, - automaticallyImplyLeading: false, - title: Container( - height: 36.h, - margin: EdgeInsets.fromLTRB(16.w, 0, 16.w, 0), - padding: EdgeInsets.fromLTRB(0, 6.h, 0, 6.h), - decoration: BoxDecoration( - color: Colors.white, - borderRadius: BorderRadius.all(Radius.circular(4)), - boxShadow: [ - BoxShadow( - color: Colors.black.withAlpha(12), - offset: Offset(0, 3), - blurRadius: 14, - spreadRadius: 0, - ) - ]), - child: TextField( - textInputAction: TextInputAction.search, - onEditingComplete: () { - startLocation(); - }, - controller: editingController, - cursorHeight: 30.h, - decoration: InputDecoration( - contentPadding: EdgeInsets.symmetric(vertical: 12.h), - prefixIcon: Icon( - Icons.search, - size: 24, - color: Colors.black, - ), - suffixIcon: InkWell( - onTap: () { - editingController.clear(); - }, - child: Icon( - Icons.close, - size: 19, - color: Colors.grey, - ), - ), - border: InputBorder.none, - ), - ), - ), - flexibleSpace: FlexibleSpaceBar( - background: Container( - child: map, - ), - ), - expandedHeight: 375.h, - bottom: PreferredSize( - preferredSize: Size(double.infinity, 52.h), - child: Container( - padding: EdgeInsets.only(top: 6.h), - color: Color(0xFFFAFAFA), - child: ItemTitle( - text: S.of(context).jingbilianmenghuiyuandian, - imgPath: "assets/image/icon_union_store.png", - ), - ), - ), - ); - } + // Widget buildSliverAppBar(BMFMapWidget map) { + // return SliverAppBar( + // // 滑上去时搜索隐藏 + // // floating: true, + // // snap: true, + // pinned: true, + // backgroundColor: Color(0xFFFAFAFA), + // elevation: 0, + // automaticallyImplyLeading: false, + // title: Container( + // height: 36.h, + // margin: EdgeInsets.fromLTRB(16.w, 0, 16.w, 0), + // padding: EdgeInsets.fromLTRB(0, 6.h, 0, 6.h), + // decoration: BoxDecoration( + // color: Colors.white, + // borderRadius: BorderRadius.all(Radius.circular(4)), + // boxShadow: [ + // BoxShadow( + // color: Colors.black.withAlpha(12), + // offset: Offset(0, 3), + // blurRadius: 14, + // spreadRadius: 0, + // ) + // ]), + // child: TextField( + // textInputAction: TextInputAction.search, + // onEditingComplete: () { + // startLocation(); + // }, + // controller: editingController, + // cursorHeight: 30.h, + // decoration: InputDecoration( + // contentPadding: EdgeInsets.symmetric(vertical: 12.h), + // prefixIcon: Icon( + // Icons.search, + // size: 24, + // color: Colors.black, + // ), + // suffixIcon: InkWell( + // onTap: () { + // editingController.clear(); + // }, + // child: Icon( + // Icons.close, + // size: 19, + // color: Colors.grey, + // ), + // ), + // border: InputBorder.none, + // ), + // ), + // ), + // flexibleSpace: FlexibleSpaceBar( + // background: Container( + // child: map, + // ), + // ), + // expandedHeight: 375.h, + // bottom: PreferredSize( + // preferredSize: Size(double.infinity, 52.h), + // child: Container( + // padding: EdgeInsets.only(top: 6.h), + // color: Color(0xFFFAFAFA), + // child: ItemTitle( + // text: S.of(context).jingbilianmenghuiyuandian, + // imgPath: "assets/image/icon_union_store.png", + // ), + // ), + // ), + // ); + // } Widget buildStoreItem(Store store, position) { return Container( - margin: EdgeInsets.fromLTRB(16.w, 8.h, 16.w, 16.h), + margin: EdgeInsets.fromLTRB(16.w, 8.h, 16.w, 8.h), padding: EdgeInsets.fromLTRB(20.w, 20.h, 20.w, 20.h), decoration: BoxDecoration( color: Colors.white, @@ -651,6 +624,9 @@ class _UnionPage extends State ), ], ), + SizedBox( + height: 4.h, + ), Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, crossAxisAlignment: CrossAxisAlignment.center, diff --git a/pubspec.lock b/pubspec.lock index 6dc89927..4ce17977 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -35,7 +35,7 @@ packages: name: async url: "https://pub.flutter-io.cn" source: hosted - version: "2.6.1" + version: "2.5.0" barcode: dependency: transitive description: @@ -307,6 +307,13 @@ packages: url: "https://pub.flutter-io.cn" source: hosted version: "2.0.1" + flutter_bmflocation: + dependency: "direct main" + description: + name: flutter_bmflocation + url: "https://pub.flutter-io.cn" + source: hosted + version: "1.0.4" flutter_cache_manager: dependency: transitive description: @@ -886,7 +893,7 @@ packages: name: test_api url: "https://pub.flutter-io.cn" source: hosted - version: "0.3.0" + version: "0.2.19" timing: dependency: transitive description: @@ -1049,7 +1056,7 @@ packages: name: win32 url: "https://pub.flutter-io.cn" source: hosted - version: "2.2.5" + version: "2.0.5" xdg_directories: dependency: transitive description: @@ -1072,5 +1079,5 @@ packages: source: hosted version: "3.1.0" sdks: - dart: ">=2.13.0 <3.0.0" + dart: ">=2.12.0 <3.0.0" flutter: ">=2.0.0" diff --git a/pubspec.yaml b/pubspec.yaml index 68b17f91..c9555a4c 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -45,7 +45,7 @@ dependencies: permission_handler: ^5.0.1+1 -# flutter_bmflocation: ^1.0.4 + flutter_bmflocation: ^1.0.3 flutter_baidu_mapapi_base: ^2.0.1 flutter_baidu_mapapi_map: ^2.0.1 flutter_baidu_mapapi_search: ^2.0.1