diff --git a/Ifish.xcodeproj/project.pbxproj b/Ifish.xcodeproj/project.pbxproj index 4e842f2..e655c1f 100644 --- a/Ifish.xcodeproj/project.pbxproj +++ b/Ifish.xcodeproj/project.pbxproj @@ -15813,7 +15813,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 2; + CURRENT_PROJECT_VERSION = 3; DEVELOPMENT_TEAM = WFX8GD5HFX; ENABLE_BITCODE = NO; ENABLE_TESTABILITY = YES; @@ -15931,7 +15931,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 2; + CURRENT_PROJECT_VERSION = 3; DEVELOPMENT_TEAM = WFX8GD5HFX; ENABLE_BITCODE = NO; ENABLE_TESTABILITY = YES; diff --git a/Ifish/controllers/ConnectAauariumVC/ConAquarMethodVC.m b/Ifish/controllers/ConnectAauariumVC/ConAquarMethodVC.m index 9d07a43..affe258 100644 --- a/Ifish/controllers/ConnectAauariumVC/ConAquarMethodVC.m +++ b/Ifish/controllers/ConnectAauariumVC/ConAquarMethodVC.m @@ -97,22 +97,14 @@ Strong UILabel *subTitleLabel; UIAlertController *alert = [UIAlertController alertControllerWithTitle:@"提示" message:@"需要定位权限才能获取wifi信息给设备配网,来添加设备" preferredStyle:UIAlertControllerStyleAlert]; - UIAlertAction *ok = [UIAlertAction actionWithTitle:@"打开定位" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) { - 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 *ok = [UIAlertAction actionWithTitle:@"确定" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) { + [self.navigationController popViewControllerAnimated:YES]; }]; UIAlertAction *cancel = [UIAlertAction actionWithTitle:@"取消" style:UIAlertActionStyleDestructive handler:^(UIAlertAction * _Nonnull action) { [self.navigationController popViewControllerAnimated:YES]; }]; [alert addAction:ok]; - [alert addAction:cancel]; + //[alert addAction:cancel]; [self presentViewController:alert animated:YES completion:nil]; diff --git a/Ifish/controllers/IfishTabControllers/探索/IfishNewShopsFlie/IfishShopEdite/VController/IfishShopEditeNewViewController.m b/Ifish/controllers/IfishTabControllers/探索/IfishNewShopsFlie/IfishShopEdite/VController/IfishShopEditeNewViewController.m index 812aead..48378a3 100644 --- a/Ifish/controllers/IfishTabControllers/探索/IfishNewShopsFlie/IfishShopEdite/VController/IfishShopEditeNewViewController.m +++ b/Ifish/controllers/IfishTabControllers/探索/IfishNewShopsFlie/IfishShopEdite/VController/IfishShopEditeNewViewController.m @@ -130,7 +130,7 @@ UIGestureRecognizerDelegate> }]; [alert addAction:cancel]; [alert addAction:ok]; - [self presentViewController:alert animated:YES completion:nil]; + // [self presentViewController:alert animated:YES completion:nil]; } #pragma mark - 定位成功 -(void)locationManager:(CLLocationManager *)manager didUpdateLocations:(NSArray *)locations{ diff --git a/Ifish/controllers/IfishTabControllers/探索/IfishNewShopsFlie/ShopCertificationNewFile/view/ShopCerPart1InfoViewCell.m b/Ifish/controllers/IfishTabControllers/探索/IfishNewShopsFlie/ShopCertificationNewFile/view/ShopCerPart1InfoViewCell.m index 4662fea..7b29e23 100644 --- a/Ifish/controllers/IfishTabControllers/探索/IfishNewShopsFlie/ShopCertificationNewFile/view/ShopCerPart1InfoViewCell.m +++ b/Ifish/controllers/IfishTabControllers/探索/IfishNewShopsFlie/ShopCertificationNewFile/view/ShopCerPart1InfoViewCell.m @@ -95,7 +95,7 @@ [alert addAction:cancel]; [alert addAction:ok]; - [self.window.rootViewController presentViewController:alert animated:YES completion:nil]; + // [self.window.rootViewController presentViewController:alert animated:YES completion:nil]; } #pragma mark - 定位成功 -(void)locationManager:(CLLocationManager *)manager didUpdateLocations:(NSArray *)locations{ diff --git a/Ifish/controllers/IfishTabControllers/探索/lookafterWorkbech/ShopEditViewController.m b/Ifish/controllers/IfishTabControllers/探索/lookafterWorkbech/ShopEditViewController.m index 28d4f17..dfc2f07 100644 --- a/Ifish/controllers/IfishTabControllers/探索/lookafterWorkbech/ShopEditViewController.m +++ b/Ifish/controllers/IfishTabControllers/探索/lookafterWorkbech/ShopEditViewController.m @@ -120,7 +120,7 @@ }]; [alert addAction:cancel]; [alert addAction:ok]; - [self presentViewController:alert animated:YES completion:nil]; + // [self presentViewController:alert animated:YES completion:nil]; } #pragma mark - 定位成功 -(void)locationManager:(CLLocationManager *)manager didUpdateLocations:(NSArray *)locations{ diff --git a/Ifish/controllers/IfishTabControllers/探索/shopCertification/ShopCertificationViewController.m b/Ifish/controllers/IfishTabControllers/探索/shopCertification/ShopCertificationViewController.m index 6e7f175..fc92d2d 100644 --- a/Ifish/controllers/IfishTabControllers/探索/shopCertification/ShopCertificationViewController.m +++ b/Ifish/controllers/IfishTabControllers/探索/shopCertification/ShopCertificationViewController.m @@ -188,7 +188,7 @@ }]; [alert addAction:cancel]; [alert addAction:ok]; - [self presentViewController:alert animated:YES completion:nil]; + //[self presentViewController:alert animated:YES completion:nil]; } #pragma mark - 定位成功 -(void)locationManager:(CLLocationManager *)manager didUpdateLocations:(NSArray *)locations{ diff --git a/Ifish/controllers/logAddRegistController/LogInViewController.m b/Ifish/controllers/logAddRegistController/LogInViewController.m index 4685912..f182ee3 100644 --- a/Ifish/controllers/logAddRegistController/LogInViewController.m +++ b/Ifish/controllers/logAddRegistController/LogInViewController.m @@ -564,7 +564,7 @@ }]; [alert addAction:cancel]; [alert addAction:ok]; - [self presentViewController:alert animated:YES completion:nil]; + // [self presentViewController:alert animated:YES completion:nil]; } #pragma mark - 定位成功 -(void)locationManager:(CLLocationManager *)manager didUpdateLocations:(NSArray *)locations{ diff --git a/Ifish/controllers/logAddRegistController/RegistViewController.mm b/Ifish/controllers/logAddRegistController/RegistViewController.mm index 5baefd6..95873eb 100644 --- a/Ifish/controllers/logAddRegistController/RegistViewController.mm +++ b/Ifish/controllers/logAddRegistController/RegistViewController.mm @@ -162,7 +162,7 @@ extern BOOL formLogIn; }]; [alert addAction:cancel]; [alert addAction:ok]; - [self presentViewController:alert animated:YES completion:nil]; + // [self presentViewController:alert animated:YES completion:nil]; } #pragma mark - 定位成功 -(void)locationManager:(CLLocationManager *)manager didUpdateLocations:(NSArray *)locations{