55

smartRhino.xcodeproj/project.pbxproj

@@ -1184,6 +1184,9 @@
 		EB9D65A7248E358900636BAC /* BookReadFontNameAlert.xib in Resources */ = {isa = PBXBuildFile; fileRef = EB9D65A2248E358900636BAC /* BookReadFontNameAlert.xib */; };
 		EB9D65AB248E46FE00636BAC /* BookPlayAlert.xib in Resources */ = {isa = PBXBuildFile; fileRef = EB9D65A8248E46FE00636BAC /* BookPlayAlert.xib */; };
 		EB9D65AC248E46FE00636BAC /* BookPlayAlert.m in Sources */ = {isa = PBXBuildFile; fileRef = EB9D65AA248E46FE00636BAC /* BookPlayAlert.m */; };
+		EBA0FA55249CC22C0022AFA3 /* SSScrollViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = EBA0FA54249CC22C0022AFA3 /* SSScrollViewController.m */; };
+		EBA0FA5A249CC34C0022AFA3 /* UIGestureRecognizer+SSUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = EBA0FA57249CC34B0022AFA3 /* UIGestureRecognizer+SSUtil.m */; };
+		EBA0FA5B249CC34C0022AFA3 /* UIView+LYLayout.m in Sources */ = {isa = PBXBuildFile; fileRef = EBA0FA59249CC34C0022AFA3 /* UIView+LYLayout.m */; };
 		EBAA1F242463A4F200272F13 /* SourceGroupVC.m in Sources */ = {isa = PBXBuildFile; fileRef = EBAA1F232463A4F200272F13 /* SourceGroupVC.m */; };
 		EBAACA902406475100F44B67 /* ShowBtn.m in Sources */ = {isa = PBXBuildFile; fileRef = EBAACA8F2406475100F44B67 /* ShowBtn.m */; };
 		EBAACA932406730C00F44B67 /* MyFavoriteSearchVC.m in Sources */ = {isa = PBXBuildFile; fileRef = EBAACA922406730C00F44B67 /* MyFavoriteSearchVC.m */; };
@@ -3347,6 +3350,12 @@
 		EB9D65A8248E46FE00636BAC /* BookPlayAlert.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = BookPlayAlert.xib; sourceTree = "<group>"; };
 		EB9D65A9248E46FE00636BAC /* BookPlayAlert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BookPlayAlert.h; sourceTree = "<group>"; };
 		EB9D65AA248E46FE00636BAC /* BookPlayAlert.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BookPlayAlert.m; sourceTree = "<group>"; };
+		EBA0FA53249CC22C0022AFA3 /* SSScrollViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SSScrollViewController.h; sourceTree = "<group>"; };
+		EBA0FA54249CC22C0022AFA3 /* SSScrollViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SSScrollViewController.m; sourceTree = "<group>"; };
+		EBA0FA56249CC34B0022AFA3 /* UIView+LYLayout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIView+LYLayout.h"; sourceTree = "<group>"; };
+		EBA0FA57249CC34B0022AFA3 /* UIGestureRecognizer+SSUtil.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIGestureRecognizer+SSUtil.m"; sourceTree = "<group>"; };
+		EBA0FA58249CC34B0022AFA3 /* UIGestureRecognizer+SSUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIGestureRecognizer+SSUtil.h"; sourceTree = "<group>"; };
+		EBA0FA59249CC34C0022AFA3 /* UIView+LYLayout.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIView+LYLayout.m"; sourceTree = "<group>"; };
 		EBA9F8E9239287180013BDDA /* Accounts.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Accounts.framework; path = System/Library/Frameworks/Accounts.framework; sourceTree = SDKROOT; };
 		EBA9F8EB239287220013BDDA /* AddressBook.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AddressBook.framework; path = System/Library/Frameworks/AddressBook.framework; sourceTree = SDKROOT; };
 		EBA9F8ED2392872F0013BDDA /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = System/Library/Frameworks/CFNetwork.framework; sourceTree = SDKROOT; };
@@ -8176,6 +8185,10 @@
 		EB95266D248A0B19003EFCCE /* BookRead */ = {
 			isa = PBXGroup;
 			children = (
+				EBA0FA58249CC34B0022AFA3 /* UIGestureRecognizer+SSUtil.h */,
+				EBA0FA57249CC34B0022AFA3 /* UIGestureRecognizer+SSUtil.m */,
+				EBA0FA56249CC34B0022AFA3 /* UIView+LYLayout.h */,
+				EBA0FA59249CC34C0022AFA3 /* UIView+LYLayout.m */,
 				EB95268A248A12F1003EFCCE /* 龙王传说.txt */,
 				EB952687248A0CA5003EFCCE /* DCFileTool.h */,
 				EB952688248A0CA5003EFCCE /* DCFileTool.m */,
@@ -8194,6 +8207,8 @@
 				EB95266B248A0A2A003EFCCE /* BookReadVC.m */,
 				EB952672248A0BA6003EFCCE /* DCContentVC.h */,
 				EB952670248A0BA6003EFCCE /* DCContentVC.m */,
+				EBA0FA53249CC22C0022AFA3 /* SSScrollViewController.h */,
+				EBA0FA54249CC22C0022AFA3 /* SSScrollViewController.m */,
 			);
 			path = viewcontroller;
 			sourceTree = "<group>";
@@ -9489,6 +9504,7 @@
 				EB8E2D0C239666A900CDFBDA /* PSTGridLayoutItem.m in Sources */,
 				EBFA5EF4246E374A00915D5F /* HomeMusicCell.m in Sources */,
 				C6F2E19A236C334A009E6903 /* UIImage+Crop.m in Sources */,
+				EBA0FA55249CC22C0022AFA3 /* SSScrollViewController.m in Sources */,
 				C751012823837FB100E4429B /* MyZanCell.m in Sources */,
 				EB952693248A560E003EFCCE /* BookReadSearchAlert.m in Sources */,
 				C7974A40236C4CC0004D5470 /* MyWorkWordVC.m in Sources */,
@@ -9667,6 +9683,7 @@
 				32C384C823B1AE9500BBC733 /* NoteBookCommentVC.m in Sources */,
 				C7D6BC8E235DA1CE00770E7C /* MyClubApplicationViewController.m in Sources */,
 				C7E03AD523CD89EA00A97589 /* InputGongwenFileCell.m in Sources */,
+				EBA0FA5A249CC34C0022AFA3 /* UIGestureRecognizer+SSUtil.m in Sources */,
 				EB18109D2488DB5F009EDEF5 /* BookTextTopCell.m in Sources */,
 				C77229A323B63B3500007B21 /* WorkFlowPersonnelListModel.m in Sources */,
 				EBB6886B23C9C0C300E24DD9 /* MMDatabaseConn+Initial.m in Sources */,
@@ -9795,6 +9812,7 @@
 				EB8E2D80239666A900CDFBDA /* EMMsgLocationBubbleView.m in Sources */,
 				C7716AF923B3435C00D6D45D /* MeetingSummaryListModel.m in Sources */,
 				EB8E2D2C239666A900CDFBDA /* EMMoreFunctionView.m in Sources */,
+				EBA0FA5B249CC34C0022AFA3 /* UIView+LYLayout.m in Sources */,
 				EB8E2CF8239666A900CDFBDA /* MWZoomingScrollView.m in Sources */,
 				C59D0C2D23825DE1007D0760 /* UIBarButtonItem+YYAdd.m in Sources */,
 				C7D6BBAC235DA18A00770E7C /* NavigationController.m in Sources */,

smartRhino.xcworkspace/xcuserdata/niuzhen.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -14,5 +14,21 @@
             breakpointStackSelectionBehavior = "1">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "7A346065-38BB-4AE7-8AD3-397373265AF7"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "smartRhino/Project/VCModel/Login/Controller/LoginVC.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "196"
+            endingLineNumber = "196"
+            landmarkName = "-getUserInfoDetail"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

smartRhino/AppConfig.h

@@ -130,14 +130,14 @@ return;\
 
 // 是否为空对象
 #define MHObjectIsNil(__object)  ((nil == __object) || [__object isKindOfClass:[NSNull class]])
-//url
+
 //#define BaseUrl @"http://111.12.8.69:83"///广西
 //#define HtmlUrl @"http://111.12.8.69:82"
 
-#define BaseUrl @"https://apk.tederen.com"
+#define BaseUrl @"https://apk.tederen.com/service"
 #define HtmlUrl @"https://apk.tederen.com/admin"
-#define MyChannelUrl @"/api/v1/channels/1"
-#define ContentUrl @"/api/v1/contents/1"
+#define MyChannelUrl  @"/api/v1/channels/1"
+#define ContentUrl    @"/api/v1/contents/1"
 #define MainSearchUrl @"/api/v1/contents/1325"
 
 #define Host(x) [NSString stringWithFormat:@"%@%@",BaseUrl,x]

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

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

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

@@ -58,14 +58,14 @@
         // Initialization code
         [self setBackgroundColor:[UIColor clearColor]];
         self.contentMode=UIViewContentModeRedraw;
-//        _rectangleWidth = 145.0f;
-//        _rectangleHeight = 145.0f;
-//        _cornerRadio = 10.0f;
-//        _blackAlpha = 0.4f;
-        _rectangleWidth = 0.0f;
-        _rectangleHeight = 0.0f;
-        _cornerRadio = 0.0f;
-        _blackAlpha = 0.0f;
+        _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];

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

@@ -17,6 +17,7 @@
 + (ZDTostView *)showLoadingMessage:(NSString *)aMessage inView:(UIView *)aView ;//DEPRECATED_ATTRIBUTE;
 + (ZDTostView *)showSucceedMessage:(NSString *)aMessage inView:(UIView *)aView finish:(void (^)(void))finish ;//DEPRECATED_ATTRIBUTE;
 + (ZDTostView *)showWaitMessage:(NSString *)aMessage inView:(UIView *)aView;
++ (ZDTostView *)showMessage:(NSString *)aMessage inView:(UIView *)aView;
 + (void)removeLoadingTost;// DEPRECATED_ATTRIBUTE;
 + (ZDTostView *)showErrorMessage2:(NSString *)aMessage inView:(UIView *)aView;
 @end

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, 0.0f);
+    tost.customViewOffSet = CGPointMake(0.0f, 40.0f);
     
-//    [customView startAnimating];
+    [customView startAnimating];
     [tost setCustomView:customView];
     [tost.label1 setText:aMessage];
     return tost;
@@ -188,4 +188,10 @@
     [tost.label1 setText:aMessage];
     return  [tost showSharedTostInViewAutoDisappear:aView];
 }
++ (ZDTostView *)showMessage:(NSString *)aMessage inView:(UIView *)aView{
+    ZDTostView *tost = [ZDTostView sharedTostView];
+    [tost.customImageView removeFromSuperview];
+    [tost.label1 setText:aMessage];
+    return  [tost showSharedTostInViewAutoDisappear:aView];
+}
 @end

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

@@ -15,14 +15,16 @@
 #import "MailListSortVC.h"
 #import "MyTDGroupView.h"
 #import "MailCourseVC.h"
+#import "YCMenuView.h"
 
 @interface MailListVC ()<UITableViewDelegate,UITableViewDataSource>
-@property (weak, nonatomic) IBOutlet UIView *HeadView;
-@property (strong,nonatomic) IBOutlet UIButton *rightButton;
+@property (weak, nonatomic) IBOutlet UIView       *HeadView;
+@property (strong,nonatomic) IBOutlet UIButton    *rightButton;
 @property (strong,nonatomic) IBOutlet UITableView *tableView;
-@property (strong, nonatomic) MyTDGroupView             *SearchView;
-@property (strong,nonatomic) NSMutableArray *dataSourceArray;
-@property (strong,nonatomic) NSMutableArray *historyDataSourceArray;
+@property (strong, nonatomic) MyTDGroupView       *SearchView;
+@property (strong,nonatomic) NSMutableArray       *dataSourceArray;
+@property (strong,nonatomic) NSMutableArray       *taskActionArray;
+@property (strong,nonatomic) NSMutableArray       *historyDataSourceArray;
 @property (nonatomic, strong) AddressBookGroupModel *groupModel;
 @end
 
@@ -38,6 +40,12 @@
     }
     return _SearchView;
 }
+-(NSMutableArray *)taskActionArray{
+    if(!_taskActionArray){
+        _taskActionArray = [[NSMutableArray alloc] initWithObjects:@"建通讯录",@"加联系人",@"批量编辑",@"扫一扫", nil];
+    }
+    return _taskActionArray;
+}
 - (void)viewDidLoad {
     [super viewDidLoad];
     [self getData];
@@ -75,35 +83,65 @@
     self.tableView.backgroundColor = [UIColor clearColor];
 
     [self.rightButton setAction:^{
-        [[ShowNewGroupAlert initShowNewGroupAlertWithTitle:@"新建通讯录" placeholder:@"请输入通讯录名称" confirm:^(NSString * _Nonnull groupName) {
-            SHOWLOADING
-            [[HttpManager sharedHttpManager] POSTUrl:[NSString stringWithFormat:@"%@%@",BaseUrl,AddressBookGroup_Add_Post] parameters:@{@"addressBookGroupName":groupName} responseStyle:JOSN success:^(id  _Nonnull responseObject) {
-                REMOVESHOW
-                NSLog(@"%@",responseObject);
-                [weakSelf getData];
-                dispatch_async(dispatch_get_main_queue(), ^{
-                    MailListByZuVC *vc = [MailListByZuVC initMailListByZuVC];
-                    vc.notChangeSearchColor = weakSelf.notSearchChangeColor;
-                    vc.isSelectPeople = weakSelf.isSelectPeople;
-                    vc.isChat = weakSelf.isChat;
-                    vc.isShow = weakSelf.isShow;
-                    vc.isCheck = weakSelf.isCheck;
-                    vc.UserIds = weakSelf.UserIds;
-                    vc.isReturn = weakSelf.isReturn;
-                    vc.sendModel = weakSelf.sendModel;
-                    vc.titleStr = responseObject[@"GroupName"];
-                    vc.indexId = [responseObject[@"Id"] integerValue];
-                    vc.pageType = MailListByZuPageType_custom;
-                    [weakSelf.navigationController pushViewController:vc animated:YES];
-                });
-            } failure:^(NSError * _Nonnull error) {
-                SHOWERROR([ZYCTool handerResultData:error]);
-            }];
-        } cancle:^{
-        }] show];
+        NSMutableArray *menuDataSourceArray = [weakSelf getMenuDataSource:weakSelf.taskActionArray];
+        YCMenuView *view = [YCMenuView menuWithActions:menuDataSourceArray width:106 relyonView:weakSelf.rightButton];
+        view.menuColor = RGB(255, 255, 255);
+        view.separatorColor = RGB(234, 234, 234);
+        view.textColor = RGB(102, 102, 102);
+        view.textFont = [UIFont systemFontOfSize:16.0];
+        view.menuCellHeight = 43.5;
+        view.maxDisplayCount = 10;
+        view.offset = - 6;
+        [view show];
     }];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(messageReturnSuccess) name:MESSAGERETURNSUCCESS object:nil];
 }
+-(NSMutableArray *)getMenuDataSource:(NSMutableArray *)titleArray{
+    NSMutableArray *menuDataSourceArray = [[NSMutableArray alloc] init];
+    for(int i=0;i<titleArray.count;i++){
+        NSString *titleStr = [titleArray objectAtIndex:i];
+        WS(weakSelf);
+        YCMenuAction *actionMenu = [YCMenuAction actionWithTitle:titleStr image:nil handler:^(YCMenuAction *action) {
+            if([@"建通讯录" isEqualToString:action.title]){
+                [[ShowNewGroupAlert initShowNewGroupAlertWithTitle:@"新建通讯录" placeholder:@"请输入通讯录名称" confirm:^(NSString * _Nonnull groupName) {
+                    SHOWLOADING
+                    [[HttpManager sharedHttpManager] POSTUrl:[NSString stringWithFormat:@"%@%@",BaseUrl,AddressBookGroup_Add_Post] parameters:@{@"addressBookGroupName":groupName} responseStyle:JOSN success:^(id  _Nonnull responseObject) {
+                        REMOVESHOW
+                        NSLog(@"%@",responseObject);
+                        [weakSelf getData];
+                        dispatch_async(dispatch_get_main_queue(), ^{
+                            MailListByZuVC *vc = [MailListByZuVC initMailListByZuVC];
+                            vc.notChangeSearchColor = weakSelf.notSearchChangeColor;
+                            vc.isSelectPeople = weakSelf.isSelectPeople;
+                            vc.isChat = weakSelf.isChat;
+                            vc.isShow = weakSelf.isShow;
+                            vc.isCheck = weakSelf.isCheck;
+                            vc.UserIds = weakSelf.UserIds;
+                            vc.isReturn = weakSelf.isReturn;
+                            vc.sendModel = weakSelf.sendModel;
+                            vc.titleStr = responseObject[@"GroupName"];
+                            vc.indexId = [responseObject[@"Id"] integerValue];
+                            vc.pageType = MailListByZuPageType_custom;
+                            [weakSelf.navigationController pushViewController:vc animated:YES];
+                        });
+                    } failure:^(NSError * _Nonnull error) {
+                        REMOVESHOW
+                        //                SHOWERROR([ZYCTool handerResultData:error]);
+                    }];
+                } cancle:^{
+                }] show];
+            }else if ([@"加联系人" isEqualToString:action.title]){
+
+            }else if ([@"批量编辑" isEqualToString:action.title]){
+                
+            }else if ([@"扫一扫" isEqualToString:action.title]){
+                
+            }
+        }];
+        [menuDataSourceArray addObject:actionMenu];
+    }
+    return menuDataSourceArray;
+}
 - (void)messageReturnSuccess
 {
     self.isReturn = NO;

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

@@ -55,21 +55,51 @@
     model.ArticleGroupName = @"推荐";
     model.IsSelect = YES;
     [self.channelSelectArr addObject:model];
-//    ChannelModel * workModel = [[ChannelModel alloc] init];
-//    workModel.ArticleGroupId = 1;
-//    workModel.ArticleGroupName = @"待办工作";
-//    workModel.IsSelect = NO;
-//    [self.channelSelectArr addObject:workModel];
-    ChannelModel * sModel = [[ChannelModel alloc] init];
-    sModel.ArticleGroupId = 2;
-    sModel.ArticleGroupName = @"信源听说";
-    sModel.IsSelect = NO;
-    [self.channelSelectArr addObject:sModel];
-    ChannelModel * mModel = [[ChannelModel alloc] init];
-    mModel.ArticleGroupId = 3;
-    mModel.ArticleGroupName = @"名校";
-    mModel.IsSelect = NO;
-    [self.channelSelectArr addObject:mModel];
+//    ChannelModel * sModel = [[ChannelModel alloc] init];
+//    sModel.ArticleGroupId = 2;
+//    sModel.ArticleGroupName = @"信源听说";
+//    sModel.IsSelect = NO;
+//    [self.channelSelectArr addObject:sModel];
+//    ChannelModel * mModel = [[ChannelModel alloc] init];
+//    mModel.ArticleGroupId = 3;
+//    mModel.ArticleGroupName = @"名校";
+//    mModel.IsSelect = NO;
+//    [self.channelSelectArr addObject:mModel];
+//    ChannelModel * aModel = [[ChannelModel alloc] init];
+//    aModel.ArticleGroupId = 4;
+//    aModel.ArticleGroupName = @"会员特供";
+//    aModel.IsSelect = NO;
+//    [self.channelSelectArr addObject:aModel];
+//    ChannelModel * bModel = [[ChannelModel alloc] init];
+//    bModel.ArticleGroupId = 5;
+//    bModel.ArticleGroupName = @"每日微课";
+//    bModel.IsSelect = NO;
+//    [self.channelSelectArr addObject:bModel];
+//    ChannelModel * cModel = [[ChannelModel alloc] init];
+//    cModel.ArticleGroupId = 6;
+//    cModel.ArticleGroupName = @"每日技能";
+//    cModel.IsSelect = NO;
+//    [self.channelSelectArr addObject:cModel];
+//    ChannelModel * dModel = [[ChannelModel alloc] init];
+//    dModel.ArticleGroupId = 7;
+//    dModel.ArticleGroupName = @"每日好书";
+//    dModel.IsSelect = NO;
+//    [self.channelSelectArr addObject:dModel];
+//    ChannelModel * eModel = [[ChannelModel alloc] init];
+//    eModel.ArticleGroupId = 8;
+//    eModel.ArticleGroupName = @"每日好文";
+//    eModel.IsSelect = NO;
+//    [self.channelSelectArr addObject:eModel];
+//    ChannelModel * fModel = [[ChannelModel alloc] init];
+//    fModel.ArticleGroupId = 9;
+//    fModel.ArticleGroupName = @"名师";
+//    fModel.IsSelect = NO;
+//    [self.channelSelectArr addObject:fModel];
+//    ChannelModel * gModel = [[ChannelModel alloc] init];
+//    gModel.ArticleGroupId = 10;
+//    gModel.ArticleGroupName = @"大咖讲座";
+//    gModel.IsSelect = NO;
+//    [self.channelSelectArr addObject:gModel];
 }
 - (void)getData
 {
@@ -198,34 +228,58 @@
     if (indexPath.section == 0 && indexPath.item == 0) {
         return false;
     }
-    if (indexPath.section == 1) {
-        return false;
-    }
+//    if (indexPath.section == 1) {
+//        return false;
+//    }
     return true;
 }
 
 // 在移动结束的时候调用此代理方法
 - (void)collectionView:(UICollectionView *)collectionView moveItemAtIndexPath:(NSIndexPath *)sourceIndexPath toIndexPath:(NSIndexPath*)destinationIndexPath {
-    NSMutableArray *arraySource = @[].mutableCopy;
-    NSMutableArray *arrayDestination = @[].mutableCopy;
-    if (sourceIndexPath.section == 0) {
-        arraySource = self.channelSelectArr;
-    } else {
-        arraySource = self.channelOtherArr;
+    WS(weakSelf);
+//    NSMutableArray *arraySource = @[].mutableCopy;
+//    NSMutableArray *arrayDestination = @[].mutableCopy;
+    if (sourceIndexPath.section == destinationIndexPath.section) {
+        return;
     }
+//    if (sourceIndexPath.section == 0) {
+//        arraySource = self.channelSelectArr;
+//    } else {
+//        arraySource = self.channelOtherArr;
+//    }
+//    if (destinationIndexPath.section == 0) {
+//        arrayDestination = self.channelSelectArr;
+//    } else {
+//        arrayDestination = self.channelOtherArr;
+//    }
+
     if (destinationIndexPath.section == 0) {
-        arrayDestination = self.channelSelectArr;
-    } else {
-        arrayDestination = self.channelOtherArr;
+        ChannelModel * model = self.channelOtherArr[sourceIndexPath.item];
+        if (model) {
+            [[HttpManager sharedHttpManager] POSTUrl:Host(Article_Pindao_User_add) parameters:@{@"ArticleGroupId":@(model.Id)} responseStyle:DATA success:^(id  _Nonnull responseObject) {
+                [weakSelf getData];
+            } failure:^(NSError * _Nonnull error) {
+                
+            }];
+        }
+    }else{
+        ChannelModel * model = self.channelSelectArr[sourceIndexPath.item];
+        if (model) {
+            NSString * url = [NSString stringWithFormat:@"%@%ld",Host(Article_Pindao_User_Delete),(long)model.Id];
+            [[HttpManager sharedHttpManager] DeleteUrl:url parameters:@{} responseStyle:DATA success:^(id  _Nonnull responseObject) {
+                [weakSelf getData];
+            } failure:^(NSError * _Nonnull error) {
+                
+            }];
+        }
     }
-
-    NSString *string = arraySource[sourceIndexPath.row];
-    [arraySource removeObjectAtIndex:sourceIndexPath.row];
-    [arrayDestination insertObject:string atIndex:destinationIndexPath.row];
-    [self.channelMainArr removeAllObjects];
-    [self.channelMainArr addObject:self.channelSelectArr];
-    [self.channelMainArr addObject:self.channelOtherArr];
-    [self.collectionView reloadData];
+//    NSString *string = arraySource[sourceIndexPath.row];
+//    [arraySource removeObjectAtIndex:sourceIndexPath.row];
+//    [arrayDestination insertObject:string atIndex:destinationIndexPath.row];
+//    [self.channelMainArr removeAllObjects];
+//    [self.channelMainArr addObject:self.channelSelectArr];
+//    [self.channelMainArr addObject:self.channelOtherArr];
+//    [self.collectionView reloadData];
 }
 
 - (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath {
@@ -243,12 +297,13 @@
             return cell;
         }
     } else {
-        cell.deleteButton.hidden = NO;
-        if ((indexPath.item == 0) || (indexPath.item == 1)||(indexPath.item == 2)||(indexPath.item == 3)) {
+        if (indexPath.item == 0) {
             cell.deleteButton.hidden = YES;
+        }else{
+            cell.deleteButton.hidden = NO;
+            cell.deleteButton.tag = indexPath.item;
+            [cell.deleteButton addTarget:self action:@selector(deleteChannelAction:) forControlEvents:UIControlEventTouchUpInside];
         }
-        cell.deleteButton.tag = indexPath.row;
-        [cell.deleteButton addTarget:self action:@selector(deleteChannelAction:) forControlEvents:UIControlEventTouchUpInside];
         return cell;
     }
 }
@@ -272,7 +327,7 @@
         case UIGestureRecognizerStateBegan:{
             //判断手势落点位置是否在路径上
             NSIndexPath *indexPath = [self.collectionView indexPathForItemAtPoint:[longPress locationInView:self.collectionView]];
-            if (indexPath == nil||indexPath.item == 0||indexPath.section == 1 || indexPath.item == 1) {
+            if (indexPath.item == 0 && indexPath.section == 0) {
                 break;
             }
             //在路径上则开始移动该路径上的cell
@@ -283,7 +338,7 @@
             break;
         case UIGestureRecognizerStateChanged:{
             NSIndexPath *indexPath = [self.collectionView indexPathForItemAtPoint:[longPress locationInView:self.collectionView]];
-            if (indexPath == nil||indexPath.item == 0||indexPath.section == 1 || indexPath.item == 1) {
+            if (indexPath.item == 0 && indexPath.section == 0) {
                 break;
             }
             //移动过程当中随时更新cell位置

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

@@ -565,10 +565,18 @@
                                                 </constraints>
                                                 <state key="normal" image="home_music_icon"/>
                                             </button>
+                                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="taA-U3-5jt">
+                                                <rect key="frame" x="0.0" y="43.666666666666664" width="414" height="0.3333333333333357"/>
+                                                <color key="backgroundColor" red="0.89803921568627454" green="0.89803921568627454" blue="0.89803921568627454" alpha="1" colorSpace="calibratedRGB"/>
+                                                <constraints>
+                                                    <constraint firstAttribute="height" constant="0.5" id="Xay-jW-zUz"/>
+                                                </constraints>
+                                            </view>
                                         </subviews>
                                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         <constraints>
                                             <constraint firstItem="ogw-Jp-00F" firstAttribute="top" secondItem="Nmk-kJ-EpI" secondAttribute="top" id="35h-xS-xxz"/>
+                                            <constraint firstItem="taA-U3-5jt" firstAttribute="leading" secondItem="giH-qQ-oYO" secondAttribute="leading" id="8Ti-d5-F80"/>
                                             <constraint firstAttribute="trailing" secondItem="cix-Oo-wg8" secondAttribute="trailing" constant="10" id="Bgr-Rq-J8T"/>
                                             <constraint firstItem="ogw-Jp-00F" firstAttribute="leading" secondItem="Nmk-kJ-EpI" secondAttribute="trailing" id="Hbj-Kc-ucQ"/>
                                             <constraint firstItem="yMl-n2-VaV" firstAttribute="centerX" secondItem="giH-qQ-oYO" secondAttribute="centerX" id="K3M-d2-puy"/>
@@ -576,6 +584,8 @@
                                             <constraint firstAttribute="height" constant="44" id="PWf-fH-uvI"/>
                                             <constraint firstItem="Nmk-kJ-EpI" firstAttribute="leading" secondItem="giH-qQ-oYO" secondAttribute="leading" id="VOw-Qh-c8N"/>
                                             <constraint firstAttribute="bottom" secondItem="Nmk-kJ-EpI" secondAttribute="bottom" id="agf-gs-lED"/>
+                                            <constraint firstAttribute="bottom" secondItem="taA-U3-5jt" secondAttribute="bottom" id="bX1-eB-MFl"/>
+                                            <constraint firstAttribute="trailing" secondItem="taA-U3-5jt" secondAttribute="trailing" id="hat-0S-fvi"/>
                                             <constraint firstAttribute="bottom" secondItem="cix-Oo-wg8" secondAttribute="bottom" id="iJj-fQ-3su"/>
                                             <constraint firstItem="yMl-n2-VaV" firstAttribute="centerY" secondItem="giH-qQ-oYO" secondAttribute="centerY" id="p9E-WQ-Deo"/>
                                             <constraint firstItem="ogw-Jp-00F" firstAttribute="bottom" secondItem="Nmk-kJ-EpI" secondAttribute="bottom" id="vun-vU-gsi"/>
@@ -893,6 +903,7 @@
                         <outlet property="shareCountL" destination="Mgv-Zu-uNm" id="6o8-8g-igd"/>
                         <outlet property="shareImgV" destination="k6n-sb-jAd" id="jJn-8p-Nta"/>
                         <outlet property="tableView" destination="XUI-zY-2co" id="XUa-1p-hri"/>
+                        <outlet property="titleL" destination="yMl-n2-VaV" id="MYA-2c-UzD"/>
                         <outlet property="zanButton" destination="Twb-YZ-7Ru" id="J0I-ZB-vZ0"/>
                         <outlet property="zanCountL" destination="5kk-U6-emg" id="WIB-R2-D4V"/>
                         <outlet property="zanImgV" destination="yxB-OI-xrF" id="b7x-xS-O6N"/>

smartRhino/Project/VCModel/Home/OtherHomeVC/MyTDTopic/VC/MyTDTopicDetailVC.h

@@ -14,7 +14,6 @@ NS_ASSUME_NONNULL_BEGIN
 +(MyTDTopicDetailVC *)initMyTDTopicDetailVC;
 @property (nonatomic, copy) void(^deleteTopicBlock)(void);
 @property (nonatomic, assign) BOOL         isComment;
-@property (nonatomic, assign) BOOL         isMusic;
 @property (assign, nonatomic) CollectModelType  type;
 @property (assign, nonatomic) NSInteger  Id;
 @property (strong, nonatomic) NSURL     *URL;

smartRhino/Project/VCModel/Home/OtherHomeVC/MyTDTopic/VC/MyTDTopicDetailVC.m

@@ -96,13 +96,16 @@
 - (void)viewWillAppear:(BOOL)animated
 {
     [super viewWillAppear:animated];
-    self.musicBtn.hidden = !self.isMusic;
     WS(weakSelf);
+    self.dismissSelf = NO;
+    self.musicBtn.hidden = YES;
+    [self createMenuItems];
     switch (self.type) {
         case CollectModel_InterMail:
         {
             [self setMailBottomView:YES];
             [self.ReplayBtn setAction:^{
+                weakSelf.dismissSelf = YES;
                 [weakSelf ReplayAction];
             }];
             self.titleL.text = @"站内信";
@@ -129,14 +132,17 @@
         case CollectModel_NoteBook:
         {
             self.titleL.text = @"笔记";
+            self.musicBtn.hidden = NO;
             [self setMailBottomView:NO];
         }
             break;
         case CollectModel_Aritle:
         {
             self.titleL.text = @"正文";
+            self.musicBtn.hidden = NO;
             [self setMailBottomView:NO];
         }
+            break;
         default:
         {
             self.titleL.text = @"话题";
@@ -166,13 +172,13 @@
     }
 }
 - (void)ReplayAction{
+    WS(weakSelf);
     UIAlertController *alert = [UIAlertController alertControllerWithTitle:nil message:nil preferredStyle:UIAlertControllerStyleActionSheet];
     
     UIAlertAction *alertAction1 = [UIAlertAction actionWithTitle:@"取消" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
-        
+        [weakSelf setCusMenuShare];
     }];
     [alertAction1 setValue:UIColorHex(#0A0A0A) forKey:@"titleTextColor"];
-    WS(weakSelf);
     UIAlertAction *alertAction2 = [UIAlertAction actionWithTitle:@"回复" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
         weakSelf.webH = 0;
         MyTDTopicCreateVC * vc = [MyTDTopicCreateVC initMyTDTopicCreateVC];
@@ -214,14 +220,17 @@
     [self setTableViewRefresh];
     WS(weakSelf);
     [self.shareButton setAction:^{
+        weakSelf.dismissSelf = YES;
         [weakSelf ShareDetail];
     }];
     [self.zanButton setAction:^{
+        weakSelf.dismissSelf = YES;
         [weakSelf gotoZanHander];
     }];
 
     if (self.type != CollectModel_InterMail) {
         [self.commentButton setAction:^{
+            weakSelf.dismissSelf = YES;
             [weakSelf commentHander];
         }];
         [self.commentScrollBtn setAction:^{
@@ -287,7 +296,7 @@
         [UIView setAnimationBeginsFromCurrentState:YES];
         [UIView setAnimationCurve:[curve intValue]];
     } completion:^(BOOL finished) {
-        
+        [weakSelf setCusMenuShare];
     }];
 }
 - (void)setTableViewRefresh{
@@ -324,6 +333,7 @@
     self.shareImgV.image = IMG(@"icon_share");
     WS(weakSelf);
     [self.collectButton setAction:^{
+        weakSelf.dismissSelf = YES;
         if (model.IsCollect) {
             dispatch_async(dispatch_get_main_queue(), ^{
                 UIAlertController *alert = [UIAlertController alertControllerWithTitle:@"真的取消收藏吗？" message:nil preferredStyle:UIAlertControllerStyleAlert];
@@ -351,9 +361,10 @@
                     } failure:^(NSError * _Nonnull error) {
                         //                    SHOWERROR([ZYCTool handerResultData:error]);
                     }];
+                    [weakSelf setCusMenuShare];
                 }];
                 UIAlertAction *actionNo = [UIAlertAction actionWithTitle:@"取消" style:UIAlertActionStyleCancel handler:^(UIAlertAction * _Nonnull action) {
-                    
+                    [weakSelf setCusMenuShare];
                 }];
                 [alert addAction:actionYes];
                 [alert addAction:actionNo];
@@ -1556,9 +1567,10 @@
             weakSelf.isScrComment = YES;
             [weakSelf scrollToCommentViewTop];
         });
+        [weakSelf setCusMenuShare];
     } failure:^(NSError * _Nonnull error) {
         REMOVESHOW
-//        SHOWERROR([ZYCTool handerResultData:error]);
+        [weakSelf setCusMenuShare];
     }];
 }
 /// 点赞正文
@@ -1577,10 +1589,11 @@
         dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
             weakSelf.isScrComment = YES;
             [weakSelf scrollToCommentViewTop];
+            [weakSelf setCusMenuShare];
         });
     } failure:^(NSError * _Nonnull error) {
         REMOVESHOW
-//        SHOWERROR([ZYCTool handerResultData:error]);
+        [weakSelf setCusMenuShare];
     }];
 }
 /// 评论正文
@@ -1589,6 +1602,7 @@
     WEAKSELF
     self.commentInputView.inputBlock = ^(NSString * _Nonnull content) {
         NSLog(@"%@",content);
+        [weakSelf setCusMenuShare];
         [weakSelf sendCommentToServerWithcontent:content];
     };
 }
@@ -1957,6 +1971,7 @@
 {
     [self becomeFirstResponder];
     UIMenuController *menu = [UIMenuController sharedMenuController];
+    UIMenuItem *copyItem = [[UIMenuItem alloc] initWithTitle:@"复制" action:@selector(copyItemAction:)];
     UIMenuItem *deleteItem = [[UIMenuItem alloc] initWithTitle:@"删除" action:@selector(deleteItemAction:)];
     UIMenuItem *upDateItem = [[UIMenuItem alloc] initWithTitle:@"编辑" action:@selector(upDateItemAction:)];
     [menu setMenuItems: @[deleteItem,upDateItem]];
@@ -1968,6 +1983,7 @@
 {
     [self becomeFirstResponder];
     UIMenuController *menu = [UIMenuController sharedMenuController];
+    UIMenuItem *copyItem = [[UIMenuItem alloc] initWithTitle:@"复制" action:@selector(copyItemAction:)];
     UIMenuItem *deleteItem = [[UIMenuItem alloc] initWithTitle:@"删除" action:@selector(deleteItemAction:)];
     UIMenuItem *upDateItem = [[UIMenuItem alloc] initWithTitle:@"编辑" action:@selector(upDateItemAction:)];
     [menu setMenuItems: @[deleteItem,upDateItem]];
@@ -1975,14 +1991,21 @@
     [menu setMenuVisible:YES animated:NO];
 }
 
--(BOOL)canBecomeFirstResponder
-{
-    return YES;
-}
+//-(BOOL)canBecomeFirstResponder
+//{
+//    return YES;
+//}
 //是否可以接收某些菜单的某些交互操作
--(BOOL)canPerformAction:(SEL)action withSender:(id)sender{
-    return (action == @selector(deleteItemAction:)
-            ||action == @selector(upDateItemAction:));
+//-(BOOL)canPerformAction:(SEL)action withSender:(id)sender{
+//    return (action == @selector(deleteItemAction:)
+//            ||action == @selector(upDateItemAction:));
+//}
+- (void)copyItemAction:(UIMenuItem *)item
+{
+    UIPasteboard *pboard = [UIPasteboard generalPasteboard];
+    pboard.string = self.commentStr;
+    SHOWSUCCESS(@"复制成功");
+    NSLog(@"选中-----%@", pboard.string);
 }
 - (void)deleteItemAction:(UIMenuItem *)item
 {
@@ -2443,63 +2466,87 @@
 }
 #pragma mark - UIMenuController
 //指定menu响应事件 屏蔽系统自带响应事件
-//- (BOOL)canPerformAction:(SEL)action withSender:(id)sender {
-//    NSLog(@"%@", NSStringFromSelector(action));
-//    if (action == @selector(tySelectedAll:)
-//        ||action == @selector(shareSelectedText:)) {
-//        return YES;
-//    }
-//    if (action == @selector(cut:)
-//        ||action == @selector(select:)
-//        ||action == @selector(selectAll:)
-//        ||action == @selector(paste:)
-//        ||action == @selector(delete:)
-//        ||action == @selector(makeTextWritingDirectionRightToLeft:)
-//        ||action == @selector(makeTextWritingDirectionLeftToRight:)) {
-//        return NO;
-//    }
-//    return NO;
-//}
-//- (void)viewWillDisappear:(BOOL)animated{
-//    [super viewWillDisappear:animated];
-//    self.dismissSelf = YES;
-//}
-////允许成为第一响应
-//- (BOOL)canBecomeFirstResponder {
-//    return YES;
-//}
-//- (BOOL)canResignFirstResponder {
-//    if (self.dismissSelf) {
-//        return YES;
-//    }
-//    return NO;
-//}
-//
-//- (void)tySelectedAll:(UIMenuController *)menu{
-//    
-//    [self.webView selectAll:menu];
-//    self.dismissSelf = YES;
-//}
-//#pragma mark 实现自定义方法
-//- (void)shareSelectedText:(UIMenuController *)menu {
-//    WS(weakSelf);
-//    [self.webView evaluateJavaScript:@"window.getSelection().toString()" completionHandler:^(id _Nullable data, NSError * _Nullable error) {
-//        NSLog(@"选中的文字为:%@", data);
-//        [self.webView copy:data];
-//        weakSelf.shareText = data;
-//        if (weakSelf.shareText.length > 0) {
-//            weakSelf.IsShareText = YES;
-//            [weakSelf shareHander];
-//        }
-//    }];
-//}
-//- (void)createMenuItems
-//{
-//    UIMenuController * menu = [UIMenuController sharedMenuController];
-//    UIMenuItem *item1 = [[UIMenuItem alloc]initWithTitle:@"全选" action:@selector(tySelectedAll:)];
-//    UIMenuItem *item2 = [[UIMenuItem alloc]initWithTitle:@"转发" action:@selector(shareSelectedText:)];
-//    [menu setMenuItems:@[item1, item2]];
-//    menu.menuVisible = YES;
-//}
+- (BOOL)canPerformAction:(SEL)action withSender:(id)sender {
+    NSLog(@"%@", NSStringFromSelector(action));
+    if (action == @selector(copyAction:)
+        ||action == @selector(tySelectedAll:)
+        ||action == @selector(shareSelectedText:)
+        ||action == @selector(searchAction:)
+        ||action == @selector(deleteItemAction:)
+        ||action == @selector(upDateItemAction:)) {
+        return YES;
+    }
+    if (action == @selector(cut:)
+        ||action == @selector(select:)
+        ||action == @selector(selectAll:)
+        ||action == @selector(paste:)
+        ||action == @selector(delete:)
+        ||action == @selector(makeTextWritingDirectionRightToLeft:)
+        ||action == @selector(makeTextWritingDirectionLeftToRight:)) {
+        return NO;
+    }
+    return NO;
+}
+- (void)viewWillDisappear:(BOOL)animated{
+    [super viewWillDisappear:animated];
+    self.dismissSelf = YES;
+}
+//允许成为第一响应
+- (BOOL)canBecomeFirstResponder {
+    return YES;
+}
+- (BOOL)canResignFirstResponder {
+    if (self.dismissSelf) {
+        return YES;
+    }
+    return NO;
+}
+#pragma mark 实现自定义方法
+- (void)setCusMenuShare
+{
+    self.dismissSelf = NO;
+    [self createMenuItems];
+}
+- (void)copyAction:(UIMenuController *)menu
+{
+    SHOWSUCCESS(@"复制成功");
+    [self.webView evaluateJavaScript:@"window.getSelection().toString()" completionHandler:^(id _Nullable content, NSError * _Nullable error) {
+        UIPasteboard *pboard = [UIPasteboard generalPasteboard];
+        pboard.string = (NSString *)content;
+        NSLog(@"选中-----%@", pboard.string);
+    }];
+}
+- (void)searchAction:(UIMenuController *)menu
+{
+    
+}
+- (void)tySelectedAll:(UIMenuController *)menu{
+    
+    [self.webView selectAll:menu];
+    self.dismissSelf = YES;
+}
+
+- (void)shareSelectedText:(UIMenuController *)menu {
+    WS(weakSelf);
+    [self.webView evaluateJavaScript:@"window.getSelection().toString()" completionHandler:^(id _Nullable data, NSError * _Nullable error) {
+        NSLog(@"选中的文字为:%@", data);
+        [self.webView copy:data];
+        weakSelf.shareText = data;
+        if (weakSelf.shareText.length > 0) {
+            weakSelf.IsShareText = YES;
+            [weakSelf shareHander];
+        }
+    }];
+}
+- (void)createMenuItems
+{
+    UIMenuController * menu = [UIMenuController sharedMenuController];
+    UIMenuItem *item1 = [[UIMenuItem alloc]initWithTitle:@"复制" action:@selector(copyAction:)];
+    UIMenuItem *item2 = [[UIMenuItem alloc]initWithTitle:@"全选" action:@selector(tySelectedAll:)];
+    UIMenuItem *item3 = [[UIMenuItem alloc]initWithTitle:@"摘录" action:@selector(shareSelectedText:)];
+    UIMenuItem *item4 = [[UIMenuItem alloc]initWithTitle:@"搜索" action:@selector(searchAction:)];
+    [menu setMenuItems:@[item1, item2, item3, item4]];
+    menu.menuVisible = YES;
+}
 @end
 

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

@@ -312,13 +312,13 @@
         attach.bounds = CGRectMake(0, 0, 11, 11);
         NSAttributedString *collegeStr = [NSAttributedString attributedStringWithAttachment:attach];
         [attStr appendAttributedString:collegeStr];
-        NSAttributedString *placeStr = [[NSAttributedString alloc] initWithString:@" 大众" attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:18],NSForegroundColorAttributeName:UIColorHex(0x999999)}];
+        NSAttributedString *placeStr = [[NSAttributedString alloc] initWithString:@" 大众" attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:18],NSForegroundColorAttributeName:self.leftHidden ? UIColorHex(0x0a0a0a) : UIColorHex(0x999999)}];
         [attStr appendAttributedString:placeStr];
         label.attributedText = attStr;
         headerView.backgroundColor = UIColorHex(0xFFFFFF);
         WS(weakSelf);
         UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithActionBlock:^(id  _Nonnull sender) {
-            weakSelf.leftHidden = NO;
+            weakSelf.leftHidden = !weakSelf.leftHidden;
             [weakSelf reloadData];
         }];
         [headerView addGestureRecognizer:tap];
@@ -335,7 +335,7 @@
     if (tableView == self.leftTableV) {
         BookContentLeftModel * model = [self.dataArray objectAtIndex:indexPath.row];
         BookContentLeftCell * cell = [BookContentLeftCell configCell:tableView indexPath:indexPath];
-        [cell setDataModel:model];
+        [cell setDataModel:model withLift:self.leftHidden withMiddle:self.middleHidden];
         if (indexPath.row == 0) {
             if (model.isSelect) {
                 cell.height.constant = 58.f;

smartRhino/Project/VCModel/Home/VC/BookStore/VC/BookRead/UIGestureRecognizer+SSUtil.h

@@ -0,0 +1,19 @@
+//
+//  UIGestureRecognizer+SSUtil.h
+//  TTReading
+//
+//  Created by loyinglin on 2019/3/17.
+//  Copyright © 2019 ByteDance. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface UIGestureRecognizer (SSUtil)
+
+- (void)cancelCurrentGestureReccongizing;
+
+@end
+
+NS_ASSUME_NONNULL_END

smartRhino/Project/VCModel/Home/VC/BookStore/VC/BookRead/UIGestureRecognizer+SSUtil.m

@@ -0,0 +1,19 @@
+//
+//  UIGestureRecognizer+SSUtil.m
+//  TTReading
+//
+//  Created by loyinglin on 2019/3/17.
+//  Copyright © 2019 ByteDance. All rights reserved.
+//
+
+#import "UIGestureRecognizer+SSUtil.h"
+
+@implementation UIGestureRecognizer (SSUtil)
+
+- (void)cancelCurrentGestureReccongizing {
+    // disabled gesture recognizers will not receive touches. when changed to NO the gesture recognizer will be cancelled if it's currently recognizing a gesture
+    self.enabled = NO;
+    self.enabled = YES;
+}
+
+@end

smartRhino/Project/VCModel/Home/VC/BookStore/VC/BookRead/UIView+LYLayout.h

@@ -0,0 +1,26 @@
+//
+//  UIView+LYLayout.h
+//  LYFrameworkDemo
+//
+//  Created by loyinglin on 2018/10/25.
+//  Copyright © 2018 loyinglin. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface UIView (LYLayout)
+
+@property (nonatomic) CGFloat left;        ///< Shortcut for frame.origin.x.
+@property (nonatomic) CGFloat top;         ///< Shortcut for frame.origin.y
+@property (nonatomic) CGFloat right;       ///< Shortcut for frame.origin.x + frame.size.width
+@property (nonatomic) CGFloat bottom;      ///< Shortcut for frame.origin.y + frame.size.height
+@property (nonatomic) CGFloat width;       ///< Shortcut for frame.size.width.
+@property (nonatomic) CGFloat height;      ///< Shortcut for frame.size.height.
+@property (nonatomic) CGFloat centerX;     ///< Shortcut for center.x
+@property (nonatomic) CGFloat centerY;     ///< Shortcut for center.y
+@property (nonatomic) CGPoint origin;      ///< Shortcut for frame.origin.
+@property (nonatomic) CGSize  size;        ///< Shortcut for frame.size.
+
+@end
+
+

smartRhino/Project/VCModel/Home/VC/BookStore/VC/BookRead/UIView+LYLayout.m

@@ -0,0 +1,121 @@
+//
+//  UIView+LYLayout.m
+//  LYFrameworkDemo
+//
+//  Created by loyinglin on 2018/10/25.
+//  Copyright © 2018 loyinglin. All rights reserved.
+//
+
+#import "UIView+LYLayout.h"
+
+@implementation UIView (LYLayout)
+
+- (CGFloat)left {
+    
+    return self.frame.origin.x;
+}
+
+- (void)setLeft:(CGFloat)x {
+    
+    CGRect frame = self.frame;
+    frame.origin.x = x;
+    self.frame = frame;
+}
+
+- (CGFloat)top {
+    
+    return self.frame.origin.y;
+}
+
+- (void)setTop:(CGFloat)y {
+    
+    CGRect frame = self.frame;
+    frame.origin.y = y;
+    self.frame = frame;
+}
+
+- (CGFloat)right {
+    
+    return self.frame.origin.x + self.frame.size.width;
+}
+
+- (void)setRight:(CGFloat)right {
+    CGRect frame = self.frame;
+    frame.origin.x = right - frame.size.width;
+    self.frame = frame;
+}
+
+- (CGFloat)bottom {
+    return self.frame.origin.y + self.frame.size.height;
+}
+
+- (void)setBottom:(CGFloat)bottom {
+    CGRect frame = self.frame;
+    frame.origin.y = bottom - frame.size.height;
+    self.frame = frame;
+}
+
+- (CGFloat)width {
+    return self.frame.size.width;
+}
+
+- (void)setWidth:(CGFloat)width {
+    CGRect frame = self.frame;
+    frame.size.width = width;
+    self.frame = frame;
+}
+
+- (CGFloat)height {
+    return self.frame.size.height;
+}
+
+- (void)setHeight:(CGFloat)height {
+    CGRect frame = self.frame;
+    frame.size.height = height;
+    self.frame = frame;
+}
+
+- (CGFloat)centerX {
+    
+    return self.center.x;
+}
+
+- (void)setCenterX:(CGFloat)centerX {
+    
+    self.center = CGPointMake(centerX, self.center.y);
+}
+
+- (CGFloat)centerY {
+    
+    return self.center.y;
+}
+
+- (void)setCenterY:(CGFloat)centerY {
+    self.center = CGPointMake(self.center.x, centerY);
+}
+
+- (CGPoint)origin {
+    
+    return self.frame.origin;
+}
+
+- (void)setOrigin:(CGPoint)origin {
+    CGRect frame = self.frame;
+    frame.origin = origin;
+    self.frame = frame;
+}
+
+- (CGSize)size {
+    
+    return self.frame.size;
+}
+
+- (void)setSize:(CGSize)size {
+    
+    CGRect frame = self.frame;
+    frame.size = size;
+    self.frame = frame;
+}
+
+@end
+

smartRhino/Project/VCModel/Home/VC/BookStore/VC/BookRead/viewcontroller/BookReadVC.m

@@ -21,8 +21,9 @@
 #import "BookReadStlyeModel.h"
 #import "BookPlayAlert.h"
 #import "BookCardPayAlert.h"
+#import "SSScrollViewController.h"
 
-@interface BookReadVC () <UIPageViewControllerDelegate, UIPageViewControllerDataSource,DCPageBottomViewDelegate,DCPageTopViewDelegate,DCBookListViewDelgate,UIGestureRecognizerDelegate>
+@interface BookReadVC () <UIPageViewControllerDelegate, UIPageViewControllerDataSource,DCPageBottomViewDelegate,DCPageTopViewDelegate,DCBookListViewDelgate,UIGestureRecognizerDelegate,SSScrollViewControllerDelegate>
 {
     CGSize _contentSize;
 }
@@ -617,7 +618,14 @@
             break;
         default:
         {
-            self.pageViewController = [[UIPageViewController alloc]initWithTransitionStyle:UIPageViewControllerTransitionStyleScroll navigationOrientation:UIPageViewControllerNavigationOrientationVertical options:nil];
+            SSScrollViewController *vc = [[SSScrollViewController alloc] init];
+            vc.shouldFullFill = YES;
+            vc.delegate = self;
+            [self addChildViewController:vc];
+            [self.view addSubview:vc.view];
+            [vc setInitVC:[self getRandomVCWithIndex:self.currentIndex]];
+            return;
+//            self.pageViewController = [[UIPageViewController alloc]initWithTransitionStyle:UIPageViewControllerTransitionStyleScroll navigationOrientation:UIPageViewControllerNavigationOrientationVertical options:nil];
         }
             break;
     }
@@ -638,6 +646,39 @@
     [self.view insertSubview:self.pageViewController.view belowSubview:self.topView];
     self.toolViewShow = NO;
 }
+- (UIViewController *)scrollViewControllerGetLastVC:(SSScrollViewController *)scrollVC {
+    UIViewController *ret;
+    UIViewController *vc = [scrollVC.viewControllers firstObject];
+    if (vc) {
+        NSInteger index = vc.view.tag;
+        if (index > 0) {
+            ret = [self getRandomVCWithIndex:index - 1];
+        }
+    }
+    return ret;
+}
+
+- (UIViewController *)scrollViewControllerGetNextVC:(SSScrollViewController *)scrollVC {
+    UIViewController *ret;
+    UIViewController *vc = [scrollVC.viewControllers lastObject];
+    if (vc) {
+        NSInteger index = vc.view.tag;
+        if (index < 10) {
+            ret = [self getRandomVCWithIndex:index + 1];
+        }
+    }
+    return ret;
+}
+
+- (void)scrollViewController:(SSScrollViewController *)scrollVC currentShowViewController:(UIViewController *)viewController {
+    NSLog(@"currentShowViewController:%ld", (long) viewController.view.tag);
+}
+
+- (UIViewController *)getRandomVCWithIndex:(NSInteger)index {
+    DCContentVC *contantVC = [self viewControllerAtIndex:index];
+    contantVC.view.tag = index;
+    return contantVC;
+}
 
 -(DCPageTopView *)topView
 {

smartRhino/Project/VCModel/Home/VC/BookStore/VC/BookRead/viewcontroller/SSScrollViewController.h

@@ -0,0 +1,42 @@
+//
+//  SSScorllViewController.h
+//  LearnCoreText
+//
+//  Created by loyinglin on 2019/3/18.
+//  Copyright © 2019 Loying. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@class SSScrollViewController;
+@protocol SSScrollViewControllerDelegate <NSObject>
+
+- (UIViewController *)scrollViewControllerGetLastVC:(SSScrollViewController *)scrollVC;
+
+- (UIViewController *)scrollViewControllerGetNextVC:(SSScrollViewController *)scrollVC;
+
+- (void)scrollViewController:(SSScrollViewController *)scrollVC currentShowViewController:(UIViewController *)viewController;
+
+@end
+
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface SSScrollViewController : UIViewController
+
+
+/**
+ 是否对首屏内容进行填充，保证满屏显示；default是NO
+ */
+@property (nonatomic, assign) BOOL shouldFullFill;
+
+@property (nonatomic, weak) id<SSScrollViewControllerDelegate> delegate;
+
+@property(readonly, nonatomic) NSArray<__kindof UIViewController *> *viewControllers;
+
+- (void)setInitVC:(UIViewController *)vc;
+
+@end
+
+
+NS_ASSUME_NONNULL_END

smartRhino/Project/VCModel/Home/VC/BookStore/VC/BookRead/viewcontroller/SSScrollViewController.m

@@ -0,0 +1,207 @@
+//
+//  SSScorllViewController.m
+//  LearnCoreText
+//
+//  Created by loyinglin on 2019/3/18.
+//  Copyright © 2019 Loying. All rights reserved.
+//
+
+#import "SSScrollViewController.h"
+#import "UIView+LYLayout.h"
+#import "UIGestureRecognizer+SSUtil.h"
+
+@interface SSScrollViewController () <UIScrollViewDelegate>
+
+@property (nonatomic, strong) UIScrollView *scrollView;
+@property (nonatomic, strong) NSMutableArray<UIViewController *> *vcArr;
+@property (nonatomic, weak) UIViewController *currentVC;
+
+@end
+
+@implementation SSScrollViewController
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    
+    self.vcArr = [NSMutableArray array];
+    // Do any additional setup after loading the view.
+    
+    self.scrollView = [[UIScrollView alloc] initWithFrame:self.view.bounds];
+    self.scrollView.showsVerticalScrollIndicator = NO;
+    self.scrollView.delegate = self;
+    self.scrollView.contentSize = CGSizeMake(self.view.width, self.view.height * 3);
+    [self.view addSubview:self.scrollView];
+    
+    if (@available(iOS 11.0, *)) {
+        self.scrollView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
+    }
+    else{
+        self.automaticallyAdjustsScrollViewInsets = NO;
+    }
+}
+
+#pragma mark - init
+
+#pragma mark - getter&setter
+
+- (void)setInitVC:(UIViewController *)vc {
+    [self resetStatus];
+    
+    [self addChildViewController:vc];
+    [self.vcArr addObject:vc];
+    vc.view.top = self.scrollView.contentOffset.y;
+    [self.scrollView addSubview:vc.view];
+    if (self.shouldFullFill) {
+        [self fullFillContent];
+    }
+    self.currentVC = vc;
+}
+
+- (void)fullFillContent {
+    CGFloat downFillY;
+    if (self.viewControllers && self.viewControllers.count > 0) {
+        UIViewController *vc = [self.viewControllers lastObject];
+        downFillY = vc.view.bottom;
+    }
+    else {
+        downFillY = self.scrollView.contentOffset.y;
+    }
+    while (downFillY < self.scrollView.contentOffset.y + self.scrollView.height) {
+        if (!self.delegate) {
+            NSLog(@"error, empty delegate");
+            break;
+        }
+        UIViewController *vc = [self.delegate scrollViewControllerGetNextVC:self];
+        if (!vc) {
+            NSLog(@"info, reach next end");
+            break;
+        }
+        
+        [self.vcArr addObject:vc];
+        [self addChildViewController:vc];
+        [self.scrollView addSubview:vc.view];
+        vc.view.top = downFillY;
+        downFillY = vc.view.bottom;
+        NSLog(@"info, add next vc, frame:%@", NSStringFromCGRect(vc.view.frame));
+    }
+}
+
+- (NSArray<UIViewController *> *)viewControllers {
+    return self.vcArr;
+}
+
+- (void)resetStatus {
+    for (int i = 0; i < self.vcArr.count; ++i) {
+        UIViewController *vc = [self.vcArr lastObject];
+        [vc removeFromParentViewController];
+        [vc.view removeFromSuperview];
+    }
+    [self.vcArr removeAllObjects];
+    [self safeSetContentOffsetY:self.scrollView.height];
+}
+#pragma mark - action
+
+- (void)updateAllViewsWithOffset:(CGFloat)offset {
+    for (int i = 0; i < self.vcArr.count; ++i) {
+        UIViewController *vc = [self.vcArr objectAtIndex:i];
+        vc.view.top += offset;
+    }
+    [self.scrollView setContentOffset:CGPointMake(self.scrollView.contentOffset.x, self.scrollView.contentOffset.y + offset)];
+}
+
+- (CGFloat)getVCMaxY {
+    CGFloat ret = 0;
+    if (self.viewControllers.count > 0) {
+        ret = [self.viewControllers lastObject].view.bottom;
+    }
+    return ret;
+}
+
+- (CGFloat)getVCMinY {
+    CGFloat ret = 0;
+    if (self.viewControllers.count > 0) {
+        ret = [self.viewControllers firstObject].view.top;
+    }
+    return ret;
+}
+
+#pragma mark - delegate
+
+- (void)scrollViewDidScroll:(UIScrollView *)scrollView {
+    if (scrollView.contentOffset.y < [self getVCMinY]) { // 上面没vc了
+        if (self.delegate) {
+            UIViewController *vc = [self.delegate scrollViewControllerGetLastVC:self];
+            if (vc) {
+                [self addChildViewController:vc];
+                vc.view.bottom = [self getVCMinY];
+                [self.scrollView addSubview:vc.view];
+                [self.vcArr insertObject:vc atIndex:0];
+            }
+        }
+        if (scrollView.contentOffset.y < [self getVCMinY]) {
+            [self safeSetContentOffsetY:[self getVCMinY]];
+            [scrollView.panGestureRecognizer cancelCurrentGestureReccongizing];
+        }
+    }
+    else if (scrollView.contentOffset.y + scrollView.height > [self getVCMaxY]) {
+        if (self.delegate) {
+            UIViewController *vc = [self.delegate scrollViewControllerGetNextVC:self];
+            if (vc) {
+                [self addChildViewController:vc];
+                [self.scrollView addSubview:vc.view];
+                vc.view.top = [self getVCMaxY];
+                [self.vcArr addObject:vc];
+            }
+        }
+        if (scrollView.contentOffset.y + scrollView.height > [self getVCMaxY]) {
+            [self safeSetContentOffsetY:[self getVCMaxY] - scrollView.height];
+        }
+    }
+    
+    // check top
+    if (self.vcArr && self.vcArr.count > 0) {
+        UIViewController *vc = [self.vcArr firstObject];
+        if (vc.view.bottom < scrollView.contentOffset.y) { // 看不见
+            [self.vcArr removeObject:vc];
+            [vc removeFromParentViewController];
+            [vc.view removeFromSuperview];
+            [self updateAllViewsWithOffset:-vc.view.height];
+        }
+    }
+//
+    // check bottom
+    if (self.vcArr && self.vcArr.count > 0) {
+        UIViewController *vc = [self.vcArr lastObject];
+        if (vc.view.top > scrollView.contentOffset.y + scrollView.height) { //
+            [self.vcArr removeObject:vc];
+            [vc removeFromParentViewController];
+            [vc.view removeFromSuperview];
+            [self updateAllViewsWithOffset:vc.view.height];
+        }
+    }
+    
+    [self checkCurrentVC];
+}
+
+- (void)checkCurrentVC {
+    for (int i = 0; i < self.vcArr.count; ++i) {
+        if (self.vcArr[i].view.bottom > self.scrollView.contentOffset.y + self.scrollView.height / 2) {
+            if (self.vcArr[i] != self.currentVC) {
+                self.currentVC = self.vcArr[i];
+                if (self.delegate) {
+                    [self.delegate scrollViewController:self currentShowViewController:self.currentVC];
+                }
+            }
+            break;
+        }
+    }
+}
+
+- (void)safeSetContentOffsetY:(CGFloat)y {
+    self.scrollView.delegate = nil;
+    [self.scrollView setContentOffset:CGPointMake(self.scrollView.contentOffset.x, y) animated:NO];
+    self.scrollView.delegate = self;
+}
+#pragma mark - private
+
+@end

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

@@ -492,4 +492,5 @@
             break;
     }
 }
+
 @end

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

@@ -16,6 +16,11 @@ NS_ASSUME_NONNULL_BEGIN
 @property (weak, nonatomic) IBOutlet UICollectionView *collectionView;
 @property (weak, nonatomic) IBOutlet UIButton *lookAllBtn;
 @property (weak, nonatomic) IBOutlet NSLayoutConstraint *height;
+@property (copy, nonatomic) NSArray                     *dataArray;
+
+@property (assign, nonatomic) CGFloat                  offset;
+@property (assign, nonatomic) CGFloat                  offsetX;
+
 + (BookBillCell *)configCell:(UITableView *)tableView indexPath:(NSIndexPath *)indexPath;
 - (void)setDataWithModel:(BookBillModel *)model Item:(NSInteger)Item;
 @end

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

@@ -59,27 +59,32 @@
         {
             self.height.constant = 303.f;
             [self.collectionView setContentSize:CGSizeMake((SCREEN_WIDTH - 40) * 3, 303.f)];
+            self.offset = SCREEN_WIDTH - 40;
         }
             break;
         case BookBillCourse:
         {
             self.height.constant = 270.f;
             [self.collectionView setContentSize:CGSizeMake((SCREEN_WIDTH - 35) * 3, 270.f)];
+            self.offset = SCREEN_WIDTH - 35;
         }
             break;
         case BookBillVideo:
         {
             self.height.constant = 270.f;
             [self.collectionView setContentSize:CGSizeMake((SCREEN_WIDTH - 35) * 3, 270.f)];
+            self.offset = SCREEN_WIDTH - 35;
         }
             break;
         default:
         {
             self.height.constant = 300.f;
             [self.collectionView setContentSize:CGSizeMake((SCREEN_WIDTH - 35) * 3, 300.f)];
+            self.offset = SCREEN_WIDTH - 35;
         }
             break;
     }
+    self.dataArray = [NSMutableArray arrayWithArray:@[@"",@"",@"",@"",@"",@"",@"",@"",@""]];
     [self.collectionView setContentOffset:CGPointZero animated:NO];
     [self.contentView setBackgroundColor:Item % 2 != 0 ? UIColorHex(0xFFFFFF) : UIColorHex(0xF7F7F9)];
     [self.collectionView setBackgroundColor:Item % 2 != 0 ? UIColorHex(0xFFFFFF) : UIColorHex(0xF7F7F9)];
@@ -95,7 +100,7 @@
 }
 - (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section
 {
-    return 9;
+    return self.dataArray.count;
 }
 - (NSInteger)numberOfSectionsInCollectionView:(UICollectionView *)collectionView
 {
@@ -154,5 +159,52 @@
             break;
     }
 }
+- (void)scrollViewDidEndScrollingAnimation:(UIScrollView *)scrollView{
+    self.offsetX = scrollView.contentOffset.x;
+}
+
+- (void)scrollViewWillBeginDecelerating:(UIScrollView *)scrollView{
+    if (fabs(scrollView.contentOffset.x - self.offsetX) > 20) {
+        if (scrollView.contentOffset.x > self.offsetX) {
+            NSInteger i = scrollView.contentOffset.x / self.offset + 1;
+            if (self.dataArray.count / 3 <= i) {
+                i --;
+            }
+            NSIndexPath * index =  [NSIndexPath indexPathForRow:i > 0 ? 3 * i : 0  inSection:0];
+            [_collectionView scrollToItemAtIndexPath:index atScrollPosition:UICollectionViewScrollPositionCenteredHorizontally animated:YES];
+        }else{
+            NSInteger i = scrollView.contentOffset.x / self.offset + 1;
+            i = (i - 1)<0?0:(i - 1);
+            if (self.dataArray.count / 3 <= i) {
+                i --;
+            }
+            NSIndexPath * index =  [NSIndexPath indexPathForRow:i > 0 ? 3 * i : 0 inSection:0];
+            [_collectionView scrollToItemAtIndexPath:index atScrollPosition:UICollectionViewScrollPositionCenteredHorizontally animated:YES];
+        }
+    }
+}
 
+- (void)scrollViewWillEndDragging:(UIScrollView *)scrollView withVelocity:(CGPoint)velocity targetContentOffset:(inout CGPoint *)targetContentOffset{
+    if (scrollView.contentOffset.x > (self.offset * self.dataArray.count / 3 - self.offset)) {
+        return;
+    }
+    if (fabs(scrollView.contentOffset.x - self.offsetX) > 20) {
+        if (scrollView.contentOffset.x > self.offsetX) {
+            NSInteger i = scrollView.contentOffset.x / self.offset + 1;
+            if (self.dataArray.count / 3 <= i) {
+                i --;
+            }
+            NSIndexPath * index =  [NSIndexPath indexPathForRow:i > 0 ? 3 * i : 0  inSection:0];
+            [_collectionView scrollToItemAtIndexPath:index atScrollPosition:UICollectionViewScrollPositionCenteredHorizontally animated:YES];
+        }else{
+            NSInteger i = scrollView.contentOffset.x / self.offset + 1;
+            i = (i - 1)<0?0:(i - 1);
+            if (self.dataArray.count / 3 <= i) {
+                i --;
+            }
+            NSIndexPath * index =  [NSIndexPath indexPathForRow:i > 0 ? 3 * i : 0 inSection:0];
+            [_collectionView scrollToItemAtIndexPath:index atScrollPosition:UICollectionViewScrollPositionCenteredHorizontally animated:YES];
+        }
+    }
+}
 @end

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

@@ -20,6 +20,7 @@ NS_ASSUME_NONNULL_BEGIN
 + (BookContentLeftCell *)configCell:(UITableView *)tableView indexPath:(NSIndexPath *)indexPath;
 
 - (void)setDataModel:(BookContentLeftModel *)model;
+- (void)setDataModel:(BookContentLeftModel *)model withLift:(BOOL)left withMiddle:(BOOL)middle;
 - (void)setDataWithModel:(BookContentLeftModel *)model middleHidden:(BOOL)middle;
 - (void)setDataWithsubModel:(BookContentLeftModel *)model leftHidden:(BOOL)left;
 

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

@@ -32,8 +32,8 @@
 {
     self.NameL.text = model.title;
     if (model.isSelect) {
-        self.NameL.font = Kfont(18);
         self.BgView.backgroundColor = UIColorHex(0xFFFFFF);
+        self.NameL.textColor = UIColorHex(0x0A0A0A);
         self.BlueView.hidden = NO;
     }else{
         self.NameL.font = Kfont(16);
@@ -41,6 +41,29 @@
         self.BlueView.hidden = YES;
     }
 }
+- (void)setDataModel:(BookContentLeftModel *)model withLift:(BOOL)left withMiddle:(BOOL)middle
+{
+    self.NameL.text = model.title;
+    if (model.isSelect) {
+        self.NameL.font = Kfont(18);
+        if (!left && !middle) {
+            self.BgView.backgroundColor = UIColorHex(0x3979D3);
+            self.NameL.textColor = UIColorHex(0xFFFFFF);
+            self.BlueView.hidden = YES;
+        }else{
+            if(!left)
+            {
+                self.BgView.backgroundColor = UIColorHex(0xFFFFFF);
+                self.NameL.textColor = UIColorHex(0x0A0A0A);
+                self.BlueView.hidden = NO;
+            }
+        }
+    }else{
+        self.NameL.font = Kfont(16);
+        self.BgView.backgroundColor = UIColorHex(0xEBEBEB);
+        self.BlueView.hidden = YES;
+    }
+}
 - (void)setDataWithModel:(BookContentLeftModel *)model middleHidden:(BOOL)middle
 {
     self.NameL.text = model.title;

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

@@ -17,6 +17,8 @@ NS_ASSUME_NONNULL_BEGIN
 + (BookHomeCell *)configCell2:(UITableView *)tableView indexPath:(NSIndexPath *)indexPath;
 @property (copy, nonatomic) NSArray                   *dataArray;
 @property (assign, nonatomic) BookHomeType             type;
+@property (assign, nonatomic) CGFloat                  offset;
+@property (assign, nonatomic) CGFloat                  offsetX;
 @property (weak, nonatomic) IBOutlet UICollectionView *collectionView;
 @property (copy, nonatomic) void(^ClickItemBlock)(NSInteger Item);
 - (void)setDataWith:(BookHomeModel *)model andType:(BookHomeType)type andItem:(NSInteger)Item;

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

@@ -59,36 +59,42 @@
         {
             layout.scrollDirection = UICollectionViewScrollDirectionVertical;
             [self.collectionView setContentSize:CGSizeMake(SCREEN_WIDTH, 101 * 3)];
+            self.offset = SCREEN_WIDTH;
         }
             break;
         case BookHomeB:
         {
             layout.scrollDirection = UICollectionViewScrollDirectionHorizontal;
             [self.collectionView setContentSize:CGSizeMake((SCREEN_WIDTH - 40) * 3, 101 * 3)];
+            self.offset = SCREEN_WIDTH - 40;
         }
             break;
         case BookHomeC:
         {
             layout.scrollDirection = UICollectionViewScrollDirectionHorizontal;
             [self.collectionView setContentSize:CGSizeMake((SCREEN_WIDTH - 40) * 3, 101 * 3)];
+            self.offset = SCREEN_WIDTH - 40;
         }
             break;
         case BookHomeD:
         {
             layout.scrollDirection = UICollectionViewScrollDirectionHorizontal;
             [self.collectionView setContentSize:CGSizeMake((SCREEN_WIDTH - 40) * 3, 101 * 3)];
+            self.offset = SCREEN_WIDTH - 40;
         }
             break;
         case BookHomeE:
         {
             layout.scrollDirection = UICollectionViewScrollDirectionHorizontal;
             [self.collectionView setContentSize:CGSizeMake((SCREEN_WIDTH - 40) * 3, 101 * 3)];
+            self.offset = SCREEN_WIDTH - 40;
         }
             break;
         default:
         {
             layout.scrollDirection = UICollectionViewScrollDirectionHorizontal;
             [self.collectionView setContentSize:CGSizeMake((SCREEN_WIDTH - 40) * 4, 101 * 3)];
+            self.offset = (SCREEN_WIDTH - 40 ) * 0.5;
         }
             break;
     }
@@ -151,4 +157,52 @@
         self.ClickItemBlock(indexPath.item);
     }
 }
+- (void)scrollViewDidEndScrollingAnimation:(UIScrollView *)scrollView{
+    self.offsetX = scrollView.contentOffset.x;
+}
+
+- (void)scrollViewWillBeginDecelerating:(UIScrollView *)scrollView{
+    if (fabs(scrollView.contentOffset.x - self.offsetX) > 20) {
+        if (scrollView.contentOffset.x > self.offsetX) {
+            NSInteger i = scrollView.contentOffset.x / self.offset + 1;
+            if (self.dataArray.count / 3 <= i) {
+                i --;
+            }
+            NSIndexPath * index =  [NSIndexPath indexPathForRow:i > 0 ? 3 * i : 0  inSection:0];
+            [_collectionView scrollToItemAtIndexPath:index atScrollPosition:UICollectionViewScrollPositionCenteredHorizontally animated:YES];
+        }else{
+            NSInteger i = scrollView.contentOffset.x / self.offset + 1;
+            i = (i - 1)<0?0:(i - 1);
+            if (self.dataArray.count / 3 <= i) {
+                i --;
+            }
+            NSIndexPath * index =  [NSIndexPath indexPathForRow:i > 0 ? 3 * i : 0 inSection:0];
+            [_collectionView scrollToItemAtIndexPath:index atScrollPosition:UICollectionViewScrollPositionCenteredHorizontally animated:YES];
+        }
+    }
+}
+
+- (void)scrollViewWillEndDragging:(UIScrollView *)scrollView withVelocity:(CGPoint)velocity targetContentOffset:(inout CGPoint *)targetContentOffset{
+    if (scrollView.contentOffset.x > (self.offset * self.dataArray.count / 3 - self.offset)) {
+        return;
+    }
+    if (fabs(scrollView.contentOffset.x - self.offsetX) > 20) {
+        if (scrollView.contentOffset.x > self.offsetX) {
+            NSInteger i = scrollView.contentOffset.x / self.offset + 1;
+            if (self.dataArray.count / 3 <= i) {
+                i --;
+            }
+            NSIndexPath * index =  [NSIndexPath indexPathForRow:i > 0 ? 3 * i : 0  inSection:0];
+            [_collectionView scrollToItemAtIndexPath:index atScrollPosition:UICollectionViewScrollPositionCenteredHorizontally animated:YES];
+        }else{
+            NSInteger i = scrollView.contentOffset.x / self.offset + 1;
+            i = (i - 1)<0?0:(i - 1);
+            if (self.dataArray.count / 3 <= i) {
+                i --;
+            }
+            NSIndexPath * index =  [NSIndexPath indexPathForRow:i > 0 ? 3 * i : 0 inSection:0];
+            [_collectionView scrollToItemAtIndexPath:index atScrollPosition:UICollectionViewScrollPositionCenteredHorizontally animated:YES];
+        }
+    }
+}
 @end

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

@@ -135,7 +135,7 @@
     [self.tableView.mj_header endRefreshing];
     [self.tableView.mj_footer endRefreshing];
     self.currentPage = 1;
-    if (self.currentChannel >= 2 && self.currentChannel <= 10) {
+    if (self.currentChannel >= 67 && self.currentChannel <= 75) {
         [self.tableView reloadData];
     }else{
         [self.dataSource removeAllObjects];
@@ -150,7 +150,7 @@
         [self.tableView.mj_footer resetNoMoreData];
         return;
     }
-    if (self.currentChannel >= 2 && self.currentChannel <= 10) {
+    if (self.currentChannel >= 67 && self.currentChannel <= 75) {
         [self.tableView.mj_footer resetNoMoreData];
     }else{
         [self ReGetHomeListData:self.currentChannel];
@@ -185,14 +185,14 @@
     dispatch_semaphore_t sem = dispatch_semaphore_create(0);
     __block NSInteger httpFinishCount = 0;
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-        [[HttpManager sharedHttpManager] GETUrl:[NSString stringWithFormat:@"%@%@",BaseUrl,HomeSlideImages_GET] parameters: @{} responseStyle:JOSN success:^(id  _Nonnull responseObject) {
+        [[HttpManager sharedHttpManager] GETUrl:[NSString stringWithFormat:@"%@%@",BaseUrl,HomeSlideImages_GET] parameters: @{@"TypeId":@1} responseStyle:JOSN success:^(id  _Nonnull responseObject) {
             NSArray *arr = responseObject[@"Items"];
             NSLog(@"首页轮播数据%@",arr.firstObject);
             [weakSelf.bannerModelArray removeAllObjects];
             [weakSelf.bannerImgArr removeAllObjects];
             NSMutableArray *array = [NSMutableArray array];
             NSMutableArray *array2 = [NSMutableArray array];
-            for (int i = 0; i < arr.count; i++) {
+            for (NSInteger i = 0; i < arr.count; i++) {
                 NSDictionary *dic = arr[i];
                 HomeTopImageModel *imageModel = [[HomeTopImageModel alloc] initWithDictionary:dic error:nil];
                 [array2 addObject:imageModel];
@@ -205,7 +205,9 @@
                 dispatch_semaphore_signal(sem);
             }
         } failure:^(NSError * _Nonnull error) {
-            REMOVESHOW
+            if (++httpFinishCount == 3) {
+                dispatch_semaphore_signal(sem);
+            }
         }];
         
 #pragma mark - 频道
@@ -227,7 +229,6 @@
                 dispatch_semaphore_signal(sem);
             }
         } failure:^(NSError * _Nonnull error) {
-            REMOVESHOW
         }];
         
 #pragma mark - 列表
@@ -243,7 +244,6 @@
         }];
         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];
@@ -253,11 +253,9 @@
 - (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];
@@ -278,14 +276,12 @@
                     }
                 });
             } 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];
@@ -306,7 +302,6 @@
                 }
             });
         } failure:^(NSError * _Nonnull error) {
-            REMOVESHOW
             [weakSelf.tableView.mj_header endRefreshing];
             [weakSelf.tableView.mj_footer endRefreshing];
         }];
@@ -452,57 +447,7 @@
 - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath{
     Item *model = self.dataSource[indexPath.row];
     switch (self.currentChannel) {
-        case 1:
-        {
-            return 159.f + 15.f;
-        }
-            break;
-        case 2:
-        {
-            return UITableViewAutomaticDimension;
-        }
-            break;
-        case 3:
-        {
-            return UITableViewAutomaticDimension;
-        }
-            break;
-        case 4:
-        {
-            return UITableViewAutomaticDimension;
-        }
-            break;
-        case 5:
-        {
-            return UITableViewAutomaticDimension;
-        }
-            break;
-        case 6:
-        {
-            return UITableViewAutomaticDimension;
-        }
-            break;
-        case 7:
-        {
-            return UITableViewAutomaticDimension;
-        }
-            break;
-        case 8:
-        {
-            return UITableViewAutomaticDimension;
-        }
-            break;
-        case 9:
-        {
-            return UITableViewAutomaticDimension;
-        }
-            break;
-        case 10:
-        {
-            return UITableViewAutomaticDimension;
-        }
-            break;
-        default:
+        case 0:
         {
             if (model.ImageUrls.count == 0) {
                 model.cellID = 1;
@@ -514,14 +459,6 @@
             switch (model.cellID) {
                 case 1:
                 {
-//                    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;
@@ -546,6 +483,16 @@
             }
         }
             break;
+        case 1:
+        {
+            return 159.f + 15.f;
+        }
+            break;
+        default:
+        {
+            return UITableViewAutomaticDimension;
+        }
+            break;
     }
 }
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath{
@@ -565,7 +512,7 @@
             return cell;
         }
             break;
-        case 2:
+        case 72:
         {
             HomeMusicCell * cell = [HomeMusicCell configCell:tableView indexPath:indexPath];
             if (indexPath.row == 0) {
@@ -574,7 +521,7 @@
             return cell;
         }
             break;
-        case 3:
+        case 75:
         {
             HomeSchoolCell * cell = [HomeSchoolCell configCell:tableView indexPath:indexPath];
             if (indexPath.row == 0) {
@@ -585,7 +532,7 @@
             return cell;
         }
             break;
-        case 4:
+        case 68:
         {
             HomeUserPrivilegeCell * cell = [HomeUserPrivilegeCell configCell:tableView indexPath:indexPath];
             if (indexPath.row == 0) {
@@ -596,7 +543,7 @@
             return cell;
         }
             break;
-        case 5:
+        case 70:
         {
             HomeWeiCousreCell * cell = [HomeWeiCousreCell configCell0:tableView indexPath:indexPath];
             if (indexPath.row == 0) {
@@ -605,7 +552,7 @@
             return cell;
         }
             break;
-        case 6:
+        case 73:
         {
             if (indexPath.row == 0) {
                 HomeProblemTopCell * cell = [HomeProblemTopCell configCell0:tableView indexPath:indexPath];
@@ -618,7 +565,7 @@
             }
         }
             break;
-        case 7:
+        case 71:
         {
             HomeGoodBookCell * cell = [HomeGoodBookCell configCell:tableView indexPath:indexPath];
             if (indexPath.row == 0) {
@@ -634,20 +581,20 @@
             return cell;
         }
             break;
-        case 8:
+        case 69:
         {
             BookSubArticeCell * cell = [BookSubArticeCell configCell:tableView indexPath:indexPath];
             [cell setData];
             return cell;
         }
             break;
-        case 9:
+        case 74:
         {
             HomeTeacherCell * cell = [HomeTeacherCell configCell:tableView indexPath:indexPath];
             return cell;
         }
             break;
-        case 10:
+        case 67:
         {
             if (indexPath.row == 0) {
                 HomeBigshotCell * cell = [HomeBigshotCell configCell0:tableView indexPath:indexPath];
@@ -835,7 +782,7 @@
             [weakSelf.tableView reloadData];
         });
     } failure:^(NSError * _Nonnull error) {
-        REMOVESHOW
+        
     }];
 }
 #pragma mark - SLBannerViewDelegate
@@ -847,10 +794,8 @@
 - (void)getArticleDetail:(NSInteger)index{
     HomeTopImageModel *model = self.bannerModelArray[index];
       NSLog(@"点击轮播图%ld",(long)model.ArticleId);
-    SHOWLOADING
     WEAKSELF
     [[HttpManager sharedHttpManager] GETWithUrl:[NSString stringWithFormat:@"%@%ld",Article_Detail_Get,(long)model.ArticleId] parameters:@{} success:^(id  _Nonnull responseObject) {
-        REMOVESHOW;
         Item *model = [[Item alloc]initWithDictionary:responseObject error:nil];
         //        HomeDetailController *homeDetail = [[HomeDetailController alloc] init];
         //        [homeDetail loadCurrentModel:itemModel];
@@ -934,56 +879,51 @@
 //    workModel.ArticleGroupName = @"待办工作";
 //    workModel.IsSelect = NO;
 //    [self.myChannel addObject:workModel];
-    ChannelModel * sModel = [[ChannelModel alloc] init];
-    sModel.ArticleGroupId = 2;
-    sModel.ArticleGroupName = @"信源听说";
-    sModel.IsSelect = NO;
-    [self.myChannel addObject:sModel];
-    ChannelModel * mModel = [[ChannelModel alloc] init];
-    mModel.ArticleGroupId = 3;
-    mModel.ArticleGroupName = @"名校";
-    mModel.IsSelect = NO;
-    [self.myChannel addObject:mModel];
-    ChannelModel * aModel = [[ChannelModel alloc] init];
-    aModel.ArticleGroupId = 4;
-    aModel.ArticleGroupName = @"会员特供";
-    aModel.IsSelect = NO;
-    [self.myChannel addObject:aModel];
-    ChannelModel * bModel = [[ChannelModel alloc] init];
-    bModel.ArticleGroupId = 5;
-    bModel.ArticleGroupName = @"每日微课";
-    bModel.IsSelect = NO;
-    [self.myChannel addObject:bModel];
-    ChannelModel * cModel = [[ChannelModel alloc] init];
-    cModel.ArticleGroupId = 6;
-    cModel.ArticleGroupName = @"每日一题";
-    cModel.IsSelect = NO;
-    [self.myChannel addObject:cModel];
-    ChannelModel * dModel = [[ChannelModel alloc] init];
-    dModel.ArticleGroupId = 7;
-    dModel.ArticleGroupName = @"每日好书";
-    dModel.IsSelect = NO;
-    [self.myChannel addObject:dModel];
-    ChannelModel * eModel = [[ChannelModel alloc] init];
-    eModel.ArticleGroupId = 8;
-    eModel.ArticleGroupName = @"每日好文";
-    eModel.IsSelect = NO;
-    [self.myChannel addObject:eModel];
-    ChannelModel * fModel = [[ChannelModel alloc] init];
-    fModel.ArticleGroupId = 9;
-    fModel.ArticleGroupName = @"名师";
-    fModel.IsSelect = NO;
-    [self.myChannel addObject:fModel];
-    ChannelModel * gModel = [[ChannelModel alloc] init];
-    gModel.ArticleGroupId = 10;
-    gModel.ArticleGroupName = @"大咖讲座";
-    gModel.IsSelect = NO;
-    [self.myChannel addObject:gModel];
+//    ChannelModel * sModel = [[ChannelModel alloc] init];
+//    sModel.ArticleGroupId = 2;
+//    sModel.ArticleGroupName = @"信源听说";
+//    sModel.IsSelect = NO;
+//    [self.myChannel addObject:sModel];
+//    ChannelModel * mModel = [[ChannelModel alloc] init];
+//    mModel.ArticleGroupId = 3;
+//    mModel.ArticleGroupName = @"名校";
+//    mModel.IsSelect = NO;
+//    [self.myChannel addObject:mModel];
+//    ChannelModel * aModel = [[ChannelModel alloc] init];
+//    aModel.ArticleGroupId = 4;
+//    aModel.ArticleGroupName = @"会员特供";
+//    aModel.IsSelect = NO;
+//    [self.myChannel addObject:aModel];
+//    ChannelModel * bModel = [[ChannelModel alloc] init];
+//    bModel.ArticleGroupId = 5;
+//    bModel.ArticleGroupName = @"每日微课";
+//    bModel.IsSelect = NO;
+//    [self.myChannel addObject:bModel];
+//    ChannelModel * cModel = [[ChannelModel alloc] init];
+//    cModel.ArticleGroupId = 6;
+//    cModel.ArticleGroupName = @"每日技能";
+//    cModel.IsSelect = NO;
+//    [self.myChannel addObject:cModel];
+//    ChannelModel * dModel = [[ChannelModel alloc] init];
+//    dModel.ArticleGroupId = 7;
+//    dModel.ArticleGroupName = @"每日好书";
+//    dModel.IsSelect = NO;
+//    [self.myChannel addObject:dModel];
 //    ChannelModel * eModel = [[ChannelModel alloc] init];
 //    eModel.ArticleGroupId = 8;
 //    eModel.ArticleGroupName = @"每日好文";
 //    eModel.IsSelect = NO;
 //    [self.myChannel addObject:eModel];
+//    ChannelModel * fModel = [[ChannelModel alloc] init];
+//    fModel.ArticleGroupId = 9;
+//    fModel.ArticleGroupName = @"名师";
+//    fModel.IsSelect = NO;
+//    [self.myChannel addObject:fModel];
+//    ChannelModel * gModel = [[ChannelModel alloc] init];
+//    gModel.ArticleGroupId = 10;
+//    gModel.ArticleGroupName = @"大咖讲座";
+//    gModel.IsSelect = NO;
+//    [self.myChannel addObject:gModel];
 }
 - (UIView *)noDataView
 {

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

@@ -143,32 +143,32 @@
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="254" text="一次函数与不等式" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="XOr-LJ-X93">
-                        <rect key="frame" x="15" y="15" width="229" height="20.5"/>
+                        <rect key="frame" x="131" y="15" width="139" height="20.5"/>
                         <fontDescription key="fontDescription" type="system" pointSize="17"/>
                         <color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <nil key="highlightedColor"/>
                     </label>
                     <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"/>
+                        <rect key="frame" x="15" y="28.5" width="101" height="76"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="76" id="1pA-l4-ejS"/>
                             <constraint firstAttribute="width" constant="101" id="TMC-ZL-A4x"/>
                         </constraints>
                     </imageView>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="253" text="在水平地面点A处有一网球发射器向…" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="OJc-2k-Rs9">
-                        <rect key="frame" x="15" y="45.5" width="229" height="17"/>
+                        <rect key="frame" x="131" y="45.5" width="229" height="17"/>
                         <fontDescription key="fontDescription" type="system" pointSize="14"/>
                         <color key="textColor" red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="252" text="周亮" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1bA-O0-MTy">
-                        <rect key="frame" x="15" y="72.5" width="25" height="14.5"/>
+                        <rect key="frame" x="131" y="72.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"/>
                     </label>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="初中数学几何知识…" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zhq-3K-Q1t">
-                        <rect key="frame" x="15" y="97" width="100" height="20.5"/>
+                        <rect key="frame" x="131" y="97" width="100" height="20.5"/>
                         <constraints>
                             <constraint firstAttribute="width" relation="lessThanOrEqual" constant="100" id="yxY-iA-M9p"/>
                         </constraints>
@@ -177,16 +177,16 @@
                         <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="gfF-Yp-n7Z">
-                        <rect key="frame" x="127" y="100" width="25" height="14.5"/>
+                        <rect key="frame" x="243" y="100" 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"/>
                     </label>
                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Home_yun_icon" translatesAutoresizingMaskIntoConstraints="NO" id="wwx-ur-EEY">
-                        <rect key="frame" x="164" y="102" width="15" height="11"/>
+                        <rect key="frame" x="280" y="102" width="15" height="11"/>
                     </imageView>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="40" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2EO-tB-e4N">
-                        <rect key="frame" x="182" y="100" width="15.5" height="14.5"/>
+                        <rect key="frame" x="298" y="100" width="15.5" 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"/>
@@ -201,24 +201,23 @@
                 </subviews>
                 <constraints>
                     <constraint firstItem="wwx-ur-EEY" firstAttribute="leading" secondItem="gfF-Yp-n7Z" secondAttribute="trailing" constant="12" id="17k-69-Yw0"/>
+                    <constraint firstItem="OJc-2k-Rs9" firstAttribute="leading" secondItem="XOr-LJ-X93" secondAttribute="leading" id="3H0-Y1-ZuT"/>
                     <constraint firstItem="OJc-2k-Rs9" firstAttribute="top" secondItem="XOr-LJ-X93" secondAttribute="bottom" constant="10" id="BZC-eH-AYU"/>
                     <constraint firstAttribute="bottom" secondItem="W6r-ue-Wb4" secondAttribute="bottom" id="Fpa-21-fQ7"/>
+                    <constraint firstAttribute="trailing" secondItem="OJc-2k-Rs9" secondAttribute="trailing" constant="15" id="GFH-Mb-0lt"/>
                     <constraint firstItem="2EO-tB-e4N" firstAttribute="centerY" secondItem="zhq-3K-Q1t" secondAttribute="centerY" id="GdF-A1-AEY"/>
-                    <constraint firstItem="XOr-LJ-X93" firstAttribute="leading" secondItem="0Zt-q6-Hz7" secondAttribute="leading" constant="15" id="Hly-td-61E"/>
+                    <constraint firstItem="XOr-LJ-X93" firstAttribute="leading" secondItem="fSS-a1-YvI" secondAttribute="trailing" constant="15" id="Hly-td-61E"/>
                     <constraint firstItem="W6r-ue-Wb4" firstAttribute="leading" secondItem="0Zt-q6-Hz7" secondAttribute="leading" id="Kr4-ya-00o"/>
-                    <constraint firstItem="fSS-a1-YvI" firstAttribute="leading" secondItem="XOr-LJ-X93" secondAttribute="trailing" constant="15" id="LXI-qU-TYu"/>
                     <constraint firstAttribute="trailing" secondItem="W6r-ue-Wb4" secondAttribute="trailing" id="NBe-RL-iYH"/>
                     <constraint firstItem="XOr-LJ-X93" firstAttribute="top" secondItem="0Zt-q6-Hz7" secondAttribute="top" constant="15" id="OXl-nq-3C3"/>
                     <constraint firstItem="W6r-ue-Wb4" firstAttribute="top" secondItem="zhq-3K-Q1t" secondAttribute="bottom" constant="15" id="Psc-Tm-Owi"/>
-                    <constraint firstItem="zhq-3K-Q1t" firstAttribute="leading" secondItem="0Zt-q6-Hz7" secondAttribute="leading" constant="15" id="Tru-0s-HdU"/>
-                    <constraint firstItem="fSS-a1-YvI" firstAttribute="leading" secondItem="OJc-2k-Rs9" secondAttribute="trailing" constant="15" id="Yqn-cz-Lp1"/>
+                    <constraint firstItem="1bA-O0-MTy" firstAttribute="leading" secondItem="XOr-LJ-X93" secondAttribute="leading" id="VSK-rG-gTi"/>
                     <constraint firstItem="gfF-Yp-n7Z" firstAttribute="centerY" secondItem="zhq-3K-Q1t" secondAttribute="centerY" id="eS3-pn-mdK"/>
                     <constraint firstItem="gfF-Yp-n7Z" firstAttribute="leading" secondItem="zhq-3K-Q1t" secondAttribute="trailing" constant="12" id="i0G-9X-F42"/>
-                    <constraint firstItem="OJc-2k-Rs9" firstAttribute="leading" secondItem="0Zt-q6-Hz7" secondAttribute="leading" constant="15" id="nSU-NG-gbs"/>
+                    <constraint firstItem="zhq-3K-Q1t" firstAttribute="leading" secondItem="XOr-LJ-X93" secondAttribute="leading" id="nDF-N1-s31"/>
                     <constraint firstItem="2EO-tB-e4N" firstAttribute="leading" secondItem="wwx-ur-EEY" secondAttribute="trailing" constant="3" id="np3-wb-yk2"/>
                     <constraint firstItem="fSS-a1-YvI" firstAttribute="centerY" secondItem="0Zt-q6-Hz7" secondAttribute="centerY" id="uoy-nE-O5z"/>
-                    <constraint firstItem="1bA-O0-MTy" firstAttribute="leading" secondItem="0Zt-q6-Hz7" secondAttribute="leading" constant="15" id="vpc-xg-I8S"/>
-                    <constraint firstAttribute="trailing" secondItem="fSS-a1-YvI" secondAttribute="trailing" constant="15" id="wIy-F6-3pO"/>
+                    <constraint firstItem="fSS-a1-YvI" firstAttribute="leading" secondItem="0Zt-q6-Hz7" secondAttribute="leading" constant="15" id="xFb-mr-g4Q"/>
                     <constraint firstItem="wwx-ur-EEY" firstAttribute="centerY" secondItem="2EO-tB-e4N" secondAttribute="centerY" id="y49-7k-TIc"/>
                     <constraint firstItem="1bA-O0-MTy" firstAttribute="top" secondItem="OJc-2k-Rs9" secondAttribute="bottom" constant="10" id="yu3-Qe-kFe"/>
                     <constraint firstItem="wwx-ur-EEY" firstAttribute="centerY" secondItem="zhq-3K-Q1t" secondAttribute="centerY" id="z0r-lT-Lf1"/>

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

@@ -26,14 +26,27 @@
                                     <constraint firstAttribute="width" secondItem="JQz-WS-Pz6" secondAttribute="height" multiplier="130:80" id="SiB-Qb-UMV"/>
                                 </constraints>
                             </imageView>
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="home_video_leftIcon" translatesAutoresizingMaskIntoConstraints="NO" id="uol-zb-5L9">
+                                <rect key="frame" x="5" y="61" width="12" height="12"/>
+                            </imageView>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="02:14:27" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Bgp-qa-TtD">
+                                <rect key="frame" x="19.5" y="61" width="42.5" height="12"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="10"/>
+                                <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                <nil key="highlightedColor"/>
+                            </label>
                         </subviews>
                         <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
                         <constraints>
+                            <constraint firstItem="Bgp-qa-TtD" firstAttribute="centerY" secondItem="uol-zb-5L9" secondAttribute="centerY" id="Jfq-Pu-2vn"/>
+                            <constraint firstItem="uol-zb-5L9" firstAttribute="bottom" secondItem="JQz-WS-Pz6" secondAttribute="bottom" constant="-7" id="JjF-Nb-i3v"/>
                             <constraint firstAttribute="width" constant="130" id="KTc-Sz-vRT"/>
                             <constraint firstAttribute="bottom" secondItem="JQz-WS-Pz6" secondAttribute="bottom" id="R3m-2x-X1b"/>
                             <constraint firstItem="JQz-WS-Pz6" firstAttribute="top" secondItem="Xwu-8Z-Lpc" secondAttribute="top" id="Tvd-QR-1iq"/>
                             <constraint firstItem="JQz-WS-Pz6" firstAttribute="leading" secondItem="Xwu-8Z-Lpc" secondAttribute="leading" id="W52-9C-gwl"/>
+                            <constraint firstItem="Bgp-qa-TtD" firstAttribute="leading" secondItem="uol-zb-5L9" secondAttribute="trailing" constant="2.5" id="WyB-EB-htt"/>
                             <constraint firstAttribute="trailing" secondItem="JQz-WS-Pz6" secondAttribute="trailing" id="bru-Do-AhE"/>
+                            <constraint firstItem="uol-zb-5L9" firstAttribute="leading" secondItem="JQz-WS-Pz6" secondAttribute="leading" constant="5" id="vHR-SJ-9aV"/>
                         </constraints>
                     </view>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="理科思维记古诗——中国诗词 大会冠军陈更独家开讲" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="KJB-m3-kx3">
@@ -119,7 +132,7 @@
                 <outlet property="titleL" destination="KJB-m3-kx3" id="6ih-sS-IfC"/>
                 <outlet property="yunV" destination="Ojh-TS-zhY" id="VOV-MF-8D0"/>
             </connections>
-            <point key="canvasLocation" x="114" y="-89"/>
+            <point key="canvasLocation" x="113.04347826086958" y="-89.397321428571431"/>
         </tableViewCell>
         <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="HomeWeiCousreCell1" rowHeight="137" id="hj2-ed-aZh" customClass="HomeWeiCousreCell">
             <rect key="frame" x="0.0" y="0.0" width="320" height="110"/>
@@ -300,6 +313,7 @@
     <resources>
         <image name="Book_rightjian_icon" width="8" height="14"/>
         <image name="Home_yun_icon" width="15" height="11"/>
+        <image name="home_video_leftIcon" width="12" height="12"/>
         <image name="img_placeHolder" width="800" height="800"/>
     </resources>
 </document>

smartRhino/Project/VCModel/Login/Model/UserManager.m

@@ -39,7 +39,7 @@ TDShareInstance_implementation(UserManager)
         REMOVESHOW
     } failure:^(NSError * _Nonnull error) {
         REMOVESHOW
-        SHOWERROR([ZYCTool handerResultData:error])
+//        SHOWERROR([ZYCTool handerResultData:error])
     }];
 }
 + (void)getUserInfoDetailSuccess:(void (^)(id responseObject))successful failure:(void (^) (NSError *error))failure{

smartRhino/Project/VCModel/My_Center/Controller/ColletionVC/Controller/MyFavoriteVC.m

@@ -142,7 +142,6 @@
 - (void)getDataList {
     WS(weakSelf);
     NSArray * sArray = [self getSelectData];
-    SHOWLOADING
     [[HttpManager sharedHttpManager] POSTWithUrl:API_ShouCangList parameters:@{@"FolderId":@(self.FolderId),@"Page":@(1),@"PerPage":@(99999999),@"VisitUserId":@(0)} success:^(id  _Nonnull responseObject) {
         
         //    [[HttpManager sharedHttpManager] POSTWithUrl:API_ShouCangList parameters:@{@"FolderId":@(self.FolderId),@"Page":@(self.currentPage),@"PerPage":@(99999999),@"VisitUserId":@(0)} success:^(id  _Nonnull responseObject) {
@@ -1182,10 +1181,8 @@
                 case 1:{
                     switch (model.CollectionType) {
                         case CollectModel_Aritle:{
-                            SHOWLOADING
                             WEAKSELF
                             [[HttpManager sharedHttpManager] GETWithUrl:[NSString stringWithFormat:@"%@%ld",Article_Detail_Get,(long)model.CollectionDataId] parameters:@{} success:^(id  _Nonnull responseObject) {
-                                REMOVESHOW;
                                 Item *itemModel = [[Item alloc]initWithDictionary:responseObject error:nil];
                                 //                                HomeDetailController *homeDetail = [[HomeDetailController alloc] init];
                                 //                                [homeDetail loadCurrentModel:itemModel];
@@ -1638,10 +1635,8 @@
 /// 文件夹 置顶 和 取消置顶
 - (void)topFind:(MyFavoriteSubModel*)findModel{
     NSLog(@"文件夹---%@%@",findModel.IsTop ? @"置顶":@"取消置顶",findModel.FolderName);
-    SHOWLOADING
     WEAKSELF
     [[HttpManager sharedHttpManager] PUTUrl:[NSString stringWithFormat:@"%@%@%ld",BaseUrl,API_Find_Top,(long)findModel.Id] parameters:@{} success:^(id  _Nonnull responseObject) {
-        REMOVESHOW
         [weakSelf reCreateTable];
     } failure:^(NSError * _Nonnull error) {
         SHOWERROR([ZYCTool handerResultData:error]);
@@ -1717,12 +1712,9 @@
     }];
     [ok setValue:k9 forKey:@"_titleTextColor"];
     UIAlertAction *noOk = [UIAlertAction actionWithTitle:@"确认" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
-        SHOWLOADING
         [[HttpManager sharedHttpManager] POSTUrl:Host(API_Find_DeleteRecord) parameters:dic responseStyle:DATA success:^(id  _Nonnull responseObject) {
-            REMOVESHOW
             [weakSelf headRefresh];
         } failure:^(NSError * _Nonnull error) {
-            REMOVESHOW
             SHOWERROR([ZYCTool handerResultData:error]);
         }];
     }];

smartRhino/Project/VCModel/My_Center/Controller/ColletionVC/Controller/OtherFavoriteVC.m

@@ -881,10 +881,8 @@
                 case 1:{
                     switch (model.CollectionType) {
                         case CollectModel_Aritle:{
-                            SHOWLOADING
                             WEAKSELF
                             [[HttpManager sharedHttpManager] GETWithUrl:[NSString stringWithFormat:@"%@%ld",Article_Detail_Get,(long)model.CollectionDataId] parameters:@{} success:^(id  _Nonnull responseObject) {
-                                REMOVESHOW;
                                 Item *itemModel = [[Item alloc]initWithDictionary:responseObject error:nil];
                                 //                                HomeDetailController *homeDetail = [[HomeDetailController alloc] init];
                                 //                                [homeDetail loadCurrentModel:itemModel];
@@ -1234,11 +1232,9 @@
 /// 文件夹 置顶 和 取消置顶
 - (void)topFind:(MyFavoriteSubModel*)findModel{
     NSLog(@"文件夹---%@%@",findModel.IsTop ? @"置顶":@"取消置顶",findModel.FolderName);
-    SHOWLOADING
     WEAKSELF
     [[HttpManager sharedHttpManager] PUTUrl:[NSString stringWithFormat:@"%@%@%ld",BaseUrl,API_Find_Top,(long)findModel.Id] parameters:@{} success:^(id  _Nonnull responseObject) {
         STRONGSELF
-        REMOVESHOW
         [strongSelf headRefresh];
     } failure:^(NSError * _Nonnull error) {
         SHOWERROR([ZYCTool handerResultData:error]);
@@ -1262,12 +1258,9 @@
     }];
     [ok setValue:k9 forKey:@"_titleTextColor"];
     UIAlertAction *noOk = [UIAlertAction actionWithTitle:@"确认" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
-        SHOWLOADING
         [[HttpManager sharedHttpManager] POSTUrl:Host(API_Find_DeleteRecord) parameters:dic responseStyle:DATA success:^(id  _Nonnull responseObject) {
-            REMOVESHOW
             [weakSelf headRefresh];
         } failure:^(NSError * _Nonnull error) {
-            REMOVESHOW
             SHOWERROR([ZYCTool handerResultData:error]);
         }];
     }];

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

@@ -140,9 +140,10 @@
                     return cell;
                 }break;
                 case 1:{
-                    MyInfoCell *cell = [MyInfoCell configCell0:tableView indexPath:indexPath];
-                    cell.cell0TitleLabel.text = @"昵称";
-                    cell.cell0ValueLabel.text = [self showStringLength:[AppUserModel sharedAppUserModel].Nick];
+                    MyInfoCell *cell = [MyInfoCell configCell1:tableView indexPath:indexPath];
+                    cell.cell1TitleLabel.text = @"姓名";
+                    cell.cell1ValueLabel.text = ISEmptyString([AppUserModel sharedAppUserModel].Name) ? @"": [self showStringLength:[AppUserModel sharedAppUserModel].Name];
+                    cell.cell1ValueLabel.textColor = UIColorHex(#3D95ED);
                     return cell;
                 }break;
                 case 2:{
@@ -341,10 +342,10 @@
                     }] showWithAnimation:kAlertAnimationBottom];
                 }break;
                 case 1:{
-                    EditMySignOrBriefVC *vc = [EditMySignOrBriefVC initEditMySignOrBriefVC];
-                    vc.pagetype = EditMySignOrBriefPageType3;
-                    vc.hidesBottomBarWhenPushed = YES;
-                    [self.navigationController pushViewController:vc animated:YES];
+//                    EditMySignOrBriefVC *vc = [EditMySignOrBriefVC initEditMySignOrBriefVC];
+//                    vc.pagetype = EditMySignOrBriefPageType3;
+//                    vc.hidesBottomBarWhenPushed = YES;
+//                    [self.navigationController pushViewController:vc animated:YES];
                 }break;
                 case 2:{
                     WS(weakSelf);

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

@@ -131,7 +131,6 @@
 
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{
     [tableView deselectRowAtIndexPath:indexPath animated:YES];
-    
     switch (indexPath.section) {
         case 0:{
             switch (indexPath.row) {

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

@@ -2349,10 +2349,8 @@
     }
 }
 - (void)eidtorNoteBook:(MyNoteBookSubModel *)model{
-    SHOWLOADING
     WS(weakSelf);
     [[HttpManager sharedHttpManager] GETUrl:[NSString stringWithFormat:@"%@%@%@",BaseUrl,API_NoteBook_Detail,@(model.MiddleId).stringValue] parameters:@{} responseStyle:JOSN success:^(id  _Nonnull responseObject) {
-        REMOVESHOW;
         MyTDTopicCreateVC * vc = [MyTDTopicCreateVC initMyTDTopicCreateVC];
         vc.type = CollectModel_NoteBook;
         vc.FolderId = weakSelf.FolderId;
@@ -2663,10 +2661,8 @@
 /// 文件夹 置顶 和 取消置顶
 - (void)topFind:(MyNoteBookSubModel*)findModel{
     NSLog(@"文件夹---%@%@",findModel.IsTop ? @"置顶":@"取消置顶",findModel.FolderName);
-    SHOWLOADING
     WEAKSELF
     [[HttpManager sharedHttpManager] PUTUrl:[NSString stringWithFormat:@"%@%@%ld",BaseUrl,API_Find_Top,(long)findModel.Id] parameters:@{} success:^(id  _Nonnull responseObject) {
-        REMOVESHOW
         [weakSelf reCreateTable];
     } failure:^(NSError * _Nonnull error) {
         SHOWERROR([ZYCTool handerResultData:error]);
@@ -2727,10 +2723,8 @@
     [dic setValue:MiddleIds forKey:@"MiddleIds"];
     [dic setValue:@(4) forKey:@"FolderType"];
     
-    SHOWLOADING
     WEAKSELF
     [[HttpManager sharedHttpManager] POSTUrl:Host(API_Find_DeleteRecord) parameters:dic responseStyle:DATA success:^(id  _Nonnull responseObject) {
-        REMOVESHOW
         [weakSelf headRefresh];
     } failure:^(NSError * _Nonnull error) {
         SHOWERROR([ZYCTool handerResultData:error]);
@@ -2883,7 +2877,6 @@
 #pragma -mark 点赞
 - (void)zanHanderIndex:(NSIndexPath *)indexPath{
     MyNoteBookSubModel *mdoel =  self.noteBookArray[indexPath.row];
-    SHOWLOADING
     NSMutableDictionary  *dic = [NSMutableDictionary dictionary];
     [dic setValue:@(mdoel.MiddleId) forKey:@"SourceId"];
     [dic setValue:@([AppUserModel sharedAppUserModel].Id) forKey:@"UserId"];
@@ -2925,9 +2918,7 @@
     switch (model.Type) {
         case CollectModel_Aritle:
         {
-            SHOWLOADING
             [[HttpManager sharedHttpManager] GETWithUrl:[NSString stringWithFormat:@"%@%ld",Article_Detail_Get,(long)model.Id] parameters:@{} success:^(id  _Nonnull responseObject) {
-                REMOVESHOW;
                 Item *itemModel = [[Item alloc]initWithDictionary:responseObject error:nil];
                 //                HomeDetailController *homeDetail = [[HomeDetailController alloc] init];
                 //                [homeDetail loadCurrentModel:itemModel];

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

@@ -976,10 +976,8 @@
 {
 }
 - (void)eidtorNoteBook:(NSInteger)noteId{
-    SHOWLOADING
     WS(weakSelf);
     [[HttpManager sharedHttpManager] GETUrl:[NSString stringWithFormat:@"%@%@%@",BaseUrl,API_NoteBook_Detail,@(noteId).stringValue] parameters:@{} responseStyle:JOSN success:^(id  _Nonnull responseObject) {
-        REMOVESHOW;
         MyTDTopicCreateVC * vc = [MyTDTopicCreateVC initMyTDTopicCreateVC];
         vc.type = CollectModel_NoteBook;
         vc.FolderId = weakSelf.FolderId;
@@ -1024,10 +1022,8 @@
 /// 文件夹 置顶 和 取消置顶
 - (void)topFind:(MyNoteBookSubModel*)findModel{
     NSLog(@"文件夹---%@%@",findModel.IsTop ? @"置顶":@"取消置顶",findModel.FolderName);
-    SHOWLOADING
     WEAKSELF
     [[HttpManager sharedHttpManager] PUTUrl:[NSString stringWithFormat:@"%@%@%ld",BaseUrl,API_Find_Top,(long)findModel.Id] parameters:@{} success:^(id  _Nonnull responseObject) {
-        REMOVESHOW
         [weakSelf headRefresh];
     } failure:^(NSError * _Nonnull error) {
         SHOWERROR([ZYCTool handerResultData:error]);
@@ -1044,10 +1040,8 @@
     [dic setValue:MiddleIds forKey:@"MiddleIds"];
     [dic setValue:@(4) forKey:@"FolderType"];
     
-    SHOWLOADING
     WEAKSELF
     [[HttpManager sharedHttpManager] POSTUrl:Host(API_Find_DeleteRecord) parameters:dic responseStyle:DATA success:^(id  _Nonnull responseObject) {
-        REMOVESHOW
         [weakSelf headRefresh];
     } failure:^(NSError * _Nonnull error) {
         SHOWERROR([ZYCTool handerResultData:error]);
@@ -1135,7 +1129,6 @@
 #pragma -mark 点赞
 - (void)zanHanderIndex:(NSIndexPath *)indexPath{
     MyNoteBookSubModel *mdoel =  self.noteBookArray[indexPath.row];
-    SHOWLOADING
     NSMutableDictionary  *dic = [NSMutableDictionary dictionary];
     [dic setValue:@(mdoel.MiddleId) forKey:@"SourceId"];
     [dic setValue:@([AppUserModel sharedAppUserModel].Id) forKey:@"UserId"];
@@ -1168,9 +1161,7 @@
     switch (model.Type) {
         case CollectModel_Aritle:
         {
-            SHOWLOADING
             [[HttpManager sharedHttpManager] GETWithUrl:[NSString stringWithFormat:@"%@%ld",Article_Detail_Get,(long)model.Id] parameters:@{} success:^(id  _Nonnull responseObject) {
-                REMOVESHOW;
                 Item *itemModel = [[Item alloc]initWithDictionary:responseObject error:nil];
                 //                HomeDetailController *homeDetail = [[HomeDetailController alloc] init];
                 //                [homeDetail loadCurrentModel:itemModel];

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

@@ -58,6 +58,13 @@
 @end
 
 @implementation SourceHomeVC
+- (void)viewWillDisappear:(BOOL)animated
+{
+    [super viewWillDisappear:animated];
+    [self.showBtn dismissCom];
+    self.menuIsShow = NO;
+    [self.menuListView dismiss];
+}
 - (BOOL)hidesBottomBarWhenPushed{
     return NO;
 }
@@ -270,7 +277,7 @@
             UILabel * label = [UILabel new];
             label.font = [UIFont systemFontOfSize:15];
             label.textColor = UIColorHex(0x666666);
-            label.text = @"遇 见";
+            label.text = @"话 题";
             [self.sectionView addSubview:label];
             CGFloat w = [testL sizeThatFits:CGSizeMake(SCREEN_WIDTH, 20)].width;
             CGFloat left = (width - w) * 0.5 + 10;
@@ -392,7 +399,9 @@
             weakSelf.menuListView = [MenuListView MenuListViewaddArray:@[weakSelf.groupListArray] height:162 + NAVH MenuType:MenuMoreSelectType];
         });
     } failure:^(NSError * _Nonnull error) {
-        
+        dispatch_async(dispatch_get_main_queue(), ^{
+            weakSelf.menuListView = [MenuListView MenuListViewaddArray:@[weakSelf.groupListArray] height:162 + NAVH MenuType:MenuMoreSelectType];
+        });
     }];
 }
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath{

smartRhino/Project/VCModel/WorkFlow/AddPeopleToGongWenCell.m

@@ -110,6 +110,5 @@
 - (void)setApprovalSection:(NSMutableArray *)approvalSection {
     _approvalSection = approvalSection;
     [self.collectView reloadData];
-    
 }
 @end

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

@@ -1019,7 +1019,7 @@
                 [weakSelf presentViewController:alertVC animated:YES completion:nil];
             }];
 
-            action1.backgroundColor = RGB(255, 59, 47);
+            action1.backgroundColor = UIColorHex(#F64A33);
             UITableViewRowAction *action2 = [UITableViewRowAction rowActionWithStyle:UITableViewRowActionStyleDestructive title:@"编辑" handler:^(UITableViewRowAction * _Nonnull action, NSIndexPath * _Nonnull indexPath) {
                 [weakSelf eidtorNoteBook:model];
             }];
@@ -1051,7 +1051,7 @@
                 [alertVC addAction:noOk];
                 [weakSelf presentViewController:alertVC animated:YES completion:nil];
             }];
-            action1.backgroundColor = RGB(255, 59, 47);
+            action1.backgroundColor = UIColorHex(#F64A33);
 
             UITableViewRowAction *action2 = [UITableViewRowAction rowActionWithStyle:UITableViewRowActionStyleDestructive title:@"重命名" handler:^(UITableViewRowAction * _Nonnull action, NSIndexPath * _Nonnull indexPath) {
                 MyFavoriteNewFindVC *vc = [MyFavoriteNewFindVC initMyFavoriteNewFindVC];