no message

smartRhino.xcodeproj/project.pbxproj

@@ -6406,9 +6406,9 @@
 				C7D6B9DC235D7D7600770E7C /* main.m */,
 				C7F61620238BF664008AF22D /* Resource */,
 				C7D6B9E4235DA18700770E7C /* Project */,
+				EB7955C824C6959700EE9A55 /* TopicBook */,
 				C7D6BAD7235DA18800770E7C /* SmartRhino-Prefix.pch */,
 				C6F2E1F1236D1794009E6903 /* WclAppConfig.h */,
-				EB7955C824C6959700EE9A55 /* TopicBook */,
 				C7CA60A8237310010062B8B8 /* FwzAppConfig.h */,
 				C59D0A4923824E80007D0760 /* PhbAppConfig.h */,
 				C74BCC84238FC39000169982 /* smartRhino-Bridging-Header.h */,

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

@@ -116,7 +116,7 @@
             vc.CollectionDataId = weakSelf.CollectionDataId;
             vc.CollectionType = weakSelf.CollectionType;
             vc.isCollect = weakSelf.collectType == CollectHanderType_Collect ? YES : NO;
-            vc.fileType = weakSelf.TypeValue == 1 ? NewTopicFileType : NewOtherFileType;
+            vc.fileType = NewCollectFileType;
             [weakSelf.navigationController pushViewController:vc animated:YES];
         }
     }];

smartRhino/Project/VCModel/ChatMessage/Controller/MailList/Controller/MailChatVC.h

@@ -18,6 +18,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (assign, nonatomic) CreateFileFolderType   type;
 @property (nonatomic, assign) NSInteger  TypeValue;///1 群聊 2小组 3自建通讯录
 @property (nonatomic, assign) NSInteger  TypeId;
+@property (assign, nonatomic) BOOL                   IsSelectDes;
 @end
 
 NS_ASSUME_NONNULL_END

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

@@ -103,8 +103,7 @@
     }];
     WS(weakSelf);
     [self.rightBtn setAction:^{
-        weakSelf.isAllSelected = !weakSelf.isAllSelected;
-        [weakSelf selectedAction];
+        [weakSelf SelectResult];
     }];
 
     [self.CusNavBar addSubview:self.titleL];
@@ -130,8 +129,11 @@
         make.height.mas_offset(36);
     }];
     [self.SearchView.button setAction:^{
-        MailGroupListSerachVC * vc = [[MailGroupListSerachVC alloc] init];
-        vc.TypeValue = weakSelf.TypeValue;
+//        MailGroupListSerachVC * vc = [[MailGroupListSerachVC alloc] init];
+//        vc.TypeValue = weakSelf.TypeValue;
+//        [weakSelf.navigationController pushViewController:vc animated:YES];
+        MailGroupListSerachVC *vc = [[MailGroupListSerachVC alloc] init];
+        vc.IsSelect = YES;
         [weakSelf.navigationController pushViewController:vc animated:YES];
     }];
     [self.view addSubview:self.tableView];
@@ -272,6 +274,8 @@
             vc.Id = model.Id;
             vc.TypeValue = model.TypeValue;
             vc.titleStr = model.Name;
+            vc.IsSelect = self.IsSelect;
+            vc.IsSelectDes = self.IsSelectDes;
             [self.navigationController pushViewController:vc animated:YES];
         }
     }else{
@@ -280,6 +284,8 @@
         vc.Id = model.Id;
         vc.TypeValue = model.TypeValue;
         vc.titleStr = model.Name;
+        vc.IsSelect = self.IsSelect;
+        vc.IsSelectDes = self.IsSelectDes;
         [self.navigationController pushViewController:vc animated:YES];
     }
 }
@@ -434,4 +440,59 @@
     }
     return nil;
 }
+- (void)SelectResult
+{
+    NSMutableArray * mailArray = [NSMutableArray arrayWithArray:USERDEFAULTSGET(MAILSELECT)];
+    NSMutableArray * chaoArray = [NSMutableArray array];
+    NSMutableDictionary * paraDict = [NSMutableDictionary dictionary];
+    NSMutableArray * mArray = [NSMutableArray array];
+    NSMutableArray * selectArray = [NSMutableArray array];
+    [mailArray enumerateObjectsUsingBlock:^(id  _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
+        SelectModel * sModel = (SelectModel*) [NSKeyedUnarchiver unarchiveObjectWithData:(NSData *)obj];
+        [chaoArray addObject:sModel];
+        [mArray addObject:@{@"SourceType":@(sModel.SourceType),@"SourceId":@(sModel.SourceId),@"SourceTypeValue":@(sModel.TypeValue),@"SourceName":sModel.SourceName}];
+    }];
+    if (self.IsSelectDes) {
+        [[NSNotificationCenter defaultCenter] postNotificationName:NOTIFI_ChaoSongRen object:nil userInfo:@{@"selectPeople":chaoArray}];
+        [self back1];
+        return;
+    }else{
+        [paraDict setValue:mArray forKey:@"Item"];
+        SHOWLOADING
+        WS(weakSelf);
+        [[HttpManager sharedHttpManager] POSTUrl:Host(API_APP_User_Middle) parameters:paraDict responseStyle:JOSN success:^(id  _Nonnull responseObject) {
+            REMOVESHOW
+            for (NSDictionary *dict in responseObject) {
+                SelectModel * model = [SelectModel modelWithDictionary:dict];
+                model.UserId = model.Id;
+                model.UserName = model.Name;
+                model.SourceId = model.UserId;
+                model.SourceName = model.UserName;
+                [selectArray addObject:model];
+            }
+            [[NSNotificationCenter defaultCenter] postNotificationName:NOTIFI_ChaoSongRen object:nil userInfo:@{@"selectPeople":selectArray}];
+            [weakSelf back1];
+        } failure:^(NSError * _Nonnull error) {
+            SHOWERROR([ZYCTool handerResultData:error]);
+        }];
+    }
+}
+-(void)back1{
+    for ( NSInteger i = (self.navigationController.viewControllers.count - 1); i > 0 ;i --) {
+           NSLog(@"%@",self.navigationController.viewControllers[i]);
+        if ([self.navigationController.viewControllers[i] isKindOfClass:NSClassFromString(@"MyWorkWordVC")]
+            || [self.navigationController.viewControllers[i] isKindOfClass:NSClassFromString(@"ChatNewGroupVC")]
+            || [self.navigationController.viewControllers[i] isKindOfClass:NSClassFromString(@"H5ViewController")]
+            || [self.navigationController.viewControllers[i] isKindOfClass:NSClassFromString(@"MyTDTopicCreateVC")]
+            || [self.navigationController.viewControllers[i] isKindOfClass:NSClassFromString(@"MyFavoriteNewFindVC")]
+            || [self.navigationController.viewControllers[i] isKindOfClass:NSClassFromString(@"ChatNewRowVC")]
+            || [self.navigationController.viewControllers[i] isKindOfClass:NSClassFromString(@"MyTDTopicGroupUserVC")]
+            || [self.navigationController.viewControllers[i] isKindOfClass:NSClassFromString(@"WorkFlowOrderController")]
+            || [self.navigationController.viewControllers[i] isKindOfClass:NSClassFromString(@"CreateInterLeterVC")]
+            || [self.navigationController.viewControllers[i] isKindOfClass:NSClassFromString(@"MailListByZuVC")]) {
+            [self.navigationController popToViewController:self.navigationController.viewControllers[i] animated:YES];
+            return;
+        }
+    }
+}
 @end

smartRhino/Project/VCModel/ChatMessage/Controller/MailList/Controller/MailGroupListSerachVC.h

@@ -16,6 +16,8 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong,nonatomic) NSArray   * dataArray;
 @property (nonatomic, assign) NSInteger  Id;
 @property (nonatomic, assign) NSInteger  TypeValue;///1 群聊 2小组 3自建通讯录
+@property (assign, nonatomic) BOOL         IsSelectDes;
+@property (nonatomic, assign) BOOL         IsSelect;
 @end
 
 NS_ASSUME_NONNULL_END

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

@@ -27,6 +27,14 @@
     self.tableView.dataSource = self;
     [self.topNavSearch setBarPlaceholder:@"姓名/手机号/邮箱"];
     [self addObserver:self forKeyPath:@"searchText" options:NSKeyValueObservingOptionNew context:nil];
+    WS(weakSelf);
+    if (self.IsSelect) {
+        self.cancelBtn.enabled = NO;
+        [self.cancelBtn setAttributedTitle:[[NSAttributedString alloc] initWithString:@"确定" attributes:@{NSFontAttributeName: [UIFont fontWithName:@"PingFang SC" size: 15],NSForegroundColorAttributeName: [UIColor lightGrayColor]}] forState:UIControlStateNormal];
+        [self.cancelBtn setAction:^{
+            [weakSelf back1];
+        }];
+    }
 }
 
 - (void)dealloc
@@ -50,7 +58,8 @@
 {
     WEAKSELF
     [self.listArray removeAllObjects];
-    [[HttpManager sharedHttpManager] POSTUrl:Host(API_APP_User_Group_Chat_Search) parameters:@{@"TypeValue":@(self.TypeValue),@"Id":@(self.Id),@"Keyword":searchKey} responseStyle:JOSN success:^(id  _Nonnull responseObject) {
+    [[HttpManager sharedHttpManager] POSTWithUrl:Host(AddressBookGroup_Search_Post) parameters:@{@"Key":searchKey} success:^(id  _Nonnull responseObject) {
+//    [[HttpManager sharedHttpManager] POSTUrl:Host(API_APP_User_Group_Chat_Search) parameters:@{@"TypeValue":@(self.TypeValue),@"Id":@(self.Id),@"Keyword":searchKey} responseStyle:JOSN success:^(id  _Nonnull responseObject) {
         NSLog(@"%@",responseObject);
         for (NSDictionary *dic in responseObject) {
             SelectModel * model = [[SelectModel alloc] initDict:dic];
@@ -87,25 +96,16 @@
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
 {
     SelectModel * model = [self.listArray objectAtIndex:indexPath.row];
-    if (self.IsAddUser) {
-        if ([self checkSelectArray] == 0) {
-            [self.cancelBtn setAttributedTitle:[[NSAttributedString alloc] initWithString:@"确定" attributes:@{NSFontAttributeName: [UIFont fontWithName:@"PingFang SC" size: 15],NSForegroundColorAttributeName: UIColorHex(#3979D3)}] forState:UIControlStateNormal];
-        }else{
-            [self.cancelBtn setAttributedTitle:[[NSAttributedString alloc] initWithString:[NSString stringWithFormat:@"确定(%ld)",[self checkSelectArray]] attributes:@{NSFontAttributeName: [UIFont fontWithName:@"PingFang SC" size: 15],NSForegroundColorAttributeName: UIColorHex(#3979D3)}] forState:UIControlStateNormal];
-        }
+    if (self.IsSelect) {
         MailListByZuCell *cell = [MailListByZuCell configCell1:tableView indexPath:indexPath];
         cell.cell0TitleLabel.text = model.UserName;
         cell.cell0DepartMentName.text = @"";
         cell.selectBtn.selected = model.hadSelected;
-        if (model.IsDisable) {
-            [cell.contentView setBackgroundColor:[UIColor grayColor]];
-            [cell.selectBtn setEnabled:NO];
-        }
         WS(weakSelf);
         [cell.selectBtn setAction:^{
             model.hadSelected = !model.hadSelected;
-            [weakSelf.tableView reloadData];
-            //[weakSelf.tableView reloadRowsAtIndexPaths:@[indexPath] withRowAnimation:UITableViewRowAnimationNone];
+            [weakSelf countMailArray:@[model]];
+            [tableView reloadRowsAtIndexPaths:@[indexPath] withRowAnimation:UITableViewRowAnimationNone];
         }];
         [cell.cell0ImgView sd_setImageWithURL:[NSURL URLWithString:model.AvatarUrl] placeholderImage:IMG(@"chatmsg_list_testuser_img")];
         return cell;
@@ -117,25 +117,22 @@
         return cell;
     }
 }
-- (NSInteger)checkSelectArray
-{
-    NSInteger count = 0;
-    for (SelectModel *model in self.listArray) {
-        if (model.hadSelected) {
-            count ++;
-        }
-    }
-    return count;
-}
+
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
 {
-    SelectModel *model = [self.listArray objectAtIndex:indexPath.row];
-    model.SourceName = model.UserName;
-    model.SourceId = model.UserId;
     [tableView deselectRowAtIndexPath:indexPath animated:YES];
-    MailListDetailVC *vc = [MailListDetailVC initMailListDetailVC];
-    vc.indexId = model.SourceId;
-    [self.navigationController pushViewController:vc animated:YES];
+    SelectModel *model = [self.listArray objectAtIndex:indexPath.row];
+    if (self.IsSelect) {
+        model.hadSelected = !model.hadSelected;
+        [self countMailArray:@[model]];
+        [tableView reloadRowsAtIndexPaths:@[indexPath] withRowAnimation:UITableViewRowAnimationNone];
+    }else{
+        model.SourceName = model.UserName;
+        model.SourceId = model.UserId;
+        MailListDetailVC *vc = [MailListDetailVC initMailListDetailVC];
+        vc.indexId = model.SourceId;
+        [self.navigationController pushViewController:vc animated:YES];
+    }
 }
 -(void)back1{
     [self.navigationController popViewControllerAnimated:YES];
@@ -146,4 +143,68 @@
     }
     return _listArray;
 }
+- (void)countMailArray:(NSArray *)sssArray
+{
+    NSMutableArray * mailArray = [NSMutableArray arrayWithArray:USERDEFAULTSGET(MAILSELECT)];
+    for (id detail in sssArray) {
+        SelectModel * ssmodel = [self addSelectModel:detail];
+        
+        __block BOOL isEque = NO;
+        [mailArray enumerateObjectsUsingBlock:^(id  _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
+            SelectModel * sModel = (SelectModel*) [NSKeyedUnarchiver unarchiveObjectWithData:(NSData *)obj];
+            if (sModel.SourceType == ssmodel.SourceType && sModel.SourceId == ssmodel.SourceId && sModel.TypeValue == ssmodel.TypeValue) {
+                isEque = YES;
+                if (!ssmodel.hadSelected) {
+                    [mailArray removeObject:obj];
+                }
+            }
+        }];
+        if (!isEque && ssmodel.hadSelected) {
+            NSData * ssdata  = [NSKeyedArchiver archivedDataWithRootObject:ssmodel];
+            [mailArray addObject:ssdata];
+        }
+        USERDEFAULTSSET(mailArray, MAILSELECT);
+    }
+    if (mailArray.count > 0) {
+        NSString  * count = [NSString stringWithFormat:@"确定(%ld)",(long)mailArray.count];
+        [self.cancelBtn setAttributedTitle:[[NSAttributedString alloc] initWithString:count attributes:@{NSFontAttributeName: [UIFont fontWithName:@"PingFang SC" size: 15],NSForegroundColorAttributeName: UIColorHex(#3979D3)}] forState:UIControlStateNormal];
+        self.cancelBtn.enabled = YES;
+    }else{
+        self.cancelBtn.enabled = NO;
+        [self.cancelBtn setAttributedTitle:[[NSAttributedString alloc] initWithString:@"确定" attributes:@{NSFontAttributeName: [UIFont fontWithName:@"PingFang SC" size: 15],NSForegroundColorAttributeName: [UIColor lightGrayColor]}] forState:UIControlStateNormal];
+    }
+}
+- (SelectModel *)addSelectModel:(id)model
+{
+    if ([model isKindOfClass:[SelectModel class]]) {
+        SelectModel * sModel = (SelectModel *)model;
+        sModel.SourceType = 0;
+        sModel.SourceId = sModel.UserId;
+        sModel.SourceName = sModel.UserName;
+        sModel.hadSelected = sModel.hadSelected;
+        sModel.AvatarUrl = sModel.AvatarUrl;
+        return sModel;
+    }
+//    if ([model isKindOfClass:[MailChatModel class]]) {
+//        MailChatModel * mModel = (MailChatModel *)model;
+//        SelectModel * sModel = [[SelectModel alloc] init];
+//        sModel.SourceType = mModel.TypeId;
+//        sModel.SourceId = mModel.Id;
+//        sModel.SourceName = mModel.Name;
+//        sModel.TypeValue = mModel.TypeValue;
+//        sModel.hadSelected = mModel.IsSelect;
+//        return sModel;
+//    }
+    if ([model isKindOfClass:[Department class]]) {
+        Department * mModel = (Department *)model;
+        SelectModel * sModel = [[SelectModel alloc] init];
+        sModel.SourceType = 1;
+        sModel.SourceId = mModel.Id;
+        sModel.SourceName = mModel.Name;
+        sModel.TypeValue = 0;
+        sModel.hadSelected = mModel.hadSelected;
+        return sModel;
+    }
+    return nil;
+}
 @end

smartRhino/Project/VCModel/ChatMessage/Controller/MailList/Controller/MailGroupListVC.h

@@ -15,7 +15,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, assign) NSInteger  Id;
 @property (nonatomic, assign) NSInteger  TypeValue;///1 群聊 2小组 3自建通讯录
 @property (nonatomic, copy) NSString     *titleStr;
-
+@property (assign, nonatomic) BOOL                   IsSelectDes;
 +(MailGroupListVC *)initMailGroupListVC;
 @end
 

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

@@ -19,10 +19,16 @@
 @property (weak, nonatomic) IBOutlet UILabel      *titleL;
 @property (weak, nonatomic) IBOutlet UIView       *HeadView;
 @property (strong,nonatomic)IBOutlet UITableView  *tableView;
+@property (weak, nonatomic) IBOutlet UIButton     *rightBtn;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *Height;
 @property (strong, nonatomic) MyTDGroupView       *SearchView;
 @property (strong,nonatomic) NSMutableArray       *pinyinArray;
 @property (strong,nonatomic) NSMutableArray       *nameArray;
 @property (strong,nonatomic) NSMutableArray       *cusNameArray;
+@property (nonatomic, strong) UIView      *SortView;
+@property (nonatomic, assign) BOOL        isAllSelected;
+@property (nonatomic, strong) UIButton    *allSelectBtn;
+@property (nonatomic, strong) UILabel     *selectCountL;
 @end
 
 @implementation MailGroupListVC
@@ -52,13 +58,21 @@
     WS(weakSelf);
     [self.SearchView.button setAction:^{
         MailGroupListSerachVC *vc = [[MailGroupListSerachVC alloc] init];
-        vc.TypeValue = weakSelf.TypeValue;
+        vc.IsSelect = YES;
         [weakSelf.navigationController pushViewController:vc animated:YES];
     }];
     self.tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
     self.tableView.delegate = self;
     self.tableView.dataSource = self;
     self.tableView.backgroundColor = [UIColor clearColor];
+    self.rightBtn.hidden = !self.IsSelect;
+    if (self.IsSelect) {
+        self.Height.constant = 84.f;
+        [self addSortV];
+    }
+    [self.rightBtn setAction:^{
+        [weakSelf SelectResult];
+    }];
     [self getData];
 }
 
@@ -107,19 +121,39 @@
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath{
     NSArray * array = self.cusNameArray[indexPath.section];
     SelectModel * smodel = [array objectAtIndex:indexPath.row];
-    MailListByZuCell *cell = [MailListByZuCell configCell0:tableView indexPath:indexPath];
-    cell.cell0TitleLabel.text = smodel.UserName;
-    [cell.cell0ImgView sd_setImageWithURL:[NSURL URLWithString:smodel.AvatarUrl] placeholderImage:[UIImage imageNamed:@"chatmsg_list_testuser_img"]];
-    return cell;
+    WS(weakSelf);
+    if (self.IsSelect) {
+        MailListByZuCell *cell = [MailListByZuCell configCell1:tableView indexPath:indexPath];
+        cell.cell0TitleLabel.text = smodel.UserName;
+        [cell.cell0ImgView sd_setImageWithURL:[NSURL URLWithString:smodel.AvatarUrl] placeholderImage:[UIImage imageNamed:@"chatmsg_list_testuser_img"]];
+        [cell.selectBtn setSelected:smodel.hadSelected];
+        [cell.selectBtn setAction:^{
+            smodel.hadSelected = !smodel.hadSelected;
+            [weakSelf countMailArray:@[smodel]];
+            [tableView reloadRowAtIndexPath:indexPath withRowAnimation:UITableViewRowAnimationAutomatic];
+        }];
+        return cell;
+    }else{
+        MailListByZuCell *cell = [MailListByZuCell configCell0:tableView indexPath:indexPath];
+        cell.cell0TitleLabel.text = smodel.UserName;
+        [cell.cell0ImgView sd_setImageWithURL:[NSURL URLWithString:smodel.AvatarUrl] placeholderImage:[UIImage imageNamed:@"chatmsg_list_testuser_img"]];
+        return cell;
+    }
 }
 
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{
     [tableView deselectRowAtIndexPath:indexPath animated:YES];
     NSArray * array = self.cusNameArray[indexPath.section];
-    SelectModel * sModel = [array objectAtIndex:indexPath.row];
-    MailListDetailVC * userVC = [MailListDetailVC initMailListDetailVC];
-    userVC.indexId = sModel.UserId;
-    [self.navigationController pushViewController:userVC animated:YES];
+    SelectModel * smodel = [array objectAtIndex:indexPath.row];
+    if (self.IsSelect) {
+        smodel.hadSelected = !smodel.hadSelected;
+        [self countMailArray:@[smodel]];
+        [tableView reloadRowAtIndexPath:indexPath withRowAnimation:UITableViewRowAnimationAutomatic];
+    }else{
+        MailListDetailVC * userVC = [MailListDetailVC initMailListDetailVC];
+        userVC.indexId = smodel.UserId;
+        [self.navigationController pushViewController:userVC animated:YES];
+    }
 }
 
 - (void)getData{
@@ -185,4 +219,202 @@
         [weakSelf.tableView reloadData];
     });
 }
+
+- (UIButton *)allSelectBtn
+{
+    if (!_allSelectBtn) {
+        _allSelectBtn = [UIButton new];
+        [_allSelectBtn setImage:IMG(@"sendinfo_no") forState:UIControlStateNormal];
+        [_allSelectBtn setImage:IMG(@"sendinfo_yes") forState:UIControlStateSelected];
+    }
+    return _allSelectBtn;
+}
+- (UILabel *)selectCountL
+{
+    if (!_selectCountL) {
+        _selectCountL = [UILabel new];
+        _selectCountL.font = Kfont(13);
+        _selectCountL.text = @"0";
+        _selectCountL.textColor = UIColorHex(0x0F88EB);
+    }
+    return _selectCountL;
+}
+- (UIView *)SortView
+{
+    if (!_SortView) {
+        _SortView = [UIView new];
+        _SortView.backgroundColor = UIColorHex(0xF0EFF4);
+    }
+    return _SortView;
+}
+- (void)addSortV
+{
+    [self.HeadView addSubview:self.SortView];
+    [self.SortView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.right.mas_equalTo(self.HeadView);
+        make.height.mas_offset(38);
+        make.top.mas_equalTo(self.SearchView.mas_bottom).offset(4);
+    }];
+    [self.SortView addSubview:self.allSelectBtn];
+    [self.SortView addSubview:self.selectCountL];
+    [self.allSelectBtn mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.mas_offset(5);
+        make.centerY.mas_equalTo(self.SortView);
+        make.size.mas_offset(CGSizeMake(38, 38));
+    }];
+    UILabel * leftL = [UILabel new];
+    leftL.text = @"已选:";
+    leftL.textColor = UIColorHex(0x666666);
+    leftL.font = Kfont(13);
+    [self.SortView addSubview:leftL];
+    [leftL mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.mas_equalTo(self.allSelectBtn.mas_right).offset(5);
+        make.centerY.mas_equalTo(self.SortView);
+    }];
+    [self.selectCountL mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.mas_equalTo(leftL.mas_right).offset(8);
+        make.centerY.mas_equalTo(self.SortView);
+    }];
+    
+    WS(weakSelf);
+    [self.allSelectBtn setAction:^{
+        weakSelf.isAllSelected = !weakSelf.isAllSelected;
+        [weakSelf selectedAction];
+    }];
+}
+- (void)selectedAction{
+    [self.allSelectBtn setSelected:self.isAllSelected];
+    NSInteger count = 0;
+    for (NSArray * array in self.cusNameArray) {
+        for (SelectModel * model in array) {
+            model.hadSelected = self.isAllSelected;
+            if (model.hadSelected) {
+                count ++;
+            }
+            [self countMailArray:@[model]];
+        }
+    }
+    self.selectCountL.text = [NSString stringWithFormat:@"%ld",count];
+    [self.tableView reloadData];
+}
+- (void)countMailArray:(NSArray *)sssArray
+{
+    NSMutableArray * mailArray = [NSMutableArray arrayWithArray:USERDEFAULTSGET(MAILSELECT)];
+    for (id detail in sssArray) {
+        SelectModel * ssmodel = [self addSelectModel:detail];
+        
+        __block BOOL isEque = NO;
+        [mailArray enumerateObjectsUsingBlock:^(id  _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
+            SelectModel * sModel = (SelectModel*) [NSKeyedUnarchiver unarchiveObjectWithData:(NSData *)obj];
+            if (sModel.SourceType == ssmodel.SourceType && sModel.SourceId == ssmodel.SourceId && sModel.TypeValue == ssmodel.TypeValue) {
+                isEque = YES;
+                if (!ssmodel.hadSelected) {
+                    [mailArray removeObject:obj];
+                }
+            }
+        }];
+        if (!isEque && ssmodel.hadSelected) {
+            NSData * ssdata  = [NSKeyedArchiver archivedDataWithRootObject:ssmodel];
+            [mailArray addObject:ssdata];
+        }
+        USERDEFAULTSSET(mailArray, MAILSELECT);
+    }
+    if (mailArray.count > 0) {
+        self.rightBtn.enabled = YES;
+        [self.rightBtn setTitleColor:UIColorHex(#3979D3) forState:UIControlStateNormal];
+        [self.rightBtn setTitle:[NSString stringWithFormat:@"确定(%ld)",(long)mailArray.count] forState:UIControlStateNormal];
+    }else{
+        self.rightBtn.enabled = NO;
+        [self.rightBtn setTitle:@"确定" forState:UIControlStateNormal];
+        [self.rightBtn setTitleColor:[UIColor lightGrayColor] forState:UIControlStateNormal];
+    }
+}
+- (SelectModel *)addSelectModel:(id)model
+{
+    if ([model isKindOfClass:[SelectModel class]]) {
+        SelectModel * sModel = (SelectModel *)model;
+        sModel.SourceType = 0;
+        sModel.SourceId = sModel.UserId;
+        sModel.SourceName = sModel.UserName;
+        sModel.hadSelected = sModel.hadSelected;
+        sModel.AvatarUrl = sModel.AvatarUrl;
+        return sModel;
+    }
+//    if ([model isKindOfClass:[MailChatModel class]]) {
+//        MailChatModel * mModel = (MailChatModel *)model;
+//        SelectModel * sModel = [[SelectModel alloc] init];
+//        sModel.SourceType = mModel.TypeId;
+//        sModel.SourceId = mModel.Id;
+//        sModel.SourceName = mModel.Name;
+//        sModel.TypeValue = mModel.TypeValue;
+//        sModel.hadSelected = mModel.IsSelect;
+//        return sModel;
+//    }
+    if ([model isKindOfClass:[Department class]]) {
+        Department * mModel = (Department *)model;
+        SelectModel * sModel = [[SelectModel alloc] init];
+        sModel.SourceType = 1;
+        sModel.SourceId = mModel.Id;
+        sModel.SourceName = mModel.Name;
+        sModel.TypeValue = 0;
+        sModel.hadSelected = mModel.hadSelected;
+        return sModel;
+    }
+    return nil;
+}
+- (void)SelectResult
+{
+    NSMutableArray * mailArray = [NSMutableArray arrayWithArray:USERDEFAULTSGET(MAILSELECT)];
+    NSMutableArray * chaoArray = [NSMutableArray array];
+    NSMutableDictionary * paraDict = [NSMutableDictionary dictionary];
+    NSMutableArray * mArray = [NSMutableArray array];
+    NSMutableArray * selectArray = [NSMutableArray array];
+    [mailArray enumerateObjectsUsingBlock:^(id  _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
+        SelectModel * sModel = (SelectModel*) [NSKeyedUnarchiver unarchiveObjectWithData:(NSData *)obj];
+        [chaoArray addObject:sModel];
+        [mArray addObject:@{@"SourceType":@(sModel.SourceType),@"SourceId":@(sModel.SourceId),@"SourceTypeValue":@(sModel.TypeValue),@"SourceName":sModel.SourceName}];
+    }];
+    if (self.IsSelectDes) {
+        [[NSNotificationCenter defaultCenter] postNotificationName:NOTIFI_ChaoSongRen object:nil userInfo:@{@"selectPeople":chaoArray}];
+        [self back1];
+        return;
+    }else{
+        [paraDict setValue:mArray forKey:@"Item"];
+        SHOWLOADING
+        WS(weakSelf);
+        [[HttpManager sharedHttpManager] POSTUrl:Host(API_APP_User_Middle) parameters:paraDict responseStyle:JOSN success:^(id  _Nonnull responseObject) {
+            REMOVESHOW
+            for (NSDictionary *dict in responseObject) {
+                SelectModel * model = [SelectModel modelWithDictionary:dict];
+                model.UserId = model.Id;
+                model.UserName = model.Name;
+                model.SourceId = model.UserId;
+                model.SourceName = model.UserName;
+                [selectArray addObject:model];
+            }
+            [[NSNotificationCenter defaultCenter] postNotificationName:NOTIFI_ChaoSongRen object:nil userInfo:@{@"selectPeople":selectArray}];
+            [weakSelf back1];
+        } failure:^(NSError * _Nonnull error) {
+            SHOWERROR([ZYCTool handerResultData:error]);
+        }];
+    }
+}
+-(void)back1{
+    for ( NSInteger i = (self.navigationController.viewControllers.count - 1); i > 0 ;i --) {
+           NSLog(@"%@",self.navigationController.viewControllers[i]);
+        if ([self.navigationController.viewControllers[i] isKindOfClass:NSClassFromString(@"MyWorkWordVC")]
+            || [self.navigationController.viewControllers[i] isKindOfClass:NSClassFromString(@"ChatNewGroupVC")]
+            || [self.navigationController.viewControllers[i] isKindOfClass:NSClassFromString(@"H5ViewController")]
+            || [self.navigationController.viewControllers[i] isKindOfClass:NSClassFromString(@"MyTDTopicCreateVC")]
+            || [self.navigationController.viewControllers[i] isKindOfClass:NSClassFromString(@"MyFavoriteNewFindVC")]
+            || [self.navigationController.viewControllers[i] isKindOfClass:NSClassFromString(@"ChatNewRowVC")]
+            || [self.navigationController.viewControllers[i] isKindOfClass:NSClassFromString(@"MyTDTopicGroupUserVC")]
+            || [self.navigationController.viewControllers[i] isKindOfClass:NSClassFromString(@"WorkFlowOrderController")]
+            || [self.navigationController.viewControllers[i] isKindOfClass:NSClassFromString(@"CreateInterLeterVC")]
+            || [self.navigationController.viewControllers[i] isKindOfClass:NSClassFromString(@"MailListByZuVC")]) {
+            [self.navigationController popToViewController:self.navigationController.viewControllers[i] animated:YES];
+            return;
+        }
+    }
+}
 @end

smartRhino/Project/VCModel/ChatMessage/Controller/MailList/Controller/MailGroupVC.h

@@ -18,6 +18,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, assign) NSInteger  TypeValue;///1 群聊 2小组 3自建通讯录
 @property (assign, nonatomic) CreateFileFolderType   type;
 @property (nonatomic, assign) NSInteger  TypeId;
+@property (assign, nonatomic) BOOL                   IsSelectDes;
 @end
 
 NS_ASSUME_NONNULL_END

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

@@ -96,8 +96,7 @@
     }];
     WS(weakSelf);
     [self.rightBtn setAction:^{
-        weakSelf.isAllSelected = !weakSelf.isAllSelected;
-        [weakSelf selectedAction];
+        [weakSelf SelectResult];
     }];
 
     [self.CusNavBar addSubview:self.titleL];
@@ -125,8 +124,11 @@
         make.height.mas_offset(36);
     }];
     [self.SearchView.button setAction:^{
-        MailGroupListSerachVC * vc = [[MailGroupListSerachVC alloc] init];
-        vc.TypeValue = 2;
+//        MailGroupListSerachVC * vc = [[MailGroupListSerachVC alloc] init];
+//        vc.TypeValue = 2;
+//        [weakSelf.navigationController pushViewController:vc animated:YES];
+        MailGroupListSerachVC *vc = [[MailGroupListSerachVC alloc] init];
+        vc.IsSelect = YES;
         [weakSelf.navigationController pushViewController:vc animated:YES];
     }];
     [self.view addSubview:self.tableView];
@@ -286,6 +288,13 @@
         NoticeListModel *listModel = [[NoticeListModel alloc] initWithDictionary:responseObject error:nil];
         weakSelf.totalRecord = listModel.Total;
         [weakSelf.dataArray addObjectsFromArray:listModel.Items];
+        for (NoticeModel * model in weakSelf.dataArray) {
+            if (model.AttributeValue == 2) {
+                model.TypeValue = 22;
+            }else{
+                model.TypeValue = 20;
+            }
+        }
         dispatch_async(dispatch_get_main_queue(), ^{
             [weakSelf.tableView removeFromSuperview];
             weakSelf.tableView = nil;
@@ -714,10 +723,65 @@
         sModel.SourceType = self.TypeId;
         sModel.SourceId = mModel.Id;
         sModel.SourceName = mModel.GroupName;
-        sModel.TypeValue = self.TypeValue;
+        sModel.TypeValue = mModel.TypeValue;
         sModel.hadSelected = mModel.IsSelect;
         return sModel;
     }
     return nil;
 }
+- (void)SelectResult
+{
+    NSMutableArray * mailArray = [NSMutableArray arrayWithArray:USERDEFAULTSGET(MAILSELECT)];
+    NSMutableArray * chaoArray = [NSMutableArray array];
+    NSMutableDictionary * paraDict = [NSMutableDictionary dictionary];
+    NSMutableArray * mArray = [NSMutableArray array];
+    NSMutableArray * selectArray = [NSMutableArray array];
+    [mailArray enumerateObjectsUsingBlock:^(id  _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
+        SelectModel * sModel = (SelectModel*) [NSKeyedUnarchiver unarchiveObjectWithData:(NSData *)obj];
+        [chaoArray addObject:sModel];
+        [mArray addObject:@{@"SourceType":@(sModel.SourceType),@"SourceId":@(sModel.SourceId),@"SourceTypeValue":@(sModel.TypeValue),@"SourceName":sModel.SourceName}];
+    }];
+    if (self.IsSelectDes) {
+        [[NSNotificationCenter defaultCenter] postNotificationName:NOTIFI_ChaoSongRen object:nil userInfo:@{@"selectPeople":chaoArray}];
+        [self back1];
+        return;
+    }else{
+        [paraDict setValue:mArray forKey:@"Item"];
+        SHOWLOADING
+        WS(weakSelf);
+        [[HttpManager sharedHttpManager] POSTUrl:Host(API_APP_User_Middle) parameters:paraDict responseStyle:JOSN success:^(id  _Nonnull responseObject) {
+            REMOVESHOW
+            for (NSDictionary *dict in responseObject) {
+                SelectModel * model = [SelectModel modelWithDictionary:dict];
+                model.UserId = model.Id;
+                model.UserName = model.Name;
+                model.SourceId = model.UserId;
+                model.SourceName = model.UserName;
+                [selectArray addObject:model];
+            }
+            [[NSNotificationCenter defaultCenter] postNotificationName:NOTIFI_ChaoSongRen object:nil userInfo:@{@"selectPeople":selectArray}];
+            [weakSelf back1];
+        } failure:^(NSError * _Nonnull error) {
+            SHOWERROR([ZYCTool handerResultData:error]);
+        }];
+    }
+}
+-(void)back1{
+    for ( NSInteger i = (self.navigationController.viewControllers.count - 1); i > 0 ;i --) {
+           NSLog(@"%@",self.navigationController.viewControllers[i]);
+        if ([self.navigationController.viewControllers[i] isKindOfClass:NSClassFromString(@"MyWorkWordVC")]
+            || [self.navigationController.viewControllers[i] isKindOfClass:NSClassFromString(@"ChatNewGroupVC")]
+            || [self.navigationController.viewControllers[i] isKindOfClass:NSClassFromString(@"H5ViewController")]
+            || [self.navigationController.viewControllers[i] isKindOfClass:NSClassFromString(@"MyTDTopicCreateVC")]
+            || [self.navigationController.viewControllers[i] isKindOfClass:NSClassFromString(@"MyFavoriteNewFindVC")]
+            || [self.navigationController.viewControllers[i] isKindOfClass:NSClassFromString(@"ChatNewRowVC")]
+            || [self.navigationController.viewControllers[i] isKindOfClass:NSClassFromString(@"MyTDTopicGroupUserVC")]
+            || [self.navigationController.viewControllers[i] isKindOfClass:NSClassFromString(@"WorkFlowOrderController")]
+            || [self.navigationController.viewControllers[i] isKindOfClass:NSClassFromString(@"CreateInterLeterVC")]
+            || [self.navigationController.viewControllers[i] isKindOfClass:NSClassFromString(@"MailListByZuVC")]) {
+            [self.navigationController popToViewController:self.navigationController.viewControllers[i] animated:YES];
+            return;
+        }
+    }
+}
 @end

smartRhino/Project/VCModel/ChatMessage/Controller/MailList/Controller/ShowDesVC.h

@@ -15,6 +15,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong,nonatomic) NSMutableArray      *dataSourceArray;
 @property (assign, nonatomic) BOOL                   isReturn;
 @property (assign, nonatomic) BOOL                   IsSelect;
+@property (assign, nonatomic) BOOL                   IsSelectDes;
 +(ShowDesVC *)initShowDesVC;
 @end
 

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

@@ -50,11 +50,8 @@
     }
     WS(weakSelf);
     UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithActionBlock:^(id  _Nonnull sender) {
-        MailListSearchVC *vc = [[MailListSearchVC alloc] init];
-        vc.isReturn = weakSelf.isReturn;
-        vc.sendModel = weakSelf.sendModel;
-        vc.DepartmentId = 0;
-        vc.SearchType = 0;
+        MailGroupListSerachVC *vc = [[MailGroupListSerachVC alloc] init];
+        vc.IsSelect = YES;
         [weakSelf.navigationController pushViewController:vc animated:YES];
      }];
      [self.myHeaderView addGestureRecognizer:tap];
@@ -81,8 +78,7 @@
         make.right.mas_equalTo(self.CusNavBar.mas_right).offset(-15);
     }];
     [self.rightBtn setAction:^{
-        weakSelf.isAllSelected = !weakSelf.isAllSelected;
-        [weakSelf selectedAction];
+        [weakSelf SelectResult];
     }];
 }
 - (void)dealloc
@@ -229,9 +225,9 @@
 - (void)selectedAction{
     [self.allSelectBtn setSelected:self.isAllSelected];
     NSInteger count = 0;
-    for (SelectModel * model in self.dataSourceArray) {
-        model.hadSelected = self.isAllSelected;
-        if (model.hadSelected) {
+    for (MailSubModel * model in self.dataSourceArray) {
+        model.IsSelect = self.isAllSelected;
+        if (model.IsSelect) {
             count ++;
         }
         [self countMailArray:@[model]];
@@ -292,16 +288,16 @@
 //        sModel.hadSelected = mModel.IsSelect;
 //        return sModel;
 //    }
-//    if ([model isKindOfClass:[MailSubModel class]]) {
-//        MailSubModel * mModel = (MailSubModel *)model;
-//        SelectModel * sModel = [[SelectModel alloc] init];
-//        sModel.SourceType = mModel.TypeId;
-//        sModel.SourceId = mModel.Id;
-//        sModel.SourceName = mModel.Name;
-//        sModel.TypeValue = mModel.TypeValue;
-//        sModel.hadSelected = mModel.IsSelect;
-//        return sModel;
-//    }
+    if ([model isKindOfClass:[MailSubModel class]]) {
+        MailSubModel * mModel = (MailSubModel *)model;
+        SelectModel * sModel = [[SelectModel alloc] init];
+        sModel.SourceType = mModel.TypeId;
+        sModel.SourceId = mModel.Id;
+        sModel.SourceName = mModel.Name;
+        sModel.TypeValue = mModel.TypeValue;
+        sModel.hadSelected = mModel.IsSelect;
+        return sModel;
+    }
     if ([model isKindOfClass:[Department class]]) {
         Department * mModel = (Department *)model;
         SelectModel * sModel = [[SelectModel alloc] init];
@@ -314,6 +310,61 @@
     }
     return nil;
 }
+- (void)SelectResult
+{
+    NSMutableArray * mailArray = [NSMutableArray arrayWithArray:USERDEFAULTSGET(MAILSELECT)];
+    NSMutableArray * chaoArray = [NSMutableArray array];
+    NSMutableDictionary * paraDict = [NSMutableDictionary dictionary];
+    NSMutableArray * mArray = [NSMutableArray array];
+    NSMutableArray * selectArray = [NSMutableArray array];
+    [mailArray enumerateObjectsUsingBlock:^(id  _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
+        SelectModel * sModel = (SelectModel*) [NSKeyedUnarchiver unarchiveObjectWithData:(NSData *)obj];
+        [chaoArray addObject:sModel];
+        [mArray addObject:@{@"SourceType":@(sModel.SourceType),@"SourceId":@(sModel.SourceId),@"SourceTypeValue":@(sModel.TypeValue),@"SourceName":sModel.SourceName}];
+    }];
+    if (self.IsSelectDes) {
+        [[NSNotificationCenter defaultCenter] postNotificationName:NOTIFI_ChaoSongRen object:nil userInfo:@{@"selectPeople":chaoArray}];
+        [self back1];
+        return;
+    }else{
+        [paraDict setValue:mArray forKey:@"Item"];
+        SHOWLOADING
+        WS(weakSelf);
+        [[HttpManager sharedHttpManager] POSTUrl:Host(API_APP_User_Middle) parameters:paraDict responseStyle:JOSN success:^(id  _Nonnull responseObject) {
+            REMOVESHOW
+            for (NSDictionary *dict in responseObject) {
+                SelectModel * model = [SelectModel modelWithDictionary:dict];
+                model.UserId = model.Id;
+                model.UserName = model.Name;
+                model.SourceId = model.UserId;
+                model.SourceName = model.UserName;
+                [selectArray addObject:model];
+            }
+            [[NSNotificationCenter defaultCenter] postNotificationName:NOTIFI_ChaoSongRen object:nil userInfo:@{@"selectPeople":selectArray}];
+            [weakSelf back1];
+        } failure:^(NSError * _Nonnull error) {
+            SHOWERROR([ZYCTool handerResultData:error]);
+        }];
+    }
+}
+-(void)back1{
+    for ( NSInteger i = (self.navigationController.viewControllers.count - 1); i > 0 ;i --) {
+           NSLog(@"%@",self.navigationController.viewControllers[i]);
+        if ([self.navigationController.viewControllers[i] isKindOfClass:NSClassFromString(@"MyWorkWordVC")]
+            || [self.navigationController.viewControllers[i] isKindOfClass:NSClassFromString(@"ChatNewGroupVC")]
+            || [self.navigationController.viewControllers[i] isKindOfClass:NSClassFromString(@"H5ViewController")]
+            || [self.navigationController.viewControllers[i] isKindOfClass:NSClassFromString(@"MyTDTopicCreateVC")]
+            || [self.navigationController.viewControllers[i] isKindOfClass:NSClassFromString(@"MyFavoriteNewFindVC")]
+            || [self.navigationController.viewControllers[i] isKindOfClass:NSClassFromString(@"ChatNewRowVC")]
+            || [self.navigationController.viewControllers[i] isKindOfClass:NSClassFromString(@"MyTDTopicGroupUserVC")]
+            || [self.navigationController.viewControllers[i] isKindOfClass:NSClassFromString(@"WorkFlowOrderController")]
+            || [self.navigationController.viewControllers[i] isKindOfClass:NSClassFromString(@"CreateInterLeterVC")]
+            || [self.navigationController.viewControllers[i] isKindOfClass:NSClassFromString(@"MailListByZuVC")]) {
+            [self.navigationController popToViewController:self.navigationController.viewControllers[i] animated:YES];
+            return;
+        }
+    }
+}
 @end
 
 

smartRhino/Project/VCModel/ChatMessage/Controller/MailList/Controller/ShowSysVC.h

@@ -15,6 +15,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong,nonatomic) NSMutableArray      *dataSourceArray;
 @property (assign, nonatomic) BOOL                   isReturn;
 @property (assign, nonatomic) BOOL                   IsSelect;
+@property (assign, nonatomic) BOOL                   IsSelectDes;
 +(ShowSysVC *)initShowSysVC;
 @end
 

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

@@ -49,11 +49,8 @@
     }
     WS(weakSelf);
     UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithActionBlock:^(id  _Nonnull sender) {
-        MailListSearchVC *vc = [[MailListSearchVC alloc] init];
-        vc.isReturn = weakSelf.isReturn;
-        vc.sendModel = weakSelf.sendModel;
-        vc.DepartmentId = 0;
-        vc.SearchType = 0;
+        MailGroupListSerachVC *vc = [[MailGroupListSerachVC alloc] init];
+        vc.IsSelect = YES;
         [weakSelf.navigationController pushViewController:vc animated:YES];
      }];
      [self.myHeaderView addGestureRecognizer:tap];
@@ -80,8 +77,7 @@
         make.right.mas_equalTo(self.CusNavBar.mas_right).offset(-15);
     }];
     [self.rightBtn setAction:^{
-        weakSelf.isAllSelected = !weakSelf.isAllSelected;
-        [weakSelf selectedAction];
+        [weakSelf SelectResult];
     }];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(messageReturnSuccess) name:MESSAGERETURNSUCCESS object:nil];
 }
@@ -135,6 +131,7 @@
                 vc.titleStr = model.Name;
                 vc.TypeValue = model.TypeValue;
                 vc.TypeId = model.TypeId;
+                vc.IsSelectDes = self.IsSelectDes;
                 [self.navigationController pushViewController:vc animated:YES];
             }
                 break;
@@ -145,6 +142,7 @@
                 vc.titleStr = model.Name;
                 vc.TypeValue = model.TypeValue;
                 vc.TypeId = model.TypeId;
+                vc.IsSelectDes = self.IsSelectDes;
                 [self.navigationController pushViewController:vc animated:YES];
             }
                 break;
@@ -294,9 +292,9 @@
         MailModel * mModel = (MailModel *)model;
         SelectModel * sModel = [[SelectModel alloc] init];
         sModel.SourceType = mModel.TypeId;
-        sModel.SourceId = 0;
+        sModel.SourceId = mModel.Id;
         sModel.SourceName = mModel.Name;
-        sModel.TypeValue = 0;
+        sModel.TypeValue = mModel.TypeValue;
         sModel.hadSelected = mModel.IsSelect;
         return sModel;
     }
@@ -322,6 +320,61 @@
     }
     return nil;
 }
+- (void)SelectResult
+{
+    NSMutableArray * mailArray = [NSMutableArray arrayWithArray:USERDEFAULTSGET(MAILSELECT)];
+    NSMutableArray * chaoArray = [NSMutableArray array];
+    NSMutableDictionary * paraDict = [NSMutableDictionary dictionary];
+    NSMutableArray * mArray = [NSMutableArray array];
+    NSMutableArray * selectArray = [NSMutableArray array];
+    [mailArray enumerateObjectsUsingBlock:^(id  _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
+        SelectModel * sModel = (SelectModel*) [NSKeyedUnarchiver unarchiveObjectWithData:(NSData *)obj];
+        [chaoArray addObject:sModel];
+        [mArray addObject:@{@"SourceType":@(sModel.SourceType),@"SourceId":@(sModel.SourceId),@"SourceTypeValue":@(sModel.TypeValue),@"SourceName":sModel.SourceName}];
+    }];
+    if (self.IsSelectDes) {
+        [[NSNotificationCenter defaultCenter] postNotificationName:NOTIFI_ChaoSongRen object:nil userInfo:@{@"selectPeople":chaoArray}];
+        [self back1];
+        return;
+    }else{
+        [paraDict setValue:mArray forKey:@"Item"];
+        SHOWLOADING
+        WS(weakSelf);
+        [[HttpManager sharedHttpManager] POSTUrl:Host(API_APP_User_Middle) parameters:paraDict responseStyle:JOSN success:^(id  _Nonnull responseObject) {
+            REMOVESHOW
+            for (NSDictionary *dict in responseObject) {
+                SelectModel * model = [SelectModel modelWithDictionary:dict];
+                model.UserId = model.Id;
+                model.UserName = model.Name;
+                model.SourceId = model.UserId;
+                model.SourceName = model.UserName;
+                [selectArray addObject:model];
+            }
+            [[NSNotificationCenter defaultCenter] postNotificationName:NOTIFI_ChaoSongRen object:nil userInfo:@{@"selectPeople":selectArray}];
+            [weakSelf back1];
+        } failure:^(NSError * _Nonnull error) {
+            SHOWERROR([ZYCTool handerResultData:error]);
+        }];
+    }
+}
+-(void)back1{
+    for ( NSInteger i = (self.navigationController.viewControllers.count - 1); i > 0 ;i --) {
+           NSLog(@"%@",self.navigationController.viewControllers[i]);
+        if ([self.navigationController.viewControllers[i] isKindOfClass:NSClassFromString(@"MyWorkWordVC")]
+            || [self.navigationController.viewControllers[i] isKindOfClass:NSClassFromString(@"ChatNewGroupVC")]
+            || [self.navigationController.viewControllers[i] isKindOfClass:NSClassFromString(@"H5ViewController")]
+            || [self.navigationController.viewControllers[i] isKindOfClass:NSClassFromString(@"MyTDTopicCreateVC")]
+            || [self.navigationController.viewControllers[i] isKindOfClass:NSClassFromString(@"MyFavoriteNewFindVC")]
+            || [self.navigationController.viewControllers[i] isKindOfClass:NSClassFromString(@"ChatNewRowVC")]
+            || [self.navigationController.viewControllers[i] isKindOfClass:NSClassFromString(@"MyTDTopicGroupUserVC")]
+            || [self.navigationController.viewControllers[i] isKindOfClass:NSClassFromString(@"WorkFlowOrderController")]
+            || [self.navigationController.viewControllers[i] isKindOfClass:NSClassFromString(@"CreateInterLeterVC")]
+            || [self.navigationController.viewControllers[i] isKindOfClass:NSClassFromString(@"MailListByZuVC")]) {
+            [self.navigationController popToViewController:self.navigationController.viewControllers[i] animated:YES];
+            return;
+        }
+    }
+}
 @end
 
 

smartRhino/Project/VCModel/ChatMessage/Controller/MailList/Controller/ShowUserVC.h

@@ -15,6 +15,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong,nonatomic) NSMutableArray      *dataSourceArray;
 @property (assign, nonatomic) BOOL                   isReturn;
 @property (assign, nonatomic) BOOL                   IsSelect;
+@property (assign, nonatomic) BOOL                   IsSelectDes;
 +(ShowUserVC *)initShowUserVC;
 @end
 

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

@@ -49,11 +49,8 @@
     }
     WS(weakSelf);
     UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithActionBlock:^(id  _Nonnull sender) {
-        MailListSearchVC *vc = [[MailListSearchVC alloc] init];
-        vc.isReturn = weakSelf.isReturn;
-        vc.sendModel = weakSelf.sendModel;
-        vc.DepartmentId = 0;
-        vc.SearchType = 0;
+        MailGroupListSerachVC *vc = [[MailGroupListSerachVC alloc] init];
+        vc.IsSelect = YES;
         [weakSelf.navigationController pushViewController:vc animated:YES];
      }];
      [self.myHeaderView addGestureRecognizer:tap];
@@ -80,8 +77,7 @@
         make.right.mas_equalTo(self.CusNavBar.mas_right).offset(-15);
     }];
     [self.rightBtn setAction:^{
-        weakSelf.isAllSelected = !weakSelf.isAllSelected;
-        [weakSelf selectedAction];
+        [weakSelf SelectResult];
     }];
 }
 - (void)dealloc
@@ -288,6 +284,62 @@
     }
     return nil;
 }
+
+- (void)SelectResult
+{
+    NSMutableArray * mailArray = [NSMutableArray arrayWithArray:USERDEFAULTSGET(MAILSELECT)];
+    NSMutableArray * chaoArray = [NSMutableArray array];
+    NSMutableDictionary * paraDict = [NSMutableDictionary dictionary];
+    NSMutableArray * mArray = [NSMutableArray array];
+    NSMutableArray * selectArray = [NSMutableArray array];
+    [mailArray enumerateObjectsUsingBlock:^(id  _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
+        SelectModel * sModel = (SelectModel*) [NSKeyedUnarchiver unarchiveObjectWithData:(NSData *)obj];
+        [chaoArray addObject:sModel];
+        [mArray addObject:@{@"SourceType":@(sModel.SourceType),@"SourceId":@(sModel.SourceId),@"SourceTypeValue":@(sModel.TypeValue),@"SourceName":sModel.SourceName}];
+    }];
+    if (self.IsSelectDes) {
+        [[NSNotificationCenter defaultCenter] postNotificationName:NOTIFI_ChaoSongRen object:nil userInfo:@{@"selectPeople":chaoArray}];
+        [self back1];
+        return;
+    }else{
+        [paraDict setValue:mArray forKey:@"Item"];
+        SHOWLOADING
+        WS(weakSelf);
+        [[HttpManager sharedHttpManager] POSTUrl:Host(API_APP_User_Middle) parameters:paraDict responseStyle:JOSN success:^(id  _Nonnull responseObject) {
+            REMOVESHOW
+            for (NSDictionary *dict in responseObject) {
+                SelectModel * model = [SelectModel modelWithDictionary:dict];
+                model.UserId = model.Id;
+                model.UserName = model.Name;
+                model.SourceId = model.UserId;
+                model.SourceName = model.UserName;
+                [selectArray addObject:model];
+            }
+            [[NSNotificationCenter defaultCenter] postNotificationName:NOTIFI_ChaoSongRen object:nil userInfo:@{@"selectPeople":selectArray}];
+            [weakSelf back1];
+        } failure:^(NSError * _Nonnull error) {
+            SHOWERROR([ZYCTool handerResultData:error]);
+        }];
+    }
+}
+-(void)back1{
+    for ( NSInteger i = (self.navigationController.viewControllers.count - 1); i > 0 ;i --) {
+           NSLog(@"%@",self.navigationController.viewControllers[i]);
+        if ([self.navigationController.viewControllers[i] isKindOfClass:NSClassFromString(@"MyWorkWordVC")]
+            || [self.navigationController.viewControllers[i] isKindOfClass:NSClassFromString(@"ChatNewGroupVC")]
+            || [self.navigationController.viewControllers[i] isKindOfClass:NSClassFromString(@"H5ViewController")]
+            || [self.navigationController.viewControllers[i] isKindOfClass:NSClassFromString(@"MyTDTopicCreateVC")]
+            || [self.navigationController.viewControllers[i] isKindOfClass:NSClassFromString(@"MyFavoriteNewFindVC")]
+            || [self.navigationController.viewControllers[i] isKindOfClass:NSClassFromString(@"ChatNewRowVC")]
+            || [self.navigationController.viewControllers[i] isKindOfClass:NSClassFromString(@"MyTDTopicGroupUserVC")]
+            || [self.navigationController.viewControllers[i] isKindOfClass:NSClassFromString(@"WorkFlowOrderController")]
+            || [self.navigationController.viewControllers[i] isKindOfClass:NSClassFromString(@"CreateInterLeterVC")]
+            || [self.navigationController.viewControllers[i] isKindOfClass:NSClassFromString(@"MailListByZuVC")]) {
+            [self.navigationController popToViewController:self.navigationController.viewControllers[i] animated:YES];
+            return;
+        }
+    }
+}
 @end
 
 

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

@@ -1527,12 +1527,20 @@
                                                     <constraint firstAttribute="height" constant="0.5" id="sQf-wp-Kw9"/>
                                                 </constraints>
                                             </view>
+                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="9xi-SA-xJJ">
+                                                <rect key="frame" x="368" y="7" width="31" height="30"/>
+                                                <state key="normal" title="确定">
+                                                    <color key="titleColor" white="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                </state>
+                                            </button>
                                         </subviews>
                                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         <constraints>
                                             <constraint firstItem="82V-Fq-NAA" firstAttribute="centerX" secondItem="xeO-9F-lbm" secondAttribute="centerX" id="7H6-Rf-raz"/>
                                             <constraint firstItem="aFP-Qv-m72" firstAttribute="leading" secondItem="xeO-9F-lbm" secondAttribute="leading" id="96k-wS-dxH"/>
+                                            <constraint firstItem="9xi-SA-xJJ" firstAttribute="centerY" secondItem="xeO-9F-lbm" secondAttribute="centerY" id="DAZ-FN-u9p"/>
                                             <constraint firstAttribute="bottom" secondItem="aFP-Qv-m72" secondAttribute="bottom" id="E14-7O-4f1"/>
+                                            <constraint firstAttribute="trailing" secondItem="9xi-SA-xJJ" secondAttribute="trailing" constant="15" id="Eci-ZH-8yt"/>
                                             <constraint firstItem="pUV-vQ-UvY" firstAttribute="centerY" secondItem="aFP-Qv-m72" secondAttribute="centerY" id="IqF-gS-8hp"/>
                                             <constraint firstAttribute="trailing" secondItem="9HM-kK-xtT" secondAttribute="trailing" id="TPE-DM-5hf"/>
                                             <constraint firstItem="82V-Fq-NAA" firstAttribute="centerY" secondItem="xeO-9F-lbm" secondAttribute="centerY" id="aal-OC-b4d"/>
@@ -1585,6 +1593,8 @@
                     <navigationItem key="navigationItem" id="qse-ZL-xH6"/>
                     <connections>
                         <outlet property="HeadView" destination="cds-au-riU" id="8DJ-6s-RY2"/>
+                        <outlet property="Height" destination="fA5-bw-Pjz" id="DQJ-IB-fzN"/>
+                        <outlet property="rightBtn" destination="9xi-SA-xJJ" id="BUZ-cY-euE"/>
                         <outlet property="tableView" destination="uzh-ah-Kl1" id="a98-2J-74B"/>
                         <outlet property="titleL" destination="82V-Fq-NAA" id="VQZ-g9-dpb"/>
                     </connections>

smartRhino/Project/VCModel/ChatMessage/Controller/MyTDGroup/Cell/TDGroupInfoListCell.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097.2" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -37,7 +37,7 @@
                     </label>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="事件聚焦" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wvS-i5-ZvJ">
                         <rect key="frame" x="16" y="64" width="288" height="102"/>
-                        <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="18"/>
+                        <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="20"/>
                         <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
@@ -199,7 +199,7 @@
                     </label>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" text="事件聚焦" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FX3-2q-6Qs">
                         <rect key="frame" x="16" y="64" width="288" height="163.5"/>
-                        <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="18"/>
+                        <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="20"/>
                         <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
@@ -407,7 +407,7 @@
                     </label>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" text="事件聚焦" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="MjR-4O-nf5">
                         <rect key="frame" x="16" y="64" width="288" height="211.5"/>
-                        <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="18"/>
+                        <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="20"/>
                         <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
@@ -630,7 +630,7 @@
                     </label>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" text="事件聚焦" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="DfP-II-xeF">
                         <rect key="frame" x="16" y="64" width="288" height="235.5"/>
-                        <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="18"/>
+                        <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="20"/>
                         <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
@@ -881,7 +881,7 @@
                     </label>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" text="事件聚焦" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yVA-qq-0Qg">
                         <rect key="frame" x="16" y="64" width="288" height="113.5"/>
-                        <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="18"/>
+                        <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="20"/>
                         <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
@@ -1164,7 +1164,7 @@
                     </label>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" text="事件聚焦" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="AWh-Mg-KC4">
                         <rect key="frame" x="16" y="64" width="288" height="75.5"/>
-                        <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="18"/>
+                        <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="20"/>
                         <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
@@ -1504,7 +1504,7 @@
                     </label>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" text="事件聚焦" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lrt-Ub-Des">
                         <rect key="frame" x="16" y="64" width="288" height="230.5"/>
-                        <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="18"/>
+                        <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="20"/>
                         <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
                     </label>

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

@@ -610,7 +610,6 @@
 #pragma mark - Notification
 - (void)recviveChaoSongRen:(NSNotification *)notification{
     NSMutableArray <SelectModel *>* array = notification.userInfo[@"selectPeople"];
-    
     NSMutableArray <SelectModel *>* array0 = self.selectArray;
     NSMutableArray <SelectModel *>* array1 = notification.userInfo[@"selectPeople"];
     if (array0.count == 0) {

smartRhino/Project/VCModel/Home/OtherHomeVC/MyTDTopic/View/TopicBookCell.h

@@ -20,6 +20,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (weak, nonatomic) IBOutlet UIButton *enterBtn;
 @property (weak, nonatomic) IBOutlet UIImageView *rightV;
 @property (weak, nonatomic) IBOutlet UIImageView *IsTopV;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *width;
 
 + (TopicBookCell *)configCell0:(UITableView *)tableView indexPath:(NSIndexPath *)indexPath;
 + (TopicBookCell *)configCell1:(UITableView *)tableView indexPath:(NSIndexPath *)indexPath;

smartRhino/Project/VCModel/Home/OtherHomeVC/MyTDTopic/View/TopicBookCell.xib

@@ -18,26 +18,25 @@
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="公开" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mmc-qm-fSl">
-                        <rect key="frame" x="78" y="24.5" width="35" height="21"/>
-                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                        <rect key="frame" x="75" y="23.5" width="39" height="23"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="19"/>
                         <color key="textColor" red="0.039215686274509803" green="0.039215686274509803" blue="0.039215686274509803" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="find_1" translatesAutoresizingMaskIntoConstraints="NO" id="z9j-iT-NNm">
-                        <rect key="frame" x="15" y="17.5" width="40" height="35"/>
+                        <rect key="frame" x="15" y="17.5" width="37" height="35"/>
                         <constraints>
-                            <constraint firstAttribute="width" constant="40" id="3p7-dx-TI4"/>
-                            <constraint firstAttribute="height" constant="35" id="Gt9-g1-xc0"/>
+                            <constraint firstAttribute="width" constant="37" id="3p7-dx-TI4"/>
                         </constraints>
                     </imageView>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Sqv-5a-YhQ">
-                        <rect key="frame" x="283" y="27.5" width="8" height="15"/>
+                        <rect key="frame" x="284.5" y="27.5" width="8" height="15"/>
                         <fontDescription key="fontDescription" type="system" pointSize="12"/>
                         <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
-                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Book_rightjian_icon" translatesAutoresizingMaskIntoConstraints="NO" id="Dcm-po-vEH">
-                        <rect key="frame" x="297" y="28" width="8" height="14"/>
+                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="chatmsg_rightArrow_icon" translatesAutoresizingMaskIntoConstraints="NO" id="Dcm-po-vEH">
+                        <rect key="frame" x="298.5" y="29" width="6.5" height="12"/>
                     </imageView>
                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ZjR-y9-VGl">
                         <rect key="frame" x="15" y="69.5" width="305" height="0.5"/>
@@ -47,7 +46,7 @@
                         </constraints>
                     </view>
                     <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Asn-JS-qgQ">
-                        <rect key="frame" x="261" y="21.5" width="30" height="27"/>
+                        <rect key="frame" x="262.5" y="21.5" width="30" height="27"/>
                         <fontDescription key="fontDescription" type="system" pointSize="12"/>
                         <state key="normal" title="进入">
                             <color key="titleColor" red="0.22352941176470587" green="0.47450980392156861" blue="0.82745098039215681" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -79,6 +78,7 @@
                 <outlet property="lineV" destination="ZjR-y9-VGl" id="ZnM-0h-nOd"/>
                 <outlet property="rightV" destination="Dcm-po-vEH" id="ZuA-nv-ibI"/>
                 <outlet property="titleL" destination="mmc-qm-fSl" id="8cn-8R-q3f"/>
+                <outlet property="width" destination="KZD-MA-kNu" id="Adk-Ms-3is"/>
             </connections>
             <point key="canvasLocation" x="137.68115942028987" y="152.67857142857142"/>
         </tableViewCell>
@@ -90,26 +90,25 @@
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="公开" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="DJF-YH-X9q">
-                        <rect key="frame" x="78" y="10" width="35" height="21"/>
-                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                        <rect key="frame" x="75" y="8" width="39" height="23"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="19"/>
                         <color key="textColor" red="0.039215686274509803" green="0.039215686274509803" blue="0.039215686274509803" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="find_1" translatesAutoresizingMaskIntoConstraints="NO" id="GAY-UR-qLH">
-                        <rect key="frame" x="15" y="17.5" width="40" height="35"/>
+                        <rect key="frame" x="15" y="17.5" width="37" height="35"/>
                         <constraints>
-                            <constraint firstAttribute="height" constant="35" id="C9W-C0-hYZ"/>
-                            <constraint firstAttribute="width" constant="40" id="FFI-8Y-Zr5"/>
+                            <constraint firstAttribute="width" constant="37" id="FFI-8Y-Zr5"/>
                         </constraints>
                     </imageView>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="GvF-zh-k1F">
-                        <rect key="frame" x="283" y="27.5" width="8" height="15"/>
+                        <rect key="frame" x="284.5" y="27.5" width="8" height="15"/>
                         <fontDescription key="fontDescription" type="system" pointSize="12"/>
                         <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
-                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Book_rightjian_icon" translatesAutoresizingMaskIntoConstraints="NO" id="e2H-4o-iv7">
-                        <rect key="frame" x="297" y="28" width="8" height="14"/>
+                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="chatmsg_rightArrow_icon" translatesAutoresizingMaskIntoConstraints="NO" id="e2H-4o-iv7">
+                        <rect key="frame" x="298.5" y="29" width="6.5" height="12"/>
                     </imageView>
                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="7Vu-bS-qYf">
                         <rect key="frame" x="15" y="69.5" width="305" height="0.5"/>
@@ -119,20 +118,20 @@
                         </constraints>
                     </view>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="公开" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6Xz-7t-WEN">
-                        <rect key="frame" x="78" y="39" width="25" height="14.5"/>
-                        <fontDescription key="fontDescription" type="system" pointSize="12"/>
+                        <rect key="frame" x="75" y="39" width="29" height="17"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="14"/>
                         <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
                     <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="bmw-do-RAQ">
-                        <rect key="frame" x="261" y="21.5" width="30" height="27"/>
+                        <rect key="frame" x="262.5" y="21.5" width="30" height="27"/>
                         <fontDescription key="fontDescription" type="system" pointSize="12"/>
                         <state key="normal" title="进入">
                             <color key="titleColor" red="0.22352941179999999" green="0.47450980390000003" blue="0.82745098039999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         </state>
                     </button>
                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="置顶" translatesAutoresizingMaskIntoConstraints="NO" id="bKH-FT-Ndp">
-                        <rect key="frame" x="118" y="12.5" width="30" height="16"/>
+                        <rect key="frame" x="119" y="11.5" width="30" height="16"/>
                     </imageView>
                 </subviews>
                 <constraints>
@@ -176,16 +175,15 @@
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="公开" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="f3Q-O4-ynD">
-                        <rect key="frame" x="109" y="10" width="35" height="21"/>
-                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                        <rect key="frame" x="106" y="8" width="39" height="23"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="19"/>
                         <color key="textColor" red="0.039215686270000001" green="0.039215686270000001" blue="0.039215686270000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="find_1" translatesAutoresizingMaskIntoConstraints="NO" id="Nhj-AJ-6ky">
-                        <rect key="frame" x="46" y="17.5" width="40" height="35"/>
+                        <rect key="frame" x="46" y="17.5" width="37" height="35"/>
                         <constraints>
-                            <constraint firstAttribute="width" constant="40" id="3ke-KB-xbX"/>
-                            <constraint firstAttribute="height" constant="35" id="8sd-K0-avg"/>
+                            <constraint firstAttribute="width" constant="37" id="3ke-KB-xbX"/>
                         </constraints>
                     </imageView>
                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="JR3-Vp-vAS">
@@ -196,8 +194,8 @@
                         </constraints>
                     </view>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="公开" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JVt-T5-eOu">
-                        <rect key="frame" x="109" y="39" width="25" height="14.5"/>
-                        <fontDescription key="fontDescription" type="system" pointSize="12"/>
+                        <rect key="frame" x="106" y="39" width="29" height="17"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="14"/>
                         <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
@@ -206,7 +204,7 @@
                         <state key="normal" image="sendinfo_no"/>
                     </button>
                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="置顶" translatesAutoresizingMaskIntoConstraints="NO" id="yiG-ii-qag">
-                        <rect key="frame" x="149" y="12.5" width="30" height="16"/>
+                        <rect key="frame" x="150" y="11.5" width="30" height="16"/>
                     </imageView>
                 </subviews>
                 <constraints>
@@ -238,7 +236,7 @@
         </tableViewCell>
     </objects>
     <resources>
-        <image name="Book_rightjian_icon" width="8" height="14"/>
+        <image name="chatmsg_rightArrow_icon" width="6.5" height="12"/>
         <image name="find_1" width="37" height="32"/>
         <image name="sendinfo_no" width="38" height="38"/>
         <image name="置顶" width="30" height="16"/>

smartRhino/Project/VCModel/My_Center/Controller/ColletionVC/Cell/MyFavoriteViewCell.xib

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097.2" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
@@ -18,12 +18,12 @@
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="文件夹类型" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zTN-8G-7ZF">
-                        <rect key="frame" x="65" y="10" width="82" height="20"/>
+                        <rect key="frame" x="65" y="10" width="92" height="21.5"/>
                         <constraints>
                             <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="20" id="0dd-qj-S2w"/>
-                            <constraint firstAttribute="width" relation="lessThanOrEqual" constant="150" id="qAK-PV-b2s"/>
+                            <constraint firstAttribute="width" relation="lessThanOrEqual" constant="180" id="qAK-PV-b2s"/>
                         </constraints>
-                        <fontDescription key="fontDescription" type="system" pointSize="16"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="18"/>
                         <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
@@ -53,9 +53,9 @@
                         <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" verticalHuggingPriority="252" text="公开" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="c3p-qg-gy4">
-                        <rect key="frame" x="65" y="38" width="25" height="11.5"/>
-                        <fontDescription key="fontDescription" type="system" pointSize="12"/>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="252" verticalCompressionResistancePriority="749" text="公开" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="c3p-qg-gy4">
+                        <rect key="frame" x="65" y="39.5" width="29" height="10"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="14"/>
                         <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
@@ -65,7 +65,7 @@
                         <state key="normal" title="进入"/>
                     </button>
                     <imageView hidden="YES" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="置顶" translatesAutoresizingMaskIntoConstraints="NO" id="ugw-YR-cOk">
-                        <rect key="frame" x="157" y="12" width="30" height="16"/>
+                        <rect key="frame" x="167" y="13" width="30" height="16"/>
                     </imageView>
                 </subviews>
                 <constraints>
@@ -143,7 +143,7 @@
                         <constraints>
                             <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="29.5" id="fhu-Iu-TVD"/>
                         </constraints>
-                        <fontDescription key="fontDescription" type="system" pointSize="16"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="18"/>
                         <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
@@ -282,12 +282,12 @@
                         <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
-                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="事件聚焦" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="IEM-eC-6Uw">
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="749" text="事件聚焦" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="IEM-eC-6Uw">
                         <rect key="frame" x="16" y="67" width="288" height="19.5"/>
                         <constraints>
                             <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="19.5" id="Nn8-Li-bVO"/>
                         </constraints>
-                        <fontDescription key="fontDescription" type="system" pointSize="16"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="18"/>
                         <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
@@ -379,7 +379,7 @@
                         <constraints>
                             <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="22" id="iFs-oR-VgV"/>
                         </constraints>
-                        <fontDescription key="fontDescription" type="system" pointSize="16"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="18"/>
                         <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
                         <userDefinedRuntimeAttributes>
@@ -527,7 +527,7 @@
                         <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
-                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="事件聚焦" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Njl-FN-f5s">
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="749" text="事件聚焦" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Njl-FN-f5s">
                         <rect key="frame" x="16" y="67" width="288" height="21.5"/>
                         <constraints>
                             <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="19.5" id="KUK-Pb-VmM"/>
@@ -689,7 +689,7 @@
                         <constraints>
                             <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="29.5" id="sOK-h8-hRc"/>
                         </constraints>
-                        <fontDescription key="fontDescription" type="system" pointSize="16"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="18"/>
                         <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
@@ -833,7 +833,7 @@
                         <constraints>
                             <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="29.5" id="J77-3f-9D7"/>
                         </constraints>
-                        <fontDescription key="fontDescription" type="system" pointSize="16"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="18"/>
                         <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
@@ -992,7 +992,7 @@
                         <constraints>
                             <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="29.5" id="twL-Wc-YWI"/>
                         </constraints>
-                        <fontDescription key="fontDescription" type="system" pointSize="16"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="18"/>
                         <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
@@ -1096,12 +1096,12 @@
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="事件聚焦" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yIn-kM-NG5">
-                        <rect key="frame" x="88" y="10" width="65.5" height="20"/>
+                        <rect key="frame" x="88" y="10" width="73.5" height="21.5"/>
                         <constraints>
                             <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="20" id="Iu5-B0-KUs"/>
                             <constraint firstAttribute="width" relation="lessThanOrEqual" constant="150" id="cbi-xa-9RE"/>
                         </constraints>
-                        <fontDescription key="fontDescription" type="system" pointSize="16"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="18"/>
                         <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
@@ -1119,8 +1119,8 @@
                             <constraint firstAttribute="height" constant="0.5" id="OrH-Se-Nuu"/>
                         </constraints>
                     </view>
-                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="252" text="公开" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="n1w-V2-6rb">
-                        <rect key="frame" x="88" y="38" width="25" height="10.5"/>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="252" verticalCompressionResistancePriority="749" text="公开" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="n1w-V2-6rb">
+                        <rect key="frame" x="88" y="39.5" width="25" height="9"/>
                         <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"/>
@@ -1157,7 +1157,7 @@
                         <rect key="frame" x="326" y="23.5" width="7" height="12"/>
                     </imageView>
                     <imageView hidden="YES" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="置顶" translatesAutoresizingMaskIntoConstraints="NO" id="enU-cb-gfk">
-                        <rect key="frame" x="163.5" y="12" width="30" height="16"/>
+                        <rect key="frame" x="171.5" y="13" width="30" height="16"/>
                     </imageView>
                 </subviews>
                 <constraints>
@@ -1241,7 +1241,7 @@
                         <constraints>
                             <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="29.5" id="s54-4j-4WM"/>
                         </constraints>
-                        <fontDescription key="fontDescription" type="system" pointSize="16"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="18"/>
                         <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
@@ -1389,12 +1389,12 @@
                         <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
-                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="事件聚焦" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LAA-GK-LDa">
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="749" text="事件聚焦" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LAA-GK-LDa">
                         <rect key="frame" x="42" y="67" width="236" height="19.5"/>
                         <constraints>
                             <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="19.5" id="mMv-Jg-kJ9"/>
                         </constraints>
-                        <fontDescription key="fontDescription" type="system" pointSize="16"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="18"/>
                         <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
@@ -1503,7 +1503,7 @@
                         <constraints>
                             <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="22" id="CLR-kk-zFB"/>
                         </constraints>
-                        <fontDescription key="fontDescription" type="system" pointSize="16"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="18"/>
                         <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
@@ -1811,7 +1811,7 @@
                         <constraints>
                             <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="29.5" id="shV-05-9Ln"/>
                         </constraints>
-                        <fontDescription key="fontDescription" type="system" pointSize="16"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="18"/>
                         <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
@@ -1989,7 +1989,7 @@
                         <constraints>
                             <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="29.5" id="Vqd-SB-YxQ"/>
                         </constraints>
-                        <fontDescription key="fontDescription" type="system" pointSize="16"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="18"/>
                         <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
@@ -2151,7 +2151,7 @@
                         <constraints>
                             <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="29.5" id="nNi-lS-5P7"/>
                         </constraints>
-                        <fontDescription key="fontDescription" type="system" pointSize="16"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="18"/>
                         <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
@@ -2273,22 +2273,22 @@
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="252" text="文章类型" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Up9-8C-BKL">
-                        <rect key="frame" x="20" y="13" width="340" height="19.5"/>
-                        <fontDescription key="fontDescription" type="system" pointSize="16"/>
+                        <rect key="frame" x="20" y="13" width="340" height="21.5"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="18"/>
                         <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rNt-Md-P5u">
-                        <rect key="frame" x="20" y="45.5" width="31" height="32"/>
+                        <rect key="frame" x="20" y="47.5" width="31" height="30"/>
                         <fontDescription key="fontDescription" type="system" pointSize="12"/>
                         <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_browse" translatesAutoresizingMaskIntoConstraints="NO" id="BVG-PB-tNl">
-                        <rect key="frame" x="56" y="57" width="12.5" height="9"/>
+                        <rect key="frame" x="56" y="58" width="12.5" height="9"/>
                     </imageView>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lnO-4f-UOX">
-                        <rect key="frame" x="73.5" y="54.5" width="31" height="14"/>
+                        <rect key="frame" x="73.5" y="55.5" width="31" height="14"/>
                         <fontDescription key="fontDescription" type="system" pointSize="12"/>
                         <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <nil key="highlightedColor"/>

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

@@ -34,7 +34,8 @@
 #import "MailListDetailVC.h"
 #import "ShareListVC.h"
 #import "MyTDGroupView.h"
-
+#import "TopicBookCell.h"
+#import "NoteDraftVC.h"
 @interface NoteBookVC ()<UITableViewDataSource,UITableViewDelegate,NoteBookShareVCDelegate>
 @property (weak, nonatomic) IBOutlet UIButton *rightAddButton;
 @property (weak, nonatomic) IBOutlet UIButton *rightEditBtn;
@@ -69,6 +70,7 @@
 @property (strong, nonatomic) NoteBookCommentVC *noteBookCommentVC;
 @property (strong, nonatomic) FlowAttachmentsModel * returnModel;
 @property (nonatomic,assign) NSInteger selectCount;
+@property (nonatomic,assign) NSInteger DraftCount;
 @end
 
 @implementation NoteBookVC
@@ -157,8 +159,6 @@
         MyNoteBookModel *listModel = [[MyNoteBookModel alloc] initWithDictionary:responseObject error:nil];
         weakSelf.totalPage = listModel.Total;
         [weakSelf.noteBookArray addObjectsFromArray:listModel.Items];
-        //        weakSelf.dataArray = weakSelf.noteBookArray.mutableCopy;
-        
         for (MyNoteBookSubModel * model in weakSelf.noteBookArray) {
             for (MyNoteBookSubModel * fModel in sArray) {
                 if (model.Id == fModel.Id) {
@@ -166,6 +166,13 @@
                 }
             }
         }
+        if (!weakSelf.isSubVC) {
+            MyNoteBookSubModel * addModel = [[MyNoteBookSubModel alloc] init];
+            addModel.AttributeValue = 100;
+            addModel.Name = @"草稿箱";
+            addModel.FileCount = [responseObject[@"DraftCount"] integerValue];
+            [weakSelf.noteBookArray insertObject:addModel atIndex:0];
+        }
         dispatch_async(dispatch_get_main_queue(), ^{
             [weakSelf.tableView.mj_header endRefreshing];
             [weakSelf.tableView.mj_footer endRefreshing];
@@ -520,9 +527,41 @@
     return 1;
 }
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section{
+
     return self.noteBookArray.count;
-}
 
+}
+- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    MyNoteBookSubModel *model  = self.noteBookArray[indexPath.row];
+    switch (self.operationStateEnum) {
+        case OperationStateEnum1:{
+            switch (model.AttributeValue){
+                case 100:
+                {
+                    return 0.f;
+                }break;
+                default:{
+                    return UITableViewAutomaticDimension;
+                }break;
+            }
+        }break;
+        case OperationStateEnum0:{
+            return UITableViewAutomaticDimension;
+        }break;
+        default:{
+            switch (model.AttributeValue){
+                case 100:
+                {
+                    return 0.f;
+                }break;
+                default:{
+                    return UITableViewAutomaticDimension;
+                }break;
+            }break;
+        }
+    }
+}
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath{
     WS(weakSelf);
     [self setOperationAllButton];
@@ -1665,7 +1704,7 @@
                             break;
                     }
                 }break;
-                default:{
+                case 2:{
                     MyFavoriteViewCell *cell = [MyFavoriteViewCell configCell0:tableView indexPath:indexPath];
                     switch (model.RoleId) {
                         case 1:
@@ -1694,6 +1733,15 @@
                     cell.selectionStyle = UITableViewCellSelectionStyleNone;
                             return cell;
                 }break;
+                default:{
+                    TopicBookCell * cell = [TopicBookCell configCell0:tableView indexPath:indexPath];
+                    cell.titleL.text = model.Name;
+                    cell.imagV.image = IMG(@"Draft_Icon");
+                    cell.width.constant = 13.f;
+                    cell.countL.text = [NSString stringWithFormat:@"%ld",model.FileCount];
+                    cell.enterBtn.hidden = YES;
+                    return cell;
+                }break;
             }
         }break;
         default:{
@@ -2454,6 +2502,10 @@
                     [self.navigationController pushViewController:vc animated:YES];
                 }break;
                 default:
+                {
+//                    NoteDraftVC * vc = [NoteDraftVC initNoteDraftVC];
+//                    [self.navigationController pushViewController:vc animated:YES];
+                }
                     break;
             }
         }break;

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

@@ -115,8 +115,8 @@
 }
 - (void)getDataList{
     WS(weakSelf);
-    [[HttpManager sharedHttpManager] POSTUrl:Host(API_NoteBook) parameters:@{@"FolderId":@(self.FolderId),@"Page":@(1),@"PerPage":@(99999999),@"VisitUserId":@(self.VisitUserId),@"SearchKey":@"",@"Sort":@""} responseStyle:JOSN success:^(id  _Nonnull responseObject) {
-        //    [[HttpManager sharedHttpManager] POSTUrl:Host(API_NoteBook) parameters:@{@"FolderId":@(self.FolderId),@"Page":@(self.currentPage),@"PerPage":@(10),@"VisitUserId":@(self.VisitUserId),@"SearchKey":@"",@"Sort":@""} responseStyle:JOSN success:^(id  _Nonnull responseObject) {
+    [weakSelf.noteBookArray removeAllObjects];
+    [[HttpManager sharedHttpManager] POSTUrl:Host(API_NoteBook) parameters:@{@"FolderId":@(self.FolderId),@"Page":@(1),@"PerPage":@(99999999),@"VisitUserId":@(self.VisitUserId),@"SearchKey":@"",@"Sort":@"",@"TypeValue":@(self.TypeValue)} responseStyle:JOSN success:^(id  _Nonnull responseObject) {
         NSLog(@"笔记列表数据 %@",responseObject);
         MyNoteBookModel *listModel = [[MyNoteBookModel alloc] initWithDictionary:responseObject error:nil];
         weakSelf.totalPage = listModel.Total;

smartRhino/Project/VCModel/My_Center/Controller/NoteBook/View/NoteBookCell.xib

@@ -40,7 +40,7 @@
                     </label>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="笔记包含小组" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dyl-TL-3df">
                         <rect key="frame" x="16" y="67.5" width="288" height="143"/>
-                        <fontDescription key="fontDescription" type="system" pointSize="18"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="20"/>
                         <color key="textColor" red="0.039215686274509803" green="0.039215686274509803" blue="0.039215686274509803" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
@@ -207,7 +207,7 @@
                     </label>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="笔记包含小组" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="B7M-jR-123">
                         <rect key="frame" x="16" y="67.5" width="288" height="141.5"/>
-                        <fontDescription key="fontDescription" type="system" pointSize="18"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="20"/>
                         <color key="textColor" red="0.039215686270000001" green="0.039215686270000001" blue="0.039215686270000001" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
@@ -390,7 +390,7 @@
                     </label>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="笔记包含小组" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="QXm-bX-Ebp">
                         <rect key="frame" x="16" y="67.5" width="288" height="119"/>
-                        <fontDescription key="fontDescription" type="system" pointSize="18"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="20"/>
                         <color key="textColor" red="0.039215686270000001" green="0.039215686270000001" blue="0.039215686270000001" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
@@ -577,7 +577,7 @@
                     </label>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="笔记包含小组" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Rlm-JQ-4tz">
                         <rect key="frame" x="16" y="67.5" width="288" height="189"/>
-                        <fontDescription key="fontDescription" type="system" pointSize="18"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="20"/>
                         <color key="textColor" red="0.039215686270000001" green="0.039215686270000001" blue="0.039215686270000001" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
@@ -789,7 +789,7 @@
                     </label>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="笔记包含小组" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1Cl-AZ-6rU">
                         <rect key="frame" x="16" y="67.5" width="288" height="158"/>
-                        <fontDescription key="fontDescription" type="system" pointSize="18"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="20"/>
                         <color key="textColor" red="0.039215686270000001" green="0.039215686270000001" blue="0.039215686270000001" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
@@ -1048,7 +1048,7 @@
                         <constraints>
                             <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="29.5" id="nlW-qy-ufa"/>
                         </constraints>
-                        <fontDescription key="fontDescription" type="system" pointSize="18"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="20"/>
                         <color key="textColor" red="0.039215686270000001" green="0.039215686270000001" blue="0.039215686270000001" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
@@ -1375,8 +1375,8 @@
                         </userDefinedRuntimeAttributes>
                     </label>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="笔记包含小组" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="OCX-6S-0eN">
-                        <rect key="frame" x="16" y="67.5" width="288" height="21.5"/>
-                        <fontDescription key="fontDescription" type="system" pointSize="18"/>
+                        <rect key="frame" x="16" y="67.5" width="288" height="24"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="20"/>
                         <color key="textColor" red="0.039215686270000001" green="0.039215686270000001" blue="0.039215686270000001" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
                         <userDefinedRuntimeAttributes>
@@ -1384,7 +1384,7 @@
                         </userDefinedRuntimeAttributes>
                     </label>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" text="" lineBreakMode="tailTruncation" numberOfLines="5" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Cj7-fa-RHP">
-                        <rect key="frame" x="15" y="99" width="290" height="26.5"/>
+                        <rect key="frame" x="15" y="101.5" width="290" height="24"/>
                         <fontDescription key="fontDescription" type="system" pointSize="16"/>
                         <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
@@ -1544,7 +1544,7 @@
                     </label>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="a2O-7B-mRD">
                         <rect key="frame" x="16" y="57" width="288" height="56.5"/>
-                        <fontDescription key="fontDescription" type="system" pointSize="18"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="20"/>
                         <color key="textColor" red="0.039215686270000001" green="0.039215686270000001" blue="0.039215686270000001" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
                         <userDefinedRuntimeAttributes>
@@ -1764,7 +1764,7 @@
                     </label>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="笔记包含小组" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LCK-Qb-M3n">
                         <rect key="frame" x="42" y="68" width="262" height="273.5"/>
-                        <fontDescription key="fontDescription" type="system" pointSize="18"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="20"/>
                         <color key="textColor" red="0.039215686270000001" green="0.039215686270000001" blue="0.039215686270000001" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
@@ -1876,7 +1876,7 @@
                     </label>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="笔记包含小组" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3UJ-3I-acZ">
                         <rect key="frame" x="42" y="67.5" width="262" height="165"/>
-                        <fontDescription key="fontDescription" type="system" pointSize="18"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="20"/>
                         <color key="textColor" red="0.039215686270000001" green="0.039215686270000001" blue="0.039215686270000001" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
@@ -2008,7 +2008,7 @@
                     </label>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="笔记包含小组" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="IkO-Zr-Ice">
                         <rect key="frame" x="42" y="67.5" width="262" height="121"/>
-                        <fontDescription key="fontDescription" type="system" pointSize="18"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="20"/>
                         <color key="textColor" red="0.039215686270000001" green="0.039215686270000001" blue="0.039215686270000001" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
@@ -2144,7 +2144,7 @@
                     </label>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="笔记包含小组" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1XC-IX-oks">
                         <rect key="frame" x="42" y="67.5" width="262" height="105.5"/>
-                        <fontDescription key="fontDescription" type="system" pointSize="18"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="20"/>
                         <color key="textColor" red="0.039215686270000001" green="0.039215686270000001" blue="0.039215686270000001" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
@@ -2305,7 +2305,7 @@
                     </label>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="笔记包含小组" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="HIP-os-lRv">
                         <rect key="frame" x="58" y="67.5" width="246" height="198.5"/>
-                        <fontDescription key="fontDescription" type="system" pointSize="18"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="20"/>
                         <color key="textColor" red="0.039215686270000001" green="0.039215686270000001" blue="0.039215686270000001" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
@@ -2513,7 +2513,7 @@
                         <constraints>
                             <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="29.5" id="7VN-hT-aaT"/>
                         </constraints>
-                        <fontDescription key="fontDescription" type="system" pointSize="18"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="20"/>
                         <color key="textColor" red="0.039215686270000001" green="0.039215686270000001" blue="0.039215686270000001" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
@@ -2789,8 +2789,8 @@
                         </userDefinedRuntimeAttributes>
                     </label>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="笔记包含小组" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hUx-9i-WnJ">
-                        <rect key="frame" x="42" y="57" width="223" height="21.5"/>
-                        <fontDescription key="fontDescription" type="system" pointSize="18"/>
+                        <rect key="frame" x="42" y="57" width="223" height="24"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="20"/>
                         <color key="textColor" red="0.039215686270000001" green="0.039215686270000001" blue="0.039215686270000001" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
                         <userDefinedRuntimeAttributes>
@@ -2817,7 +2817,7 @@
                         <state key="selected" image="sendinfo_yes"/>
                     </button>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" text="" lineBreakMode="tailTruncation" numberOfLines="5" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="SgI-rB-yEW">
-                        <rect key="frame" x="42" y="88.5" width="223" height="22"/>
+                        <rect key="frame" x="42" y="91" width="223" height="19.5"/>
                         <fontDescription key="fontDescription" type="system" pointSize="16"/>
                         <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
@@ -2898,7 +2898,7 @@
                     </label>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="笔记包含小组" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bAR-Vv-ogz">
                         <rect key="frame" x="42" y="57" width="223" height="76.5"/>
-                        <fontDescription key="fontDescription" type="system" pointSize="18"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="20"/>
                         <color key="textColor" red="0.039215686270000001" green="0.039215686270000001" blue="0.039215686270000001" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
                         <userDefinedRuntimeAttributes>

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

@@ -106,7 +106,7 @@
     
     UILabel * titleL = [UILabel new];
     titleL.textColor = UIColorHex(0x0A0A0A);
-    titleL.font = [UIFont systemFontOfSize:15];
+    titleL.font = [UIFont systemFontOfSize:14];
     titleL.text = @"我的小组";
     [self.groupView addSubview:titleL];
     [titleL mas_makeConstraints:^(MASConstraintMaker *make) {

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

@@ -1167,7 +1167,7 @@
         vc.ParentId = model.FolderResult.Id;
         vc.myTitle = model.FolderResult.FolderName;
         vc.TypeValue = 1;
-        vc.VisitUserId = model.UserId;
+        vc.isSubVC = model.FolderResult.Id == 0 ? NO : YES;
         vc.hidesBottomBarWhenPushed = YES;
         [self.navigationController pushViewController:vc animated:YES];
     }else{
@@ -1177,6 +1177,7 @@
         vc.Author = model.UserName;
         vc.myTitle = model.FolderResult.FolderName;
         vc.VisitUserId = model.UserId;
+        vc.TypeValue = 1;
         vc.hidesBottomBarWhenPushed = YES;
         [self.navigationController pushViewController:vc animated:YES];
     }

smartRhino/Project/VCModel/WorkFlow/AddLookUpUserSecondVC.m

@@ -34,6 +34,8 @@
 @property (nonatomic, strong) UIView      *SortView;
 @property (nonatomic, strong) UIButton    *allSelectBtn;
 @property (nonatomic, strong) UILabel     *selectCountL;
+@property (nonatomic, assign) BOOL         allSelected;
+
 @end
 
 @implementation AddLookUpUserSecondVC
@@ -60,13 +62,8 @@
     }];
     WS(weakSelf);
     UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithActionBlock:^(id  _Nonnull sender) {
-        MailListSearchVC *vc = [[MailListSearchVC alloc] init];
-        vc.notChangeColor = weakSelf.notSearchChangeColor;
-        vc.IsAddUser = YES;
-        vc.isShow = weakSelf.isShow;
-        vc.UserIds = weakSelf.UserIds;
-        vc.DepartmentId = weakSelf.indexId;
-        vc.SearchType = weakSelf.isMyGroup;
+        MailGroupListSerachVC *vc = [[MailGroupListSerachVC alloc] init];
+        vc.IsSelect = YES;
         [weakSelf.navigationController pushViewController:vc animated:YES];
     }];
     [self.listHeaderVIew addGestureRecognizer:tap];
@@ -115,7 +112,7 @@
 
 //全选操作
 - (void)selectedAction{
-    if (self.isAllSelected) {
+    if (self.allSelected) {
         [self.allSelectBtn setImage:IMG(@"sendinfo_yes") forState:UIControlStateNormal];
     }else{
         [self.allSelectBtn setImage:IMG(@"sendinfo_no") forState:UIControlStateNormal];
@@ -125,7 +122,7 @@
         for(NSInteger i = 0 ; i < 2 ; i++){
             if (i == 0) {
                 for (Department *depart in self.departSourceDataArray) {
-                     depart.hadSelected = self.isAllSelected;
+                     depart.hadSelected = self.allSelected;
                     if (depart.hadSelected) {
                         count ++;
                     }
@@ -134,7 +131,7 @@
             }
             if (i == 1) {
                 for (SelectModel * model in self.usersSourceDataArray) {
-                    model.hadSelected = self.isAllSelected;
+                    model.hadSelected = self.allSelected;
                     if (model.hadSelected) {
                         count ++;
                     }
@@ -149,7 +146,7 @@
             for (id sub in array) {
                 if ([sub isKindOfClass:[MailModel class]]) {
                     MailModel * model = (MailModel *)sub;
-                    model.IsSelect = self.isAllSelected;
+                    model.IsSelect = self.allSelected;
                     if (model.IsSelect) {
                         count ++;
                     }
@@ -157,7 +154,7 @@
                 }
                 if ([sub isKindOfClass:[SelectModel class]]) {
                     SelectModel * model = (SelectModel *)sub;
-                    model.hadSelected = self.isAllSelected;
+                    model.hadSelected = self.allSelected;
                     if (model.hadSelected) {
                         count ++;
                     }
@@ -181,41 +178,22 @@
 }
 
 - (void)confirmAction:(UIButton*)btn{
-        NSMutableDictionary * paraDict = [NSMutableDictionary dictionary];
-        if (self.dataSourceArray.count > 0) {
-            NSMutableArray * mArray = [NSMutableArray array];
-            for (NSArray * array in self.dataSourceArray) {
-                for (id sub in array) {
-                    if ([sub isKindOfClass:[MailModel class]]) {
-                        MailModel * model = (MailModel *)sub;
-                        if (model.IsSelect) {
-                            [mArray addObject:@{@"SourceType":@(model.TypeId),@"SourceId":@(model.Id),@"SourceTypeValue":@(model.TypeValue),@"SourceName":model.Name}];
-                        }
-                    }
-                    if ([sub isKindOfClass:[SelectModel class]]) {
-                        SelectModel * model = (SelectModel *)sub;
-                        if (model.hadSelected) {
-                            [mArray addObject:@{@"SourceType":@(model.TypeId),@"SourceId":@(model.Id),@"SourceTypeValue":@(model.TypeValue),@"SourceName":model.Name}];
-                        }
-                    }
-                }
-            }
-            if (mArray.count > 0) {
-                [paraDict setValue:mArray forKey:@"Item"];
-            }
-        }
-        if (self.departSourceDataArray.count > 0) {
-            NSMutableArray * mArray = [NSMutableArray array];
-            for (Department *model in self.departSourceDataArray) {
-                if (model.hadSelected) {
-                    [mArray addObject:@{@"SourceType":@(model.TypeId),@"SourceId":@(model.Id),@"SourceTypeValue":@(0),@"SourceName":model.Name}];
-                }
-            }
-            if (mArray.count > 0) {
-                [paraDict setValue:mArray forKey:@"Item"];
-            }
-        }
-        [self.selectArray removeAllObjects];
+    NSMutableArray * mailArray = [NSMutableArray arrayWithArray:USERDEFAULTSGET(MAILSELECT)];
+    NSMutableArray * chaoArray = [NSMutableArray array];
+    NSMutableDictionary * paraDict = [NSMutableDictionary dictionary];
+    NSMutableArray * mArray = [NSMutableArray array];
+    [self.selectArray removeAllObjects];
+    [mailArray enumerateObjectsUsingBlock:^(id  _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
+        SelectModel * sModel = (SelectModel*) [NSKeyedUnarchiver unarchiveObjectWithData:(NSData *)obj];
+        [chaoArray addObject:sModel];
+        [mArray addObject:@{@"SourceType":@(sModel.SourceType),@"SourceId":@(sModel.SourceId),@"SourceTypeValue":@(sModel.TypeValue),@"SourceName":sModel.SourceName}];
+    }];
+    if (self.isAllSelected) {
+        [[NSNotificationCenter defaultCenter] postNotificationName:NOTIFI_ChaoSongRen object:nil userInfo:@{@"selectPeople":chaoArray}];
+        [self back1];
+        return;
+    }else{
+        [paraDict setValue:mArray forKey:@"Item"];
         SHOWLOADING
         WS(weakSelf);
         [[HttpManager sharedHttpManager] POSTUrl:Host(API_APP_User_Middle) parameters:paraDict responseStyle:JOSN success:^(id  _Nonnull responseObject) {
@@ -234,124 +212,8 @@
         } failure:^(NSError * _Nonnull error) {
             SHOWERROR([ZYCTool handerResultData:error]);
         }];
-
-//    if (self.isAllSelected) {
-//        //获取所有被选中的分组
-//        NSMutableArray *groupIDArray = [NSMutableArray array];
-//        for (Department *model in self.departSourceDataArray) {
-//            if (model.hadSelected) {
-//                [groupIDArray addObject:model];
-//            }
-//        }
-//        for (SelectModel *mode in self.usersSourceDataArray) {
-//            if (mode.hadSelected) {
-//                mode.SourceType = 0;
-//                mode.SourceId = mode.UserId;
-//                mode.SourceName = mode.UserName;
-//                [self.selectArray addObject:mode];
-//            }
-//        }
-//        if (groupIDArray.count == 0) {
-//            NSLog(@"选中%@",self.selectArray);
-//            [[NSNotificationCenter defaultCenter] postNotificationName:NOTIFI_ChaoSongRen object:nil userInfo:@{@"selectPeople":self.selectArray}];
-//            [self back1];
-//            return;
-//        } else {
-//            NSMutableArray *selectedUsers = [[NSMutableArray alloc] init];
-//            //把部门转换为成员
-//            for (Department *model in groupIDArray) {
-//                SelectModel *selectModel = [[SelectModel alloc] init];
-//                selectModel.UserId = model.Id;
-//                selectModel.UserName = model.Name ? model.Name : model.GroupName;
-//                selectModel.SourceType = self.SourceType;
-//                selectModel.SourceId = model.Id;
-//                selectModel.SourceName = model.Name ? model.Name : model.GroupName;
-//                [selectedUsers addObject:selectModel];
-//                if ([model.Name isEqualToString:@"单位通讯录"]) {
-//                    selectModel.SourceType = 1;
-//                }else if ([model.Name isEqualToString:@"自建通讯录"]) {
-//                    selectModel.SourceType = 3;
-//                }
-//            }
-//            if (self.selectArray.count > 0) {
-//                [selectedUsers addObjectsFromArray:self.selectArray];
-//            }
-//            [[NSNotificationCenter defaultCenter] postNotificationName:NOTIFI_ChaoSongRen object:nil userInfo:@{@"selectPeople":selectedUsers}];
-//            [self back1];
-//            return;
-//        }
-//    }
-//    NSMutableArray *groupIDArray = [NSMutableArray array];
-//    for (Department *model in self.departSourceDataArray) {
-//        if (model.hadSelected) {
-//            [groupIDArray addObject:@(model.Id)];
-//        }
-//    }
-//    for (SelectModel *mode in self.usersSourceDataArray) {
-//        if (mode.hadSelected) {
-//            [self.selectArray addObject:mode];
-//        }
-//    }
-
-//    if (self.selectArray.count > 0) {
-//        NSLog(@"选中%@",self.selectArray);
-//        [[NSNotificationCenter defaultCenter] postNotificationName:NOTIFI_ChaoSongRen object:nil userInfo:@{@"selectPeople":self.selectArray}];
-//        [self back1];
-//        return;
-//    }else{
-//        NSMutableDictionary *dic = @{@"ItemId":groupIDArray}.mutableCopy;
-//        [dic setValue:@(self.isMyGroup) forKey:@"TypeId"];
-//        if (self.isDefalutPage == 1) {
-//            [dic setValue:@[@(0)] forKey:@"ItemId"];
-//            if (self.indexflag == 0) {
-//                if (self.departSourceDataArray.firstObject.hadSelected) {
-//                    [dic setValue:@(1) forKey:@"TypeId"];
-//                }else{
-//                    [dic setValue:@(2) forKey:@"TypeId"];
-//                }
-//            }else if (self.indexflag == 1) {
-//                if (self.departSourceDataArray.firstObject.hadSelected) {
-//                    [dic setValue:@(1) forKey:@"TypeId"];
-//                }else{
-//                    [dic setValue:@(2) forKey:@"TypeId"];
-//                }
-//            }else if (self.indexflag == 2){
-//                [dic setValue:@(1) forKey:@"TypeId"];
-//            }
-//        }
-//        NSLog(@"请求参数1%@",dic);
-//        [[HttpManager sharedHttpManager] POSTUrl:[NSString stringWithFormat:@"%@%@",BaseUrl,AddChaoSongRen_Post] parameters:dic responseStyle:JOSN success:^(id  _Nonnull responseObject) {
-//            REMOVESHOW
-//            for (NSDictionary *dict in responseObject) {
-//                SelectModel * model = [SelectModel modelWithDictionary:dict];
-//                model.UserId = model.Id;
-//                model.UserName = model.Name;
-//                model.SourceType = weakSelf.SourceType;
-//                model.SourceId = model.UserId;
-//                model.SourceName = model.UserName;
-//                [weakSelf.selectArray addObject:model];
-//            }
-//            [[NSNotificationCenter defaultCenter] postNotificationName:NOTIFI_ChaoSongRen object:nil userInfo:@{@"selectPeople":weakSelf.selectArray}];
-//            [weakSelf back1];
-//        } failure:^(NSError * _Nonnull error) {
-//            SHOWERROR([ZYCTool handerResultData:error]);
-//        }];
-        
-//    }
+    }
 }
-
-//- (void)setRIghtButtonTitle:(NSInteger)indeflag{
-//    [self.myNavigationBar.rightButton setTitle:[NSString stringWithFormat:@"确定(%ld)",(long)indeflag] forState:UIControlStateNormal];
-//    if (self.isDefalutPage == 1){
-//        if (indeflag == 2) {
-//            [self.myNavigationBar.backButton2 setTitle:@"取消全选" forState:UIControlStateNormal];
-//        }else{
-//            [self.myNavigationBar.backButton2 setTitle:@"全选" forState:UIControlStateNormal];
-//        }
-//    }else{
-//         [self.myNavigationBar.backButton2 setTitle:@"全选" forState:UIControlStateNormal];
-//    }
-//}
 #pragma mark - setter
 - (TDTableView *)myTableView{
     if (!_myTableView) {
@@ -533,47 +395,64 @@
     if (self.IsSubVC) {
         if (self.isDefalutPage == 1) {
             if (indexPath.row == 0) { //
+                Department *model = self.departSourceDataArray[indexPath.row];
                 AddLookUpUserSecondVC *vc = [[AddLookUpUserSecondVC alloc] init];
-                vc.indexId = self.departSourceDataArray[indexPath.row].Id;
-                vc.isDefalutPage = 2;
-                vc.isMyGroup = 1;
-                vc.SourceType = 1;
-                vc.IsSubVC = YES;
-                vc.isShow = self.isShow;
-                vc.UserIds = self.UserIds;
-                vc.titleStr = self.titleStr;
-                vc.grouperArray = self.grouperArray;
-                vc.isAllSelected = self.isAllSelected;
-                [self.navigationController pushViewController:vc animated:YES];
+                if (model.hadSelected) {
+                    model.hadSelected = !model.hadSelected;
+                    [self.myTableView reloadRow:indexPath.row inSection:indexPath.section withRowAnimation:UITableViewRowAnimationNone];
+                }else{
+                    vc.indexId = model.Id;
+                    vc.isDefalutPage = 2;
+                    vc.isMyGroup = 1;
+                    vc.SourceType = 1;
+                    vc.IsSubVC = YES;
+                    vc.isShow = self.isShow;
+                    vc.UserIds = self.UserIds;
+                    vc.titleStr = self.titleStr;
+                    vc.grouperArray = self.grouperArray;
+                    vc.isAllSelected = self.isAllSelected;
+                    [self.navigationController pushViewController:vc animated:YES];
+                }
             }else{
+                Department *model = self.departSourceDataArray[indexPath.row];
                 AddLookUpUserSecondVC *vc = [[AddLookUpUserSecondVC alloc] init];
-                vc.indexId = self.departSourceDataArray[indexPath.row].Id;
-                vc.isDefalutPage = 2;
-                vc.isMyGroup = 2;
-                vc.titleStr = self.titleStr;
-                vc.SourceType = 3;
-                vc.IsSubVC = YES;
-                vc.isShow = self.isShow;
-                vc.UserIds = self.UserIds;
-                vc.grouperArray = self.grouperArray;
-                vc.isAllSelected = self.isAllSelected;
-                [self.navigationController pushViewController:vc animated:YES];
+                if (model.hadSelected) {
+                    model.hadSelected = !model.hadSelected;
+                    [self.myTableView reloadRow:indexPath.row inSection:indexPath.section withRowAnimation:UITableViewRowAnimationNone];
+                }else{
+                    vc.indexId = model.Id;
+                    vc.isDefalutPage = 2;
+                    vc.isMyGroup = 2;
+                    vc.titleStr = self.titleStr;
+                    vc.SourceType = 3;
+                    vc.IsSubVC = YES;
+                    vc.isShow = self.isShow;
+                    vc.UserIds = self.UserIds;
+                    vc.grouperArray = self.grouperArray;
+                    vc.isAllSelected = self.isAllSelected;
+                    [self.navigationController pushViewController:vc animated:YES];
+                }
             }
         }else{
             if (indexPath.section == 0) {
-                AddLookUpUserSecondVC *vc = [[AddLookUpUserSecondVC alloc] init];
                 Department *model = self.departSourceDataArray[indexPath.row];
-                vc.indexId = model.Id;
-                vc.isDefalutPage = 2;
-                vc.IsSubVC = YES;
-                vc.isShow = self.isShow;
-                vc.UserIds = self.UserIds;
-                vc.titleStr = self.titleStr;
-                vc.isMyGroup = self.isMyGroup;
-                vc.SourceType = self.SourceType;
-                vc.grouperArray = self.grouperArray;
-                vc.isAllSelected = self.isAllSelected;
-                [self.navigationController pushViewController:vc animated:YES];
+                if (model.hadSelected) {
+                    model.hadSelected = !model.hadSelected;
+                    [self.myTableView reloadRow:indexPath.row inSection:indexPath.section withRowAnimation:UITableViewRowAnimationNone];
+                }else{
+                    AddLookUpUserSecondVC *vc = [[AddLookUpUserSecondVC alloc] init];
+                    vc.indexId = model.Id;
+                    vc.isDefalutPage = 2;
+                    vc.IsSubVC = YES;
+                    vc.isShow = self.isShow;
+                    vc.UserIds = self.UserIds;
+                    vc.titleStr = self.titleStr;
+                    vc.isMyGroup = self.isMyGroup;
+                    vc.SourceType = self.SourceType;
+                    vc.grouperArray = self.grouperArray;
+                    vc.isAllSelected = self.isAllSelected;
+                    [self.navigationController pushViewController:vc animated:YES];
+                }
             }else{
                 SelectModel *model = self.usersSourceDataArray[indexPath.row];
                 model.hadSelected = !model.hadSelected;
@@ -602,40 +481,58 @@
                     ShowDesVC * vc = [ShowDesVC initShowDesVC];
                     vc.dataSourceArray = model.Items.mutableCopy;
                     vc.IsSelect = YES;
+                    vc.IsSelectDes = self.isAllSelected;
                     [self.navigationController pushViewController:vc animated:YES];
                 }
             }
                 break;
             case MailListSysType:
             {
-                ShowSysVC * vc = [ShowSysVC initShowSysVC];
-                vc.dataSourceArray = model.Items.mutableCopy;
-                vc.IsSelect = YES;
-                [self.navigationController pushViewController:vc animated:YES];
+                if (model.IsSelect) {
+                    model.IsSelect = !model.IsSelect;
+                    [self.myTableView reloadRow:indexPath.row inSection:indexPath.section withRowAnimation:UITableViewRowAnimationNone];
+                }else{
+                    ShowSysVC * vc = [ShowSysVC initShowSysVC];
+                    vc.dataSourceArray = model.Items.mutableCopy;
+                    vc.IsSelect = YES;
+                    vc.IsSelectDes = self.isAllSelected;
+                    [self.navigationController pushViewController:vc animated:YES];
+                }
             }
                 break;
             case MailListOtherType:
             {
-                ShowUserVC * vc = [ShowUserVC initShowUserVC];
-                vc.IsSelect = YES;
-                vc.dataSourceArray = self.OtherArray.mutableCopy;
-                [self.navigationController pushViewController:vc animated:YES];
+                if (model.IsSelect) {
+                    model.IsSelect = !model.IsSelect;
+                    [self.myTableView reloadRow:indexPath.row inSection:indexPath.section withRowAnimation:UITableViewRowAnimationNone];
+                }else{
+                    ShowUserVC * vc = [ShowUserVC initShowUserVC];
+                    vc.IsSelect = YES;
+                    vc.IsSelectDes = self.isAllSelected;
+                    vc.dataSourceArray = self.OtherArray.mutableCopy;
+                    [self.navigationController pushViewController:vc animated:YES];
+                }
             }
                 break;
             default:
             {
-                AddLookUpUserSecondVC *vc = [[AddLookUpUserSecondVC alloc] init];
-                vc.indexId = self.departSourceDataArray[indexPath.row].Id;
-                vc.isDefalutPage = 2;
-                vc.isMyGroup = 2;
-                vc.titleStr = self.titleStr;
-                vc.SourceType = 3;
-                vc.IsSubVC = YES;
-                vc.isShow = self.isShow;
-                vc.UserIds = self.UserIds;
-                vc.grouperArray = self.grouperArray;
-                vc.isAllSelected = self.isAllSelected;
-                [self.navigationController pushViewController:vc animated:YES];
+                if (model.IsSelect) {
+                    model.IsSelect = !model.IsSelect;
+                    [self.myTableView reloadRow:indexPath.row inSection:indexPath.section withRowAnimation:UITableViewRowAnimationNone];
+                }else{
+                    AddLookUpUserSecondVC *vc = [[AddLookUpUserSecondVC alloc] init];
+                    vc.indexId = self.departSourceDataArray[indexPath.row].Id;
+                    vc.isDefalutPage = 2;
+                    vc.isMyGroup = 2;
+                    vc.titleStr = self.titleStr;
+                    vc.SourceType = 3;
+                    vc.IsSubVC = YES;
+                    vc.isShow = self.isShow;
+                    vc.UserIds = self.UserIds;
+                    vc.grouperArray = self.grouperArray;
+                    vc.isAllSelected = self.isAllSelected;
+                    [self.navigationController pushViewController:vc animated:YES];
+                }
             }
                 break;
         }
@@ -774,9 +671,9 @@
         MailModel * mModel = (MailModel *)model;
         SelectModel * sModel = [[SelectModel alloc] init];
         sModel.SourceType = mModel.TypeId;
-        sModel.SourceId = 0;
+        sModel.SourceId = mModel.Id;
         sModel.SourceName = mModel.Name;
-        sModel.TypeValue = 0;
+        sModel.TypeValue = mModel.TypeValue;
         sModel.hadSelected = mModel.IsSelect;
         return sModel;
     }
@@ -1047,7 +944,7 @@
     
     WS(weakSelf);
     [self.allSelectBtn setAction:^{
-        weakSelf.isAllSelected = !weakSelf.isAllSelected;
+        weakSelf.allSelected = !weakSelf.allSelected;
         [weakSelf selectedAction];
     }];
 }

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

@@ -28,11 +28,11 @@
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" text="文件夹类型" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7id-tv-Nnd">
-                        <rect key="frame" x="70" y="12" width="80" height="33.5"/>
+                        <rect key="frame" x="70" y="12" width="90.5" height="33.5"/>
                         <constraints>
                             <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="20" id="Gea-xa-rYg"/>
                         </constraints>
-                        <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="16"/>
+                        <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="18"/>
                         <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
@@ -69,7 +69,7 @@
                         <nil key="highlightedColor"/>
                     </label>
                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="置顶" translatesAutoresizingMaskIntoConstraints="NO" id="QxE-nS-rLu">
-                        <rect key="frame" x="160" y="21" width="30" height="16"/>
+                        <rect key="frame" x="170.5" y="21" width="30" height="16"/>
                     </imageView>
                 </subviews>
                 <constraints>

smartRhino/SmartRhino-Prefix.pch

@@ -56,6 +56,7 @@
 #import "TDFileStorage.h"
 #import "MyTDTopicCreateVC.h"
 #import "MyTDTopicDetailVC.h"
+#import "MailGroupListSerachVC.h"
 
 #import "WclAppConfig.h"
 #import "ShowtipTool.h"