Release SealTalk Demo version 1.1.10

sealtalk · Dec 19, 2016 · aa0c630 · aa0c630
1 parent db0d4a3
commit aa0c630
Show file tree

Hide file tree

Showing 41 changed files with 1,221 additions and 207 deletions.
diff --git a/ios-rongimdemo/RCDAboutRongCloudTableViewController.m b/ios-rongimdemo/RCDAboutRongCloudTableViewController.m
@@ -330,7 +330,7 @@ - (NSArray *)urls {
   if (!_urls) {
     NSArray *section0 =
     [NSArray arrayWithObjects:@"http://rongcloud.cn/",
-     @"http://www.rongcloud.cn/changelog",
+     @"http://blog.rongcloud.cn/?page_id=1569",
      @"http://rongcloud.cn/features",
      @"http://rongcloud.cn/", nil];
     _urls = [NSArray arrayWithObjects:section0, nil];

diff --git a/ios-rongimdemo/RCDCreateGroupViewController.m b/ios-rongimdemo/RCDCreateGroupViewController.m
@@ -435,18 +435,11 @@ - (void)imagePickerController:(UIImagePickerController *)picker
 
   if ([mediaType isEqual:@"public.image"]) {
     UIImage *originImage =
-        [info objectForKey:UIImagePickerControllerOriginalImage];
-
-    UIImage *scaleImage = [self scaleImage:originImage toScale:0.8];
-
-    //        if (UIImagePNGRepresentation(scaleImage) == nil)
-    //        {
-    //            data = UIImageJPEGRepresentation(scaleImage, 0.00001);
-    //        }
-    //        else
-    //        {
-    //            data = UIImagePNGRepresentation(scaleImage);
-    //        }
+    [info objectForKey:UIImagePickerControllerOriginalImage];
+    CGRect captureRect = [[info objectForKey:UIImagePickerControllerCropRect] CGRectValue];
+    UIImage *captureImage = [self getSubImage:originImage Rect:captureRect];
+
+    UIImage *scaleImage = [self scaleImage:captureImage toScale:0.8];
     data = UIImageJPEGRepresentation(scaleImage, 0.00001);
   }
 
@@ -457,6 +450,20 @@ - (void)imagePickerController:(UIImagePickerController *)picker
   });
 }
 
+-(UIImage*)getSubImage:(UIImage *)originImage Rect:(CGRect)rect
+{
+  CGImageRef subImageRef = CGImageCreateWithImageInRect(originImage.CGImage, rect);
+  CGRect smallBounds = CGRectMake(0, 0, CGImageGetWidth(subImageRef), CGImageGetHeight(subImageRef));
+
+  UIGraphicsBeginImageContext(smallBounds.size);
+  CGContextRef context = UIGraphicsGetCurrentContext();
+  CGContextDrawImage(context, smallBounds, subImageRef);
+  UIImage* smallImage = [UIImage imageWithCGImage:subImageRef];
+  UIGraphicsEndImageContext();
+
+  return smallImage;
+}
+
 - (UIImage *)scaleImage:(UIImage *)Image toScale:(float)scaleSize {
   UIGraphicsBeginImageContext(
       CGSizeMake(Image.size.width * scaleSize, Image.size.height * scaleSize));

diff --git a/ios-rongimdemo/RCDGroupSettingsTableViewController.m b/ios-rongimdemo/RCDGroupSettingsTableViewController.m
@@ -390,9 +390,11 @@ - (void)imagePickerController:(UIImagePickerController *)picker
 
   if ([mediaType isEqual:@"public.image"]) {
     UIImage *originImage =
-        [info objectForKey:UIImagePickerControllerOriginalImage];
-
-    UIImage *scaleImage = [self scaleImage:originImage toScale:0.8];
+    [info objectForKey:UIImagePickerControllerOriginalImage];
+    CGRect captureRect = [[info objectForKey:UIImagePickerControllerCropRect] CGRectValue];
+    UIImage *captureImage = [self getSubImage:originImage Rect:captureRect];
+
+    UIImage *scaleImage = [self scaleImage:captureImage toScale:0.8];
     data = UIImageJPEGRepresentation(scaleImage, 0.00001);
   }
 
@@ -463,6 +465,20 @@ - (void)imagePickerController:(UIImagePickerController *)picker
   });
 }
 
+-(UIImage*)getSubImage:(UIImage *)originImage Rect:(CGRect)rect
+{
+  CGImageRef subImageRef = CGImageCreateWithImageInRect(originImage.CGImage, rect);
+  CGRect smallBounds = CGRectMake(0, 0, CGImageGetWidth(subImageRef), CGImageGetHeight(subImageRef));
+
+  UIGraphicsBeginImageContext(smallBounds.size);
+  CGContextRef context = UIGraphicsGetCurrentContext();
+  CGContextDrawImage(context, smallBounds, subImageRef);
+  UIImage* smallImage = [UIImage imageWithCGImage:subImageRef];
+  UIGraphicsEndImageContext();
+
+  return smallImage;
+}
+
 - (UIImage *)scaleImage:(UIImage *)Image toScale:(float)scaleSize {
   UIGraphicsBeginImageContext(
       CGSizeMake(Image.size.width * scaleSize, Image.size.height * scaleSize));

diff --git a/ios-rongimdemo/RCDSettingServerUrlViewController.h b/ios-rongimdemo/RCDSettingServerUrlViewController.h
@@ -0,0 +1,14 @@
+//
+//  RCDSetttingServerUrlViewController.h
+//  RCloudMessage
+//
+//  Created by Sin on 16/9/21.
+//  Copyright © 2016年 RongCloud. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+#import "RCAnimatedImagesView.h"
+
+@interface RCDSettingServerUrlViewController : UIViewController <RCAnimatedImagesViewDelegate>
+
+@end