From c7199d933f7f6208613c9beead42797cc9d313ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=80=E5=8F=AA=E4=BC=9A=E7=BC=96=E7=A8=8B=E7=9A=84?= =?UTF-8?q?=E7=8B=AE=E5=AD=90?= Date: Mon, 21 Oct 2019 21:59:37 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90modify=E3=80=91=EF=BC=9A=E8=A2=AB?= =?UTF-8?q?=E6=8B=92=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .DS_Store | Bin 10244 -> 10244 bytes Ifish/Info.plist | 2 +- .../IfishShopEditeNewViewController.m | 11 +++++++++-- .../view/ShopCerPart1InfoViewCell.m | 10 ++++++++-- .../lookafterWorkbech/ShopEditViewController.m | 11 +++++++++-- .../ShopCertificationViewController.m | 10 ++++++++-- .../LogInViewController.m | 10 ++++++++-- .../RegistViewController.mm | 10 ++++++++-- .../CusomeCameraViewController.m | 8 +++++--- 9 files changed, 56 insertions(+), 16 deletions(-) diff --git a/.DS_Store b/.DS_Store index a6f91990bc6e3c1aa5a565422c627aeb1010cb19..7419854d34c2229821a6a90e278adfb1f24adebf 100644 GIT binary patch delta 27 jcmZn(XbIR*Bf_kz{A2P)5v9qRLcC0B0-HC8ga`uwg>eX% delta 27 jcmZn(XbIR*Bf_k>Y2)OLB1)4rg?O2iCT!jy5+V!$jbI5^ 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]; + } } } }