Commit 882aa97e authored by 哈南's avatar 哈南

15张限制 + 文字颜色更改

parent b657173d
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
- (instancetype)init { - (instancetype)init {
self = [super init]; self = [super init];
if (self) { if (self) {
self.maxPictureNumber = 10; self.maxPictureNumber = 15;
self.columns = 2; self.columns = 2;
} }
return self; return self;
......
...@@ -135,8 +135,9 @@ ...@@ -135,8 +135,9 @@
imageMaxCount = imageMaxCount > photos.count ? photos.count : imageMaxCount; imageMaxCount = imageMaxCount > photos.count ? photos.count : imageMaxCount;
for (int index = 0; index < imageMaxCount; index++){ for (int index = 0; index < imageMaxCount; index++){
UIImage *newImage = [photos[index] rescaleImageToPX:1080]; UIImage *newImage = [photos[index] rescaleImageToPX:1080];
NSDictionary *fontDict = @{NSForegroundColorAttributeName:[UIColor yellowColor],NSFontAttributeName:[UIFont systemFontOfSize:17]};
UIImage *waterImage = [newImage imageWaterMarkWithString:self.remarkString point:CGPointMake(20, newImage.size.height - 20) attribute:fontDict]; NSDictionary *fontDict = @{NSForegroundColorAttributeName:[UIColor colorWithRed:0 green:1.0 blue:0 alpha:0.5],NSFontAttributeName:[UIFont systemFontOfSize:13]};
UIImage *waterImage = [newImage imageWaterMarkWithString:self.remarkString point:CGPointMake(20, newImage.size.height - 10) attribute:fontDict];
NSString *imageName = [self saveImageToLocal:waterImage]; NSString *imageName = [self saveImageToLocal:waterImage];
[self.viewModel.arrPics addObject:imageName]; [self.viewModel.arrPics addObject:imageName];
} }
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>APPL</string> <string>APPL</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>1.4.2</string> <string>1.4.3</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>????</string> <string>????</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment