no message

Class/LearningCenter/ComprehensiveDiscussion/Cells/ForumItemTableViewCell.m

@@ -38,9 +38,9 @@
     }
     self.imageBackView.indexPath = indexPath;
     if (topicEntity.backEnd) {
-        self.headerImageView.image = TCImage(@"Icon-83.5");
+        self.headerImageView.image = TCImage(@"manager");
     }else {
-        [self.headerImageView sd_setImageWithURL:[NSURL URLWithString:topicEntity.posterPicture] placeholderImage:ReplaceImage];
+        [self.headerImageView sd_setImageWithURL:[NSURL URLWithString:topicEntity.posterPicture] placeholderImage:TCImage(@"user")];
     }
 }
 

Class/LearningCenter/ComprehensiveDiscussion/Cells/ForumTableViewCell.h

@@ -16,6 +16,11 @@
  */
 @property (weak, nonatomic) IBOutlet UIImageView *forumImageView;
 
+/**
+ icon
+ */
+@property (weak, nonatomic) IBOutlet UIImageView *iconImageView;
+
 /**
  讨论项标题
  */

Class/LearningCenter/ComprehensiveDiscussion/Cells/ForumTableViewCell.m

@@ -19,7 +19,8 @@
 {
     _categoryEntity = categoryEntity;
     if (_categoryEntity) {
-        [self.forumImageView sd_setImageWithURL:[NSURL URLWithString:_categoryEntity.attachment.fileUrl] placeholderImage:ReplaceImage];
+        [self.forumImageView sd_setImageWithURL:[NSURL URLWithString:_categoryEntity.attachmentBg.fileUrl] placeholderImage:ReplaceImage];
+        [self.iconImageView sd_setImageWithURL:[NSURL URLWithString:_categoryEntity.attachment.fileUrl] placeholderImage:ReplaceImage];
         self.forumTitleLabel.text = _categoryEntity.name;
         self.forumDetailTitleLabel.text = _categoryEntity.fdescription;
     }

Class/LearningCenter/ComprehensiveDiscussion/Controllers/DateCalibrationViewController.m

@@ -73,7 +73,14 @@
     }
     self.timeLineResponse = response;
     [self.calibrationCollectionView reloadData];
-    [self.calibrationCollectionView setContentOffset:CGPointMake(self.calibrationCollectionView.contentSize.height - self.calibrationCollectionView.frame.size.height, 0) animated:YES];
+    [self.calibrationCollectionView scrollToItemAtIndexPath:[NSIndexPath indexPathForItem:self.timeLineResponse.list.count-1 inSection:0] atScrollPosition:UICollectionViewScrollPositionNone animated:NO];
+    //等待0.3s秒(刷新主界面)
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.3 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        NSInteger yearNumber = self.timeLineResponse.list.count-1;
+        [self checkAnimationTriangleView:yearNumber returnMonthBlock:^(NSInteger monthNumber) {
+            [self refreshForumTypeList:yearNumber monthNumber:monthNumber];
+        }];
+    });
 }
 
 #pragma mark -判断时间轴是否有效
@@ -84,17 +91,23 @@
     if ([entity.year integerValue] == [year integerValue]) {
         if ([entity.month integerValue] > [month integerValue]) {
             return NotChoose;
+        }else if ([entity.month integerValue] == [month integerValue]) {
+            return Selected;
+        }else {
+            return Default;
         }
     }else if ([entity.year integerValue] > [year integerValue]) {
+        if ([entity.month integerValue] == [month integerValue]) {
+            return Selected;
+        }
         return Default;
     }else if ([entity.year integerValue] < [year integerValue]) {
+        if ([entity.month integerValue] == [month integerValue]) {
+            return Selected;
+        }
         return Default;
     }
-    if ([month isEqualToString:entity.month]) {
-        return Selected;
-    }else {
-        return Default;
-    }
+    return NotChoose;
 }
 
 #pragma mark -UI
@@ -128,39 +141,89 @@
     self.yearNumber = index;
     TimeLineType *entity = self.timeLineResponse.list[self.yearNumber];
     self.triangleView.yearString = entity.year;
-    [self refreshForumTypeList];
+    [self checkAnimationTriangleView:index returnMonthBlock:nil];
+    [self refreshForumTypeList:index monthNumber:self.monthNumber];
 }
 
-#pragma mark -监听子控制器点击
+#pragma mark -监听子控制器点击通知
 - (void)animationTriangleView:(NSNotification *)object
 {
     CalibrationDetailCollectionCell *cell = object.object;
     self.monthNumber = cell.indexPath.item;
     for (TimeLineType *timeLineType in self.timeLineResponse.list) {
+        BOOL isSelected = NO;
         for (int i=0; i<timeLineType.list.count; i++) {
             CustomTOForumtypeEntity *entity = timeLineType.list[i];
             if (i == cell.indexPath.item) {
                 if (entity.type) {
                     entity.type = Selected;
+                    isSelected = YES;
                 }
             }else {
                 if (entity.type == Selected) {
                     entity.type = Default;
                 }
             }
+            //本次循环结束判断是否有选中时间轴
+            if (i == timeLineType.list.count - 1) {
+                if (!isSelected) {
+                    [self checkTimeLineSelected:timeLineType];
+                }
+            }
         }
     }
     [self.calibrationCollectionView reloadData];
     [self mobileTriangleView:cell];
-    [self refreshForumTypeList];
+    [self refreshForumTypeList:self.yearNumber monthNumber:self.monthNumber];
+}
+
+#pragma mark -时间轴选中后通知
+- (void)checkAnimationTriangleView:(NSInteger)yearNumber returnMonthBlock:(void(^)(NSInteger month))monthNumber
+{
+    TimeLineType *timeLineType = self.timeLineResponse.list[yearNumber];
+    NSInteger selected = 0;
+    for (int i=0; i<timeLineType.list.count; i++) {
+        CustomTOForumtypeEntity *entity = timeLineType.list[i];
+        if (entity.type == Selected) {
+            if (monthNumber) {
+                monthNumber(selected);
+            }
+            selected = i;break;
+        }
+    }
+    CalibrationCollectionViewCell *calibrationCell = (CalibrationCollectionViewCell *)[self.calibrationCollectionView cellForItemAtIndexPath:[NSIndexPath indexPathForItem:yearNumber inSection:0]];
+    CalibrationDetailCollectionCell *calibrationDetailCell = (CalibrationDetailCollectionCell *)[calibrationCell.detailsVc.calibrationDetailCollectionView cellForItemAtIndexPath:[NSIndexPath indexPathForItem:selected inSection:0]];
+    [self mobileTriangleView:calibrationDetailCell];
+}
+
+#pragma mark -校验是否选中
+- (void)checkTimeLineSelected:(TimeLineType *)timeLineType
+{
+    NSInteger number = timeLineType.list.count-1;
+    for (NSInteger i=number; i>=0; i--) {
+        CustomTOForumtypeEntity *entity = timeLineType.list[i];
+        if (entity.type) {
+            entity.type = Selected;break;
+        }
+    }
 }
 
 #pragma mark -刷新帖子分类列表
-- (void)refreshForumTypeList
+- (void)refreshForumTypeList:(NSInteger)yearNumber monthNumber:(NSInteger)monthNumber
 {
-    TimeLineType *timeLineType = self.timeLineResponse.list[self.yearNumber];
-    CustomTOForumtypeEntity *entity = timeLineType.list[self.monthNumber];
-    [Notification postNotificationName:REFRESH_FROUMLIST object:entity.fid];
+    TimeLineType *timeLineType = self.timeLineResponse.list[yearNumber];
+    CustomTOForumtypeEntity *entity = timeLineType.list[monthNumber];
+    NSString *fidString = entity.fid;
+    //判断滑动结束后指向的时间轴是否有效.
+    if (entity.type != Selected) {
+        for (int i=0; i<timeLineType.list.count; i++) {
+            CustomTOForumtypeEntity *newEntity = timeLineType.list[i];
+            if (newEntity.type == Selected) {
+                fidString = newEntity.fid;break;
+            }
+        }
+    }
+    [Notification postNotificationName:REFRESH_FROUMLIST object:fidString];
 }
 
 #pragma mark -移动指示三角
@@ -178,7 +241,7 @@
 - (TriangleIndicatorView *)triangleView
 {
     if (!_triangleView) {
-        _triangleView = [[TriangleIndicatorView alloc] initializeView:CGRectMake(20, 45, 25, 15) contentLabel:[[NSDate date] yearString]];
+        _triangleView = [[TriangleIndicatorView alloc] initializeView:CGRectMake(-100, 45, 25, 15) contentLabel:[[NSDate date] yearString]];
     }
     return _triangleView;
 }

Class/LearningCenter/ComprehensiveDiscussion/Controllers/DiscussModuleViewController.m

@@ -8,6 +8,7 @@
 
 #import "DiscussModuleViewController.h"
 #import "DiscussModuleCollectionViewCell.h"
+#import "ForumItemListViewController.h"
 
 @interface DiscussModuleViewController ()<UICollectionViewDelegate,UICollectionViewDataSource>
 
@@ -62,11 +63,22 @@
 - (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath
 {
     DiscussModuleCollectionViewCell *moduleCell = [collectionView dequeueReusableCellWithReuseIdentifier:@"DiscussModuleCollectionViewCell" forIndexPath:indexPath];
-    TOForumtypeEntity *entity = self.result.list[indexPath.item];
-    [moduleCell.DiscussModuleImageView sd_setImageWithURL:[NSURL URLWithString:entity.attachment.fileUrl] placeholderImage:REPLACEIMAGE];
+    TOForumCategoryEntity *entity = self.result.list[indexPath.item];
+    [moduleCell refreshCell:entity];
     return moduleCell;
 }
 
 
+- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath
+{
+    ForumItemListViewController *itemListVc = [[[self class] getLearningCenterStoryboardClass] instantiateViewControllerWithIdentifier:@"ForumItemListViewController"];
+    TOForumCategoryEntity *category = self.result.list[indexPath.row];
+    category.typeId = self.result.forumType.fid;
+    itemListVc.category = category;
+    [self.navigationController pushViewController:itemListVc animated:YES];
+}
+
+
+
 
 @end

Class/LearningCenter/ComprehensiveDiscussion/Controllers/ForumItemDetailViewController.m

@@ -142,9 +142,9 @@
     NSString *headerurl = [Shoppersmanager manager].Shoppers.employee.picture;
     [self.issuerImageView sd_setImageWithURL:[NSURL URLWithString:headerurl] placeholderImage:ReplaceImage];
     if (self.topicDetail.backEnd) {
-        self.issuerImageView.image = TCImage(@"Icon-83.5");
+        self.issuerImageView.image = TCImage(@"manager");
     }else {
-        [self.issuerImageView sd_setImageWithURL:[NSURL URLWithString:self.topicDetail.posterPicture] placeholderImage:ReplaceImage];
+        [self.issuerImageView sd_setImageWithURL:[NSURL URLWithString:self.topicDetail.posterPicture] placeholderImage:TCImage(@"user")];
     }
     //图片
     PostPhotoManagerViewController *photoManager = [[[self class] getLearningCenterStoryboardClass] instantiateViewControllerWithIdentifier:@"PostPhotoManagerViewController"];

Class/LearningCenter/ComprehensiveDiscussion/Controllers/ForumItemListViewController.h

@@ -21,6 +21,11 @@
  */
 @property (weak, nonatomic) IBOutlet UIImageView *classifyImageView;
 
+/**
+ 分类图标
+ */
+@property (weak, nonatomic) IBOutlet UIImageView *classIconImageView;
+
 /**
  分类标题
  */

Class/LearningCenter/ComprehensiveDiscussion/Controllers/ForumItemListViewController.m

@@ -97,7 +97,8 @@ static NSString *TAGCELL_IDENTIFIER = @"CommentTagTableViewCell";
 {
     self.classificationListTableView.backgroundColor = RGB(237, 238, 239, 1);
     self.classifyTitleLabel.text = self.category.name;
-    [self.classifyImageView sd_setImageWithURL:[NSURL URLWithString:self.category.attachment.fileUrl] placeholderImage:REPLACEIMAGE];
+    [self.classifyImageView sd_setImageWithURL:[NSURL URLWithString:self.category.attachmentBg.fileUrl] placeholderImage:REPLACEIMAGE];
+    [self.classIconImageView sd_setImageWithURL:[NSURL URLWithString:self.category.attachment.fileUrl] placeholderImage:REPLACEIMAGE];
 }
 
 #pragma mark - 获取分类帖子列表

Class/LearningCenter/ComprehensiveDiscussion/Controllers/ForumViewController.m

@@ -11,7 +11,7 @@
 #import "ForumItemListViewController.h"
 
 
-@interface ForumViewController ()<UITableViewDelegate,UITableViewDataSource>
+@interface ForumViewController ()<UITableViewDelegate,UITableViewDataSource,DZNEmptyDataSetSource,DZNEmptyDataSetDelegate>
 
 @property (nonatomic,strong) ForumCategoryResponse *category;
 
@@ -51,7 +51,6 @@
     headerRefresh.stateLabel.hidden = YES;
     headerRefresh.lastUpdatedTimeLabel.hidden = YES;
     self.forumTableView.mj_header =headerRefresh;
-    [self.forumTableView.mj_header beginRefreshing];
 }
 
 #pragma mark - 获取论坛项Type
@@ -63,6 +62,8 @@
         
         [XBLoadingView hideHUDViewWithDefault];
         [weakSelf endRefreshingForTableView:weakSelf.forumTableView];
+        weakSelf.forumTableView.emptyDataSetDelegate = weakSelf;
+        weakSelf.forumTableView.emptyDataSetSource = weakSelf;
         if (RESULT(returnValue)) {
             weakSelf.category = [[ForumCategoryResponse alloc] initWithDictionary:RESPONSE(returnValue) error:nil];
             [weakSelf.forumTableView reloadData];
@@ -97,4 +98,26 @@
 }
 
 
+#pragma mark -友好界面
+- (UIImage *)imageForEmptyDataSet:(UIScrollView *)scrollView
+{
+    return kNoDataImage;
+}
+
+- (BOOL)emptyDataSetShouldAllowScroll:(UIScrollView *)scrollView
+{
+    return YES;
+}
+
+- (CGFloat)verticalOffsetForEmptyDataSet:(UIScrollView *)scrollView {
+    return  64.0;
+}
+
+
+
+
+
+
+
+
 @end

Class/LearningCenter/ComprehensiveDiscussion/Views/CalibrationDetailCollectionCell.m

@@ -55,7 +55,7 @@
 - (void)timeLineNotChoose
 {
     self.userInteractionEnabled = NO;
-    self.monthLabel.textColor = [UIColor grayColor];
+    self.monthLabel.textColor = [UIColor lightGrayColor];
 }
 
 

Class/LearningCenter/ComprehensiveDiscussion/Views/DiscussModuleCollectionViewCell.h

@@ -10,5 +10,24 @@
 
 @interface DiscussModuleCollectionViewCell : UICollectionViewCell
 
-@property (weak, nonatomic) IBOutlet UIImageView *DiscussModuleImageView;
+
+
+/**
+ 背景图片
+ */
+@property (weak, nonatomic) IBOutlet UIImageView *discussModuleImageView;
+
+/**
+ 图片
+ */
+@property (weak, nonatomic) IBOutlet UIImageView *iconImageView;
+
+/**
+ 标题
+ */
+@property (weak, nonatomic) IBOutlet UILabel *titleLabel;
+
+- (void)refreshCell:(TOForumCategoryEntity *)entity;
+
+
 @end

Class/LearningCenter/ComprehensiveDiscussion/Views/DiscussModuleCollectionViewCell.m

@@ -10,4 +10,12 @@
 
 @implementation DiscussModuleCollectionViewCell
 
+- (void)refreshCell:(TOForumCategoryEntity *)entity
+{
+    [self.discussModuleImageView sd_setImageWithURL:[NSURL URLWithString:entity.attachmentBg.fileUrl] placeholderImage:REPLACEIMAGE];
+    [self.iconImageView sd_setImageWithURL:[NSURL URLWithString:entity.attachment.fileUrl] placeholderImage:REPLACEIMAGE];
+    self.titleLabel.text = entity.name;
+
+}
+
 @end

Class/LearningCenter/OnlineLearning/Controllers/OnlineLearningViewController.m

@@ -31,11 +31,10 @@
 #pragma mark - UICollectionView
 - (void)setUpCollectionView
 {
-    self.onlineLearningFlowLayout.itemSize = CGSizeMake((ScreenWidth-100)/4.0, ((ScreenWidth-100)/4.0-50));
+    self.onlineLearningFlowLayout.itemSize = CGSizeMake((ScreenWidth-60)/3.0, ((ScreenWidth-60)/3.0)*0.9);
     self.onlineLearningFlowLayout.sectionInset = UIEdgeInsetsMake(20, 20, 20, 20);
-    self.onlineLearningFlowLayout.minimumLineSpacing = 20;
-    self.onlineLearningFlowLayout.minimumInteritemSpacing = 20;
-    
+    self.onlineLearningFlowLayout.minimumLineSpacing = 10;
+    self.onlineLearningFlowLayout.minimumInteritemSpacing = 10;
 }
 
 #pragma mark - 学习模块数据

Class/LearningCenter/OnlineLearning/Views/OnlineLearningTableViewCell.h

@@ -16,11 +16,21 @@
  */
 @property (weak, nonatomic) IBOutlet UIImageView *studyItemImageView;
 
+/**
+ 图标
+ */
+@property (weak, nonatomic) IBOutlet UIImageView *iconImageView;
+
 /**
  类型title
  */
 @property (weak, nonatomic) IBOutlet UILabel *studyItemTitleLabel;
 
+/**
+ title背景
+ */
+@property (weak, nonatomic) IBOutlet UIView *titleBackgroundView;
+
 /**
  学习类型
  */

Class/LearningCenter/OnlineLearning/Views/OnlineLearningTableViewCell.m

@@ -12,14 +12,16 @@
 
 - (void)awakeFromNib {
     [super awakeFromNib];
-    // Initialization code
+    
+    self.titleBackgroundView.backgroundColor = [[UIColor whiteColor] colorWithAlphaComponent:0.15];
 }
 
 
 - (void)setStudeType:(TOStudyTypeEntity *)studeType
 {
     _studeType = studeType;
-    [self.studyItemImageView sd_setImageWithURL:[NSURL URLWithString:_studeType.attachment.thumbnailUrl] placeholderImage:REPLACEIMAGE];
+    [self.studyItemImageView sd_setImageWithURL:[NSURL URLWithString:_studeType.attachmentBg.fileUrl] placeholderImage:REPLACEIMAGE];
+    [self.iconImageView sd_setImageWithURL:[NSURL URLWithString:_studeType.attachment.fileUrl] placeholderImage:REPLACEIMAGE];
     self.studyItemTitleLabel.text = _studeType.name;
 }
 

Class/Message/Controllers/MessageViewController.m

@@ -35,9 +35,23 @@
 - (void)viewDidAppear:(BOOL)animated
 {
     [super viewDidAppear:animated];
+    self.navigationController.fd_fullscreenPopGestureRecognizer.enabled = NO;
+    if ([self.navigationController respondsToSelector:@selector(interactivePopGestureRecognizer)]) {
+        self.navigationController.interactivePopGestureRecognizer.enabled = NO;
+    }
     [self.meesageTableView.mj_header beginRefreshing];
 }
 
+- (void)viewWillDisappear:(BOOL)animated
+{
+    [super viewWillDisappear:animated];
+    self.navigationController.fd_fullscreenPopGestureRecognizer.enabled = YES;
+    if ([self.navigationController respondsToSelector:@selector(interactivePopGestureRecognizer)]) {
+        self.navigationController.interactivePopGestureRecognizer.enabled = YES;
+    }
+}
+
+
 - (void)viewDidLoad {
     [super viewDidLoad];
     

Lighting/LearningCenter.storyboard

@@ -209,16 +209,16 @@
                                 <rect key="frame" x="87" y="438" width="250" height="280"/>
                                 <subviews>
                                     <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="confirm" translatesAutoresizingMaskIntoConstraints="NO" id="MuY-LG-NBV">
-                                        <rect key="frame" x="-20" y="-32" width="270" height="218"/>
+                                        <rect key="frame" x="-20" y="-32" width="270" height="212"/>
                                     </imageView>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="综合讨论区" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="la7-TV-ihd">
-                                        <rect key="frame" x="0.0" y="194" width="250" height="21"/>
+                                        <rect key="frame" x="0.0" y="188" width="250" height="21"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                         <nil key="textColor"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="聚焦销售热点，分享你的故事" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1pv-4u-2vR">
-                                        <rect key="frame" x="0.0" y="235" width="250" height="16"/>
+                                        <rect key="frame" x="0.0" y="229" width="250" height="16"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                         <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
                                         <nil key="highlightedColor"/>
@@ -227,7 +227,7 @@
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 <constraints>
                                     <constraint firstItem="MuY-LG-NBV" firstAttribute="leading" secondItem="EHZ-N8-9xm" secondAttribute="leading" constant="-20" id="9IW-D6-dHc"/>
-                                    <constraint firstAttribute="bottom" secondItem="MuY-LG-NBV" secondAttribute="bottom" constant="94" id="BQk-0T-BLJ"/>
+                                    <constraint firstAttribute="bottom" secondItem="MuY-LG-NBV" secondAttribute="bottom" constant="100" id="BQk-0T-BLJ"/>
                                     <constraint firstItem="MuY-LG-NBV" firstAttribute="top" secondItem="EHZ-N8-9xm" secondAttribute="top" constant="-32" id="F36-Yg-wLf"/>
                                     <constraint firstAttribute="trailing" secondItem="MuY-LG-NBV" secondAttribute="trailing" id="SzT-1w-fgx"/>
                                     <constraint firstAttribute="trailing" secondItem="1pv-4u-2vR" secondAttribute="trailing" id="YIz-zg-ap4"/>
@@ -242,16 +242,16 @@
                                 <rect key="frame" x="387" y="438" width="250" height="280"/>
                                 <subviews>
                                     <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="onlinelearning" translatesAutoresizingMaskIntoConstraints="NO" id="SNi-DW-ctK">
-                                        <rect key="frame" x="-27" y="-31" width="277" height="216"/>
+                                        <rect key="frame" x="-27" y="-31" width="277" height="211"/>
                                     </imageView>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="在线学习" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zxI-RN-m3o">
-                                        <rect key="frame" x="0.0" y="193" width="250" height="21"/>
+                                        <rect key="frame" x="0.0" y="188" width="250" height="21"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                         <nil key="textColor"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="你学习的加油站，寻找成长的快乐" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nTp-Cy-KLN">
-                                        <rect key="frame" x="0.0" y="234" width="250" height="18"/>
+                                        <rect key="frame" x="0.0" y="229" width="250" height="18"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                         <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
                                         <nil key="highlightedColor"/>
@@ -262,7 +262,7 @@
                                     <constraint firstAttribute="trailing" secondItem="zxI-RN-m3o" secondAttribute="trailing" id="9uH-MW-k68"/>
                                     <constraint firstItem="nTp-Cy-KLN" firstAttribute="top" secondItem="zxI-RN-m3o" secondAttribute="bottom" constant="20" id="SdN-YS-dag"/>
                                     <constraint firstAttribute="width" constant="250" id="acv-Av-jV9"/>
-                                    <constraint firstAttribute="bottom" secondItem="SNi-DW-ctK" secondAttribute="bottom" constant="95" id="bB6-gP-3Jz"/>
+                                    <constraint firstAttribute="bottom" secondItem="SNi-DW-ctK" secondAttribute="bottom" constant="100" id="bB6-gP-3Jz"/>
                                     <constraint firstItem="zxI-RN-m3o" firstAttribute="top" secondItem="SNi-DW-ctK" secondAttribute="bottom" constant="8" id="eJH-x7-Y6y"/>
                                     <constraint firstItem="SNi-DW-ctK" firstAttribute="leading" secondItem="KZD-sL-JFt" secondAttribute="leading" constant="-27" id="hXl-v8-GcQ"/>
                                     <constraint firstAttribute="trailing" secondItem="nTp-Cy-KLN" secondAttribute="trailing" id="ibO-wQ-Sgk"/>
@@ -277,16 +277,16 @@
                                 <rect key="frame" x="687" y="438" width="250" height="280"/>
                                 <subviews>
                                     <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="discussion" translatesAutoresizingMaskIntoConstraints="NO" id="FmA-Aj-5Tc">
-                                        <rect key="frame" x="-28" y="-49" width="278" height="237"/>
+                                        <rect key="frame" x="-28" y="-49" width="278" height="229"/>
                                     </imageView>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="闯关区" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="uCD-5f-XRU">
-                                        <rect key="frame" x="0.0" y="196" width="250" height="21"/>
+                                        <rect key="frame" x="0.0" y="188" width="250" height="21"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                         <nil key="textColor"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="敢于挑战自己，荣誉将属于你" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="scA-SL-nss">
-                                        <rect key="frame" x="0.0" y="237" width="250" height="18"/>
+                                        <rect key="frame" x="0.0" y="229" width="250" height="18"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                         <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
                                         <nil key="highlightedColor"/>
@@ -301,7 +301,7 @@
                                     <constraint firstItem="uCD-5f-XRU" firstAttribute="leading" secondItem="dcd-Ku-GUX" secondAttribute="leading" id="ih4-tJ-bCT"/>
                                     <constraint firstItem="FmA-Aj-5Tc" firstAttribute="leading" secondItem="dcd-Ku-GUX" secondAttribute="leading" constant="-28" id="kjd-oA-cb0"/>
                                     <constraint firstItem="FmA-Aj-5Tc" firstAttribute="top" secondItem="dcd-Ku-GUX" secondAttribute="top" constant="-49" id="pp3-E5-D6V"/>
-                                    <constraint firstAttribute="bottom" secondItem="FmA-Aj-5Tc" secondAttribute="bottom" constant="92" id="uxu-CI-EKy"/>
+                                    <constraint firstAttribute="bottom" secondItem="FmA-Aj-5Tc" secondAttribute="bottom" constant="100" id="uxu-CI-EKy"/>
                                     <constraint firstItem="scA-SL-nss" firstAttribute="leading" secondItem="dcd-Ku-GUX" secondAttribute="leading" id="wO2-UG-I4o"/>
                                     <constraint firstAttribute="trailing" secondItem="FmA-Aj-5Tc" secondAttribute="trailing" id="xFm-ij-tBs"/>
                                 </constraints>
@@ -359,7 +359,7 @@
                                         <rect key="frame" x="0.0" y="28" width="1024" height="90"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="ctQ-16-eCQ" id="DuY-Eq-G4z">
-                                            <rect key="frame" x="0.0" y="0.0" width="830" height="89"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="830" height="89.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="00登录-谭" translatesAutoresizingMaskIntoConstraints="NO" id="jVJ-Bu-xw9">
@@ -429,55 +429,87 @@
                         <rect key="frame" x="0.0" y="0.0" width="1024" height="768"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="90" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="Ogf-Th-qTY">
+                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="90" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="Ogf-Th-qTY">
                                 <rect key="frame" x="0.0" y="20" width="1024" height="748"/>
                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                 <prototypes>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" accessoryType="disclosureIndicator" indentationWidth="10" reuseIdentifier="ForumTableViewCell" rowHeight="90" id="gz9-gD-P6A" customClass="ForumTableViewCell">
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="ForumTableViewCell" rowHeight="90" id="gz9-gD-P6A" customClass="ForumTableViewCell">
                                         <rect key="frame" x="0.0" y="28" width="1024" height="90"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="gz9-gD-P6A" id="4lI-td-FE0">
-                                            <rect key="frame" x="0.0" y="0.0" width="830" height="89"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="1024" height="90"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="00登录-谭" translatesAutoresizingMaskIntoConstraints="NO" id="tIu-Ox-DXo">
-                                                    <rect key="frame" x="38" y="12.5" width="65" height="65"/>
-                                                    <constraints>
-                                                        <constraint firstAttribute="width" constant="65" id="SEs-A9-aMv"/>
-                                                        <constraint firstAttribute="height" constant="65" id="ufc-Jy-eJM"/>
-                                                    </constraints>
-                                                    <userDefinedRuntimeAttributes>
-                                                        <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
-                                                            <real key="value" value="5"/>
-                                                        </userDefinedRuntimeAttribute>
-                                                    </userDefinedRuntimeAttributes>
-                                                </imageView>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="案例分析" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="InC-cR-acr">
-                                                    <rect key="frame" x="113" y="22.5" width="69.5" height="20.5"/>
+                                                    <rect key="frame" x="103" y="24" width="70" height="21"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <nil key="textColor"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="优秀配灯" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="R8L-1A-ohO">
-                                                    <rect key="frame" x="113" y="49.5" width="49.5" height="14.5"/>
+                                                    <rect key="frame" x="103" y="50" width="50" height="15"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="12"/>
                                                     <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
+                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="dottedLine" translatesAutoresizingMaskIntoConstraints="NO" id="SKx-pF-I2X">
+                                                    <rect key="frame" x="0.0" y="89" width="1024" height="1"/>
+                                                    <constraints>
+                                                        <constraint firstAttribute="height" constant="1" id="Deh-AF-cP0"/>
+                                                    </constraints>
+                                                </imageView>
+                                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="yYt-oe-BR3">
+                                                    <rect key="frame" x="28" y="13" width="65" height="65"/>
+                                                    <subviews>
+                                                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="00登录-谭" translatesAutoresizingMaskIntoConstraints="NO" id="tIu-Ox-DXo">
+                                                            <rect key="frame" x="0.0" y="0.0" width="65" height="65"/>
+                                                            <userDefinedRuntimeAttributes>
+                                                                <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
+                                                                    <real key="value" value="5"/>
+                                                                </userDefinedRuntimeAttribute>
+                                                            </userDefinedRuntimeAttributes>
+                                                        </imageView>
+                                                        <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="uBx-pP-QGT">
+                                                            <rect key="frame" x="10" y="10" width="45.5" height="45.5"/>
+                                                        </imageView>
+                                                    </subviews>
+                                                    <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                                    <constraints>
+                                                        <constraint firstAttribute="width" constant="65" id="15q-D7-CeF"/>
+                                                        <constraint firstAttribute="bottom" secondItem="tIu-Ox-DXo" secondAttribute="bottom" id="FuS-3q-Com"/>
+                                                        <constraint firstItem="tIu-Ox-DXo" firstAttribute="top" secondItem="yYt-oe-BR3" secondAttribute="top" id="HbH-48-xpU"/>
+                                                        <constraint firstItem="uBx-pP-QGT" firstAttribute="centerY" secondItem="yYt-oe-BR3" secondAttribute="centerY" id="HiL-2w-nUD"/>
+                                                        <constraint firstItem="uBx-pP-QGT" firstAttribute="centerX" secondItem="yYt-oe-BR3" secondAttribute="centerX" id="THa-hV-aru"/>
+                                                        <constraint firstItem="uBx-pP-QGT" firstAttribute="height" secondItem="yYt-oe-BR3" secondAttribute="height" multiplier="0.7" id="Zjw-ir-Dr0"/>
+                                                        <constraint firstAttribute="trailing" secondItem="tIu-Ox-DXo" secondAttribute="trailing" id="ai7-v8-aSN"/>
+                                                        <constraint firstItem="tIu-Ox-DXo" firstAttribute="leading" secondItem="yYt-oe-BR3" secondAttribute="leading" id="gCc-jL-9Cu"/>
+                                                        <constraint firstItem="uBx-pP-QGT" firstAttribute="width" secondItem="yYt-oe-BR3" secondAttribute="width" multiplier="0.7" id="lXj-jb-bNQ"/>
+                                                        <constraint firstAttribute="height" constant="65" id="mVE-WD-2KQ"/>
+                                                    </constraints>
+                                                    <userDefinedRuntimeAttributes>
+                                                        <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
+                                                            <real key="value" value="5"/>
+                                                        </userDefinedRuntimeAttribute>
+                                                    </userDefinedRuntimeAttributes>
+                                                </view>
                                             </subviews>
                                             <constraints>
-                                                <constraint firstItem="tIu-Ox-DXo" firstAttribute="leading" secondItem="4lI-td-FE0" secondAttribute="leadingMargin" constant="30" id="HOE-JK-Ace"/>
-                                                <constraint firstItem="R8L-1A-ohO" firstAttribute="leading" secondItem="tIu-Ox-DXo" secondAttribute="trailing" constant="10" id="dWF-4w-yDH"/>
-                                                <constraint firstItem="R8L-1A-ohO" firstAttribute="centerY" secondItem="4lI-td-FE0" secondAttribute="centerY" constant="12" id="gVr-DD-Skd"/>
-                                                <constraint firstItem="InC-cR-acr" firstAttribute="centerY" secondItem="4lI-td-FE0" secondAttribute="centerY" constant="-12" id="hfm-JD-QuV"/>
-                                                <constraint firstItem="tIu-Ox-DXo" firstAttribute="centerY" secondItem="4lI-td-FE0" secondAttribute="centerY" id="kxC-C1-l93"/>
-                                                <constraint firstItem="InC-cR-acr" firstAttribute="leading" secondItem="tIu-Ox-DXo" secondAttribute="trailing" constant="10" id="pCa-4a-xEH"/>
+                                                <constraint firstItem="yYt-oe-BR3" firstAttribute="centerY" secondItem="4lI-td-FE0" secondAttribute="centerY" id="1Qf-iX-lQ5"/>
+                                                <constraint firstItem="R8L-1A-ohO" firstAttribute="leading" secondItem="yYt-oe-BR3" secondAttribute="trailing" constant="10" id="1cO-Q6-jOP"/>
+                                                <constraint firstItem="InC-cR-acr" firstAttribute="leading" secondItem="yYt-oe-BR3" secondAttribute="trailing" constant="10" id="9oh-Ue-jL3"/>
+                                                <constraint firstItem="SKx-pF-I2X" firstAttribute="leading" secondItem="4lI-td-FE0" secondAttribute="leading" id="DBO-cg-Hx1"/>
+                                                <constraint firstAttribute="bottom" secondItem="SKx-pF-I2X" secondAttribute="bottom" id="EKG-DJ-7YI"/>
+                                                <constraint firstItem="InC-cR-acr" firstAttribute="centerY" secondItem="4lI-td-FE0" secondAttribute="centerY" multiplier="0.75" id="T1n-Wz-08i"/>
+                                                <constraint firstItem="R8L-1A-ohO" firstAttribute="centerY" secondItem="4lI-td-FE0" secondAttribute="centerY" multiplier="1.25" constant="1.2" id="jaq-PQ-owD"/>
+                                                <constraint firstAttribute="trailing" secondItem="SKx-pF-I2X" secondAttribute="trailing" id="vjc-P0-9e1"/>
+                                                <constraint firstItem="yYt-oe-BR3" firstAttribute="leading" secondItem="4lI-td-FE0" secondAttribute="leading" constant="28" id="wCf-7N-eKH"/>
                                             </constraints>
                                         </tableViewCellContentView>
                                         <connections>
                                             <outlet property="forumDetailTitleLabel" destination="R8L-1A-ohO" id="sDT-L7-udJ"/>
                                             <outlet property="forumImageView" destination="tIu-Ox-DXo" id="AYh-Ex-fo4"/>
                                             <outlet property="forumTitleLabel" destination="InC-cR-acr" id="vPh-Yx-udm"/>
+                                            <outlet property="iconImageView" destination="uBx-pP-QGT" id="Yoo-3E-VJ5"/>
                                         </connections>
                                     </tableViewCell>
                                 </prototypes>
@@ -487,7 +519,6 @@
                                 </connections>
                             </tableView>
                         </subviews>
-                        <color key="backgroundColor" red="0.92941176470588238" green="0.93333333333333335" blue="0.93725490196078431" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
                             <constraint firstItem="Ogf-Th-qTY" firstAttribute="leading" secondItem="FsK-t2-M2J" secondAttribute="leading" id="Gab-1f-zbg"/>
                             <constraint firstItem="lL2-ja-VxT" firstAttribute="top" secondItem="Ogf-Th-qTY" secondAttribute="bottom" id="TTE-8W-jco"/>
@@ -501,7 +532,7 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="O0u-yR-6Au" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="-61" y="1108"/>
+            <point key="canvasLocation" x="-76" y="1107"/>
         </scene>
         <!--Break Through View Controller-->
         <scene sceneID="rwc-Yg-H7D">
@@ -607,6 +638,9 @@
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ZLa-5M-jVp">
                                 <rect key="frame" x="10" y="636" width="143" height="132"/>
                                 <state key="normal" image="instructions"/>
+                                <connections>
+                                    <action selector="instructionsButtonClickAction:" destination="5sT-i0-QNe" eventType="touchUpInside" id="EFd-79-WW9"/>
+                                </connections>
                             </button>
                         </subviews>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
@@ -651,18 +685,6 @@
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Wup-l7-BBP">
                                 <rect key="frame" x="0.0" y="64" width="1024" height="100"/>
                                 <subviews>
-                                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="00启动页" translatesAutoresizingMaskIntoConstraints="NO" id="8RZ-lL-fYj">
-                                        <rect key="frame" x="45" y="15" width="70" height="70"/>
-                                        <constraints>
-                                            <constraint firstAttribute="height" constant="70" id="EMT-80-reu"/>
-                                            <constraint firstAttribute="width" constant="70" id="GYr-q8-vVB"/>
-                                        </constraints>
-                                        <userDefinedRuntimeAttributes>
-                                            <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
-                                                <real key="value" value="4"/>
-                                            </userDefinedRuntimeAttribute>
-                                        </userDefinedRuntimeAttributes>
-                                    </imageView>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="1019" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="sSD-4l-Ksh">
                                         <rect key="frame" x="185" y="57" width="29" height="16"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="13"/>
@@ -698,20 +720,54 @@
                                         <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
                                         <nil key="highlightedColor"/>
                                     </label>
+                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="8EW-Uh-ADi">
+                                        <rect key="frame" x="45" y="15" width="70" height="70"/>
+                                        <subviews>
+                                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="矩形-1-拷贝-9" translatesAutoresizingMaskIntoConstraints="NO" id="8RZ-lL-fYj">
+                                                <rect key="frame" x="0.0" y="0.0" width="70" height="70"/>
+                                                <userDefinedRuntimeAttributes>
+                                                    <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
+                                                        <real key="value" value="4"/>
+                                                    </userDefinedRuntimeAttribute>
+                                                </userDefinedRuntimeAttributes>
+                                            </imageView>
+                                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="6" translatesAutoresizingMaskIntoConstraints="NO" id="IqG-JD-duE">
+                                                <rect key="frame" x="11" y="11" width="49" height="49"/>
+                                            </imageView>
+                                        </subviews>
+                                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                        <constraints>
+                                            <constraint firstItem="IqG-JD-duE" firstAttribute="centerX" secondItem="8EW-Uh-ADi" secondAttribute="centerX" id="3p4-CZ-oPL"/>
+                                            <constraint firstItem="IqG-JD-duE" firstAttribute="centerY" secondItem="8EW-Uh-ADi" secondAttribute="centerY" id="AJ5-A1-TlC"/>
+                                            <constraint firstAttribute="width" constant="70" id="DcG-qZ-6ck"/>
+                                            <constraint firstItem="8RZ-lL-fYj" firstAttribute="top" secondItem="8EW-Uh-ADi" secondAttribute="top" id="GAw-gy-0dW"/>
+                                            <constraint firstItem="IqG-JD-duE" firstAttribute="width" secondItem="8EW-Uh-ADi" secondAttribute="width" multiplier="0.7" id="Zws-Mt-aWP"/>
+                                            <constraint firstAttribute="bottom" secondItem="8RZ-lL-fYj" secondAttribute="bottom" id="brm-mS-2EF"/>
+                                            <constraint firstItem="8RZ-lL-fYj" firstAttribute="leading" secondItem="8EW-Uh-ADi" secondAttribute="leading" id="enl-m6-GyB"/>
+                                            <constraint firstItem="IqG-JD-duE" firstAttribute="height" secondItem="8EW-Uh-ADi" secondAttribute="height" multiplier="0.7" id="ete-FU-849"/>
+                                            <constraint firstAttribute="height" constant="70" id="gy4-jc-uPa"/>
+                                            <constraint firstAttribute="trailing" secondItem="8RZ-lL-fYj" secondAttribute="trailing" id="mzL-zl-urq"/>
+                                        </constraints>
+                                        <userDefinedRuntimeAttributes>
+                                            <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
+                                                <real key="value" value="5"/>
+                                            </userDefinedRuntimeAttribute>
+                                        </userDefinedRuntimeAttributes>
+                                    </view>
                                 </subviews>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 <constraints>
                                     <constraint firstItem="ekM-ss-c7B" firstAttribute="leading" secondItem="Wup-l7-BBP" secondAttribute="leading" id="5Ps-aY-bVt"/>
-                                    <constraint firstItem="FuU-Is-N7n" firstAttribute="leading" secondItem="8RZ-lL-fYj" secondAttribute="trailing" constant="30" id="9CM-J4-kxl"/>
                                     <constraint firstItem="FuU-Is-N7n" firstAttribute="centerY" secondItem="Wup-l7-BBP" secondAttribute="centerY" constant="-10" id="BtN-tY-b2q"/>
                                     <constraint firstAttribute="trailing" secondItem="ekM-ss-c7B" secondAttribute="trailing" id="Cfh-yk-ra9"/>
+                                    <constraint firstItem="8EW-Uh-ADi" firstAttribute="leading" secondItem="Wup-l7-BBP" secondAttribute="leading" constant="45" id="DCq-qQ-OWL"/>
                                     <constraint firstItem="sSD-4l-Ksh" firstAttribute="leading" secondItem="e5v-Y5-qWA" secondAttribute="trailing" id="DDs-Uv-iEP"/>
-                                    <constraint firstItem="8RZ-lL-fYj" firstAttribute="centerY" secondItem="Wup-l7-BBP" secondAttribute="centerY" id="EPY-GU-TGS"/>
+                                    <constraint firstItem="8EW-Uh-ADi" firstAttribute="centerY" secondItem="Wup-l7-BBP" secondAttribute="centerY" id="TJ7-0j-hEx"/>
                                     <constraint firstItem="cQA-Kq-2kO" firstAttribute="top" secondItem="FuU-Is-N7n" secondAttribute="top" id="aTE-e2-L0I"/>
                                     <constraint firstItem="e5v-Y5-qWA" firstAttribute="top" secondItem="FuU-Is-N7n" secondAttribute="bottom" constant="5" id="azF-m3-ujr"/>
                                     <constraint firstAttribute="trailing" secondItem="cQA-Kq-2kO" secondAttribute="trailing" constant="40" id="bKe-Jx-b9s"/>
                                     <constraint firstItem="sSD-4l-Ksh" firstAttribute="centerY" secondItem="e5v-Y5-qWA" secondAttribute="centerY" id="c71-ys-dlC"/>
-                                    <constraint firstItem="8RZ-lL-fYj" firstAttribute="leading" secondItem="Wup-l7-BBP" secondAttribute="leading" constant="45" id="hX2-2s-x9O"/>
+                                    <constraint firstItem="FuU-Is-N7n" firstAttribute="leading" secondItem="8EW-Uh-ADi" secondAttribute="trailing" constant="30" id="eU2-WI-A1S"/>
                                     <constraint firstAttribute="bottom" secondItem="ekM-ss-c7B" secondAttribute="bottom" id="kuY-90-tLY"/>
                                     <constraint firstItem="e5v-Y5-qWA" firstAttribute="leading" secondItem="FuU-Is-N7n" secondAttribute="leading" id="mrq-YC-b0T"/>
                                     <constraint firstAttribute="height" constant="100" id="p8o-Wa-Nfp"/>
@@ -933,6 +989,7 @@
                         </constraints>
                     </view>
                     <connections>
+                        <outlet property="classIconImageView" destination="IqG-JD-duE" id="Clp-lH-M8R"/>
                         <outlet property="classificationListTableView" destination="mCC-Hw-JZs" id="hhR-hv-j9x"/>
                         <outlet property="classifyImageView" destination="8RZ-lL-fYj" id="0fe-Ev-uEp"/>
                         <outlet property="classifyListCountLabel" destination="sSD-4l-Ksh" id="YIg-eU-deA"/>
@@ -963,7 +1020,7 @@
                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                 <prototypes>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="AssessmentHeaderView" id="UfB-K3-NdF" customClass="AssessmentHeaderView">
-                                        <rect key="frame" x="0.0" y="56" width="460" height="44"/>
+                                        <rect key="frame" x="0.0" y="55.5" width="460" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="UfB-K3-NdF" id="WGo-Wa-YTq">
                                             <rect key="frame" x="0.0" y="0.0" width="460" height="44"/>
@@ -989,7 +1046,7 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="AssessmentTableViewCell" rowHeight="52" id="gIe-bF-XsX" customClass="AssessmentTableViewCell">
-                                        <rect key="frame" x="0.0" y="100" width="460" height="52"/>
+                                        <rect key="frame" x="0.0" y="99.5" width="460" height="52"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="gIe-bF-XsX" id="Va8-wn-DBM">
                                             <rect key="frame" x="0.0" y="0.0" width="460" height="52"/>
@@ -1035,7 +1092,7 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="AssessmentShortAnswerTableViewCell" rowHeight="112" id="smV-qr-KgP" customClass="AssessmentShortAnswerTableViewCell">
-                                        <rect key="frame" x="0.0" y="152" width="460" height="112"/>
+                                        <rect key="frame" x="0.0" y="151.5" width="460" height="112"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="smV-qr-KgP" id="A2f-ek-60T">
                                             <rect key="frame" x="0.0" y="0.0" width="460" height="112"/>
@@ -1178,25 +1235,50 @@
                                 </collectionViewFlowLayout>
                                 <cells>
                                     <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="DiscussModuleCollectionViewCell" id="xyj-vp-PmN" customClass="DiscussModuleCollectionViewCell">
-                                        <rect key="frame" x="0.0" y="0.0" width="306" height="228"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="306" height="150"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
-                                            <rect key="frame" x="0.0" y="0.0" width="306" height="228"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="306" height="150"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="7Fw-Z6-RHQ">
-                                                    <rect key="frame" x="0.0" y="0.0" width="306" height="228"/>
+                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="矩形-1-拷贝-9" translatesAutoresizingMaskIntoConstraints="NO" id="7Fw-Z6-RHQ">
+                                                    <rect key="frame" x="0.0" y="0.0" width="306" height="150"/>
+                                                    <userDefinedRuntimeAttributes>
+                                                        <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
+                                                            <real key="value" value="10"/>
+                                                        </userDefinedRuntimeAttribute>
+                                                    </userDefinedRuntimeAttributes>
+                                                </imageView>
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="活动公告" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rz6-GB-Wn5">
+                                                    <rect key="frame" x="142" y="62" width="90" height="27"/>
+                                                    <fontDescription key="fontDescription" type="boldSystem" pointSize="22"/>
+                                                    <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="6" translatesAutoresizingMaskIntoConstraints="NO" id="THz-Dz-s93">
+                                                    <rect key="frame" x="42" y="40" width="70" height="70"/>
+                                                    <constraints>
+                                                        <constraint firstAttribute="height" constant="70" id="6hT-Kb-PYl"/>
+                                                        <constraint firstAttribute="width" constant="70" id="HMx-vh-574"/>
+                                                    </constraints>
                                                 </imageView>
                                             </subviews>
                                         </view>
                                         <constraints>
-                                            <constraint firstAttribute="bottom" secondItem="7Fw-Z6-RHQ" secondAttribute="bottom" id="PIE-IZ-hFp"/>
-                                            <constraint firstItem="7Fw-Z6-RHQ" firstAttribute="top" secondItem="xyj-vp-PmN" secondAttribute="top" id="U95-29-39k"/>
-                                            <constraint firstAttribute="trailing" secondItem="7Fw-Z6-RHQ" secondAttribute="trailing" id="iWJ-JW-Clc"/>
-                                            <constraint firstItem="7Fw-Z6-RHQ" firstAttribute="leading" secondItem="xyj-vp-PmN" secondAttribute="leading" id="xKV-0n-pQj"/>
+                                            <constraint firstAttribute="bottom" secondItem="7Fw-Z6-RHQ" secondAttribute="bottom" id="1iz-Jy-bsz"/>
+                                            <constraint firstItem="7Fw-Z6-RHQ" firstAttribute="leading" secondItem="xyj-vp-PmN" secondAttribute="leading" id="2Zn-6l-8oc"/>
+                                            <constraint firstItem="THz-Dz-s93" firstAttribute="centerX" secondItem="xyj-vp-PmN" secondAttribute="centerX" multiplier="0.5" id="S6g-4G-EeD"/>
+                                            <constraint firstItem="rz6-GB-Wn5" firstAttribute="leading" secondItem="THz-Dz-s93" secondAttribute="trailing" constant="30" id="aGe-SB-2XV"/>
+                                            <constraint firstItem="rz6-GB-Wn5" firstAttribute="centerY" secondItem="THz-Dz-s93" secondAttribute="centerY" id="b6t-9P-7eG"/>
+                                            <constraint firstItem="THz-Dz-s93" firstAttribute="centerY" secondItem="xyj-vp-PmN" secondAttribute="centerY" id="jz0-tw-Dq5"/>
+                                            <constraint firstItem="7Fw-Z6-RHQ" firstAttribute="top" secondItem="xyj-vp-PmN" secondAttribute="top" id="mcV-WM-VNv"/>
+                                            <constraint firstAttribute="trailing" secondItem="7Fw-Z6-RHQ" secondAttribute="trailing" id="uAx-oK-x8K"/>
                                         </constraints>
+                                        <size key="customSize" width="306" height="150"/>
                                         <connections>
-                                            <outlet property="DiscussModuleImageView" destination="7Fw-Z6-RHQ" id="W0E-pr-0cW"/>
+                                            <outlet property="discussModuleImageView" destination="7Fw-Z6-RHQ" id="2Ba-7K-xbC"/>
+                                            <outlet property="iconImageView" destination="THz-Dz-s93" id="cYV-aU-Cpf"/>
+                                            <outlet property="titleLabel" destination="rz6-GB-Wn5" id="lw3-dz-dE1"/>
                                         </connections>
                                     </collectionViewCell>
                                 </cells>
@@ -1246,7 +1328,7 @@
                                 </collectionViewFlowLayout>
                                 <cells>
                                     <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="CalibrationDetailCollectionCell" id="dGo-4o-u9g" customClass="CalibrationDetailCollectionCell">
-                                        <rect key="frame" x="0.0" y="10" width="93" height="41"/>
+                                        <rect key="frame" x="0.0" y="9.5" width="93" height="41"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
                                             <rect key="frame" x="0.0" y="0.0" width="93" height="41"/>
@@ -1326,7 +1408,7 @@
                                 </collectionViewFlowLayout>
                                 <cells>
                                     <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="CalibrationCollectionViewCell" id="v20-Kz-8OX" customClass="CalibrationCollectionViewCell">
-                                        <rect key="frame" x="0.0" y="5" width="50" height="50"/>
+                                        <rect key="frame" x="0.0" y="4.5" width="50" height="50"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
                                             <rect key="frame" x="0.0" y="0.0" width="50" height="50"/>
@@ -1751,7 +1833,7 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="Hbj-9Y-heh">
-                                <rect key="frame" x="0.0" y="64" width="1024" height="704"/>
+                                <rect key="frame" x="0.0" y="95" width="1024" height="673"/>
                                 <color key="backgroundColor" red="0.92941176470588238" green="0.93333333333333335" blue="0.93725490196078431" alpha="1" colorSpace="calibratedRGB"/>
                                 <collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="10" minimumInteritemSpacing="10" id="5pu-XL-dth">
                                     <size key="itemSize" width="332" height="198"/>
@@ -1767,35 +1849,56 @@
                                             <rect key="frame" x="0.0" y="0.0" width="300" height="200"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="00登录-谭" translatesAutoresizingMaskIntoConstraints="NO" id="DWM-hY-5Md">
-                                                    <rect key="frame" x="0.0" y="0.0" width="300" height="150"/>
+                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="矩形-1-拷贝-9" translatesAutoresizingMaskIntoConstraints="NO" id="DWM-hY-5Md">
+                                                    <rect key="frame" x="0.0" y="0.0" width="300" height="200"/>
                                                 </imageView>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="产品知识" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gf6-jR-u7F">
+                                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="14r-a3-mez">
                                                     <rect key="frame" x="0.0" y="150" width="300" height="50"/>
+                                                    <subviews>
+                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="优质服务" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="62c-e9-iAJ">
+                                                            <rect key="frame" x="105" y="12" width="90" height="27"/>
+                                                            <fontDescription key="fontDescription" type="boldSystem" pointSize="22"/>
+                                                            <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                                            <nil key="highlightedColor"/>
+                                                        </label>
+                                                    </subviews>
+                                                    <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
                                                     <constraints>
-                                                        <constraint firstAttribute="height" constant="50" id="kuf-SR-p9V"/>
+                                                        <constraint firstItem="62c-e9-iAJ" firstAttribute="centerX" secondItem="14r-a3-mez" secondAttribute="centerX" id="aFy-AX-j2W"/>
+                                                        <constraint firstItem="62c-e9-iAJ" firstAttribute="centerY" secondItem="14r-a3-mez" secondAttribute="centerY" id="uT6-uA-b7T"/>
                                                     </constraints>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="18"/>
-                                                    <nil key="textColor"/>
-                                                    <nil key="highlightedColor"/>
-                                                    <color key="shadowColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                                                </label>
+                                                </view>
+                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="6" translatesAutoresizingMaskIntoConstraints="NO" id="A9i-5N-FES">
+                                                    <rect key="frame" x="60" y="20" width="180" height="120"/>
+                                                </imageView>
                                             </subviews>
                                         </view>
                                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                         <constraints>
-                                            <constraint firstItem="gf6-jR-u7F" firstAttribute="leading" secondItem="R9E-DY-fL9" secondAttribute="leading" id="1zF-s5-Z1m"/>
-                                            <constraint firstItem="DWM-hY-5Md" firstAttribute="leading" secondItem="R9E-DY-fL9" secondAttribute="leading" id="SVf-G9-zFu"/>
-                                            <constraint firstItem="DWM-hY-5Md" firstAttribute="top" secondItem="R9E-DY-fL9" secondAttribute="top" id="TCt-Uw-yGu"/>
-                                            <constraint firstAttribute="trailing" secondItem="gf6-jR-u7F" secondAttribute="trailing" id="ZW5-df-BFn"/>
-                                            <constraint firstAttribute="bottom" secondItem="gf6-jR-u7F" secondAttribute="bottom" id="gzI-gy-t5A"/>
-                                            <constraint firstItem="gf6-jR-u7F" firstAttribute="top" secondItem="DWM-hY-5Md" secondAttribute="bottom" id="m7C-qr-L5D"/>
-                                            <constraint firstAttribute="trailing" secondItem="DWM-hY-5Md" secondAttribute="trailing" id="tQk-dp-4wA"/>
+                                            <constraint firstItem="A9i-5N-FES" firstAttribute="width" secondItem="R9E-DY-fL9" secondAttribute="width" multiplier="0.6" id="0re-jy-hU1"/>
+                                            <constraint firstItem="14r-a3-mez" firstAttribute="leading" secondItem="R9E-DY-fL9" secondAttribute="leading" id="1a1-He-gAi"/>
+                                            <constraint firstItem="A9i-5N-FES" firstAttribute="centerY" secondItem="R9E-DY-fL9" secondAttribute="centerY" multiplier="0.8" id="285-4B-q1a"/>
+                                            <constraint firstItem="14r-a3-mez" firstAttribute="height" secondItem="R9E-DY-fL9" secondAttribute="height" multiplier="0.25" id="2DL-0r-vVx"/>
+                                            <constraint firstAttribute="trailing" secondItem="DWM-hY-5Md" secondAttribute="trailing" id="7rs-iX-SIS"/>
+                                            <constraint firstAttribute="bottom" secondItem="DWM-hY-5Md" secondAttribute="bottom" id="8T0-Rc-dHe"/>
+                                            <constraint firstItem="DWM-hY-5Md" firstAttribute="leading" secondItem="R9E-DY-fL9" secondAttribute="leading" id="LzS-q6-cVQ"/>
+                                            <constraint firstAttribute="trailing" secondItem="14r-a3-mez" secondAttribute="trailing" id="SYX-5h-KDK"/>
+                                            <constraint firstAttribute="bottom" secondItem="14r-a3-mez" secondAttribute="bottom" id="Zm7-i4-q3a"/>
+                                            <constraint firstItem="DWM-hY-5Md" firstAttribute="top" secondItem="R9E-DY-fL9" secondAttribute="top" id="dZG-pG-BJc"/>
+                                            <constraint firstItem="A9i-5N-FES" firstAttribute="height" secondItem="R9E-DY-fL9" secondAttribute="height" multiplier="0.6" id="lvH-dm-TU9"/>
+                                            <constraint firstItem="A9i-5N-FES" firstAttribute="centerX" secondItem="R9E-DY-fL9" secondAttribute="centerX" id="uQF-kG-Qjg"/>
                                         </constraints>
                                         <size key="customSize" width="300" height="200"/>
+                                        <userDefinedRuntimeAttributes>
+                                            <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
+                                                <real key="value" value="10"/>
+                                            </userDefinedRuntimeAttribute>
+                                        </userDefinedRuntimeAttributes>
                                         <connections>
+                                            <outlet property="iconImageView" destination="A9i-5N-FES" id="Hdw-ja-ZYk"/>
                                             <outlet property="studyItemImageView" destination="DWM-hY-5Md" id="CNj-rT-nj1"/>
-                                            <outlet property="studyItemTitleLabel" destination="gf6-jR-u7F" id="IgF-6x-Sxk"/>
+                                            <outlet property="studyItemTitleLabel" destination="62c-e9-iAJ" id="0D6-wv-hNE"/>
+                                            <outlet property="titleBackgroundView" destination="14r-a3-mez" id="pQz-gc-vzq"/>
                                         </connections>
                                     </collectionViewCell>
                                 </cells>
@@ -1804,13 +1907,21 @@
                                     <outlet property="delegate" destination="BL6-is-g3u" id="hGb-Eg-3Vp"/>
                                 </connections>
                             </collectionView>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="——  在线学习  ——" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="e5Y-fg-fxm">
+                                <rect key="frame" x="436" y="64" width="153.5" height="21"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <nil key="textColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
                         </subviews>
                         <color key="backgroundColor" red="0.92941176470588238" green="0.93333333333333335" blue="0.93725490196078431" alpha="1" colorSpace="calibratedRGB"/>
                         <constraints>
-                            <constraint firstItem="Hbj-9Y-heh" firstAttribute="top" secondItem="WmM-51-4U7" secondAttribute="bottom" constant="44" id="Toa-e3-OY2"/>
-                            <constraint firstAttribute="trailing" secondItem="Hbj-9Y-heh" secondAttribute="trailing" id="dtG-jO-YTR"/>
-                            <constraint firstItem="Hbj-9Y-heh" firstAttribute="leading" secondItem="iZG-0h-Izx" secondAttribute="leading" id="t8c-Ho-KaX"/>
-                            <constraint firstItem="56O-Us-h9l" firstAttribute="top" secondItem="Hbj-9Y-heh" secondAttribute="bottom" id="vTz-xb-8WK"/>
+                            <constraint firstItem="e5Y-fg-fxm" firstAttribute="centerX" secondItem="iZG-0h-Izx" secondAttribute="centerX" id="BSl-CU-iP5"/>
+                            <constraint firstItem="e5Y-fg-fxm" firstAttribute="top" secondItem="WmM-51-4U7" secondAttribute="bottom" constant="44" id="CsN-qW-00T"/>
+                            <constraint firstItem="Hbj-9Y-heh" firstAttribute="leading" secondItem="iZG-0h-Izx" secondAttribute="leading" id="JN7-WD-17W"/>
+                            <constraint firstItem="Hbj-9Y-heh" firstAttribute="top" secondItem="e5Y-fg-fxm" secondAttribute="bottom" constant="10" id="TTv-Sa-t8d"/>
+                            <constraint firstItem="56O-Us-h9l" firstAttribute="top" secondItem="Hbj-9Y-heh" secondAttribute="bottom" id="V3r-ZV-9Lw"/>
+                            <constraint firstAttribute="trailing" secondItem="Hbj-9Y-heh" secondAttribute="trailing" id="Y4f-Lp-ghh"/>
                         </constraints>
                     </view>
                     <connections>
@@ -2001,7 +2112,7 @@
                                         <rect key="frame" x="0.0" y="28" width="1024" height="100"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Qnm-0r-wEL" id="VAA-bT-OlF">
-                                            <rect key="frame" x="0.0" y="0.0" width="1024" height="99"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="1024" height="99.5"/>
                                             <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="agZ-rF-DnB">
@@ -2033,7 +2144,7 @@
                                         <rect key="frame" x="0.0" y="128" width="1024" height="130"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="WzB-nZ-wsW" id="Zzv-Yi-ZxT">
-                                            <rect key="frame" x="0.0" y="0.0" width="1024" height="129"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="1024" height="129.5"/>
                                             <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="kxK-dX-OAf">
@@ -2061,7 +2172,7 @@
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="749" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="85S-CZ-3Vl">
-                                                    <rect key="frame" x="90" y="86" width="914" height="32"/>
+                                                    <rect key="frame" x="90" y="86" width="914" height="31.5"/>
                                                     <string key="text">用ipad或者iphone下载，再用app专业阅读器放映出来。首先，基本不卡了；其次，送50M免费邮箱存放ppt等文件；第三，增加了激光笔，用ipad或者iphone下载，再用app专业阅读器放映出来。首先，基本不卡了；其次，送50M免费邮箱存放ppt等文件；第三，增加了激光笔，</string>
                                                     <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                                     <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
@@ -2090,7 +2201,7 @@
                                         <rect key="frame" x="0.0" y="258" width="1024" height="100"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="oia-jO-L9n" id="AMF-ag-ZWN">
-                                            <rect key="frame" x="0.0" y="0.0" width="1024" height="99"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="1024" height="99.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" text="针对人员" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="NfI-IM-h1i">
@@ -2563,7 +2674,7 @@
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 <prototypes>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="AssessmentHeaderView" rowHeight="60" id="2M5-To-MLj" customClass="AssessmentHeaderView">
-                                        <rect key="frame" x="0.0" y="56" width="1024" height="60"/>
+                                        <rect key="frame" x="0.0" y="55.5" width="1024" height="60"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="2M5-To-MLj" id="ypf-GL-4CP">
                                             <rect key="frame" x="0.0" y="0.0" width="1024" height="60"/>
@@ -2589,7 +2700,7 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="AssessmentTableViewCell" rowHeight="50" id="BjI-a1-CRm" customClass="AssessmentTableViewCell">
-                                        <rect key="frame" x="0.0" y="116" width="1024" height="50"/>
+                                        <rect key="frame" x="0.0" y="115.5" width="1024" height="50"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="BjI-a1-CRm" id="bq8-ly-DcD">
                                             <rect key="frame" x="0.0" y="0.0" width="1024" height="50"/>
@@ -2940,7 +3051,7 @@
                                         <rect key="frame" x="0.0" y="228" width="1024" height="84"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="sX2-jy-tQ2" id="iVT-bi-RKr">
-                                            <rect key="frame" x="0.0" y="0.0" width="1024" height="83"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="1024" height="83.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="crown" translatesAutoresizingMaskIntoConstraints="NO" id="pyu-Y7-w8M">
@@ -3186,8 +3297,8 @@
         </scene>
     </scenes>
     <resources>
-        <image name="00启动页" width="1500" height="1125"/>
         <image name="00登录-谭" width="1024" height="768"/>
+        <image name="6" width="141" height="141"/>
         <image name="Imagebackground" width="65" height="65"/>
         <image name="Recruitbackground" width="2048" height="1402"/>
         <image name="Recruitbackground_title" width="1762" height="939"/>
@@ -3227,6 +3338,7 @@
         <image name="stop" width="24" height="30"/>
         <image name="success" width="52" height="20"/>
         <image name="year_integra" width="27" height="27"/>
+        <image name="矩形-1-拷贝-9" width="626" height="269"/>
         <image name="通过" width="35" height="17"/>
         <image name="闯关说明" width="306" height="90"/>
     </resources>

Lighting/Supporting Files/Images.xcassets/6.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "6.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file

Lighting/Supporting Files/Images.xcassets/manager.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "manager.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "manager@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "manager@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file

Lighting/Supporting Files/Images.xcassets/user.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "user.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "user@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "user@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file

Lighting/Supporting Files/Images.xcassets/矩形-1-拷贝-9.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "矩形-1-拷贝-9.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file

Tools/CYConst/CYConstManager.h

@@ -844,4 +844,3 @@ extern NSString *const REFRESH_FROUMLIST;
 
 
 
-

Tools/Jastor/opple_objc_json_client.h

@@ -790,10 +790,16 @@ extern NSString * const GRADEMETHOD_MANUL;
 @interface ForumTypeResponse : JSONModel
 /**
  * (no documentation provided)
- * @see TOForumtypeEntity
+ * @see TOForumCategoryEntity
+ *
+ */
+@property (nonatomic, strong) NSArray<TOForumCategoryEntity> *list;
+/**
+ * (no documentation provided)
+ *
  *
  */
-@property (nonatomic, strong) NSArray<TOForumtypeEntity> *list;
+@property (nonatomic, strong) TOForumtypeEntity *forumType;
 @end /* interface ForumTypeResponse */
 
 
@@ -1841,6 +1847,7 @@ extern NSString * const GRADEMETHOD_MANUL;
  *
  */
 @property (nonatomic, copy) NSString *thumbnailUrl;
+
 /**
  * 实体类型
  *
@@ -2012,6 +2019,8 @@ extern NSString * const GRADEMETHOD_MANUL;
  *
  */
 @property (nonatomic, strong) TOAttachmentEntity *attachment;
+@property (nonatomic, strong) TOAttachmentEntity *attachmentBg;
+
 @end /* interface TOForumCategoryEntity */
 
 
@@ -3725,6 +3734,8 @@ extern NSString * const GRADEMETHOD_MANUL;
  *
  */
 @property (nonatomic, strong) TOAttachmentEntity *attachment;
+@property (nonatomic, strong) TOAttachmentEntity *attachmentBg;
+
 @end /* interface TOStudyTypeEntity */
 
 

Tools/parentclass/BaseViewController.m

@@ -689,6 +689,8 @@
 }
 
 
+
+
 - (void)dealloc
 {
     NSLog(@"释放%@控制器",self);