部分修改

SLAiELTS/SLAiELTS.xcodeproj/project.pbxproj

@@ -157,7 +157,6 @@
 		3DA5AF7C29B96B55009E4925 /* SLPageViewModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 3DA5AF7A29B96B55009E4925 /* SLPageViewModel.m */; };
 		3DA5AF7F29B96E11009E4925 /* SLPageModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 3DA5AF7E29B96E11009E4925 /* SLPageModel.m */; };
 		3DB0AE1629D6B64200671744 /* NullSafe.m in Sources */ = {isa = PBXBuildFile; fileRef = 3DB0AE1529D6B64200671744 /* NullSafe.m */; };
-		3DB97D3D29D6A86E00B12754 /* SDTimeLineTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3DB97D2329D6A86D00B12754 /* SDTimeLineTableViewController.m */; };
 		3DB97D3E29D6A86E00B12754 /* SDTimeLineCellModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 3DB97D2629D6A86D00B12754 /* SDTimeLineCellModel.m */; };
 		3DB97D3F29D6A86E00B12754 /* SDTimeLineCellOperationMenu.m in Sources */ = {isa = PBXBuildFile; fileRef = 3DB97D2A29D6A86D00B12754 /* SDTimeLineCellOperationMenu.m */; };
 		3DB97D4029D6A86E00B12754 /* SDTimeLineCellCommentView.m in Sources */ = {isa = PBXBuildFile; fileRef = 3DB97D2D29D6A86D00B12754 /* SDTimeLineCellCommentView.m */; };
@@ -172,7 +171,6 @@
 		3DB97D5A29D6AB2300B12754 /* SDPhotoBrowser.m in Sources */ = {isa = PBXBuildFile; fileRef = 3DB97D5429D6AB2200B12754 /* SDPhotoBrowser.m */; };
 		3DB97D5B29D6AB2300B12754 /* SDWaitingView.m in Sources */ = {isa = PBXBuildFile; fileRef = 3DB97D5529D6AB2200B12754 /* SDWaitingView.m */; };
 		3DB97D5C29D6AB2300B12754 /* SDBrowserImageView.m in Sources */ = {isa = PBXBuildFile; fileRef = 3DB97D5629D6AB2200B12754 /* SDBrowserImageView.m */; };
-		3DB97D5F29D6AB6400B12754 /* SDBaseTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3DB97D5E29D6AB6400B12754 /* SDBaseTableViewController.m */; };
 		3DB97D6B29D6ABC100B12754 /* SDRefreshHeaderView.m in Sources */ = {isa = PBXBuildFile; fileRef = 3DB97D6429D6ABC000B12754 /* SDRefreshHeaderView.m */; };
 		3DB97D6C29D6ABC100B12754 /* sdRefeshView_arrow@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3DB97D6529D6ABC000B12754 /* sdRefeshView_arrow@2x.png */; };
 		3DB97D6D29D6ABC100B12754 /* UIView+SDExtension.m in Sources */ = {isa = PBXBuildFile; fileRef = 3DB97D6629D6ABC000B12754 /* UIView+SDExtension.m */; };
@@ -196,6 +194,8 @@
 		3DB97DA429D6ABF000B12754 /* MLLabelLayoutManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 3DB97D9129D6ABEF00B12754 /* MLLabelLayoutManager.m */; };
 		3DB97DA529D6ABF000B12754 /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = 3DB97D9429D6ABEF00B12754 /* README.md */; };
 		3DB97DA929D6AC0A00B12754 /* LEETheme.m in Sources */ = {isa = PBXBuildFile; fileRef = 3DB97DA829D6AC0A00B12754 /* LEETheme.m */; };
+		3DE9967929E915BF00C50A83 /* SLMomentsVc.m in Sources */ = {isa = PBXBuildFile; fileRef = 3DE9967729E915BF00C50A83 /* SLMomentsVc.m */; };
+		3DE9967A29E915BF00C50A83 /* SLMomentsVc.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3DE9967829E915BF00C50A83 /* SLMomentsVc.xib */; };
 		3DF3DAA129B98A7D00CAD3AB /* SLMyView.m in Sources */ = {isa = PBXBuildFile; fileRef = 3DF3DA9F29B98A7D00CAD3AB /* SLMyView.m */; };
 		3DF3DAA429B9A68800CAD3AB /* SLBaseCellView.m in Sources */ = {isa = PBXBuildFile; fileRef = 3DF3DAA329B9A68800CAD3AB /* SLBaseCellView.m */; };
 		3DF3DAA829B9A6AA00CAD3AB /* SLBaseCellView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3DF3DAA729B9A6AA00CAD3AB /* SLBaseCellView.xib */; };
@@ -525,8 +525,6 @@
 		3DA5AF7D29B96E11009E4925 /* SLPageModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SLPageModel.h; sourceTree = "<group>"; };
 		3DA5AF7E29B96E11009E4925 /* SLPageModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SLPageModel.m; sourceTree = "<group>"; };
 		3DB0AE1529D6B64200671744 /* NullSafe.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NullSafe.m; sourceTree = "<group>"; };
-		3DB97D2229D6A86D00B12754 /* SDTimeLineTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDTimeLineTableViewController.h; sourceTree = "<group>"; };
-		3DB97D2329D6A86D00B12754 /* SDTimeLineTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDTimeLineTableViewController.m; sourceTree = "<group>"; };
 		3DB97D2529D6A86D00B12754 /* SDTimeLineCellModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDTimeLineCellModel.h; sourceTree = "<group>"; };
 		3DB97D2629D6A86D00B12754 /* SDTimeLineCellModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDTimeLineCellModel.m; sourceTree = "<group>"; };
 		3DB97D2929D6A86D00B12754 /* SDTimeLineCellOperationMenu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDTimeLineCellOperationMenu.h; sourceTree = "<group>"; };
@@ -557,8 +555,6 @@
 		3DB97D5729D6AB2200B12754 /* SDWaitingView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDWaitingView.h; sourceTree = "<group>"; };
 		3DB97D5829D6AB2200B12754 /* SDPhotoBrowser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDPhotoBrowser.h; sourceTree = "<group>"; };
 		3DB97D5929D6AB2200B12754 /* SDBrowserImageView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDBrowserImageView.h; sourceTree = "<group>"; };
-		3DB97D5D29D6AB6400B12754 /* SDBaseTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDBaseTableViewController.h; sourceTree = "<group>"; };
-		3DB97D5E29D6AB6400B12754 /* SDBaseTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDBaseTableViewController.m; sourceTree = "<group>"; };
 		3DB97D6129D6ABC000B12754 /* UIView+SDExtension.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIView+SDExtension.h"; sourceTree = "<group>"; };
 		3DB97D6229D6ABC000B12754 /* SDRefreshFooterView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDRefreshFooterView.h; sourceTree = "<group>"; };
 		3DB97D6329D6ABC000B12754 /* SDRefreshView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDRefreshView.h; sourceTree = "<group>"; };
@@ -602,6 +598,9 @@
 		3DB97DA729D6AC0A00B12754 /* LEETheme.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LEETheme.h; sourceTree = "<group>"; };
 		3DB97DA829D6AC0A00B12754 /* LEETheme.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LEETheme.m; sourceTree = "<group>"; };
 		3DB97DAA29D6AC7900B12754 /* GlobalDefines.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GlobalDefines.h; sourceTree = "<group>"; };
+		3DE9967629E915BF00C50A83 /* SLMomentsVc.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SLMomentsVc.h; sourceTree = "<group>"; };
+		3DE9967729E915BF00C50A83 /* SLMomentsVc.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SLMomentsVc.m; sourceTree = "<group>"; };
+		3DE9967829E915BF00C50A83 /* SLMomentsVc.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SLMomentsVc.xib; sourceTree = "<group>"; };
 		3DF3DA9F29B98A7D00CAD3AB /* SLMyView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SLMyView.m; sourceTree = "<group>"; };
 		3DF3DAA029B98A7D00CAD3AB /* SLMyView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SLMyView.h; sourceTree = "<group>"; };
 		3DF3DAA229B9A68800CAD3AB /* SLBaseCellView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SLBaseCellView.h; sourceTree = "<group>"; };
@@ -1311,8 +1310,6 @@
 				3D24986429AC7224003C3AFA /* SLBaseViewController.m */,
 				3D25106329AC9694000AE530 /* SLBaseNavigationController.h */,
 				3D25106429AC9694000AE530 /* SLBaseNavigationController.m */,
-				3DB97D5D29D6AB6400B12754 /* SDBaseTableViewController.h */,
-				3DB97D5E29D6AB6400B12754 /* SDBaseTableViewController.m */,
 			);
 			path = BaseVC;
 			sourceTree = "<group>";
@@ -1415,8 +1412,9 @@
 		3DB97D2129D6A86D00B12754 /* TimeLineController */ = {
 			isa = PBXGroup;
 			children = (
-				3DB97D2229D6A86D00B12754 /* SDTimeLineTableViewController.h */,
-				3DB97D2329D6A86D00B12754 /* SDTimeLineTableViewController.m */,
+				3DE9967629E915BF00C50A83 /* SLMomentsVc.h */,
+				3DE9967729E915BF00C50A83 /* SLMomentsVc.m */,
+				3DE9967829E915BF00C50A83 /* SLMomentsVc.xib */,
 				3D24D40429DEAF3200014D1C /* SLCreatMomentsVc.h */,
 				3D24D40529DEAF3200014D1C /* SLCreatMomentsVc.m */,
 				3D24D40629DEAF3200014D1C /* SLCreatMomentsVc.xib */,
@@ -1864,6 +1862,7 @@
 				3D1B988B29BEF1020008D01A /* SLLxTopCell.xib in Resources */,
 				3D25107029AD8AA9000AE530 /* SLRoleLabelViewController.xib in Resources */,
 				3D19CBFF29E7DF6B0041A6B8 /* SLMomentsCommentVc.xib in Resources */,
+				3DE9967A29E915BF00C50A83 /* SLMomentsVc.xib in Resources */,
 				3DB97D9A29D6ABF000B12754 /* LICENSE in Resources */,
 				3D1B989029BEF1AC0008D01A /* SLVocabularyCell.xib in Resources */,
 				3D1B988029BEEA670008D01A /* SLVocabularyView.xib in Resources */,
@@ -1959,7 +1958,6 @@
 				3D19CBEA29E6480E0041A6B8 /* SLFriendsModel.m in Sources */,
 				3D2510BA29AF1970000AE530 /* SPRequestError.m in Sources */,
 				3D24D41029DEB23C00014D1C /* ZLPhotoBrowerModel.m in Sources */,
-				3DB97D3D29D6A86E00B12754 /* SDTimeLineTableViewController.m in Sources */,
 				3DB97D9B29D6ABF000B12754 /* NSMutableAttributedString+MLLabel.m in Sources */,
 				3D24986C29AC72E2003C3AFA /* SLLoginVCViewController.m in Sources */,
 				3DF3DAF129BB131100CAD3AB /* RDVTabBarController.m in Sources */,
@@ -1975,6 +1973,7 @@
 				3DF3DAC429B9C6E000CAD3AB /* YMBarItemView.m in Sources */,
 				3DB97DA929D6AC0A00B12754 /* LEETheme.m in Sources */,
 				3DB97D5B29D6AB2300B12754 /* SDWaitingView.m in Sources */,
+				3DE9967929E915BF00C50A83 /* SLMomentsVc.m in Sources */,
 				3DA2C73929CAA9C30087CDB4 /* AccessToken.m in Sources */,
 				3DB97D4529D6A86E00B12754 /* SDWeiXinPhotoContainerView.m in Sources */,
 				3D2DC3F429B1E6320041A729 /* SLMikeInputView.m in Sources */,
@@ -2043,7 +2042,6 @@
 				3D1B986529BEAF2F0008D01A /* SLHorScrBtns.m in Sources */,
 				3D2510A729AEF4F0000AE530 /* SLMessageViewController.m in Sources */,
 				3D2DC3DB29B0991E0041A729 /* YMNextGrowingTextView.m in Sources */,
-				3DB97D5F29D6AB6400B12754 /* SDBaseTableViewController.m in Sources */,
 				3D25106F29AD8AA9000AE530 /* SLRoleLabelViewController.m in Sources */,
 				3D24D67B29DFA1F100014D1C /* SLRemidLookView.m in Sources */,
 				3D19CBF929E7ABFD0041A6B8 /* UITableView+Refresh.m in Sources */,

SLAiELTS/SLAiELTS/Tool/CYLTableViewPlaceHolder/UITableView+Refresh.m

@@ -35,7 +35,6 @@ static char *count = "listCount";
     self.listCount = ^(NSInteger listCount) {
         [wkSelf tableviewRefreshpostListCount:listCount];
     };
-    
 }
 - (void)tableviewRefreshpostListCount:(NSInteger)listCount{
     [self endRefreshing];

SLAiELTS/SLAiELTS/ViewControllers/BaseVC/SDBaseTableViewController.h

@@ -1,36 +0,0 @@
-//
-//  SDBaseTableViewController.h
-//  GSD_WeiXin(wechat)
-//
-//  Created by aier on 16/2/10.
-//  Copyright © 2016年 GSD. All rights reserved.
-//
-
-
-/*
- 
- *********************************************************************************
- *
- * GSD_WeiXin
- *
- * QQ交流群: 362419100(2群) 459274049（1群已满）
- * Email : gsdios@126.com
- * GitHub: https://github.com/gsdios/GSD_WeiXin
- * 新浪微博:GSD_iOS
- *
- * 此“高仿微信”用到了很高效方便的自动布局库SDAutoLayout（一行代码搞定自动布局）
- * SDAutoLayout地址：https://github.com/gsdios/SDAutoLayout
- * SDAutoLayout视频教程：http://www.letv.com/ptv/vplay/24038772.html
- * SDAutoLayout用法示例：https://github.com/gsdios/SDAutoLayout/blob/master/README.md
- *
- *********************************************************************************
- 
- */
-
-#import <UIKit/UIKit.h>
-
-@interface SDBaseTableViewController : UITableViewController
-
-@property (nonatomic, strong) NSMutableArray *dataArray;
-
-@end

SLAiELTS/SLAiELTS/ViewControllers/BaseVC/SDBaseTableViewController.m

@@ -1,50 +0,0 @@
-//
-//  SDBaseTableViewController.m
-//  GSD_WeiXin(wechat)
-//
-//  Created by aier on 16/2/10.
-//  Copyright © 2016年 GSD. All rights reserved.
-//
-
-
-/*
- 
- *********************************************************************************
- *
- * GSD_WeiXin
- *
- * QQ交流群: 362419100(2群) 459274049（1群已满）
- * Email : gsdios@126.com
- * GitHub: https://github.com/gsdios/GSD_WeiXin
- * 新浪微博:GSD_iOS
- *
- * 此“高仿微信”用到了很高效方便的自动布局库SDAutoLayout（一行代码搞定自动布局）
- * SDAutoLayout地址：https://github.com/gsdios/SDAutoLayout
- * SDAutoLayout视频教程：http://www.letv.com/ptv/vplay/24038772.html
- * SDAutoLayout用法示例：https://github.com/gsdios/SDAutoLayout/blob/master/README.md
- *
- *********************************************************************************
- 
- */
-
-#import "SDBaseTableViewController.h"
-
-@interface SDBaseTableViewController ()
-
-@end
-
-@implementation SDBaseTableViewController
-
-- (void)viewDidLoad {
-    [super viewDidLoad];
-}
-
-- (NSMutableArray *)dataArray
-{
-    if (!_dataArray) {
-        _dataArray = [[NSMutableArray alloc] init];
-    }
-    return _dataArray;
-}
-
-@end

SLAiELTS/SLAiELTS/ViewControllers/BaseVC/SLBaseTabBarController.m

@@ -12,7 +12,7 @@
 #import "SLHomeViewController.h"
 #import "SLLxViewController.h"
 #import "SLMyViewController.h"
-#import "SDTimeLineTableViewController.h"
+#import "SLMomentsVc.h"
 #import "SLAddressBookVc.h"
 
 @interface SLBaseTabBarController ()<RDVTabBarControllerDelegate,RDVTabBarDelegate>
@@ -37,7 +37,7 @@
     UIViewController *vc2 = [SLAddressBookVc loadViewControllewWithNib];
     SLBaseNavigationController *navVC2 = [[SLBaseNavigationController alloc]initWithRootViewController:vc2];
     
-    UIViewController *vc3 = [[SDTimeLineTableViewController alloc] init];
+    UIViewController *vc3 = [SLMomentsVc loadViewControllewWithNib];
     SLBaseNavigationController *navVC3 = [[SLBaseNavigationController alloc]initWithRootViewController:vc3];
     UIViewController *vc4 = [SLMyViewController loadViewControllewWithNib];
     SLBaseNavigationController *navVC4 = [[SLBaseNavigationController alloc]initWithRootViewController:vc4];

SLAiELTS/SLAiELTS/ViewControllers/Home/Views/Cells/SLHomeMsgCollectionViewCell.xib

@@ -20,7 +20,7 @@
                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="uw9-ge-7Je">
                         <rect key="frame" x="0.0" y="0.0" width="457" height="105"/>
                         <subviews>
-                            <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_ellipse" translatesAutoresizingMaskIntoConstraints="NO" id="GOG-Kd-9jG">
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_ellipse" translatesAutoresizingMaskIntoConstraints="NO" id="GOG-Kd-9jG">
                                 <rect key="frame" x="16" y="28.666666666666671" width="48" height="48"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="48" id="AUL-Ml-lNa"/>

SLAiELTS/SLAiELTS/ViewControllers/LoginVC/Models/SLUserModel.h

@@ -28,6 +28,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 + (void)requestUserRoleModel;
 
+- (NSString *)getUserHeadUrl;
+
 @end
 
 

SLAiELTS/SLAiELTS/ViewControllers/LoginVC/Models/SLUserModel.m

@@ -36,4 +36,9 @@
     }
 }
 
+- (NSString *)getUserHeadUrl {
+    NSString *userImg = [NSString stringWithFormat:@"%@%@",[SLHttpCenter SharedInstance].serverUrl, self.head];
+    return userImg;
+}
+
 @end

SLAiELTS/SLAiELTS/ViewControllers/TimeLine/TimeLineController/SDTimeLineTableViewController.h

@@ -1,35 +0,0 @@
-//
-//  SDTimeLineTableViewController.h
-//  GSD_WeiXin(wechat)
-//
-//  Created by gsd on 16/2/25.
-//  Copyright © 2016年 GSD. All rights reserved.
-//
-
-/*
- 
- *********************************************************************************
- *
- * GSD_WeiXin
- *
- * QQ交流群: 362419100(2群) 459274049（1群已满）
- * Email : gsdios@126.com
- * GitHub: https://github.com/gsdios/GSD_WeiXin
- * 新浪微博:GSD_iOS
- *
- * 此“高仿微信”用到了很高效方便的自动布局库SDAutoLayout（一行代码搞定自动布局）
- * SDAutoLayout地址：https://github.com/gsdios/SDAutoLayout
- * SDAutoLayout视频教程：http://www.letv.com/ptv/vplay/24038772.html
- * SDAutoLayout用法示例：https://github.com/gsdios/SDAutoLayout/blob/master/README.md
- *
- *********************************************************************************
- 
- */
-
-#import "SDBaseTableViewController.h"
-
-@interface SDTimeLineTableViewController : SDBaseTableViewController
-
-@property (nonatomic, strong) SLUserModel *userModel;
-
-@end

SLAiELTS/SLAiELTS/ViewControllers/TimeLine/TimeLineController/SLFriensInfoVc.m

@@ -8,7 +8,7 @@
 #import "SLFriensInfoVc.h"
 #import "SDTimeLineTableHeaderView.h"
 #import "SLMessageViewController.h"
-#import "SDTimeLineTableViewController.h"
+#import "SLMomentsVc.h"
 
 @interface SLFriensInfoVc ()
 @property (weak, nonatomic) IBOutlet UIImageView *fHeardImageView;
@@ -29,7 +29,7 @@
     self.navigationBar.separatorHeight = 0.0f;
     WS(weakSelf);
     [self.fpyqBgView addTapWithBlock:^{
-        SDTimeLineTableViewController *vc = [[SDTimeLineTableViewController alloc] init];
+        SLMomentsVc *vc = [SLMomentsVc loadViewControllewWithNib];
         SLUserModel *userModel = [[SLUserModel alloc] init];
         userModel.userId = weakSelf.friendModel.contactsId;
         vc.userModel = userModel;

SLAiELTS/SLAiELTS/ViewControllers/TimeLine/TimeLineController/SLMomentDetailTableVc.h

@@ -5,11 +5,11 @@
 //  Created by Gusont on 2023/4/13.
 //
 
-#import "SDTimeLineTableViewController.h"
+#import "SLMomentsVc.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface SLMomentDetailTableVc : SDTimeLineTableViewController
+@interface SLMomentDetailTableVc : SLMomentsVc
 
 @end
 

SLAiELTS/SLAiELTS/ViewControllers/TimeLine/TimeLineController/SLMomentDetailTableVc.m

@@ -24,7 +24,9 @@
     backBarButtonItem.title = @"取消";
     navigationBar.leftBarButtonItem = backBarButtonItem;
     navigationBar.titleItem.title = @"详情";
-    self.tableView.tableHeaderView = navigationBar;
+    self.navigationBar = navigationBar;
+    self.navigationBar.hidden = NO;
+//    self.tableView.tableHeaderView = navigationBar;
 }
 
 - (void)backBarButtonPressed:(id)pressed {

SLAiELTS/SLAiELTS/ViewControllers/TimeLine/TimeLineController/SLMomentsCommentVc.xib

@@ -22,7 +22,7 @@
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="TF7-ij-FCC" customClass="PlaceholderTextView">
-                    <rect key="frame" x="16" y="97" width="358" height="160"/>
+                    <rect key="frame" x="16" y="50" width="358" height="160"/>
                     <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="160" id="0J3-od-tyv"/>
@@ -32,26 +32,26 @@
                     </connections>
                 </view>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0/500" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6o2-3n-j5s">
-                    <rect key="frame" x="340" y="242.66666666666666" width="34" height="14.333333333333343"/>
+                    <rect key="frame" x="340" y="195.66666666666666" width="34" height="14.333333333333343"/>
                     <fontDescription key="fontDescription" type="system" pointSize="12"/>
                     <color key="textColor" systemColor="systemGray2Color"/>
                     <nil key="highlightedColor"/>
                 </label>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="aWc-yO-WqE" userLabel="lineView">
-                    <rect key="frame" x="16" y="260" width="358" height="1"/>
+                    <rect key="frame" x="16" y="213" width="358" height="1"/>
                     <color key="backgroundColor" red="0.94901960780000005" green="0.95294117649999999" blue="0.96862745100000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="1" id="WJb-UQ-hdi"/>
                     </constraints>
                 </view>
             </subviews>
-            <viewLayoutGuide key="safeArea" id="PfR-Ut-vcP"/>
+            <viewLayoutGuide key="safeArea" id="dSa-RF-b9b"/>
             <color key="backgroundColor" systemColor="systemBackgroundColor"/>
             <constraints>
                 <constraint firstItem="aWc-yO-WqE" firstAttribute="bottom" secondItem="6o2-3n-j5s" secondAttribute="bottom" constant="4" id="5U6-kg-xBk"/>
-                <constraint firstItem="PfR-Ut-vcP" firstAttribute="trailing" secondItem="TF7-ij-FCC" secondAttribute="trailing" constant="16" id="GPm-wv-QVG"/>
-                <constraint firstItem="TF7-ij-FCC" firstAttribute="leading" secondItem="PfR-Ut-vcP" secondAttribute="leading" constant="16" id="Tut-N4-XkF"/>
-                <constraint firstItem="TF7-ij-FCC" firstAttribute="top" secondItem="PfR-Ut-vcP" secondAttribute="top" constant="50" id="e35-Jz-FIx"/>
+                <constraint firstAttribute="trailing" secondItem="TF7-ij-FCC" secondAttribute="trailing" constant="16" id="GPm-wv-QVG"/>
+                <constraint firstItem="TF7-ij-FCC" firstAttribute="leading" secondItem="AOD-EN-2Gp" secondAttribute="leading" constant="16" id="Tut-N4-XkF"/>
+                <constraint firstItem="TF7-ij-FCC" firstAttribute="top" secondItem="AOD-EN-2Gp" secondAttribute="top" constant="50" id="e35-Jz-FIx"/>
                 <constraint firstItem="6o2-3n-j5s" firstAttribute="bottom" secondItem="TF7-ij-FCC" secondAttribute="bottom" id="lx6-pJ-EqN"/>
                 <constraint firstItem="aWc-yO-WqE" firstAttribute="leading" secondItem="AOD-EN-2Gp" secondAttribute="leading" constant="16" id="pF4-AB-byY"/>
                 <constraint firstItem="6o2-3n-j5s" firstAttribute="trailing" secondItem="TF7-ij-FCC" secondAttribute="trailing" id="pnW-YD-ZLZ"/>

SLAiELTS/SLAiELTS/ViewControllers/TimeLine/TimeLineController/SLMomentsVc.h

@@ -0,0 +1,24 @@
+//
+//  SLMomentsVc.h
+//  SLAiELTS
+//
+//  Created by Gusont on 2023/4/14.
+//
+
+#import "SLBaseViewController.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface SLMomentsVc : SLBaseViewController
+
+@property (weak, nonatomic) IBOutlet UITableView *tableView;
+
+@property (nonatomic, strong) SLUserModel *userModel;
+
+@property (nonatomic, assign) BOOL isDetail;
+
+@property (nonatomic, strong) NSMutableArray *dataArray;
+
+@end
+
+NS_ASSUME_NONNULL_END

SLAiELTS/SLAiELTS/ViewControllers/TimeLine/TimeLineController/SDTimeLineTableViewController.m → SLAiELTS/SLAiELTS/ViewControllers/TimeLine/TimeLineController/SLMomentsVc.m

@@ -1,32 +1,11 @@
 //
-//  SDTimeLineTableViewController.m
-//  GSD_WeiXin(wechat)
+//  SLMomentsVc.m
+//  SLAiELTS
 //
-//  Created by gsd on 16/2/25.
-//  Copyright © 2016年 GSD. All rights reserved.
+//  Created by Gusont on 2023/4/14.
 //
 
-/*
- 
- *********************************************************************************
- *
- * GSD_WeiXin
- *
- * QQ交流群: 362419100(2群) 459274049（1群已满）
- * Email : gsdios@126.com
- * GitHub: https://github.com/gsdios/GSD_WeiXin
- * 新浪微博:GSD_iOS
- *
- * 此“高仿微信”用到了很高效方便的自动布局库SDAutoLayout（一行代码搞定自动布局）
- * SDAutoLayout地址：https://github.com/gsdios/SDAutoLayout
- * SDAutoLayout视频教程：http://www.letv.com/ptv/vplay/24038772.html
- * SDAutoLayout用法示例：https://github.com/gsdios/SDAutoLayout/blob/master/README.md
- *
- *********************************************************************************
- 
- */
-
-#import "SDTimeLineTableViewController.h"
+#import "SLMomentsVc.h"
 
 #import "SDTimeLineTableHeaderView.h"
 #import "SDTimeLineRefreshHeader.h"
@@ -47,7 +26,8 @@
 
 static CGFloat textFieldH = 56;
 
-@interface SDTimeLineTableViewController () <SDTimeLineCellDelegate, UITextFieldDelegate, Delegates>
+@interface SLMomentsVc () <SDTimeLineCellDelegate, UITextFieldDelegate, Delegates>
+
 
 @property (nonatomic, strong) UITextView *textField;
 @property (nonatomic, assign) BOOL isReplayingComment;
@@ -61,7 +41,8 @@ static CGFloat textFieldH = 56;
 @property (nonatomic, strong) NSString *currentCacheFriendId;
 @end
 
-@implementation SDTimeLineTableViewController
+
+@implementation SLMomentsVc
 
 {
     CGFloat _lastScrollViewOffsetY;
@@ -71,38 +52,43 @@ static CGFloat textFieldH = 56;
 - (void)viewDidLoad
 {
     [super viewDidLoad];
+    self.navigationBar.hidden = YES;
     if (@available(iOS 11.0, *)) {
         self.tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
     } else {
         self.automaticallyAdjustsScrollViewInsets = NO;
     }
-    self.edgesForExtendedLayout = UIRectEdgeTop;
+//    if (@available(iOS 15.0, *)) {
+//        self.tableView.sectionHeaderTopPadding = 0;
+//    } else {
+//        // Fallback on earlier versions
+//    }
     
     if (!self.userModel) {
         self.userModel = [SLGlobalInfo SharedInstance].loginInfo.user;
     }
-    SDTimeLineTableHeaderView *headerView = [SDTimeLineTableHeaderView new];
-    headerView.frame = CGRectMake(0, 0, 0, 220 * KScaleW);
+    SDTimeLineTableHeaderView *headerView = [[SDTimeLineTableHeaderView alloc] initWithFrame:CGRectMake(0, 0, 0, 220 * KScaleW)];
     self.tableView.tableHeaderView = headerView;
-    
+    self.tableView.tableHeaderView.frame = CGRectMake(0, 0, kSCREEN_WIDTH, 220 * KScaleW);
     //添加分隔线颜色设置
     self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
     [self.tableView registerClass:[SDTimeLineCell class] forCellReuseIdentifier:kTimeLineTableViewCellId];
     
-
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyboardNotification:) name:UIKeyboardWillChangeFrameNotification object:nil];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(momentsUpdate:) name:@"SLMomentsUpdate" object:nil];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(momentsCommentUpdate:) name:@"SLMomentsCommentUpdate" object:nil];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(momentsDetail:) name:@"SLMomentsDetail" object:nil];
 
     [self creatModelsWithCount:0];
-    NSString *cacheKey = [NSString stringWithFormat:@"SLMomentsCache--%@", self.userModel.userId];
-    NSString *cacheStr = [[NSUserDefaults standardUserDefaults] objectForKey:cacheKey];
-    NSArray *items = [[cacheStr mj_JSONObject] objectForKey:@"items"];
-    if (items.count) {
-        NSArray<SDTimeLineCellModel *> *models = [SDTimeLineCellModel mj_objectArrayWithKeyValuesArray:items];
-        self.currentCacheFriendId = models.firstObject.friendId;
-        [self.dataArray addObjectsFromArray:models];
+    if (!self.isDetail) {
+        NSString *cacheKey = [NSString stringWithFormat:@"SLMomentsCache--%@", self.userModel.userId];
+        NSString *cacheStr = [[NSUserDefaults standardUserDefaults] objectForKey:cacheKey];
+        NSArray *items = [[cacheStr mj_JSONObject] objectForKey:@"items"];
+        if (items.count) {
+            NSArray<SDTimeLineCellModel *> *models = [SDTimeLineCellModel mj_objectArrayWithKeyValuesArray:items];
+            self.currentCacheFriendId = models.firstObject.friendId;
+            [self.dataArray addObjectsFromArray:models];
+        }
     }
 }
 
@@ -142,9 +128,10 @@ static CGFloat textFieldH = 56;
         }
     }];
     SLMomentDetailTableVc *vc = [[SLMomentDetailTableVc alloc] init];
+    vc.isDetail = YES;
     vc.dataArray = [NSMutableArray arrayWithObject:cModel];
     [vc.tableView reloadData];
-    [self.rdv_tabBarController.navigationController pushViewController:vc animated:YES];
+    [self navPushViewController:vc animated:YES];
 }
 
 - (void)momentsUpdate:(NSNotification *)notification {
@@ -179,7 +166,7 @@ static CGFloat textFieldH = 56;
     vc.momentsCommentBlock = ^(NSString * _Nonnull text) {
         [self updateCommentWithModel:cModel index:[NSIndexPath indexPathForRow:i inSection:0] text:text];
     };
-    [self.rdv_tabBarController.navigationController pushViewController:vc animated:YES];
+    [self navPushViewController:vc animated:YES];
 }
 
 - (void)updateCommentWithModel:(SDTimeLineCellModel *)model index:(NSIndexPath *)index text:(NSString *)text {
@@ -239,8 +226,6 @@ static CGFloat textFieldH = 56;
 
 - (void)creatModelsWithCount:(NSInteger)count
 {
-    
-    
     WS(weakSelf);
     [self.tableView tableviewRefresh:self.dataArray TableViewRefresh:^(NSInteger pageNo, TableListCount listCount) {
         
@@ -393,16 +378,17 @@ static CGFloat textFieldH = 56;
     } failure:^(SPRequestError *error) {
         
     }];
+    SLUserModel *userModel = [SLGlobalInfo SharedInstance].loginInfo.user;
     if (!model.isLike) {
         SDTimeLineCellLikeItemModel *likeModel = [SDTimeLineCellLikeItemModel new];
-        likeModel.userName = model.userName;
-        likeModel.userId = model.userName;
+        likeModel.userName = userModel.name;
+        likeModel.userId = userModel.userId;
         [temp addObject:likeModel];
         model.isLike = YES;
     } else {
         SDTimeLineCellLikeItemModel *tempLikeModel = nil;
         for (SDTimeLineCellLikeItemModel *likeModel in model.likeItemsArray) {
-            if ([likeModel.userName isEqualToString:model.userName]) {
+            if ([likeModel.userName isEqualToString:userModel.name]) {
                 tempLikeModel = likeModel;
                 break;
             }
@@ -480,4 +466,12 @@ static CGFloat textFieldH = 56;
     [self.moentsChatView setNeedsDisplay];
 }
 
+- (NSMutableArray *)dataArray {
+    if (!_dataArray) {
+        _dataArray = [NSMutableArray array];
+    }
+    return _dataArray;
+}
+
+
 @end

SLAiELTS/SLAiELTS/ViewControllers/TimeLine/TimeLineController/SLMomentsVc.xib

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21225" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina6_0" orientation="portrait" appearance="light"/>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21207"/>
+        <capability name="System colors in document resources" minToolsVersion="11.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="SLMomentsVc">
+            <connections>
+                <outlet property="tableView" destination="uV7-ff-uk7" id="rsd-AE-TuK"/>
+                <outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
+            </connections>
+        </placeholder>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <view clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="i5M-Pr-FkT">
+            <rect key="frame" x="0.0" y="0.0" width="390" height="844"/>
+            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <subviews>
+                <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="grouped" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="18" estimatedSectionHeaderHeight="-1" sectionFooterHeight="18" estimatedSectionFooterHeight="-1" translatesAutoresizingMaskIntoConstraints="NO" id="uV7-ff-uk7">
+                    <rect key="frame" x="0.0" y="0.0" width="390" height="844"/>
+                    <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                    <connections>
+                        <outlet property="dataSource" destination="-1" id="ZUA-mc-LPb"/>
+                        <outlet property="delegate" destination="-1" id="YCq-ch-jj8"/>
+                    </connections>
+                </tableView>
+            </subviews>
+            <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+            <constraints>
+                <constraint firstItem="uV7-ff-uk7" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="4Cv-Ie-62u"/>
+                <constraint firstAttribute="bottom" secondItem="uV7-ff-uk7" secondAttribute="bottom" id="Hx7-9p-UFF"/>
+                <constraint firstItem="uV7-ff-uk7" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" id="NT8-ow-lcY"/>
+                <constraint firstAttribute="trailing" secondItem="uV7-ff-uk7" secondAttribute="trailing" id="ZOY-LZ-8g9"/>
+            </constraints>
+            <point key="canvasLocation" x="128" y="-1"/>
+        </view>
+    </objects>
+    <resources>
+        <systemColor name="systemBackgroundColor">
+            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
+    </resources>
+</document>

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

@@ -82,6 +82,8 @@ NSString *const kSDTimeLineCellOperationButtonClickedNotification = @"SDTimeLine
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(receiveOperationButtonClickedNotification:) name:kSDTimeLineCellOperationButtonClickedNotification object:nil];
     
     _iconView = [UIImageView new];
+    _iconView.clipsToBounds = YES;
+    _iconView.contentMode = UIViewContentModeScaleAspectFill;
     
     _nameLable = [UILabel new];
     _nameLable.font = [UIFont boldSystemFontOfSize:16];
@@ -96,7 +98,7 @@ NSString *const kSDTimeLineCellOperationButtonClickedNotification = @"SDTimeLine
         model.name = weakSelf.model.userName;
         model.head = weakSelf.model.userImg;
         vc.friendModel = model;
-        [weakSelf.viewController.rdv_tabBarController.navigationController pushViewController:vc animated:YES];
+        [weakSelf.viewController navPushViewController:vc animated:YES];
     }];
     
     _contentLabel = [UILabel new];

SLAiELTS/SLAiELTS/ViewControllers/TimeLine/Views/HeaderView/SDTimeLineTableHeaderView.m

@@ -50,6 +50,13 @@
     return self;
 }
 
+- (void)setHeaderWithLoginInfo {
+    SLUserModel *model = [SLGlobalInfo SharedInstance].loginInfo.user;
+    NSString *urlStr = [model getUserHeadUrl];
+    [_iconView sd_setImageWithURL:[NSURL URLWithString:urlStr] placeholderImage:ImageName(@"icon_ellipse")];
+    _nameLabel.text = model.name;
+}
+
 - (void)setup
 {
     _backgroundImageView = [UIImageView new];
@@ -58,9 +65,15 @@
     [self addSubview:_backgroundImageView];
     
     _iconView = [UIImageView new];
-    _iconView.image = ImageName(@"icon_ellipse");
+    NSString *urlStr = [[SLGlobalInfo SharedInstance].loginInfo.user getUserHeadUrl];
+    [_iconView sd_setImageWithURL:[NSURL URLWithString:urlStr] placeholderImage:ImageName(@"icon_ellipse")];
     [self addSubview:_iconView];
     
+    WS(weakSelf);
+    [self.KVOController observe:[SLGlobalInfo SharedInstance] keyPath:@"loginInfo" options:NSKeyValueObservingOptionNew | NSKeyValueObservingOptionOld block:^(id  _Nullable observer, id  _Nonnull object, NSDictionary<NSKeyValueChangeKey,id> * _Nonnull change) {
+        [weakSelf setHeaderWithLoginInfo];
+    }];
+    
     _nameLabel = [UILabel new];
     SLLoginInfo *targetModel = [SLGlobalInfo SharedInstance].loginInfo;
     _nameLabel.text = targetModel.user.name;
@@ -81,6 +94,7 @@
     [self addSubview:_interestcrollView];
     
     NSMutableArray *marr = [NSMutableArray arrayWithArray:@[@"运动",@"运动",@"运动",@"运动"]];
+    [marr removeAllObjects];
     [marr enumerateObjectsUsingBlock:^(NSString *obj, NSUInteger idx, BOOL * _Nonnull stop) {
         UILabel *label = [[UILabel alloc] initWithFrame:CGRectZero];
         label.text = obj;
@@ -96,7 +110,6 @@
     
     UIButton *moreInterestBtn = [UIButton buttonWithType:UIButtonTypeCustom];
     [moreInterestBtn setImage:ImageName(@"icon_moents_right_arrow") forState:UIControlStateNormal];
-    WS(weakSelf);
     [moreInterestBtn handleEvent:UIControlEventTouchUpInside withBlock:^{
             
     }];
@@ -125,11 +138,16 @@
     .rightSpaceToView(self, 50)
     .bottomSpaceToView(self, 54);
     
-    _creatBtn.sd_layout
-    .widthIs(36)
-    .heightIs(36)
-    .rightSpaceToView(self, 12)
-    .topSpaceToView(self, 0);
+//    _creatBtn.sd_layout
+//    .widthIs(36)
+//    .heightIs(36)
+//    .rightSpaceToView(self, 12)
+//    .topSpaceToView(self, 20);
+    [_creatBtn mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.width.height.mas_equalTo(36);
+        make.right.equalTo(self.mas_right).offset(-12);
+        make.top.mas_equalTo(10);
+    }];
     
     moreInterestBtn.sd_layout
     .widthIs(26)
@@ -147,8 +165,8 @@
             case 2:
             {
                 SLCreatMomentsVc *vc = [SLCreatMomentsVc loadViewControllewWithNib];
-                vc.hasPhotoSel = index != 0;
-                [weakSelf.viewController.rdv_tabBarController.navigationController pushViewController:vc animated:YES];
+                vc.hasPhotoSel = index != 2;
+                [weakSelf.viewController navPushViewController:vc animated:YES];
             }
                 break;
             default: