@woosmap/react-native-plugin-geofencing 0.1.20 → 0.1.23

package/android/build.gradle

@@ -51,12 +51,16 @@ repositories {
     google()
     mavenCentral()
     jcenter()
+    maven { url 'https://jitpack.io' }
 }
 
 dependencies {
     //noinspection GradleDynamicVersion
     implementation "com.facebook.react:react-native:+"  // From node_modules
-    implementation("com.webgeoservices.woosmapgeofencing:woosmap-mobile-sdk:1.2.+")
+    implementation 'com.google.android.gms:play-services-location:18.0.0'
+    implementation 'com.google.code.gson:gson:2.8.8'
+    implementation "com.github.woosmap:geofencing-core-android-sdk:core_geofence_2.1"
+    implementation("com.webgeoservices.woosmapgeofencing:woosmap-mobile-sdk:3.0.1")
     implementation 'com.google.android.gms:play-services-maps:17.0.0'
     implementation 'androidx.room:room-runtime:2.2.4'
     annotationProcessor 'androidx.room:room-compiler:2.2.4'

package/android/src/main/java/com/reactnativeplugingeofencing/PluginGeofencingModule.java

@@ -25,7 +25,7 @@ import com.facebook.react.modules.core.PermissionAwareActivity;
 import com.facebook.react.modules.core.PermissionListener;
 import com.webgeoservices.woosmapgeofencing.Woosmap;
 import com.webgeoservices.woosmapgeofencing.WoosmapSettings;
-import com.webgeoservices.woosmapgeofencing.database.Region;
+import com.webgeoservices.woosmapgeofencingcore.database.Region;
 
 import java.lang.reflect.Array;
 import java.util.ArrayList;

package/android/src/main/java/com/reactnativeplugingeofencing/WoosRegionReadyListener.java

@@ -8,8 +8,8 @@ import com.facebook.react.ReactNativeHost;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
 import com.webgeoservices.woosmapgeofencing.Woosmap;
-import com.webgeoservices.woosmapgeofencing.database.Region;
-import com.webgeoservices.woosmapgeofencing.database.RegionLog;
+import com.webgeoservices.woosmapgeofencingcore.database.Region;
+import com.webgeoservices.woosmapgeofencingcore.database.RegionLog;
 
 /***
  * Implements Woosmap Region callbacks
@@ -41,6 +41,6 @@ public class WoosRegionReadyListener implements Woosmap.RegionReadyListener,Woos
 
   @Override
   public void RegionReadyCallback(Region region) {
-   
+
   }
 }

package/android/src/main/java/com/reactnativeplugingeofencing/WoosmapTask.java

@@ -13,10 +13,10 @@ import com.facebook.react.bridge.WritableArray;
 import com.facebook.react.bridge.WritableNativeArray;
 import com.google.android.gms.maps.model.LatLng;
 import com.webgeoservices.woosmapgeofencing.Woosmap;
-import com.webgeoservices.woosmapgeofencing.database.MovingPosition;
-import com.webgeoservices.woosmapgeofencing.database.POI;
-import com.webgeoservices.woosmapgeofencing.database.Region;
-import com.webgeoservices.woosmapgeofencing.database.WoosmapDb;
+import com.webgeoservices.woosmapgeofencingcore.database.MovingPosition;
+import com.webgeoservices.woosmapgeofencingcore.database.POI;
+import com.webgeoservices.woosmapgeofencingcore.database.Region;
+import com.webgeoservices.woosmapgeofencingcore.database.WoosmapDb;
 
 import org.json.JSONObject;
 

package/android/src/main/java/com/reactnativeplugingeofencing/WoosmapUtil.java

@@ -9,10 +9,10 @@ import com.facebook.react.bridge.WritableArray;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.bridge.WritableNativeArray;
 import com.facebook.react.bridge.WritableNativeMap;
-import com.webgeoservices.woosmapgeofencing.database.MovingPosition;
-import com.webgeoservices.woosmapgeofencing.database.POI;
-import com.webgeoservices.woosmapgeofencing.database.Region;
-import com.webgeoservices.woosmapgeofencing.database.RegionLog;
+import com.webgeoservices.woosmapgeofencingcore.database.MovingPosition;
+import com.webgeoservices.woosmapgeofencingcore.database.POI;
+import com.webgeoservices.woosmapgeofencingcore.database.Region;
+import com.webgeoservices.woosmapgeofencingcore.database.RegionLog;
 
 import org.json.JSONArray;
 import org.json.JSONException;

package/ios/DataLocation.swift

@@ -38,7 +38,7 @@ public class DataLocation: LocationServiceDelegate {
     }
     
     public func readLocations(id:String) -> Location? {
-        return Locations.getLocationByLocationID(locationId: id)
+        return Locations.getLocationFromId(id: id)
     }
 
     public func eraseLocations() {

package/ios/PluginGeofencing.swift

@@ -963,6 +963,7 @@ class PluginGeofencing: RCTEventEmitter {
         result["radius"] = woosdata.radius
         result["frompositiondetection"] = woosdata.fromPositionDetection
         result["eventname"] = woosdata.eventName
+        result["spenttime"] = woosdata.spentTime
         return result
     }
     

package/ios/WoosmapGeofenceService.swift

@@ -104,13 +104,17 @@ import AirshipCore
 
     /// This callback received when application become active
     @objc func appDidBecomeActive() {
-        WoosmapGeofencing.shared.didBecomeActive()
+        DispatchQueue.main.async {
+            WoosmapGeofencing.shared.didBecomeActive()
+        }
     }
 
     /// This callback recived when application enter in background mode
     @objc func appDidEnterBackground() {
         if CLLocationManager.authorizationStatus() != .notDetermined {
-            WoosmapGeofencing.shared.startMonitoringInBackground()
+            DispatchQueue.main.async {
+                WoosmapGeofencing.shared.startMonitoringInBackground()
+            }
         }
     }
 
@@ -403,7 +407,7 @@ import AirshipCore
         if let locationService = WoosmapGeofencing.shared.locationService{
             if let customRegion = locationService.locationManager?.monitoredRegions{
                 customRegion.forEach { item in
-                    if(locationService.getRegionType(identifier: item.identifier) == LocationService.RegionType.custom){
+                    if(locationService.getRegionType(identifier: item.identifier) == RegionType.custom){
                         let customRegion = Region()
                         customRegion.identifier = item.identifier
                         if let circleRegion = item as? CLCircularRegion{
@@ -426,7 +430,8 @@ import AirshipCore
     /// - Returns: Region
     public func  getRegions(id:String) -> Region? {
         if let locationService = WoosmapGeofencing.shared.locationService{
-            if(locationService.getRegionType(identifier: id) == LocationService.RegionType.custom){
+            let regiontype = locationService.getRegionType(identifier: id)
+            if( regiontype == RegionType.custom){
                 if let customRegions = locationService.locationManager?.monitoredRegions{
                     if let watchRegion = customRegions.first(where: { item in
                         return item.identifier == id
@@ -492,12 +497,12 @@ import AirshipCore
 
     /// Delete all ZOI regions
     public func  deleteAllZoiRegion() {
-        WoosmapGeofencing.shared.locationService.removeRegions(type: LocationService.RegionType.custom)
+        WoosmapGeofencing.shared.locationService.removeRegions(type: RegionType.custom)
     }
 
     /// Delete all POI regions
     public func  deleteAllPoiRegion() {
-        WoosmapGeofencing.shared.locationService.removeRegions(type: LocationService.RegionType.poi)
+        WoosmapGeofencing.shared.locationService.removeRegions(type: RegionType.poi)
     }
 
     /// Delete regions by id
@@ -517,7 +522,7 @@ import AirshipCore
     /// Delete all regions
     public func  deleteAllRegion() {
         DataRegion().eraseRegions()
-        WoosmapGeofencing.shared.locationService.removeRegions(type: LocationService.RegionType.none)
+        WoosmapGeofencing.shared.locationService.removeRegions(type: RegionType.none)
     }
 
     @objc static public func mockdata() {

package/package.json

@@ -1 +1 @@
-{"name":"@woosmap/react-native-plugin-geofencing","version":"0.1.20","description":"This react-native plugin extends the functionality offered by the Woosmap Geofencing Mobile SDKs. Find more about the Woosmap Geofencing SDK","main":"lib/commonjs/index","module":"lib/module/index","types":"lib/typescript/index.d.ts","react-native":"src/index","source":"src/index","files":["src","lib","android","ios","cpp","react-native-plugin-geofencing.podspec"],"scripts":{"test":"jest","typescript":"tsc --noEmit","lint":"eslint \"**/*.{js,ts,tsx}\"","prepare":"bob build","release":"release-it","example":"yarn --cwd example","pods":"cd example && pod-install --quiet","bootstrap":"yarn example && yarn && yarn pods"},"keywords":["react-native","ios","android","woosmap"],"repository":"https://github.com/Woosmap/woosmap-geofencing-react-native-plugin","author":"WGS Indoor <28100769+sameerdhulap@users.noreply.github.com> (https://github.com/sameerdhulap)","license":"MIT","bugs":{"url":"https://github.com/Woosmap/woosmap-geofencing-react-native-plugin/issues"},"homepage":"https://github.com/Woosmap/woosmap-geofencing-react-native-plugin#readme","publishConfig":{"registry":"https://registry.npmjs.org/"},"devDependencies":{"@commitlint/config-conventional":"^11.0.0","@react-native-community/eslint-config":"^2.0.0","@release-it/conventional-changelog":"^2.0.0","@types/jest":"^26.0.0","@types/react":"^16.9.19","@types/react-native":"0.62.13","commitlint":"^11.0.0","eslint":"^7.2.0","eslint-config-prettier":"^7.0.0","eslint-plugin-prettier":"^3.1.3","husky":"^6.0.0","jest":"^26.0.1","pod-install":"^0.1.0","prettier":"^2.0.5","react":"16.13.1","react-native":"^0.68.1","react-native-builder-bob":"^0.18.0","release-it":"^14.2.2","typescript":"^4.1.3"},"peerDependencies":{"react":"*","react-native":"*"},"jest":{"preset":"react-native","modulePathIgnorePatterns":["<rootDir>/example/node_modules","<rootDir>/lib/"]},"commitlint":{"extends":["@commitlint/config-conventional"]},"release-it":{"git":{"commitMessage":"chore: release ${version}","tagName":"v${version}"},"npm":{"publish":true},"github":{"release":true},"plugins":{"@release-it/conventional-changelog":{"preset":"angular"}}},"eslintConfig":{"root":true,"extends":["@react-native-community","prettier"],"rules":{"prettier/prettier":["error",{"quoteProps":"consistent","singleQuote":true,"tabWidth":2,"trailingComma":"es5","useTabs":false}]}},"eslintIgnore":["node_modules/","lib/"],"prettier":{"quoteProps":"consistent","singleQuote":true,"tabWidth":2,"trailingComma":"es5","useTabs":false},"react-native-builder-bob":{"source":"src","output":"lib","targets":["commonjs","module",["typescript",{"project":"tsconfig.build.json"}]]},"dependencies":{"react-native-uuid":"^2.0.1"}}
+{"name":"@woosmap/react-native-plugin-geofencing","version":"0.1.23","description":"This react-native plugin extends the functionality offered by the Woosmap Geofencing Mobile SDKs. Find more about the Woosmap Geofencing SDK","main":"lib/commonjs/index","module":"lib/module/index","types":"lib/typescript/index.d.ts","react-native":"src/index","source":"src/index","files":["src","lib","android","ios","cpp","react-native-plugin-geofencing.podspec"],"scripts":{"test":"jest","typescript":"tsc --noEmit","lint":"eslint \"**/*.{js,ts,tsx}\"","prepare":"bob build","release":"release-it","example":"yarn --cwd example","pods":"cd example && pod-install --quiet","bootstrap":"yarn example && yarn && yarn pods"},"keywords":["react-native","ios","android","woosmap"],"repository":"https://github.com/Woosmap/woosmap-geofencing-react-native-plugin","author":"WGS Indoor <28100769+sameerdhulap@users.noreply.github.com> (https://github.com/sameerdhulap)","license":"MIT","bugs":{"url":"https://github.com/Woosmap/woosmap-geofencing-react-native-plugin/issues"},"homepage":"https://github.com/Woosmap/woosmap-geofencing-react-native-plugin#readme","publishConfig":{"registry":"https://registry.npmjs.org/"},"devDependencies":{"@commitlint/config-conventional":"^11.0.0","@react-native-community/eslint-config":"^2.0.0","@release-it/conventional-changelog":"^2.0.0","@types/jest":"^26.0.0","@types/react":"^16.9.19","@types/react-native":"0.62.13","commitlint":"^11.0.0","eslint":"^7.2.0","eslint-config-prettier":"^7.0.0","eslint-plugin-prettier":"^3.1.3","husky":"^6.0.0","jest":"^26.0.1","pod-install":"^0.1.0","prettier":"^2.0.5","react":"16.13.1","react-native":"^0.68.1","react-native-builder-bob":"^0.18.0","release-it":"^14.2.2","typescript":"^4.1.3"},"peerDependencies":{"react":"*","react-native":"*"},"jest":{"preset":"react-native","modulePathIgnorePatterns":["<rootDir>/example/node_modules","<rootDir>/lib/"]},"commitlint":{"extends":["@commitlint/config-conventional"]},"release-it":{"git":{"commitMessage":"chore: release ${version}","tagName":"v${version}"},"npm":{"publish":true},"github":{"release":true},"plugins":{"@release-it/conventional-changelog":{"preset":"angular"}}},"eslintConfig":{"root":true,"extends":["@react-native-community","prettier"],"rules":{"prettier/prettier":["error",{"quoteProps":"consistent","singleQuote":true,"tabWidth":2,"trailingComma":"es5","useTabs":false}]}},"eslintIgnore":["node_modules/","lib/"],"prettier":{"quoteProps":"consistent","singleQuote":true,"tabWidth":2,"trailingComma":"es5","useTabs":false},"react-native-builder-bob":{"source":"src","output":"lib","targets":["commonjs","module",["typescript",{"project":"tsconfig.build.json"}]]},"dependencies":{"react-native-uuid":"^2.0.1"}}

package/react-native-plugin-geofencing.podspec

@@ -16,5 +16,5 @@ Pod::Spec.new do |s|
   s.source_files = "ios/**/*.{h,m,mm,swift}"
 
   s.dependency "React-Core"
-  s.dependency "WoosmapGeofencing" , '~> 2.0.0'
+  s.dependency "WoosmapGeofencing" , '~> 3.0.0'
 end

package/src/internal/Region.tsx

@@ -10,6 +10,7 @@
  * @param {number} radius The radius of the region in meters.
  * @param {boolean} frompositiondetection Determines whether the user's current position is inside the region.
  * @param {string} eventName Describe cause of region event, Entry or Exit.
+ * @param {number} spenttime Number of seconds the user spent in region in case of event name Exit.
  */
 class Region {
   Date: number;
@@ -20,6 +21,7 @@ class Region {
   Radius: number;
   Frompositiondetection: boolean;
   Eventname: string;
+  SpentTime: number;
   constructor(
     date: number,
     didenter: boolean,
@@ -28,7 +30,8 @@ class Region {
     longitude: number,
     radius: number,
     frompositiondetection: boolean,
-    eventname: string
+    eventname: string,
+    spenttime: number
   ) {
     this.Date = date;
     this.Didenter = didenter;
@@ -38,6 +41,7 @@ class Region {
     this.Radius = radius;
     this.Frompositiondetection = frompositiondetection;
     this.Eventname = eventname;
+    this.SpentTime = spenttime;
   }
   /**
    * Converts json object to an object of type Region.
@@ -54,7 +58,8 @@ class Region {
       json.longitude,
       json.radius,
       json.frompositiondetection,
-      json.eventname
+      json.eventname,
+      json.spenttime
     );
   }
 }