新版本1.1.1

LIKE/LIKE.xcodeproj/xcuserdata/leer.xcuserdatad/xcschemes/LIKE.xcscheme

@@ -70,7 +70,7 @@
  selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
  launchStyle = "0"
  useCustomWorkingDirectory = "NO"
- buildConfiguration = "Debug"
+ buildConfiguration = "Release"
  ignoresPersistentStateOnLaunch = "NO"
  debugDocumentVersioning = "YES"
  debugServiceExtension = "internal"
@@ -97,7 +97,7 @@
  shouldUseLaunchSchemeArgsEnv = "YES"
  savedToolIdentifier = ""
  useCustomWorkingDirectory = "NO"
- buildConfiguration = "Debug"
+ buildConfiguration = "Release"
  debugDocumentVersioning = "YES">
  <BuildableProductRunnable
  runnableDebuggingMode = "0">
@@ -114,7 +114,7 @@
  buildConfiguration = "Debug">
  </AnalyzeAction>
  <ArchiveAction
- buildConfiguration = "Debug"
+ buildConfiguration = "Release"
  revealArchiveInOrganizer = "YES">
  </ArchiveAction>
 </Scheme>

LIKE/LIKE/AppDelegate.m

@@ -75,6 +75,7 @@ -(void) load:(NSDictionary *)launchOptions
 
  // UMeng
  [MobClick startWithAppkey:@"54bf7949fd98c563bc00075d" reportPolicy:SENDWIFIONLY channelId:@"App Store"];
+ [MobClick checkUpdate];
 
 
  // CMD

LIKE/LIKE/Info.plist

@@ -17,7 +17,7 @@
  <key>CFBundlePackageType</key>
  <string>APPL</string>
  <key>CFBundleShortVersionString</key>
- <string>1.1.0</string>
+ <string>1.1.1</string>
  <key>CFBundleSignature</key>
  <string>????</string>
  <key>CFBundleURLTypes</key>
@@ -74,7 +74,7 @@
  </dict>
  </array>
  <key>CFBundleVersion</key>
- <string>1.1.0.8</string>
+ <string>1.1.1.4</string>
  <key>FacebookAppID</key>
  <string>368579790017819</string>
  <key>FacebookDisplayName</key>

LIKE/LIKE/LCFramework/Foundation/Resource/LCInternationalization.bundle/da.lproj/Localizable.strings

@@ -51,6 +51,14 @@
 "更换头像" = "Edit your avatar";
 "拍摄新图片" = "Take a photo";
 "从相册选择" = "Select from album";
+"自拍" = "Selfie";
+"广告" = "Advertisement";
+"色情" = "Pornographic";
+"谣言" = "Rumor";
+"恶意营销" = "Malicious marketing";
+"侮辱诋毁" = "Insult or slander";
+"侵权举报(诽谤、抄袭、冒用...)" = "Infringement";
+"删除该标签后，你的like数也会相应减少，确认删除吗？" = "After you delete the tag, your like number will be reduced, are you ready for the confirmation?";
 
 // Tip
 "上传失败啦！请检查您的网络稍后再试Orz～" = "Upload failed! Please check your internet connection";

LIKE/LIKE/LKApplication/Application/Camera/LKCameraViewController.m

@@ -38,7 +38,9 @@ @interface LKCameraViewController () <FastttCameraDelegate>
 
 LC_PROPERTY(assign) UIDeviceOrientation deviceOrientation;
 
-LC_PROPERTY(strong) UIView * gtaView;
+LC_PROPERTY(strong) UIView *gtaView;
+
+LC_PROPERTY(strong) UIView *wastedView;
 
 
 @end
@@ -106,6 +108,17 @@ -(void) handleNotification:(NSNotification *)notification
 
  NSMutableArray * array = [@[self.flashButton, self.switchCameraButton, self.photosButton] mutableCopy];
 
+ if (self.wastedView) {
+ [array addObject:self.wastedView];
+
+ LC_FAST_ANIMATIONS(0.25, ^{
+
+ self.wastedView.viewFrameX = 0;
+ self.wastedView.viewFrameY = (self.fastCamera.view.viewFrameHeight - self.wastedView.viewFrameHeight) * 0.5;
+
+ });
+ }
+
  if (self.gtaView) {
  [array addObject:self.gtaView];
 
@@ -131,6 +144,17 @@ -(void) handleNotification:(NSNotification *)notification
 
  NSMutableArray * array = [@[self.flashButton, self.switchCameraButton, self.photosButton] mutableCopy];
 
+ if (self.wastedView) {
+
+ [array addObject:self.wastedView];
+
+ LC_FAST_ANIMATIONS(0.25, ^{
+
+ self.wastedView.viewFrameX = 0;
+ self.wastedView.viewFrameY = (self.fastCamera.view.viewFrameHeight - self.wastedView.viewFrameHeight) * 0.5;
+ });
+ }
+
  if (self.gtaView) {
 
  [array addObject:self.gtaView];
@@ -399,6 +423,11 @@ - (void)switchFilterAtIndex:(NSInteger)index
 {
  self.filterIndex = index;
 
+ if (self.wastedView) {
+ [self.wastedView removeFromSuperview];
+ self.wastedView = nil;
+ }
+
  if (self.gtaView) {
  [self.gtaView removeFromSuperview];
  self.gtaView = nil;
@@ -409,7 +438,15 @@ - (void)switchFilterAtIndex:(NSInteger)index
  return;
  }
 
- if (self.filterIndex == 1 || self.filterIndex == 2) {
+ if (self.filterIndex == 1) {
+
+ self.wastedView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"Wasted2" useCache:YES]];
+ self.wastedView.viewFrameX = 0;
+ self.wastedView.viewFrameY = (self.fastCamera.view.viewFrameHeight - self.wastedView.viewFrameHeight) * 0.5;
+ self.fastCamera.view.ADD(self.wastedView);
+ }
+
+ if (self.filterIndex == 2 || self.filterIndex == 3) {
 
  self.gtaView = [[UIImageView alloc] initWithImage:self.filterIndex == 1 ? [UIImage imageNamed:@"Gta-driving.png" useCache:YES] : [UIImage imageNamed:@"Gta-walking.png" useCache:YES]];
  self.gtaView.viewFrameX = 10;

LIKE/LIKE/LKApplication/Application/Camera/LKFilterManager.m

@@ -39,6 +39,7 @@ -(NSMutableArray *) allFilterNames
 
 -(void) defaultSettings
 {
+ [self addImageFilter:@"Wasted"];
  [self addImageFilter:@"GtaTrevor"];
  [self addImageFilter:@"GtaFranklin"];
  [self addImageFilter:@"Vivid"];

LIKE/LIKE/LKApplication/Application/Camera/LKImageCropperViewController.m

@@ -55,7 +55,9 @@ @interface LKImageCropperViewController ()
 LC_PROPERTY(assign) NSInteger filterIndex;
 LC_PROPERTY(assign) BOOL magic;
 
-LC_PROPERTY(strong) UIView * gtaView;
+LC_PROPERTY(strong) UIView *gtaView;
+
+LC_PROPERTY(strong) UIView *wastedView;
 
 @end
 
@@ -315,8 +317,17 @@ - (void)initControlBtn
 
  UIImage * image = [self lookkupImageFilterWithImage:LKFilterManager.singleton.allFilterImage[i - 1] originImage:preview];
 
+ // Wasted滤镜
+ if (i == 1) {
+
+ CGFloat width = image.size.width;
+ CGFloat height = width / 414 * 72;
+
+ image = [image addMaskImage:[UIImage imageNamed:@"Wasted2" useCache:YES] imageSize:image.size inRect:CGRectMake(0, (image.size.height - height) * 0.5, width, height)];
+ }
 
- if (i == 1 || i == 2) {
+ // GTA滤镜
+ if (i == 2 || i == 3) {
 
  CGFloat width = (245. / 1020.) * image.size.width * 1.5;
  CGFloat height = width / 245 * 172.;
@@ -474,13 +485,32 @@ -(void) update
 
  image = [self lookkupImageFilterWithImage:LKFilterManager.singleton.allFilterImage[self.filterIndex - 1] originImage:self.originalImage];
 
+ if (self.wastedView) {
+ [self.wastedView removeFromSuperview];
+ self.wastedView = nil;
+ }
 
  if (self.gtaView) {
  [self.gtaView removeFromSuperview];
  self.gtaView = nil;
  }
 
- if (self.filterIndex == 1 || self.filterIndex == 2) {
+
+ // Wasted滤镜
+ if (self.filterIndex == 1) {
+
+// CGFloat width = image.size.width;
+// CGFloat screenW = [UIScreen mainScreen].bounds.size.width;
+// CGFloat scale = [UIScreen mainScreen].scale;
+// CGFloat height = width / 1242 * 216;
+ CGFloat width = image.size.width;
+ CGFloat height = width * 216 / 1242;
+
+ image = [image addMaskImage:[UIImage imageNamed:@"Wasted2" useCache:YES] imageSize:image.size inRect:CGRectMake(0, (image.size.height - height) * 0.5, width, height)];
+ }
+
+ // GTA滤镜
+ if (self.filterIndex == 2 || self.filterIndex == 3) {
 
  CGFloat width = (245. / 1020.) * image.size.width;
  CGFloat height = width / 245 * 172.;

LIKE/LIKE/LKApplication/Application/Home/LKHomeViewController.m

@@ -34,6 +34,7 @@
 #import "Doppelganger.h"
 #import "LKBadgeView.h"
 #import "LKSearchResultsViewController.h"
+#import "MobClick.h"
 
 
 #define FOCUS_FEED_CACHE_KEY [NSString stringWithFormat:@"LKFocusFeedKey-%@", LKLocalUser.singleton.user.id]

LIKE/LIKE/LKApplication/Application/Home/LKPostDetailViewController.m

@@ -570,7 +570,7 @@ - (void)reportReason {
 
  @weakly(self);
 
- [LKActionSheet showWithTitle:nil buttonTitles:@[LC_LO(@"自拍"),LC_LO(@"广告"),LC_LO(@"色情"),LC_LO(@"谣言"),LC_LO(@"恶意营销"),LC_LO(@"侮辱诋毁"),LC_LO(@"侵权举报 (诽谤、抄袭、冒用...)")] didSelected:^(NSInteger index) {
+ [LKActionSheet showWithTitle:nil buttonTitles:@[LC_LO(@"自拍"),LC_LO(@"广告"),LC_LO(@"色情"),LC_LO(@"谣言"),LC_LO(@"恶意营销"),LC_LO(@"侮辱诋毁"),LC_LO(@"侵权举报(诽谤、抄袭、冒用...)")] didSelected:^(NSInteger index) {
 
  @normally(self);
 
@@ -621,7 +621,7 @@ - (void)reportWithIndex:(NSInteger)index {
  break;
 
  case 6:
- [interface addParameter:LC_LO(@"侵权举报 (诽谤、抄袭、冒用...)") key:@"reason"];
+ [interface addParameter:LC_LO(@"侵权举报(诽谤、抄袭、冒用...)") key:@"reason"];
  break;
 
  default:
@@ -997,7 +997,8 @@ - (UITableViewCell *)tableView:(LCUITableView *)tableView cellForRowAtIndexPath:
  };
 
 
- self.userHead.url = self.post.user.avatar;
+// self.userHead.url = self.post.user.avatar;
+ [self.userHead sd_setImageWithURL:[NSURL URLWithString:self.post.user.avatar] placeholderImage:nil];
  self.userName.text = self.post.user.name;
  [self.userLikes setText:self.post.user.likes.description animated:NO];
 
@@ -1309,7 +1310,8 @@ -(UIImage *) buildShareImage:(NSInteger)shareIndex
  imageView.viewFrameHeight = headWidth - 10 * proportion;
  imageView.viewFrameX = (20 + 18) * proportion + 5 * proportion;
  imageView.viewFrameY = 5 * proportion;
- imageView.url = self.post.user.avatar;
+// imageView.url = self.post.user.avatar;
+ [imageView sd_setImageWithURL:[NSURL URLWithString:self.post.user.avatar] placeholderImage:nil];
  imageView.cornerRadius = imageView.viewMidHeight;
  imageView.backgroundColor = [UIColor whiteColor];
  bottomView.ADD(imageView);
@@ -1367,7 +1369,7 @@ -(UIImage *) buildShareImage:(NSInteger)shareIndex
  interestView.viewFrameY = CGRectGetMaxY(qrCodeView.frame) - interestView.viewFrameHeight;
  bottomView.ADD(interestView);
 
- NSArray *interestArray = @[@"高达", @"狗", @"旅行", @"猫", @"美食", @"喷漆", @"摄影", @"游戏", @"手办"];
+ NSArray *interestArray = @[@"高达", @"狗", @"旅行", @"猫", @"美食", @"喷漆", @"摄影", @"游戏", @"手办", @"变形金刚", @"钢铁侠", @"星球大战"];
 
  UIImage *interestImage = nil;
  for (LKTag *tag in self.tagsListModel.tags) {
@@ -1422,11 +1424,11 @@ -(UIImage *) buildShareImage:(NSInteger)shareIndex
  inRect:LC_RECT(0, image.size.height - headWidth / 2, bottomView.viewFrameWidth, bottomView.viewFrameHeight)];
 
 
- UIImage * icon = [[UIImage imageNamed:@"LikeIconSmall.png" useCache:NO] scaleToBeWidth:50 * proportion];
+ UIImage * icon = [[UIImage imageNamed:@"LikeIconSmall.png" useCache:NO] scaleToBeWidth:33 * proportion];
 
  image = [image addMaskImage:icon
  imageSize:image.size
- inRect:LC_RECT(image.size.width - icon.size.width - 40, 40, icon.size.width, icon.size.height)];
+ inRect:LC_RECT(image.size.width - icon.size.width - 20, 20, icon.size.width, icon.size.height)];
 
  return image;
 }
@@ -1441,7 +1443,7 @@ - (UIImage *)getInterestImageWithTagArray:(NSArray *)tagArray tag:(LKTag *)tag {
  // 狗
  NSArray *dog = @[@"汪星人", @"汪", @"狗"];
  // 旅行
- NSArray *travel = @[@"旅行"];
+ NSArray *travel = @[@"旅行", @"吉他", @"音乐", @"艺术", @"旅游"];
  // 猫
  NSArray *cat = @[@"喵星人", @"猫", @"喵"];
  // 美食
@@ -1453,7 +1455,13 @@ - (UIImage *)getInterestImageWithTagArray:(NSArray *)tagArray tag:(LKTag *)tag {
  // 游戏
  NSArray *game = @[@"PS4", @"XBOX", @"游戏", @"GTA", @"数码", @"索尼大法好", @"索大好"];
  // 手办
- NSArray *gk = @[@"手办", @"粘土人", @"粘土"];
+ NSArray *gk = @[@"手办", @"粘土人", @"粘土", @"舰娘", @"初音", @"动漫", @"漫画"];
+ // 变形金刚
+ NSArray *transformer = @[@"变形金刚", @"擎天柱", @"大力神", @"大黄蜂", @"TF", @"汽车人", @"transformers", @"威震天"];
+ // 钢铁侠
+ NSArray *ironMan = @[@"钢铁侠", @"美国队长", @"IRON MAN", @"复仇者联盟", @"绿巨人", @"漫威"];
+ // 星球大战
+ NSArray *starWar = @[@"星球大战", @"STAR WARS", @"STARWARS", @"星战"];
 
  if ([tag.tag rangeOfString:tagArray[0]].length) {
 
@@ -1554,6 +1562,39 @@ - (UIImage *)getInterestImageWithTagArray:(NSArray *)tagArray tag:(LKTag *)tag {
  }
  }
 
+ if ([tag.tag rangeOfString:tagArray[9]].length) {
+
+ for (NSString *str in transformer) {
+
+ if ([tag.tag rangeOfString:str].length) {
+
+ return [UIImage imageNamed:@"变形金刚"];
+ }
+ }
+ }
+
+ if ([tag.tag rangeOfString:tagArray[10]].length) {
+
+ for (NSString *str in ironMan) {
+
+ if ([tag.tag rangeOfString:str].length) {
+
+ return [UIImage imageNamed:@"钢铁侠"];
+ }
+ }
+ }
+
+ if ([tag.tag rangeOfString:tagArray[11]].length) {
+
+ for (NSString *str in starWar) {
+
+ if ([tag.tag rangeOfString:str].length) {
+
+ return [UIImage imageNamed:@"星球大战"];
+ }
+ }
+ }
+
  return nil;
 }
 

LIKE/LIKE/LKApplication/Application/Home/LKTagCommentsViewController.m

@@ -540,7 +540,8 @@ - (UITableViewCell *)tableView:(LCUITableView *)tableView cellForRowAtIndexPath:
  cell.ADD(item);
  }
 
- head.url = self.tagValue.user.avatar;
+// head.url = self.tagValue.user.avatar;
+ [head sd_setImageWithURL:[NSURL URLWithString:self.tagValue.user.avatar] placeholderImage:nil];
  item.tagValue = self.tagValue;
  item.viewFrameX = head.viewRightX + padding;
  item.viewFrameY = 53 / 2 - item.viewMidHeight;

LIKE/LIKE/LKApplication/Application/Home/Views/LKCommentsView.m

@@ -10,6 +10,7 @@
 #import "LKComment.h"
 #import "LKTime.h"
 #import "LKPostDetailCell.h"
+#import "UIImageView+WebCache.h"
 
 @implementation LKCommentsView
 
@@ -79,7 +80,8 @@ -(void) setTagValue:(LKTag *)tagValue
  head.viewFrameWidth = 33;
  head.viewFrameHeight = 33;
  head.cornerRadius = 33 / 2;
- head.url = comment.user.avatar;
+// head.url = comment.user.avatar;
+ [head sd_setImageWithURL:[NSURL URLWithString:comment.user.avatar] placeholderImage:nil];
  head.userInteractionEnabled = YES;
  [head addTapGestureRecognizer:self selector:@selector(headTapAction:)];
  head.tag = i + 100;