From b5716bfc283d912937a27aa50ccc83f8fd4dc4f6 Mon Sep 17 00:00:00 2001 From: lzj Date: Mon, 20 Apr 2020 15:31:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3marker=E6=97=8B=E8=BD=AC?= =?UTF-8?q?=E8=A7=92=E5=BA=A6=E4=B8=BA=E9=80=86=E6=97=B6=E9=92=88=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- android/build.gradle | 5 -- .../uimanager/OverlayMarkerManager.java | 2 +- example/App1.js | 2 +- .../reswift_modify_delete_methods.patch | 12 ++++ .../rn_modify_add_macro.patch | 62 ++++++++++++++++++ .../rn_modify_module_method.patch | 10 +++ .../rn_modify_react_podspec.patch | 29 ++++++++ example/res/image/icon_car@3x.png | Bin 9462 -> 10120 bytes example/rnRunScript.sh | 26 ++++++++ ios/RCTBaiduMap/Module/JMMarkerAnnotation.m | 2 +- react-native-baidu-map-jm.podspec | 2 +- 11 files changed, 143 insertions(+), 9 deletions(-) create mode 100644 example/react-native-patch/reswift_modify_delete_methods.patch create mode 100644 example/react-native-patch/rn_modify_add_macro.patch create mode 100644 example/react-native-patch/rn_modify_module_method.patch create mode 100644 example/react-native-patch/rn_modify_react_podspec.patch mode change 100755 => 100644 example/res/image/icon_car@3x.png create mode 100755 example/rnRunScript.sh diff --git a/android/build.gradle b/android/build.gradle index 8260d5c..caf23a3 100755 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,6 +1,5 @@ apply plugin: 'com.android.library' apply plugin: 'maven' -apply plugin: 'signing' buildscript { repositories { @@ -48,10 +47,6 @@ android { } } -signing { - sign configurations.archives -} - dependencies { compileOnly 'com.facebook.react:react-native:+' compileOnly files('src/main/assets') diff --git a/android/src/main/java/org/lovebing/reactnative/baidumap/uimanager/OverlayMarkerManager.java b/android/src/main/java/org/lovebing/reactnative/baidumap/uimanager/OverlayMarkerManager.java index 4ee2706..5c47752 100755 --- a/android/src/main/java/org/lovebing/reactnative/baidumap/uimanager/OverlayMarkerManager.java +++ b/android/src/main/java/org/lovebing/reactnative/baidumap/uimanager/OverlayMarkerManager.java @@ -61,7 +61,7 @@ public void setAlpha(OverlayMarker overlayMarker, float alpha) { @ReactProp(name = "rotate") public void setRotate(OverlayMarker overlayMarker, float rotate) { - overlayMarker.setRotate(rotate); + overlayMarker.setRotate(-rotate); } @ReactProp(name = "flat") diff --git a/example/App1.js b/example/App1.js index 5159de1..be7489f 100755 --- a/example/App1.js +++ b/example/App1.js @@ -223,7 +223,7 @@ export default class App1 extends Component { title={this.state.markers[0].title} location={this.state.markers[0].location} icon={require('./res/image/icon_car.png')} - rotate={90} + rotate={20} /> (_ subscriber: S) diff --git a/example/react-native-patch/rn_modify_add_macro.patch b/example/react-native-patch/rn_modify_add_macro.patch new file mode 100644 index 0000000..447f938 --- /dev/null +++ b/example/react-native-patch/rn_modify_add_macro.patch @@ -0,0 +1,62 @@ +--- a/node_modules/react-native/React/Base/RCTBridgeModule.h ++++ b/node_modules/react-native/React/Base/RCTBridgeModule.h +@@ -74,6 +74,17 @@ + + (void)load { RCTRegisterModule(self); } + + /** ++ * Same as RCT_EXPORT_MODULE, but uses __attribute__((constructor)) for module ++ * registration. Useful for registering swift classes that forbids use of load ++ * Used in RCT_EXTERN_REMAP_MODULE ++ */ ++#define RCT_EXPORT_MODULE_NO_LOAD(js_name, objc_name) \ ++RCT_EXTERN void RCTRegisterModule(Class); \ +++ (NSString *)moduleName { return @#js_name; } \ ++__attribute__((constructor)) static void \ ++RCT_CONCAT(initialize_, objc_name)() { RCTRegisterModule([objc_name class]); } ++ ++/** + * To improve startup performance users may want to generate their module lists + * at build time and hook the delegate to merge with the runtime list. This + * macro takes the place of the above for those cases by omitting the +load +@@ -250,7 +261,7 @@ + @interface objc_name (RCTExternModule) \ + @end \ + @implementation objc_name (RCTExternModule) \ +- RCT_EXPORT_MODULE(js_name) ++ RCT_EXPORT_MODULE_NO_LOAD(js_name, objc_name) + + /** + * Use this macro in accordance with RCT_EXTERN_MODULE to export methods +@@ -323,10 +334,29 @@ + @end + + /** ++ * A protocol that allows TurboModules to do lookup on other TurboModules. ++ * Calling these methods may cause a module to be synchronously instantiated. ++ */ ++ @protocol RCTTurboModuleLookupDelegate ++ - (id)moduleForName:(const char *)moduleName; ++ ++ /** ++ * Rationale: ++ * When TurboModules lookup other modules by name, we first check the TurboModule ++ * registry to see if a TurboModule exists with the respective name. In this case, ++ * we don't want a RedBox to be raised if the TurboModule isn't found. ++ * ++ * This method is deprecated and will be deleted after the migration from ++ * TurboModules to TurboModules is complete. ++ */ ++ - (id)moduleForName:(const char *)moduleName warnOnLookupFailure:(BOOL)warnOnLookupFailure; ++ - (BOOL)moduleIsInitialized:(const char *)moduleName; ++ @end ++ ++/** + * Experimental. + * A protocol to declare that a class supports TurboModule. + * This may be removed in the future. ++ * See RCTTurboModule.h for actual signature. + */ +-@protocol RCTTurboModule +- +-@end ++@protocol RCTTurboModule; diff --git a/example/react-native-patch/rn_modify_module_method.patch b/example/react-native-patch/rn_modify_module_method.patch new file mode 100644 index 0000000..e589ec2 --- /dev/null +++ b/example/react-native-patch/rn_modify_module_method.patch @@ -0,0 +1,10 @@ +--- a/node_modules/react-native/React/Base/RCTModuleMethod.mm ++++ b/node_modules/react-native/React/Base/RCTModuleMethod.mm +@@ -90,6 +90,7 @@ + + static BOOL RCTParseUnused(const char **input) + { + return RCTReadString(input, "__unused") || ++ RCTReadString(input, "__attribute__((__unused__))") || //lzj fixed + RCTReadString(input, "__attribute__((unused))"); + } diff --git a/example/react-native-patch/rn_modify_react_podspec.patch b/example/react-native-patch/rn_modify_react_podspec.patch new file mode 100644 index 0000000..a10a658 --- /dev/null +++ b/example/react-native-patch/rn_modify_react_podspec.patch @@ -0,0 +1,29 @@ +--- a/node_modules/react-native/React.podspec ++++ b/node_modules/react-native/React.podspec +@@ -115,6 +115,8 @@ + s.subspec "jsiexecutor" do |ss| + ss.dependency "React/cxxreact" + ss.dependency "React/jsi" ++ ss.dependency "DoubleConversion" ++ ss.dependency "glog" + ss.dependency "Folly", folly_version + ss.compiler_flags = folly_compiler_flags + ss.source_files = "ReactCommon/jsiexecutor/jsireact/*.{cpp,h}" +@@ -125,6 +127,8 @@ + + s.subspec "jsi" do |ss| + ss.dependency "Folly", folly_version ++ ss.dependency "DoubleConversion" ++ ss.dependency "glog" + ss.compiler_flags = folly_compiler_flags + ss.source_files = "ReactCommon/jsi/*.{cpp,h}" + ss.private_header_files = "ReactCommon/jsi/*.h" +@@ -142,6 +146,8 @@ + ss.dependency "React/jsinspector" + ss.dependency "boost-for-react-native", "1.63.0" + ss.dependency "Folly", folly_version ++ ss.dependency "DoubleConversion" ++ ss.dependency "glog" + ss.compiler_flags = folly_compiler_flags + ss.source_files = "ReactCommon/cxxreact/*.{cpp,h}" + ss.exclude_files = "ReactCommon/cxxreact/SampleCxxModule.*" diff --git a/example/res/image/icon_car@3x.png b/example/res/image/icon_car@3x.png old mode 100755 new mode 100644 index 3cb84ea3652f2f232b02d979ee789dd1e977ea42..4c8da9a16758634e6a07a2559e5cef572a0f9d29 GIT binary patch literal 10120 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 HxuGPP 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ǼDXM1&!#_vw;)X_pd_Un?*HJTGbD> zZl}wNmde9=R&(|4laXNklioMQq0K8%;#em|d}a~0t7!vO+V97cyRo>R&o|WhJr75( zrgp+Qk0#c)yHf8`(8vR&Li&!+5?fW~)OWVZ@jYSFw7)qdD(d}&z z+>LQA*#XHx4Hi(|jB^l{qhqdRes8bMNKF|@g>~=*$^E|Na5=!d;Oypv!NZ=!G4v#n z?Nf^hHMWx$E93?5z*EREx?2fyV*Fg(IRyuSx*ob?Y<{Qffl4g>-L!!}==S%&ak7$1 K64hcRLH`4i5Zf{U delta 9371 zcmZWvbx<2Xvro|CEiOfi6)##G0u(E5!BgA`UNpEvaY}J34#5KyFQq_%;_kuS9bUih zz5m|L-0kjf_jYb(=YF$ubCGISil3s?Rps%pDX{?n0G^_PtmZ$d_iq}!!1%Wg>kiia z6KK}bD$)Qz?H8PfPw4+_I&%e06#&4882|_j1pw~;L4i8}fCmo%um=GEM7{z5WYDZu z4KV-!sGq1rm6*vv1XfX}lW}&nq!Zxc=i*_Iz^0>1#sq>e{>gtMSrJG>_P^?XZ92No zjt)+4BJQ?UR>>|vQrLeK?sr@~-2dJAe=%bJK}FPDZ7rSLKe^jFJ4w6~r_bnU+aJN_ng{b%IQ$kBny5m);58KLb!iiKQ~Ia6(1PgIZr9txTCr~D5N{Nah@ zM?pP`G1FMz8laA7E`ANw_Gs~6X5)uC%$)I$JG|9Un{Hr}b`f zY7#5%tNp31uXkR)|8xBKw6byvWAw590h3uZVWeAX$__Yqm)bm)CQ;!V(bn_eXD8S& zE}y)9IZ&94(Ro$D??mBrk$Vs$A%>{;;AwQbUY=adhZeNw0;^N?SeGZJJugzpOvr_O z&*G@F+hU*3(sLyh4X;N3jumdzpdf`Xy_S@c$IAK%E+olU1Q7S85;w>k>IwD@SQFud zIZH*S_CcL2ropo1@ZX{-75_o1jiH)nm765ig?D-P00O0lq+99Y~sERQ>)m?aUXU=_I!KZ-LYyOWwAapoba(lGwpl5 z@??A47qd0Na*nCrWU(42r%p*`oJFkIyPf_ClcBj6aBfRm%|+kR{h2|xiu3F?U*47( zvS^`t+Ur4I=ULa4=iL%al?CtB`p)OF(Oa1(Rne`>0FO%+Z6z|+mpD-yFk?ewrrz>o z3N&cNN8J%RruAZ_#&z%Xw*-ELp5n_VHVRX0cH|sEkfx!rh@lO>H=#VbjtQ7%N+Cu`0XsdK}isbFgRF$^ICa5rj`?d zg?J(F>aM1?(}C)zgV00qW#&`)RvDf7kq}7z4$>hkWzuMmLb=A$1olMv9=x3-Cs6;X z&$Af629jL#8%o9d4kD*@tlXs+I#fkOypcQoQ%7F%VC{8YFOc2^VJ zfQYNR%YN7?a47;E_B-uhl|6BlYfn2ujy(|P=!VS!2yS|9eE8z%&qy^T^+M~fV-H$C z3Zr;LrEbMG4(+{~DRLmjpCiPP1~;8kOUfyD$SG*;%)GZ#keMfZNH==I6o8>~#b}Xw z+PBJ1PxW_=jnUZB-m4+SnvO4r2Jgyagle1gcn+SyauI_HOVnd5z3I3eecsQlU8Lkx zdD#}cr4cgeD(|@DbGt3#R~?1*hZ?up`$gmt4ipPlGumdIqy%Lq>D_PMy`tTmgx6Tb zAhk=_cYe{9un^Mg(WA!x7$`6;ndAAcH}@8&Msl`SpO#&1nMYcLd0ZX1f#>R!KvQ{Y(!yGg2HStg4qba=PQ%OWxU+XMHX?zH(Fn` z887`?=0umAVqcimK-a%oS&tvGJ;-YSWhS5=zn zhRdtnKI;b&H7CC}1Q#;oq(j46><;U5zehH^xVo!9#HU+1ZPQ0B$R4Rd>mT`_-UCw~}3!m0K?H zgIk{3PRr(19ZJ5|wh}JwrxpjdNSsB$P#^`z%4dY`(5SH&oPtA^&yT$+w~SDQwCo9X z$2I^HRSDN%_MkA;)_k)&i(QsGtKu5*EHyjvitAPnRb&2I{)aKaCjLTp{?y)uh5jRQ z`T8pvb8gJzQTO7caT1zlUvnI_c(Skf>G&*Gd5JPrGN~c+%6sA7FJeYIU3L3*kU2R- zfbPTC9re948N9H&|AU9CiE?sdtlv-AGY!kOQJO<&FB`8lFY|kkmT*>RT+y*=;>D9w zov#ckP)S`Q?O7Mk=BuG0@4VD{hy(q!LjcH^@iJmaGV7LOadGr0T&$Kd&MM@XMvVV8 zZM57kwN52e-w0bLmmHK+IAGwV&cnvq9yokYsrr|!*O(cF!#VU{C5a$wdVR1LrP}vx zIE>un76JF54S~Q^orfG}axRE9B}FsspBJ?(WW&JXrHLAv-2@~M8Bf3D_li~rAq#2%3jQchrt@4G@zB^|M!K_g;Bz&-NjsyWQ zu4rciGeUPp)e^OPyiX2ZC&F-a98SkYF^s77WdwRz0yOTQ(B2X>E036G6AyW_>f5`d zlDZ=KI9J)-_cOge!0y8p`qX-Jy23BC-nv0rPp9tLl`&SdhbkNd|Z64cAB);{i^kdp-QqiTQ02HHS%Z^t@H=Xw81{&18Z?UlUi zA+UsbiOSI)_seeOPZ^|P|6bq)lj?KSe&*4B%GgZ%+X$t0sH#TJJJb>eqp{JGXACBu zTbC%9R3%4iCa@5`)PDyfTc4uIj#eCTPaM4OnbaMBo1;;@2?}Rx|Hi*tq$giIweyp` z=CL`|?TzwWAq$nLcVpaA_l)Hci~8B+hFxA9BJb;gJrV7wQa3edrMd!uF{FO`D?}$~ zALC}5J;($51&@g#^X2G>24l^bdR=-F95kG!cn)~*z-Ysu`85h-F7te^8WgQ6`bF zSZDq=@eNX3i}4ZmF(a)^Y7ccFkMQK?FmF3(+~}$=KHlckDRK*K@eD#I-r%(|!OmV^ zRTXh>Nm0)oQQxB!7p;?+5M_+HNAqAM^!K$}EgM9yi*yJg4)X{~Qu?}l|J#>!b{^!R z&BWV+EBu=?Z&H<4HFzJG_Wp06?<)MWH1~KSfrRSxt_}z$kuu)6Zj1%)iu?R}Gey8q zO|0d-`JhTe@ywo(r5;^fF0INg8@EN{+3W?^3r`@IHc&go`NVMK6+re9$-8U%Lki0| zl;%0^I*I12HzK{%Bs`!>w@e#^hGC<#@vBlVI5xS?!}a9=35Znuvddgsq8@Z5d&Jw- z687hILor0aP50U*mW#av(H|0#BTnMd3O`3l&i8+K9N^=)4rmsPzEoh(`|c%P{v zz??`7)ss|7`xlZ;JR#2u@1UIlqNaEAM)$Me*2DoU%%UsZTXgZK2v=y`P`KXdyzDRtjVxdvC;E zvat#K;awn@6h_ceZ;r~fS*~wuZKliwqBqqW%ESB0(Ll~+MO#-MmlrIy%9VtS^(L|# zA%PG-ZM++QMN2*B5t&4NNCmm|BE?SPGD3YylWzpS+N9;uHL-^`*0-JdL2+!$cr5RK z)P)Q*l{6;b5s9Z{8`#}I5Hyz7u?`2#l-Mw4yJ8Axv$yYk(#(Y zI#JyPV)fp6{4!fZ?6NqKMIS7EE~5IYv8T}>M3CFWHD2%<>0*4=_c%Tl&AhnL=N|HGI zIGpR}%qUn#fN#2K*M$G}B+AH^h_CQD6i}GX>n&^HsH=Seb|LLI;XBMCB9R-HAwKR5N z<60{*w=4RAxqf`(XW99`H-ok!ivl0VY(n|*(r^W!OmKmZW*&gesMtsDmAwRCqXDQu zODC+Ca|Ir*Aa}=Pe6gXGrhQcbtp1 zvz}qSAfVXW+sUgwa$+OJnL!(hqvrxQnSIph`PLHA%|Y)Sza|_AOL)-oRrny#gS9ra z$WI%^hq*~dVf`wLyh@c@OW`~blis7IBz1j2_fz-CEk{+k<=H_rPM008`-v)`gTY9G z2V*hSPTz&|D^N=|#>ElmN>&g%>NQBg^Nset`cOZpmjs zq!dIyb5{DmfL^%HFpUfypf?83qPY z5(A=v^gA!EzspxZ_xSq(z$6uLXu-N-Gjf=tH#nd4k33P)Q#Y53Ae01bpvV5OY>$s| zpp_UC9()2Da(_Z8=!K>Pn@Be9bEczAfGQi$f=3^Qbry1O1$2f z(I1Iz?N)7GyI%9{Xd0+&6ADi#7VCU3ZM?>aPMi%(THcZC+VD1LM_D~tI}9J|So&ey z5=j*@bWhN==s{j#AXyXU|Ea>N^7DH4r!jkB(dDLOz&cPm9BPLNg&~r;U<(k1( zlKd4cIZGnta}8<*7BgE~37<|&rQgczoyyY6`^C%Qx=dC{$;SdOx^aV=jB_PJNapMF zy(YahwgvwNhk|*yLH;5(q0mXLK;UL~iR3+)W*Bn2Jue6|KU)t^5K(pR>L>^bV#WDh#zCAE$R@%-(jerFXi}i1M62|xk;1(U64qL>L zG*y3^Nuo%wNt>qe*gU9BM`cR*U&i;ojIvuFgT~Pr$#vm7vNMntyxm3$2jRfKcLZLE zu>;Do0YZD`OVllcg%*Va1aZvF`_>Bm^;7zLe>adQstrG*fD<;_pvRUxai-cIkG5ik&8L*9s(IvY)7iDNB5EIY4dyZ;B>o$g{)w+(&`vcv4 zE)64Jppt9z)}*Ons%#_<`?^M0PO4;W$N|3O+w7nr6tvUthCem{5sirX;IvW{X5G?n zV}oMo3xy1INU1kbvH?!aA$*+5x1NzLPNDMxecGZum`(zJ5tazQ2Z!!Ue3Mij4z1LK5KfEO>cnr|(jZUa&N1m}!O$jxhNRxZkIn;u$D8q< z56MJ$U0^HOjbiWd1yF(1d`OQ&1xo`EF&kA{zeJW|DW})kOF)`l$Ffq1zCw!l6Q&26 zj}Vo3dmPzVcDw>=G~s>=fbIJ2qa4!C%4|Ur*zQ3f&y4brBRSf)wDTZUEVB%zNkc&{ z^gsSYD9}$iv7W=SU&0q(ITYh_Diw#JP*m8kDA3arpJQ0c=}^EMvS@L9F8VTuH)2=$$@XEgR#1MNR8Fi2gx}=@2?{3XSzCCS_CEDs9cmH_H7rP)2vwT|P%G za$?1C)6^Ar6ce6}KPqVId~y9AzGH~>?T~2v_q+^{R)k)h1QB&{Zhn#1A~)?@cnS6W zn6qEYc+bHsf~rC81Y0!bB9u8vc49lPLaQV_X?brx&Th{?fh8WVU>JjLlRoufXhCe-_ZLVKOlls@QcISPb z>3poNq0ZNZpUMnvMkHDj%s3(CbZiFB~uM({IVhqy50IK#3MS`Ie~(A_|hQ#j2| zI@}gE-+S{K)d%X5ByJPUxT{iKi@pOt$KdwrqG}5WxNFm_s_R?e=3mz|`!=I@ zK79FR_=Z4HA_D_E5oZJDe_^VlewGsJqX_%q<;%BP^*hJI!+ksq3REej}D* z-JQDjqRDw)o*jKp4Q;2}XzH$Vh?BjHyq1YD@KRr(Skdce=c}m-cx+66{}(~H>dB;Z z7(|Yjp;&(9on5SCQ1`NLj%X(@XxY!66YKAS=GD1ZS@7ImlVeLaeY>l&Y^~uY?=XY(R1)!VzQJ zu0;*`mA%VBF$M6t1qq&8Yzl-!!rcrRBh|obU)Za3;rD5&evcY;>M!7h-)!C`kaLw& zU%ei@YAvbyE-c6bA3U4h&~qdBS8ZDUT!zKDvoj%>%bAi-0`R^`UUaHUNmIP8y*`}R zpARx(R9wW`c+<;IGZ<-!GGaqh^=P8u;<@k9j03;v0cS{A8=8vAoLNxB7{3%}5Ym)K zg(*MI^2!;Ce~uU~c5Y*# zU>{VrPp{$W!C%%z%!sabJihHsfa+w)w$BVIGL6a@pHdbG%wX2XKqMEV<9`dj1#K_5 zf+YffwapQ338kF1EJUbn8YbA9t@kj0j;ajX850W|xwTEHNO(^ea^4+yOn_0!1fwke z9sSW!mv~nT`8I(?keL5hmx{~M-`As;1k!VNfCZZ!;>li1|yfv-byC(<&>D>8+eyO zVaq&TufIetU}1b5)D4Zya!+j_fw{l#Hb(1_X1jYe{YDM<#hvoBha?bQJJQ}ytpLW`0L{9rHT4tAD{E4z#$HDZIb-l}jCZ#Roy#Lw z``v8I3#kLOvO!l>+d|*EF;Kv|06mCwi1pUkju&$XuSD8@Q@+}ppeTGr7~RERMa?;y z$XM%cH;ek)LB;;4+ra#IV8Ms{yeCv6!ao9af=|^-r&SF~{qTUAUb9bqXYs6f?eDB5 z1N^E3jv(tc^{$_NIhwJ!B$oiO=rTDnj-nM3?k9P?Kl~hmQ36(AzZh8nUdxQD_Cdxg zU-pAGu?5I9bMJ(nW4C-c4PvI4MpW2$<^>b*g?ZD`3e1JgrwT{^(D)zj+*uu08bBp4 zl)j*xq(N{PR?Dv;Z2%)nvRW)SE%j_6HTqcG2q}kK-wt+i78pJ}9L&0)@XRBhu77Z+ zYJ}s!l}@G-%tQ>+&ApqAuxT01zqOgu=W!#XBrc2JM1ith%%1Z#G-~RYTaZMMQGppf@dannydI>3rg`LOMIcqPfEj|b(9P%n}hy%xVW4hg9O)tL3>bY?P~ z_iZX0cjE;M{7ustAl_Y#pk=Z*ZRkj=OHEwFC8n1k0K(8oeG|6bgL1^$KX!bx_21}j za;8%5Ao5}|lCa`h5JIh%gYJ>MVyiLak#{|GP2pu_;b0u|ifYnwL>VI?+qKTT@^PFV`@q}QxC?-97WpPlwl6IA>v~51J6XNZwu)xSqLRw2*xIW5Wg|R zPai%X8p71@OSN29n#;*jCcHR}Bs|IBI%OGm9mqVAbM=9DHmB(u;GwPJc!eZF1F*^2 zCWq18%c^^Dhe)`VyRSCChA8Xy#IqgR3sCgI>o%m*$6S*{} z#6A6i(%;@G8WkH=jt)C7rSWkx>8y%6DxEVU9;WlWwO!Lhx|r<>ypPa&ixIoE zDa{^j|6v-}Kv-Di(*>KHVM3kk!b!{YFCW1%A0G*soK%rIL-Qopaw$UB+5MH{r17H6TJXvF1neC9(ad=;XN6QT;>)(=%;G+DriUaj z5$2+~Fo@}Q`rui{zG>bixc=ach%BPWvtU#WsQIE=a)$VTT8?Xp2WJovHYq>{iq=2YRGB8!d?!WT`r` zLrl)F$d9{`UJm){lpR=ic@zOS8-8(Q!*UB{$CRxyRV8YU{xr-miaRHE#JZ27feb8~ zWzDZtT7#FDP4)tw;eh)r5m28JmiKET`;xT*p^xcQ;H;=%Ee~SfKPJ9{f)x+DM${rM z;!^8E%S+JOLZk8Oa^R54)$gUm&y7RM;dbMLxBBxPubB$vlA^I}Hn_6Q_!f1dV42Hs52Kciy#M+9|=RI!X$B1_~*KWbqtboN5*l^P1D6AN`*XKGba$!2DMZo$|fa z))`mPPYVVPf19niJr-lo4?mx3G<& z3dj24fF|$sW2~X2*-tqfF!gc40KYT5;~?Zq*(yCiJS$=UO*mOSS>;f8<);0``}+;z z%uw`vwe%T_6gD{n0|Qb;a(r9ivvojss$r#b4O-gE#}>$(nKFCJ=x2xR?YX(hx#0j$ zbJJ7ga`2FE2maR?8$_T$r{su^xk+mu4!Vo5WIpjv0s5w%?GE4!Ory&ZmFtfd-pnb9 zA~_QKebMIc{k}o(^~Mp7W-cxC2g_{vR<|V*a^>66S-!dLb3W=C6C94?y>?75B8cZJ zFqyS&nR*Go=__OYte;y$q^=7Rrrrj&m+EWVd<8=JOs@*Pp6^%k8&w%U&D#%VoDn;p zCIO@${`lj*C~i?0ge8-iK9ut2l0ev7IJu1pIGi_@L;oGysr$zZ3`ce9#^^*HjKYvO zBW@#n`FGOJ-VNck$7iKAuPTXw&)r2Oty;6_&w-N4th1xgxDl{ZBIR~%)%Ehk@ z4B;Fua>lNljh~(Oht8Z0w9^)L>;V0}&ff4FerOhTO$-x(4MZ4>odSh`_TL8xd`U|)@qL_&+>dAR(GD;iv8QS`i_07I3p=)O} zCOPUUr8bVYq<&dOecVlxqy%+VMx2p%<=84>cL1|@r*jA0}`!S6MG*ok`K7rPL zWtizCU2M4qgd|2rADaC2^VP?SLRKVA&q#0u5~@dFT*_BAyFU-)lkILU!%kVN;a(Tz zkC4nD!DrkW|7ZM;9bQvyiHARHql5LuIr%enn03Ae*-*WRyPqqaaF^A07fe48oF?Dw zPfM&{pZAYPUmO?BHU6o3!t}ltFp?%v#=e8*`^q=ws4Cs{s%7gxbOCq|x#nnTb}CE6 z$H!hdcM6(TXPEMCBXQ;&8g8trrk1!Qm!F|ag_{*1wX7Z0qc3=O(N<(3Gz%2(zkeNZ z2^cyI-3vh0;2T{>p3Vv`l7gcTXKh^CsdeWYZoP6kWLBwBj$a}ugPsZC7Cx4)=v3qX Qeh~o_L6G480d;s7Hvj+t diff --git a/example/rnRunScript.sh b/example/rnRunScript.sh new file mode 100755 index 0000000..43ce8b3 --- /dev/null +++ b/example/rnRunScript.sh @@ -0,0 +1,26 @@ +#!/bin/sh + +SRCROOT=`pwd` +REACT_NATIVE_DIR=${SRCROOT}/node_modules/react-native +PATCH_FILE_PATH=${SRCROOT}/react-native-patch +echo "REACT_NATIVE_DIR:$REACT_NATIVE_DIR" +echo "PATCH_FILE_PATH:$PATCH_FILE_PATH" + +set -x +patch -p0 -N --dry-run --silent -f $REACT_NATIVE_DIR/React/Base/RCTModuleMethod.mm < $PATCH_FILE_PATH/rn_modify_module_method.patch 1>/dev/null +if [ $? -eq 0 ]; then +patch -p0 -f $REACT_NATIVE_DIR/React/Base/RCTModuleMethod.mm < $PATCH_FILE_PATH/rn_modify_module_method.patch +fi + +set -x +patch -p0 -N --dry-run --silent -f $REACT_NATIVE_DIR/React.podspec < $PATCH_FILE_PATH/rn_modify_react_podspec.patch 1>/dev/null +if [ $? -eq 0 ]; then +patch -p0 -f $REACT_NATIVE_DIR/React.podspec < $PATCH_FILE_PATH/rn_modify_react_podspec.patch +fi + +set -x +patch -p0 -N --dry-run --silent -f $REACT_NATIVE_DIR/React/Base/RCTBridgeModule.h < $PATCH_FILE_PATH/rn_modify_add_macro.patch 1>/dev/null +if [ $? -eq 0 ]; then +patch -p0 -f $REACT_NATIVE_DIR/React/Base/RCTBridgeModule.h < $PATCH_FILE_PATH/rn_modify_add_macro.patch +fi + diff --git a/ios/RCTBaiduMap/Module/JMMarkerAnnotation.m b/ios/RCTBaiduMap/Module/JMMarkerAnnotation.m index 76cf169..acc2c8b 100644 --- a/ios/RCTBaiduMap/Module/JMMarkerAnnotation.m +++ b/ios/RCTBaiduMap/Module/JMMarkerAnnotation.m @@ -35,7 +35,7 @@ + (UIImage *)imageRotated:(UIImage *)image radians:(CGFloat)radians if (!image || (num == radians && num % 360 == 0)) { return image; } - double radius = radians * M_PI / 180 + M_PI; + double radius = -radians * M_PI / 180; CGSize rotatedSize = image.size; UIGraphicsBeginImageContextWithOptions(rotatedSize, false, [UIScreen mainScreen].scale); diff --git a/react-native-baidu-map-jm.podspec b/react-native-baidu-map-jm.podspec index 4ff454d..fc8381c 100644 --- a/react-native-baidu-map-jm.podspec +++ b/react-native-baidu-map-jm.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "react-native-baidu-map-jm" - s.version = "1.3.4" + s.version = "1.3.5" s.summary = "Baidu Map for React Native" s.description = <<-DESC