占位图

smartRhino/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -33,19 +33,19 @@
     {
       "size" : "40x40",
       "idiom" : "iphone",
-      "filename" : "logo_120-1.png",
+      "filename" : "logo_60@2x.png",
       "scale" : "3x"
     },
     {
       "size" : "60x60",
       "idiom" : "iphone",
-      "filename" : "logo_120.png",
+      "filename" : "logo_60@2x-1.png",
       "scale" : "2x"
     },
     {
       "size" : "60x60",
       "idiom" : "iphone",
-      "filename" : "logo_180.png",
+      "filename" : "logo_60@3x.png",
       "scale" : "3x"
     },
     {

smartRhino/Assets.xcassets/img_placeHolder.imageset/Contents.json

@@ -2,16 +2,15 @@
   "images" : [
     {
       "idiom" : "universal",
+      "filename" : "img_placeHolder.png",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "img_placeHolder@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "img_placeHolder@3x.png",
       "scale" : "3x"
     }
   ],

smartRhino/FwzAppConfig.h

@@ -387,6 +387,7 @@ typedef enum BookChanelType{
     BookChanelTool = 1,   ///工具书
     BookChanelPublic = 2, ///公众号
     BookChanelPeriodica = 3,///期刊
+    BookChanelSpecialty = 4,///专业图书
 }BookChanelType;
 
 #define NOTIFI_ChaoSongRen @"NOTIFI_ChaoSongRen"

smartRhino/Project/Base/SubClass/NavigationBar/TDNavigationBar.m

@@ -152,7 +152,7 @@
 - (UILabel *)titleLabel {
     if (!_titleLabel) {
         _titleLabel = [[UILabel alloc] init];
-        _titleLabel.font = [UIFont systemFontOfSize:17.f];
+        _titleLabel.font = [UIFont systemFontOfSize:16.f];
         _titleLabel.textColor = UIColorHex(#333333);
         _titleLabel.textAlignment = NSTextAlignmentCenter;
     }

smartRhino/Project/Base/SubClass/SearchBar/TDSearchBar.m

@@ -16,7 +16,7 @@
     if (self) {
         self.backgroundImage = [UIImage new];
         self.placeholder = @" 搜索";
-        self.layer.cornerRadius = 15.f;
+        self.layer.cornerRadius = 18.f;
         self.layer.borderWidth = 0.5;
         self.layer.borderColor = [UIColor hexStringToColor:@"d8d8d8"].CGColor;
         UIImage *searchIcon = [UIImage imageNamed:@"sousuo"];

smartRhino/Project/Base/SubClass/SearchView/InfoSearchView.m

@@ -25,7 +25,7 @@
     if (self) {
         self.backButton.frame = CGRectMake(0, 0, 50,44);
         self.menuButton.frame = CGRectMake(50, 0, 35,44);
-        self.searchBar.frame = CGRectMake(90, 7, kGXScreenWidth - 105, 30);
+        self.searchBar.frame = CGRectMake(90, 4, kGXScreenWidth - 105, 36);
         self.menuButton.contentHorizontalAlignment = UIControlContentHorizontalAlignmentLeft;
         [self addSubview:self.backButton];
         [self addSubview:self.menuButton];
@@ -141,6 +141,7 @@
 - (UIView *)lineView {
     if (!_lineView) {
         _lineView = [UIView new];
+        _lineView.hidden = YES;
         _lineView.backgroundColor = UIColorHex(CCCCCC);
     }
     return _lineView;

smartRhino/Project/Base/SubClass/SearchView/SurfaceSearchView.m

@@ -147,7 +147,7 @@
     if (!_bookBtn) {
         _bookBtn = [UIButton new];
         _bookBtn.frame = CGRectMake(kGXScreenWidth - 16 - 49, 7, 49, 38);
-        [_bookBtn setAttributedTitle:[[NSAttributedString alloc] initWithString:@"书城" attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:13],NSForegroundColorAttributeName:UIColorHex(0x222222)}] forState:UIControlStateNormal];
+        [_bookBtn setAttributedTitle:[[NSAttributedString alloc] initWithString:@"书城" attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:14],NSForegroundColorAttributeName:UIColorHex(0x222222)}] forState:UIControlStateNormal];
         [_bookBtn addTarget:self action:@selector(bookButtonAction:) forControlEvents:UIControlEventTouchUpInside];
     }
     return _bookBtn;

smartRhino/Project/My/Setting/Controller/SettingViewController.m

@@ -74,7 +74,7 @@
 }
 
 - (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section {
-    return 10;
+    return 5;
 }
 
 - (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section {
@@ -83,13 +83,13 @@
 
 - (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section {
     UIView *view = [UIView new];
-    view.backgroundColor = kBackgroundColor;
+    view.backgroundColor = UIColorHex(0xF5F5F5);
     return view;
 }
 
 - (UIView *)tableView:(UITableView *)tableView viewForFooterInSection:(NSInteger)section {
     UIView *view = [UIView new];
-    view.backgroundColor = kBackgroundColor;
+    view.backgroundColor = UIColorHex(0xF5F5F5);
     return view;
 }
 

smartRhino/Project/Other/Category/UIViewController+NavBar.m

@@ -241,7 +241,7 @@
         [bar setBackgroundImage:image forBarMetrics:UIBarMetricsDefault];
         
         //设置NavBar文字样式
-        [bar setTitleTextAttributes:@{NSFontAttributeName: [UIFont boldSystemFontOfSize:18],
+        [bar setTitleTextAttributes:@{NSFontAttributeName: [UIFont boldSystemFontOfSize:16],
                                       NSForegroundColorAttributeName: color,
                                       NSStrokeWidthAttributeName: [NSValue valueWithCGSize:CGSizeMake(0.0, 0.0)],
                                       NSStrokeColorAttributeName: color}];

smartRhino/Project/VCModel/ChatMessage/ChatMsg.storyboard

@@ -73,8 +73,8 @@
                                                 <state key="normal" image="chatmsg_right_add_icon"/>
                                             </button>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="私信" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Jog-Lg-Zi7">
-                                                <rect key="frame" x="188.66666666666666" y="11.666666666666668" width="37" height="21.000000000000004"/>
-                                                <fontDescription key="fontDescription" type="system" pointSize="18"/>
+                                                <rect key="frame" x="190.66666666666666" y="12.333333333333334" width="32.666666666666657" height="19.333333333333329"/>
+                                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                 <color key="textColor" red="0.039215686274509803" green="0.039215686274509803" blue="0.039215686274509803" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
@@ -196,8 +196,8 @@
                                                 </connections>
                                             </button>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="新建群聊" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xyJ-Xf-CYK">
-                                                <rect key="frame" x="170.33333333333334" y="11.666666666666668" width="73.666666666666657" height="21.000000000000004"/>
-                                                <fontDescription key="fontDescription" type="system" pointSize="18"/>
+                                                <rect key="frame" x="174.33333333333334" y="12.333333333333334" width="65.333333333333343" height="19.333333333333329"/>
+                                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                 <color key="textColor" red="0.039215686274509803" green="0.039215686274509803" blue="0.039215686274509803" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
@@ -693,11 +693,11 @@
                                                 </connections>
                                             </button>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="信源" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5UH-7c-Gi9">
-                                                <rect key="frame" x="188.66666666666666" y="11.666666666666668" width="37" height="21.000000000000004"/>
+                                                <rect key="frame" x="190.66666666666666" y="12.333333333333334" width="32.666666666666657" height="19.333333333333329"/>
                                                 <constraints>
                                                     <constraint firstAttribute="width" relation="lessThanOrEqual" constant="150" id="aD7-18-j6n"/>
                                                 </constraints>
-                                                <fontDescription key="fontDescription" type="system" pointSize="18"/>
+                                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                 <color key="textColor" red="0.039215686270000001" green="0.039215686270000001" blue="0.039215686270000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
@@ -769,11 +769,11 @@
                                                 </connections>
                                             </button>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="移动到" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Uci-24-K3R">
-                                                <rect key="frame" x="179.33333333333334" y="11.666666666666668" width="55.333333333333343" height="21.000000000000004"/>
+                                                <rect key="frame" x="182.66666666666666" y="12.333333333333334" width="49" height="19.333333333333329"/>
                                                 <constraints>
                                                     <constraint firstAttribute="width" relation="lessThanOrEqual" constant="150" id="jjR-Qh-fQX"/>
                                                 </constraints>
-                                                <fontDescription key="fontDescription" type="system" pointSize="18"/>
+                                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                 <color key="textColor" red="0.039215686270000001" green="0.039215686270000001" blue="0.039215686270000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
@@ -885,8 +885,8 @@
                                                 </connections>
                                             </button>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="群聊二维码" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YOD-4L-Gir">
-                                                <rect key="frame" x="161" y="11.666666666666668" width="92" height="21.000000000000004"/>
-                                                <fontDescription key="fontDescription" type="system" pointSize="18"/>
+                                                <rect key="frame" x="166.33333333333334" y="12.333333333333334" width="81.666666666666657" height="19.333333333333329"/>
+                                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                 <color key="textColor" red="0.039215686270000001" green="0.039215686270000001" blue="0.039215686270000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>

smartRhino/Project/VCModel/ChatMessage/Controller/ChatMsgNotice/ChatMsgNotice.storyboard

@@ -432,6 +432,13 @@
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="xFc-TM-bNO">
+                                <rect key="frame" x="0.0" y="64" width="375" height="46"/>
+                                <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="46" id="dzT-nW-79X"/>
+                                </constraints>
+                            </view>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="gOF-Up-7dr" customClass="WQNavigationBar">
                                 <rect key="frame" x="0.0" y="0.0" width="375" height="64"/>
                                 <subviews>
@@ -492,7 +499,7 @@
                                 </connections>
                             </view>
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="50m-7H-XbB">
-                                <rect key="frame" x="0.0" y="64" width="375" height="603"/>
+                                <rect key="frame" x="0.0" y="110" width="375" height="557"/>
                                 <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
                                 <connections>
                                     <outlet property="dataSource" destination="RQB-jI-Tpd" id="EqD-az-F1u"/>
@@ -502,18 +509,22 @@
                         </subviews>
                         <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
                         <constraints>
+                            <constraint firstItem="xFc-TM-bNO" firstAttribute="leading" secondItem="Qxq-is-031" secondAttribute="leading" id="3Tw-wb-Kuo"/>
                             <constraint firstItem="gOF-Up-7dr" firstAttribute="top" secondItem="4th-1q-k4I" secondAttribute="top" id="OpO-wN-efg"/>
                             <constraint firstAttribute="bottom" secondItem="50m-7H-XbB" secondAttribute="bottom" id="SI8-CF-Ovd"/>
+                            <constraint firstItem="50m-7H-XbB" firstAttribute="top" secondItem="xFc-TM-bNO" secondAttribute="bottom" id="Yhj-m8-5zp"/>
                             <constraint firstItem="50m-7H-XbB" firstAttribute="leading" secondItem="Qxq-is-031" secondAttribute="leading" id="fYH-jl-5zt"/>
-                            <constraint firstItem="50m-7H-XbB" firstAttribute="top" secondItem="gOF-Up-7dr" secondAttribute="bottom" id="gd9-nr-aqs"/>
                             <constraint firstItem="Qxq-is-031" firstAttribute="trailing" secondItem="50m-7H-XbB" secondAttribute="trailing" id="lf5-0p-10j"/>
+                            <constraint firstItem="xFc-TM-bNO" firstAttribute="top" secondItem="gOF-Up-7dr" secondAttribute="bottom" id="lxT-Sr-WJu"/>
                             <constraint firstItem="gOF-Up-7dr" firstAttribute="trailing" secondItem="Qxq-is-031" secondAttribute="trailing" id="oeQ-TI-Ld1"/>
                             <constraint firstItem="gOF-Up-7dr" firstAttribute="leading" secondItem="Qxq-is-031" secondAttribute="leading" id="q6j-bJ-5ZB"/>
+                            <constraint firstItem="xFc-TM-bNO" firstAttribute="trailing" secondItem="Qxq-is-031" secondAttribute="trailing" id="tBt-SO-03F"/>
                         </constraints>
                         <viewLayoutGuide key="safeArea" id="Qxq-is-031"/>
                     </view>
                     <navigationItem key="navigationItem" id="C5f-2e-EUB"/>
                     <connections>
+                        <outlet property="HeadView" destination="xFc-TM-bNO" id="Tei-nR-42j"/>
                         <outlet property="operationBackButton" destination="F8k-Ea-GYp" id="aK4-7D-OIr"/>
                         <outlet property="rightAddBtn" destination="JlX-i1-EKc" id="7lr-99-z2w"/>
                         <outlet property="tableView" destination="50m-7H-XbB" id="e05-em-T6d"/>
@@ -522,7 +533,7 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="Osy-d6-hC2" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="-532" y="2246"/>
+            <point key="canvasLocation" x="-532" y="2245.7271364317844"/>
         </scene>
         <!--Chat TestingVC-->
         <scene sceneID="nE1-vd-NdS">

smartRhino/Project/VCModel/ChatMessage/Controller/ChatMsgNotice/Controller/MoveViewController.m

@@ -11,6 +11,7 @@
 #import "MoveSearchVC.h"
 #import "MyFavoriteNewFindVC.h"
 #import "ShowNewGroupAlert.h"
+#import "MyTDGroupView.h"
 
 @interface MoveViewController ()<UITableViewDelegate,UITableViewDataSource>
 {
@@ -18,12 +19,13 @@
 }
 
 @property (weak, nonatomic) IBOutlet UITableView *tableView;
+@property (weak, nonatomic) IBOutlet UIView *HeadView;
 
 @property (weak, nonatomic) IBOutlet UILabel *titleL;
 
 @property (weak, nonatomic) IBOutlet UIButton *rightAddBtn;
 @property (strong, nonatomic) NSMutableArray *taskActionArray;
-
+@property (strong, nonatomic) MyTDGroupView      *SearchView;
 
 @property (assign, nonatomic) PageTypeFromTitleBtn pageType;
 
@@ -53,12 +55,32 @@
     MoveViewController *controller = [StoryboardManager.shared.chatMsgNotice instantiateViewControllerWithIdentifier:@"MoveViewController"];
     return controller;
 }
+- (MyTDGroupView *)SearchView
+{
+    if (!_SearchView) {
+        _SearchView = [[MyTDGroupView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, 36)];
+    }
+    return _SearchView;
+}
 - (void)viewDidLoad {
     [super viewDidLoad];
-    _placeholderCellCount = 2;
+    _placeholderCellCount = 1;
     self.fd_prefersNavigationBarHidden = YES;
-    self.titleL.text = self.titleStr;
+    [self.HeadView addSubview:self.SearchView];
+    [self.SearchView  mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.top.mas_offset(6);
+        make.left.right.mas_equalTo(self.HeadView);
+        make.height.mas_offset(36);
+    }];
     WS(weakSelf);
+    [self.SearchView.button setAction:^{
+        MoveSearchVC *vc = [[MoveSearchVC alloc] init];
+        vc.TypeId = weakSelf.TypeId;
+        vc.ParentId = 0;
+        vc.FolderIds = weakSelf.FolderIds;
+        [weakSelf.navigationController pushViewController:vc animated:YES];
+    }];
+    self.titleL.text = self.titleStr;
     [self.rightAddBtn setAction:^{
         if (weakSelf.TypeId == CreateNoticeType || weakSelf.TypeId == CreateGroupType || weakSelf.TypeId == CreateCommonType || weakSelf.TypeId == CreateTopicType) {
             [[ShowNewGroupAlert initShowNewGroupAlertWithTitle:@"建文件夹" placeholder:@"请输入文件夹名称" confirm:^(NSString * _Nonnull groupName) {
@@ -127,79 +149,66 @@
 }
 
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath{
-    if (indexPath.row == 0) {
-        ChatMsgNoticeCell *cell = [ChatMsgNoticeCell configCell0:tableView indexPath:indexPath];
+    if (indexPath.row == 0){
+        ChatMsgNoticeCell *cell = [ChatMsgNoticeCell configCell30:tableView indexPath:indexPath];
+        return cell;
+    }
+    ChatMsgNoticeCell *cell = [ChatMsgNoticeCell configCell40:tableView indexPath:indexPath];
+    cell.cell1TitleLabel.text = self.noticeArray[indexPath.row - _placeholderCellCount].Name;
+    if (self.noticeArray[indexPath.row - _placeholderCellCount].IsFolder == 1){
+        cell.cell1TimeLabel.hidden = YES;
+        cell.enterBtn.hidden = NO;
+        cell.rightImageView.hidden = NO;
         WS(weakSelf);
-        [cell.cell0SearchBtn setAction:^{
-            MoveSearchVC *vc = [[MoveSearchVC alloc] init];
+        [cell.enterBtn setAction:^{
+            MoveViewController *vc = [MoveViewController initMoveViewController];
+            vc.ParentId = weakSelf.noticeArray[indexPath.row - self->_placeholderCellCount].Id;
             vc.TypeId = weakSelf.TypeId;
-            vc.ParentId = 0;
+            vc.collectType = weakSelf.collectType;
+            vc.CollectionDataId = weakSelf.CollectionDataId;
+            vc.CollectionType = weakSelf.CollectionType;
+            vc.titleStr = weakSelf.noticeArray[indexPath.row - self->_placeholderCellCount].Name;
             vc.FolderIds = weakSelf.FolderIds;
+            vc.isFromCreateBookVc  = weakSelf.isFromCreateBookVc;
+            vc.sendModel = weakSelf.sendModel;
+            vc.isReturn = weakSelf.isReturn;
             [weakSelf.navigationController pushViewController:vc animated:YES];
         }];
-        return cell;
-    }else {
-        if (indexPath.row == 1){
-            ChatMsgNoticeCell *cell = [ChatMsgNoticeCell configCell30:tableView indexPath:indexPath];
-            return cell;
-        }
-        ChatMsgNoticeCell *cell = [ChatMsgNoticeCell configCell40:tableView indexPath:indexPath];
-        cell.cell1TitleLabel.text = self.noticeArray[indexPath.row - _placeholderCellCount].Name;
-        if (self.noticeArray[indexPath.row - _placeholderCellCount].IsFolder == 1){
-            cell.cell1TimeLabel.hidden = YES;
-            cell.enterBtn.hidden = NO;
-            cell.rightImageView.hidden = NO;
-            WS(weakSelf);
-            [cell.enterBtn setAction:^{
-                MoveViewController *vc = [MoveViewController initMoveViewController];
-                vc.ParentId = weakSelf.noticeArray[indexPath.row - self->_placeholderCellCount].Id;
-                vc.TypeId = weakSelf.TypeId;
-                vc.collectType = weakSelf.collectType;
-                vc.CollectionDataId = weakSelf.CollectionDataId;
-                vc.CollectionType = weakSelf.CollectionType;
-                vc.titleStr = weakSelf.noticeArray[indexPath.row - self->_placeholderCellCount].Name;
-                vc.FolderIds = weakSelf.FolderIds;
-                vc.isFromCreateBookVc  = weakSelf.isFromCreateBookVc;
-                vc.sendModel = weakSelf.sendModel;
-                vc.isReturn = weakSelf.isReturn;
-                [weakSelf.navigationController pushViewController:vc animated:YES];
-            }];
-        }else{
-            [cell.rightImageView setHidden:YES];
-            cell.cell1TimeLabel.hidden = YES;
-            cell.enterBtn.hidden = YES;
-        }
-        if (self.TypeId == CreateNoticeType || self.TypeId == CreateGroupType || self.TypeId == CreateCommonType || self.TypeId == CreateTopicType) {
-            cell.powerLbl.hidden = YES;
-        }else{
-            NSInteger status = self.noticeArray[indexPath.row - _placeholderCellCount].RoleId;
-            switch (status) {
-                case 1:
-                    cell.cell1IconImgView.image = IMG(@"find_1");
-                    cell.powerLbl.text = @"公开";
-                    break;
-                case 2:
-                    cell.cell1IconImgView.image = IMG(@"find_0");
-                    cell.powerLbl.text = @"私有";
-                    break;
-                default:
-                    cell.cell1IconImgView.image = IMG(@"find_1");
-                    cell.powerLbl.text = [NSString stringWithFormat:@"共享给:%@",self.noticeArray[indexPath.row - _placeholderCellCount].EnjoyUser];
-                    break;
-            }
-        }
-
-        if (self.noticeArray[indexPath.row - _placeholderCellCount].IsDisable) {
-            cell.cellBlackVIew.hidden = NO;
-        }else{
-            cell.cellBlackVIew.hidden = YES;
+    }else{
+        [cell.rightImageView setHidden:YES];
+        cell.cell1TimeLabel.hidden = YES;
+        cell.enterBtn.hidden = YES;
+    }
+    if (self.TypeId == CreateNoticeType || self.TypeId == CreateGroupType || self.TypeId == CreateCommonType || self.TypeId == CreateTopicType) {
+        cell.powerLbl.hidden = YES;
+    }else{
+        NSInteger status = self.noticeArray[indexPath.row - _placeholderCellCount].RoleId;
+        switch (status) {
+            case 1:
+                cell.cell1IconImgView.image = IMG(@"find_1");
+                cell.powerLbl.text = @"公开";
+                break;
+            case 2:
+                cell.cell1IconImgView.image = IMG(@"find_0");
+                cell.powerLbl.text = @"私有";
+                break;
+            default:
+                cell.cell1IconImgView.image = IMG(@"find_1");
+                cell.powerLbl.text = [NSString stringWithFormat:@"共享给:%@",self.noticeArray[indexPath.row - _placeholderCellCount].EnjoyUser];
+                break;
         }
-        return cell;
     }
+    
+    if (self.noticeArray[indexPath.row - _placeholderCellCount].IsDisable) {
+        cell.cellBlackVIew.hidden = NO;
+    }else{
+        cell.cellBlackVIew.hidden = YES;
+    }
+    return cell;
 }
 
 - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath{
-    if (indexPath.row == 0 || indexPath.row == 1) {
+    if (indexPath.row == 0) {
         return [ChatMsgNoticeCell configCell0Height];
     }else{
         return [ChatMsgNoticeCell configCell1Height];
@@ -209,9 +218,6 @@
     // 从创建笔记push过来
     if (self.isFromCreateBookVc) {
         if (indexPath.row == 0) {
-            return;
-        }
-        else if (indexPath.row == 1) {
             NoticeFindModel *tmpModel = [[NoticeFindModel alloc]init];
             tmpModel.Name = @"根目录";
             tmpModel.Id = self.ParentId;
@@ -222,34 +228,32 @@
         }
     }
     else {
-        if (indexPath.row == 0) {
-                return;
-            }else if(indexPath.row == 1){
-                NoticeFindModel * model = [[NoticeFindModel alloc] init];
-                model.Id = self.ParentId;
+        if(indexPath.row == 1){
+            NoticeFindModel * model = [[NoticeFindModel alloc] init];
+            model.Id = self.ParentId;
+            switch (self.collectType) {
+                case CollectHanderType_Collect:
+                    [self collectToFindWithSuperModel:model];
+                    break;
+                default:
+                {
+                    [self moveFind:self.FolderIds withSuperModel:model];
+                }break;
+            }
+        }else {
+            if (self.noticeArray[indexPath.row - 2].IsDisable) {
+                
+            }else{
                 switch (self.collectType) {
                     case CollectHanderType_Collect:
-                        [self collectToFindWithSuperModel:model];
+                        [self collectToFindWithSuperModel:self.noticeArray[indexPath.row - 2]];
                         break;
                     default:
-                    {
-                        [self moveFind:self.FolderIds withSuperModel:model];
-                    }break;
-                }
-            }else {
-                if (self.noticeArray[indexPath.row - 2].IsDisable) {
-                    
-                }else{
-                    switch (self.collectType) {
-                        case CollectHanderType_Collect:
-                            [self collectToFindWithSuperModel:self.noticeArray[indexPath.row - 2]];
-                            break;
-                        default:
-                            [self moveFind:self.FolderIds withSuperModel:self.noticeArray[indexPath.row - 2]];
-                            break;
-                    }
+                        [self moveFind:self.FolderIds withSuperModel:self.noticeArray[indexPath.row - 2]];
+                        break;
                 }
             }
+        }
     }
 }
 

smartRhino/Project/VCModel/ChatMessage/Controller/MailList/Controller/MailListByZuVC.m

@@ -161,7 +161,7 @@
                 break;
         }
         self.iSViewEditor = NO;
-        self.HeadHight.constant = 46.f;
+        self.HeadHight.constant = 54.f;
 
         //默认操作状态为无状态
         self.operationStateEnum = OperationStateEnum0;

smartRhino/Project/VCModel/ChatMessage/Controller/MailList/MailList.storyboard

@@ -67,8 +67,8 @@
                                                 <state key="normal" image="chatmsg_right_add_icon"/>
                                             </button>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="通讯录" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cY5-AX-PcZ">
-                                                <rect key="frame" x="103.66666666666669" y="11.666666666666668" width="207" height="21.000000000000004"/>
-                                                <fontDescription key="fontDescription" type="system" pointSize="18"/>
+                                                <rect key="frame" x="103.66666666666669" y="12.333333333333334" width="207" height="19.333333333333329"/>
+                                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                 <color key="textColor" red="0.039215686270000001" green="0.039215686270000001" blue="0.039215686270000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
@@ -111,14 +111,14 @@
                                 </connections>
                             </view>
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="HCu-mz-62m">
-                                <rect key="frame" x="0.0" y="110" width="414" height="626"/>
+                                <rect key="frame" x="0.0" y="118" width="414" height="618"/>
                                 <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
                             </tableView>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="O39-GM-fgg">
-                                <rect key="frame" x="0.0" y="64" width="414" height="46"/>
+                                <rect key="frame" x="0.0" y="64" width="414" height="54"/>
                                 <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
                                 <constraints>
-                                    <constraint firstAttribute="height" constant="46" id="h7w-8G-5wP"/>
+                                    <constraint firstAttribute="height" constant="54" id="h7w-8G-5wP"/>
                                 </constraints>
                             </view>
                         </subviews>
@@ -187,8 +187,8 @@
                                                 </connections>
                                             </button>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="通讯录下的列表" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Sc4-LZ-xil">
-                                                <rect key="frame" x="132.33333333333331" y="11.666666666666668" width="149.33333333333331" height="21.000000000000004"/>
-                                                <fontDescription key="fontDescription" type="system" pointSize="18"/>
+                                                <rect key="frame" x="132.33333333333331" y="12.333333333333334" width="149.33333333333331" height="19.333333333333329"/>
+                                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                 <color key="textColor" red="0.039215686270000001" green="0.039215686270000001" blue="0.039215686270000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
@@ -239,14 +239,14 @@
                                 </connections>
                             </view>
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="SdD-zm-gTv">
-                                <rect key="frame" x="0.0" y="110" width="414" height="626"/>
+                                <rect key="frame" x="0.0" y="118" width="414" height="618"/>
                                 <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
                             </tableView>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="MUN-LO-bJ5">
-                                <rect key="frame" x="0.0" y="64" width="414" height="46"/>
+                                <rect key="frame" x="0.0" y="64" width="414" height="54"/>
                                 <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
                                 <constraints>
-                                    <constraint firstAttribute="height" constant="46" id="RJO-bw-sbX"/>
+                                    <constraint firstAttribute="height" constant="54" id="RJO-bw-sbX"/>
                                 </constraints>
                             </view>
                         </subviews>
@@ -350,8 +350,8 @@
                                                 </connections>
                                             </button>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="通讯录下的列表" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="b66-Mm-eI2">
-                                                <rect key="frame" x="132.33333333333331" y="11.666666666666668" width="149.33333333333331" height="21.000000000000004"/>
-                                                <fontDescription key="fontDescription" type="system" pointSize="18"/>
+                                                <rect key="frame" x="132.33333333333331" y="12.333333333333334" width="149.33333333333331" height="19.333333333333329"/>
+                                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                 <color key="textColor" red="0.039215686270000001" green="0.039215686270000001" blue="0.039215686270000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
@@ -589,8 +589,8 @@
                                                 </connections>
                                             </button>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="自建通讯录" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="v6n-ej-FIw">
-                                                <rect key="frame" x="132.33333333333331" y="11.666666666666668" width="149.33333333333331" height="21.000000000000004"/>
-                                                <fontDescription key="fontDescription" type="system" pointSize="18"/>
+                                                <rect key="frame" x="132.33333333333331" y="11.999999999999998" width="149.33333333333331" height="20.333333333333329"/>
+                                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                 <color key="textColor" red="0.039215686270000001" green="0.039215686270000001" blue="0.039215686270000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
@@ -734,8 +734,8 @@
                                                 </connections>
                                             </button>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="选人" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1dP-TK-l1B">
-                                                <rect key="frame" x="103.66666666666669" y="11.666666666666668" width="207" height="21.000000000000004"/>
-                                                <fontDescription key="fontDescription" type="system" pointSize="18"/>
+                                                <rect key="frame" x="103.66666666666669" y="12.333333333333334" width="207" height="19.333333333333329"/>
+                                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                 <color key="textColor" red="0.039215686270000001" green="0.039215686270000001" blue="0.039215686270000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
@@ -840,8 +840,8 @@
                                                 </connections>
                                             </button>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="单位通讯录" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ngk-zC-Wl0">
-                                                <rect key="frame" x="103.66666666666669" y="11.666666666666668" width="207" height="21.000000000000004"/>
-                                                <fontDescription key="fontDescription" type="system" pointSize="18"/>
+                                                <rect key="frame" x="103.66666666666669" y="12.333333333333334" width="207" height="19.333333333333329"/>
+                                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                 <color key="textColor" red="0.039215686270000001" green="0.039215686270000001" blue="0.039215686270000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
@@ -946,8 +946,8 @@
                                                 </connections>
                                             </button>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="自建通讯录" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="VpO-JC-uan">
-                                                <rect key="frame" x="103.66666666666669" y="11.666666666666668" width="207" height="21.000000000000004"/>
-                                                <fontDescription key="fontDescription" type="system" pointSize="18"/>
+                                                <rect key="frame" x="103.66666666666669" y="12.333333333333334" width="207" height="19.333333333333329"/>
+                                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                 <color key="textColor" red="0.039215686270000001" green="0.039215686270000001" blue="0.039215686270000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>

smartRhino/Project/VCModel/ChatMessage/Controller/MyTDGroup/TDGroup.storyboard

@@ -61,8 +61,8 @@
                                                 </connections>
                                             </button>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="新建小组" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zxd-Qr-DzQ">
-                                                <rect key="frame" x="170.33333333333334" y="11.666666666666668" width="73.666666666666657" height="21.000000000000004"/>
-                                                <fontDescription key="fontDescription" type="system" pointSize="18"/>
+                                                <rect key="frame" x="174.33333333333334" y="12.333333333333334" width="65.333333333333343" height="19.333333333333329"/>
+                                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                 <color key="textColor" red="0.039215686270000001" green="0.039215686270000001" blue="0.039215686270000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
@@ -418,8 +418,8 @@
                                                 </connections>
                                             </button>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="小组二维码" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LKC-Nr-k91">
-                                                <rect key="frame" x="161" y="11.666666666666668" width="92" height="21.000000000000004"/>
-                                                <fontDescription key="fontDescription" type="system" pointSize="18"/>
+                                                <rect key="frame" x="166.33333333333334" y="12.333333333333334" width="81.666666666666657" height="19.333333333333329"/>
+                                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                 <color key="textColor" red="0.039215686270000001" green="0.039215686270000001" blue="0.039215686270000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
@@ -650,8 +650,8 @@
                                                 <state key="normal" image="chatmsg_detailchat_more_icon"/>
                                             </button>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="关于移动互联网时代" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="55D-dE-14Z">
-                                                <rect key="frame" x="124.33333333333333" y="11.666666666666668" width="165.33333333333337" height="21.000000000000004"/>
-                                                <fontDescription key="fontDescription" type="system" pointSize="18"/>
+                                                <rect key="frame" x="133.66666666666666" y="12.333333333333334" width="146.99999999999997" height="19.333333333333329"/>
+                                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                 <color key="textColor" red="0.039215686274509803" green="0.039215686274509803" blue="0.039215686274509803" alpha="1" colorSpace="calibratedRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
@@ -808,8 +808,8 @@
                                                 </connections>
                                             </button>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="小组详情" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="KAn-TU-jFe">
-                                                <rect key="frame" x="170.33333333333334" y="11.666666666666668" width="73.666666666666657" height="21.000000000000004"/>
-                                                <fontDescription key="fontDescription" type="system" pointSize="18"/>
+                                                <rect key="frame" x="174.33333333333334" y="12.333333333333334" width="65.333333333333343" height="19.333333333333329"/>
+                                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                 <color key="textColor" red="0.039215686270000001" green="0.039215686270000001" blue="0.039215686270000001" alpha="1" colorSpace="calibratedRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
@@ -950,8 +950,8 @@
                                                 </connections>
                                             </button>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="小组权限" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xGd-G0-OmQ">
-                                                <rect key="frame" x="170.33333333333334" y="11.666666666666668" width="73.666666666666657" height="21.000000000000004"/>
-                                                <fontDescription key="fontDescription" type="system" pointSize="18"/>
+                                                <rect key="frame" x="174.33333333333334" y="12.333333333333334" width="65.333333333333343" height="19.333333333333329"/>
+                                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                 <color key="textColor" red="0.039215686270000001" green="0.039215686270000001" blue="0.039215686270000001" alpha="1" colorSpace="calibratedRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
@@ -1053,8 +1053,8 @@
                                                 </connections>
                                             </button>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="小组标签" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Gu2-iD-52v">
-                                                <rect key="frame" x="170.33333333333334" y="11.666666666666668" width="73.666666666666657" height="21.000000000000004"/>
-                                                <fontDescription key="fontDescription" type="system" pointSize="18"/>
+                                                <rect key="frame" x="174.33333333333334" y="12.333333333333334" width="65.333333333333343" height="19.333333333333329"/>
+                                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                 <color key="textColor" red="0.039215686270000001" green="0.039215686270000001" blue="0.039215686270000001" alpha="1" colorSpace="calibratedRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>

smartRhino/Project/VCModel/ChatMessage/Controller/MyTDGroup/TDGroupInfo.storyboard

@@ -60,8 +60,8 @@
                                                 </connections>
                                             </button>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="修改小组名称" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zxd-Qr-DzQ">
-                                                <rect key="frame" x="152" y="11.666666666666668" width="110.33333333333331" height="21.000000000000004"/>
-                                                <fontDescription key="fontDescription" type="system" pointSize="18"/>
+                                                <rect key="frame" x="158" y="12.333333333333334" width="98" height="19.333333333333329"/>
+                                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                 <color key="textColor" red="0.039215686270000001" green="0.039215686270000001" blue="0.039215686270000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
@@ -504,8 +504,8 @@
                                                 </connections>
                                             </button>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="写话题" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="RO7-vj-h0m">
-                                                <rect key="frame" x="179.33333333333334" y="11.666666666666668" width="55.333333333333343" height="21.000000000000004"/>
-                                                <fontDescription key="fontDescription" type="system" pointSize="18"/>
+                                                <rect key="frame" x="182.66666666666666" y="12.333333333333334" width="49" height="19.333333333333329"/>
+                                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                 <color key="textColor" red="0.039215686270000001" green="0.039215686270000001" blue="0.039215686270000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>

smartRhino/Project/VCModel/ChatMessage/Controller/MyTDGroup/View/NewTopicTextView.m

@@ -42,7 +42,7 @@
     }
     
     if (!self.placeholderColor) {
-        [self setPlaceholderColor:UIColorHex(#999999)];
+        [self setPlaceholderColor:UIColorHex(0xC5C5C5)];
     }
     
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(textChanged:) name:UITextViewTextDidChangeNotification object:nil];

smartRhino/Project/VCModel/ChatMessage/Controller/TDInternalLeter/contoller/TDInterLeterHome.storyboard

@@ -80,18 +80,18 @@
                                                 <state key="normal" image="chatmsg_right_add_icon"/>
                                             </button>
                                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="CuK-6l-ib5" customClass="ShowBtn">
-                                                <rect key="frame" x="169" y="13.5" width="37" height="17"/>
+                                                <rect key="frame" x="171" y="13.5" width="33" height="17"/>
                                                 <constraints>
                                                     <constraint firstAttribute="height" constant="17" id="R0o-GE-4XN"/>
                                                 </constraints>
-                                                <fontDescription key="fontDescription" type="system" pointSize="18"/>
+                                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                 <state key="normal" title="全部">
                                                     <color key="titleColor" red="0.039215686270000001" green="0.039215686270000001" blue="0.039215686270000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 </state>
                                             </button>
                                             <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="批量编辑" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7xw-KS-acR">
-                                                <rect key="frame" x="153" y="12" width="69.5" height="20.5"/>
-                                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                <rect key="frame" x="155" y="12.5" width="65.5" height="19.5"/>
+                                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                 <nil key="textColor"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
@@ -882,8 +882,8 @@
                                                 </connections>
                                             </button>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="正文" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nh6-u0-8S7">
-                                                <rect key="frame" x="170" y="12" width="35" height="20.5"/>
-                                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                <rect key="frame" x="171" y="12.5" width="33" height="19.5"/>
+                                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                 <nil key="textColor"/>
                                                 <nil key="highlightedColor"/>
                                             </label>

smartRhino/Project/VCModel/ChatMessage/Controller/WaitWork/VC/NewWaitWorkVC.m

@@ -125,6 +125,7 @@
 - (void)setViewBtnAction
 {
     self.textView.placeholder = @"添加备注";
+
     WS(weakSelf);
     [self.endBtn setAction:^{
         SHOWLOADING

smartRhino/Project/VCModel/ChatMessage/Controller/WaitWork/VC/WaitWorkVC.m

@@ -67,6 +67,9 @@
             }
             [weakSelf.menuBtn setImage:[UIImage imageNamed:@"chatmsg_notice_showAll_icon"] forState:UIControlStateNormal];
         };
+        weakSelf.menuListView.dismissBlock = ^{
+            [weakSelf.menuBtn setImage:[UIImage imageNamed:@"chatmsg_notice_showAll_icon"] forState:UIControlStateNormal];
+        };
     }];
     [self.addBtn setAction:^{
         NewWaitWorkVC * vc = [NewWaitWorkVC initNewWaitWorkVC];
@@ -84,7 +87,8 @@
         TopicGroupManageModel * model = [TopicGroupManageModel modelWithDictionary:dic];
         [self.listArray addObject:model];
     }
-    self.menuListView = [MenuListView MenuListViewaddArray:@[self.listArray] showToView:self.cusNavBar MenuType:MenuOnlySelectType];
+
+    self.menuListView = [MenuListView MenuListViewaddArray:@[self.listArray] height:NAVH MenuType:MenuOnlySelectType];
 }
 
 - (void)getData

smartRhino/Project/VCModel/ChatMessage/Controller/WaitWork/View/MenuListView.h

@@ -16,6 +16,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface MenuListView : UIView
 + (instancetype)MenuListViewaddArray:(NSArray *)array showToView:(UIView *)view MenuType:(MenuListType)type;
++ (instancetype)MenuListViewaddArray:(NSArray *)array height:(CGFloat)height MenuType:(MenuListType)type;
 @property (nonatomic, copy) void(^SelectBtnblock)(NSArray *array);
 @property (nonatomic, copy) void(^SelectGroupblock)(void);
 @property (nonatomic, copy) void(^dismissBlock)(void);

smartRhino/Project/VCModel/ChatMessage/Controller/WaitWork/View/MenuListView.m

@@ -13,6 +13,8 @@
 @interface MenuListView()<UICollectionViewDelegate,UICollectionViewDataSource>
 @property (nonatomic, strong)NSMutableArray * listArray;
 @property (nonatomic, strong)UIView * topView;
+@property (nonatomic, assign)CGFloat  height;
+
 @property (nonatomic, strong)UIView * bgView;
 @property (nonatomic, assign)MenuListType  type;
 @property (nonatomic, strong)UICollectionView * collectionView;
@@ -22,14 +24,27 @@
 {
     return [[MenuListView alloc] initWithArray:array view:view MenuType:type];
 }
-
++ (instancetype)MenuListViewaddArray:(NSArray *)array height:(CGFloat)height MenuType:(MenuListType)type
+{
+    return [[MenuListView alloc] initWithArray:array height:height MenuType:type];
+}
+- (instancetype)initWithArray:(NSArray *)array height:(CGFloat)height MenuType:(MenuListType)type
+{
+    if (self = [super init]) {
+        self.listArray = [NSMutableArray arrayWithArray:array];
+        self.type = type;
+        self.height = height;
+        [self setCusView:YES];
+    }
+    return self;
+}
 - (instancetype)initWithArray:(NSArray *)array view:(UIView *)view MenuType:(MenuListType)type
 {
     if (self = [super init]) {
         self.listArray = [NSMutableArray arrayWithArray:array];
         self.type = type;
         self.topView = view;
-        [self setCusView];
+        [self setCusView:NO];
     }
     return self;
 }
@@ -42,9 +57,13 @@
     }
     return _bgView;
 }
-- (void)setCusView
+- (void)setCusView:(BOOL)isHeight
 {
-    [self setFrame: CGRectMake(0, CGRectGetMaxY(self.topView.frame), SCREEN_WIDTH, SCREEN_HEIGHT - CGRectGetMaxY(self.topView.frame))];
+    if (isHeight) {
+        [self setFrame: CGRectMake(0, self.height, SCREEN_WIDTH, SCREEN_HEIGHT - self.height)];
+    }else{
+        [self setFrame: CGRectMake(0, CGRectGetMaxY(self.topView.frame) , SCREEN_WIDTH, SCREEN_HEIGHT - CGRectGetMaxY(self.topView.frame))];
+    }
     
     [self addSubview:self.bgView];
     if (self.type == MenuMoreSelectType) {
@@ -226,7 +245,7 @@
     if ([kind isEqualToString:UICollectionElementKindSectionHeader]) {
         UICollectionReusableView *headerView = [collectionView dequeueReusableSupplementaryViewOfKind:UICollectionElementKindSectionHeader withReuseIdentifier:@"HeaderView" forIndexPath:indexPath];
         UILabel *lablel = [[UILabel alloc] init];
-        lablel.textColor = UIColorHex(#BBBBBB);
+        lablel.textColor = UIColorHex(0xBBBBBB);
         [headerView addSubview:lablel];
         if (self.type == MenuMoreSelectType) {
             lablel.text = @"选择显示";
@@ -234,9 +253,10 @@
             lablel.text = @"排序方式";
         }
         lablel.font = [UIFont systemFontOfSize:11.f];
+        lablel.textAlignment = NSTextAlignmentLeft;
         [headerView addSubview:lablel];
         [lablel mas_makeConstraints:^(MASConstraintMaker *make) {
-            make.left.mas_offset(15);
+            make.left.mas_equalTo(headerView);
             make.centerY.mas_equalTo(headerView);
         }];
         return headerView;

smartRhino/Project/VCModel/ChatMessage/Controller/WaitWork/WaitWork.storyboard

@@ -57,11 +57,11 @@
                                                 <state key="normal" image="chatmsg_right_add_icon"/>
                                             </button>
                                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="SvS-Of-TDQ">
-                                                <rect key="frame" x="147" y="13.666666666666664" width="120" height="17"/>
+                                                <rect key="frame" x="151" y="13.666666666666664" width="112" height="17"/>
                                                 <constraints>
                                                     <constraint firstAttribute="height" constant="17" id="Yo6-gn-uf8"/>
                                                 </constraints>
-                                                <fontDescription key="fontDescription" type="system" pointSize="18"/>
+                                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                 <inset key="contentEdgeInsets" minX="33" minY="0.0" maxX="0.0" maxY="0.0"/>
                                                 <inset key="titleEdgeInsets" minX="-55" minY="0.0" maxX="0.0" maxY="0.0"/>
                                                 <inset key="imageEdgeInsets" minX="66" minY="0.0" maxX="0.0" maxY="0.0"/>
@@ -137,7 +137,7 @@
                     <navigationItem key="navigationItem" id="NKA-Hb-T1U"/>
                     <connections>
                         <outlet property="addBtn" destination="cjZ-Pc-tj5" id="b5n-he-nWN"/>
-                        <outlet property="cusNavBar" destination="nXu-vq-Dw6" id="fsm-ga-Ao1"/>
+                        <outlet property="cusNavBar" destination="hCB-eT-rx4" id="uF4-A7-Od7"/>
                         <outlet property="menuBtn" destination="SvS-Of-TDQ" id="Jn9-ou-7tn"/>
                         <outlet property="tableView" destination="P7O-Ou-oGU" id="6Ad-Ye-MQq"/>
                     </connections>
@@ -190,8 +190,8 @@
                                                 </constraints>
                                             </view>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="待办详情" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="XkS-MV-Nwm">
-                                                <rect key="frame" x="170" y="11" width="74" height="22"/>
-                                                <fontDescription key="fontDescription" name=".AppleSystemUIFont" family=".AppleSystemUIFont" pointSize="18"/>
+                                                <rect key="frame" x="174.33333333333334" y="11.999999999999998" width="65.333333333333343" height="20.333333333333329"/>
+                                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                 <color key="textColor" red="0.0078431372549019607" green="0.0078431372549019607" blue="0.0078431372549019607" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
@@ -316,7 +316,7 @@
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="chatmsg_rightArrow_icon" translatesAutoresizingMaskIntoConstraints="NO" id="ikG-8O-GYH">
-                                                <rect key="frame" x="393.66666666666669" y="15.666666666666629" width="7" height="13.666666666666664"/>
+                                                <rect key="frame" x="393.66666666666669" y="16.666666666666629" width="7" height="12"/>
                                             </imageView>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="未设置" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eya-KJ-w5g">
                                                 <rect key="frame" x="328.66666666666669" y="12" width="52" height="21"/>
@@ -356,7 +356,7 @@
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="chatmsg_rightArrow_icon" translatesAutoresizingMaskIntoConstraints="NO" id="nVZ-Wm-GEC">
-                                                <rect key="frame" x="393.66666666666669" y="15.666666666666742" width="7" height="13.666666666666664"/>
+                                                <rect key="frame" x="393.66666666666669" y="16.333333333333371" width="7" height="12"/>
                                             </imageView>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="高" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ju9-64-4oc">
                                                 <rect key="frame" x="340.33333333333331" y="12" width="17.333333333333314" height="21"/>
@@ -399,7 +399,7 @@
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="chatmsg_rightArrow_icon" translatesAutoresizingMaskIntoConstraints="NO" id="9tA-9a-fRd">
-                                                <rect key="frame" x="393.66666666666669" y="15.666666666666629" width="7" height="13.666666666666664"/>
+                                                <rect key="frame" x="393.66666666666669" y="16.666666666666629" width="7" height="12"/>
                                             </imageView>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="未设置" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="W4X-Mw-0X9">
                                                 <rect key="frame" x="328.66666666666669" y="12" width="52" height="21"/>
@@ -527,8 +527,8 @@
                                                 </constraints>
                                             </view>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="标签" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="KUe-Hi-aco">
-                                                <rect key="frame" x="188.66666666666666" y="11" width="37" height="22"/>
-                                                <fontDescription key="fontDescription" name=".AppleSystemUIFont" family=".AppleSystemUIFont" pointSize="18"/>
+                                                <rect key="frame" x="190.66666666666666" y="11.999999999999998" width="32.666666666666657" height="20.333333333333329"/>
+                                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                 <color key="textColor" red="0.0078431372550000003" green="0.0078431372550000003" blue="0.0078431372550000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
@@ -613,7 +613,7 @@
         <image name="WaitWork_high" width="16" height="16"/>
         <image name="back_black_icon" width="11" height="20"/>
         <image name="chatmsg_notice_showAll_icon" width="13" height="13"/>
-        <image name="chatmsg_rightArrow_icon" width="7" height="13.666666984558105"/>
+        <image name="chatmsg_rightArrow_icon" width="6.6666665077209473" height="12"/>
         <image name="chatmsg_right_add_icon" width="15.666666984558105" height="15.666666984558105"/>
         <image name="menu_black_icon" width="16.666666030883789" height="14.666666984558105"/>
         <image name="结束切图" width="55.333332061767578" height="55.333332061767578"/>

smartRhino/Project/VCModel/Home/OtherHomeVC/ClickOK/AddChannel/AddChannelController.m

@@ -346,7 +346,7 @@
 - (TDButton *)dismissButton {
     if (!_dismissButton) {
         _dismissButton = [[TDButton alloc] init];
-        _dismissButton.frame = CGRectMake(kGXScreenWidth - (Width_Layout(30)),kStatusBarHeight,Width_Layout(30), Height_Layout(30));
+        _dismissButton.frame = CGRectMake(kGXScreenWidth - (Width_Layout(50)),kStatusBarHeight,Width_Layout(40), Height_Layout(40));
         [_dismissButton setCurrentButtonHotSize:CGSizeZero];
         [_dismissButton setImage:IMG(@"icon_dissmiss") forState:UIControlStateNormal];
         [_dismissButton addTarget:self action:@selector(dismissAction) forControlEvents:UIControlEventTouchUpInside];

smartRhino/Project/VCModel/Home/OtherHomeVC/ClickOK/ClickOKViewController.m

@@ -115,7 +115,7 @@
 - (UILabel *)titleLabel{
     if (!_titleLabel) {
         _titleLabel = [[UILabel alloc]init];
-        _titleLabel.font = [UIFont systemFontOfSize:17.f];
+        _titleLabel.font = [UIFont systemFontOfSize:16.f];
         _titleLabel.textColor =[UIColor hexStringToColor:@"333333" ];
     }
     return _titleLabel;

smartRhino/Project/VCModel/Home/OtherHomeVC/ClickOK/View/MyZanCell.xib

@@ -24,7 +24,7 @@
                             <constraint firstAttribute="height" constant="0.5" id="DUy-2p-Rek"/>
                         </constraints>
                     </view>
-                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="zhujun2" translatesAutoresizingMaskIntoConstraints="NO" id="Hov-LO-qkZ" customClass="YYAnimatedImageView" customModule="灵犀办公" customModuleProvider="target">
+                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="zhujun2" translatesAutoresizingMaskIntoConstraints="NO" id="Hov-LO-qkZ" customClass="YYAnimatedImageView" customModule="泰德信源" customModuleProvider="target">
                         <rect key="frame" x="10" y="17.5" width="35" height="35"/>
                         <constraints>
                             <constraint firstAttribute="width" secondItem="Hov-LO-qkZ" secondAttribute="height" multiplier="1:1" id="Dtd-g4-izm"/>
@@ -44,18 +44,18 @@
                         </constraints>
                     </view>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="朱军" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tuP-Im-W0Z">
-                        <rect key="frame" x="53" y="17.5" width="160" height="15.5"/>
+                        <rect key="frame" x="53" y="17.5" width="170.5" height="19.5"/>
                         <fontDescription key="fontDescription" type="system" pointSize="16"/>
                         <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="nH0-Yx-iPy">
-                        <rect key="frame" x="53" y="37" width="160" height="15.5"/>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="中国理论网撰稿人" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nH0-Yx-iPy">
+                        <rect key="frame" x="53" y="38" width="170.5" height="14.5"/>
                         <fontDescription key="fontDescription" type="system" pointSize="12"/>
                         <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <nil key="highlightedColor"/>
                     </label>
-                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="12:26 14:25" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bO1-HO-eEI">
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" text="12:26 14:25" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bO1-HO-eEI">
                         <rect key="frame" x="238.5" y="27" width="71.5" height="16"/>
                         <fontDescription key="fontDescription" type="system" pointSize="13"/>
                         <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -71,14 +71,11 @@
                     <constraint firstAttribute="bottom" secondItem="LYz-PQ-5WP" secondAttribute="bottom" id="K1w-1Y-aIE"/>
                     <constraint firstAttribute="trailing" secondItem="bO1-HO-eEI" secondAttribute="trailing" constant="10" id="LXb-dH-qOK"/>
                     <constraint firstItem="Hov-LO-qkZ" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="10" id="LcV-WD-KTZ"/>
+                    <constraint firstItem="bO1-HO-eEI" firstAttribute="leading" secondItem="tuP-Im-W0Z" secondAttribute="trailing" constant="15" id="Lkn-Vl-JVD"/>
                     <constraint firstAttribute="trailing" secondItem="TzT-Ld-m9t" secondAttribute="trailing" id="Md6-Va-JGM"/>
-                    <constraint firstItem="tuP-Im-W0Z" firstAttribute="leading" secondItem="Hov-LO-qkZ" secondAttribute="trailing" constant="8" id="Mvh-D4-H1X"/>
                     <constraint firstItem="TzT-Ld-m9t" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" id="QbE-HL-QRU"/>
-                    <constraint firstItem="nH0-Yx-iPy" firstAttribute="top" secondItem="Hov-LO-qkZ" secondAttribute="centerY" constant="2" id="TKS-gD-EqR"/>
-                    <constraint firstItem="tuP-Im-W0Z" firstAttribute="width" secondItem="H2p-sc-9uM" secondAttribute="width" multiplier="0.5" id="UqQ-qm-0A5"/>
-                    <constraint firstItem="tuP-Im-W0Z" firstAttribute="bottom" secondItem="Hov-LO-qkZ" secondAttribute="centerY" constant="-2" id="iKC-Qw-2bx"/>
+                    <constraint firstItem="bO1-HO-eEI" firstAttribute="leading" secondItem="nH0-Yx-iPy" secondAttribute="trailing" constant="15" id="gpH-dK-Wgc"/>
                     <constraint firstItem="nH0-Yx-iPy" firstAttribute="leading" secondItem="Hov-LO-qkZ" secondAttribute="trailing" constant="8" id="mWO-6a-RDQ"/>
-                    <constraint firstItem="nH0-Yx-iPy" firstAttribute="width" secondItem="tuP-Im-W0Z" secondAttribute="width" id="oQQ-mn-gpT"/>
                     <constraint firstItem="LYz-PQ-5WP" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" id="oZ7-Lx-uWg"/>
                     <constraint firstItem="nH0-Yx-iPy" firstAttribute="bottom" secondItem="Hov-LO-qkZ" secondAttribute="bottom" id="v43-fx-voM"/>
                     <constraint firstItem="TzT-Ld-m9t" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="xIE-Ma-Mtb"/>

smartRhino/Project/VCModel/Home/OtherHomeVC/HomeSearch/HomeSearchController.m

@@ -604,7 +604,6 @@ static NSString * MyApprovalBCellID = @"MyApprovalBCell";
             };
             weakSelf.drawerView.frame = CGRectMake(0,0, SCREEN_WIDTH, SCREEN_HEIGHT);// - kNavigationHeight
         };
-        [_topNavSearch showLineView];
     }
     return _topNavSearch;
 }

smartRhino/Project/VCModel/Home/OtherHomeVC/MyTDTopic/MyTDTopic.storyboard

@@ -203,8 +203,8 @@
                                                 <state key="normal" image="chatmsg_right_add_icon"/>
                                             </button>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="分组管理" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3v3-Zy-VJF">
-                                                <rect key="frame" x="170.33333333333334" y="11.666666666666668" width="73.666666666666657" height="21.000000000000004"/>
-                                                <fontDescription key="fontDescription" type="system" pointSize="18"/>
+                                                <rect key="frame" x="174.33333333333334" y="12.333333333333334" width="65.333333333333343" height="19.333333333333329"/>
+                                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                 <color key="textColor" red="0.039215686270000001" green="0.039215686270000001" blue="0.039215686270000001" alpha="1" colorSpace="calibratedRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
@@ -314,8 +314,8 @@
                                                 </state>
                                             </button>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="通讯录下的列表" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bO7-Qh-0zV">
-                                                <rect key="frame" x="103.66666666666669" y="11.666666666666668" width="207" height="21.000000000000004"/>
-                                                <fontDescription key="fontDescription" type="system" pointSize="18"/>
+                                                <rect key="frame" x="103.66666666666669" y="12.333333333333334" width="207" height="19.333333333333329"/>
+                                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                 <color key="textColor" red="0.039215686270000001" green="0.039215686270000001" blue="0.039215686270000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
@@ -553,8 +553,8 @@
                                                 </connections>
                                             </button>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="正文" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yMl-n2-VaV">
-                                                <rect key="frame" x="189.66666666666666" y="11.999999999999998" width="34.666666666666657" height="20.333333333333329"/>
-                                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                <rect key="frame" x="190.66666666666666" y="12.333333333333334" width="32.666666666666657" height="19.333333333333329"/>
+                                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                 <nil key="textColor"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
@@ -928,8 +928,8 @@
                                                 </connections>
                                             </button>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="正文" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="GUC-zj-MKl">
-                                                <rect key="frame" x="189.66666666666666" y="11.999999999999998" width="34.666666666666657" height="20.333333333333329"/>
-                                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                <rect key="frame" x="190.66666666666666" y="11.999999999999998" width="32.666666666666657" height="20.333333333333329"/>
+                                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                 <nil key="textColor"/>
                                                 <nil key="highlightedColor"/>
                                             </label>

smartRhino/Project/VCModel/Home/OtherHomeVC/MyTDTopic/MyTDTopicExtent.storyboard

@@ -62,8 +62,8 @@
                                                 </connections>
                                             </button>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="正文" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Hf9-FP-6Vv">
-                                                <rect key="frame" x="103.66666666666669" y="11" width="207" height="22"/>
-                                                <fontDescription key="fontDescription" type="system" pointSize="18"/>
+                                                <rect key="frame" x="103.66666666666669" y="11.999999999999998" width="207" height="20.333333333333329"/>
+                                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                 <color key="textColor" red="0.039215686270000001" green="0.039215686270000001" blue="0.039215686270000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
@@ -183,8 +183,8 @@
                                                 </constraints>
                                             </view>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="写话题" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="TEo-N9-lto">
-                                                <rect key="frame" x="179.33333333333334" y="11.666666666666668" width="55.333333333333343" height="21.000000000000004"/>
-                                                <fontDescription key="fontDescription" type="system" pointSize="18"/>
+                                                <rect key="frame" x="182.66666666666666" y="12.333333333333334" width="49" height="19.333333333333329"/>
+                                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                 <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
@@ -283,8 +283,8 @@
                                                 <state key="normal" image="chatmsg_right_add_icon"/>
                                             </button>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="选择发布范围" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hpk-yx-3ZD">
-                                                <rect key="frame" x="152" y="11.666666666666668" width="110.33333333333331" height="21.000000000000004"/>
-                                                <fontDescription key="fontDescription" type="system" pointSize="18"/>
+                                                <rect key="frame" x="158" y="12.333333333333334" width="98" height="19.333333333333329"/>
+                                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                 <color key="textColor" red="0.039215686270000001" green="0.039215686270000001" blue="0.039215686270000001" alpha="1" colorSpace="calibratedRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
@@ -448,8 +448,8 @@
                                                 </connections>
                                             </button>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="写话题" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="osx-6l-iOG">
-                                                <rect key="frame" x="179.33333333333334" y="11.666666666666668" width="55.333333333333343" height="21.000000000000004"/>
-                                                <fontDescription key="fontDescription" type="system" pointSize="18"/>
+                                                <rect key="frame" x="182.66666666666666" y="12.333333333333334" width="49" height="19.333333333333329"/>
+                                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                 <color key="textColor" red="0.039215686270000001" green="0.039215686270000001" blue="0.039215686270000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>

smartRhino/Project/VCModel/Home/VC/BookStore/BookStore.storyboard

@@ -61,8 +61,8 @@
                                                 </connections>
                                             </button>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="书城" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FYW-PM-Jt6">
-                                                <rect key="frame" x="188.66666666666666" y="11.666666666666668" width="37" height="21.000000000000004"/>
-                                                <fontDescription key="fontDescription" type="system" pointSize="18"/>
+                                                <rect key="frame" x="190.66666666666666" y="12.333333333333334" width="32.666666666666657" height="19.333333333333329"/>
+                                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                 <color key="textColor" red="0.039215686270000001" green="0.039215686270000001" blue="0.039215686270000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
@@ -92,36 +92,25 @@
                                     <outlet property="height" destination="4EF-wU-gZO" id="qe0-R5-HtA"/>
                                 </connections>
                             </view>
-                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="fOE-DA-hIE">
-                                <rect key="frame" x="0.0" y="64" width="414" height="46"/>
-                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                <constraints>
-                                    <constraint firstAttribute="height" constant="46" id="S61-L2-dW7"/>
-                                </constraints>
-                            </view>
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" separatorStyle="none" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="18" sectionFooterHeight="18" translatesAutoresizingMaskIntoConstraints="NO" id="P7O-Ou-oGU">
-                                <rect key="frame" x="0.0" y="110" width="414" height="626"/>
+                                <rect key="frame" x="0.0" y="64" width="414" height="672"/>
                                 <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
                             </tableView>
                         </subviews>
                         <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
                         <constraints>
-                            <constraint firstItem="P7O-Ou-oGU" firstAttribute="top" secondItem="fOE-DA-hIE" secondAttribute="bottom" id="1Tz-YE-dW3"/>
                             <constraint firstItem="P7O-Ou-oGU" firstAttribute="leading" secondItem="7c1-e0-9St" secondAttribute="leading" id="FLs-xl-Waa"/>
+                            <constraint firstItem="P7O-Ou-oGU" firstAttribute="top" secondItem="hCB-eT-rx4" secondAttribute="bottom" id="UBz-ak-hD9"/>
                             <constraint firstItem="hCB-eT-rx4" firstAttribute="trailing" secondItem="7c1-e0-9St" secondAttribute="trailing" id="aeX-EI-pWy"/>
                             <constraint firstItem="7c1-e0-9St" firstAttribute="bottom" secondItem="P7O-Ou-oGU" secondAttribute="bottom" id="b3y-bO-csP"/>
                             <constraint firstItem="hCB-eT-rx4" firstAttribute="top" secondItem="DUl-bS-JUQ" secondAttribute="top" id="dLA-cp-dy0"/>
                             <constraint firstItem="7c1-e0-9St" firstAttribute="trailing" secondItem="P7O-Ou-oGU" secondAttribute="trailing" id="g3z-GR-Hbx"/>
-                            <constraint firstItem="fOE-DA-hIE" firstAttribute="leading" secondItem="7c1-e0-9St" secondAttribute="leading" id="kqs-NO-JYv"/>
-                            <constraint firstItem="fOE-DA-hIE" firstAttribute="top" secondItem="hCB-eT-rx4" secondAttribute="bottom" id="nk2-Mg-YwS"/>
                             <constraint firstItem="hCB-eT-rx4" firstAttribute="leading" secondItem="7c1-e0-9St" secondAttribute="leading" id="rMd-z6-kZq"/>
-                            <constraint firstItem="fOE-DA-hIE" firstAttribute="trailing" secondItem="7c1-e0-9St" secondAttribute="trailing" id="wW3-qK-wkk"/>
                         </constraints>
                         <viewLayoutGuide key="safeArea" id="7c1-e0-9St"/>
                     </view>
                     <navigationItem key="navigationItem" id="NKA-Hb-T1U"/>
                     <connections>
-                        <outlet property="HeadView" destination="fOE-DA-hIE" id="hEB-wO-6X1"/>
                         <outlet property="tableView" destination="P7O-Ou-oGU" id="Cld-5f-LEV"/>
                     </connections>
                 </viewController>
@@ -166,8 +155,8 @@
                                                 </connections>
                                             </button>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="书城" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tsn-nb-UnH">
-                                                <rect key="frame" x="188.66666666666666" y="11.666666666666668" width="37" height="21.000000000000004"/>
-                                                <fontDescription key="fontDescription" type="system" pointSize="18"/>
+                                                <rect key="frame" x="190.66666666666666" y="12.333333333333334" width="32.666666666666657" height="19.333333333333329"/>
+                                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                 <color key="textColor" red="0.039215686270000001" green="0.039215686270000001" blue="0.039215686270000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
@@ -272,8 +261,8 @@
                                                 </connections>
                                             </button>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="书城" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hm5-b0-bGy">
-                                                <rect key="frame" x="188.66666666666666" y="11.666666666666668" width="37" height="21.000000000000004"/>
-                                                <fontDescription key="fontDescription" type="system" pointSize="18"/>
+                                                <rect key="frame" x="190.66666666666666" y="12.333333333333334" width="32.666666666666657" height="19.333333333333329"/>
+                                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                 <color key="textColor" red="0.039215686270000001" green="0.039215686270000001" blue="0.039215686270000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
@@ -406,8 +395,8 @@
                                                 </connections>
                                             </button>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="书城" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Fah-vC-JzT">
-                                                <rect key="frame" x="188.66666666666666" y="11.666666666666668" width="37" height="21.000000000000004"/>
-                                                <fontDescription key="fontDescription" type="system" pointSize="18"/>
+                                                <rect key="frame" x="190.66666666666666" y="12.333333333333334" width="32.666666666666657" height="19.333333333333329"/>
+                                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                 <color key="textColor" red="0.039215686270000001" green="0.039215686270000001" blue="0.039215686270000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
@@ -525,6 +514,7 @@
                         <outlet property="HeadView" destination="RCI-he-2Y3" id="Jps-1T-5rk"/>
                         <outlet property="TitleL" destination="Fah-vC-JzT" id="rVu-qB-YTj"/>
                         <outlet property="collectionView" destination="AwI-E2-DTb" id="cFO-qc-xCS"/>
+                        <outlet property="leftTableHeight" destination="pc6-DH-uqx" id="INk-tJ-ex6"/>
                         <outlet property="leftTableV" destination="ALj-0X-ei3" id="c5S-4P-ocz"/>
                         <outlet property="leftW" destination="7H5-jZ-ncS" id="oeZ-Kt-lix"/>
                         <outlet property="middleTableV" destination="Bhc-Gs-CiI" id="2QL-7p-hAO"/>
@@ -574,8 +564,8 @@
                                                 </connections>
                                             </button>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="播放列表" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6EQ-yo-Aue">
-                                                <rect key="frame" x="170.33333333333334" y="11.666666666666668" width="73.666666666666657" height="21.000000000000004"/>
-                                                <fontDescription key="fontDescription" type="system" pointSize="18"/>
+                                                <rect key="frame" x="174.33333333333334" y="11.999999999999998" width="65.333333333333343" height="20.333333333333329"/>
+                                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                 <color key="textColor" red="0.039215686270000001" green="0.039215686270000001" blue="0.039215686270000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
@@ -1020,8 +1010,8 @@
                                                 </connections>
                                             </button>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="微  课" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="J9C-DU-7Mo">
-                                                <rect key="frame" x="184" y="11.666666666666668" width="46" height="21.000000000000004"/>
-                                                <fontDescription key="fontDescription" type="system" pointSize="18"/>
+                                                <rect key="frame" x="186.33333333333334" y="12.333333333333334" width="41.333333333333343" height="19.333333333333329"/>
+                                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                 <color key="textColor" red="0.039215686270000001" green="0.039215686270000001" blue="0.039215686270000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
@@ -1287,8 +1277,8 @@
                                         <rect key="frame" x="0.0" y="20" width="414" height="44"/>
                                         <subviews>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="榜单" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="46z-8F-Sjr">
-                                                <rect key="frame" x="188.66666666666666" y="11.666666666666668" width="37" height="21.000000000000004"/>
-                                                <fontDescription key="fontDescription" type="system" pointSize="18"/>
+                                                <rect key="frame" x="190.66666666666666" y="12.333333333333334" width="32.666666666666657" height="19.333333333333329"/>
+                                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                 <color key="textColor" red="0.039215686270000001" green="0.039215686270000001" blue="0.039215686270000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
@@ -1403,8 +1393,8 @@
                                         <rect key="frame" x="0.0" y="20" width="414" height="44"/>
                                         <subviews>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="榜单" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="MZe-MH-JIj">
-                                                <rect key="frame" x="188.66666666666666" y="11.666666666666668" width="37" height="21.000000000000004"/>
-                                                <fontDescription key="fontDescription" type="system" pointSize="18"/>
+                                                <rect key="frame" x="190.66666666666666" y="12.333333333333334" width="32.666666666666657" height="19.333333333333329"/>
+                                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                 <color key="textColor" red="0.039215686270000001" green="0.039215686270000001" blue="0.039215686270000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
@@ -1508,8 +1498,8 @@
                                         <rect key="frame" x="0.0" y="20" width="414" height="44"/>
                                         <subviews>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="榜单" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="axK-vY-QeB">
-                                                <rect key="frame" x="188.66666666666666" y="11.666666666666668" width="37" height="21.000000000000004"/>
-                                                <fontDescription key="fontDescription" type="system" pointSize="18"/>
+                                                <rect key="frame" x="190.66666666666666" y="12.333333333333334" width="32.666666666666657" height="19.333333333333329"/>
+                                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                 <color key="textColor" red="0.039215686270000001" green="0.039215686270000001" blue="0.039215686270000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
@@ -1619,8 +1609,8 @@
                                         <rect key="frame" x="0.0" y="20" width="414" height="44"/>
                                         <subviews>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="榜单" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Chk-rG-v0m">
-                                                <rect key="frame" x="188.66666666666666" y="11.33333333333333" width="37" height="21.666666666666671"/>
-                                                <fontDescription key="fontDescription" type="system" pointSize="18"/>
+                                                <rect key="frame" x="190.66666666666666" y="12.333333333333334" width="32.666666666666657" height="19.333333333333329"/>
+                                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                 <color key="textColor" red="0.039215686270000001" green="0.039215686270000001" blue="0.039215686270000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
@@ -1966,8 +1956,8 @@
                                         <rect key="frame" x="0.0" y="20" width="414" height="44"/>
                                         <subviews>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="榜单" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rjt-lA-kta">
-                                                <rect key="frame" x="188.66666666666666" y="11.666666666666668" width="37" height="21.000000000000004"/>
-                                                <fontDescription key="fontDescription" type="system" pointSize="18"/>
+                                                <rect key="frame" x="190.66666666666666" y="12.333333333333334" width="32.666666666666657" height="19.333333333333329"/>
+                                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                 <color key="textColor" red="0.039215686270000001" green="0.039215686270000001" blue="0.039215686270000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
@@ -2100,8 +2090,8 @@
                                                 <state key="normal" title="Button" image="Book_Share_Icon"/>
                                             </button>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="书城" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5L4-ju-j4X">
-                                                <rect key="frame" x="188.66666666666666" y="11.666666666666668" width="37" height="21.000000000000004"/>
-                                                <fontDescription key="fontDescription" type="system" pointSize="18"/>
+                                                <rect key="frame" x="190.66666666666666" y="12.333333333333334" width="32.666666666666657" height="19.333333333333329"/>
+                                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                 <color key="textColor" red="0.039215686270000001" green="0.039215686270000001" blue="0.039215686270000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>

smartRhino/Project/VCModel/Home/VC/BookStore/VC/BookChanelVC.m

@@ -36,7 +36,7 @@
 }
 - (void)setArray
 {
-    self.dataArray = [NSMutableArray arrayWithArray:@[@"微课",@"工具书",@"课程",@"公众号",@"期刊",@"科学文化",@"教育",@"综合",@"艺术",@"经济",@"历史"]];
+    self.dataArray = [NSMutableArray arrayWithArray:@[@"微课",@"工具书",@"课程",@"公众号",@"期刊",@"科学文化",@"教育",@"综合",@"艺术",@"经济",@"童书",@"专业图书"]];
 }
 - (NSInteger)numberOfSectionsInCollectionView:(UICollectionView *)collectionView{
     return 3;
@@ -149,7 +149,25 @@
             BookWeiCourseListVC * vc = [BookWeiCourseListVC initBookWeiCourseListVC];
             vc.titleStr = title;
             vc.type = BookChanelPeriodica;
-            vc.isClassify = NO;
+            vc.isClassify = YES;
+            [self.navigationController pushViewController:vc animated:YES];
+        }
+            break;
+        case 10:
+        {
+            BookWeiCourseListVC * vc = [BookWeiCourseListVC initBookWeiCourseListVC];
+            vc.titleStr = title;
+            vc.type = BookChanelPeriodica;
+            vc.isClassify = YES;
+            [self.navigationController pushViewController:vc animated:YES];
+        }
+            break;
+        case 11:
+        {
+            BookWeiCourseListVC * vc = [BookWeiCourseListVC initBookWeiCourseListVC];
+            vc.titleStr = title;
+            vc.type = BookChanelSpecialty;
+            vc.isClassify = YES;
             [self.navigationController pushViewController:vc animated:YES];
         }
             break;

smartRhino/Project/VCModel/Home/VC/BookStore/VC/BookContentNavVC.m

@@ -51,6 +51,7 @@
 @property (weak, nonatomic) IBOutlet UILabel     *TitleL;
 @property (weak, nonatomic) IBOutlet NSLayoutConstraint *leftW;
 @property (weak, nonatomic) IBOutlet NSLayoutConstraint *middleW;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *leftTableHeight;
 @property (strong, nonatomic) MyTDGroupView             *SearchView;
 @property (strong, nonatomic) NSMutableArray            *dataArray;
 @property (strong, nonatomic) NSMutableArray            *selectArray;
@@ -259,7 +260,7 @@
     if (tableView == self.leftTableV) {
         return 0.01f;
     }else if(tableView == self.middleTableV){
-        return 62.f;
+        return 60.f;
     }else if(tableView == self.selectTableV){
         BookSelectModel * model = [self.selectArray objectAtIndex:section];
         switch (model.type) {
@@ -296,14 +297,14 @@
 //        label.text = @"推荐";
 //        headerView.backgroundColor = UIColorHex(0xEBEBEB);
     }else if(tableView == self.middleTableV){
-        [headerView setFrame:CGRectMake(0, 0, SCREEN_WIDTH, 62)];
+        [headerView setFrame:CGRectMake(0, 0, SCREEN_WIDTH, 60)];
         UILabel * label = [UILabel new];
         [headerView addSubview:label];
         label.font = [UIFont systemFontOfSize:16];
         label.textColor = UIColorHex(0x0A0A0A);
         [label mas_makeConstraints:^(MASConstraintMaker *make) {
             make.centerX.mas_equalTo(headerView);
-            make.centerY.mas_equalTo(headerView);
+            make.top.mas_offset(20);
         }];
         NSMutableAttributedString * attStr = [[NSMutableAttributedString alloc] init];
         NSTextAttachment *attach = [[NSTextAttachment alloc] init];
@@ -334,12 +335,16 @@
     if (tableView == self.leftTableV) {
         BookContentLeftModel * model = [self.dataArray objectAtIndex:indexPath.row];
         BookContentLeftCell * cell = [BookContentLeftCell configCell:tableView indexPath:indexPath];
-//        [cell setDataWithModel:model middleHidden:self.middleHidden];
         [cell setDataModel:model];
         if (indexPath.row == 0) {
-            cell.height.constant = 42.f;
-        }else{
-            cell.height.constant = 62.f;
+            if (model.isSelect) {
+                cell.height.constant = 58.f;
+                self.leftTableHeight.constant = 2.f;
+            }else{
+                cell.height.constant = 42.f;
+                self.leftTableHeight.constant = 18.f;
+            }
+            [self.leftTableV layoutIfNeeded];
         }
         return cell;
     }else if(tableView == self.middleTableV){

smartRhino/Project/VCModel/Home/VC/BookStore/VC/BookMingDetailVC.m

@@ -101,10 +101,7 @@
         };
         weakSelf.drawerView.frame = CGRectMake(0,0, SCREEN_WIDTH, SCREEN_HEIGHT);// - kNavigationHeight
     }];
-    [self.navBar layoutIfNeeded];
-    [self.bottomView layoutIfNeeded];
-    CGFloat NavH = CGRectGetMaxY(self.navBar.frame) + CGRectGetMinY(self.navBar.frame);
-    CGFloat scrH = CGRectGetMinY(self.bottomView.frame) - CGRectGetMaxY(self.navBar.frame) + CGRectGetMinY(self.navBar.frame) + 2;
+
     
     WMZPageParam *param = PageParam()
     .wTitleArrSet(@[@"文章",@"视频",@"音频"])
@@ -116,7 +113,7 @@
     //等分
     .wMenuTitleWidthSet(PageVCWidth/3)
     .wMenuCellPaddingSet(45 - 21.5)
-    .wTopOffsetSet(-NavH)
+    .wTopOffsetSet(-NAVH)
     .wFromNaviSet(YES)
     .wMenuAnimalSet(PageTitleMenuLine)
     .wMenuTitleFontSet(16.f)
@@ -134,15 +131,19 @@
     });
     self.param = param;
 
+    [self.bottomView layoutIfNeeded];
+    CGFloat height = CGRectGetMinY(self.bottomView.frame) - self.navigationController.navigationBar.frame.size.height;
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-        [weakSelf.downSc setFrame:CGRectMake(0, NavH, SCREEN_WIDTH, scrH)];
-        CGRect rect = weakSelf.upSc.mainView.frame;
-        rect.size.height = 45.f;
-        [weakSelf.upSc.mainView setFrame:rect];
-        [weakSelf.upSc addObserver:weakSelf forKeyPath:@"currentTitleIndex" options:NSKeyValueObservingOptionNew|NSKeyValueObservingOptionOld context:nil];
-        [weakSelf setArticeBtnView];
+        dispatch_async(dispatch_get_main_queue(), ^{
+            for (UIView * view in weakSelf.view.subviews) {
+                if ([view isKindOfClass:[WMZPageScroller class]]) {
+                    [view setFrame:CGRectMake(0, NAVH, SCREEN_WIDTH, height)];
+                }
+            }
+            [weakSelf.upSc addObserver:weakSelf forKeyPath:@"currentTitleIndex" options:NSKeyValueObservingOptionNew|NSKeyValueObservingOptionOld context:nil];
+            [weakSelf setArticeBtnView];
+        });
     });
-
 }
 - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary<NSKeyValueChangeKey,id> *)change context:(void *)context
 {
@@ -221,7 +222,7 @@
         make.centerX.mas_equalTo(subView);
     }];
     imagV.image = IMG(@"img_placeHolder");
-    imagV.contentMode = UIViewContentModeScaleToFill;
+    imagV.contentMode = UIViewContentModeScaleAspectFit;
     UILabel * bookL = [UILabel new];
     [subView addSubview:bookL];
     bookL.text = @"中美贸易";

smartRhino/Project/VCModel/Home/VC/BookStore/VC/BookPeriodicaDetailVC.m

@@ -99,10 +99,6 @@
         };
         weakSelf.drawerView.frame = CGRectMake(0,0, SCREEN_WIDTH, SCREEN_HEIGHT);// - kNavigationHeight
     }];
-    [self.navBar layoutIfNeeded];
-    [self.bottomView layoutIfNeeded];
-    CGFloat NavH = CGRectGetMaxY(self.navBar.frame) + CGRectGetMinY(self.navBar.frame);
-    CGFloat scrH = CGRectGetMinY(self.bottomView.frame) - CGRectGetMaxY(self.navBar.frame) + CGRectGetMinY(self.navBar.frame) + 2;
 
     WMZPageParam *param = PageParam()
     .wTitleArrSet(@[@"文章"])
@@ -113,7 +109,7 @@
     .wTopSuspensionSet(YES)
     //等分
     .wMenuTitleWidthSet(PageVCWidth)
-    .wTopOffsetSet(-NavH)
+    .wTopOffsetSet(-NAVH)
     .wFromNaviSet(YES)
     .wMenuAnimalSet(PageTitleMenuNone)
     .wMenuTitleFontSet(16.f)
@@ -124,15 +120,20 @@
     .wMenuIndicatorColorSet(UIColorHex(0x3979D3))
     .wMenuTitleColorSet(UIColorHex(0x666666))
     .wMenuTitleSelectFontSet(16.f)
-    
     //头部
     .wMenuHeadViewSet(^UIView *{
         return [weakSelf setHeadView];
     });
     self.param = param;
+    [self.bottomView layoutIfNeeded];
+    CGFloat height = CGRectGetMinY(self.bottomView.frame) - self.navigationController.navigationBar.frame.size.height;
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-        [weakSelf.downSc setFrame:CGRectMake(0, NavH, SCREEN_WIDTH, scrH)];
         dispatch_async(dispatch_get_main_queue(), ^{
+            for (UIView * view in weakSelf.view.subviews) {
+                if ([view isKindOfClass:[WMZPageScroller class]]) {
+                    [view setFrame:CGRectMake(0, NAVH, SCREEN_WIDTH, height)];
+                }
+            }
             [weakSelf setListView];
             [weakSelf setBtnView];
         });
@@ -229,7 +230,7 @@
         make.centerX.mas_equalTo(subView);
     }];
     imagV.image = IMG(@"img_placeHolder");
-    imagV.contentMode = UIViewContentModeScaleToFill;
+    imagV.contentMode = UIViewContentModeScaleAspectFit;
     UILabel * bookL = [UILabel new];
     [subView addSubview:bookL];
     bookL.text = @"经济研究";
@@ -514,6 +515,7 @@
             make.width.mas_offset(SCREEN_WIDTH / 3);
         }];
     }
+    [self.bottomView bringSubviewToFront:self.view];
 }
 - (void)clickBtnAction:(UIButton *)sender
 {

smartRhino/Project/VCModel/Home/VC/BookStore/VC/BookStoreHome.m

@@ -42,7 +42,7 @@
 
 @interface BookStoreHome ()<UITableViewDelegate,UITableViewDataSource,UICollectionViewDelegate,UICollectionViewDataSource>
 @property (weak, nonatomic) IBOutlet UITableView *tableView;
-@property (weak, nonatomic) IBOutlet UIView      *HeadView;
+@property (strong, nonatomic)  UIView      *HeadView;
 @property (strong, nonatomic) MyTDGroupView             *SearchView;
 @property (strong, nonatomic) NSMutableArray            *dataArray;
 @property (strong, nonatomic) NSMutableArray            *collectionDataSource;
@@ -56,7 +56,14 @@
     BookStoreHome *controller = [StoryboardManager.shared.Book instantiateViewControllerWithIdentifier:@"BookStoreHome"];
     return controller;
 }
-
+- (UIView *)HeadView
+{
+    if (!_HeadView) {
+        _HeadView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, 46)];
+        _HeadView.backgroundColor = [UIColor whiteColor];
+    }
+    return _HeadView;
+}
 - (MyTDGroupView *)SearchView
 {
     if (!_SearchView) {
@@ -99,6 +106,7 @@
     self.tableView.delegate = self;
     self.tableView.dataSource = self;
     self.tableView.backgroundColor = [UIColor whiteColor];
+    self.tableView.tableHeaderView = self.HeadView;
     [self.HeadView addSubview:self.SearchView];
     [self.SearchView  mas_makeConstraints:^(MASConstraintMaker *make) {
         make.top.mas_offset(6);
@@ -116,7 +124,6 @@
 }
 
 -(void)initCollectionData{
-    
     [self.collectionDataSource removeAllObjects];
     NSMutableArray * array = [NSMutableArray array];
     for (NSInteger i = 0;i < 4; i++) {
@@ -353,6 +360,7 @@
     ChatMsgCollectionCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"ChatMsgCollectionCell" forIndexPath:indexPath];
     cell.cell0IconImg.image = [UIImage imageNamed:bean.imgName];
     cell.cell0TitleLabel.text = bean.title;
+    cell.cell0TitleLabel.font = Kfont(13);
     cell.imagH.constant = 40.f;
     cell.imagW.constant = 40.f;
     cell.titleConstant.constant = 1.5f;

smartRhino/Project/VCModel/Home/VC/BookStore/VC/BookSubArticeVC.m

@@ -30,7 +30,7 @@
         make.top.mas_equalTo(lineV.mas_bottom);
         make.left.right.mas_equalTo(self.view);
         if (@available(iOS 11.0, *)) {
-            make.bottom.equalTo(self.view.mas_safeAreaLayoutGuideBottom).offset(-54);
+            make.bottom.equalTo(self.view.mas_safeAreaLayoutGuideBottom).offset(-86);
         } else {
             make.bottom.equalTo(self.view.mas_bottom).offset(-54);
         }

smartRhino/Project/VCModel/Home/VC/BookStore/VC/BookSubMusicVC.m

@@ -29,7 +29,7 @@
         make.top.mas_equalTo(lineV.mas_bottom);
         make.left.right.mas_equalTo(self.view);
         if (@available(iOS 11.0, *)) {
-            make.bottom.equalTo(self.view.mas_safeAreaLayoutGuideBottom).offset(-54);
+            make.bottom.equalTo(self.view.mas_safeAreaLayoutGuideBottom).offset(-86);
         } else {
             make.bottom.equalTo(self.view.mas_bottom).offset(-54);
         }

smartRhino/Project/VCModel/Home/VC/BookStore/VC/BookSubPeriodicaVC.m

@@ -22,7 +22,7 @@
     [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.top.left.right.mas_equalTo(self.view);
         if (@available(iOS 11.0, *)) {
-            make.bottom.equalTo(self.view.mas_safeAreaLayoutGuideBottom).offset(-54);
+            make.bottom.equalTo(self.view.mas_safeAreaLayoutGuideBottom).offset(-86);
         } else {
             make.bottom.equalTo(self.view.mas_bottom).offset(-54);
         }

smartRhino/Project/VCModel/Home/VC/BookStore/VC/BookSubVideoVC.m

@@ -30,7 +30,7 @@
         make.top.mas_equalTo(lineV.mas_bottom);
         make.left.right.mas_equalTo(self.view);
         if (@available(iOS 11.0, *)) {
-            make.bottom.equalTo(self.view.mas_safeAreaLayoutGuideBottom).offset(-54);
+            make.bottom.equalTo(self.view.mas_safeAreaLayoutGuideBottom).offset(-86);
         } else {
             make.bottom.equalTo(self.view.mas_bottom).offset(-54);
         }

smartRhino/Project/VCModel/Home/VC/BookStore/VC/BookWeiCourseListVC.m

@@ -118,6 +118,19 @@
                 return cell;
             }
                 break;
+            case BookChanelSpecialty:
+            {
+                if (self.isRow) {
+                    HomeWeiCousreCell * cell = [HomeWeiCousreCell configCell0:tableView indexPath:indexPath];
+                    cell.lineLeft.constant = 15.f;
+                    cell.lineRight.constant = 15.f;
+                    return cell;
+                }else{
+                    BookPeriodicaCell * cell = [BookPeriodicaCell configCell:tableView indexPath:indexPath];
+                    return cell;
+                }
+            }
+                break;
             default:
             {
                 if (self.isRow) {

smartRhino/Project/VCModel/Home/VC/BookStore/View/BookAllLookCell.xib

@@ -17,7 +17,7 @@
                 <rect key="frame" x="0.0" y="0.0" width="348" height="120"/>
                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                 <subviews>
-                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="img_placeHolder" translatesAutoresizingMaskIntoConstraints="NO" id="1cH-ae-3WY">
+                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="img_placeHolder" translatesAutoresizingMaskIntoConstraints="NO" id="1cH-ae-3WY">
                         <rect key="frame" x="15" y="15" width="68" height="90"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="90" id="RCa-0d-gY6"/>
@@ -86,6 +86,6 @@
         </collectionViewCell>
     </objects>
     <resources>
-        <image name="img_placeHolder" width="70" height="70"/>
+        <image name="img_placeHolder" width="800" height="800"/>
     </resources>
 </document>

smartRhino/Project/VCModel/Home/VC/BookStore/View/BookBillBookCell.xib

@@ -17,7 +17,7 @@
                 <rect key="frame" x="0.0" y="0.0" width="366" height="130"/>
                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                 <subviews>
-                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="img_placeHolder" translatesAutoresizingMaskIntoConstraints="NO" id="orz-f8-j5u">
+                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="img_placeHolder" translatesAutoresizingMaskIntoConstraints="NO" id="orz-f8-j5u">
                         <rect key="frame" x="20" y="20" width="56" height="81"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="81" id="L9o-25-wMU"/>
@@ -95,6 +95,6 @@
         </collectionViewCell>
     </objects>
     <resources>
-        <image name="img_placeHolder" width="70" height="70"/>
+        <image name="img_placeHolder" width="800" height="800"/>
     </resources>
 </document>

smartRhino/Project/VCModel/Home/VC/BookStore/View/BookBillCousreCell.xib

@@ -17,7 +17,7 @@
                 <rect key="frame" x="0.0" y="0.0" width="369" height="127"/>
                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                 <subviews>
-                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="img_placeHolder" translatesAutoresizingMaskIntoConstraints="NO" id="Ksc-nU-cce">
+                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="img_placeHolder" translatesAutoresizingMaskIntoConstraints="NO" id="Ksc-nU-cce">
                         <rect key="frame" x="15" y="20" width="110" height="70"/>
                         <constraints>
                             <constraint firstAttribute="width" constant="110" id="8ov-Ey-3es"/>
@@ -95,6 +95,6 @@
         </collectionViewCell>
     </objects>
     <resources>
-        <image name="img_placeHolder" width="70" height="70"/>
+        <image name="img_placeHolder" width="800" height="800"/>
     </resources>
 </document>

smartRhino/Project/VCModel/Home/VC/BookStore/View/BookBillMusicCell.xib

@@ -20,7 +20,7 @@
                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Book_Musicplay_btn" translatesAutoresizingMaskIntoConstraints="NO" id="X6T-cL-Q0K">
                         <rect key="frame" x="27" y="86" width="11" height="12.5"/>
                     </imageView>
-                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="img_placeHolder" translatesAutoresizingMaskIntoConstraints="NO" id="dXK-Z5-5jV">
+                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="img_placeHolder" translatesAutoresizingMaskIntoConstraints="NO" id="dXK-Z5-5jV">
                         <rect key="frame" x="15" y="74.5" width="35" height="35"/>
                         <constraints>
                             <constraint firstAttribute="width" constant="35" id="7ih-5t-Ej1"/>
@@ -103,6 +103,6 @@
     </objects>
     <resources>
         <image name="Book_Musicplay_btn" width="11" height="12.5"/>
-        <image name="img_placeHolder" width="70" height="70"/>
+        <image name="img_placeHolder" width="800" height="800"/>
     </resources>
 </document>

smartRhino/Project/VCModel/Home/VC/BookStore/View/BookCardPayAlertCell.xib

@@ -17,7 +17,7 @@
                 <rect key="frame" x="0.0" y="0.0" width="320" height="160"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
-                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="img_placeHolder" translatesAutoresizingMaskIntoConstraints="NO" id="G92-eo-trM">
+                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="img_placeHolder" translatesAutoresizingMaskIntoConstraints="NO" id="G92-eo-trM">
                         <rect key="frame" x="0.0" y="15" width="98" height="130"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="130" id="04R-rQ-QYU"/>
@@ -89,7 +89,7 @@
                 <rect key="frame" x="0.0" y="0.0" width="320" height="124"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
-                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="img_placeHolder" translatesAutoresizingMaskIntoConstraints="NO" id="W3c-rb-Oax">
+                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="img_placeHolder" translatesAutoresizingMaskIntoConstraints="NO" id="W3c-rb-Oax">
                         <rect key="frame" x="15" y="15" width="130" height="80"/>
                         <constraints>
                             <constraint firstAttribute="width" constant="130" id="0U3-It-sbe"/>
@@ -177,7 +177,7 @@
                 <rect key="frame" x="0.0" y="0.0" width="320" height="88"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
-                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="img_placeHolder" translatesAutoresizingMaskIntoConstraints="NO" id="rHx-Wg-fcz">
+                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="img_placeHolder" translatesAutoresizingMaskIntoConstraints="NO" id="rHx-Wg-fcz">
                         <rect key="frame" x="15" y="24" width="40" height="40"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="40" id="YFM-DI-3Jb"/>
@@ -254,6 +254,6 @@
     <resources>
         <image name="Book_Musicplay_btn" width="11" height="12.5"/>
         <image name="Book_Videoplay_btn" width="24.5" height="28"/>
-        <image name="img_placeHolder" width="70" height="70"/>
+        <image name="img_placeHolder" width="800" height="800"/>
     </resources>
 </document>

smartRhino/Project/VCModel/Home/VC/BookStore/View/BookChanelCell.xib

@@ -17,7 +17,7 @@
                 <rect key="frame" x="0.0" y="0.0" width="194" height="126"/>
                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                 <subviews>
-                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="img_placeHolder" translatesAutoresizingMaskIntoConstraints="NO" id="9Pu-EG-58o">
+                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="img_placeHolder" translatesAutoresizingMaskIntoConstraints="NO" id="9Pu-EG-58o">
                         <rect key="frame" x="70" y="15" width="54" height="70"/>
                         <constraints>
                             <constraint firstAttribute="width" constant="54" id="SYJ-Ab-OWB"/>
@@ -49,6 +49,6 @@
         </collectionViewCell>
     </objects>
     <resources>
-        <image name="img_placeHolder" width="70" height="70"/>
+        <image name="img_placeHolder" width="800" height="800"/>
     </resources>
 </document>

smartRhino/Project/VCModel/Home/VC/BookStore/View/BookContentCell.xib

@@ -17,7 +17,7 @@
                 <rect key="frame" x="0.0" y="0.0" width="320" height="124"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
-                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="img_placeHolder" translatesAutoresizingMaskIntoConstraints="NO" id="G92-eo-trM">
+                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="img_placeHolder" translatesAutoresizingMaskIntoConstraints="NO" id="G92-eo-trM">
                         <rect key="frame" x="15" y="15" width="60" height="93.5"/>
                         <constraints>
                             <constraint firstAttribute="height" priority="750" constant="90" id="04R-rQ-QYU"/>
@@ -100,7 +100,7 @@
                 <rect key="frame" x="0.0" y="0.0" width="320" height="124"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
-                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="img_placeHolder" translatesAutoresizingMaskIntoConstraints="NO" id="W3c-rb-Oax">
+                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="img_placeHolder" translatesAutoresizingMaskIntoConstraints="NO" id="W3c-rb-Oax">
                         <rect key="frame" x="15" y="15" width="130" height="93.5"/>
                         <constraints>
                             <constraint firstAttribute="width" constant="130" id="0U3-It-sbe"/>
@@ -189,7 +189,7 @@
                 <rect key="frame" x="0.0" y="0.0" width="320" height="88"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
-                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="img_placeHolder" translatesAutoresizingMaskIntoConstraints="NO" id="rHx-Wg-fcz">
+                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="img_placeHolder" translatesAutoresizingMaskIntoConstraints="NO" id="rHx-Wg-fcz">
                         <rect key="frame" x="15" y="26.5" width="35" height="35"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="35" id="YFM-DI-3Jb"/>
@@ -255,6 +255,6 @@
     <resources>
         <image name="Book_Musicplay_btn" width="11" height="12.5"/>
         <image name="Book_Videoplay_btn" width="24.5" height="28"/>
-        <image name="img_placeHolder" width="70" height="70"/>
+        <image name="img_placeHolder" width="800" height="800"/>
     </resources>
 </document>

smartRhino/Project/VCModel/Home/VC/BookStore/View/BookContentLeftCell.m

@@ -32,9 +32,11 @@
 {
     self.NameL.text = model.title;
     if (model.isSelect) {
+        self.NameL.font = Kfont(18);
         self.BgView.backgroundColor = UIColorHex(0xFFFFFF);
         self.BlueView.hidden = NO;
     }else{
+        self.NameL.font = Kfont(16);
         self.BgView.backgroundColor = UIColorHex(0xEBEBEB);
         self.BlueView.hidden = YES;
     }

smartRhino/Project/VCModel/Home/VC/BookStore/View/BookDetailCell.xib

@@ -84,7 +84,7 @@
                 <rect key="frame" x="0.0" y="0.0" width="320" height="124"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
-                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="img_placeHolder" translatesAutoresizingMaskIntoConstraints="NO" id="uTI-hF-AKF">
+                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="img_placeHolder" translatesAutoresizingMaskIntoConstraints="NO" id="uTI-hF-AKF">
                         <rect key="frame" x="15" y="15" width="60" height="90"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="90" id="YMK-3n-SFj"/>
@@ -195,6 +195,6 @@
     </objects>
     <resources>
         <image name="Book_icongary" width="9.5" height="9"/>
-        <image name="img_placeHolder" width="70" height="70"/>
+        <image name="img_placeHolder" width="800" height="800"/>
     </resources>
 </document>

smartRhino/Project/VCModel/Home/VC/BookStore/View/BookHomeSubCell.h

@@ -18,6 +18,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (weak, nonatomic) IBOutlet NSLayoutConstraint *constant;
 @property (weak, nonatomic) IBOutlet UIView *lineV;
 @property (weak, nonatomic) IBOutlet UIView *conView;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *imgHeight;
 @property (assign, nonatomic) BookHomeType             type;
 - (void)setDataWithModel:(BookHomeSubModel *)model;
 - (void)setData;

smartRhino/Project/VCModel/Home/VC/BookStore/View/BookHomeSubCell.m

@@ -16,7 +16,38 @@
 }
 - (void)setDataWithModel:(BookHomeSubModel *)model
 {
-    self.constant.constant = 81.f;
+    switch (self.type) {
+        case BookHomeA:
+        {
+            self.constant.constant = 81.f;
+            self.imgHeight.constant = 81.f;
+        }
+            break;
+        case BookHomeB:
+        {
+            self.constant.constant = 81.f;
+            self.imgHeight.constant = 81.f;
+        }
+            break;
+        case BookHomeC:
+        {
+            self.constant.constant = 81.f;
+            self.imgHeight.constant = 81.f;
+        }
+            break;
+        case BookHomeD:
+        {
+            self.constant.constant = 81.f;
+            self.imgHeight.constant = 81.f;
+        }
+            break;
+        default:
+        {
+            self.constant.constant = 81.f;
+            self.imgHeight.constant = 81.f;
+        }
+            break;
+    }
     self.type = model.type;
     self.titleL.text = model.title;
     self.nameL.text = model.name;

smartRhino/Project/VCModel/Home/VC/BookStore/View/BookHomeSubCell.xib

@@ -11,36 +11,36 @@
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="" id="gTV-IL-0wX" customClass="BookHomeSubCell">
-            <rect key="frame" x="0.0" y="0.0" width="348" height="101"/>
+            <rect key="frame" x="0.0" y="0.0" width="348" height="121"/>
             <autoresizingMask key="autoresizingMask"/>
             <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
-                <rect key="frame" x="0.0" y="0.0" width="348" height="101"/>
+                <rect key="frame" x="0.0" y="0.0" width="348" height="121"/>
                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                 <subviews>
-                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="img_placeHolder" translatesAutoresizingMaskIntoConstraints="NO" id="bA2-sd-Bwc">
-                        <rect key="frame" x="20" y="0.0" width="56" height="81"/>
+                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="img_placeHolder" translatesAutoresizingMaskIntoConstraints="NO" id="bA2-sd-Bwc">
+                        <rect key="frame" x="20" y="0.0" width="65" height="94"/>
                         <constraints>
-                            <constraint firstAttribute="height" constant="81" id="Vo6-NV-DS7"/>
-                            <constraint firstAttribute="width" constant="56" id="pqY-EY-JbB"/>
+                            <constraint firstAttribute="height" constant="94" id="Vo6-NV-DS7"/>
+                            <constraint firstAttribute="width" secondItem="bA2-sd-Bwc" secondAttribute="height" multiplier="112:162" id="r58-ug-rNo"/>
                         </constraints>
                     </imageView>
                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="vsA-5i-JVn">
-                        <rect key="frame" x="91" y="0.0" width="237" height="81"/>
+                        <rect key="frame" x="100" y="0.0" width="228" height="94"/>
                         <subviews>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="252" verticalCompressionResistancePriority="751" text="小学教材全解(四年级语文下)" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="liJ-1z-MiV">
-                                <rect key="frame" x="0.0" y="0.0" width="237" height="21"/>
+                                <rect key="frame" x="0.0" y="0.0" width="228" 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="z8u-OB-Dnl">
-                                <rect key="frame" x="0.0" y="25" width="237" height="18"/>
+                                <rect key="frame" x="0.0" y="25" width="228" height="31"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="12"/>
                                 <color key="textColor" red="0.36470588235294116" green="0.39215686274509803" blue="0.43137254901960786" alpha="0.84705882352941175" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="252" verticalCompressionResistancePriority="749" usesAttributedText="YES" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="war-bn-c1x">
-                                <rect key="frame" x="0.0" y="47" width="237" height="34"/>
+                                <rect key="frame" x="0.0" y="60" width="228" height="34"/>
                                 <attributedString key="attributedText">
                                     <fragment>
                                         <string key="content">我们看重的是教给学生多少知识。在教育者眼中，学生就是一个装知识的容器，那个时候教育的成…
@@ -71,14 +71,14 @@
                             <constraint firstItem="liJ-1z-MiV" firstAttribute="top" secondItem="vsA-5i-JVn" secondAttribute="top" id="PYI-gJ-BLd"/>
                             <constraint firstItem="war-bn-c1x" firstAttribute="leading" secondItem="vsA-5i-JVn" secondAttribute="leading" id="Ph2-B5-XXK"/>
                             <constraint firstAttribute="trailing" secondItem="liJ-1z-MiV" secondAttribute="trailing" id="ZSs-Ld-7V6"/>
-                            <constraint firstAttribute="height" constant="81" id="rjc-0J-jhQ"/>
+                            <constraint firstAttribute="height" constant="94" id="rjc-0J-jhQ"/>
                             <constraint firstAttribute="trailing" secondItem="z8u-OB-Dnl" secondAttribute="trailing" id="uE5-52-hRx"/>
                             <constraint firstAttribute="bottom" secondItem="war-bn-c1x" secondAttribute="bottom" id="yfy-Nd-lLm"/>
                             <constraint firstItem="liJ-1z-MiV" firstAttribute="leading" secondItem="vsA-5i-JVn" secondAttribute="leading" id="z1c-Td-bjy"/>
                         </constraints>
                     </view>
                     <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Bc8-wf-3Ic">
-                        <rect key="frame" x="15" y="100.5" width="318" height="0.5"/>
+                        <rect key="frame" x="15" y="120.5" width="318" height="0.5"/>
                         <color key="backgroundColor" red="0.89803921568627454" green="0.89803921568627454" blue="0.89803921568627454" alpha="1" colorSpace="calibratedRGB"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="0.5" id="Fa9-Kc-SzP"/>
@@ -89,28 +89,30 @@
             <constraints>
                 <constraint firstAttribute="trailing" secondItem="Bc8-wf-3Ic" secondAttribute="trailing" constant="15" id="6Lw-y5-oOB"/>
                 <constraint firstItem="vsA-5i-JVn" firstAttribute="leading" secondItem="bA2-sd-Bwc" secondAttribute="trailing" constant="15" id="6yi-Fb-K8a"/>
+                <constraint firstAttribute="bottom" secondItem="Bc8-wf-3Ic" secondAttribute="bottom" id="7AL-vl-Mf1"/>
                 <constraint firstAttribute="trailing" secondItem="vsA-5i-JVn" secondAttribute="trailing" constant="20" id="ELT-O2-tLk"/>
                 <constraint firstItem="vsA-5i-JVn" firstAttribute="centerY" secondItem="bA2-sd-Bwc" secondAttribute="centerY" id="EVs-3f-JGh"/>
+                <constraint firstItem="Bc8-wf-3Ic" firstAttribute="top" secondItem="bA2-sd-Bwc" secondAttribute="bottom" priority="750" constant="15" id="SgZ-gd-cb8"/>
                 <constraint firstItem="bA2-sd-Bwc" firstAttribute="leading" secondItem="gTV-IL-0wX" secondAttribute="leading" constant="20" id="fU8-3I-kJ6"/>
                 <constraint firstItem="bA2-sd-Bwc" firstAttribute="top" secondItem="gTV-IL-0wX" secondAttribute="top" id="ffI-0V-uny"/>
-                <constraint firstAttribute="bottom" secondItem="Bc8-wf-3Ic" secondAttribute="bottom" id="oYp-0l-J0K"/>
                 <constraint firstItem="Bc8-wf-3Ic" firstAttribute="leading" secondItem="gTV-IL-0wX" secondAttribute="leading" constant="15" id="pPE-tv-Q5G"/>
             </constraints>
             <viewLayoutGuide key="safeArea" id="SEy-5g-ep8"/>
-            <size key="customSize" width="348" height="123"/>
+            <size key="customSize" width="348" height="143"/>
             <connections>
                 <outlet property="conView" destination="vsA-5i-JVn" id="jBD-T3-df2"/>
                 <outlet property="constant" destination="rjc-0J-jhQ" id="DRl-0J-q3R"/>
                 <outlet property="imagV" destination="bA2-sd-Bwc" id="HBB-dP-aM7"/>
+                <outlet property="imgHeight" destination="Vo6-NV-DS7" id="xMC-km-Y2S"/>
                 <outlet property="lineV" destination="Bc8-wf-3Ic" id="Uvx-39-gE9"/>
                 <outlet property="nameL" destination="z8u-OB-Dnl" id="pAX-xZ-Ycp"/>
                 <outlet property="subTitleL" destination="war-bn-c1x" id="dTG-hc-3ox"/>
                 <outlet property="titleL" destination="liJ-1z-MiV" id="wv7-b3-TNI"/>
             </connections>
-            <point key="canvasLocation" x="352.17391304347831" y="164.39732142857142"/>
+            <point key="canvasLocation" x="352.17391304347831" y="171.09375"/>
         </collectionViewCell>
     </objects>
     <resources>
-        <image name="img_placeHolder" width="50" height="50"/>
+        <image name="img_placeHolder" width="800" height="800"/>
     </resources>
 </document>

smartRhino/Project/VCModel/Home/VC/BookStore/View/BookMingArticeListVC.m

@@ -35,7 +35,7 @@ static UINib *ViewNib = nil;
     UIImageView * imagV = [UIImageView new];
     [view addSubview:imagV];
     imagV.image = IMG(@"img_placeHolder");
-    imagV.contentMode = UIViewContentModeScaleToFill;
+    imagV.contentMode = UIViewContentModeScaleAspectFit;
     [imagV mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.mas_offset(27.5);
         make.centerY.mas_equalTo(view);

smartRhino/Project/VCModel/Home/VC/BookStore/View/BookPeriodicaCell.xib

@@ -17,7 +17,7 @@
                 <rect key="frame" x="0.0" y="0.0" width="320" height="161"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
-                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="img_placeHolder" translatesAutoresizingMaskIntoConstraints="NO" id="RO9-F4-g65">
+                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="img_placeHolder" translatesAutoresizingMaskIntoConstraints="NO" id="RO9-F4-g65">
                         <rect key="frame" x="15" y="18" width="60" height="124.5"/>
                         <constraints>
                             <constraint firstAttribute="width" constant="60" id="O4z-Mg-T1q"/>
@@ -92,6 +92,6 @@
         </tableViewCell>
     </objects>
     <resources>
-        <image name="img_placeHolder" width="50" height="50"/>
+        <image name="img_placeHolder" width="800" height="800"/>
     </resources>
 </document>

smartRhino/Project/VCModel/Home/VC/BookStore/View/BookPublicBookCell.xib

@@ -17,7 +17,7 @@
                 <rect key="frame" x="0.0" y="0.0" width="320" height="161"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
-                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="img_placeHolder" translatesAutoresizingMaskIntoConstraints="NO" id="nwG-Zc-T3u">
+                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="img_placeHolder" translatesAutoresizingMaskIntoConstraints="NO" id="nwG-Zc-T3u">
                         <rect key="frame" x="15" y="18" width="68" height="124.5"/>
                         <constraints>
                             <constraint firstAttribute="height" priority="750" constant="90" id="RLR-8I-dG9"/>
@@ -119,6 +119,6 @@
     </objects>
     <resources>
         <image name="Book_start_gray" width="17.5" height="15.5"/>
-        <image name="img_placeHolder" width="50" height="50"/>
+        <image name="img_placeHolder" width="800" height="800"/>
     </resources>
 </document>

smartRhino/Project/VCModel/Home/VC/BookStore/View/BookSubArticeCell.xib

@@ -17,7 +17,7 @@
                 <rect key="frame" x="0.0" y="0.0" width="320" height="120"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
-                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="img_placeHolder" translatesAutoresizingMaskIntoConstraints="NO" id="IhC-i6-RZM">
+                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="img_placeHolder" translatesAutoresizingMaskIntoConstraints="NO" id="IhC-i6-RZM">
                         <rect key="frame" x="227" y="15" width="80" height="89.5"/>
                         <constraints>
                             <constraint firstAttribute="height" priority="750" constant="80" id="Au0-P8-4CV"/>
@@ -103,6 +103,6 @@
         </tableViewCell>
     </objects>
     <resources>
-        <image name="img_placeHolder" width="70" height="70"/>
+        <image name="img_placeHolder" width="800" height="800"/>
     </resources>
 </document>

smartRhino/Project/VCModel/Home/VC/HomeViewController.m

@@ -488,28 +488,29 @@
             switch (model.cellID) {
                 case 1:
                 {
-                    UILabel * label = [[UILabel alloc] initWithFrame: CGRectMake(0, 0, SCREEN_WIDTH - 30, 18)];
-                    label.text = model.Title;
-                    label.font = [UIFont systemFontOfSize:18];
-                    label.numberOfLines = 2;
-                    CGSize maxSize = CGSizeMake(label.bounds.size.width, CGFLOAT_MAX);
-                    CGSize newSize = [label sizeThatFits:maxSize];
-                    int height = 50 + newSize.height;
-                    return height;
+//                    UILabel * label = [UILabel new];
+//                    label.text = model.Title;
+//                    label.font = [UIFont systemFontOfSize:18];
+//                    label.numberOfLines = 2;
+//                    CGSize maxSize = CGSizeMake(SCREEN_WIDTH - 30, CGFLOAT_MAX);
+//                    CGSize newSize = [label sizeThatFits:maxSize];
+//                    int height = 49 + newSize.height;
+//                    return height;
+                    return UITableViewAutomaticDimension;
                 }
                     break;
                 case 2:
-                    return 115;
+                    return 112;
                     break;
                 case 3:
                 {
-                    UILabel * label = [[UILabel alloc] initWithFrame: CGRectMake(0, 0, SCREEN_WIDTH - 30, 18)];
+                    UILabel * label = [UILabel new];
                     label.text = model.Title;
-                    label.font = [UIFont systemFontOfSize:18];
+                    label.font = [UIFont fontWithName:@"PingFang SC" size:18];
                     label.numberOfLines = 2;
-                    CGSize maxSize = CGSizeMake(label.bounds.size.width, CGFLOAT_MAX);
+                    CGSize maxSize = CGSizeMake(SCREEN_WIDTH - 30.f, CGFLOAT_MAX);
                     CGSize newSize = [label sizeThatFits:maxSize];
-                    int height = 86 * (kGXScreenWidth / 375.0) + 67 + newSize.height;
+                    NSInteger height = 86.f / 336.f * (SCREEN_WIDTH - 30.f) + 52.5f + newSize.height;
                     return height;
                 }
                     break;
@@ -531,7 +532,7 @@
             HomeListWorkCell *cell = (HomeListWorkCell *)[tableView dequeueReusableCellWithIdentifier:@"HomeListWorkCell"];
             if (cell != nil && self.dataSource.count > 0) {
                 if (indexPath.row == 0) {
-                    cell.top.constant = 19.f;
+                    cell.top.constant = 11.f;
                 }
                 [cell loadSearchData:model];
             }
@@ -542,7 +543,7 @@
         {
             HomeMusicCell * cell = [HomeMusicCell configCell:tableView indexPath:indexPath];
             if (indexPath.row == 0) {
-                cell.height.constant = 1.5f;
+                cell.height.constant = -2.f;
             }
             return cell;
         }
@@ -551,6 +552,7 @@
         {
             HomeSchoolCell * cell = [HomeSchoolCell configCell:tableView indexPath:indexPath];
             if (indexPath.row == 0) {
+                cell.height.constant = -4.f;
                 cell.topView.backgroundColor = [UIColor whiteColor];
             }
             [cell setData];
@@ -560,6 +562,9 @@
         case 4:
         {
             HomeUserPrivilegeCell * cell = [HomeUserPrivilegeCell configCell:tableView indexPath:indexPath];
+            if (indexPath.row == 0) {
+                cell.height.constant = 11.f;
+            }
             BOOL isEnd = self.dataSource.count - 1 == indexPath.row;
             [cell setDataWithItem:indexPath.row isUnUser:isEnd];
             return cell;
@@ -568,6 +573,9 @@
         case 5:
         {
             HomeWeiCousreCell * cell = [HomeWeiCousreCell configCell0:tableView indexPath:indexPath];
+            if (indexPath.row == 0) {
+                cell.height.constant = 11.f;
+            }
             return cell;
         }
             break;
@@ -575,6 +583,7 @@
         {
             if (indexPath.row == 0) {
                 HomeProblemTopCell * cell = [HomeProblemTopCell configCell0:tableView indexPath:indexPath];
+                cell.height.constant = -2.f;
                 [cell setData];
                 return cell;
             }else{
@@ -586,6 +595,9 @@
         case 7:
         {
             HomeGoodBookCell * cell = [HomeGoodBookCell configCell:tableView indexPath:indexPath];
+            if (indexPath.row == 0) {
+                cell.height.constant = 11.f;
+            }
             BOOL isEnd = self.dataSource.count - 1 == indexPath.row;
             [cell setDataWithItem:indexPath.row isUnUser:isEnd];
             cell.ClickIndexBlock = ^{

smartRhino/Project/VCModel/Home/VC/View/Cell/HomeGoodBookCell.h

@@ -15,6 +15,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (weak, nonatomic) IBOutlet UIButton *huanBtn;
 @property (weak, nonatomic) IBOutlet UICollectionView *collectionView;
 @property (weak, nonatomic) IBOutlet NSLayoutConstraint *collectH;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *height;
 @property (assign, nonatomic)NSInteger   type;
 @property (copy, nonatomic) void(^ClickIndexBlock)(void);
 + (HomeGoodBookCell *)configCell:(UITableView *)tableView indexPath:(NSIndexPath *)indexPath;

smartRhino/Project/VCModel/Home/VC/View/Cell/HomeGoodBookCell.xib

@@ -98,6 +98,7 @@
                 <outlet property="TitleL" destination="kmx-3v-ANh" id="jhJ-lV-4mD"/>
                 <outlet property="collectH" destination="Gf8-xE-dZW" id="SZr-Cb-Vaa"/>
                 <outlet property="collectionView" destination="ysF-Xb-9r9" id="OdI-Jd-VWT"/>
+                <outlet property="height" destination="m9c-up-lDO" id="mXg-13-IIr"/>
                 <outlet property="huanBtn" destination="eXD-Mb-dOw" id="uT8-44-X7i"/>
             </connections>
             <point key="canvasLocation" x="0.0" y="150.66964285714286"/>

smartRhino/Project/VCModel/Home/VC/View/Cell/HomeGoodBookCollectCell.xib

@@ -17,7 +17,7 @@
                 <rect key="frame" x="0.0" y="0.0" width="99" height="190"/>
                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                 <subviews>
-                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="img_placeHolder" translatesAutoresizingMaskIntoConstraints="NO" id="QPI-af-UiU">
+                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="img_placeHolder" translatesAutoresizingMaskIntoConstraints="NO" id="QPI-af-UiU">
                         <rect key="frame" x="15" y="0.0" width="69" height="96"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="96" id="kC6-ZV-nYz"/>
@@ -59,6 +59,6 @@
         </collectionViewCell>
     </objects>
     <resources>
-        <image name="img_placeHolder" width="70" height="70"/>
+        <image name="img_placeHolder" width="800" height="800"/>
     </resources>
 </document>

smartRhino/Project/VCModel/Home/VC/View/Cell/HomeMusicCell.xib

@@ -24,7 +24,7 @@
                             <constraint firstAttribute="height" id="rHG-yz-ama"/>
                         </constraints>
                     </view>
-                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="img_placeHolder" translatesAutoresizingMaskIntoConstraints="NO" id="MFp-Pv-IJS">
+                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="img_placeHolder" translatesAutoresizingMaskIntoConstraints="NO" id="MFp-Pv-IJS">
                         <rect key="frame" x="15" y="30" width="40" height="40"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="40" id="IYf-89-w3Z"/>
@@ -154,6 +154,6 @@
         <image name="Book_Musicplay_btn" width="11" height="12.5"/>
         <image name="home_guangbo_icon" width="11" height="11"/>
         <image name="home_ting_icon" width="12.5" height="10.5"/>
-        <image name="img_placeHolder" width="50" height="50"/>
+        <image name="img_placeHolder" width="800" height="800"/>
     </resources>
 </document>

smartRhino/Project/VCModel/Home/VC/View/Cell/HomeProblemTopCell.h

@@ -23,6 +23,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (weak, nonatomic) IBOutlet UILabel *timeL;
 @property (weak, nonatomic) IBOutlet UIImageView *yanV;
 @property (weak, nonatomic) IBOutlet UILabel *numL;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *height;
 
 + (HomeProblemTopCell *)configCell0:(UITableView *)tableView indexPath:(NSIndexPath *)indexPath;
 + (HomeProblemTopCell *)configCell1:(UITableView *)tableView indexPath:(NSIndexPath *)indexPath;

smartRhino/Project/VCModel/Home/VC/View/Cell/HomeProblemTopCell.xib

@@ -129,6 +129,7 @@
             <connections>
                 <outlet property="TopBtn" destination="KTX-8l-iwG" id="Eb8-n6-dFo"/>
                 <outlet property="collectionView" destination="8xE-K0-gVr" id="CQI-2V-n3A"/>
+                <outlet property="height" destination="saF-sq-8PP" id="WYQ-q0-eiZ"/>
                 <outlet property="topContentL" destination="0fc-Ma-pCc" id="2qH-bL-vxT"/>
                 <outlet property="topTitleL" destination="86u-fE-ywa" id="laP-dm-mc6"/>
             </connections>
@@ -147,7 +148,7 @@
                         <color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <nil key="highlightedColor"/>
                     </label>
-                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="img_placeHolder" translatesAutoresizingMaskIntoConstraints="NO" id="fSS-a1-YvI">
+                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="img_placeHolder" translatesAutoresizingMaskIntoConstraints="NO" id="fSS-a1-YvI">
                         <rect key="frame" x="259" y="28.5" width="101" height="76"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="76" id="1pA-l4-ejS"/>
@@ -239,6 +240,6 @@
     </objects>
     <resources>
         <image name="Home_yun_icon" width="15" height="11"/>
-        <image name="img_placeHolder" width="50" height="50"/>
+        <image name="img_placeHolder" width="800" height="800"/>
     </resources>
 </document>

smartRhino/Project/VCModel/Home/VC/View/Cell/HomeProblemTopCollectCell.xib

@@ -17,7 +17,7 @@
                 <rect key="frame" x="0.0" y="0.0" width="231" height="138"/>
                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                 <subviews>
-                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="img_placeHolder" translatesAutoresizingMaskIntoConstraints="NO" id="4rc-NE-1Bd">
+                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="img_placeHolder" translatesAutoresizingMaskIntoConstraints="NO" id="4rc-NE-1Bd">
                         <rect key="frame" x="0.0" y="0.0" width="231" height="138"/>
                         <userDefinedRuntimeAttributes>
                             <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
@@ -43,6 +43,6 @@
         </collectionViewCell>
     </objects>
     <resources>
-        <image name="img_placeHolder" width="70" height="70"/>
+        <image name="img_placeHolder" width="800" height="800"/>
     </resources>
 </document>

smartRhino/Project/VCModel/Home/VC/View/Cell/HomeSchoolCell.h

@@ -21,6 +21,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (weak, nonatomic) IBOutlet NSLayoutConstraint *numW;
 @property (weak, nonatomic) IBOutlet NSLayoutConstraint *levelW;
 @property (weak, nonatomic) IBOutlet UIView *topView;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *height;
 
 + (HomeSchoolCell *)configCell:(UITableView *)tableView indexPath:(NSIndexPath *)indexPath;
 - (void)setData;

smartRhino/Project/VCModel/Home/VC/View/Cell/HomeSchoolCell.xib

@@ -17,7 +17,7 @@
                 <rect key="frame" x="0.0" y="0.0" width="320" height="149"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
-                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="img_placeHolder" translatesAutoresizingMaskIntoConstraints="NO" id="6t5-sz-xts">
+                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="img_placeHolder" translatesAutoresizingMaskIntoConstraints="NO" id="6t5-sz-xts">
                         <rect key="frame" x="15" y="47" width="55" height="55"/>
                         <constraints>
                             <constraint firstAttribute="width" constant="55" id="YmV-s4-Hjk"/>
@@ -118,6 +118,7 @@
             <connections>
                 <outlet property="addW" destination="KzU-gR-tGM" id="FBI-Yl-7tE"/>
                 <outlet property="addressL" destination="DnW-RR-GG7" id="4Pr-Cp-LdD"/>
+                <outlet property="height" destination="Hvb-Ov-vqO" id="X7t-f4-cP0"/>
                 <outlet property="imagV" destination="6t5-sz-xts" id="bbt-Zc-dWe"/>
                 <outlet property="levelL" destination="yaU-j5-jfH" id="P2H-dW-AB8"/>
                 <outlet property="levelW" destination="CTR-fK-UrO" id="FSy-36-H60"/>
@@ -131,6 +132,6 @@
         </tableViewCell>
     </objects>
     <resources>
-        <image name="img_placeHolder" width="50" height="50"/>
+        <image name="img_placeHolder" width="800" height="800"/>
     </resources>
 </document>

smartRhino/Project/VCModel/Home/VC/View/Cell/HomeTableViewCell.xib

@@ -18,7 +18,7 @@
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="252" usesAttributedText="YES" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YgE-8E-OAL">
-                        <rect key="frame" x="14" y="12.999999999999998" width="346" height="25.333333333333329"/>
+                        <rect key="frame" x="14" y="10.999999999999998" width="346" height="25.333333333333329"/>
                         <attributedString key="attributedText">
                             <fragment content="Label">
                                 <attributes>
@@ -31,25 +31,22 @@
                         <nil key="highlightedColor"/>
                     </label>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="KFl-uC-noW">
-                        <rect key="frame" x="14" y="53.333333333333336" width="31" height="17.333333333333336"/>
-                        <constraints>
-                            <constraint firstAttribute="width" relation="greaterThanOrEqual" id="ggo-zy-ZPI"/>
-                        </constraints>
+                        <rect key="frame" x="14" y="51.333333333333336" width="31" height="20.333333333333336"/>
                         <fontDescription key="fontDescription" type="system" pointSize="12"/>
                         <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_browse" translatesAutoresizingMaskIntoConstraints="NO" id="KbR-uD-9vR">
-                        <rect key="frame" x="59.999999999999993" y="57.333333333333336" width="12.666666666666664" height="9.0000000000000071"/>
+                        <rect key="frame" x="59.999999999999993" y="57" width="12.666666666666664" height="9"/>
                     </imageView>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7Co-Gx-Kdg">
-                        <rect key="frame" x="77.666666666666671" y="54.666666666666664" width="31" height="14.333333333333336"/>
+                        <rect key="frame" x="77.666666666666671" y="54.333333333333336" width="31" height="14.333333333333336"/>
                         <fontDescription key="fontDescription" type="system" pointSize="12"/>
                         <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Khb-wA-qTJ" customClass="TDButton">
-                        <rect key="frame" x="355" y="51" width="8" height="22"/>
+                        <rect key="frame" x="355" y="50.333333333333336" width="8" height="22.000000000000007"/>
                         <state key="normal" image="icon_delete"/>
                         <connections>
                             <action selector="deleteButtonClicked:" destination="KGk-i7-Jjw" eventType="touchUpInside" id="atU-JK-psD"/>
@@ -69,13 +66,13 @@
                     <constraint firstItem="KbR-uD-9vR" firstAttribute="centerY" secondItem="KFl-uC-noW" secondAttribute="centerY" id="Dm5-xv-lAV"/>
                     <constraint firstItem="KbR-uD-9vR" firstAttribute="leading" secondItem="KFl-uC-noW" secondAttribute="trailing" constant="15" id="EtK-sG-SeL"/>
                     <constraint firstItem="KFl-uC-noW" firstAttribute="leading" secondItem="YgE-8E-OAL" secondAttribute="leading" id="Gg9-XC-LVC"/>
-                    <constraint firstItem="99F-nx-eFU" firstAttribute="top" secondItem="KFl-uC-noW" secondAttribute="bottom" constant="12" id="JVK-v7-caS"/>
+                    <constraint firstItem="99F-nx-eFU" firstAttribute="top" secondItem="KFl-uC-noW" secondAttribute="bottom" constant="11" id="JVK-v7-caS"/>
                     <constraint firstItem="99F-nx-eFU" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" id="cLv-S8-9mQ"/>
                     <constraint firstItem="KFl-uC-noW" firstAttribute="top" secondItem="YgE-8E-OAL" secondAttribute="bottom" constant="15" id="dUx-PI-QlX"/>
                     <constraint firstItem="YgE-8E-OAL" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="14" id="dqw-xd-oGI"/>
                     <constraint firstAttribute="trailing" secondItem="99F-nx-eFU" secondAttribute="trailing" id="gz5-Sp-amn"/>
                     <constraint firstItem="7Co-Gx-Kdg" firstAttribute="leading" secondItem="KbR-uD-9vR" secondAttribute="trailing" constant="5" id="iK7-Qr-fOK"/>
-                    <constraint firstItem="YgE-8E-OAL" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" constant="13" id="ipH-Gs-VcG"/>
+                    <constraint firstItem="YgE-8E-OAL" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" constant="11" id="ipH-Gs-VcG"/>
                     <constraint firstItem="Khb-wA-qTJ" firstAttribute="centerY" secondItem="7Co-Gx-Kdg" secondAttribute="centerY" id="jDw-YB-mHT"/>
                     <constraint firstItem="7Co-Gx-Kdg" firstAttribute="centerY" secondItem="KbR-uD-9vR" secondAttribute="centerY" id="onW-Ec-vvz"/>
                     <constraint firstAttribute="trailing" secondItem="Khb-wA-qTJ" secondAttribute="trailing" constant="12" id="sLg-MI-7Pi"/>
@@ -231,7 +228,7 @@
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" usesAttributedText="YES" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="D1f-np-HIe">
-                        <rect key="frame" x="14" y="11.999999999999998" width="346" height="25.333333333333329"/>
+                        <rect key="frame" x="14" y="10.999999999999998" width="346" height="25.333333333333329"/>
                         <attributedString key="attributedText">
                             <fragment content="Label">
                                 <attributes>
@@ -244,29 +241,29 @@
                         <nil key="highlightedColor"/>
                     </label>
                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_browse" translatesAutoresizingMaskIntoConstraints="NO" id="gg6-h5-8jf">
-                        <rect key="frame" x="59.999999999999993" y="143.66666666666666" width="12.666666666666664" height="9"/>
+                        <rect key="frame" x="59.999999999999993" y="142.33333333333334" width="12.666666666666664" height="9"/>
                     </imageView>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="z52-4O-pBu">
-                        <rect key="frame" x="77.666666666666671" y="141" width="31" height="14.333333333333343"/>
+                        <rect key="frame" x="77.666666666666671" y="139.66666666666666" width="31" height="14.333333333333343"/>
                         <fontDescription key="fontDescription" type="system" pointSize="12"/>
                         <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="f09-N9-sQv" customClass="TDButton">
-                        <rect key="frame" x="355" y="137" width="8" height="22"/>
+                        <rect key="frame" x="355" y="135.66666666666666" width="8" height="22"/>
                         <state key="normal" image="icon_delete"/>
                         <connections>
                             <action selector="deleteButtonClicked:" destination="X5B-D5-66E" eventType="touchUpInside" id="Nxm-zQ-s1n"/>
                         </connections>
                     </button>
                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="GIO-Ee-ceQ">
-                        <rect key="frame" x="14.666666666666657" y="42.333333333333336" width="346" height="88.666666666666657"/>
+                        <rect key="frame" x="15" y="41.333333333333336" width="345" height="88.333333333333314"/>
                         <subviews>
                             <stackView opaque="NO" contentMode="scaleToFill" distribution="fillEqually" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="eJF-jW-6lE">
-                                <rect key="frame" x="0.0" y="0.0" width="346" height="88.666666666666671"/>
+                                <rect key="frame" x="0.0" y="0.0" width="345" height="88.333333333333329"/>
                                 <subviews>
                                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="img_placeHolder" translatesAutoresizingMaskIntoConstraints="NO" id="Iau-oY-FmX">
-                                        <rect key="frame" x="0.0" y="0.0" width="112" height="88.666666666666671"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="111.66666666666667" height="88.333333333333329"/>
                                         <userDefinedRuntimeAttributes>
                                             <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
                                                 <integer key="value" value="3"/>
@@ -275,7 +272,7 @@
                                         </userDefinedRuntimeAttributes>
                                     </imageView>
                                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="img_placeHolder" translatesAutoresizingMaskIntoConstraints="NO" id="DP8-dp-i97">
-                                        <rect key="frame" x="117" y="0.0" width="112" height="88.666666666666671"/>
+                                        <rect key="frame" x="116.66666666666666" y="0.0" width="111.66666666666666" height="88.333333333333329"/>
                                         <userDefinedRuntimeAttributes>
                                             <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
                                                 <integer key="value" value="3"/>
@@ -284,7 +281,7 @@
                                         </userDefinedRuntimeAttributes>
                                     </imageView>
                                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="img_placeHolder" translatesAutoresizingMaskIntoConstraints="NO" id="r2f-7M-sRO">
-                                        <rect key="frame" x="234" y="0.0" width="112" height="88.666666666666671"/>
+                                        <rect key="frame" x="233.33333333333334" y="0.0" width="111.66666666666666" height="88.333333333333329"/>
                                         <userDefinedRuntimeAttributes>
                                             <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
                                                 <integer key="value" value="3"/>
@@ -304,15 +301,8 @@
                             <constraint firstAttribute="width" secondItem="GIO-Ee-ceQ" secondAttribute="height" multiplier="336:86" id="q3u-G2-UOC"/>
                         </constraints>
                     </view>
-                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="om6-uj-wjn">
-                        <rect key="frame" x="0.0" y="171" width="375" height="0.66666666666665719"/>
-                        <color key="backgroundColor" red="0.90980392156862744" green="0.90980392156862744" blue="0.90980392156862744" alpha="1" colorSpace="calibratedRGB"/>
-                        <constraints>
-                            <constraint firstAttribute="height" constant="0.5" id="8du-gk-REQ"/>
-                        </constraints>
-                    </view>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="HBg-V9-ax8">
-                        <rect key="frame" x="14" y="141" width="31" height="14.333333333333343"/>
+                        <rect key="frame" x="14" y="139.66666666666666" width="31" height="14.333333333333343"/>
                         <constraints>
                             <constraint firstAttribute="width" relation="greaterThanOrEqual" id="7id-CB-wl7"/>
                         </constraints>
@@ -320,18 +310,25 @@
                         <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
+                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="om6-uj-wjn">
+                        <rect key="frame" x="0.0" y="165.66666666666666" width="375" height="0.33333333333334281"/>
+                        <color key="backgroundColor" red="0.90980392156862744" green="0.90980392156862744" blue="0.90980392156862744" alpha="1" colorSpace="calibratedRGB"/>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="0.5" id="8du-gk-REQ"/>
+                        </constraints>
+                    </view>
                 </subviews>
                 <constraints>
                     <constraint firstItem="z52-4O-pBu" firstAttribute="centerY" secondItem="HBg-V9-ax8" secondAttribute="centerY" id="0za-Oe-kDm"/>
-                    <constraint firstItem="om6-uj-wjn" firstAttribute="top" secondItem="f09-N9-sQv" secondAttribute="bottom" constant="12" id="39O-Sd-XTx"/>
+                    <constraint firstItem="om6-uj-wjn" firstAttribute="top" secondItem="GIO-Ee-ceQ" secondAttribute="bottom" constant="36" id="39O-Sd-XTx"/>
                     <constraint firstItem="HBg-V9-ax8" firstAttribute="leading" secondItem="gB2-UJ-p7H" secondAttribute="leading" constant="14" id="Eio-gY-3Dv"/>
                     <constraint firstItem="z52-4O-pBu" firstAttribute="leading" secondItem="gg6-h5-8jf" secondAttribute="trailing" constant="5" id="F4m-x2-5PY"/>
                     <constraint firstItem="om6-uj-wjn" firstAttribute="leading" secondItem="gB2-UJ-p7H" secondAttribute="leading" id="Iva-Fp-72n"/>
                     <constraint firstAttribute="trailing" secondItem="f09-N9-sQv" secondAttribute="trailing" constant="12" id="Jwu-rV-hzo"/>
                     <constraint firstItem="gg6-h5-8jf" firstAttribute="centerY" secondItem="HBg-V9-ax8" secondAttribute="centerY" id="Pts-yC-0U8"/>
-                    <constraint firstItem="D1f-np-HIe" firstAttribute="top" secondItem="gB2-UJ-p7H" secondAttribute="top" constant="12" id="SJO-hO-PGb"/>
-                    <constraint firstItem="GIO-Ee-ceQ" firstAttribute="leading" secondItem="gB2-UJ-p7H" secondAttribute="leading" constant="14.5" id="Txb-l5-Dm5"/>
-                    <constraint firstAttribute="trailing" secondItem="GIO-Ee-ceQ" secondAttribute="trailing" constant="14.5" id="WME-hq-noA"/>
+                    <constraint firstItem="D1f-np-HIe" firstAttribute="top" secondItem="gB2-UJ-p7H" secondAttribute="top" constant="11" id="SJO-hO-PGb"/>
+                    <constraint firstItem="GIO-Ee-ceQ" firstAttribute="leading" secondItem="gB2-UJ-p7H" secondAttribute="leading" constant="15" id="Txb-l5-Dm5"/>
+                    <constraint firstAttribute="trailing" secondItem="GIO-Ee-ceQ" secondAttribute="trailing" constant="15" id="WME-hq-noA"/>
                     <constraint firstAttribute="trailing" secondItem="D1f-np-HIe" secondAttribute="trailing" constant="15" id="Y5o-ve-0pT"/>
                     <constraint firstItem="HBg-V9-ax8" firstAttribute="top" secondItem="GIO-Ee-ceQ" secondAttribute="bottom" constant="10" id="elO-VQ-JcO"/>
                     <constraint firstAttribute="trailing" secondItem="om6-uj-wjn" secondAttribute="trailing" id="kf9-UU-0FF"/>
@@ -359,6 +356,6 @@
     <resources>
         <image name="icon_browse" width="12.666666984558105" height="9"/>
         <image name="icon_delete" width="8" height="8.6666669845581055"/>
-        <image name="img_placeHolder" width="48" height="48"/>
+        <image name="img_placeHolder" width="800" height="800"/>
     </resources>
 </document>

smartRhino/Project/VCModel/Home/VC/View/Cell/HomeUserPrivilegeCell.h

@@ -17,6 +17,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (weak, nonatomic) IBOutlet NSLayoutConstraint *collectH;
 @property (weak, nonatomic) IBOutlet UIView *ShowView;
 @property (weak, nonatomic) IBOutlet UILabel *showTitleL;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *height;
 + (HomeUserPrivilegeCell *)configCell:(UITableView *)tableView indexPath:(NSIndexPath *)indexPath;
 - (void)setDataWithItem:(NSInteger)Item isUnUser:(BOOL)isUser;
 @end

smartRhino/Project/VCModel/Home/VC/View/Cell/HomeUserPrivilegeCell.m

@@ -41,12 +41,12 @@
 
 - (void)setDataWithItem:(NSInteger)Item isUnUser:(BOOL)isUser
 {
-    self.collectH.constant = 101.f * 3;
+    self.collectH.constant = 109.f * 3;
     [self.contentView setBackgroundColor:Item % 2 == 0 ? UIColorHex(0xFFFFFF) : UIColorHex(0xF7F7F9)];
     [self.collectionView setBackgroundColor:Item % 2 == 0 ? UIColorHex(0xFFFFFF) : UIColorHex(0xF7F7F9)];
 
     UICollectionViewFlowLayout * layout = [[UICollectionViewFlowLayout alloc]init];
-    [self.collectionView setContentSize:CGSizeMake(SCREEN_WIDTH, 101 * 3)];
+    [self.collectionView setContentSize:CGSizeMake(SCREEN_WIDTH, 109 * 3)];
     layout.sectionInset = UIEdgeInsetsMake(0, 0, 0, 0);
     [self.collectionView setCollectionViewLayout:layout];
     [self.collectionView setContentOffset:CGPointZero animated:NO];
@@ -79,7 +79,7 @@
 }
 -(CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath
 {
-    return CGSizeMake(SCREEN_WIDTH, 101);
+    return CGSizeMake(SCREEN_WIDTH, 109);
 }
 
 - (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath

smartRhino/Project/VCModel/Home/VC/View/Cell/HomeUserPrivilegeCell.xib

@@ -96,6 +96,7 @@
                 <outlet property="TitleL" destination="hAY-uY-bAk" id="SRX-kX-law"/>
                 <outlet property="collectH" destination="3y8-3h-fwa" id="UBG-NE-Gkr"/>
                 <outlet property="collectionView" destination="pX8-ub-ERT" id="nYm-gY-kiG"/>
+                <outlet property="height" destination="nOO-gd-D7c" id="zeg-BY-gqu"/>
                 <outlet property="lookBtn" destination="WGF-vK-EYA" id="SFn-P3-liK"/>
                 <outlet property="showTitleL" destination="OGf-9P-E8c" id="Frc-Fh-LC1"/>
             </connections>

smartRhino/Project/VCModel/Home/VC/View/Cell/HomeWeiCousreCell.h

@@ -25,6 +25,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (weak, nonatomic) IBOutlet UILabel *jianjieL;
 @property (weak, nonatomic) IBOutlet NSLayoutConstraint *lineLeft;
 @property (weak, nonatomic) IBOutlet NSLayoutConstraint *lineRight;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *height;
 @property (strong, nonatomic) NSMutableArray  *dataArray;
 + (HomeWeiCousreCell *)configCell0:(UITableView *)tableView indexPath:(NSIndexPath *)indexPath;
 + (HomeWeiCousreCell *)configCell1:(UITableView *)tableView indexPath:(NSIndexPath *)indexPath;

smartRhino/Project/VCModel/Home/VC/View/Cell/HomeWeiCousreCell.xib

@@ -20,7 +20,7 @@
                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Xwu-8Z-Lpc">
                         <rect key="frame" x="15" y="25.5" width="115" height="76"/>
                         <subviews>
-                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="img_placeHolder" translatesAutoresizingMaskIntoConstraints="NO" id="JQz-WS-Pz6">
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="img_placeHolder" translatesAutoresizingMaskIntoConstraints="NO" id="JQz-WS-Pz6">
                                 <rect key="frame" x="0.0" y="0.0" width="115" height="76"/>
                             </imageView>
                         </subviews>
@@ -103,6 +103,7 @@
             </tableViewCellContentView>
             <viewLayoutGuide key="safeArea" id="aW0-zy-SZf"/>
             <connections>
+                <outlet property="height" destination="cc2-g3-nTO" id="5ph-eZ-Tdi"/>
                 <outlet property="imgV" destination="JQz-WS-Pz6" id="pOR-D3-750"/>
                 <outlet property="lineLeft" destination="eHj-99-bAV" id="9PX-Bf-emx"/>
                 <outlet property="lineRight" destination="0Vl-zy-lWM" id="XiI-aF-2oE"/>
@@ -297,6 +298,6 @@
     <resources>
         <image name="Book_rightjian_icon" width="8" height="14"/>
         <image name="Home_yun_icon" width="15" height="11"/>
-        <image name="img_placeHolder" width="70" height="70"/>
+        <image name="img_placeHolder" width="800" height="800"/>
     </resources>
 </document>

smartRhino/Project/VCModel/My_Center/Controller/ColletionVC/Favorite.storyboard

@@ -66,11 +66,11 @@
                                                 </connections>
                                             </button>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="我的收藏" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="NwW-CR-NTw">
-                                                <rect key="frame" x="170.33333333333334" y="11" width="73.666666666666657" height="22"/>
+                                                <rect key="frame" x="174.33333333333334" y="11.999999999999998" width="65.333333333333343" height="20.333333333333329"/>
                                                 <constraints>
                                                     <constraint firstAttribute="width" relation="lessThanOrEqual" constant="150" id="qNi-jp-5Vc"/>
                                                 </constraints>
-                                                <fontDescription key="fontDescription" type="system" pointSize="18"/>
+                                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                 <color key="textColor" red="0.039215686270000001" green="0.039215686270000001" blue="0.039215686270000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
@@ -219,8 +219,8 @@
                                                 </connections>
                                             </button>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="建文件夹" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="QUN-FW-xr2">
-                                                <rect key="frame" x="170" y="11" width="74" height="22"/>
-                                                <fontDescription key="fontDescription" type="system" pointSize="18"/>
+                                                <rect key="frame" x="174.33333333333334" y="11.999999999999998" width="65.333333333333343" height="20.333333333333329"/>
+                                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                 <color key="textColor" red="0.039215686270000001" green="0.039215686270000001" blue="0.039215686270000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
@@ -536,11 +536,11 @@
                                                 <state key="normal" image="my_collect"/>
                                             </button>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="我的收藏" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="z5V-L3-0wj">
-                                                <rect key="frame" x="170.33333333333334" y="11" width="73.666666666666657" height="22"/>
+                                                <rect key="frame" x="174.33333333333334" y="11.999999999999998" width="65.333333333333343" height="20.333333333333329"/>
                                                 <constraints>
                                                     <constraint firstAttribute="width" relation="lessThanOrEqual" constant="150" id="7mn-Ei-Dcz"/>
                                                 </constraints>
-                                                <fontDescription key="fontDescription" type="system" pointSize="18"/>
+                                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                 <color key="textColor" red="0.039215686270000001" green="0.039215686270000001" blue="0.039215686270000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>

smartRhino/Project/VCModel/My_Center/Controller/ColletionVC/Setting/Controller/SettingVC.m

@@ -97,7 +97,6 @@
             return 1;
         }break;
         case 1:{
-//            return 3;
             return 1;
         }break;
         case 2:{
@@ -117,22 +116,20 @@
 
 - (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section{
     UIView *headerView = [[UIView alloc]init];
-    [headerView setBackgroundColor:RGBA(238, 238, 238, 1)];
+    headerView.backgroundColor = UIColorHex(0xF5F5F5);
     return headerView;
 }
 
 - (UIView *)tableView:(UITableView *)tableView viewForFooterInSection:(NSInteger)section{
-    UIView *headerView = [[UIView alloc]init];
-    [headerView setBackgroundColor:RGBA(238, 238, 238, 1)];
-    return headerView;
+    return [UIView new];
 }
 
 - (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section{
-    return 9.5;
+    return 5.f;
 }
 
 - (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section{
-    return 0;
+    return 0.01f;
 }
  
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath{

smartRhino/Project/VCModel/My_Center/Controller/ColletionVC/Setting/View/BlacklistCell.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15510"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -17,7 +17,7 @@
                 <rect key="frame" x="0.0" y="0.0" width="320" height="63"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
-                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="1bT-47-L3m">
+                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="1bT-47-L3m">
                         <rect key="frame" x="15.5" y="11.5" width="40.5" height="40.5"/>
                         <constraints>
                             <constraint firstAttribute="width" constant="40.5" id="988-Cr-UTe"/>

smartRhino/Project/VCModel/My_Center/Controller/NoteBook/Controller/ReadListVC.m

@@ -113,7 +113,7 @@
 - (UILabel *)titleLabel{
     if (!_titleLabel) {
         _titleLabel = [[UILabel alloc]init];
-        _titleLabel.font = [UIFont systemFontOfSize:17.f];
+        _titleLabel.font = [UIFont systemFontOfSize:16.f];
         _titleLabel.textColor =[UIColor hexStringToColor:@"333333" ];
     }
     return _titleLabel;

smartRhino/Project/VCModel/My_Center/Controller/NoteBook/NoteBook.storyboard

@@ -77,8 +77,8 @@
                                                 <state key="normal" image="chatmsg_right_add_icon"/>
                                             </button>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jZF-ZC-nAl">
-                                                <rect key="frame" x="166.5" y="11.5" width="42" height="21"/>
-                                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                <rect key="frame" x="165.5" y="11.5" width="44" height="21"/>
+                                                <fontDescription key="fontDescription" type="system" pointSize="18"/>
                                                 <nil key="textColor"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
@@ -231,16 +231,16 @@
                                                 </state>
                                             </button>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="根目录" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1YA-BS-eRa">
-                                                <rect key="frame" x="161.5" y="7" width="52" height="30"/>
-                                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                <rect key="frame" x="163" y="7" width="49" height="30"/>
+                                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                 <nil key="textColor"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="AOm-li-jku">
-                                                <rect key="frame" x="161.5" y="7" width="52" height="30"/>
+                                                <rect key="frame" x="163" y="7" width="49" height="30"/>
                                             </button>
                                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="chatmsg_notice_showAll_icon" translatesAutoresizingMaskIntoConstraints="NO" id="f66-az-Bid">
-                                                <rect key="frame" x="218.5" y="15.5" width="13" height="13"/>
+                                                <rect key="frame" x="217" y="15.5" width="13" height="13"/>
                                             </imageView>
                                         </subviews>
                                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -335,8 +335,8 @@
                                                 </connections>
                                             </button>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="正文" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qeK-Tg-l5P">
-                                                <rect key="frame" x="170" y="12" width="35" height="20.5"/>
-                                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                <rect key="frame" x="171" y="12.5" width="33" height="19.5"/>
+                                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                 <nil key="textColor"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
@@ -675,8 +675,8 @@
                                                 </connections>
                                             </button>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="选择保存位置" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cOA-eS-PlH">
-                                                <rect key="frame" x="135.5" y="11.5" width="104" height="21"/>
-                                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                <rect key="frame" x="138.5" y="12.5" width="98" height="19.5"/>
+                                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                 <nil key="textColor"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
@@ -1671,8 +1671,8 @@
                                                 </connections>
                                             </button>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="正文" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="g2n-7m-lJ0">
-                                                <rect key="frame" x="170" y="12" width="35" height="20.5"/>
-                                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                <rect key="frame" x="171" y="12.5" width="33" height="19.5"/>
+                                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                 <nil key="textColor"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
@@ -1767,12 +1767,12 @@
                                                 <state key="normal" image="add_find"/>
                                             </button>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4iT-e6-Lyz">
-                                                <rect key="frame" x="165.5" y="12" width="44" height="20"/>
+                                                <rect key="frame" x="167.5" y="12" width="40" height="20"/>
                                                 <constraints>
                                                     <constraint firstAttribute="height" constant="20" id="WXY-8R-nji"/>
                                                     <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="40" id="qhA-9T-Zs4"/>
                                                 </constraints>
-                                                <fontDescription key="fontDescription" type="system" pointSize="18"/>
+                                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                 <nil key="textColor"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
@@ -1870,8 +1870,8 @@
                                                 </connections>
                                             </button>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="正文" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="CXf-eE-GQI">
-                                                <rect key="frame" x="170" y="12" width="35" height="20.5"/>
-                                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                <rect key="frame" x="171" y="12.5" width="33" height="19.5"/>
+                                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                 <nil key="textColor"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
@@ -1969,8 +1969,8 @@
                                                 </connections>
                                             </button>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6s5-iv-aAp">
-                                                <rect key="frame" x="166.5" y="11.5" width="42" height="21"/>
-                                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                <rect key="frame" x="168" y="12.5" width="39.5" height="19.5"/>
+                                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                 <nil key="textColor"/>
                                                 <nil key="highlightedColor"/>
                                             </label>

smartRhino/Project/VCModel/My_Center/Controller/SearchModel/MyCenterSearch.storyboard

@@ -323,8 +323,8 @@
                                                 </connections>
                                             </button>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="聊天记录" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="axA-4a-lmu">
-                                                <rect key="frame" x="170.33333333333334" y="11.666666666666668" width="73.666666666666657" height="21.000000000000004"/>
-                                                <fontDescription key="fontDescription" type="system" pointSize="18"/>
+                                                <rect key="frame" x="174.33333333333334" y="12.333333333333334" width="65.333333333333343" height="19.333333333333329"/>
+                                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                 <color key="textColor" red="0.039215686274509803" green="0.039215686274509803" blue="0.039215686274509803" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>

smartRhino/Project/VCModel/My_Center/My_Center.storyboard

@@ -91,8 +91,8 @@
                                                 </connections>
                                             </button>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="个人信息" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="NwW-CR-NTw">
-                                                <rect key="frame" x="170.33333333333334" y="11.666666666666668" width="73.666666666666657" height="21.000000000000004"/>
-                                                <fontDescription key="fontDescription" type="system" pointSize="18"/>
+                                                <rect key="frame" x="174.33333333333334" y="12.333333333333334" width="65.333333333333343" height="19.333333333333329"/>
+                                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                 <color key="textColor" red="0.039215686270000001" green="0.039215686270000001" blue="0.039215686270000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
@@ -193,8 +193,8 @@
                                                 </connections>
                                             </button>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="设置昵称" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Xft-dk-VT8">
-                                                <rect key="frame" x="170.33333333333334" y="11.666666666666668" width="73.666666666666657" height="21.000000000000004"/>
-                                                <fontDescription key="fontDescription" type="system" pointSize="18"/>
+                                                <rect key="frame" x="174.33333333333334" y="12.333333333333334" width="65.333333333333343" height="19.333333333333329"/>
+                                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                 <color key="textColor" red="0.039215686270000001" green="0.039215686270000001" blue="0.039215686270000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
@@ -342,8 +342,8 @@
                                                 </connections>
                                             </button>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="我的签名" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ip2-87-wi2">
-                                                <rect key="frame" x="170.33333333333334" y="11.666666666666668" width="73.666666666666657" height="21.000000000000004"/>
-                                                <fontDescription key="fontDescription" type="system" pointSize="18"/>
+                                                <rect key="frame" x="174.33333333333334" y="11.999999999999998" width="65.333333333333343" height="20.333333333333329"/>
+                                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                 <color key="textColor" red="0.039215686270000001" green="0.039215686270000001" blue="0.039215686270000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
@@ -585,8 +585,8 @@
                                                 </connections>
                                             </button>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="绑定手机号" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rnf-05-mSj">
-                                                <rect key="frame" x="161" y="11.666666666666668" width="92" height="21.000000000000004"/>
-                                                <fontDescription key="fontDescription" type="system" pointSize="18"/>
+                                                <rect key="frame" x="166.33333333333334" y="12.333333333333334" width="81.666666666666657" height="19.333333333333329"/>
+                                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                 <color key="textColor" red="0.039215686270000001" green="0.039215686270000001" blue="0.039215686270000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
@@ -867,8 +867,8 @@
                                                 </connections>
                                             </button>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="个人头像" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="XDm-0n-KDt">
-                                                <rect key="frame" x="170.33333333333334" y="11.666666666666668" width="73.666666666666657" height="21.000000000000004"/>
-                                                <fontDescription key="fontDescription" type="system" pointSize="18"/>
+                                                <rect key="frame" x="174.33333333333334" y="12.333333333333334" width="65.333333333333343" height="19.333333333333329"/>
+                                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                 <color key="textColor" red="0.039215686270000001" green="0.039215686270000001" blue="0.039215686270000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
@@ -972,8 +972,8 @@
                                                 </connections>
                                             </button>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="账户明细" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="z9j-hQ-h8C">
-                                                <rect key="frame" x="170.33333333333334" y="11.666666666666668" width="73.666666666666657" height="21.000000000000004"/>
-                                                <fontDescription key="fontDescription" type="system" pointSize="18"/>
+                                                <rect key="frame" x="174.33333333333334" y="12.333333333333334" width="65.333333333333343" height="19.333333333333329"/>
+                                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                 <color key="textColor" red="0.039215686270000001" green="0.039215686270000001" blue="0.039215686270000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
@@ -1065,16 +1065,16 @@
                                                 </connections>
                                             </button>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="无限卡会员" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="DFS-Ff-mWl">
-                                                <rect key="frame" x="161" y="11.33333333333333" width="92" height="21.666666666666671"/>
-                                                <fontDescription key="fontDescription" type="system" pointSize="18"/>
+                                                <rect key="frame" x="166.33333333333334" y="12.333333333333334" width="81.666666666666657" height="19.333333333333329"/>
+                                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                 <color key="textColor" red="0.039215686274509803" green="0.039215686274509803" blue="0.039215686274509803" alpha="1" colorSpace="calibratedRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="jsx-wp-kfs">
-                                                <rect key="frame" x="334" y="0.0" width="80" height="44"/>
+                                                <rect key="frame" x="324" y="0.0" width="90" height="44"/>
                                                 <constraints>
                                                     <constraint firstAttribute="height" constant="44" id="TfV-x7-Eib"/>
-                                                    <constraint firstAttribute="width" constant="80" id="kuu-yI-CYq"/>
+                                                    <constraint firstAttribute="width" constant="90" id="kuu-yI-CYq"/>
                                                 </constraints>
                                                 <state key="normal" title="明细记录">
                                                     <color key="titleColor" red="0.039215686274509803" green="0.039215686274509803" blue="0.039215686274509803" alpha="1" colorSpace="calibratedRGB"/>