md编辑优化

wanghengheng · wanghengheng · commit a462cf845383 · 2015-02-11T18:53:49.000+08:00
diff --git a/Coding_iOS/Controllers/EditTaskViewController.m b/Coding_iOS/Controllers/EditTaskViewController.m
@@ -479,7 +479,9 @@ - (void)goToDescriptionVC{
     }
     ESWeakSelf;
     TaskDescriptionViewController *vc = [[TaskDescriptionViewController alloc] init];
+    vc.curTask = _myCopyTask;
     vc.markdown = _myCopyTask.task_description.markdown;
+    
     vc.savedNewMDBlock = ^(NSString *mdStr, NSString *mdHtmlStr){
         ESStrongSelf;
         _self.myCopyTask.has_description = [NSNumber numberWithBool:(mdStr.length > 0)];
diff --git a/Coding_iOS/Controllers/EditTopicViewController.m b/Coding_iOS/Controllers/EditTopicViewController.m
@@ -122,6 +122,7 @@ - (void)loadEditView{
         [_editView addSubview:_inputTitleView];
         
         _inputContentView = [[EaseMarkdownTextView alloc] initWithFrame:CGRectZero];
+        _inputContentView.curProject = self.curProTopic.project;
         _inputContentView.textColor = [UIColor colorWithHexString:@"0x666666"];
         
         _inputContentView.backgroundColor = [UIColor clearColor];
diff --git a/Coding_iOS/Controllers/TaskDescriptionViewController.h b/Coding_iOS/Controllers/TaskDescriptionViewController.h
@@ -7,9 +7,11 @@
 //
 
 #import "BaseViewController.h"
+#import "Tasks.h"
 
 @interface TaskDescriptionViewController : BaseViewController
 @property (strong, nonatomic) NSString *markdown;
+@property (strong, nonatomic) Task *curTask;
 @property (copy, nonatomic) void(^savedNewMDBlock)(NSString *mdStr, NSString *mdHtmlStr);
 
 @end
diff --git a/Coding_iOS/Controllers/TaskDescriptionViewController.m b/Coding_iOS/Controllers/TaskDescriptionViewController.m
@@ -103,6 +103,7 @@ - (void)setCurIndex:(NSInteger)curIndex{
 - (void)loadEditView{
     if (!_editView) {
         _editView = [[EaseMarkdownTextView alloc] initWithFrame:self.view.bounds];
+        _editView.curProject = self.curTask.project;
         _editView.backgroundColor = [UIColor clearColor];
         _editView.textColor = [UIColor colorWithHexString:@"0x666666"];
         _editView.font = [UIFont systemFontOfSize:16];
diff --git a/Coding_iOS/Models/Task.h b/Coding_iOS/Models/Task.h
@@ -79,7 +79,6 @@ typedef NS_ENUM(NSInteger, TaskHandleType) {
 
 @interface Task_Description : NSObject
 @property (strong, nonatomic) NSString *description_mine, *markdown;
-@property (strong, nonatomic) HtmlMedia *htmlMedia;
 + (instancetype)taskDescriptionFrom:(Task_Description *)oldDes;
 + (instancetype)defaultDescription;
 - (BOOL)isSameTo:(Task_Description *)td;
diff --git a/Coding_iOS/Models/Task.m b/Coding_iOS/Models/Task.m
@@ -272,21 +272,13 @@ - (instancetype)init
     return self;
 }
 
-- (void)setDescription_mine:(NSString *)description_mine{
-    if (_description_mine != description_mine) {
-        _htmlMedia = [HtmlMedia htmlMediaWithString:description_mine showType:MediaShowTypeImageAndMonkey];
-        _description_mine = _htmlMedia.contentDisplay;
-    }
-}
-
 + (instancetype)taskDescriptionFrom:(Task_Description *)oldDes{
     if (!oldDes) {
         return nil;
     }
     Task_Description *des = [[Task_Description alloc] init];
     des.markdown = oldDes.markdown;
     des.description_mine = oldDes.description_mine;
-    des.htmlMedia = oldDes.htmlMedia;
     return des;
 }
 + (instancetype)defaultDescription{
diff --git a/Coding_iOS/Vendor/RFKeyboardToolbar/RFToolbarButton.m b/Coding_iOS/Vendor/RFKeyboardToolbar/RFToolbarButton.m
@@ -41,6 +41,7 @@ - (id)initWithTitle:(NSString *)title {
 
 - (id)init {
     CGSize sizeOfText = [self.title sizeWithAttributes:@{NSFontAttributeName:[UIFont boldSystemFontOfSize:14.f]}];
+    sizeOfText.width = MAX(sizeOfText.width, 20);
     
     if (self = [super initWithFrame:CGRectMake(0, 0, sizeOfText.width + 18.104, sizeOfText.height + 10.298)]) {
         self.backgroundColor = [UIColor colorWithWhite:0.902 alpha:1.0];
diff --git a/Coding_iOS/Views/EaseMarkdownTextView.h b/Coding_iOS/Views/EaseMarkdownTextView.h
@@ -8,6 +8,8 @@
 
 #import <UIKit/UIKit.h>
 #import "UIPlaceHolderTextView.h"
-@interface EaseMarkdownTextView : UIPlaceHolderTextView
+#import "Projects.h"
 
+@interface EaseMarkdownTextView : UIPlaceHolderTextView
+@property (strong, nonatomic) Project *curProject;
 @end
diff --git a/Coding_iOS/Views/EaseMarkdownTextView.m b/Coding_iOS/Views/EaseMarkdownTextView.m
@@ -9,6 +9,13 @@
 #import "EaseMarkdownTextView.h"
 #import "RFKeyboardToolbar.h"
 #import "RFToolbarButton.h"
+#import <RegexKitLite/RegexKitLite.h>
+
+//at某人的功能
+#import "UsersViewController.h"
+#import "ProjectMemberListViewController.h"
+#import "Users.h"
+#import "Login.h"
 
 
 @implementation EaseMarkdownTextView
@@ -20,46 +27,69 @@ - (id)initWithFrame:(CGRect)frame {
 }
 
 - (NSArray *)buttons {
-    return @[[self createButtonWithTitle:@"#" andEventHandler:^{ [self insertText:@"#"]; }],
+    return @[
+             [self createButtonWithTitle:@"@" andEventHandler:^{ [self doAT]; }],
+             
+             [self createButtonWithTitle:@"#" andEventHandler:^{ [self insertText:@"#"]; }],
              [self createButtonWithTitle:@"*" andEventHandler:^{ [self insertText:@"*"]; }],
-             [self createButtonWithTitle:@"_" andEventHandler:^{ [self insertText:@"_"]; }],
              [self createButtonWithTitle:@"`" andEventHandler:^{ [self insertText:@"`"]; }],
-             [self createButtonWithTitle:@"@" andEventHandler:^{ [self insertText:@"@"]; }],
+             [self createButtonWithTitle:@"-" andEventHandler:^{ [self insertText:@"-"]; }],
+             
+             
+             
+             [self createButtonWithTitle:@"标题" andEventHandler:^{ [self doTitle]; }],
+             [self createButtonWithTitle:@"粗体" andEventHandler:^{ [self doBold]; }],
+             [self createButtonWithTitle:@"斜体" andEventHandler:^{ [self doItalic]; }],
+             [self createButtonWithTitle:@"代码" andEventHandler:^{ [self doCode]; }],
+             [self createButtonWithTitle:@"引用" andEventHandler:^{ [self doQuote]; }],
+             [self createButtonWithTitle:@"列表" andEventHandler:^{ [self doList]; }],
+             
              [self createButtonWithTitle:@"链接" andEventHandler:^{
+                 NSString *tipStr = @"在此输入链接描述";
                  NSRange selectionRange = self.selectedRange;
                  selectionRange.location += 1;
-                 [self insertText:@"[]()"];
-                 [self setSelectionRange:selectionRange];
-                 
-             }],
-             [self createButtonWithTitle:@"代码" andEventHandler:^{
-                 NSRange selectionRange = self.selectedRange;
-                 selectionRange.location += self.text.length == 0 ? 3 : 4;
-                 
-                 [self insertText: self.text.length == 0 ? @"```\n```" : @"\n```\n```"];
+                 selectionRange.length = tipStr.length;
+
+                 [self insertText:[NSString stringWithFormat:@"[%@]()", tipStr]];
                  [self setSelectionRange:selectionRange];
              }],
+             
              [self createButtonWithTitle:@"图片链接" andEventHandler:^{
+                 NSString *tipStr = @"在此输入图片描述";
                  NSRange selectionRange = self.selectedRange;
                  selectionRange.location += 2;
-                 
-                 [self insertText:@"![]()"];
-                 [self setSelectionRange:self.selectedRange];
-             }],
-             [self createButtonWithTitle:@"任务" andEventHandler:^{
-                 NSRange selectionRange = self.selectedRange;
-                 selectionRange.location += 7;
-                 
-                 [self insertText:self.text.length == 0 ? @"- [ ] " : @"\n- [ ] "];
+                 selectionRange.length = tipStr.length;
+
+                 [self insertText:[NSString stringWithFormat:@"![%@]()", tipStr]];
                  [self setSelectionRange:selectionRange];
              }],
-             [self createButtonWithTitle:@"引用" andEventHandler:^{
+             
+             [self createButtonWithTitle:@"分割线" andEventHandler:^{
                  NSRange selectionRange = self.selectedRange;
-                 selectionRange.location += 3;
+                 NSString *insertStr = [self needPreNewLine]? @"\n\n------\n": @"\n------\n";
+                 
+                 selectionRange.location += insertStr.length;
+                 selectionRange.length = 0;
                  
-                 [self insertText:self.text.length == 0 ? @"> " : @"\n> "];
+                 [self insertText:insertStr];
                  [self setSelectionRange:selectionRange];
-             }]];
+             }],
+             
+             [self createButtonWithTitle:@"_" andEventHandler:^{ [self insertText:@"_"]; }],
+             [self createButtonWithTitle:@"+" andEventHandler:^{ [self insertText:@"+"]; }],
+             [self createButtonWithTitle:@"~" andEventHandler:^{ [self insertText:@"~"]; }],
+             [self createButtonWithTitle:@"=" andEventHandler:^{ [self insertText:@"="]; }],
+             [self createButtonWithTitle:@"[" andEventHandler:^{ [self insertText:@"["]; }],
+             [self createButtonWithTitle:@"]" andEventHandler:^{ [self insertText:@"]"]; }],
+             [self createButtonWithTitle:@"<" andEventHandler:^{ [self insertText:@"<"]; }],
+             [self createButtonWithTitle:@">" andEventHandler:^{ [self insertText:@">"]; }]
+             ];
+}
+
+- (BOOL)needPreNewLine{
+    NSString *preStr = [self.text substringToIndex:self.selectedRange.location];
+    return !(preStr.length == 0
+            || [preStr isMatchedByRegex:@"[\\n\\r]+[\\t\\f]*$"]);
 }
 
 - (RFToolbarButton *)createButtonWithTitle:(NSString*)title andEventHandler:(void(^)())handler {
@@ -73,4 +103,90 @@ - (void)setSelectionRange:(NSRange)range {
     self.selectedRange = range;
     self.tintColor = previousTint;
 }
+
+#pragma mark md_Method
+- (void)doTitle{
+    [self doMDWithLeftStr:@"## " rightStr:@" ##" tipStr:@"在此输入标题" doNeedPreNewLine:YES];
+}
+
+- (void)doBold{
+    [self doMDWithLeftStr:@"**" rightStr:@"**" tipStr:@"在此输入粗体文字" doNeedPreNewLine:NO];
+}
+
+- (void)doItalic{
+    [self doMDWithLeftStr:@"*" rightStr:@"*" tipStr:@"在此输入斜体文字" doNeedPreNewLine:NO];
+}
+
+- (void)doCode{
+    [self doMDWithLeftStr:@"```\n" rightStr:@"\n```" tipStr:@"在此输入代码片段" doNeedPreNewLine:YES];
+}
+
+- (void)doQuote{
+    [self doMDWithLeftStr:@"> " rightStr:@"" tipStr:@"在此输入引用文字" doNeedPreNewLine:YES];
+}
+
+- (void)doList{
+    [self doMDWithLeftStr:@"- " rightStr:@"" tipStr:@"在此输入列表项" doNeedPreNewLine:YES];
+}
+
+- (void)doMDWithLeftStr:(NSString *)leftStr rightStr:(NSString *)rightStr tipStr:(NSString *)tipStr doNeedPreNewLine:(BOOL)doNeedPreNewLine{
+    
+    BOOL needPreNewLine = doNeedPreNewLine? [self needPreNewLine]: NO;
+    
+    
+    if (!leftStr || !rightStr || !tipStr) {
+        return;
+    }
+    NSRange selectionRange = self.selectedRange;
+    NSString *insertStr = [self.text substringWithRange:selectionRange];
+    
+    if (selectionRange.length > 0) {//已有选中文字
+        //撤销
+        if (selectionRange.location >= leftStr.length && selectionRange.location + selectionRange.length + rightStr.length <= self.text.length) {
+            NSRange expandRange = NSMakeRange(selectionRange.location- leftStr.length, selectionRange.length +leftStr.length +rightStr.length);
+            if ([self.text rangeOfString:[NSString stringWithFormat:@"%@%@%@", leftStr, insertStr, rightStr] options:NSLiteralSearch range:expandRange].location != NSNotFound) {
+                selectionRange.location -= leftStr.length;
+                selectionRange.length = insertStr.length;
+                self.text = [self.text stringByReplacingCharactersInRange:expandRange withString:insertStr];
+                [self setSelectionRange:selectionRange];
+                return;
+            }
+        }
+        //添加
+        selectionRange.location += needPreNewLine? leftStr.length +1: leftStr.length;
+        insertStr = [NSString stringWithFormat:needPreNewLine? @"\n%@%@%@": @"%@%@%@", leftStr, insertStr, rightStr];
+    }else{//未选中任何文字
+        //添加
+        selectionRange.location += needPreNewLine? leftStr.length +1: leftStr.length;
+        selectionRange.length = tipStr.length;
+        insertStr = [NSString stringWithFormat:needPreNewLine? @"\n%@%@%@": @"%@%@%@", leftStr, tipStr, rightStr];
+    }
+    [self insertText:insertStr];
+    [self setSelectionRange:selectionRange];
+}
+
+#pragma mark AT
+- (void)doAT{
+    __weak typeof(self) weakSelf = self;
+    if (self.curProject) {
+        //@项目成员
+        [ProjectMemberListViewController showATSomeoneWithBlock:^(User *curUser) {
+            [weakSelf atSomeUser:curUser andRange:self.selectedRange];
+        } withProject:self.curProject];
+    }else{
+        //@好友
+        [UsersViewController showATSomeoneWithBlock:^(User *curUser) {
+            [weakSelf atSomeUser:curUser andRange:self.selectedRange];
+        }];
+    }
+}
+
+- (void)atSomeUser:(User *)curUser andRange:(NSRange)range{
+    if (curUser) {
+        NSString *appendingStr = [NSString stringWithFormat:@"@%@ ", curUser.name];
+        [self insertText:appendingStr];
+    }
+}
+
+
 @end
