@sentiance-react-native/core 6.3.1 → 6.4.0-rc.1

package/ios/RNSentianceCore+Converter.h

@@ -51,5 +51,6 @@ typedef NS_ENUM(NSInteger, UIBackgroundRefreshStatus);
 - (NSSet<NSNumber*> *)convertStringTransmittableDataTypes:(NSArray<NSString*>*)stringDataTypes;
 - (NSDictionary *)convertDrivingInsights:(SENTDrivingInsights *)drivingInsights;
 - (NSArray *)convertHarshDrivingEvents:(NSArray<SENTHarshDrivingEvent*> *)harshDrivingEvents;
+- (NSArray *)convertPhoneUsageEvents:(NSArray<SENTPhoneUsageEvent*> *)phoneUsageEvents;
 
 @end

package/ios/RNSentianceCore+Converter.m

@@ -1130,7 +1130,16 @@
     [self addTransportEventInfoToDict:transportEventDict event:drivingInsights.transportEvent];
     dict[@"transportEvent"] = transportEventDict;
 
-    safetyScoresDict[@"smoothScore"] = drivingInsights.safetyScores.smoothScore;
+    NSNumber* smoothScore = drivingInsights.safetyScores.smoothScore;
+    if (smoothScore != nil) {
+        safetyScoresDict[@"smoothScore"] = smoothScore;
+    }
+
+    NSNumber* focusScore = drivingInsights.safetyScores.focusScore;
+    if (focusScore != nil) {
+        safetyScoresDict[@"focusScore"] = focusScore;
+    }
+
     dict[@"safetyScores"] = safetyScoresDict;
 
     return dict;
@@ -1145,11 +1154,30 @@
 }
 
 - (NSDictionary<NSString *, NSNumber *> *)convertHarshDrivingEvent:(SENTHarshDrivingEvent *)harshDrivingEvent {
-    NSMutableDictionary<NSString *, NSNumber *> *dict = [[NSMutableDictionary alloc] init];
-    dict[@"time"] = [harshDrivingEvent.date description];
-    dict[@"timeEpoch"] = @((long) (harshDrivingEvent.date.timeIntervalSince1970 * 1000));
+    NSMutableDictionary<NSString *, NSNumber *> *dict = [self convertDrivingEvent:harshDrivingEvent];
     dict[@"magnitude"] = @(harshDrivingEvent.magnitude);
     return dict;
 }
 
+- (NSArray<NSDictionary<NSString *, NSNumber *> *> *)convertPhoneUsageEvents:(NSArray<SENTPhoneUsageEvent*> *)phoneUsageEvents {
+    NSMutableArray <NSDictionary<NSString *, NSNumber *> *> *array = [[NSMutableArray alloc] init];
+    for (SENTPhoneUsageEvent *event in phoneUsageEvents) {
+        [array addObject:[self convertPhoneUsage:event]];
+    }
+    return array;
+}
+
+- (NSDictionary<NSString *, NSNumber *> *)convertPhoneUsageEvent:(SENTPhoneUsageEvent *)phoneUsageEvent {
+    return [self convertDrivingEvent:phoneUsageEvent];
+}
+
+- (NSMutableDictionary<NSString *, NSNumber *> *)convertDrivingEvent:(SENTDrivingEvent *)drivingEvent {
+    NSMutableDictionary<NSString *, NSNumber *> *dict = [[NSMutableDictionary alloc] init];
+    dict[@"startTime"] = [drivingEvent.startDate description];
+    dict[@"startTimeEpoch"] = @((long) (drivingEvent.startDate.timeIntervalSince1970 * 1000));
+    dict[@"endTime"] = [drivingEvent.endDate description];
+    dict[@"endTimeEpoch"] = @((long) (drivingEvent.endDate.timeIntervalSince1970 * 1000));
+    return dict;
+}
+
 @end

package/ios/RNSentianceCore.m

@@ -1054,6 +1054,14 @@ RCT_EXPORT_METHOD(getHarshDrivingEvents:(NSString*)transportId resolver:(RCTProm
     resolve([self convertHarshDrivingEvents:harshDrivingEvents]);
 }
 
+RCT_EXPORT_METHOD(getPhoneUsageEvents:(NSString*)transportId resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
+{
+    REJECT_IF_SDK_NOT_INITIALIZED(reject);
+
+    NSArray<SENTPhoneUsageEvent *> *phoneUsageEvents = [[Sentiance sharedInstance] getPhoneUsageEventsForTransportId:transportId];
+    resolve([self convertPhoneUsageEvents:phoneUsageEvents]);
+}
+
 RCT_EXPORT_METHOD(addNativeListener:(NSString *)eventName subscriptionId:(NSInteger)subscriptionId resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
     REJECT_IF_SDK_NOT_INITIALIZED(reject);
 

package/ios/RNSentianceCore.podspec

@@ -4,7 +4,7 @@ sentiance_sdk_version = package['sdkVersions']['ios']['sentiance']
 
 Pod::Spec.new do |s|
   s.name         = "RNSentianceCore"
-  s.version      = "6.3.1"
+  s.version      = "6.4.0-rc.1"
   s.summary      = "RNSentianceCore"
   s.description  = <<-DESC
                    RNSentianceCore

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentiance-react-native/core",
-  "version": "6.3.1",
+  "version": "6.4.0-rc.1",
   "description": "React Native Sentiance core library",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -29,10 +29,10 @@
       "targetSdk": 31,
       "compileSdk": 31,
       "buildTools": "30.0.3",
-      "sentiance": "6.3.+"
+      "sentiance": "6.4.+"
     },
     "ios": {
-      "sentiance": "~> 6.3.0"
+      "sentiance": "~> 6.4.0"
     }
   }
 }