diff --git a/.DS_Store b/.DS_Store index a6f9199..7419854 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/Ifish/Info.plist b/Ifish/Info.plist index 8a69ec5..e18985a 100644 --- a/Ifish/Info.plist +++ b/Ifish/Info.plist @@ -70,7 +70,7 @@ CFBundleVersion - 5.0.1 + 5.0.2 ITSAppUsesNonExemptEncryption LSApplicationCategoryType diff --git a/Ifish/controllers/IfishTabControllers/探索/IfishNewShopsFlie/IfishShopEdite/VController/IfishShopEditeNewViewController.m b/Ifish/controllers/IfishTabControllers/探索/IfishNewShopsFlie/IfishShopEdite/VController/IfishShopEditeNewViewController.m index ec3ca63..812aead 100644 --- a/Ifish/controllers/IfishTabControllers/探索/IfishNewShopsFlie/IfishShopEdite/VController/IfishShopEditeNewViewController.m +++ b/Ifish/controllers/IfishTabControllers/探索/IfishNewShopsFlie/IfishShopEdite/VController/IfishShopEditeNewViewController.m @@ -115,8 +115,15 @@ UIGestureRecognizerDelegate> UIAlertController *alert = [UIAlertController alertControllerWithTitle:@"提示" message:@"请在设置中打开定位" preferredStyle:UIAlertControllerStyleAlert]; UIAlertAction *ok = [UIAlertAction actionWithTitle:@"打开定位" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) { - NSURL *settingURL = [NSURL URLWithString:UIApplicationOpenSettingsURLString]; - [[UIApplication sharedApplication]openURL:settingURL]; + NSURL * url = [NSURL URLWithString:UIApplicationOpenSettingsURLString]; + + if([[UIApplication sharedApplication] canOpenURL:url]) { + if (@available(iOS 10.0, *)) { + [[UIApplication sharedApplication] openURL:url options:@{} completionHandler:nil]; + }else { + [[UIApplication sharedApplication] openURL:url]; + } + } }]; UIAlertAction *cancel = [UIAlertAction actionWithTitle:@"取消" style:UIAlertActionStyleCancel handler:^(UIAlertAction * _Nonnull action) { diff --git a/Ifish/controllers/IfishTabControllers/探索/IfishNewShopsFlie/ShopCertificationNewFile/view/ShopCerPart1InfoViewCell.m b/Ifish/controllers/IfishTabControllers/探索/IfishNewShopsFlie/ShopCertificationNewFile/view/ShopCerPart1InfoViewCell.m index b8ae8ef..4662fea 100644 --- a/Ifish/controllers/IfishTabControllers/探索/IfishNewShopsFlie/ShopCertificationNewFile/view/ShopCerPart1InfoViewCell.m +++ b/Ifish/controllers/IfishTabControllers/探索/IfishNewShopsFlie/ShopCertificationNewFile/view/ShopCerPart1InfoViewCell.m @@ -80,8 +80,14 @@ UIAlertController *alert = [UIAlertController alertControllerWithTitle:@"提示" message:@"请在设置中打开定位" preferredStyle:UIAlertControllerStyleAlert]; UIAlertAction *ok = [UIAlertAction actionWithTitle:@"打开定位" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) { - NSURL *settingURL = [NSURL URLWithString:UIApplicationOpenSettingsURLString]; - [[UIApplication sharedApplication]openURL:settingURL]; + NSURL * url = [NSURL URLWithString:UIApplicationOpenSettingsURLString]; + if([[UIApplication sharedApplication] canOpenURL:url]) { + if (@available(iOS 10.0, *)) { + [[UIApplication sharedApplication] openURL:url options:@{} completionHandler:nil]; + }else { + [[UIApplication sharedApplication] openURL:url]; + } + } }]; UIAlertAction *cancel = [UIAlertAction actionWithTitle:@"取消" style:UIAlertActionStyleCancel handler:^(UIAlertAction * _Nonnull action) { diff --git a/Ifish/controllers/IfishTabControllers/探索/lookafterWorkbech/ShopEditViewController.m b/Ifish/controllers/IfishTabControllers/探索/lookafterWorkbech/ShopEditViewController.m index 649c9f9..28d4f17 100644 --- a/Ifish/controllers/IfishTabControllers/探索/lookafterWorkbech/ShopEditViewController.m +++ b/Ifish/controllers/IfishTabControllers/探索/lookafterWorkbech/ShopEditViewController.m @@ -105,8 +105,15 @@ UIAlertController *alert = [UIAlertController alertControllerWithTitle:@"提示" message:@"请在设置中打开定位" preferredStyle:UIAlertControllerStyleAlert]; UIAlertAction *ok = [UIAlertAction actionWithTitle:@"打开定位" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) { - NSURL *settingURL = [NSURL URLWithString:UIApplicationOpenSettingsURLString]; - [[UIApplication sharedApplication]openURL:settingURL]; + NSURL * url = [NSURL URLWithString:UIApplicationOpenSettingsURLString]; + + if([[UIApplication sharedApplication] canOpenURL:url]) { + if (@available(iOS 10.0, *)) { + [[UIApplication sharedApplication] openURL:url options:@{} completionHandler:nil]; + }else { + [[UIApplication sharedApplication] openURL:url]; + } + } }]; UIAlertAction *cancel = [UIAlertAction actionWithTitle:@"取消" style:UIAlertActionStyleCancel handler:^(UIAlertAction * _Nonnull action) { diff --git a/Ifish/controllers/IfishTabControllers/探索/shopCertification/ShopCertificationViewController.m b/Ifish/controllers/IfishTabControllers/探索/shopCertification/ShopCertificationViewController.m index a83e32d..6e7f175 100644 --- a/Ifish/controllers/IfishTabControllers/探索/shopCertification/ShopCertificationViewController.m +++ b/Ifish/controllers/IfishTabControllers/探索/shopCertification/ShopCertificationViewController.m @@ -174,8 +174,14 @@ UIAlertController *alert = [UIAlertController alertControllerWithTitle:@"提示" message:@"请在设置中打开定位" preferredStyle:UIAlertControllerStyleAlert]; UIAlertAction *ok = [UIAlertAction actionWithTitle:@"打开定位" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) { - NSURL *settingURL = [NSURL URLWithString:UIApplicationOpenSettingsURLString]; - [[UIApplication sharedApplication]openURL:settingURL]; + NSURL * url = [NSURL URLWithString:UIApplicationOpenSettingsURLString]; + if([[UIApplication sharedApplication] canOpenURL:url]) { + if (@available(iOS 10.0, *)) { + [[UIApplication sharedApplication] openURL:url options:@{} completionHandler:nil]; + }else { + [[UIApplication sharedApplication] openURL:url]; + } + } }]; UIAlertAction *cancel = [UIAlertAction actionWithTitle:@"取消" style:UIAlertActionStyleCancel handler:^(UIAlertAction * _Nonnull action) { diff --git a/Ifish/controllers/logAddRegistController/LogInViewController.m b/Ifish/controllers/logAddRegistController/LogInViewController.m index a31a2cf..77a43a3 100644 --- a/Ifish/controllers/logAddRegistController/LogInViewController.m +++ b/Ifish/controllers/logAddRegistController/LogInViewController.m @@ -500,8 +500,14 @@ UIAlertController *alert = [UIAlertController alertControllerWithTitle:@"提示" message:@"请在设置中打开定位" preferredStyle:UIAlertControllerStyleAlert]; UIAlertAction *ok = [UIAlertAction actionWithTitle:@"打开定位" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) { - NSURL *settingURL = [NSURL URLWithString:UIApplicationOpenSettingsURLString]; - [[UIApplication sharedApplication]openURL:settingURL]; + NSURL * url = [NSURL URLWithString:UIApplicationOpenSettingsURLString]; + if([[UIApplication sharedApplication] canOpenURL:url]) { + if (@available(iOS 10.0, *)) { + [[UIApplication sharedApplication] openURL:url options:@{} completionHandler:nil]; + }else { + [[UIApplication sharedApplication] openURL:url]; + } + } }]; UIAlertAction *cancel = [UIAlertAction actionWithTitle:@"取消" style:UIAlertActionStyleCancel handler:^(UIAlertAction * _Nonnull action) { diff --git a/Ifish/controllers/logAddRegistController/RegistViewController.mm b/Ifish/controllers/logAddRegistController/RegistViewController.mm index 8674645..d1b2677 100644 --- a/Ifish/controllers/logAddRegistController/RegistViewController.mm +++ b/Ifish/controllers/logAddRegistController/RegistViewController.mm @@ -126,8 +126,14 @@ extern BOOL formLogIn; UIAlertController *alert = [UIAlertController alertControllerWithTitle:@"提示" message:@"请在设置中打开定位" preferredStyle:UIAlertControllerStyleAlert]; UIAlertAction *ok = [UIAlertAction actionWithTitle:@"打开定位" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) { - NSURL *settingURL = [NSURL URLWithString:UIApplicationOpenSettingsURLString]; - [[UIApplication sharedApplication]openURL:settingURL]; + NSURL * url = [NSURL URLWithString:UIApplicationOpenSettingsURLString]; + if([[UIApplication sharedApplication] canOpenURL:url]) { + if (@available(iOS 10.0, *)) { + [[UIApplication sharedApplication] openURL:url options:@{} completionHandler:nil]; + }else { + [[UIApplication sharedApplication] openURL:url]; + } + } }]; UIAlertAction *cancel = [UIAlertAction actionWithTitle:@"取消" style:UIAlertActionStyleCancel handler:^(UIAlertAction * _Nonnull action) { diff --git a/Ifish/views/CustomcamerFile/CusomeCameraViewController.m b/Ifish/views/CustomcamerFile/CusomeCameraViewController.m index a6575e0..b42a8b1 100644 --- a/Ifish/views/CustomcamerFile/CusomeCameraViewController.m +++ b/Ifish/views/CustomcamerFile/CusomeCameraViewController.m @@ -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]; + } } } }