书城

smartRhino.xcodeproj/project.pbxproj

@@ -782,6 +782,8 @@
 		EB3EAFE823A2437E00C38AB4 /* TDGroupSearchResultVC.m in Sources */ = {isa = PBXBuildFile; fileRef = EB3EAFE723A2437E00C38AB4 /* TDGroupSearchResultVC.m */; };
 		EB3EAFEE23A26B9B00C38AB4 /* TDGroupInfoListVC.m in Sources */ = {isa = PBXBuildFile; fileRef = EB3EAFED23A26B9B00C38AB4 /* TDGroupInfoListVC.m */; };
 		EB3EAFF123A31C7D00C38AB4 /* TDGroupInfoDetailVC.m in Sources */ = {isa = PBXBuildFile; fileRef = EB3EAFF023A31C7D00C38AB4 /* TDGroupInfoDetailVC.m */; };
+		EB41513B246BC64800030371 /* BookStore.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = EB41513A246BC64800030371 /* BookStore.storyboard */; };
+		EB41513E246BC71500030371 /* BookStoreHome.m in Sources */ = {isa = PBXBuildFile; fileRef = EB41513D246BC71500030371 /* BookStoreHome.m */; };
 		EB440FC523A32302006BCB95 /* TDGroupInfoDetailCell.m in Sources */ = {isa = PBXBuildFile; fileRef = EB440FC323A32302006BCB95 /* TDGroupInfoDetailCell.m */; };
 		EB440FC623A32302006BCB95 /* TDGroupInfoDetailCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = EB440FC423A32302006BCB95 /* TDGroupInfoDetailCell.xib */; };
 		EB440FC923A3324F006BCB95 /* createSearchBarView.m in Sources */ = {isa = PBXBuildFile; fileRef = EB440FC823A3324F006BCB95 /* createSearchBarView.m */; };
@@ -2546,6 +2548,9 @@
 		EB3EAFED23A26B9B00C38AB4 /* TDGroupInfoListVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TDGroupInfoListVC.m; sourceTree = "<group>"; };
 		EB3EAFEF23A31C7D00C38AB4 /* TDGroupInfoDetailVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TDGroupInfoDetailVC.h; sourceTree = "<group>"; };
 		EB3EAFF023A31C7D00C38AB4 /* TDGroupInfoDetailVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TDGroupInfoDetailVC.m; sourceTree = "<group>"; };
+		EB41513A246BC64800030371 /* BookStore.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = BookStore.storyboard; sourceTree = "<group>"; };
+		EB41513C246BC71500030371 /* BookStoreHome.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BookStoreHome.h; sourceTree = "<group>"; };
+		EB41513D246BC71500030371 /* BookStoreHome.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BookStoreHome.m; sourceTree = "<group>"; };
 		EB440FC223A32302006BCB95 /* TDGroupInfoDetailCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TDGroupInfoDetailCell.h; sourceTree = "<group>"; };
 		EB440FC323A32302006BCB95 /* TDGroupInfoDetailCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TDGroupInfoDetailCell.m; sourceTree = "<group>"; };
 		EB440FC423A32302006BCB95 /* TDGroupInfoDetailCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = TDGroupInfoDetailCell.xib; sourceTree = "<group>"; };
@@ -5197,6 +5202,7 @@
 		C7811F5823603D4A000CC76A /* VC */ = {
 			isa = PBXGroup;
 			children = (
+				EB415134246BC59800030371 /* BookStore */,
 				C7DBAE4D237A87E100D427DD /* FwzBaseView.h */,
 				C7DBAE4E237A87E100D427DD /* FwzBaseView.m */,
 				C768AFB52379778F00E0A066 /* MyTableView.h */,
@@ -6739,6 +6745,40 @@
 			path = Model;
 			sourceTree = "<group>";
 		};
+		EB415134246BC59800030371 /* BookStore */ = {
+			isa = PBXGroup;
+			children = (
+				EB41513A246BC64800030371 /* BookStore.storyboard */,
+				EB415135246BC5D800030371 /* Model */,
+				EB415136246BC5D800030371 /* VC */,
+				EB415137246BC5D800030371 /* View */,
+			);
+			path = BookStore;
+			sourceTree = "<group>";
+		};
+		EB415135246BC5D800030371 /* Model */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			path = Model;
+			sourceTree = "<group>";
+		};
+		EB415136246BC5D800030371 /* VC */ = {
+			isa = PBXGroup;
+			children = (
+				EB41513C246BC71500030371 /* BookStoreHome.h */,
+				EB41513D246BC71500030371 /* BookStoreHome.m */,
+			);
+			path = VC;
+			sourceTree = "<group>";
+		};
+		EB415137246BC5D800030371 /* View */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			path = View;
+			sourceTree = "<group>";
+		};
 		EB581CEB23A0F52D00C451B0 /* WaitWork */ = {
 			isa = PBXGroup;
 			children = (
@@ -7860,6 +7900,7 @@
 				EB8E2DA0239666A900CDFBDA /* image@2x.png in Resources */,
 				EB8E2D9D239666A900CDFBDA /* msg_file_white@3x.png in Resources */,
 				C788F1892369451A0070A6B3 /* FavoritesViewController.xib in Resources */,
+				EB41513B246BC64800030371 /* BookStore.storyboard in Resources */,
 				C78373FC23AA287C0096AFE2 /* FecordJoinWorkFlowListController.xib in Resources */,
 				EBDE08B42458192C005D426C /* Common.storyboard in Resources */,
 				EB8E2D89239666A900CDFBDA /* msg_recv_audio02@3x.png in Resources */,
@@ -8345,6 +8386,7 @@
 				EBE5EF2724598F8600AD59C4 /* MyCardVC.m in Sources */,
 				C625AA8E236FCDD30010E967 /* ChatMsgSearchHistoryVC.m in Sources */,
 				C59D0C3D23825DE1007D0760 /* NSNotificationCenter+YYAdd.m in Sources */,
+				EB41513E246BC71500030371 /* BookStoreHome.m in Sources */,
 				C62270AE236C09FC00E2E3BF /* LeeTagItemViewModel.m in Sources */,
 				C7D6BB3D235DA18A00770E7C /* MyChanelCollectionReusableViewTop.m in Sources */,
 				C7D6BC99235DA1CE00770E7C /* PersonalCertificationHeaderView.m in Sources */,

smartRhino/AppConfig.h

@@ -30,7 +30,8 @@
 #define SHOWERROR2(a) [ZDTostView showErrorMessage2:a inView:[UIApplication sharedApplication].keyWindow];
 #define SHOWSUCCESS(a) [ZDTostView showSucceedMessage:a inView:[UIApplication sharedApplication].keyWindow];
 #define SHOWWAIT(a) [ZDTostView showWaitMessage:a inView:[UIApplication sharedApplication].keyWindow];
-#define SHOWLOADING   [ZDTostView showLoadingMessage:@"加载中..." inView:[UIApplication sharedApplication].keyWindow];
+//#define SHOWLOADING   [ZDTostView showLoadingMessage:@"加载中..." inView:[UIApplication sharedApplication].keyWindow];
+#define SHOWLOADING   [ZDTostView showLoadingMessage:@"" inView:[UIApplication sharedApplication].keyWindow];
 #define REMOVESHOW [ZDTostView removeLoadingTost];
 
 /* 其他 */

smartRhino/Assets.xcassets/My_Conter/my_conter_setting_icon.imageset/Contents.json

@@ -2,7 +2,6 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "my_conter_setting_icon.png",
       "scale" : "1x"
     },
     {

smartRhino/Assets.xcassets/首页/home_sousuo.imageset/Contents.json

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

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

@@ -18,11 +18,13 @@ typedef void(^TouchBlock)(void);
 
 - (void)searchViewMenuAction;
 
+- (void)searchViewBookAction;
 @end
 
 @interface SurfaceSearchView : UIView
 
 @property (nonatomic, copy) TouchBlock buttonBlock;
+@property (nonatomic, copy) void(^bookBlock)(void);
 @property (nonatomic, weak) id<SurfaceSearchViewDelegate> delegate;
 
 - (void)setBgViewColor:(UIColor *)color;

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

@@ -10,13 +10,15 @@
 
 @interface SurfaceSearchView ()
 
-@property (nonatomic, strong) UIView *bgView;
-@property (nonatomic, strong) TDButton *searchButton;
-@property (nonatomic, strong) UIView *lineView;
+@property (nonatomic, strong) UIView   *bgView;
+@property (nonatomic, strong) UIButton *searchButton;
+@property (nonatomic, strong) UIView   *lineView;
 
 @property (nonatomic, strong) TDButton *backButton;
 @property (nonatomic, strong) TDButton *menuButton;
 
+@property (nonatomic, strong) UIView  *shulineV;
+@property (nonatomic, strong) UIButton *bookBtn;
 @end
 
 @implementation SurfaceSearchView
@@ -28,6 +30,8 @@
     if (self) {
         [self addSubview:self.bgView];
         [self addSubview:self.searchButton];
+        [self addSubview:self.shulineV];
+        [self addSubview:self.bookBtn];
     }
     return self;
 }
@@ -83,7 +87,12 @@
     }
     [[self viewController].navigationController popViewControllerAnimated:YES];
 }
-
+- (void)bookButtonAction:(UIButton *)sender
+{
+    if (self.bookBlock) {
+        self.bookBlock();
+    }
+}
 #pragma mark - setter
 - (UIView *)bgView {
     if (!_bgView) {
@@ -96,19 +105,23 @@
 
 - (UIButton *)searchButton {
     if (!_searchButton) {
-        _searchButton = [TDButton buttonWithType:UIButtonTypeCustom];
+        _searchButton = [UIButton new];
         _searchButton.backgroundColor = [UIColor whiteColor];
         _searchButton.frame = CGRectMake(16, 7, kGXScreenWidth-32, 38);
-        [_searchButton setImage:[UIImage imageNamed:@"searchIcon"] forState:(UIControlStateNormal)];
-        [_searchButton setTitleColor:[UIColor hexStringToColor:@"999999"] forState:(UIControlStateNormal)];
-        [_searchButton setTitle:@"搜索" forState:(UIControlStateNormal)];
+        NSMutableAttributedString * attStr = [[NSMutableAttributedString alloc] init];
+        NSTextAttachment *attach = [[NSTextAttachment alloc] init];
+        attach.image = [UIImage imageNamed:@"home_sousuo"];
+        attach.bounds = CGRectMake(0, -2, 12, 13);
+        NSAttributedString *collegeStr = [NSAttributedString attributedStringWithAttachment:attach];
+        [attStr appendAttributedString:collegeStr];
+        NSAttributedString *placeStr = [[NSAttributedString alloc] initWithString:@" 输入关键字搜索" attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:13],NSForegroundColorAttributeName:UIColorHex(0xCCCCCC)}];
+        [attStr appendAttributedString:placeStr];
+        [_searchButton setAttributedTitle:attStr forState:UIControlStateNormal];
         _searchButton.layer.cornerRadius = 8.f;
         _searchButton.layer.borderWidth = 1.0f;
         _searchButton.layer.borderColor = [UIColor whiteColor].CGColor;
-//        [UIColor hexStringToColor:@"d8d8d8"].CGColor;
-        [_searchButton.titleLabel setFont:[UIFont systemFontOfSize:14]];
+        _searchButton.contentEdgeInsets = UIEdgeInsetsMake(0, 12, 0, -10);
         _searchButton.contentHorizontalAlignment = UIControlContentHorizontalAlignmentLeft;
-        _searchButton.contentEdgeInsets = UIEdgeInsetsMake(0, 10, 0, -10);
         [_searchButton addTarget:self action:@selector(searchAction:) forControlEvents:UIControlEventTouchUpInside];
     }
     return _searchButton;
@@ -117,11 +130,28 @@
 - (UIView *)lineView {
     if (!_lineView) {
         _lineView = [UIView new];
-        _lineView.backgroundColor = UIColorHex(E6E6E6);
+        _lineView.backgroundColor = UIColorHex(E5E5E5);
     }
     return _lineView;
 }
 
+- (UIView *)shulineV {
+    if (!_shulineV) {
+        _shulineV = [UIView new];
+        _shulineV.frame = CGRectMake(kGXScreenWidth - 16 - 49.5, 16.5, 0.5, 20);
+        _shulineV.backgroundColor = UIColorHex(E5E5E5);
+    }
+    return _shulineV;
+}
+- (UIButton *)bookBtn {
+    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 addTarget:self action:@selector(bookButtonAction:) forControlEvents:UIControlEventTouchUpInside];
+    }
+    return _bookBtn;
+}
 - (TDButton *)backButton {
     if (!_backButton) {
         _backButton = [[TDButton alloc] init];

smartRhino/Project/Other/Util/StoryboardManager/StoryboardManager.h

@@ -35,7 +35,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (weak, nonatomic,readonly) UIStoryboard *Search;
 @property (weak, nonatomic,readonly) UIStoryboard *Common;
 @property (weak, nonatomic,readonly) UIStoryboard *Source;
-
+@property (weak, nonatomic,readonly) UIStoryboard *Book;
 @end
 
 NS_ASSUME_NONNULL_END

smartRhino/Project/Other/Util/StoryboardManager/StoryboardManager.m

@@ -33,7 +33,7 @@
 @property (weak, nonatomic) UIStoryboard *Search;
 @property (weak, nonatomic) UIStoryboard *Common;
 @property (weak, nonatomic) UIStoryboard *Source;
-
+@property (weak, nonatomic) UIStoryboard *Book;
 @end
 
 @implementation StoryboardManager
@@ -186,4 +186,10 @@
     }
     return _Source = [UIStoryboard storyboardWithName:@"Source" bundle:nil];
 }
+- (UIStoryboard *)Book {
+    if (_Book) {
+        return _Book;
+    }
+    return _Book = [UIStoryboard storyboardWithName:@"BookStore" bundle:nil];
+}
 @end

smartRhino/Project/Tools/ZDTostView(提示窗)/ZDChatroomAlertView.m

@@ -58,10 +58,14 @@
         // Initialization code
         [self setBackgroundColor:[UIColor clearColor]];
         self.contentMode=UIViewContentModeRedraw;
-        _rectangleWidth = 145.0f;
-        _rectangleHeight = 145.0f;
-        _cornerRadio = 10.0f;
-        _blackAlpha = 0.4f;
+//        _rectangleWidth = 145.0f;
+//        _rectangleHeight = 145.0f;
+//        _cornerRadio = 10.0f;
+//        _blackAlpha = 0.4f;
+        _rectangleWidth = 0.0f;
+        _rectangleHeight = 0.0f;
+        _cornerRadio = 0.0f;
+        _blackAlpha = 0.0f;
         self.offSet = CGPointMake(0.0f, 0.0f);
         _customImageView  = [[UIImageView alloc] initWithFrame:CGRectZero];
         [self addSubview:_customImageView];
@@ -74,7 +78,7 @@
         [_label1 setFont:[UIFont systemFontOfSize:15.0f]];
         [self addSubview:_label1];
         [_label1 setTextColor:[UIColor whiteColor]];
-        [_label1 setText:@"xxxxxx"];
+        [_label1 setText:@""];
         
         _label2 = [[UILabel alloc] initWithFrame:CGRectZero];
         [_label2 setBackgroundColor:[UIColor clearColor]];
@@ -82,7 +86,7 @@
         [_label2 setFont:[UIFont systemFontOfSize:13.0f]];
         [self addSubview:_label2];
         [_label2 setTextColor:[UIColor whiteColor]];
-        [_label2 setText:@"xxxxxx"];
+        [_label2 setText:@""];
         
         _textField = [[UITextField alloc] initWithFrame:CGRectZero];
         [self addSubview:_textField];

smartRhino/Project/Tools/ZDTostView(提示窗)/ZDTostView.m

@@ -151,9 +151,9 @@
 {
     ZDTostView *tost = [ZDTostView sharedTostView];
     UIActivityIndicatorView *customView = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhiteLarge];
-    tost.customViewOffSet = CGPointMake(0.0f, 40.0f);
+    tost.customViewOffSet = CGPointMake(0.0f, 0.0f);
     
-    [customView startAnimating];
+//    [customView startAnimating];
     [tost setCustomView:customView];
     [tost.label1 setText:aMessage];
     return tost;

smartRhino/Project/VCModel/ChatMessage/View/ChatMsgListCell.m

@@ -30,7 +30,7 @@
     return 50;
 }
 + (CGFloat)configCell1Height{
-    return 90;
+    return 80;
 }
 + (CGFloat)configCell2Height{
     return 69;

smartRhino/Project/VCModel/ChatMessage/View/ChatMsgListCell.xib

@@ -67,32 +67,22 @@
             <point key="canvasLocation" x="132" y="88"/>
         </tableViewCell>
         <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="ChatMsgListCell1" id="Kvw-lD-KLs" customClass="ChatMsgListCell">
-            <rect key="frame" x="0.0" y="0.0" width="320" height="90"/>
+            <rect key="frame" x="0.0" y="0.0" width="320" height="80"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Kvw-lD-KLs" id="dRh-Bp-163">
-                <rect key="frame" x="0.0" y="0.0" width="320" height="90"/>
+                <rect key="frame" x="0.0" y="0.0" width="320" height="80"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="0oD-Oi-ctz">
-                        <rect key="frame" x="0.0" y="0.0" width="320" height="90"/>
+                        <rect key="frame" x="0.0" y="0.0" width="320" height="80"/>
                         <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
                     </view>
-                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="gX1-ax-cOi">
-                        <rect key="frame" x="0.0" y="89.5" width="320" height="0.5"/>
-                        <color key="backgroundColor" red="0.93333333333333335" green="0.93333333333333335" blue="0.93333333333333335" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                        <constraints>
-                            <constraint firstAttribute="height" constant="0.5" id="zvh-01-Tqx"/>
-                        </constraints>
-                    </view>
                 </subviews>
                 <constraints>
                     <constraint firstAttribute="bottom" secondItem="0oD-Oi-ctz" secondAttribute="bottom" id="S2I-li-fSV"/>
-                    <constraint firstItem="gX1-ax-cOi" firstAttribute="leading" secondItem="dRh-Bp-163" secondAttribute="leading" id="Yts-qH-iML"/>
                     <constraint firstItem="0oD-Oi-ctz" firstAttribute="leading" secondItem="dRh-Bp-163" secondAttribute="leading" id="b27-K8-dK6"/>
                     <constraint firstItem="0oD-Oi-ctz" firstAttribute="top" secondItem="dRh-Bp-163" secondAttribute="top" id="fUD-kt-S4U"/>
-                    <constraint firstAttribute="bottom" secondItem="gX1-ax-cOi" secondAttribute="bottom" id="gM3-i7-Dbk"/>
                     <constraint firstAttribute="trailing" secondItem="0oD-Oi-ctz" secondAttribute="trailing" id="szw-bw-5LF"/>
-                    <constraint firstAttribute="trailing" secondItem="gX1-ax-cOi" secondAttribute="trailing" id="vcZ-pQ-yet"/>
                 </constraints>
             </tableViewCellContentView>
             <viewLayoutGuide key="safeArea" id="520-dZ-mlc"/>

smartRhino/Project/VCModel/Home/OtherHomeVC/Drawer/DrawerView.m

@@ -56,6 +56,7 @@ TDShareInstance_implementation(DrawerView)
         [self addGestureRecognizer:tapGesture];
         tapGesture.delegate = self;
         [self reloadDrawerData];
+        [self.tableView setScrollEnabled:NO];
         [self.tableView reloadData];
     }
     return self;
@@ -74,7 +75,7 @@ TDShareInstance_implementation(DrawerView)
     self.drawerTitleLab.text = [NSString stringWithFormat:@"%@,您好",[AppUserModel sharedAppUserModel].Nick];
 
     _imageNameArr = @[@[@"draw_home", @"draw_common", @"draw_source", @"draw_mine"], @[@"draw_mail", @"draw_sixin", @"draw_collect",@"draw_note"],@[@"draw_txl", @"draw_set"]];
-    _drawerNameArr = @[@[@"首页", @"常用", @"信源", @"我的"],@[@"站内信", @"私信", @"收藏",@"笔记"],@[@"通讯录", @"设置"]];
+    _drawerNameArr = @[@[@"首页", @"常用", @"信源", @"我的"],@[@"收件箱", @"私信", @"收藏",@"笔记"],@[@"通讯录", @"设置"]];
 }
 
 #pragma mark - UITableViewDataSource && UITableViewDelegate

smartRhino/Project/VCModel/Home/OtherHomeVC/Favorites/VC/FavoritesViewController.m

@@ -114,7 +114,7 @@
     if (!_searchView) {
         _searchView = [[SurfaceSearchView alloc] init];
         [_searchView setBgViewColor:[UIColor clearColor]];
-        [_searchView setPlaceHolderText:@"输入关键字搜索"];
+//        [_searchView setPlaceHolderText:@"输入关键字搜索"];
         [_searchView setMainType];
     }
     return _searchView;

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

@@ -0,0 +1,17 @@
+//
+//  BookStoreHome.h
+//  smartRhino
+//
+//  Created by niuzhen on 2020/5/13.
+//  Copyright © 2020 tederen. All rights reserved.
+//
+
+#import "BaseViewController.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface BookStoreHome : BaseViewController
++(BookStoreHome *)initBookStoreHome;
+@end
+
+NS_ASSUME_NONNULL_END

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

@@ -84,11 +84,15 @@
     [self layoutSubviews];
     WEAKSELF
     self.searchView.buttonBlock = ^(){
-        STRONGSELF
         HomeSearchController *homeSearch = [[HomeSearchController alloc] init];
-        [strongSelf.navigationController pushViewController:homeSearch animated:YES];
+        [weakSelf.navigationController pushViewController:homeSearch animated:YES];
         
     };
+    self.searchView.bookBlock = ^(){
+        NSLog(@"12314");
+//        HomeSearchController *homeSearch = [[HomeSearchController alloc] init];
+//        [weakSelf.navigationController pushViewController:homeSearch animated:YES];
+    };
     [UserManager getUserInfoDetail];
     self.tableView.delegate = self;
     self.tableView.dataSource = self;
@@ -108,6 +112,8 @@
     }];
 }
 - (void)headRefresh{
+    [self.tableView.mj_header endRefreshing];
+    [self.tableView.mj_footer endRefreshing];
     self.currentPage = 1;
     [self.dataSource removeAllObjects];
     [self ReGetHomeListData:self.currentChannel];
@@ -136,7 +142,8 @@
 }
 - (void)tableViewScrollTop
 {
-    [self.tableView scrollToTop];
+    [self.tableView scrollToRowAtIndexPath:[NSIndexPath indexPathForRow:0 inSection:0] atScrollPosition:UITableViewScrollPositionTop animated:NO];
+    [self.tableView scrollRectToVisible:CGRectMake(0, 0, 1, 1) animated:YES];
 }
 - (void)dealloc
 {
@@ -208,6 +215,8 @@
         dispatch_semaphore_wait(sem, DISPATCH_TIME_FOREVER);
         dispatch_async(dispatch_get_main_queue(), ^{
             REMOVESHOW
+            [weakSelf.tableView.mj_header endRefreshing];
+            [weakSelf.tableView.mj_footer endRefreshing];
             [weakSelf.tableView reloadData];
         });
     });
@@ -215,9 +224,11 @@
 - (void)ReGetHomeListData:(NSInteger)channelId
 {
     WS(weakSelf);
+    SHOWLOADING
     if (self.currentChannel == 1) {
         NSDictionary * paraDict = @{@"Type":@"MyChecking",@"page":@(self.currentPage),@"perPage":@10};
             [[HttpManager sharedHttpManager] GETUrl:Host(WorkFlowAddApproval_Post) parameters:paraDict responseStyle:JOSN success:^(id  _Nonnull responseObject) {
+                REMOVESHOW
                 NSDictionary *dic = (NSDictionary *)responseObject;
                 HomeArticleModel *model = [HomeArticleModel modelWithDictionary:dic];
                 [weakSelf.tableView.mj_header endRefreshing];
@@ -238,12 +249,14 @@
                     }
                 });
             } failure:^(NSError * _Nonnull error) {
+                REMOVESHOW
                 [weakSelf.tableView.mj_header endRefreshing];
                 [weakSelf.tableView.mj_footer endRefreshing];
                 SHOWERROR([ZYCTool handerResultData:error])
             }];
     }else{
         [[HttpManager sharedHttpManager] POSTUrl:[NSString stringWithFormat:@"%@%@",BaseUrl,Article_Notice_list_Post] parameters: @{@"page":@(self.currentPage),@"perPage":@10,@"GroupId":@(channelId)} responseStyle:JOSN success:^(id  _Nonnull responseObject) {
+            REMOVESHOW
             NSDictionary *dic = (NSDictionary *)responseObject;
             HomeArticleModel *model = [HomeArticleModel modelWithDictionary:dic];
             [weakSelf.tableView.mj_header endRefreshing];
@@ -264,6 +277,7 @@
                 }
             });
         } failure:^(NSError * _Nonnull error) {
+            REMOVESHOW
             [weakSelf.tableView.mj_header endRefreshing];
             [weakSelf.tableView.mj_footer endRefreshing];
         }];
@@ -581,7 +595,7 @@
     if (!_searchView) {
         _searchView = [[SurfaceSearchView alloc] init];
         [_searchView setBgViewColor:[UIColor clearColor]];
-        [_searchView setPlaceHolderText:@"输入关键字搜索"];
+//        [_searchView setPlaceHolderText:@"输入关键字搜索"];
         [_searchView setMainType];
     }
     return _searchView;

smartRhino/Project/VCModel/My_Center/Controller/My_CenterVC.m

@@ -39,6 +39,7 @@
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(PushSettingVC:) name:DRAWERPUSHVC object:nil];
     self.tableView.delegate = self;
     self.tableView.dataSource = self;
+    [self.tableView setScrollEnabled:NO];
     self.tableView.backgroundColor = [UIColor clearColor];
     self.tableView.estimatedRowHeight = 0;
     self.tableView.estimatedSectionHeaderHeight = 0;

smartRhino/Project/VCModel/My_Center/View/My_CenterCell.xib

@@ -111,7 +111,7 @@
                                 <rect key="frame" x="15" y="15" width="21" height="20"/>
                             </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="e7z-xJ-zAm">
-                                <rect key="frame" x="48" y="14.5" width="42" height="21"/>
+                                <rect key="frame" x="44" y="14.5" width="42" height="21"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <color key="textColor" red="0.039215686274509803" green="0.039215686274509803" blue="0.039215686274509803" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
@@ -137,8 +137,8 @@
                             <constraint firstItem="e7z-xJ-zAm" firstAttribute="centerY" secondItem="0r7-Ur-DFH" secondAttribute="centerY" id="FGb-i1-gOa"/>
                             <constraint firstAttribute="trailing" secondItem="WoT-Pw-KbO" secondAttribute="trailing" id="L9B-aD-fOj"/>
                             <constraint firstItem="xp9-Zr-Utd" firstAttribute="centerY" secondItem="0r7-Ur-DFH" secondAttribute="centerY" id="Nep-9L-Bad"/>
-                            <constraint firstItem="e7z-xJ-zAm" firstAttribute="leading" secondItem="0r7-Ur-DFH" secondAttribute="leading" constant="48" id="PWV-uk-47S"/>
                             <constraint firstAttribute="trailing" secondItem="xp9-Zr-Utd" secondAttribute="trailing" constant="15" id="Uk4-BQ-jos"/>
+                            <constraint firstItem="e7z-xJ-zAm" firstAttribute="leading" secondItem="B2M-pf-V6v" secondAttribute="trailing" constant="8" id="Z6H-Mw-H6v"/>
                             <constraint firstItem="WoT-Pw-KbO" firstAttribute="leading" secondItem="0r7-Ur-DFH" secondAttribute="leading" id="lfR-hs-qd8"/>
                             <constraint firstItem="B2M-pf-V6v" firstAttribute="centerY" secondItem="0r7-Ur-DFH" secondAttribute="centerY" id="oax-P0-ozB"/>
                             <constraint firstItem="B2M-pf-V6v" firstAttribute="leading" secondItem="0r7-Ur-DFH" secondAttribute="leading" constant="15" id="odo-L5-WpY"/>

smartRhino/Project/VCModel/Source/Controller/SourceGroupVC.m

@@ -79,7 +79,7 @@
     }];
     [self.HeadView addSubview:self.groupView];
     [self.groupView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.top.mas_equalTo(self.SearchView.mas_bottom);
+        make.top.mas_equalTo(self.SearchView.mas_bottom).offset(4);
         make.left.bottom.right.mas_equalTo(self.HeadView);
     }];
     UIImageView * imgV = [UIImageView new];

smartRhino/Project/VCModel/Source/Controller/SourceHomeVC.m

@@ -212,6 +212,13 @@
 }
 - (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section
 {
+    CGFloat width = (SCREEN_WIDTH - 20) / self.collectionDataSource.count;
+    UILabel * testL = [UILabel new];
+    testL.font = [UIFont systemFontOfSize:15];
+    testL.text = @"收件箱";
+    UILabel * testBtnL = [UILabel new];
+    testBtnL.font = [UIFont systemFontOfSize:15];
+    testBtnL.text = @"私信";
     switch (section) {
         case 0:{
             UIView * view = [UIView new];
@@ -225,17 +232,21 @@
             label.textColor = UIColorHex(0x666666);
             label.text = @"遇 见";
             [view addSubview:label];
+            CGFloat w = [testL sizeThatFits:CGSizeMake(SCREEN_WIDTH, 20)].width;
+            CGFloat left = (width - w) * 0.5 + 10;
             [label mas_makeConstraints:^(MASConstraintMaker *make) {
-                make.left.mas_offset(30);
+                make.left.mas_offset(left);
                 make.centerY.mas_equalTo(view);
             }];
             UIButton * btn = [UIButton new];
             [view addSubview:btn];
             [btn setImage:IMG(@"ChatMsg_new_topic") forState:UIControlStateNormal];
+            CGFloat r = [testBtnL sizeThatFits:CGSizeMake(SCREEN_WIDTH, 20)].width;
+            CGFloat right = (width - r) * 0.5 - 0.5;
             [btn mas_makeConstraints:^(MASConstraintMaker *make) {
-                make.right.mas_offset(-20);
+                make.right.mas_offset(-right);
                 make.centerY.mas_equalTo(view);
-                make.size.mas_offset(CGSizeMake(28, 28));
+                make.size.mas_offset(CGSizeMake(36, 36));
             }];
             WS(weakSelf);
             [btn setAction:^{
@@ -741,14 +752,15 @@
 /****************************************************/
 - (CGSize)collectionView:(GHRefreshCollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath
 {
-    CGFloat width = SCREEN_WIDTH / self.collectionDataSource.count;
+    CGFloat width = (SCREEN_WIDTH - 20) / self.collectionDataSource.count;
     CGFloat height = 80;
     return CGSizeMake(width, height);
 }
 
 -(UIEdgeInsets)collectionView:(GHRefreshCollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout insetForSectionAtIndex:(NSInteger)section
 {
-    return UIEdgeInsetsMake(0,0,0,0);
+    CGFloat W = 10;
+    return UIEdgeInsetsMake(0,W,0,W);
 }
 
 - (CGFloat)collectionView:(GHRefreshCollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout minimumLineSpacingForSectionAtIndex:(NSInteger)section{

smartRhino/Project/VCModel/common/Controller/CommonHomeVC.m

@@ -318,14 +318,15 @@
 /****************************************************/
 - (CGSize)collectionView:(GHRefreshCollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath
 {
-    CGFloat width = SCREEN_WIDTH * 0.25;
+    CGFloat width = (SCREEN_WIDTH - 20) / self.collectionDataSource.count;
     CGFloat height = 80;
     return CGSizeMake(width, height);
 }
 
 -(UIEdgeInsets)collectionView:(GHRefreshCollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout insetForSectionAtIndex:(NSInteger)section
 {
-    return UIEdgeInsetsMake(0,0,0,0);
+    CGFloat W = 10;
+    return UIEdgeInsetsMake(0,W,0,W);
 }
 
 - (CGFloat)collectionView:(GHRefreshCollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout minimumLineSpacingForSectionAtIndex:(NSInteger)section{

smartRhino/Project/VCModel/common/Controller/CommonNoteVC.m

@@ -73,7 +73,7 @@
     }];
     [self.headerView addSubview:self.noteView];
     [self.noteView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.top.mas_equalTo(self.SearchView.mas_bottom).offset(10);
+        make.top.mas_equalTo(self.SearchView.mas_bottom).offset(4);
         make.left.bottom.right.mas_equalTo(self.headerView);
     }];
     UIImageView * imgV = [UIImageView new];
@@ -206,8 +206,6 @@
         vc.IsSelected = NO;
         [weakSelf.navigationController pushViewController:vc animated:YES];
     }];
-    self.tableView.tableHeaderView = self.headerView;
-    self.tableView.tableHeaderView.height = 90.f;
     [self setTableRefresh];
     [self.view addSubview:self.noteBookShareVC.view];
 }

smartRhino/Project/VCModel/common/View/CommonListCell.xib

@@ -28,7 +28,7 @@
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="文件夹类型" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7id-tv-Nnd">
-                        <rect key="frame" x="68" y="10" width="255" height="42.5"/>
+                        <rect key="frame" x="70" y="10" width="253" height="42.5"/>
                         <constraints>
                             <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="20" id="Gea-xa-rYg"/>
                         </constraints>
@@ -57,7 +57,7 @@
                         </constraints>
                     </view>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="252" text="公开" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="84L-UB-7zZ">
-                        <rect key="frame" x="68" y="60.5" width="25" height="14.5"/>
+                        <rect key="frame" x="70" y="60.5" width="25" height="14.5"/>
                         <fontDescription key="fontDescription" type="system" pointSize="12"/>
                         <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
@@ -72,7 +72,7 @@
                 <constraints>
                     <constraint firstAttribute="trailing" secondItem="3d7-xH-uiA" secondAttribute="trailing" id="3hQ-AG-mYt"/>
                     <constraint firstItem="wln-0c-dGh" firstAttribute="leading" secondItem="8Mf-6v-eUM" secondAttribute="leading" constant="15" id="69r-Pz-6ss"/>
-                    <constraint firstItem="7id-tv-Nnd" firstAttribute="leading" secondItem="cCf-ee-0J6" secondAttribute="trailing" constant="13" id="9Xy-Dc-JrN"/>
+                    <constraint firstItem="7id-tv-Nnd" firstAttribute="leading" secondItem="cCf-ee-0J6" secondAttribute="trailing" constant="15" id="9Xy-Dc-JrN"/>
                     <constraint firstItem="3d7-xH-uiA" firstAttribute="leading" secondItem="8Mf-6v-eUM" secondAttribute="leading" id="B83-7R-eRX"/>
                     <constraint firstItem="3d7-xH-uiA" firstAttribute="top" secondItem="wln-0c-dGh" secondAttribute="bottom" constant="6" id="DPq-4a-bXp"/>
                     <constraint firstAttribute="trailing" secondItem="7id-tv-Nnd" secondAttribute="trailing" constant="15" id="K1n-H6-TeF"/>