重写iCloud的Available检测 & 重命名Native代码内部分成员名

Author: Aaron8052

Plugins/iOS/Native/ExternC.mm

@@ -227,7 +227,7 @@ void _RemoveAllPendingNotifications(){
 
     //iCloudKeyValueStore
     void _InitializeICloud(){
-        [iCloudKeyValueStore init];
+        [iCloudKeyValueStore InitICloud];
     }
 
     bool _IsICloudAvailable(){

Plugins/iOS/Native/iCloudKeyValueStore.mm

@@ -1,38 +1,38 @@
 #import "iOSNative.h"
 
 
+
+
+@implementation iCloudKeyValueStore
+
 static NSUbiquitousKeyValueStore *keyValueStore;
 static NSDictionary *cloudDictionary;
-static BOOL iCloudInited;
-static BOOL availability;
-static NSInteger availabilityAttemptsCount;
+static BOOL inited;
 
-@implementation iCloudKeyValueStore
-+(BOOL)userLoggedIn{
++(BOOL)IsUserLoggedIn
+{
     return [[NSFileManager defaultManager] ubiquityIdentityToken] != nil;
 }
-+(void) init{
-    if(!iCloudInited && [iCloudKeyValueStore userLoggedIn]){
-        @autoreleasepool{
-            NSLog(@"init iCloud!");
-        }
+
++(void) InitICloud
+{
+    if(!inited && [iCloudKeyValueStore IsUserLoggedIn])
+    {
         keyValueStore = [NSUbiquitousKeyValueStore defaultStore];
-        
         cloudDictionary = [keyValueStore dictionaryRepresentation];
-        availabilityAttemptsCount = 0;
-        iCloudInited = YES;
+        inited = YES;
     }
 }
 
-+(BOOL)checkForAvailability{
-    if(availabilityAttemptsCount > 20){
-        return availability;
-    }
+static BOOL canWrite;
++(BOOL)IsICloudAvailable
+{
+    [iCloudKeyValueStore InitICloud];
+    if(![iCloudKeyValueStore IsUserLoggedIn])
+        return NO;
 
-    if(![iCloudKeyValueStore userLoggedIn] || !iCloudInited || !keyValueStore){
-        availability = NO;
-    }
-    else if(iCloudInited && !availability && availabilityAttemptsCount < 20){
+    if(!canWrite)
+    {
         NSDate *nowDate = [NSDate date];
         NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
         [dateFormatter setDateFormat:@"yyyy-MM-dd HH:mm:ss"];
@@ -42,24 +42,15 @@ +(BOOL)checkForAvailability{
 
         NSString *keyString = @"initKey";
         [keyValueStore setString:valueString forKey:keyString];
-        
-        if([[keyValueStore objectForKey:keyString] isEqualToString:valueString])
-        {
-            availability = [keyValueStore synchronize];
-        }
-        else{
-            availability = NO;
-        }
-
+        canWrite = [[keyValueStore objectForKey:keyString] isEqualToString:valueString] && [keyValueStore synchronize];
     }
-    LOG([NSString stringWithFormat: @"iCloud availability: %@", availability ? @"YES": @"NO"]);
-    availabilityAttemptsCount ++;
-    return availability;
 
+    return canWrite;
 }
-+(BOOL)IsICloudAvailable
+
++(BOOL) Synchronize
 {
-    return [iCloudKeyValueStore checkForAvailability];
+    return [keyValueStore synchronize];
 }
 
 +(BOOL)KeyExists:(NSString *)key
@@ -197,9 +188,7 @@ +(BOOL)SetString:(NSString *)key setValue:(NSString *)value
     return NO;
 }
 
-+(BOOL) Synchronize{
-    return [keyValueStore synchronize];
-}
+
 @end
 
 

Plugins/iOS/Native/iOSNative.h

@@ -54,7 +54,7 @@ extern UIViewController *UnityGetGLViewController();
 
 
 @interface iCloudKeyValueStore : NSObject
-+(void)init;
++(void)InitICloud;
 +(BOOL)IsICloudAvailable;
 +(BOOL)KeyExists:(NSString *)key;
 +(BOOL)ClearICloudSave;