diff --git a/total/GTOApp/UserUtil/PictureCell/PicViewModel.m b/total/GTOApp/UserUtil/PictureCell/PicViewModel.m index 1e28bdb50778edd6b2f0ba7adc6e63b9f64cd4b6..987595ad2f5ef8b494fc5d16fccfe87a8fb31f1a 100755 --- a/total/GTOApp/UserUtil/PictureCell/PicViewModel.m +++ b/total/GTOApp/UserUtil/PictureCell/PicViewModel.m @@ -13,7 +13,7 @@ - (instancetype)init { self = [super init]; if (self) { - self.maxPictureNumber = 10; + self.maxPictureNumber = 15; self.columns = 2; } return self; diff --git a/total/GTOApp/UserUtil/PictureCell/ZJPictureTableViewCell.m b/total/GTOApp/UserUtil/PictureCell/ZJPictureTableViewCell.m index 3e68382bd7db213db72255a0391870b43f9a2416..c1950aea541258dfe0782b6f642b15689c1a36d8 100755 --- a/total/GTOApp/UserUtil/PictureCell/ZJPictureTableViewCell.m +++ b/total/GTOApp/UserUtil/PictureCell/ZJPictureTableViewCell.m @@ -135,8 +135,9 @@ imageMaxCount = imageMaxCount > photos.count ? photos.count : imageMaxCount; for (int index = 0; index < imageMaxCount; index++){ 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]; [self.viewModel.arrPics addObject:imageName]; } diff --git a/total/Info.plist b/total/Info.plist index 9e79a6c0129559110df0b695b39607bc5c668fe5..25a8073fa2aa61f9863922c1d29122cff50c95af 100644 --- a/total/Info.plist +++ b/total/Info.plist @@ -19,7 +19,7 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> - <string>1.4.2</string> + <string>1.4.3</string> <key>CFBundleSignature</key> <string>????</string> <key>CFBundleVersion</key>