Merge branch 'master' into dev

JoshLipan · JoshLipan · commit 2a4a41908146 · 2021-11-24T18:31:46.000+08:00
diff --git a/index.js b/index.js
@@ -350,7 +350,7 @@ export default class JPush {
         if (Platform.OS == "android") {
             JPushModule.setMaxGeofenceNumber(params)
         } else {
-            JPushModule.setGeofenecMaxCount(params)
+            JPushModule.setGeofeneceMaxCount(params)
         }
     }
 
diff --git a/ios/RCTJPushModule/RCTJPushModule.m b/ios/RCTJPushModule/RCTJPushModule.m
@@ -361,10 +361,10 @@ - (id)init
     }
 }
 
-RCT_EXPORT_METHOD(setGeofenecMaxCount:(NSDictionary *)params)
+RCT_EXPORT_METHOD(setGeofeneceMaxCount:(NSDictionary *)params)
 {
     if(params[GEO_FENCE_MAX_NUMBER]){
-        [JPUSHService setGeofenecMaxCount:[params[GEO_FENCE_MAX_NUMBER] integerValue]];
+        [JPUSHService setGeofeneceMaxCount:[params[GEO_FENCE_MAX_NUMBER] integerValue]];
     }
 }
 
diff --git a/ios/RCTJPushModule/libjpush-ios-3.7.4.a b/ios/RCTJPushModule/libjpush-ios-3.7.4.a
diff --git a/package.json b/package.json
@@ -6,7 +6,7 @@
   "types": "index.d.ts",
   "license": "ISC",
   "author": "wicked.tc130",
-  "version": "2.8.4",
+  "version": "2.8.7",
   "repository": {
     "type": "git",
     "url": "https://github.com/jpush/jpush-react-native"

Original file line number	Diff line number	Diff line change
`@@ -350,7 +350,7 @@ export default class JPush {`
`350`	`350`	`if (Platform.OS == "android") {`
`351`	`351`	`JPushModule.setMaxGeofenceNumber(params)`
`352`	`352`	`} else {`
`353`		`- JPushModule.setGeofenecMaxCount(params)`
	`353`	`+ JPushModule.setGeofeneceMaxCount(params)`
`354`	`354`	`}`
`355`	`355`	`}`
`356`	`356`
Original file line number	Diff line number	Diff line change
`@@ -361,10 +361,10 @@ - (id)init`
`361`	`361`	`}`
`362`	`362`	`}`
`363`	`363`
`364`		`-RCT_EXPORT_METHOD(setGeofenecMaxCount:(NSDictionary *)params)`
	`364`	`+RCT_EXPORT_METHOD(setGeofeneceMaxCount:(NSDictionary *)params)`
`365`	`365`	`{`
`366`	`366`	`if(params[GEO_FENCE_MAX_NUMBER]){`
`367`		`- [JPUSHService setGeofenecMaxCount:[params[GEO_FENCE_MAX_NUMBER] integerValue]];`
	`367`	`+ [JPUSHService setGeofeneceMaxCount:[params[GEO_FENCE_MAX_NUMBER] integerValue]];`
`368`	`368`	`}`
`369`	`369`	`}`
`370`	`370`