Xcode 7 - fix

wanghengheng · wanghengheng · commit 7a350b7bf123 · 2015-07-14T14:46:06.000+08:00
diff --git a/Coding_iOS/Controllers/CodeViewController.m b/Coding_iOS/Controllers/CodeViewController.m
@@ -61,7 +61,7 @@ - (BOOL)shouldAutorotate {
     return YES;
 }
 
-- (NSUInteger)supportedInterfaceOrientations{
+- (UIInterfaceOrientationMask)supportedInterfaceOrientations{
     return UIInterfaceOrientationMaskAllButUpsideDown;
 }
 
diff --git a/Coding_iOS/Controllers/FileChangeDetailViewController.m b/Coding_iOS/Controllers/FileChangeDetailViewController.m
@@ -89,7 +89,7 @@ - (BOOL)shouldAutorotate {
     return YES;
 }
 
-- (NSUInteger)supportedInterfaceOrientations{
+- (UIInterfaceOrientationMask)supportedInterfaceOrientations{
     return UIInterfaceOrientationMaskAllButUpsideDown;
 }
 
diff --git a/Coding_iOS/Controllers/FileViewController.m b/Coding_iOS/Controllers/FileViewController.m
@@ -145,7 +145,7 @@ - (void)loadWebView:(NSURL *)fileUrl{
     }else if ([self.curFile.fileType isEqualToString:@"plist"]
               || [self.curFile.fileType isEqualToString:@"txt"]){
         NSData *fileData = [NSData dataWithContentsOfURL:fileUrl];
-        [self.contentWebView loadData:fileData MIMEType:@"text/text" textEncodingName:@"UTF-8" baseURL:nil];
+        [self.contentWebView loadData:fileData MIMEType:@"text/text" textEncodingName:@"UTF-8" baseURL:fileUrl];
     }else{
         [self.contentWebView loadRequest:[NSURLRequest requestWithURL:fileUrl]];
     }
diff --git a/Coding_iOS/Controllers/Login/IntroductionViewController.m b/Coding_iOS/Controllers/Login/IntroductionViewController.m
@@ -96,7 +96,7 @@ - (UIInterfaceOrientation)preferredInterfaceOrientationForPresentation {
     return UIInterfaceOrientationPortrait;
 }
 
-- (NSUInteger)supportedInterfaceOrientations {
+- (UIInterfaceOrientationMask)supportedInterfaceOrientations {
     return UIInterfaceOrientationMaskPortrait;
 }
 
diff --git a/Coding_iOS/Controllers/NewProject/NewProjectTypeViewController.m b/Coding_iOS/Controllers/NewProject/NewProjectTypeViewController.m
@@ -170,7 +170,7 @@ - (UIInterfaceOrientation)preferredInterfaceOrientationForPresentation {
     return UIInterfaceOrientationPortrait;
 }
 
-- (NSUInteger)supportedInterfaceOrientations {
+- (UIInterfaceOrientationMask)supportedInterfaceOrientations {
     return UIInterfaceOrientationMaskPortrait;
 }
 
diff --git a/Coding_iOS/Controllers/NewProject/NewProjectViewController.m b/Coding_iOS/Controllers/NewProject/NewProjectViewController.m
@@ -257,7 +257,7 @@ - (UIInterfaceOrientation)preferredInterfaceOrientationForPresentation {
     return UIInterfaceOrientationPortrait;
 }
 
-- (NSUInteger)supportedInterfaceOrientations {
+- (UIInterfaceOrientationMask)supportedInterfaceOrientations {
     return UIInterfaceOrientationMaskPortrait;
 }
 
diff --git a/Coding_iOS/Controllers/ProjectSetting/ProjectAdvancedSettingViewController.m b/Coding_iOS/Controllers/ProjectSetting/ProjectAdvancedSettingViewController.m
@@ -168,7 +168,7 @@ - (UIInterfaceOrientation)preferredInterfaceOrientationForPresentation {
     return UIInterfaceOrientationPortrait;
 }
 
-- (NSUInteger)supportedInterfaceOrientations {
+- (UIInterfaceOrientationMask)supportedInterfaceOrientations {
     return UIInterfaceOrientationMaskPortrait;
 }
 
diff --git a/Coding_iOS/Controllers/ProjectSetting/ProjectSettingViewController.m b/Coding_iOS/Controllers/ProjectSetting/ProjectSettingViewController.m
@@ -201,7 +201,7 @@ - (UIInterfaceOrientation)preferredInterfaceOrientationForPresentation {
     return UIInterfaceOrientationPortrait;
 }
 
-- (NSUInteger)supportedInterfaceOrientations {
+- (UIInterfaceOrientationMask)supportedInterfaceOrientations {
     return UIInterfaceOrientationMaskPortrait;
 }
 
diff --git a/Coding_iOS/Controllers/RootControllers/BaseNavigationController.m b/Coding_iOS/Controllers/RootControllers/BaseNavigationController.m
@@ -18,7 +18,7 @@ - (UIInterfaceOrientation)preferredInterfaceOrientationForPresentation{
     return [self.visibleViewController preferredInterfaceOrientationForPresentation];
 }
 
-- (NSUInteger)supportedInterfaceOrientations {
+- (UIInterfaceOrientationMask)supportedInterfaceOrientations {
     return [self.visibleViewController supportedInterfaceOrientations];
 }
 
diff --git a/Coding_iOS/Controllers/RootControllers/BaseViewController.m b/Coding_iOS/Controllers/RootControllers/BaseViewController.m
@@ -88,7 +88,7 @@ - (UIInterfaceOrientation)preferredInterfaceOrientationForPresentation {
     return UIInterfaceOrientationPortrait;
 }
 
-- (NSUInteger)supportedInterfaceOrientations {
+- (UIInterfaceOrientationMask)supportedInterfaceOrientations {
     return UIInterfaceOrientationMaskPortrait;
 }
 
diff --git a/Coding_iOS/Controllers/TweetSendCreateLocationViewController.m b/Coding_iOS/Controllers/TweetSendCreateLocationViewController.m
@@ -109,7 +109,7 @@ - (BOOL)checkTextEdit {
 - (BOOL)shouldAutorotate{
     return NO;
 }
-- (NSUInteger)supportedInterfaceOrientations {
+- (UIInterfaceOrientationMask)supportedInterfaceOrientations {
     return UIInterfaceOrientationMaskPortrait;
 }
 
diff --git a/Coding_iOS/Controllers/TweetSendLocationDetailViewController.m b/Coding_iOS/Controllers/TweetSendLocationDetailViewController.m
@@ -101,7 +101,7 @@ - (UIView *)footerView
 - (BOOL)shouldAutorotate{
     return NO;
 }
-- (NSUInteger)supportedInterfaceOrientations {
+- (UIInterfaceOrientationMask)supportedInterfaceOrientations {
     return UIInterfaceOrientationMaskPortrait;
 }
 
diff --git a/Coding_iOS/Controllers/TweetSendLocationViewController.m b/Coding_iOS/Controllers/TweetSendLocationViewController.m
@@ -156,7 +156,7 @@ - (void)configSearchBar
 - (BOOL)shouldAutorotate{
     return NO;
 }
-- (NSUInteger)supportedInterfaceOrientations {
+- (UIInterfaceOrientationMask)supportedInterfaceOrientations {
     return UIInterfaceOrientationMaskPortrait;
 }
 
diff --git a/Coding_iOS/Images.xcassets/AppIcon.appiconset/120x120-2.png b/Coding_iOS/Images.xcassets/AppIcon.appiconset/120x120-2.png
diff --git a/Coding_iOS/Images.xcassets/AppIcon.appiconset/Contents.json b/Coding_iOS/Images.xcassets/AppIcon.appiconset/Contents.json
@@ -113,12 +113,6 @@
       "idiom" : "ipad",
       "filename" : "152x152.png",
       "scale" : "2x"
-    },
-    {
-      "size" : "120x120",
-      "idiom" : "car",
-      "filename" : "120x120-2.png",
-      "scale" : "1x"
     }
   ],
   "info" : {
diff --git a/Coding_iOS/Util/OC_Category/NSObject+ObjectMap.h b/Coding_iOS/Util/OC_Category/NSObject+ObjectMap.h
@@ -41,7 +41,7 @@
 
 // Copying an NSObject to new memory ref
 // (basically initWithObject)
--(id)initWithObject:(NSObject *)oldObject error:(NSError **)error;
+//-(id)initWithObject:(NSObject *)oldObject error:(NSError **)error;
 
 // Base64 Encode/Decode
 +(NSString *)encodeBase64WithData:(NSData *)objData;
diff --git a/Coding_iOS/Util/OC_Category/NSObject+ObjectMap.m b/Coding_iOS/Util/OC_Category/NSObject+ObjectMap.m
@@ -462,21 +462,22 @@ -(NSMutableDictionary *)getpropertyArrayMap {
 
 #pragma mark - Copy NSObject (initWithObject)
 -(id)initWithObject:(NSObject *)oldObject error:(NSError **)error {
-    NSString *oldClassName = [oldObject nameOfClass];
-    NSString *newClassName = [self nameOfClass];
-    if ([newClassName isEqualToString:oldClassName]) {
-        for (NSString *propertyKey in [[oldObject propertyDictionary] allKeys]) {
-            [self setValue:[oldObject valueForKey:propertyKey] forKey:propertyKey];
+    self = [self init];
+    if (self) {
+        NSString *oldClassName = [oldObject nameOfClass];
+        NSString *newClassName = [self nameOfClass];
+        if ([newClassName isEqualToString:oldClassName]) {
+            for (NSString *propertyKey in [[oldObject propertyDictionary] allKeys]) {
+                [self setValue:[oldObject valueForKey:propertyKey] forKey:propertyKey];
+            }
+        }
+        else {
+            *error = [NSError errorWithDomain:@"MismatchedObjects" code:404 userInfo:@{@"Error":@"Mismatched Object Classes"}];
         }
     }
-    else {
-//        *error = [NSError errorWithDomain:@"MismatchedObjects" code:404 userInfo:@{@"Error":@"Mismatched Object Classes"}];
-    }
-    
     return self;
 }
 
-
 #pragma mark - Object to Data/String/etc.
 
 -(NSDictionary *)objectDictionary {
diff --git a/Coding_iOS/Vendor/JDStatusBarNotification/JDStatusBarNotification.m b/Coding_iOS/Vendor/JDStatusBarNotification/JDStatusBarNotification.m
@@ -525,7 +525,7 @@ - (BOOL)shouldAutorotate {
     return [[self keyWindowRootViewController] shouldAutorotate];
 }
 
-- (NSUInteger)supportedInterfaceOrientations {
+- (UIInterfaceOrientationMask)supportedInterfaceOrientations {
     return [[self keyWindowRootViewController] supportedInterfaceOrientations];
 }
 
diff --git a/Coding_iOS/Vendor/RDVTabBarController/RDVTabBarController.m b/Coding_iOS/Vendor/RDVTabBarController/RDVTabBarController.m
@@ -76,7 +76,7 @@ - (UIInterfaceOrientation)preferredInterfaceOrientationForPresentation{
     return UIInterfaceOrientationPortrait;
 }
 
-- (NSUInteger)supportedInterfaceOrientations {
+- (UIInterfaceOrientationMask)supportedInterfaceOrientations {
     if (self.viewControllers.count > _selectedIndex) {
         UIViewController *viewController = self.viewControllers[_selectedIndex];
         if ([viewController respondsToSelector:@selector(supportedInterfaceOrientations)]) {
diff --git a/Coding_iOS/Vendor/RKSwipeBetweenViewControllers/EasePageViewController.m b/Coding_iOS/Vendor/RKSwipeBetweenViewControllers/EasePageViewController.m
@@ -51,7 +51,7 @@ - (UIInterfaceOrientation)preferredInterfaceOrientationForPresentation {
     return UIInterfaceOrientationPortrait;
 }
 
-- (NSUInteger)supportedInterfaceOrientations {
+- (UIInterfaceOrientationMask)supportedInterfaceOrientations {
     return UIInterfaceOrientationMaskPortrait;
 }
 
diff --git a/Coding_iOS/Views/UIMessageInputView/UIMessageInputView.m b/Coding_iOS/Views/UIMessageInputView/UIMessageInputView.m
@@ -502,7 +502,17 @@ - (void)updateContentViewBecauseOfMedia:(BOOL)becauseOfMedia{
         }
     }
     if (_mediaView) {
-        CGFloat mediaHeight = ceilf(_mediaList.count/3.0)* ([self collectionView:_mediaView layout:nil sizeForItemAtIndexPath:nil].height+ kMessageInputView_MediaPadding) - kMessageInputView_MediaPadding;
+        CGFloat collectionItemHeight;
+        if (_mediaList.count <= 0) {
+            collectionItemHeight = 0;
+        }else if (_mediaList.count == 1) {
+            collectionItemHeight = 0.6* CGRectGetWidth(_inputTextView.frame);
+        }else if (_mediaList.count == 2){
+            collectionItemHeight = (CGRectGetWidth(_inputTextView.frame) - kMessageInputView_MediaPadding)/3;
+        }else{
+            collectionItemHeight = (CGRectGetWidth(_inputTextView.frame) - 2* kMessageInputView_MediaPadding)/3;
+        }
+        CGFloat mediaHeight = ceilf(_mediaList.count/3.0)* (collectionItemHeight+ kMessageInputView_MediaPadding) - kMessageInputView_MediaPadding;
         mediaSize = CGSizeMake(CGRectGetWidth(_mediaView.frame), mediaHeight);
         
         CGRect mediaFrame = CGRectMake(0, CGRectGetMaxY(_inputTextView.frame), mediaSize.width, mediaSize.height);

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ - (BOOL)shouldAutorotate {`
`61`	`61`	`return YES;`
`62`	`62`	`}`
`63`	`63`
`64`		`-- (NSUInteger)supportedInterfaceOrientations{`
	`64`	`+- (UIInterfaceOrientationMask)supportedInterfaceOrientations{`
`65`	`65`	`return UIInterfaceOrientationMaskAllButUpsideDown;`
`66`	`66`	`}`
`67`	`67`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ - (BOOL)shouldAutorotate {`
`89`	`89`	`return YES;`
`90`	`90`	`}`
`91`	`91`
`92`		`-- (NSUInteger)supportedInterfaceOrientations{`
	`92`	`+- (UIInterfaceOrientationMask)supportedInterfaceOrientations{`
`93`	`93`	`return UIInterfaceOrientationMaskAllButUpsideDown;`
`94`	`94`	`}`
`95`	`95`
Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ - (void)loadWebView:(NSURL *)fileUrl{`
`145`	`145`	`}else if ([self.curFile.fileType isEqualToString:@"plist"]`
`146`	`146`	`\|\| [self.curFile.fileType isEqualToString:@"txt"]){`
`147`	`147`	`NSData *fileData = [NSData dataWithContentsOfURL:fileUrl];`
`148`		`- [self.contentWebView loadData:fileData MIMEType:@"text/text" textEncodingName:@"UTF-8" baseURL:nil];`
	`148`	`+ [self.contentWebView loadData:fileData MIMEType:@"text/text" textEncodingName:@"UTF-8" baseURL:fileUrl];`
`149`	`149`	`}else{`
`150`	`150`	`[self.contentWebView loadRequest:[NSURLRequest requestWithURL:fileUrl]];`
`151`	`151`	`}`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ - (UIInterfaceOrientation)preferredInterfaceOrientationForPresentation {`
`96`	`96`	`return UIInterfaceOrientationPortrait;`
`97`	`97`	`}`
`98`	`98`
`99`		`-- (NSUInteger)supportedInterfaceOrientations {`
	`99`	`+- (UIInterfaceOrientationMask)supportedInterfaceOrientations {`
`100`	`100`	`return UIInterfaceOrientationMaskPortrait;`
`101`	`101`	`}`
`102`	`102`
Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,7 @@ - (UIInterfaceOrientation)preferredInterfaceOrientationForPresentation {`
`170`	`170`	`return UIInterfaceOrientationPortrait;`
`171`	`171`	`}`
`172`	`172`
`173`		`-- (NSUInteger)supportedInterfaceOrientations {`
	`173`	`+- (UIInterfaceOrientationMask)supportedInterfaceOrientations {`
`174`	`174`	`return UIInterfaceOrientationMaskPortrait;`
`175`	`175`	`}`
`176`	`176`
Original file line number	Diff line number	Diff line change
`@@ -257,7 +257,7 @@ - (UIInterfaceOrientation)preferredInterfaceOrientationForPresentation {`
`257`	`257`	`return UIInterfaceOrientationPortrait;`
`258`	`258`	`}`
`259`	`259`
`260`		`-- (NSUInteger)supportedInterfaceOrientations {`
	`260`	`+- (UIInterfaceOrientationMask)supportedInterfaceOrientations {`
`261`	`261`	`return UIInterfaceOrientationMaskPortrait;`
`262`	`262`	`}`
`263`	`263`
Original file line number	Diff line number	Diff line change
`@@ -168,7 +168,7 @@ - (UIInterfaceOrientation)preferredInterfaceOrientationForPresentation {`
`168`	`168`	`return UIInterfaceOrientationPortrait;`
`169`	`169`	`}`
`170`	`170`
`171`		`-- (NSUInteger)supportedInterfaceOrientations {`
	`171`	`+- (UIInterfaceOrientationMask)supportedInterfaceOrientations {`
`172`	`172`	`return UIInterfaceOrientationMaskPortrait;`
`173`	`173`	`}`
`174`	`174`
Original file line number	Diff line number	Diff line change
`@@ -201,7 +201,7 @@ - (UIInterfaceOrientation)preferredInterfaceOrientationForPresentation {`
`201`	`201`	`return UIInterfaceOrientationPortrait;`
`202`	`202`	`}`
`203`	`203`
`204`		`-- (NSUInteger)supportedInterfaceOrientations {`
	`204`	`+- (UIInterfaceOrientationMask)supportedInterfaceOrientations {`
`205`	`205`	`return UIInterfaceOrientationMaskPortrait;`
`206`	`206`	`}`
`207`	`207`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ - (UIInterfaceOrientation)preferredInterfaceOrientationForPresentation{`
`18`	`18`	`return [self.visibleViewController preferredInterfaceOrientationForPresentation];`
`19`	`19`	`}`
`20`	`20`
`21`		`-- (NSUInteger)supportedInterfaceOrientations {`
	`21`	`+- (UIInterfaceOrientationMask)supportedInterfaceOrientations {`
`22`	`22`	`return [self.visibleViewController supportedInterfaceOrientations];`
`23`	`23`	`}`
`24`	`24`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ - (UIInterfaceOrientation)preferredInterfaceOrientationForPresentation {`
`88`	`88`	`return UIInterfaceOrientationPortrait;`
`89`	`89`	`}`
`90`	`90`
`91`		`-- (NSUInteger)supportedInterfaceOrientations {`
	`91`	`+- (UIInterfaceOrientationMask)supportedInterfaceOrientations {`
`92`	`92`	`return UIInterfaceOrientationMaskPortrait;`
`93`	`93`	`}`
`94`	`94`