【无API变动】修复iCloud云存档写入新的key之后再读取获得空字符串的问题；规范函数命名

Author: Aaron8052

Plugins/iOS/Native/ExternC.mm

@@ -234,7 +234,7 @@ bool _IsICloudAvailable(){
         return [iCloudKeyValueStore IsICloudAvailable];
     }
     bool _ICloudKeyExists(const char *key){
-        return [iCloudKeyValueStore KeyExists:[NSString stringWithUTF8String:key ?: ""]];
+        return [iCloudKeyValueStore IsKeyExists:[NSString stringWithUTF8String:key ?: ""]];
     }
     bool _ClearICloudSave(){
         return [iCloudKeyValueStore ClearICloudSave];

Plugins/iOS/Native/iCloudKeyValueStore.mm

@@ -6,7 +6,6 @@
 @implementation iCloudKeyValueStore
 
 static NSUbiquitousKeyValueStore *keyValueStore;
-static NSDictionary *cloudDictionary;
 static BOOL inited;
 
 +(BOOL)IsUserLoggedIn
@@ -19,7 +18,6 @@ +(void) InitICloud
     if(!inited && [iCloudKeyValueStore IsUserLoggedIn])
     {
         keyValueStore = [NSUbiquitousKeyValueStore defaultStore];
-        cloudDictionary = [keyValueStore dictionaryRepresentation];
         inited = YES;
     }
 }
@@ -53,26 +51,24 @@ +(BOOL) Synchronize
     return [keyValueStore synchronize];
 }
 
-+(BOOL)KeyExists:(NSString *)key
++(BOOL)IsKeyExists:(NSString *)key
 {
     if([iCloudKeyValueStore IsICloudAvailable]){
 
-        return [cloudDictionary objectForKey:key] != nil ;
+        return [[keyValueStore dictionaryRepresentation] objectForKey:key] != nil ;
     }
     return NO;
 }
 
 +(BOOL)ClearICloudSave{
-    if([iCloudKeyValueStore IsICloudAvailable]){
-        @autoreleasepool {
-            NSLog(@"Clearing iCloud Saves");
-        }
-        NSArray *keyArray = [cloudDictionary allKeys];
+    if([iCloudKeyValueStore IsICloudAvailable])
+    {
+        NSArray *keyArray = [[keyValueStore dictionaryRepresentation] allKeys];
 
         for(int i = 0; i < keyArray.count; i++){
             @autoreleasepool {
                 NSString *key = [keyArray objectAtIndex:i];
-                if(key != NULL){
+                if(key != nil){
                     [keyValueStore removeObjectForKey:key];
                 }
             }
@@ -87,7 +83,7 @@ +(double)GetFloat:(NSString *)key defaultValue:(double)defaultValue
 {
     if([iCloudKeyValueStore IsICloudAvailable]){
 
-        if ([iCloudKeyValueStore KeyExists:key]){
+        if ([iCloudKeyValueStore IsKeyExists:key]){
             return [keyValueStore doubleForKey:key];
         }
         //[iCloudKeyValueStore iCloudSaveFloat:key setValue:defaultValue];
@@ -114,7 +110,7 @@ +(int)GetInt:(NSString *)key defaultValue:(int)defaultValue
 {
     if([iCloudKeyValueStore IsICloudAvailable]){
 
-        if ([iCloudKeyValueStore KeyExists:key]){
+        if ([iCloudKeyValueStore IsKeyExists:key]){
             return [[keyValueStore objectForKey:key] intValue];
         }
         //[iCloudKeyValueStore iCloudSaveInt:key setValue:defaultValue];
@@ -140,7 +136,7 @@ +(BOOL)GetBool:(NSString *)key defaultValue:(BOOL)defaultValue
 {
     if([iCloudKeyValueStore IsICloudAvailable]){
 
-        if ([iCloudKeyValueStore KeyExists:key]){
+        if ([iCloudKeyValueStore IsKeyExists:key]){
             return [keyValueStore boolForKey:key];
         }
         //[iCloudKeyValueStore iCloudSaveBool:key setValue:defaultValue];
@@ -166,7 +162,7 @@ +(NSString *)GetString:(NSString *)key defaultValue:(NSString *)defaultValue
 {
     if([iCloudKeyValueStore IsICloudAvailable]){
 
-        if ([iCloudKeyValueStore KeyExists:key]){
+        if ([iCloudKeyValueStore IsKeyExists:key]){
             return [keyValueStore stringForKey:key];
         }
         //[iCloudKeyValueStore iCloudSaveString:key setValue:defaultValue];

Plugins/iOS/Native/iOSNative.h

@@ -6,7 +6,6 @@
 
 extern UIViewController *UnityGetGLViewController();
 
-
 //GKGameCenterControllerDelegate 实现GameCenterView回调协议
 @interface iOSGameKit : NSObject <GKGameCenterControllerDelegate>
 +(void)ShowGameCenterView:(CompletionCallback)callback;
@@ -56,7 +55,7 @@ extern UIViewController *UnityGetGLViewController();
 @interface iCloudKeyValueStore : NSObject
 +(void)InitICloud;
 +(BOOL)IsICloudAvailable;
-+(BOOL)KeyExists:(NSString *)key;
++(BOOL)IsKeyExists:(NSString *)key;
 +(BOOL)ClearICloudSave;
 +(double)GetFloat:(NSString *)key defaultValue:(double)defaultValue;
 +(BOOL)SetFloat:(NSString *)key setValue:(double)value;