类名修改

SLAiELTS/SLAiELTS.xcodeproj/project.pbxproj

@@ -758,7 +758,7 @@
 			isa = PBXGroup;
 			children = (
 				3D24D3FE29DE964600014D1C /* AddressBookVC */,
-				3DB97D2029D6A86D00B12754 /* TimeLine */,
+				3DB97D2029D6A86D00B12754 /* Moments */,
 				3DA5AF6B29B88884009E4925 /* MyVC */,
 				3DA5AF6529B8885D009E4925 /* LxVC */,
 				3DA5AF5D29B8873B009E4925 /* Home */,
@@ -1395,18 +1395,18 @@
 			path = NullSafe;
 			sourceTree = "<group>";
 		};
-		3DB97D2029D6A86D00B12754 /* TimeLine */ = {
+		3DB97D2029D6A86D00B12754 /* Moments */ = {
 			isa = PBXGroup;
 			children = (
 				3D24D40929DEB23C00014D1C /* ZLPhotoBrowserTool */,
-				3DB97D2129D6A86D00B12754 /* TimeLineController */,
+				3DB97D2129D6A86D00B12754 /* MomentsVc */,
 				3DB97D2429D6A86D00B12754 /* Model */,
 				3DB97D2729D6A86D00B12754 /* Views */,
 			);
-			path = TimeLine;
+			path = Moments;
 			sourceTree = "<group>";
 		};
-		3DB97D2129D6A86D00B12754 /* TimeLineController */ = {
+		3DB97D2129D6A86D00B12754 /* MomentsVc */ = {
 			isa = PBXGroup;
 			children = (
 				3DE9967629E915BF00C50A83 /* SLMomentsVc.h */,
@@ -1424,7 +1424,7 @@
 				3D19CC0029E7E9340041A6B8 /* SLMomentDetailTableVc.h */,
 				3D19CC0129E7E9340041A6B8 /* SLMomentDetailTableVc.m */,
 			);
-			path = TimeLineController;
+			path = MomentsVc;
 			sourceTree = "<group>";
 		};
 		3DB97D2429D6A86D00B12754 /* Model */ = {

SLAiELTS/SLAiELTS/ViewControllers/TimeLine/Views/Cell/SDTimeLineCell.m → SLAiELTS/SLAiELTS/ViewControllers/Moments/Views/Cell/SDTimeLineCell.m

@@ -54,11 +54,9 @@ NSString *const kSDTimeLineCellOperationButtonClickedNotification = @"SDTimeLine
     SDWeiXinPhotoContainerView *_picContainerView;
     UILabel *_timeLabel;
     UIButton *_moreButton;
-    UIButton *_operationButton;
     UIButton *_operationLikeButton;
     UIButton *_operationCommentButton;
     SDTimeLineCellCommentView *_commentView;
-    SDTimeLineCellOperationMenu *_operationMenu;
 }
 
 
@@ -78,9 +76,7 @@ NSString *const kSDTimeLineCellOperationButtonClickedNotification = @"SDTimeLine
 
 - (void)setup
 {
-    
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(receiveOperationButtonClickedNotification:) name:kSDTimeLineCellOperationButtonClickedNotification object:nil];
-    
+        
     _iconView = [UIImageView new];
     _iconView.clipsToBounds = YES;
     _iconView.contentMode = UIViewContentModeScaleAspectFill;
@@ -114,10 +110,6 @@ NSString *const kSDTimeLineCellOperationButtonClickedNotification = @"SDTimeLine
     [_moreButton addTarget:self action:@selector(moreButtonClicked) forControlEvents:UIControlEventTouchUpInside];
     _moreButton.titleLabel.font = [UIFont systemFontOfSize:14];
     
-    _operationButton = [UIButton new];
-    [_operationButton setImage:[UIImage imageNamed:@"icon_moents_chat"] forState:UIControlStateNormal];
-    [_operationButton addTarget:self action:@selector(operationButtonClicked) forControlEvents:UIControlEventTouchUpInside];
-    
     _operationLikeButton = [UIButton buttonWithType:UIButtonTypeCustom];
     [_operationLikeButton setTitle:@"点赞" forState:UIControlStateNormal];
     _operationLikeButton.titleLabel.font = [UIFont systemFontOfSize:10];
@@ -150,21 +142,7 @@ NSString *const kSDTimeLineCellOperationButtonClickedNotification = @"SDTimeLine
     _timeLabel.textColor = SLColor(@"#8E8E93");
     _timeLabel.font = [UIFont systemFontOfSize:10];
     
-    
-//    _operationMenu = [SDTimeLineCellOperationMenu new];
-//    __weak typeof(self) weakSelf = self;
-//    [_operationMenu setLikeButtonClickedOperation:^{
-//        if ([weakSelf.delegate respondsToSelector:@selector(didClickLikeButtonInCell:)]) {
-//            [weakSelf.delegate didClickLikeButtonInCell:weakSelf];
-//        }
-//    }];
-//    [_operationMenu setCommentButtonClickedOperation:^{
-//        if ([weakSelf.delegate respondsToSelector:@selector(didClickcCommentButtonInCell:)]) {
-//            [weakSelf.delegate didClickcCommentButtonInCell:weakSelf];
-//        }
-//    }];
-    
-    
+
     NSArray *views = @[_iconView, _nameLable, _contentLabel, _moreButton, _picContainerView, _timeLabel, _operationLikeButton, _operationCommentButton, _commentView];
     
     [self.contentView sd_addSubviews:views];
@@ -222,12 +200,6 @@ NSString *const kSDTimeLineCellOperationButtonClickedNotification = @"SDTimeLine
     .leftEqualToView(_contentLabel)
     .rightSpaceToView(self.contentView, 14)
     .topSpaceToView(_timeLabel, 4); // 已经在内部实现高度自适应所以不需要再设置高度
-    
-//    _operationMenu.sd_layout
-//    .rightSpaceToView(_operationButton, 0)
-//    .heightIs(36)
-//    .centerYEqualToView(_operationButton)
-//    .widthIs(0);
 }
 
 - (void)configTheme{
@@ -306,9 +278,6 @@ NSString *const kSDTimeLineCellOperationButtonClickedNotification = @"SDTimeLine
 - (void)setFrame:(CGRect)frame
 {
     [super setFrame:frame];
-    if (_operationMenu.isShowing) {
-        _operationMenu.show = NO;
-    }
 }
 
 #pragma mark - private actions
@@ -320,33 +289,10 @@ NSString *const kSDTimeLineCellOperationButtonClickedNotification = @"SDTimeLine
     }
 }
 
-- (void)operationButtonClicked
-{
-    [self postOperationButtonClickedNotification];
-    _operationMenu.show = !_operationMenu.isShowing;
-}
-
-- (void)receiveOperationButtonClickedNotification:(NSNotification *)notification
-{
-    UIButton *btn = [notification object];
-    if (btn != _operationButton && _operationMenu.isShowing) {
-        _operationMenu.show = NO;
-    }
-}
-
-
 - (void)touchesBegan:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event
 {
     [super touchesBegan:touches withEvent:event];
-    [self postOperationButtonClickedNotification];
-    if (_operationMenu.isShowing) {
-        _operationMenu.show = NO;
-    }
-}
-
-- (void)postOperationButtonClickedNotification
-{
-    [[NSNotificationCenter defaultCenter] postNotificationName:kSDTimeLineCellOperationButtonClickedNotification object:_operationButton];
+//    [self postOperationButtonClickedNotification];
 }
 
 @end

SLAiELTS/SLAiELTS/ViewControllers/TimeLine/Views/PhotoContainer/SDWeiXinPhotoContainerView.m → SLAiELTS/SLAiELTS/ViewControllers/Moments/Views/PhotoContainer/SDWeiXinPhotoContainerView.m

@@ -88,7 +88,7 @@
         CGSize size = self.cellModel.imageSize;
         if (size.width) {
             itemW = MIN(itemW, size.width);
-            itemH = size.height / size.width * itemW;
+            itemH = MIN(260 * KScaleW, size.height / size.width * itemW);
         }else {
             itemH = itemW * 0.0;
         }
@@ -103,7 +103,6 @@
         long rowIndex = idx / perRowItemCount;
         UIImageView *imageView = [_imageViewsArray objectAtIndex:idx];
         imageView.hidden = NO;
-        imageView.image = [UIImage imageNamed:obj];
         imageView.contentMode = UIViewContentModeScaleAspectFill;
         imageView.clipsToBounds = YES;
         NSString *friendImg = [NSString stringWithFormat:@"%@%@",[SLHttpCenter SharedInstance].serverUrl, obj];

SLAiELTS/SLAiELTS/ViewControllers/MyVC/Views/Cells/SLMyListCollectionViewCell.m

@@ -33,7 +33,7 @@
                     break;
                 case 1:
                 {
-                    
+                    self.viewController.rdv_tabBarController.selectedIndex = 2;
                 }
                     break;
                 case 2: