From c8e94936bfe474e90a8b92715fb5adcaf259f216 Mon Sep 17 00:00:00 2001 From: 20150024 Date: Wed, 3 Jan 2018 18:45:46 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AA=BF=E6=95=B4metadata=E7=9A=84=E8=BD=89?= =?UTF-8?q?=E6=8F=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RCTAppleHealthKit+Methods_Vitals.m | 24 +++------- RCTAppleHealthKit/RCTAppleHealthKit+Queries.m | 48 +++++-------------- 2 files changed, 18 insertions(+), 54 deletions(-) diff --git a/RCTAppleHealthKit/RCTAppleHealthKit+Methods_Vitals.m b/RCTAppleHealthKit/RCTAppleHealthKit+Methods_Vitals.m index e93082b..132ff4a 100644 --- a/RCTAppleHealthKit/RCTAppleHealthKit+Methods_Vitals.m +++ b/RCTAppleHealthKit/RCTAppleHealthKit+Methods_Vitals.m @@ -151,15 +151,9 @@ NSString *uuid = bloodPressureSystolicValue.UUID.UUIDString; - NSError *error; - NSDictionary *metaDict; - if(bloodPressureSystolicValue.metadata == nil){ - metaDict = [[NSDictionary alloc] init]; - }else{ - metaDict = bloodPressureSystolicValue.metadata; - } - NSData *jsonData = [NSJSONSerialization dataWithJSONObject:metaDict options:NSJSONWritingPrettyPrinted error:&error]; - NSString *metadata =[[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding]; + NSString *metadata = [bloodPressureSystolicValue.metadata == nil ? @"" : bloodPressureSystolicValue.metadata.description stringByReplacingOccurrencesOfString:@" " withString:@""]; + metadata = [metadata stringByReplacingOccurrencesOfString:@"\r" withString:@""]; + metadata = [metadata stringByReplacingOccurrencesOfString:@"\n" withString:@""]; NSDictionary *elem = @{ @"bloodPressureSystolicValue" : @([bloodPressureSystolicValue.quantity doubleValueForUnit:unit]), @@ -232,15 +226,9 @@ NSString *uuid = bloodPressureValues.UUID.UUIDString; - NSError *error; - NSDictionary *metaDict; - if(bloodPressureSystolicValue.metadata == nil){ - metaDict = [[NSDictionary alloc] init]; - }else{ - metaDict = bloodPressureSystolicValue.metadata; - } - NSData *jsonData = [NSJSONSerialization dataWithJSONObject:metaDict options:NSJSONWritingPrettyPrinted error:&error]; - NSString *metadata =[[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding]; + NSString *metadata = [bloodPressureSystolicValue.metadata == nil ? @"" : bloodPressureSystolicValue.metadata.description stringByReplacingOccurrencesOfString:@" " withString:@""]; + metadata = [metadata stringByReplacingOccurrencesOfString:@"\r" withString:@""]; + metadata = [metadata stringByReplacingOccurrencesOfString:@"\n" withString:@""]; NSDictionary *elem = @{ @"bloodPressureSystolicValue" : @([bloodPressureSystolicValue.quantity doubleValueForUnit:unit]), diff --git a/RCTAppleHealthKit/RCTAppleHealthKit+Queries.m b/RCTAppleHealthKit/RCTAppleHealthKit+Queries.m index 45749d7..ea4c6ed 100644 --- a/RCTAppleHealthKit/RCTAppleHealthKit+Queries.m +++ b/RCTAppleHealthKit/RCTAppleHealthKit+Queries.m @@ -92,15 +92,9 @@ NSString *uuid = sample.UUID.UUIDString; - NSError *error; - NSDictionary *metaDict; - if(sample.metadata == nil){ - metaDict = [[NSDictionary alloc] init]; - }else{ - metaDict = sample.metadata; - } - NSData *jsonData = [NSJSONSerialization dataWithJSONObject:metaDict options:NSJSONWritingPrettyPrinted error:&error]; - NSString *metadata =[[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding]; + NSString *metadata = [sample.metadata == nil ? @"" : sample.metadata.description stringByReplacingOccurrencesOfString:@" " withString:@""]; + metadata = [metadata stringByReplacingOccurrencesOfString:@"\r" withString:@""]; + metadata = [metadata stringByReplacingOccurrencesOfString:@"\n" withString:@""]; NSDictionary *elem = @{ @"value" : @(value), @@ -202,15 +196,9 @@ NSString *uuid = sample.UUID.UUIDString; - NSError *error; - NSDictionary *metaDict; - if(sample.metadata == nil){ - metaDict = [[NSDictionary alloc] init]; - }else{ - metaDict = sample.metadata; - } - NSData *jsonData = [NSJSONSerialization dataWithJSONObject:metaDict options:NSJSONWritingPrettyPrinted error:&error]; - NSString *metadata =[[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding]; + NSString *metadata = [sample.metadata == nil ? @"" : sample.metadata.description stringByReplacingOccurrencesOfString:@" " withString:@""]; + metadata = [metadata stringByReplacingOccurrencesOfString:@"\r" withString:@""]; + metadata = [metadata stringByReplacingOccurrencesOfString:@"\n" withString:@""]; NSDictionary *elem = @{ @"value" : valueString, @@ -540,15 +528,9 @@ NSString *uuid = sample.UUID.UUIDString; - NSError *error; - NSDictionary *metaDict; - if(sample.metadata == nil){ - metaDict = [[NSDictionary alloc] init]; - }else{ - metaDict = sample.metadata; - } - NSData *jsonData = [NSJSONSerialization dataWithJSONObject:metaDict options:NSJSONWritingPrettyPrinted error:&error]; - NSString *metadata =[[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding]; + NSString *metadata = [sample.metadata == nil ? @"" : sample.metadata.description stringByReplacingOccurrencesOfString:@" " withString:@""]; + metadata = [metadata stringByReplacingOccurrencesOfString:@"\r" withString:@""]; + metadata = [metadata stringByReplacingOccurrencesOfString:@"\n" withString:@""]; NSDictionary *elem = @{ @"value" : @(value), @@ -698,15 +680,9 @@ NSString *uuid = sample.UUID.UUIDString; - NSError *error; - NSDictionary *metaDict; - if(sample.metadata == nil){ - metaDict = [[NSDictionary alloc] init]; - }else{ - metaDict = sample.metadata; - } - NSData *jsonData = [NSJSONSerialization dataWithJSONObject:metaDict options:NSJSONWritingPrettyPrinted error:&error]; - NSString *metadata =[[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding]; + NSString *metadata = [sample.metadata == nil ? @"" : sample.metadata.description stringByReplacingOccurrencesOfString:@" " withString:@""]; + metadata = [metadata stringByReplacingOccurrencesOfString:@"\r" withString:@""]; + metadata = [metadata stringByReplacingOccurrencesOfString:@"\n" withString:@""]; NSDictionary *elem = @{ @"value" : valueString, -- 2.26.2