Alert、ActionSheet 弹窗控件改为 AlertController 等警告处理

Author: wanghengheng

Coding_iOS.xcodeproj/project.pbxproj

@@ -49,17 +49,10 @@ @implementation AppDelegate
 
 #pragma mark XGPush
 - (void)registerPush{
-    float sysVer = [[[UIDevice currentDevice] systemVersion] floatValue];
-    if(sysVer < 8){
-        [[UIApplication sharedApplication] registerForRemoteNotificationTypes:(UIRemoteNotificationTypeAlert | UIRemoteNotificationTypeBadge | UIRemoteNotificationTypeSound)];
-    }else{
-#if __IPHONE_OS_VERSION_MAX_ALLOWED >= _IPHONE80_
-        UIMutableUserNotificationCategory *categorys = [[UIMutableUserNotificationCategory alloc] init];
-        UIUserNotificationSettings *userSettings = [UIUserNotificationSettings settingsForTypes:UIUserNotificationTypeBadge|UIUserNotificationTypeSound|UIUserNotificationTypeAlert
-                                                                                     categories:[NSSet setWithObject:categorys]];
-        [[UIApplication sharedApplication] registerUserNotificationSettings:userSettings];
-#endif
-    }
+    UIMutableUserNotificationCategory *categorys = [[UIMutableUserNotificationCategory alloc] init];
+    UIUserNotificationSettings *userSettings = [UIUserNotificationSettings settingsForTypes:UIUserNotificationTypeBadge|UIUserNotificationTypeSound|UIUserNotificationTypeAlert
+                                                                                 categories:[NSSet setWithObject:categorys]];
+    [[UIApplication sharedApplication] registerUserNotificationSettings:userSettings];
 }
 
 #pragma mark UserAgent
@@ -315,7 +308,7 @@ - (void)customizeInterface {
 }
 
 #pragma mark URL Schemes
-- (BOOL)application:(UIApplication *)application openURL:(NSURL *)url sourceApplication:(NSString *)sourceApplication annotation:(id)annotation{
+- (BOOL)application:(UIApplication *)app openURL:(NSURL *)url options:(NSDictionary<UIApplicationOpenURLOptionsKey, id> *)options{
     DebugLog(@"path: %@, params: %@", [url path], [url queryParams]);
     if ([url.absoluteString hasPrefix:kCodingAppScheme]) {
         NSDictionary *queryParams = [url queryParams];
@@ -337,16 +330,46 @@ - (BOOL)application:(UIApplication *)application openURL:(NSURL *)url sourceAppl
     }else if ([url.absoluteString hasPrefix:@"en-:"]){
         return [[ENSession sharedSession] handleOpenURL:url];
     }else{
-        return [[UMSocialManager defaultManager] handleOpenURL:url sourceApplication:sourceApplication annotation:annotation];
+        return [[UMSocialManager defaultManager] handleOpenURL:url options:options];
     }
     return YES;
 }
 
+//- (BOOL)application:(UIApplication *)application openURL:(NSURL *)url sourceApplication:(NSString *)sourceApplication annotation:(id)annotation{
+//    DebugLog(@"path: %@, params: %@", [url path], [url queryParams]);
+//    if ([url.absoluteString hasPrefix:kCodingAppScheme]) {
+//        NSDictionary *queryParams = [url queryParams];
+//        if ([url.host isEqualToString:@"safepay"]) {//支付宝支付
+//            [self p_handlePayURL:url];
+//        }else if (queryParams[@"email"] && queryParams[@"key"]) {//重置密码
+//            [self showPasswordWithURL:url];
+//        }else if ([queryParams[@"type"] isEqualToString:@"tweet"]){//发冒泡
+//            if ([Login isLogin]) {
+//                [TweetSendViewController presentWithParams:queryParams];
+//            }else{
+//                [NSObject showHudTipStr:@"未登录"];
+//            }
+//        }else{//一般模式解析网页
+//            [BaseViewController presentLinkStr:url.absoluteString];
+//        }
+//    }else if ([url.scheme isEqualToString:kSocial_WX_ID] && [url.host isEqualToString:@"pay"]){//微信支付
+//        [self p_handlePayURL:url];
+//    }else if ([url.absoluteString hasPrefix:@"en-:"]){
+//        return [[ENSession sharedSession] handleOpenURL:url];
+//    }else{
+//        return [[UMSocialManager defaultManager] handleOpenURL:url sourceApplication:sourceApplication annotation:annotation];
+//    }
+//    return YES;
+//}
+
 - (void)p_handlePayURL:(NSURL *)url{
     UIViewController *vc = [BaseViewController presentingVC];
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wundeclared-selector"
     if ([vc respondsToSelector:@selector(handlePayURL:)]) {
         [vc performSelector:@selector(handlePayURL:) withObject:url];
     }
+#pragma clang diagnostic pop
 }
 
 - (BOOL)showPasswordWithURL:(NSURL *)url{

Coding_iOS/AppDelegate.m

@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11201" systemVersion="16A323" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11161"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -18,6 +21,7 @@
                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                 <subviews>
                     <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="pqQ-5g-Tfd">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <connections>
                             <outlet property="dataSource" destination="MpB-NS-FiR" id="HCw-SA-EqP"/>

Coding_iOS/Controllers/AddReviewerViewController.xib

@@ -51,7 +51,7 @@ - (void)rightNavBtnClicked{
         [actionTitles removeObjectsInRange:NSMakeRange(0, 2)];
     }
     __weak typeof(self) weakSelf = self;
-    [[UIActionSheet bk_actionSheetCustomWithTitle:nil buttonTitles:actionTitles destructiveTitle:nil cancelTitle:@"取消" andDidDismissBlock:^(UIActionSheet *sheet, NSInteger index) {
+    [[UIAlertController ea_actionSheetCustomWithTitle:nil buttonTitles:actionTitles destructiveTitle:nil cancelTitle:@"取消" andDidDismissBlock:^(UIAlertAction *action, NSInteger index) {
         if (!weakSelf.myCodeTree.can_edit) {
             index += 2;
         }

Coding_iOS/Controllers/CodeListViewController.m

@@ -183,12 +183,12 @@ - (void)rightNavBtnClicked{
         [actionTitles removeObjectAtIndex:0];
     }
     __weak typeof(self) weakSelf = self;
-    [[UIActionSheet bk_actionSheetCustomWithTitle:nil buttonTitles:actionTitles destructiveTitle:self.myCodeFile.can_edit? @"删除文件": nil cancelTitle:@"取消" andDidDismissBlock:^(UIActionSheet *sheet, NSInteger index) {
-        [weakSelf actionSheetClicked:sheet index:index];
+    [[UIAlertController ea_actionSheetCustomWithTitle:nil buttonTitles:actionTitles destructiveTitle:self.myCodeFile.can_edit? @"删除文件": nil cancelTitle:@"取消" andDidDismissBlock:^(UIAlertAction *action, NSInteger index) {
+        [weakSelf actionSheetClickedIndex:index];
     }] showInView:self.view];
 }
 
-- (void)actionSheetClicked:(UIActionSheet *)sheet index:(NSInteger)index{
+- (void)actionSheetClickedIndex:(NSInteger)index{
     if (!self.myCodeFile.can_edit || [self.myCodeFile.file.mode isEqualToString:@"image"]) {
         index++;
     }
@@ -205,7 +205,7 @@ - (void)actionSheetClicked:(UIActionSheet *)sheet index:(NSInteger)index{
 
 - (void)deleteBtnClicked{
     __weak typeof(self) weakSelf = self;
-    [[UIActionSheet bk_actionSheetCustomWithTitle:[NSString stringWithFormat:@"确定要删除文件 %@ 吗？", _myCodeFile.file.name] buttonTitles:nil destructiveTitle:@"确认删除" cancelTitle:@"取消" andDidDismissBlock:^(UIActionSheet *sheet, NSInteger index) {
+    [[UIAlertController ea_actionSheetCustomWithTitle:[NSString stringWithFormat:@"确定要删除文件 %@ 吗？", _myCodeFile.file.name] buttonTitles:nil destructiveTitle:@"确认删除" cancelTitle:@"取消" andDidDismissBlock:^(UIAlertAction *action, NSInteger index) {
         if (index == 0) {
             [weakSelf sendDeleteRequst];
         }

Coding_iOS/Controllers/CodeViewController.m

@@ -282,7 +282,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
         ESStrongSelf;
         _self.messageToResendOrDelete = curMessage;
         [_self.myMsgInputView isAndResignFirstResponder];
-        UIActionSheet *actionSheet = [UIActionSheet bk_actionSheetCustomWithTitle:@"重新发送" buttonTitles:@[@"发送"] destructiveTitle:nil cancelTitle:@"取消" andDidDismissBlock:^(UIActionSheet *sheet, NSInteger index) {
+        UIAlertController *actionSheet = [UIAlertController ea_actionSheetCustomWithTitle:@"重新发送" buttonTitles:@[@"发送"] destructiveTitle:nil cancelTitle:@"取消" andDidDismissBlock:^(UIAlertAction *action, NSInteger index) {
             if (index == 0 && _self.messageToResendOrDelete) {
                 [_self sendPrivateMessageWithMsg:_messageToResendOrDelete];
             }
@@ -333,7 +333,7 @@ - (void)showAlertToDeleteMessage:(PrivateMessage *)toDeleteMsg{
     self.messageToResendOrDelete = toDeleteMsg;
     [self.myMsgInputView isAndResignFirstResponder];
     ESWeakSelf
-    UIActionSheet *actionSheet = [UIActionSheet bk_actionSheetCustomWithTitle:@"删除后将不会出现在你的私信记录中" buttonTitles:nil destructiveTitle:@"确认删除" cancelTitle:@"取消" andDidDismissBlock:^(UIActionSheet *sheet, NSInteger index) {
+    UIAlertController *actionSheet = [UIAlertController ea_actionSheetCustomWithTitle:@"删除后将不会出现在你的私信记录中" buttonTitles:nil destructiveTitle:@"确认删除" cancelTitle:@"取消" andDidDismissBlock:^(UIAlertAction *action, NSInteger index) {
         ESStrongSelf
         if (index == 0 && _self.messageToResendOrDelete) {
             [_self deletePrivateMessageWithMsg:_messageToResendOrDelete];

Coding_iOS/Controllers/ConversationViewController.m

@@ -131,7 +131,7 @@ - (void)swipeableTableViewCell:(SWTableViewCell *)cell didTriggerRightUtilityBut
     NSIndexPath *indexPath = [self.myTableView indexPathForCell:cell];
     CodeBranchOrTag *curB = self.myCodeBranches.list[indexPath.row];
     __weak typeof(self) weakSelf = self;
-    [[UIActionSheet bk_actionSheetCustomWithTitle:[NSString stringWithFormat:@"请确认是否要删除分支 %@ ？", curB.name] buttonTitles:nil destructiveTitle:@"确认删除" cancelTitle:@"取消" andDidDismissBlock:^(UIActionSheet *sheet, NSInteger index) {
+    [[UIAlertController ea_actionSheetCustomWithTitle:[NSString stringWithFormat:@"请确认是否要删除分支 %@ ？", curB.name] buttonTitles:nil destructiveTitle:@"确认删除" cancelTitle:@"取消" andDidDismissBlock:^(UIAlertAction *action, NSInteger index) {
         if (index == 0) {
             [weakSelf deleteBranch:curB];
         }

Coding_iOS/Controllers/EACodeBranchListViewController.m

@@ -129,7 +129,7 @@ - (void)swipeableTableViewCell:(SWTableViewCell *)cell didTriggerRightUtilityBut
     NSIndexPath *indexPath = [self.myTableView indexPathForCell:cell];
     EACodeRelease *curR = self.myCodeReleases.list[indexPath.row];
     __weak typeof(self) weakSelf = self;
-    [[UIActionSheet bk_actionSheetCustomWithTitle:[NSString stringWithFormat:@"请确认是否删除版本 %@ ？", curR.tag_name] buttonTitles:nil destructiveTitle:@"确认删除" cancelTitle:@"取消" andDidDismissBlock:^(UIActionSheet *sheet, NSInteger index) {
+    [[UIAlertController ea_actionSheetCustomWithTitle:[NSString stringWithFormat:@"请确认是否删除版本 %@ ？", curR.tag_name] buttonTitles:nil destructiveTitle:@"确认删除" cancelTitle:@"取消" andDidDismissBlock:^(UIAlertAction *action, NSInteger index) {
         if (index == 0) {
             [weakSelf deleteRelease:curR];
         }

Coding_iOS/Controllers/EACodeReleaseListViewController.m

@@ -103,8 +103,8 @@ - (BOOL)navigationShouldPopOnBackButton{
     self.curR.editBody = _inputContentView.text;
     if ([self.curR hasChanged]) {
         __weak typeof(self) weakSelf = self;
-        [[UIAlertView bk_showAlertViewWithTitle:@"提示" message:@"如果不保存，更改将丢失，是否确认返回？" cancelButtonTitle:@"取消" otherButtonTitles:@[@"确认返回"] handler:^(UIAlertView *alertView, NSInteger buttonIndex) {
-            if (buttonIndex != 0) {
+        [[UIAlertController ea_alertViewWithTitle:@"提示" message:@"如果不保存，更改将丢失，是否确认返回？" buttonTitles:@[@"确认返回"] destructiveTitle:nil cancelTitle:@"取消" andDidDismissBlock:^(UIAlertAction *action, NSInteger index) {
+            if (index == 0) {
                 [weakSelf.navigationController popViewControllerAnimated:YES];
             }
         }] show];

Coding_iOS/Controllers/EAEditCodeReleaseViewController.m

@@ -90,7 +90,7 @@ - (void)setupNavBtnAndTitle{
 
 - (void)navBtnClicked{
     __weak typeof(self) weakSelf = self;
-    [[UIActionSheet bk_actionSheetCustomWithTitle:nil buttonTitles:@[@"Pull"] destructiveTitle:@"删除本地 Repo" cancelTitle:@"取消" andDidDismissBlock:^(UIActionSheet *sheet, NSInteger index) {
+    [[UIAlertController ea_actionSheetCustomWithTitle:nil buttonTitles:@[@"Pull"] destructiveTitle:@"删除本地 Repo" cancelTitle:@"取消" andDidDismissBlock:^(UIAlertAction *action, NSInteger index) {
         if (index == 0) {
             [weakSelf pullRepo];
         }else if (index == 1){