Merge branch 'develop' into develop_01

# Conflicts: # .DS_Store # Ifish/Info.plist
2019-10-22 21:44:23 +08:00
parent 382d44ae13 c7199d933f
commit 0627410d7a
7 changed files with 55 additions and 15 deletions
@@ -527,9 +527,11 @@
        NSURL * url = [NSURL URLWithString:UIApplicationOpenSettingsURLString];
        
        if([[UIApplication sharedApplication] canOpenURL:url]) {
-            
-            [[UIApplication sharedApplication] openURL:url];
-            
+            if (@available(iOS 10.0, *)) {
+                [[UIApplication sharedApplication] openURL:url options:@{} completionHandler:nil];
+            }else {
+                [[UIApplication sharedApplication] openURL:url];
+            }
        }
    }
 }