nothing

KulexiuForStudent/KulexiuForStudent.xcodeproj/project.pbxproj

@@ -1994,6 +1994,8 @@
 		275FA1F527E7356A00CFEA2E /* Model */ = {
 			isa = PBXGroup;
 			children = (
+				BC40BA19281251EC00DEC0D1 /* HomeMessageModel.h */,
+				BC40BA1A281251ED00DEC0D1 /* HomeMessageModel.m */,
 				BCFE53F928129A5500AD6786 /* TeacherStyleModel.h */,
 				BCFE53F828129A5500AD6786 /* TeacherStyleModel.m */,
 				BCFE5404281545C500AD6786 /* HomeAlbumModel.h */,
@@ -3399,8 +3401,6 @@
 		BC40BA1128124D0C00DEC0D1 /* Model */ = {
 			isa = PBXGroup;
 			children = (
-				BC40BA19281251EC00DEC0D1 /* HomeMessageModel.h */,
-				BC40BA1A281251ED00DEC0D1 /* HomeMessageModel.m */,
 			);
 			path = Model;
 			sourceTree = "<group>";

KulexiuForStudent/KulexiuForStudent.xcworkspace/xcuserdata/wangzhi.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -62,8 +62,8 @@
             filePath = "KulexiuForStudent/Module/Home/Controller/HomeViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "849"
-            endingLineNumber = "849"
+            startingLineNumber = "910"
+            endingLineNumber = "910"
             landmarkName = "-homeCourseChooseAction:"
             landmarkType = "7">
          </BreakpointContent>
@@ -78,8 +78,8 @@
             filePath = "KulexiuForStudent/Common/Base/KSOrderManager.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "21"
-            endingLineNumber = "21"
+            startingLineNumber = "22"
+            endingLineNumber = "22"
             landmarkName = "+dealWithAliOrder:"
             landmarkType = "7">
          </BreakpointContent>
@@ -87,16 +87,32 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            uuid = "113FF9CC-3FAD-4E68-BE62-A8BDE1DB7F40"
+            uuid = "4F6C61A9-D4D5-4F22-B8F3-ED812BE470A4"
             shouldBeEnabled = "Yes"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
-            filePath = "KulexiuForStudent/Module/Home/Controller/HomeViewController.m"
+            filePath = "KulexiuForStudent/Common/Base/KSBaseWKWebViewController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "412"
+            endingLineNumber = "412"
+            landmarkName = "-handleScriptMessageSource:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "8A2379FD-DD15-49C1-A722-62AE22807377"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "KulexiuForStudent/Common/Base/KSBaseWKWebViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "353"
-            endingLineNumber = "353"
-            landmarkName = "-requestUserInfo"
+            startingLineNumber = "54"
+            endingLineNumber = "54"
+            landmarkName = "-operationDealCallbackMessage:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>

KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Home/Home_button/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Home/Home_button/home_accompany.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "home_accompany@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "home_accompany@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Home/Home_button/home_live.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "home_live@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "home_live@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Home/Home_button/home_music.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "home_music@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "home_music@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Home/Home_button/home_style.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "home_style@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "home_style@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Home/Home_button/home_video.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "home_video@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "home_video@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

KulexiuForStudent/KulexiuForStudent/Assets.xcassets/back_button_white.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "back_button_white@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "back_button_white@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

KulexiuForStudent/KulexiuForStudent/Common/Base/KSBaseWKWebViewController.m

@@ -43,6 +43,15 @@
     // Do any additional setup after loading the view.
     self.ks_prefersNavigationBarHidden = YES; // 隐藏导航栏，其他事件额外处理
     [self initWebView];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(operationDealCallbackMessage:) name:DEALCALLBACKNOTICIFATION object:nil];
+}
+
+- (void)operationDealCallbackMessage:(NSNotification *)notification {
+    NSString *status = [notification object];
+    NSMutableDictionary *sendParm = [NSMutableDictionary dictionary];
+    [sendParm setValue:@"paymentOperation" forKey:@"api"];
+    [sendParm setValue:status forKey:@"status"];
+    [self postMessage:sendParm];
 }
 
 - (void)setParmDic:(NSDictionary *)parmDic {
@@ -136,7 +145,7 @@
         WeakWebViewScriptMessageDelegate *weakScriptMessageDelegate = [[WeakWebViewScriptMessageDelegate alloc] initWithDelegate:self];
         //这个类主要用来做native与JavaScript的交互管理
         WKUserContentController * wkUController = [[WKUserContentController alloc] init];
-        [wkUController addScriptMessageHandler:weakScriptMessageDelegate name:@"DAYA"];
+        [wkUController addScriptMessageHandler:weakScriptMessageDelegate name:@"COLEXIU"];
         config.userContentController = wkUController;
         
         WKPreferences *preferences = [WKPreferences new];
@@ -149,6 +158,8 @@
         _myWebView.UIDelegate = self;
         _myWebView.navigationDelegate = self;
         _myWebView.scrollView.bounces = NO;
+        _myWebView.scrollView.showsVerticalScrollIndicator = NO;
+        _myWebView.scrollView.showsHorizontalScrollIndicator = NO;
         // 加载进度条和title
         [_myWebView addObserver:self forKeyPath:@"estimatedProgress" options:NSKeyValueObservingOptionNew context:nil];
         [_myWebView addObserver:self forKeyPath:@"title" options:NSKeyValueObservingOptionNew context:NULL];
@@ -156,7 +167,7 @@
         [_myWebView mas_makeConstraints:^(MASConstraintMaker *make) {
             make.left.right.mas_equalTo(self.view);
             make.top.mas_equalTo(self.view.mas_top).offset(topHeight);
-            make.bottom.mas_equalTo(self.view.mas_bottom);
+            make.bottom.mas_equalTo(self.view.mas_bottom).offset(-iPhoneXSafeBottomMargin);
         }];
         if (@available(iOS 11.0, *)) {
             _myWebView.scrollView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
@@ -179,7 +190,7 @@
     MJWeakSelf;
     [self.myWebView evaluateJavaScript:@"navigator.userAgent" completionHandler:^(id result, NSError *error) {
         NSString *oldUserAgent = result;
-        NSString *newUserAgent = [NSString stringWithFormat:@"%@ %@",oldUserAgent,@"DAYAAPPI"];
+        NSString *newUserAgent = [NSString stringWithFormat:@"%@ %@",oldUserAgent,@"COLEXIUAPPI"];
         weakSelf.myWebView.customUserAgent = newUserAgent;
         [weakSelf loadRequest];;
     }];
@@ -236,7 +247,7 @@
 - (void)userContentController:(WKUserContentController *)userContentController
       didReceiveScriptMessage:(WKScriptMessage *)message {
 
-    if ([message.name isEqualToString:@"DAYA"]) {
+    if ([message.name isEqualToString:@"COLEXIU"]) {
         NSDictionary *parm = [self convertJsonStringToNSDictionary:message.body];
         // 回到主线程
         dispatch_async(dispatch_get_main_queue(), ^{
@@ -548,7 +559,7 @@
     NSString *scheme = [url scheme];
     UIApplication *app = [UIApplication sharedApplication];
     NSString *urlString = url.absoluteString;
-    if (![urlString containsString:@"dayaedu.com"] && ![urlString containsString:WEBHOST]) { // 外部链接
+    if (![urlString containsString:@"colexiu.com"] && ![urlString containsString:WEBHOST]) { // 外部链接
         self.isOutLink = YES;
     }
     else {
@@ -789,7 +800,7 @@
 }
 
 - (void)dealloc {
-    [[_myWebView configuration].userContentController removeScriptMessageHandlerForName:@"DAYA"];
+    [[_myWebView configuration].userContentController removeScriptMessageHandlerForName:@"COLEXIU"];
     [_myWebView removeObserver:self forKeyPath:@"estimatedProgress"];
     [_myWebView removeObserver:self forKeyPath:@"title"];
     [_myWebView loadHTMLString:@"" baseURL:nil];

KulexiuForStudent/KulexiuForStudent/Common/Base/KSLocalWebViewController.m

@@ -72,7 +72,7 @@
         WeakWebViewScriptMessageDelegate *weakScriptMessageDelegate = [[WeakWebViewScriptMessageDelegate alloc] initWithDelegate:self];
         //这个类主要用来做native与JavaScript的交互管理
         WKUserContentController * wkUController = [[WKUserContentController alloc] init];
-        [wkUController addScriptMessageHandler:weakScriptMessageDelegate name:@"DAYA"];
+        [wkUController addScriptMessageHandler:weakScriptMessageDelegate name:@"COLEXIUAPPI"];
         config.userContentController = wkUController;
         
         WKPreferences *preferences = [WKPreferences new];
@@ -310,7 +310,7 @@
 
 
 - (void)dealloc {
-    [[_myWebView configuration].userContentController removeScriptMessageHandlerForName:@"DAYA"];
+    [[_myWebView configuration].userContentController removeScriptMessageHandlerForName:@"COLEXIUAPPI"];
     [_myWebView removeObserver:self forKeyPath:@"estimatedProgress"];
     [_myWebView removeObserver:self forKeyPath:@"title"];
     [_myWebView loadHTMLString:@"" baseURL:nil];

KulexiuForStudent/KulexiuForStudent/Common/Base/KSNetworkingManager.h

@@ -483,6 +483,14 @@ NS_ASSUME_NONNULL_BEGIN
 /// @param faliure 失败
 + (void)HomeHotAlbumRequest:(NSString *)post page:(NSInteger)page rows:(NSInteger)rows success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure;
 
+// /api-cms/news/app/home
+// 首页资讯
+
+/// 首页banner、按钮、资讯
+/// @param post post
+/// @param success 成功
+/// @param faliure 失败
++ (void)homeNewsList:(NSString *)post success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure;
 @end
 
 NS_ASSUME_NONNULL_END

KulexiuForStudent/KulexiuForStudent/Common/Base/KSNetworkingManager.m

@@ -69,6 +69,7 @@
  */
 + (void)request:(NSString *)post andWithUrl:(NSString *)myUrl and:(id)parm success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure {
     __block NSDictionary *dic;
+    NSLog(@"----url ------%@",myUrl);
 #pragma mark  ----- 签名
 //    parm = [NSString signToMD5:parm];
     NSLog(@"%@",[parm mj_JSONString]);
@@ -1022,4 +1023,18 @@
     [parm setValue:@(rows) forKey:@"rows"];
     [self request:post andWithUrl:url and:parm success:success faliure:faliure];
 }
+
+// /api-cms/news/app/home
+// 首页资讯
+
+/// 首页banner、按钮、资讯
+/// @param post post
+/// @param success 成功
+/// @param faliure 失败
++ (void)homeNewsList:(NSString *)post success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure {
+    [self configRequestMethodJSON];
+    NSString *url = [NSString stringWithFormat:@"%@%@", hostURL, @"/api-cms/news/app/home"];
+    NSMutableDictionary *parm = [NSMutableDictionary dictionary];
+    [self request:post andWithUrl:url and:parm success:success faliure:faliure];
+}
 @end

KulexiuForStudent/KulexiuForStudent/Common/Base/KSOrderManager.m

@@ -14,15 +14,19 @@
     if ([[UIApplication sharedApplication] canOpenURL:url]) {
 //        [[UIApplication sharedApplication] openURL:url];
         [[UIApplication sharedApplication] openURL:url options:@{} completionHandler:^(BOOL success) {
-            if (success) {
+            if (success) { // 跳转成功
                 NSLog(@"success");
+                [[NSNotificationCenter defaultCenter] postNotificationName:DEALCALLBACKNOTICIFATION object:@"success"];
             }
-            else {
-                NSLog(@"------");
+            else { // 未跳转成功
+                NSLog(@"---cancel---");
+                [[NSNotificationCenter defaultCenter] postNotificationName:DEALCALLBACKNOTICIFATION object:@"cancel"];
             }
         }];
     }
     else {
+        // 未安装
+        [[NSNotificationCenter defaultCenter] postNotificationName:DEALCALLBACKNOTICIFATION object:@"fail"];
         NSLog(@"无法打开该链接---- %@----", infoMessage);
     }
 }

KulexiuForStudent/KulexiuForStudent/Common/Define/PrefixHeader.pch

@@ -35,6 +35,8 @@
 #import "NSObject+KSDateFormatter.h"
 
 // 加密使用 NSString+MD5
+#define DEALCALLBACKNOTICIFATION (@"DEALCALLBACKNOTICIFATION")
+
 #define DEFAULT_SALT (@"D5sIlPU2")
 #define APPSECRET (@"QuMCIKICAgIH0sCiAgICAicGxhdGZvcm0tZGV2IjogW10")
 
@@ -113,7 +115,7 @@ shouldPrevent = NO; \
 #define hostURL (@"http://dev.colexiu.com")
 #define SEALCLASSHOST (@"http://dev.colexiu.com/api-im")
 #define WEBHOST (@"http://dev.colexiu.com/student")
-//#define WEBHOST (@"http://192.168.3.63:5000/student")
+//#define WEBHOST (@"http://192.168.3.63:5000")
 #define SOCKET_URL (@"ws://mteadev.colexiu.com/audioAnalysis")
 #define JSPUSH_ENVIRONMENT (NO)
 #define RCIM_KEY (@"0vnjpoad0jbdz")

KulexiuForStudent/KulexiuForStudent/Module/Home/Controller/HomeViewController.m

@@ -46,7 +46,7 @@
 
 #import "WMPlayer.h"  // 播放相关
 
-#define BUTTONWIDTH (80)
+#define BUTTONWIDTH (65)
 #define BUTTONHEIGHT (80)
 
 @interface HomeViewController ()<TYCyclePagerViewDataSource,TYCyclePagerViewDelegate,UITableViewDelegate,UITableViewDataSource,UIScrollViewDelegate,UICollectionViewDelegate, UICollectionViewDelegateFlowLayout,UICollectionViewDataSource,WMPlayerDelegate>
@@ -179,6 +179,24 @@
     }];
     tableHeaderHeight += self.buttonViewHeight;
     
+    NSMutableArray *buttonInfoArray = [NSMutableArray array];
+    NSArray *titleArray = @[@"陪练课",@"直播课",@"视频课",@"乐谱库",@"老师风采"];
+    NSArray *imageArray = @[@"home_accompany",@"home_live",@"home_video",@"home_music",@"home_style"];
+    NSString *accompanyUrl = [NSString stringWithFormat:@"%@%@", WEBHOST, @"/#/practiceClass"];
+    NSString *liveUrl = [NSString stringWithFormat:@"%@%@", WEBHOST, @"/#/liveClass"];
+    NSString *videoUrl = [NSString stringWithFormat:@"%@%@", WEBHOST, @"/#/videoClass"];
+    NSString *teacherUrl = [NSString stringWithFormat:@"%@%@", WEBHOST, @"/#/teacherElegant"];
+    NSArray *linkUrlArray = @[accompanyUrl,liveUrl,videoUrl,@"",teacherUrl];
+    for (NSInteger i = 0; i < titleArray.count; i++) {
+        HomeMessageModel *model = [[HomeMessageModel alloc] init];
+        model.title = titleArray[i];
+        model.coverImage = imageArray[i];
+        model.linkUrl = linkUrlArray[i];
+        [buttonInfoArray addObject:model];
+    }
+    self.buttonArray = [NSMutableArray arrayWithArray:buttonInfoArray];
+    [self showButtonMessage];
+    
     // 课程提醒
     [self.tableHeaderView addSubview:self.tipsCourseView];
     self.tipsViewHeight = CGFLOAT_MIN;
@@ -224,7 +242,7 @@
     
     // 老师风采
     [self.tableHeaderView addSubview:self.teacherView];
-    self.teachViewHeight = [self.teacherView getViewHeightWithSourceCount:10];
+    self.teachViewHeight = [self.teacherView getViewHeightWithSourceCount:4];
     
     [self.teacherView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.right.mas_equalTo(self.tableHeaderView);
@@ -242,6 +260,7 @@
     }];
     tableHeaderHeight += self.informationHeight;
     self.tableHeaderView.frame = CGRectMake(0, 0, KPortraitWidth, tableHeaderHeight);
+    [self.tableView reloadData];
 }
 
 - (void)refreshTableHeadHeight {
@@ -259,7 +278,45 @@
 }
 
 - (void)requestNewsList {
-    
+    [KSNetworkingManager homeNewsList:KS_POST success:^(NSDictionary * _Nonnull dic) {
+        if ([dic integerValueForKey:@"code"] == 200 && [dic boolValueForKey:@"status"]) {
+            NSDictionary *result = [dic dictionaryValueForKey:@"data"];
+            // banner
+            NSArray *bannerArray = [result arrayValueForKey:@"banner"];
+            NSMutableArray *bannerInfoArray = [NSMutableArray array];
+            for (NSDictionary *parm in bannerArray) {
+                HomeMessageModel *model = [[HomeMessageModel alloc] initWithDictionary:parm];
+                [bannerInfoArray addObject:model];
+            }
+            self.bannerArray = [NSMutableArray arrayWithArray:bannerInfoArray];
+            [self.bannerScroll reloadData];
+            
+            // button
+//            NSArray *buttonArray = [result arrayValueForKey:@"appMenu"];
+//            NSMutableArray *buttonInfoArray = [NSMutableArray array];
+//            for (NSDictionary *parm in buttonArray) {
+//                HomeMessageModel *model = [[HomeMessageModel alloc] initWithDictionary:parm];
+//                [buttonInfoArray addObject:model];
+//            }
+//            self.buttonArray = [NSMutableArray arrayWithArray:buttonInfoArray];
+//            [self showButtonMessage];
+            
+            // information
+            NSArray *information = [result arrayValueForKey:@"information"];
+            NSMutableArray *informationInfoArray = [NSMutableArray array];
+            for (NSDictionary *parm in information) {
+                HomeMessageModel *model = [[HomeMessageModel alloc] initWithDictionary:parm];
+                [informationInfoArray addObject:model];
+            }
+            self.dataArray = [NSMutableArray arrayWithArray:informationInfoArray];
+            [self.tableView reloadData];
+        }
+        else {
+            [self MBPShow:MESSAGEKEY];
+        }
+    } faliure:^(NSError * _Nonnull error) {
+        
+    }];
 }
 
 - (void)requestHotAlbum {
@@ -300,7 +357,9 @@
 }
 
 - (void)requestCourseInfo {
+    [self showhud];
     [KSNetworkingManager homeQueryLiveAndVideo:KS_GET success:^(NSDictionary * _Nonnull dic) {
+        [self removehub];
         [self.tableView.mj_header endRefreshing];
         if ([dic integerValueForKey:@"code"] == 200 && [dic boolValueForKey:@"status"]) {
             NSDictionary *sourceDic = [dic dictionaryValueForKey:@"data"];
@@ -325,6 +384,7 @@
         }
         [self refreshCourseView];
     } faliure:^(NSError * _Nonnull error) {
+        [self removehub];
         [self.tableView.mj_header endRefreshing];
     }];
 }
@@ -431,11 +491,11 @@
 
 - (void)showButtonMessage {
     // 添加按钮
-    if (self.buttonArray.count > 4) { // 大于4个显示底部滚动视图
+    if (self.buttonArray.count > 5) { // 大于4个显示底部滚动视图
         self.buttonContainer.buttonPageCtrl.hidden = NO;
         self.buttonContainer.buttonDotLeft.constant = 0;
-        NSInteger addPage = (self.buttonArray.count % 4) > 0 ? 1 : 0;
-        NSInteger pageCount = self.buttonArray.count / 4 + addPage;
+        NSInteger addPage = (self.buttonArray.count % 5) > 0 ? 1 : 0;
+        NSInteger pageCount = self.buttonArray.count / 5 + addPage;
         self.buttonDotWidth = 36 / pageCount;
         self.buttonContainer.buttonDotWidth.constant = self.buttonDotWidth;
         self.buttonScrollView.contentSize = CGSizeMake(kScreenWidth * pageCount, BUTTONHEIGHT);
@@ -447,13 +507,14 @@
         
     self.buttonScrollView.contentOffset = CGPointMake(0, 0);
     [self.buttonScrollView removeAllSubViews];
-    CGFloat buttonSpace = (kScreenWidth - 4 * BUTTONWIDTH) / 5;
+    CGFloat buttonSpace = (kScreenWidth - 5 * BUTTONWIDTH) / 6;
     for (NSInteger i = 0; i < self.buttonArray.count; i++) {
         HomeMessageModel *model = self.buttonArray[i];
         KSHomeButton *buttonView = [KSHomeButton shareInstance];
-        [buttonView.buttonImage sd_setImageWithURL:[NSURL URLWithString:model.coverImage]];
+//        [buttonView.buttonImage sd_setImageWithURL:[NSURL URLWithString:model.coverImage]];
+        [buttonView.buttonImage setImage:[UIImage imageNamed:model.coverImage]];
         buttonView.buttonTitle.text = model.title;
-        buttonView.frame = CGRectMake(buttonSpace + (i % 4) * (BUTTONWIDTH + buttonSpace) + (i / 4) * KPortraitWidth, 0, BUTTONWIDTH, BUTTONHEIGHT);
+        buttonView.frame = CGRectMake(buttonSpace + (i % 5) * (BUTTONWIDTH + buttonSpace) + (i / 5) * KPortraitWidth, 0, BUTTONWIDTH, BUTTONHEIGHT);
         buttonView.actionButton.tag = 3000 + i;
         [buttonView.actionButton addTarget:self action:@selector(HomeTopButtonAction:) forControlEvents:UIControlEventTouchUpInside];
         [self.buttonScrollView addSubview:buttonView];
@@ -891,7 +952,7 @@
 
 - (void)teacherMoreIntorduce {
     KSBaseWKWebViewController *ctrl = [[KSBaseWKWebViewController alloc] init];
-    ctrl.url = [NSString stringWithFormat:@"%@%@", WEBHOST, @"/#/teacherList"];
+    ctrl.url = [NSString stringWithFormat:@"%@%@", WEBHOST, @"/#/teacherElegant"];
     [self.navigationController pushViewController:ctrl animated:YES];
 }
 

KulexiuForStudent/KulexiuForStudent/Module/Home/Model/HomeMessageModel.h

@@ -0,0 +1,46 @@
+//
+//  HomeMessageModel.h
+//
+//  Created by Steven  on 2022/4/25
+//  Copyright (c) 2022 __MyCompanyName__. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+
+
+@interface HomeMessageModel : NSObject <NSCoding, NSCopying>
+
+@property (nonatomic, strong) NSString *subType;
+@property (nonatomic, assign) double status;
+@property (nonatomic, strong) NSString *title;
+@property (nonatomic, strong) NSString *typeName;
+@property (nonatomic, strong) NSString *subTypeName;
+@property (nonatomic, strong) NSString *offlineTime;
+@property (nonatomic, strong) NSString *updateName;
+@property (nonatomic, strong) NSString *updateTime;
+@property (nonatomic, strong) NSString *onlineTime;
+@property (nonatomic, strong) NSString *memo;
+@property (nonatomic, strong) NSString *subjectName;
+@property (nonatomic, assign) BOOL delFlag;
+@property (nonatomic, assign) double type;
+@property (nonatomic, strong) NSString *subjectIdList;
+@property (nonatomic, strong) NSString *internalBaseClassIdentifier;
+@property (nonatomic, strong) NSString *hrefTarget;
+@property (nonatomic, strong) NSString *coverImage;
+@property (nonatomic, assign) double showTime;
+@property (nonatomic, assign) double createBy;
+@property (nonatomic, assign) double updateBy;
+@property (nonatomic, strong) NSString *linkUrl;
+@property (nonatomic, strong) NSString *videoCoverImage;
+@property (nonatomic, strong) NSString *createTime;
+@property (nonatomic, assign) double order;
+@property (nonatomic, strong) NSString *attribute1;
+@property (nonatomic, strong) NSString *content;
+@property (nonatomic, strong) NSString *attribute2;
+
++ (instancetype)modelObjectWithDictionary:(NSDictionary *)dict;
+- (instancetype)initWithDictionary:(NSDictionary *)dict;
+- (NSDictionary *)dictionaryRepresentation;
+
+@end

KulexiuForStudent/KulexiuForStudent/Module/Home/Model/HomeMessageModel.m

@@ -0,0 +1,281 @@
+//
+//  HomeMessageModel.m
+//
+//  Created by Steven  on 2022/4/25
+//  Copyright (c) 2022 __MyCompanyName__. All rights reserved.
+//
+
+#import "HomeMessageModel.h"
+
+
+NSString *const kHomeMessageModelSubType = @"subType";
+NSString *const kHomeMessageModelStatus = @"status";
+NSString *const kHomeMessageModelTitle = @"title";
+NSString *const kHomeMessageModelTypeName = @"typeName";
+NSString *const kHomeMessageModelSubTypeName = @"subTypeName";
+NSString *const kHomeMessageModelOfflineTime = @"offlineTime";
+NSString *const kHomeMessageModelUpdateName = @"updateName";
+NSString *const kHomeMessageModelUpdateTime = @"updateTime";
+NSString *const kHomeMessageModelOnlineTime = @"onlineTime";
+NSString *const kHomeMessageModelMemo = @"memo";
+NSString *const kHomeMessageModelSubjectName = @"subjectName";
+NSString *const kHomeMessageModelDelFlag = @"delFlag";
+NSString *const kHomeMessageModelType = @"type";
+NSString *const kHomeMessageModelSubjectIdList = @"subjectIdList";
+NSString *const kHomeMessageModelId = @"id";
+NSString *const kHomeMessageModelHrefTarget = @"hrefTarget";
+NSString *const kHomeMessageModelCoverImage = @"coverImage";
+NSString *const kHomeMessageModelShowTime = @"showTime";
+NSString *const kHomeMessageModelCreateBy = @"createBy";
+NSString *const kHomeMessageModelUpdateBy = @"updateBy";
+NSString *const kHomeMessageModelLinkUrl = @"linkUrl";
+NSString *const kHomeMessageModelVideoCoverImage = @"videoCoverImage";
+NSString *const kHomeMessageModelCreateTime = @"createTime";
+NSString *const kHomeMessageModelOrder = @"order";
+NSString *const kHomeMessageModelAttribute1 = @"attribute1";
+NSString *const kHomeMessageModelContent = @"content";
+NSString *const kHomeMessageModelAttribute2 = @"attribute2";
+
+
+@interface HomeMessageModel ()
+
+- (id)objectOrNilForKey:(id)aKey fromDictionary:(NSDictionary *)dict;
+
+@end
+
+@implementation HomeMessageModel
+
+@synthesize subType = _subType;
+@synthesize status = _status;
+@synthesize title = _title;
+@synthesize typeName = _typeName;
+@synthesize subTypeName = _subTypeName;
+@synthesize offlineTime = _offlineTime;
+@synthesize updateName = _updateName;
+@synthesize updateTime = _updateTime;
+@synthesize onlineTime = _onlineTime;
+@synthesize memo = _memo;
+@synthesize subjectName = _subjectName;
+@synthesize delFlag = _delFlag;
+@synthesize type = _type;
+@synthesize subjectIdList = _subjectIdList;
+@synthesize internalBaseClassIdentifier = _internalBaseClassIdentifier;
+@synthesize hrefTarget = _hrefTarget;
+@synthesize coverImage = _coverImage;
+@synthesize showTime = _showTime;
+@synthesize createBy = _createBy;
+@synthesize updateBy = _updateBy;
+@synthesize linkUrl = _linkUrl;
+@synthesize videoCoverImage = _videoCoverImage;
+@synthesize createTime = _createTime;
+@synthesize order = _order;
+@synthesize attribute1 = _attribute1;
+@synthesize content = _content;
+@synthesize attribute2 = _attribute2;
+
+
++ (instancetype)modelObjectWithDictionary:(NSDictionary *)dict
+{
+    return [[self alloc] initWithDictionary:dict];
+}
+
+- (instancetype)initWithDictionary:(NSDictionary *)dict
+{
+    self = [super init];
+    
+    // This check serves to make sure that a non-NSDictionary object
+    // passed into the model class doesn't break the parsing.
+    if(self && [dict isKindOfClass:[NSDictionary class]]) {
+            self.subType = [self objectOrNilForKey:kHomeMessageModelSubType fromDictionary:dict];
+            self.status = [[self objectOrNilForKey:kHomeMessageModelStatus fromDictionary:dict] doubleValue];
+            self.title = [self objectOrNilForKey:kHomeMessageModelTitle fromDictionary:dict];
+            self.typeName = [self objectOrNilForKey:kHomeMessageModelTypeName fromDictionary:dict];
+            self.subTypeName = [self objectOrNilForKey:kHomeMessageModelSubTypeName fromDictionary:dict];
+            self.offlineTime = [self objectOrNilForKey:kHomeMessageModelOfflineTime fromDictionary:dict];
+            self.updateName = [self objectOrNilForKey:kHomeMessageModelUpdateName fromDictionary:dict];
+            self.updateTime = [self objectOrNilForKey:kHomeMessageModelUpdateTime fromDictionary:dict];
+            self.onlineTime = [self objectOrNilForKey:kHomeMessageModelOnlineTime fromDictionary:dict];
+            self.memo = [self objectOrNilForKey:kHomeMessageModelMemo fromDictionary:dict];
+            self.subjectName = [self objectOrNilForKey:kHomeMessageModelSubjectName fromDictionary:dict];
+            self.delFlag = [[self objectOrNilForKey:kHomeMessageModelDelFlag fromDictionary:dict] boolValue];
+            self.type = [[self objectOrNilForKey:kHomeMessageModelType fromDictionary:dict] doubleValue];
+            self.subjectIdList = [self objectOrNilForKey:kHomeMessageModelSubjectIdList fromDictionary:dict];
+            self.internalBaseClassIdentifier = [self objectOrNilForKey:kHomeMessageModelId fromDictionary:dict];
+            self.hrefTarget = [self objectOrNilForKey:kHomeMessageModelHrefTarget fromDictionary:dict];
+            self.coverImage = [self objectOrNilForKey:kHomeMessageModelCoverImage fromDictionary:dict];
+            self.showTime = [[self objectOrNilForKey:kHomeMessageModelShowTime fromDictionary:dict] doubleValue];
+            self.createBy = [[self objectOrNilForKey:kHomeMessageModelCreateBy fromDictionary:dict] doubleValue];
+            self.updateBy = [[self objectOrNilForKey:kHomeMessageModelUpdateBy fromDictionary:dict] doubleValue];
+            self.linkUrl = [self objectOrNilForKey:kHomeMessageModelLinkUrl fromDictionary:dict];
+            self.videoCoverImage = [self objectOrNilForKey:kHomeMessageModelVideoCoverImage fromDictionary:dict];
+            self.createTime = [self objectOrNilForKey:kHomeMessageModelCreateTime fromDictionary:dict];
+            self.order = [[self objectOrNilForKey:kHomeMessageModelOrder fromDictionary:dict] doubleValue];
+            self.attribute1 = [self objectOrNilForKey:kHomeMessageModelAttribute1 fromDictionary:dict];
+            self.content = [self objectOrNilForKey:kHomeMessageModelContent fromDictionary:dict];
+            self.attribute2 = [self objectOrNilForKey:kHomeMessageModelAttribute2 fromDictionary:dict];
+
+    }
+    
+    return self;
+    
+}
+
+- (NSDictionary *)dictionaryRepresentation
+{
+    NSMutableDictionary *mutableDict = [NSMutableDictionary dictionary];
+    [mutableDict setValue:self.subType forKey:kHomeMessageModelSubType];
+    [mutableDict setValue:[NSNumber numberWithDouble:self.status] forKey:kHomeMessageModelStatus];
+    [mutableDict setValue:self.title forKey:kHomeMessageModelTitle];
+    [mutableDict setValue:self.typeName forKey:kHomeMessageModelTypeName];
+    [mutableDict setValue:self.subTypeName forKey:kHomeMessageModelSubTypeName];
+    [mutableDict setValue:self.offlineTime forKey:kHomeMessageModelOfflineTime];
+    [mutableDict setValue:self.updateName forKey:kHomeMessageModelUpdateName];
+    [mutableDict setValue:self.updateTime forKey:kHomeMessageModelUpdateTime];
+    [mutableDict setValue:self.onlineTime forKey:kHomeMessageModelOnlineTime];
+    [mutableDict setValue:self.memo forKey:kHomeMessageModelMemo];
+    [mutableDict setValue:self.subjectName forKey:kHomeMessageModelSubjectName];
+    [mutableDict setValue:[NSNumber numberWithBool:self.delFlag] forKey:kHomeMessageModelDelFlag];
+    [mutableDict setValue:[NSNumber numberWithDouble:self.type] forKey:kHomeMessageModelType];
+    [mutableDict setValue:self.subjectIdList forKey:kHomeMessageModelSubjectIdList];
+    [mutableDict setValue:self.internalBaseClassIdentifier forKey:kHomeMessageModelId];
+    [mutableDict setValue:self.hrefTarget forKey:kHomeMessageModelHrefTarget];
+    [mutableDict setValue:self.coverImage forKey:kHomeMessageModelCoverImage];
+    [mutableDict setValue:[NSNumber numberWithDouble:self.showTime] forKey:kHomeMessageModelShowTime];
+    [mutableDict setValue:[NSNumber numberWithDouble:self.createBy] forKey:kHomeMessageModelCreateBy];
+    [mutableDict setValue:[NSNumber numberWithDouble:self.updateBy] forKey:kHomeMessageModelUpdateBy];
+    [mutableDict setValue:self.linkUrl forKey:kHomeMessageModelLinkUrl];
+    [mutableDict setValue:self.videoCoverImage forKey:kHomeMessageModelVideoCoverImage];
+    [mutableDict setValue:self.createTime forKey:kHomeMessageModelCreateTime];
+    [mutableDict setValue:[NSNumber numberWithDouble:self.order] forKey:kHomeMessageModelOrder];
+    [mutableDict setValue:self.attribute1 forKey:kHomeMessageModelAttribute1];
+    [mutableDict setValue:self.content forKey:kHomeMessageModelContent];
+    [mutableDict setValue:self.attribute2 forKey:kHomeMessageModelAttribute2];
+
+    return [NSDictionary dictionaryWithDictionary:mutableDict];
+}
+
+- (NSString *)description 
+{
+    return [NSString stringWithFormat:@"%@", [self dictionaryRepresentation]];
+}
+
+#pragma mark - Helper Method
+- (id)objectOrNilForKey:(id)aKey fromDictionary:(NSDictionary *)dict
+{
+    id object = [dict objectForKey:aKey];
+    if ([object isKindOfClass:[NSNumber class]]) {
+        NSNumber *number = object;
+        object = [number stringValue];
+    }
+    return [object isEqual:[NSNull null]] ? nil : object;
+}
+
+
+#pragma mark - NSCoding Methods
+
+- (id)initWithCoder:(NSCoder *)aDecoder
+{
+    self = [super init];
+
+    self.subType = [aDecoder decodeObjectForKey:kHomeMessageModelSubType];
+    self.status = [aDecoder decodeDoubleForKey:kHomeMessageModelStatus];
+    self.title = [aDecoder decodeObjectForKey:kHomeMessageModelTitle];
+    self.typeName = [aDecoder decodeObjectForKey:kHomeMessageModelTypeName];
+    self.subTypeName = [aDecoder decodeObjectForKey:kHomeMessageModelSubTypeName];
+    self.offlineTime = [aDecoder decodeObjectForKey:kHomeMessageModelOfflineTime];
+    self.updateName = [aDecoder decodeObjectForKey:kHomeMessageModelUpdateName];
+    self.updateTime = [aDecoder decodeObjectForKey:kHomeMessageModelUpdateTime];
+    self.onlineTime = [aDecoder decodeObjectForKey:kHomeMessageModelOnlineTime];
+    self.memo = [aDecoder decodeObjectForKey:kHomeMessageModelMemo];
+    self.subjectName = [aDecoder decodeObjectForKey:kHomeMessageModelSubjectName];
+    self.delFlag = [aDecoder decodeBoolForKey:kHomeMessageModelDelFlag];
+    self.type = [aDecoder decodeDoubleForKey:kHomeMessageModelType];
+    self.subjectIdList = [aDecoder decodeObjectForKey:kHomeMessageModelSubjectIdList];
+    self.internalBaseClassIdentifier = [aDecoder decodeObjectForKey:kHomeMessageModelId];
+    self.hrefTarget = [aDecoder decodeObjectForKey:kHomeMessageModelHrefTarget];
+    self.coverImage = [aDecoder decodeObjectForKey:kHomeMessageModelCoverImage];
+    self.showTime = [aDecoder decodeDoubleForKey:kHomeMessageModelShowTime];
+    self.createBy = [aDecoder decodeDoubleForKey:kHomeMessageModelCreateBy];
+    self.updateBy = [aDecoder decodeDoubleForKey:kHomeMessageModelUpdateBy];
+    self.linkUrl = [aDecoder decodeObjectForKey:kHomeMessageModelLinkUrl];
+    self.videoCoverImage = [aDecoder decodeObjectForKey:kHomeMessageModelVideoCoverImage];
+    self.createTime = [aDecoder decodeObjectForKey:kHomeMessageModelCreateTime];
+    self.order = [aDecoder decodeDoubleForKey:kHomeMessageModelOrder];
+    self.attribute1 = [aDecoder decodeObjectForKey:kHomeMessageModelAttribute1];
+    self.content = [aDecoder decodeObjectForKey:kHomeMessageModelContent];
+    self.attribute2 = [aDecoder decodeObjectForKey:kHomeMessageModelAttribute2];
+    return self;
+}
+
+- (void)encodeWithCoder:(NSCoder *)aCoder
+{
+
+    [aCoder encodeObject:_subType forKey:kHomeMessageModelSubType];
+    [aCoder encodeDouble:_status forKey:kHomeMessageModelStatus];
+    [aCoder encodeObject:_title forKey:kHomeMessageModelTitle];
+    [aCoder encodeObject:_typeName forKey:kHomeMessageModelTypeName];
+    [aCoder encodeObject:_subTypeName forKey:kHomeMessageModelSubTypeName];
+    [aCoder encodeObject:_offlineTime forKey:kHomeMessageModelOfflineTime];
+    [aCoder encodeObject:_updateName forKey:kHomeMessageModelUpdateName];
+    [aCoder encodeObject:_updateTime forKey:kHomeMessageModelUpdateTime];
+    [aCoder encodeObject:_onlineTime forKey:kHomeMessageModelOnlineTime];
+    [aCoder encodeObject:_memo forKey:kHomeMessageModelMemo];
+    [aCoder encodeObject:_subjectName forKey:kHomeMessageModelSubjectName];
+    [aCoder encodeBool:_delFlag forKey:kHomeMessageModelDelFlag];
+    [aCoder encodeDouble:_type forKey:kHomeMessageModelType];
+    [aCoder encodeObject:_subjectIdList forKey:kHomeMessageModelSubjectIdList];
+    [aCoder encodeObject:_internalBaseClassIdentifier forKey:kHomeMessageModelId];
+    [aCoder encodeObject:_hrefTarget forKey:kHomeMessageModelHrefTarget];
+    [aCoder encodeObject:_coverImage forKey:kHomeMessageModelCoverImage];
+    [aCoder encodeDouble:_showTime forKey:kHomeMessageModelShowTime];
+    [aCoder encodeDouble:_createBy forKey:kHomeMessageModelCreateBy];
+    [aCoder encodeDouble:_updateBy forKey:kHomeMessageModelUpdateBy];
+    [aCoder encodeObject:_linkUrl forKey:kHomeMessageModelLinkUrl];
+    [aCoder encodeObject:_videoCoverImage forKey:kHomeMessageModelVideoCoverImage];
+    [aCoder encodeObject:_createTime forKey:kHomeMessageModelCreateTime];
+    [aCoder encodeDouble:_order forKey:kHomeMessageModelOrder];
+    [aCoder encodeObject:_attribute1 forKey:kHomeMessageModelAttribute1];
+    [aCoder encodeObject:_content forKey:kHomeMessageModelContent];
+    [aCoder encodeObject:_attribute2 forKey:kHomeMessageModelAttribute2];
+}
+
+- (id)copyWithZone:(NSZone *)zone
+{
+    HomeMessageModel *copy = [[HomeMessageModel alloc] init];
+    
+    if (copy) {
+
+        copy.subType = [self.subType copyWithZone:zone];
+        copy.status = self.status;
+        copy.title = [self.title copyWithZone:zone];
+        copy.typeName = [self.typeName copyWithZone:zone];
+        copy.subTypeName = [self.subTypeName copyWithZone:zone];
+        copy.offlineTime = [self.offlineTime copyWithZone:zone];
+        copy.updateName = [self.updateName copyWithZone:zone];
+        copy.updateTime = [self.updateTime copyWithZone:zone];
+        copy.onlineTime = [self.onlineTime copyWithZone:zone];
+        copy.memo = [self.memo copyWithZone:zone];
+        copy.subjectName = [self.subjectName copyWithZone:zone];
+        copy.delFlag = self.delFlag;
+        copy.type = self.type;
+        copy.subjectIdList = [self.subjectIdList copyWithZone:zone];
+        copy.internalBaseClassIdentifier = [self.internalBaseClassIdentifier copyWithZone:zone];
+        copy.hrefTarget = [self.hrefTarget copyWithZone:zone];
+        copy.coverImage = [self.coverImage copyWithZone:zone];
+        copy.showTime = self.showTime;
+        copy.createBy = self.createBy;
+        copy.updateBy = self.updateBy;
+        copy.linkUrl = [self.linkUrl copyWithZone:zone];
+        copy.videoCoverImage = [self.videoCoverImage copyWithZone:zone];
+        copy.createTime = [self.createTime copyWithZone:zone];
+        copy.order = self.order;
+        copy.attribute1 = [self.attribute1 copyWithZone:zone];
+        copy.content = [self.content copyWithZone:zone];
+        copy.attribute2 = [self.attribute2 copyWithZone:zone];
+    }
+    
+    return copy;
+}
+
+
+@end

KulexiuForStudent/KulexiuForStudent/Module/Home/NoticeCenter/Model/HomeMessageModel.h

@@ -1,28 +0,0 @@
-//
-//  HomeMessageModel.h
-//
-//  Created by   on 2019/9/24
-//  Copyright (c) 2019 __MyCompanyName__. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-
-
-@interface HomeMessageModel : NSObject <NSCoding, NSCopying>
-
-@property (nonatomic, strong) NSString *status;
-@property (nonatomic, strong) NSString *content;
-@property (nonatomic, assign) double userId;
-@property (nonatomic, strong) NSString *updateTime;
-@property (nonatomic, strong) NSString *title;
-@property (nonatomic, strong) NSString *coverImage;
-@property (nonatomic, assign) double type;
-@property (nonatomic, strong) NSString *createTime;
-@property (nonatomic, strong) NSString *linkUrl;
-
-+ (instancetype)modelObjectWithDictionary:(NSDictionary *)dict;
-- (instancetype)initWithDictionary:(NSDictionary *)dict;
-- (NSDictionary *)dictionaryRepresentation;
-
-@end

KulexiuForStudent/KulexiuForStudent/Module/Home/NoticeCenter/Model/HomeMessageModel.m

@@ -1,154 +0,0 @@
-//
-//  HomeMessageModel.m
-//
-//  Created by   on 2019/9/24
-//  Copyright (c) 2019 __MyCompanyName__. All rights reserved.
-//
-
-#import "HomeMessageModel.h"
-
-
-NSString *const kHomeMessageModelStatus = @"status";
-NSString *const kHomeMessageModelContent = @"content";
-NSString *const kHomeMessageModelId = @"id";
-NSString *const kHomeMessageModelUpdateTime = @"updateTime";
-NSString *const kHomeMessageModelTitle = @"title";
-NSString *const kHomeMessageModelCoverImage = @"coverImage";
-NSString *const kHomeMessageModelType = @"type";
-NSString *const kHomeMessageModelCreateTime = @"createTime";
-NSString *const kHomeMessageModelLinkUrl = @"linkUrl";
-
-
-
-@interface HomeMessageModel ()
-
-- (id)objectOrNilForKey:(id)aKey fromDictionary:(NSDictionary *)dict;
-
-@end
-
-@implementation HomeMessageModel
-
-@synthesize status = _status;
-@synthesize content = _content;
-@synthesize userId = _userId;
-@synthesize updateTime = _updateTime;
-@synthesize title = _title;
-@synthesize coverImage = _coverImage;
-@synthesize type = _type;
-@synthesize createTime = _createTime;
-@synthesize linkUrl = _linkUrl;
-
-+ (instancetype)modelObjectWithDictionary:(NSDictionary *)dict
-{
-    return [[self alloc] initWithDictionary:dict];
-}
-
-- (instancetype)initWithDictionary:(NSDictionary *)dict
-{
-    self = [super init];
-    
-    // This check serves to make sure that a non-NSDictionary object
-    // passed into the model class doesn't break the parsing.
-    if(self && [dict isKindOfClass:[NSDictionary class]]) {
-            self.status = [self objectOrNilForKey:kHomeMessageModelStatus fromDictionary:dict];
-            self.content = [self objectOrNilForKey:kHomeMessageModelContent fromDictionary:dict];
-            self.userId = [[self objectOrNilForKey:kHomeMessageModelId fromDictionary:dict] doubleValue];
-            self.updateTime = [self objectOrNilForKey:kHomeMessageModelUpdateTime fromDictionary:dict];
-            self.title = [self objectOrNilForKey:kHomeMessageModelTitle fromDictionary:dict];
-            self.coverImage = [self objectOrNilForKey:kHomeMessageModelCoverImage fromDictionary:dict];
-            self.type = [[self objectOrNilForKey:kHomeMessageModelType fromDictionary:dict] doubleValue];
-            self.createTime = [self objectOrNilForKey:kHomeMessageModelCreateTime fromDictionary:dict];
-            self.linkUrl = [self objectOrNilForKey:kHomeMessageModelLinkUrl fromDictionary:dict];
-    }
-    
-    return self;
-    
-}
-
-- (NSDictionary *)dictionaryRepresentation
-{
-    NSMutableDictionary *mutableDict = [NSMutableDictionary dictionary];
-    [mutableDict setValue:self.status forKey:kHomeMessageModelStatus];
-    [mutableDict setValue:self.content forKey:kHomeMessageModelContent];
-    [mutableDict setValue:[NSNumber numberWithDouble:self.userId] forKey:kHomeMessageModelId];
-    [mutableDict setValue:self.updateTime forKey:kHomeMessageModelUpdateTime];
-    [mutableDict setValue:self.title forKey:kHomeMessageModelTitle];
-    [mutableDict setValue:self.coverImage forKey:kHomeMessageModelCoverImage];
-    [mutableDict setValue:[NSNumber numberWithDouble:self.type] forKey:kHomeMessageModelType];
-    [mutableDict setValue:self.createTime forKey:kHomeMessageModelCreateTime];
-    [mutableDict setValue:self.linkUrl forKey:kHomeMessageModelLinkUrl];
-    
-    return [NSDictionary dictionaryWithDictionary:mutableDict];
-}
-
-- (NSString *)description 
-{
-    return [NSString stringWithFormat:@"%@", [self dictionaryRepresentation]];
-}
-
-#pragma mark - Helper Method
-- (id)objectOrNilForKey:(id)aKey fromDictionary:(NSDictionary *)dict
-{
-    id object = [dict objectForKey:aKey];
-    if ([object isKindOfClass:[NSNumber class]]) {
-        NSNumber *number = object;
-        object = [number stringValue];
-    }
-    return [object isEqual:[NSNull null]] ? nil : object;
-}
-
-
-#pragma mark - NSCoding Methods
-
-- (id)initWithCoder:(NSCoder *)aDecoder
-{
-    self = [super init];
-
-    self.status = [aDecoder decodeObjectForKey:kHomeMessageModelStatus];
-    self.content = [aDecoder decodeObjectForKey:kHomeMessageModelContent];
-    self.userId = [aDecoder decodeDoubleForKey:kHomeMessageModelId];
-    self.updateTime = [aDecoder decodeObjectForKey:kHomeMessageModelUpdateTime];
-    self.title = [aDecoder decodeObjectForKey:kHomeMessageModelTitle];
-    self.coverImage = [aDecoder decodeObjectForKey:kHomeMessageModelCoverImage];
-    self.type = [aDecoder decodeDoubleForKey:kHomeMessageModelType];
-    self.createTime = [aDecoder decodeObjectForKey:kHomeMessageModelCreateTime];
-    self.linkUrl = [aDecoder decodeObjectForKey:kHomeMessageModelLinkUrl];
-    return self;
-}
-
-- (void)encodeWithCoder:(NSCoder *)aCoder
-{
-
-    [aCoder encodeObject:_status forKey:kHomeMessageModelStatus];
-    [aCoder encodeObject:_content forKey:kHomeMessageModelContent];
-    [aCoder encodeDouble:_userId forKey:kHomeMessageModelId];
-    [aCoder encodeObject:_updateTime forKey:kHomeMessageModelUpdateTime];
-    [aCoder encodeObject:_title forKey:kHomeMessageModelTitle];
-    [aCoder encodeObject:_coverImage forKey:kHomeMessageModelCoverImage];
-    [aCoder encodeDouble:_type forKey:kHomeMessageModelType];
-    [aCoder encodeObject:_createTime forKey:kHomeMessageModelCreateTime];
-    [aCoder encodeObject:_linkUrl forKey:kHomeMessageModelLinkUrl];
-}
-
-- (id)copyWithZone:(NSZone *)zone
-{
-    HomeMessageModel *copy = [[HomeMessageModel alloc] init];
-    
-    if (copy) {
-
-        copy.status = [self.status copyWithZone:zone];
-        copy.content = [self.content copyWithZone:zone];
-        copy.userId = self.userId;
-        copy.updateTime = [self.updateTime copyWithZone:zone];
-        copy.title = [self.title copyWithZone:zone];
-        copy.coverImage = [self.coverImage copyWithZone:zone];
-        copy.type = self.type;
-        copy.createTime = [self.createTime copyWithZone:zone];
-        copy.linkUrl = [self.linkUrl copyWithZone:zone];
-    }
-    
-    return copy;
-}
-
-
-@end

KulexiuForStudent/KulexiuForStudent/Module/Home/View/KSHomeButton.xib

@@ -10,29 +10,29 @@
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="KSHomeButton">
-            <rect key="frame" x="0.0" y="0.0" width="80" height="90"/>
+            <rect key="frame" x="0.0" y="0.0" width="80" height="80"/>
             <autoresizingMask key="autoresizingMask"/>
             <subviews>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="专项训练" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1ld-By-usD">
-                    <rect key="frame" x="11" y="73" width="58" height="17"/>
+                    <rect key="frame" x="15.5" y="63" width="49.5" height="17"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="17" id="HmM-NJ-9X6"/>
                     </constraints>
-                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                    <color key="textColor" red="0.26666666666666666" green="0.26666666666666666" blue="0.26666666666666666" alpha="1" colorSpace="calibratedRGB"/>
+                    <fontDescription key="fontDescription" type="system" pointSize="12"/>
+                    <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
                     <nil key="highlightedColor"/>
                 </label>
                 <button opaque="NO" tag="1003" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Z8s-SG-JhM">
-                    <rect key="frame" x="8.5" y="0.0" width="63.5" height="90"/>
+                    <rect key="frame" x="8.5" y="0.0" width="63.5" height="80"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="63.5" id="JSo-aS-lFI"/>
                     </constraints>
                 </button>
-                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="home_train" translatesAutoresizingMaskIntoConstraints="NO" id="fGp-yj-UZk">
-                    <rect key="frame" x="7" y="0.0" width="66" height="67"/>
+                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="home_accompany" translatesAutoresizingMaskIntoConstraints="NO" id="fGp-yj-UZk">
+                    <rect key="frame" x="14.5" y="5" width="51" height="51"/>
                     <constraints>
-                        <constraint firstAttribute="width" constant="66" id="a4B-wg-004"/>
-                        <constraint firstAttribute="height" constant="67" id="xmk-HE-99v"/>
+                        <constraint firstAttribute="width" constant="51" id="a4B-wg-004"/>
+                        <constraint firstAttribute="height" constant="51" id="xmk-HE-99v"/>
                     </constraints>
                 </imageView>
             </subviews>
@@ -43,7 +43,7 @@
                 <constraint firstItem="Z8s-SG-JhM" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="QJA-gE-y6C"/>
                 <constraint firstItem="1ld-By-usD" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="Zfj-98-cxn"/>
                 <constraint firstItem="Z8s-SG-JhM" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="gyu-3P-I55"/>
-                <constraint firstItem="fGp-yj-UZk" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="t2k-gD-lM1"/>
+                <constraint firstItem="fGp-yj-UZk" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="5" id="t2k-gD-lM1"/>
                 <constraint firstAttribute="bottom" secondItem="1ld-By-usD" secondAttribute="bottom" id="ygh-pf-cwF"/>
             </constraints>
             <nil key="simulatedTopBarMetrics"/>
@@ -58,6 +58,6 @@
         </view>
     </objects>
     <resources>
-        <image name="home_train" width="52" height="42"/>
+        <image name="home_accompany" width="51" height="51"/>
     </resources>
 </document>

KulexiuForStudent/KulexiuForStudent/Module/Mine/Controller/MineViewController.m

@@ -142,7 +142,9 @@
             break;
         case MINEVIEWTYPE_DEAL:
         {
-            
+            KSBaseWKWebViewController *ctrl = [[KSBaseWKWebViewController alloc] init];
+            ctrl.url = [NSString stringWithFormat:@"%@%@",WEBHOST,@"/#/tradeRecord"];
+            [self.navigationController pushViewController:ctrl animated:YES];
         }
             break;
         case MINEVIEWTYPE_NETWORK:

KulexiuForStudent/KulexiuForStudent/Module/Mine/View/MineNavView.m

@@ -9,8 +9,6 @@
 
 @interface MineNavView ()
 
-@property (weak, nonatomic) IBOutlet NSLayoutConstraint *topHeight;
-
 @property (nonatomic, copy) MineNavAction callback;
 
 @end
@@ -19,12 +17,11 @@
 
 - (void)awakeFromNib {
     [super awakeFromNib];
-    _topHeight.constant = 28 + topMarginToTop();
 }
 
 + (instancetype)shareInstance {
     MineNavView *view = [[[NSBundle mainBundle] loadNibNamed:@"MineNavView" owner:nil options:nil] firstObject];
-    view.frame = CGRectMake(0, 0, kScreenWidth, 28 + topMarginToTop() + 40 + 10);
+    view.frame = CGRectMake(0, 0, kScreenWidth, kNaviBarHeight);
     return view;
 }
 

KulexiuForStudent/KulexiuForStudent/Module/Mine/View/MineNavView.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="19529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19519"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -14,7 +14,7 @@
             <autoresizingMask key="autoresizingMask"/>
             <subviews>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="o7c-br-wf5">
-                    <rect key="frame" x="364" y="28" width="40" height="40"/>
+                    <rect key="frame" x="364" y="47" width="40" height="40"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="40" id="He1-cX-k8M"/>
                         <constraint firstAttribute="width" constant="40" id="S21-d9-pEr"/>
@@ -28,15 +28,12 @@
             </subviews>
             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
             <constraints>
-                <constraint firstItem="o7c-br-wf5" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="28" id="DgL-Sb-Tt2"/>
                 <constraint firstAttribute="trailing" secondItem="o7c-br-wf5" secondAttribute="trailing" constant="10" id="Kng-m2-QZf"/>
+                <constraint firstAttribute="bottom" secondItem="o7c-br-wf5" secondAttribute="bottom" id="UkV-jH-fS0"/>
             </constraints>
             <nil key="simulatedTopBarMetrics"/>
             <nil key="simulatedBottomBarMetrics"/>
             <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
-            <connections>
-                <outlet property="topHeight" destination="DgL-Sb-Tt2" id="uGB-sz-XL8"/>
-            </connections>
             <point key="canvasLocation" x="131.8840579710145" y="-96.763392857142847"/>
         </view>
     </objects>

KulexiuForStudent/build/Debug-iphonesimulator/KulexiuForStudent.app/_CodeSignature/CodeResources

@@ -58,7 +58,7 @@
 		</data>
 		<key>Assets.car</key>
 		<data>
-		CF0FtB18jA9Fw3ylfTlL23hwiwQ=
+		2g/sMLlIOMHrO1ygtm90GN/KPcI=
 		</data>
 		<key>Base.lproj/LaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib</key>
 		<data>
@@ -1099,7 +1099,7 @@
 		</data>
 		<key>KSHomeButton.nib</key>
 		<data>
-		ZIs/kfmN1S9h+4SD+1PUOGr83gI=
+		qwK3zqSG4jTyzZsSNyE9a0Rwywc=
 		</data>
 		<key>KSImageAlert.nib</key>
 		<data>
@@ -1147,7 +1147,7 @@
 		</data>
 		<key>MineNavView.nib</key>
 		<data>
-		MnmU3z4O1oioXd/L0U9gD3Pikuo=
+		KwBb/6wDWuUN7+I6+G/xw/cczoo=
 		</data>
 		<key>ModifyBodyView.nib</key>
 		<data>
@@ -3813,7 +3813,7 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			OkEu9gu3litxuHwmlGeBCMV/PZzZpMTlrZRhY9+V4LM=
+			b2h+VH+PoIQONhw7xRQ04RzSTii0PecdR1d7CEgrfOw=
 			</data>
 		</dict>
 		<key>Base.lproj/LaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib</key>
@@ -5297,7 +5297,7 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			PoPA1Fx14omvVeR6Z+3D4Tql7keK5s8iIdhieaIwXsg=
+			iU4Mp6gzfnehYfZ6zjV1wMVp6r9q5XQvuwImWEt8jvI=
 			</data>
 		</dict>
 		<key>KSImageAlert.nib</key>
@@ -5381,7 +5381,7 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			7FTjxu1VUc+lq6mxbfC1T+F/kXnZUNHdsjPe0LQK2Z0=
+			oqw1aX1CRHmqpcoBU4iQbTOAAeE8NGBDjrYX+FaDMGc=
 			</data>
 		</dict>
 		<key>ModifyBodyView.nib</key>

KulexiuForStudent/build/KulexiuForStudent.build/Debug-iphonesimulator/KulexiuForStudent.build/Objects-normal/x86_64/HomeViewController.d

@@ -57,7 +57,7 @@ dependencies: \
   /Users/wangzhi/DayaWorkspace/Klx_student/KulexiuForStudent/KulexiuForStudent/Common/ThirdPart/TYCyclePagerView/TYCyclePagerTransformLayout.h \
   /Users/wangzhi/DayaWorkspace/Klx_student/KulexiuForStudent/KulexiuForStudent/Common/ThirdPart/TYCyclePagerView/TYPageControl.h \
   /Users/wangzhi/DayaWorkspace/Klx_student/KulexiuForStudent/KulexiuForStudent/Module/Home/View/HomeBannerCell.h \
-  /Users/wangzhi/DayaWorkspace/Klx_student/KulexiuForStudent/KulexiuForStudent/Module/Home/NoticeCenter/Model/HomeMessageModel.h \
+  /Users/wangzhi/DayaWorkspace/Klx_student/KulexiuForStudent/KulexiuForStudent/Module/Home/Model/HomeMessageModel.h \
   /Users/wangzhi/DayaWorkspace/Klx_student/KulexiuForStudent/KulexiuForStudent/Module/Home/View/HomeButtonView.h \
   /Users/wangzhi/DayaWorkspace/Klx_student/KulexiuForStudent/KulexiuForStudent/Module/Home/View/KSHomeButton.h \
   /Users/wangzhi/DayaWorkspace/Klx_student/KulexiuForStudent/KulexiuForStudent/Module/Home/View/HomeHotAlbumView.h \

KulexiuForStudent/build/Pods.build/Debug-iphonesimulator/CHIPageControl.build/Objects-normal/x86_64/CHIPageControl-master.swiftdeps

@@ -1,7 +1,7 @@
 version: "Apple Swift version 5.6 (swiftlang-5.6.0.323.62 clang-1316.0.20.8)"
 options: "1df5a087573c1c3cd07e8076f6918d3928f13c31665350d2c288f48bd5050822"
-build_start_time: [1650789965, 754937171]
-build_end_time: [1650789965, 921732902]
+build_start_time: [1650888887, 508931159]
+build_end_time: [1650888887, 672636032]
 inputs:
   "/Users/wangzhi/DayaWorkspace/Klx_student/KulexiuForStudent/Pods/CHIPageControl/CHIPageControl/CHIPageControlAji.swift": [1649151994, 661623716]
   "/Users/wangzhi/DayaWorkspace/Klx_student/KulexiuForStudent/Pods/CHIPageControl/CHIPageControl/CHIPageControlAleppo.swift": [1649151994, 661175489]