iOS7的一些bugfix

wanghengheng · wanghengheng · commit cf0831fd2067 · 2015-01-23T12:02:33.000+08:00
diff --git a/Coding_iOS/Controllers/AddTopicViewController.m b/Coding_iOS/Controllers/AddTopicViewController.m
@@ -83,7 +83,7 @@ - (void)addTopicBtnClicked:(id)sender{
     self.myProTopic.title = _inputTitleView.text;
     self.myProTopic.content = _inputContentView.text;
     
-    if (_myProTopic.title.length <= 0 || _myProTopic.content <= 0) {
+    if (_myProTopic.title.length <= 0 || _myProTopic.htmlMedia.contentOrigional <= 0) {
         kTipAlert(@"&#33267;&#23569;&#20889;&#28857;&#20160;&#20040;&#21526;");
         return;
     }
diff --git a/Coding_iOS/Controllers/MeSetting/FeedbackViewController.m b/Coding_iOS/Controllers/MeSetting/FeedbackViewController.m
@@ -90,7 +90,7 @@ - (void)feedbackBtnClicked:(id)sender{
     self.myProTopic.title = _inputTitleView.text;
     self.myProTopic.content = _inputContentView.text;
     
-    if (_myProTopic.title.length <= 0 || _myProTopic.content <= 0) {
+    if (_myProTopic.title.length <= 0 || _myProTopic.htmlMedia.contentOrigional <= 0) {
         kTipAlert(@"&#33267;&#23569;&#20889;&#28857;&#20160;&#20040;&#21526;");
         return;
     }
diff --git a/Coding_iOS/Models/HtmlMedia.m b/Coding_iOS/Models/HtmlMedia.m
@@ -17,7 +17,7 @@ - (instancetype)initWithString:(NSString *)htmlString showType:(MediaShowType)sh
             htmlString = [NSString stringWithFormat:@"<body>%@</body>", htmlString];
         }
 
-        _contentDisplay = [[NSMutableString alloc] init];
+        _contentDisplay = [NSMutableString stringWithString:@""];
         _mediaItems = [[NSMutableArray alloc] init];
         
         NSData *data=[htmlString dataUsingEncoding:NSUTF8StringEncoding];
diff --git a/Coding_iOS/Models/ProjectTopic.m b/Coding_iOS/Models/ProjectTopic.m
@@ -56,7 +56,7 @@ - (NSString *)toAddTopicPath{
 }
 - (NSDictionary *)toAddTopicParams{
     return @{@"title" : [_title aliasedString],
-             @"content" : [_content aliasedString]};
+             @"content" : [_htmlMedia.contentOrigional aliasedString]};
 }
 
 - (NSString *)toCommentsPath{
diff --git a/Coding_iOS/Vendor/ActionSheetPicker/AbstractActionSheetPicker.m b/Coding_iOS/Vendor/ActionSheetPicker/AbstractActionSheetPicker.m
@@ -50,7 +50,7 @@ CG_INLINE BOOL isIPhone4()
 
 
 
-@interface AbstractActionSheetPicker ()
+@interface AbstractActionSheetPicker ()<UIGestureRecognizerDelegate>
 
 @property(nonatomic, strong) UIBarButtonItem *barButtonItem;
 @property(nonatomic, strong) UIBarButtonItem *doneBarButtonItem;
@@ -486,7 +486,9 @@ - (void)configureAndPresentActionSheetForView:(UIView *)aView
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(didRotate:) name:UIApplicationWillChangeStatusBarOrientationNotification object:nil];
 
     _actionSheet = [[SWActionSheet alloc] initWithView:aView];
+    
     UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(handleTap:)];
+    tap.delegate = self;
     [_actionSheet addGestureRecognizer:tap];
 
     [self presentActionSheet:_actionSheet];
@@ -497,9 +499,6 @@ - (void)configureAndPresentActionSheetForView:(UIView *)aView
     [UIView commitAnimations];
 }
 
--(void)handleTap:(UIGestureRecognizer*) recognizer{
-    [self actionPickerCancel:nil];
-}
 - (void) didRotate:(NSNotification *)notification
 {
     UIInterfaceOrientationMask supportedInterfaceOrientations = (UIInterfaceOrientationMask) [[UIApplication sharedApplication]
@@ -584,6 +583,15 @@ - (void)popoverControllerDidDismissPopover:(UIPopoverController *)popoverControl
     [self notifyTarget:self.target didCancelWithAction:self.cancelAction origin:[self storedOrigin]];
 }
 
+#pragma mark UIGestureRecognizerDelegate
+- (BOOL)gestureRecognizerShouldBegin:(UIGestureRecognizer *)gestureRecognizer{
+    CGPoint location = [gestureRecognizer locationInView:self.toolbar];
+    return !CGRectContainsPoint(self.toolbar.bounds, location);
+}
+
+-(void)handleTap:(UIGestureRecognizer*) recognizer{
+    [self actionPickerCancel:nil];
+}
 
 @end
 

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ - (void)addTopicBtnClicked:(id)sender{`
`83`	`83`	`self.myProTopic.title = _inputTitleView.text;`
`84`	`84`	`self.myProTopic.content = _inputContentView.text;`
`85`	`85`
`86`		`- if (_myProTopic.title.length <= 0 \|\| _myProTopic.content <= 0) {`
	`86`	`+ if (_myProTopic.title.length <= 0 \|\| _myProTopic.htmlMedia.contentOrigional <= 0) {`
`87`	`87`	`kTipAlert(@"至少写点什么吖");`
`88`	`88`	`return;`
`89`	`89`	`}`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ - (void)feedbackBtnClicked:(id)sender{`
`90`	`90`	`self.myProTopic.title = _inputTitleView.text;`
`91`	`91`	`self.myProTopic.content = _inputContentView.text;`
`92`	`92`
`93`		`- if (_myProTopic.title.length <= 0 \|\| _myProTopic.content <= 0) {`
	`93`	`+ if (_myProTopic.title.length <= 0 \|\| _myProTopic.htmlMedia.contentOrigional <= 0) {`
`94`	`94`	`kTipAlert(@"至少写点什么吖");`
`95`	`95`	`return;`
`96`	`96`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ - (instancetype)initWithString:(NSString *)htmlString showType:(MediaShowType)sh`
`17`	`17`	`htmlString = [NSString stringWithFormat:@"<body>%@</body>", htmlString];`
`18`	`18`	`}`
`19`	`19`
`20`		`- _contentDisplay = [[NSMutableString alloc] init];`
	`20`	`+ _contentDisplay = [NSMutableString stringWithString:@""];`
`21`	`21`	`_mediaItems = [[NSMutableArray alloc] init];`
`22`	`22`
`23`	`23`	`NSData *data=[htmlString dataUsingEncoding:NSUTF8StringEncoding];`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ - (NSString *)toAddTopicPath{`
`56`	`56`	`}`
`57`	`57`	`- (NSDictionary *)toAddTopicParams{`
`58`	`58`	`return @{@"title" : [_title aliasedString],`
`59`		`- @"content" : [_content aliasedString]};`
	`59`	`+ @"content" : [_htmlMedia.contentOrigional aliasedString]};`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`- (NSString *)toCommentsPath{`