no message

smartRhino.xcodeproj/project.pbxproj

@@ -852,6 +852,8 @@
 		EB44409624A1F5D200B2E212 /* IndexViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = EB44409524A1F5D200B2E212 /* IndexViewController.m */; };
 		EB44409A24A1FF7400B2E212 /* HomeRecommendVC.m in Sources */ = {isa = PBXBuildFile; fileRef = EB44409924A1FF7400B2E212 /* HomeRecommendVC.m */; };
 		EB44409D24A2110D00B2E212 /* HomeBigshotVC.m in Sources */ = {isa = PBXBuildFile; fileRef = EB44409C24A2110D00B2E212 /* HomeBigshotVC.m */; };
+		EB44982624E3AFE80040A9FF /* GroupSquareSearchVC.m in Sources */ = {isa = PBXBuildFile; fileRef = EB44982524E3AFE80040A9FF /* GroupSquareSearchVC.m */; };
+		EB44982924E3E13D0040A9FF /* GroupListView.m in Sources */ = {isa = PBXBuildFile; fileRef = EB44982824E3E13D0040A9FF /* GroupListView.m */; };
 		EB4B652524C003050041A82C /* MailAddUserSearch.m in Sources */ = {isa = PBXBuildFile; fileRef = EB4B652424C003050041A82C /* MailAddUserSearch.m */; };
 		EB4B652824C01DCE0041A82C /* MailVerifyVC.m in Sources */ = {isa = PBXBuildFile; fileRef = EB4B652724C01DCE0041A82C /* MailVerifyVC.m */; };
 		EB4B652B24C04DED0041A82C /* MailEditVC.m in Sources */ = {isa = PBXBuildFile; fileRef = EB4B652A24C04DED0041A82C /* MailEditVC.m */; };
@@ -2892,6 +2894,10 @@
 		EB44409924A1FF7400B2E212 /* HomeRecommendVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HomeRecommendVC.m; sourceTree = "<group>"; };
 		EB44409B24A2110D00B2E212 /* HomeBigshotVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HomeBigshotVC.h; sourceTree = "<group>"; };
 		EB44409C24A2110D00B2E212 /* HomeBigshotVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HomeBigshotVC.m; sourceTree = "<group>"; };
+		EB44982424E3AFE70040A9FF /* GroupSquareSearchVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GroupSquareSearchVC.h; sourceTree = "<group>"; };
+		EB44982524E3AFE80040A9FF /* GroupSquareSearchVC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GroupSquareSearchVC.m; sourceTree = "<group>"; };
+		EB44982724E3E13C0040A9FF /* GroupListView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GroupListView.h; sourceTree = "<group>"; };
+		EB44982824E3E13D0040A9FF /* GroupListView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GroupListView.m; sourceTree = "<group>"; };
 		EB4B652324C003040041A82C /* MailAddUserSearch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MailAddUserSearch.h; sourceTree = "<group>"; };
 		EB4B652424C003050041A82C /* MailAddUserSearch.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MailAddUserSearch.m; sourceTree = "<group>"; };
 		EB4B652624C01DCE0041A82C /* MailVerifyVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MailVerifyVC.h; sourceTree = "<group>"; };
@@ -4454,10 +4460,10 @@
 				EB4B652A24C04DED0041A82C /* MailEditVC.m */,
 				EB3DCA50245552AE000A0189 /* ShareCusVC.h */,
 				EB3DCA51245552AE000A0189 /* ShareCusVC.m */,
+				EB3DCA4524551B0E000A0189 /* ShareListVC.h */,
 				EB3DCA4624551B0E000A0189 /* ShareListVC.m */,
 				EB3DCA4D24555299000A0189 /* ShareSysVC.h */,
 				EB3DCA4E24555299000A0189 /* ShareSysVC.m */,
-				EB3DCA4524551B0E000A0189 /* ShareListVC.h */,
 				EBA25D4F24D7FA3800CBEBF2 /* ShowSysVC.h */,
 				EBA25D4E24D7FA3800CBEBF2 /* ShowSysVC.m */,
 				EBA25D5224D81BC200CBEBF2 /* ShowUserVC.h */,
@@ -7758,6 +7764,8 @@
 			children = (
 				EB7DD2362462AB5B00C6048F /* GroupSquareVC.h */,
 				EB7DD2372462AB5B00C6048F /* GroupSquareVC.m */,
+				EB44982424E3AFE70040A9FF /* GroupSquareSearchVC.h */,
+				EB44982524E3AFE80040A9FF /* GroupSquareSearchVC.m */,
 				EB6D86D224977EFA001D3B6C /* GroupSynopsisVC.h */,
 				EB6D86D324977EFA001D3B6C /* GroupSynopsisVC.m */,
 				EBFA5EE92491F9B100AD38B0 /* ReplayMeLikeVC.h */,
@@ -7794,6 +7802,8 @@
 		EB7DD229246261E100C6048F /* View */ = {
 			isa = PBXGroup;
 			children = (
+				EB44982724E3E13C0040A9FF /* GroupListView.h */,
+				EB44982824E3E13D0040A9FF /* GroupListView.m */,
 				EBCC209324B726EC001BDCDC /* UILabel+YBAttributeTextTapAction.h */,
 				EBCC209224B726EC001BDCDC /* UILabel+YBAttributeTextTapAction.m */,
 				EB7DD2392462B62600C6048F /* GroupSquareCell.h */,
@@ -9295,6 +9305,7 @@
 				C7D6BB45235DA18A00770E7C /* CommentModel.m in Sources */,
 				C6F2E1A0236C3C32009E6903 /* EditUserNickVC.m in Sources */,
 				C76B01282387B9C400AD6E28 /* WorkFilterModel.m in Sources */,
+				EB44982624E3AFE80040A9FF /* GroupSquareSearchVC.m in Sources */,
 				EB18108C24888DC3009EDEF5 /* BookTextBookVC.m in Sources */,
 				EB6E84D5246FB90300BE0524 /* HomeUserPrivilegeCell.m in Sources */,
 				EBF7177724725EDF00ED1838 /* BookLoginPayAlert.m in Sources */,
@@ -10220,6 +10231,7 @@
 				EB92E88A23B09AD4008E94CF /* GFCalendarScrollView.m in Sources */,
 				C7AB8434235EA93B00F2363F /* SWQRCodeConfig.m in Sources */,
 				C7D6BBB5235DA18A00770E7C /* TDTableViewCell.m in Sources */,
+				EB44982924E3E13D0040A9FF /* GroupListView.m in Sources */,
 				EBB6886E23C9C0C300E24DD9 /* MMFileUploadUtil.m in Sources */,
 				EBF64A76241C73510074FD55 /* WorkFlowFecordSearchVC.m in Sources */,
 				EB2E46FD23A46B5F00CAF0D3 /* TDGroupSearchCell.m in Sources */,

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

@@ -55,5 +55,53 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "B7193E93-053C-4313-B12F-7CC92214D9A7"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "smartRhino/Project/VCModel/ChatMessage/Controller/MailList/Controller/MailListByZuVC.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "1098"
+            endingLineNumber = "1098"
+            landmarkName = "-getData"
+            landmarkType = "7">
+            <Locations>
+               <Location
+                  uuid = "B7193E93-053C-4313-B12F-7CC92214D9A7 - b1ec691cd085d067"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "-[MailListByZuVC getData]"
+                  moduleName = "&#x6cf0;&#x5fb7;&#x4fe1;&#x6e90;"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/tederen/Desktop/Tederen_c/smartRhino/Project/VCModel/ChatMessage/Controller/MailList/Controller/MailListByZuVC.m"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "1098"
+                  endingLineNumber = "1098"
+                  offsetFromSymbolStart = "1980">
+               </Location>
+               <Location
+                  uuid = "B7193E93-053C-4313-B12F-7CC92214D9A7 - 1c1f84d17705f544"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "__25-[MailListByZuVC getData]_block_invoke_3"
+                  moduleName = "&#x6cf0;&#x5fb7;&#x4fe1;&#x6e90;"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/tederen/Desktop/Tederen_c/smartRhino/Project/VCModel/ChatMessage/Controller/MailList/Controller/MailListByZuVC.m"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "1099"
+                  endingLineNumber = "1099"
+                  offsetFromSymbolStart = "100">
+               </Location>
+            </Locations>
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

smartRhino/AppConfig.h

@@ -135,7 +135,7 @@ return;\
 //#define HtmlUrl @"http://111.12.8.69:82"
 
 #define BaseUrl @"https://apk.tederen.com/service"
-#define HtmlUrl @"https://apk.tederen.com/admin"
+#define HtmlUrl @"https://apk.tederen.com"
 #define MyChannelUrl  @"/api/v1/channels/1"
 #define ContentUrl    @"/api/v1/contents/1"
 #define MainSearchUrl @"/api/v1/contents/1325"
@@ -208,6 +208,8 @@ return;\
 #pragma mark - 小组
 #define API_APP_GROUP_Group_Category           @"/api/app/group/group-category/"
 #define API_APP_GROUP_Category_list            @"/api/app/group/category-list/"
+#define API_APP_GROUP_Search                   @"/api/app/group/search/"
+
 
 #pragma mark - 设置消息
 #define Seting_PrivateLetter_Post @"/api/app/user/update-user-private-letter"
@@ -417,6 +419,8 @@ return;\
 #pragma mark - 话题
 ///话题分组列表
 #define APP_Topic_Group   @"/api/app/topic/group"
+///小组列表
+#define API_APP_Group_List   @"/api/app/group/list"
 
 ///话题分组列表
 #define APP_Topic_List_Group   @"/api/app/topic/list-group"

smartRhino/Assets.xcassets/会议.imageset/Contents.json

@@ -5,18 +5,18 @@
       "scale" : "1x"
     },
     {
-      "idiom" : "universal",
       "filename" : "会议@2x.png",
+      "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "idiom" : "universal",
       "filename" : "会议@3x.png",
+      "idiom" : "universal",
       "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}

smartRhino/Assets.xcassets/会议纪要.imageset/Contents.json

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

smartRhino/FwzAppConfig.h

@@ -315,6 +315,8 @@ typedef enum CollectModelType{
     CollectModel_work = 14,
     CollectModel_NoSignMail = 18,
     CollectModel_NewTopic = -4,
+    CollectModel_TopicBooK = 41,
+    CollectModel_TopicSubBooK = 42,
     CollectModel_CollectFileAll = 120,
     CollectModel_NoteFileAll = 130,
     CollectModel_Aritle = 100,
@@ -419,6 +421,8 @@ typedef enum HistorySearchType {
     HistorySearchType_Reply = 16,
     ///
     HistorySearchType_LikeList = 17,
+    ///
+    HistorySearchType_Square = 18,
 }HistorySearchType;
 
 /// 书城

smartRhino/Project/Base/SubClass/Button/ShowBtn.m

@@ -17,6 +17,12 @@
     }
     return self;
 }
+- (BOOL)pointInside:(CGPoint)point withEvent:(UIEvent *)event {
+    CGRect bounds = self.bounds;
+    CGFloat widthDelta = self.bounds.size.width * 1.5;
+    bounds = CGRectInset(bounds, - 0.5 * widthDelta, 0);
+    return CGRectContainsPoint(bounds, point);
+}
 - (void)setLabelTitle:(NSString *)title
 {
     self.title = [NSString stringWithFormat:@"%@ ",title];

smartRhino/Project/Base/SubClass/TabBarController/WorkFlowTabbarController.m

@@ -37,7 +37,7 @@
 {
     [super didMoveToParentViewController:parent];
     if(!parent){
-        [TabBarController sharedTabBarController].tabBar.hidden = NO;
+        [TabBarController sharedTabBarController].tabBar.hidden = YES;
     }
 }
 - (void)viewDidLoad {

smartRhino/Project/Other/Third/Calender/NSDate+Extension.m

@@ -188,9 +188,15 @@
     NSInteger srcDay = [srcComponents day];
     // 要额外显示的时间分钟
     // 当年
+//    NSCalendarUnit type = NSCalendarUnitYear | NSCalendarUnitMonth | NSCalendarUnitDay | NSCalendarUnitHour | NSCalendarUnitMinute | NSCalendarUnitSecond;
+//
+//    NSDateComponents *cmps = [calendar components:type fromDate:currentDate toDate:dt options:0];
+//    // 4.输出结果
+//    NSLog(@"两个时间相差%ld年%ld月%ld日%ld小时%ld分钟%ld秒", cmps.year, cmps.month, cmps.day, cmps.hour, cmps.minute, cmps.second);
+    
     if(currentYear == srcYear) {
-        long currentTimestamp = [self getIOSTimeStamp_l:currentDate];
-        long srcTimestamp = [self getIOSTimeStamp_l:dt];
+        long currentTimestamp = [self getIOSTimeStamp:currentDate];
+        long srcTimestamp = [self getIOSTimeStamp:dt];
         // 相差时间（单位：秒）
         long delta = currentTimestamp - srcTimestamp;
         // 当天（月份和日期一致才是）
@@ -215,15 +221,15 @@
 + (NSString *)getTimeString:(NSDate *)dt format:(NSString *)fmt{
     NSDateFormatter* format = [[NSDateFormatter alloc] init];
     [format setDateFormat:fmt];
-    return [format stringFromDate:dt];
+    return [format stringFromDate:[NSDate dateWithTimeIntervalSince1970:[dt timeIntervalSince1970]]];
 }
 + (NSDate *)getStringDate:(NSString *)date format:(NSString *)fmt{
     NSDateFormatter* format = [[NSDateFormatter alloc] init];
     [format setDateFormat:fmt];
     return [format dateFromString:date];
 }
-+ (NSTimeInterval)getIOSTimeStamp:(NSDate*)dat{
-    NSTimeInterval a = [dat timeIntervalSince1970];
++ (long)getIOSTimeStamp:(NSDate*)dat{
+    long a = [dat timeIntervalSince1970];
     return a;
 }
 

smartRhino/Project/VCModel/ChatMessage/Chat/EMChatViewController.m

@@ -52,28 +52,28 @@
 
 @interface EMChatViewController ()<UIScrollViewDelegate, UINavigationControllerDelegate, UIImagePickerControllerDelegate, EMMultiDevicesDelegate, EMChatManagerDelegate, EMGroupManagerDelegate, EMChatroomManagerDelegate, EMChatBarDelegate, EMMessageCellDelegate, EMChatBarEmoticonViewDelegate, EMChatBarRecordAudioViewDelegate,EMMoreFunctionViewDelegate,EMReadReceiptMsgDelegate,NoteBookShareVCDelegate>
 
-@property (nonatomic, strong) dispatch_queue_t msgQueue;
-@property (nonatomic, strong) UIView      * titleV;
-@property (nonatomic, strong) UIButton    * backBtn;
-@property (nonatomic, strong) UIButton    * tabBtn;
-@property (nonatomic, strong) UIButton    * mangerBtn;
-@property (nonatomic, strong) UILabel    *  titleL;
+@property (nonatomic,strong) dispatch_queue_t msgQueue;
+@property (nonatomic,strong) UIView      * titleV;
+@property (nonatomic,strong) UIButton    * backBtn;
+@property (nonatomic,strong) UIButton    * tabBtn;
+@property (nonatomic,strong) UIButton    * mangerBtn;
+@property (nonatomic,strong) UILabel    *  titleL;
 @property (strong,nonatomic) DrawerView *drawerView;
-@property (nonatomic) BOOL isFirstLoadMsg;
-@property (nonatomic) BOOL isViewDidAppear;
+@property (nonatomic,assign) BOOL isFirstLoadMsg;
+@property (nonatomic,assign) BOOL isViewDidAppear;
 
-@property (nonatomic, strong) EMConversationModel *conversationModel;
-@property (nonatomic, strong) NSString *moreMsgId;  //第一条消息的消息id
+@property (nonatomic,strong) EMConversationModel *conversationModel;
+@property (nonatomic,strong) NSString *moreMsgId;  //第一条消息的消息id
 
-@property (nonatomic, strong) UILabel *titleLabel;
-@property (nonatomic, strong) UILabel *titleDetailLabel;
+@property (nonatomic,strong) UILabel *titleLabel;
+@property (nonatomic,strong) UILabel *titleDetailLabel;
 
-@property (nonatomic, strong) EMChatBar *chatBar;
-@property (nonatomic, strong) UIImagePickerController *imagePicker;
+@property (nonatomic,strong) EMChatBar *chatBar;
+@property (nonatomic,strong) UIImagePickerController *imagePicker;
 
-@property (nonatomic, strong) EMGroup *group;
+@property (nonatomic,strong) EMGroup *group;
 //阅读回执
-@property (nonatomic, strong) EMReadReceiptMsgViewController *readReceiptControl;
+@property (nonatomic,strong) EMReadReceiptMsgViewController *readReceiptControl;
 
 
 //长按操作栏
@@ -85,19 +85,21 @@
 @property (nonatomic, strong) UIMenuItem *transpondMenuItem;
 @property (nonatomic, strong) UIMenuItem *playAndRecordMenuItem;
 //消息格式化
-@property (nonatomic) NSTimeInterval msgTimelTag;
+@property (nonatomic, assign) NSTimeInterval msgTimelTag;
 
 //@
-@property (nonatomic) BOOL isWillInputAt;
+@property (nonatomic,assign) BOOL isWillInputAt;
 @property (strong, nonatomic) NoteBookShareVC *noteBookShareVC;
 @property (strong, nonatomic) UIImage         *sendImage;
 
 //Typing
-@property (nonatomic) BOOL isTyping;
-@property (nonatomic) BOOL enableTyping;
-@property (nonatomic, copy) NSMutableArray *userInfoArray;
-@property (nonatomic, copy) NSMutableArray *chatDistoryArray;
-@property (nonatomic, assign) NSInteger     UserId;
+@property (nonatomic,assign) BOOL isTyping;
+@property (nonatomic,assign) BOOL enableTyping;
+@property (nonatomic,copy) NSMutableArray *userInfoArray;
+@property (nonatomic,copy) NSMutableArray *chatDistoryArray;
+@property (nonatomic,assign) NSInteger     UserId;
+@property (nonatomic,assign) BOOL backRoot;
+
 @end
 
 @implementation EMChatViewController
@@ -297,8 +299,12 @@
     self.titleL.text = self.conversationModel.name;
     WS(weakSelf);
     [self.backBtn setAction:^{
-        weakSelf.hidesBottomBarWhenPushed = NO;
-        [weakSelf.navigationController popViewControllerAnimated:YES];
+        if (weakSelf.backRoot) {
+            [weakSelf back1];
+        }else{
+            weakSelf.hidesBottomBarWhenPushed = NO;
+            [weakSelf.navigationController popViewControllerAnimated:YES];
+        }
     }];
     [self.tabBtn setAction:^{
         [[UtilsTools getWindow] addSubview:weakSelf.drawerView];
@@ -374,7 +380,15 @@
         }
     }];
 }
-
+- (void)back1
+{
+    for (NSInteger i = (self.navigationController.viewControllers.count - 1); i > 0 ;i --) {
+        if ([self.navigationController.viewControllers[i] isKindOfClass:NSClassFromString(@"MyTDTopicDetailVC")]) {
+            [self.navigationController popToViewController:self.navigationController.viewControllers[i] animated:YES];
+            return;
+        }
+    }
+}
 - (void)_setupChatBarMoreViews
 {
     //语音
@@ -2534,6 +2548,7 @@
 - (void)returnMessge
 {
     if (self.isReturn) {
+        self.backRoot = YES;
         self.isReturn = NO;
         [[NSNotificationCenter defaultCenter] postNotificationName:MESSAGERETURNSUCCESS object:nil];
         switch (self.sendModel.SoureTypeId) {

smartRhino/Project/VCModel/ChatMessage/Chat/MessageCell/BubbleView/EMMsgExtSmartBubbleView.m

@@ -134,7 +134,7 @@
             break;
         case CollectModel_meetMian:
         {
-            self.iconView.image = IMG(@"会议");
+            self.iconView.image = IMG(@"会议纪要");
         }
             break;
         case CollectModel_meetDetail:

smartRhino/Project/VCModel/ChatMessage/Controller/ChatMsg/Controller/ChatGroupAddVC.m

@@ -204,7 +204,7 @@
                                         @"SourceType":@(2)///邀请
             };
             SHOWLOADING
-            [[HttpManager sharedHttpManager] POSTUrl:Host(APP_Group_Insert_User) parameters:paraDict responseStyle:DATA success:^(id  _Nonnull responseObject) {
+            [[HttpManager sharedHttpManager] POSTUrl:Host(APP_Group_Insert_User) parameters:paraDict responseStyle:JOSN success:^(id  _Nonnull responseObject) {
                 REMOVESHOW
                 [weakSelf back1];
                 dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{

smartRhino/Project/VCModel/ChatMessage/Controller/ChatMsg/Controller/ChatGroupSearchVC.m

@@ -55,7 +55,7 @@
                                                 @"UserId":@([AppUserModel sharedAppUserModel].Id),
                                                 @"SourceType":@(2)///邀请
                     };
-                    [[HttpManager sharedHttpManager] POSTUrl:Host(APP_Group_Insert_User) parameters:paraDict responseStyle:DATA success:^(id  _Nonnull responseObject) {
+                    [[HttpManager sharedHttpManager] POSTUrl:Host(APP_Group_Insert_User) parameters:paraDict responseStyle:JOSN success:^(id  _Nonnull responseObject) {
                         [weakSelf back1];
                         dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
                             [[NSNotificationCenter defaultCenter] postNotificationName:GROUPADDMESSAGE object:nil];

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

@@ -132,7 +132,11 @@
     SHOWLOADING
     NSMutableDictionary *dic = [NSMutableDictionary dictionary];
     [dic setValue:@(self.ParentId) forKey:@"ParentId"];
-    [dic setValue:self.TypeValue == 1 ? @(-4) : @(self.TypeId) forKey:@"TypeId"];
+    if (self.collectType == CollectHanderType_Collect) {
+        [dic setValue:@(CreateCollectionType) forKey:@"TypeId"];
+    }else{
+        [dic setValue:@(self.TypeId) forKey:@"TypeId"];
+    }
     [dic setValue:self.FolderIds forKey:@"FolderIds"];
     NSLog(@"%@",dic);
     WS(weakSelf);
@@ -344,9 +348,9 @@
 }
 //- (void)back{
 //    for ( int i = 0 ;i< self.navigationController.viewControllers.count;i++) {
-//        if ([self.navigationController.viewControllers[i] isKindOfClass:NSClassFromString(@"CreateNoteBookVC")]
-//            ||[self.navigationController.viewControllers[i] isKindOfClass:NSClassFromString(@"MyFavoriteVC")]) {
-//            [self.navigationController popToViewController:self.navigationController.viewControllers[i] animated:YES];
+//        if ([vc isKindOfClass:NSClassFromString(@"CreateNoteBookVC")]
+//            ||[vc isKindOfClass:NSClassFromString(@"MyFavoriteVC")]) {
+//            [self.navigationController popToViewController:vc animated:YES];
 //            return;
 //        }
 //
@@ -357,7 +361,7 @@
 - (void)moveFind:(NSMutableArray*)findModelArray withSuperModel:(NoticeFindModel *)supermodel{
     if (self.isReturn) {
         MyTDTopicCreateVC * vc = [MyTDTopicCreateVC initMyTDTopicCreateVC];
-        vc.type = self.TypeValue == 1 ? CollectModel_NewTopic : CollectModel_NoteBook;
+        vc.type = self.CollectionType;
         vc.sendModel = self.sendModel;
         vc.isReturn = self.isReturn;
         [self.navigationController pushViewController:vc animated:YES];
@@ -365,7 +369,7 @@
         NSMutableDictionary *dic = [[NSMutableDictionary alloc]init];
         [dic setValue:findModelArray forKey:@"Ids"];
         [dic setValue:@(supermodel.Id) forKey:@"ParentId"];
-        if (self.TypeValue == 1) {
+        if (self.TypeId == CreateNewTopicType) {
             [dic setValue:@(self.TypeId) forKey:@"TypeId"];
         }
         SHOWLOADING
@@ -408,21 +412,21 @@
 }
 
 - (void)myBack{
-    for ( NSInteger i = (self.navigationController.viewControllers.count - 1); i > 0 ;i --) {
-        if ([self.navigationController.viewControllers[i] isKindOfClass:NSClassFromString(@"ChatMsgNoticeVC")]
-            || [self.navigationController.viewControllers[i] isKindOfClass:NSClassFromString(@"MyTDGroupViewController")]
-            || [self.navigationController.viewControllers[i] isKindOfClass:NSClassFromString(@"MyFavoriteVC")]
-            || [self.navigationController.viewControllers[i] isKindOfClass:NSClassFromString(@"NoteBookVC")]
-            || [self.navigationController.viewControllers[i] isKindOfClass:NSClassFromString(@"HomeDetailController")]
-            || [self.navigationController.viewControllers[i] isKindOfClass:NSClassFromString(@"OtherNoteBookVC")]
-            || [self.navigationController.viewControllers[i] isKindOfClass:NSClassFromString(@"OtherFavoriteVC")]
-            || [self.navigationController.viewControllers[i] isKindOfClass:NSClassFromString(@"TDInterLeterHomeViewController")]
-            || [self.navigationController.viewControllers[i] isKindOfClass:NSClassFromString(@"NewMeetingFecordDetailsController")]
-            || [self.navigationController.viewControllers[i] isKindOfClass:NSClassFromString(@"CommonHomeVC")]
-            || [self.navigationController.viewControllers[i] isKindOfClass:NSClassFromString(@"CommonNoteVC")]
-            || [self.navigationController.viewControllers[i] isKindOfClass:NSClassFromString(@"MyTDTopicBookVC")]
-            || [self.navigationController.viewControllers[i] isKindOfClass:NSClassFromString(@"MyTDTopicDetailVC")]) {
-            [self.navigationController popToViewController:self.navigationController.viewControllers[i] animated:YES];
+    for (UIViewController * vc in self.navigationController.viewControllers) {
+        if ([vc isKindOfClass:NSClassFromString(@"ChatMsgNoticeVC")]
+            || [vc isKindOfClass:NSClassFromString(@"MyTDGroupViewController")]
+            || [vc isKindOfClass:NSClassFromString(@"MyFavoriteVC")]
+            || [vc isKindOfClass:NSClassFromString(@"NoteBookVC")]
+            || [vc isKindOfClass:NSClassFromString(@"HomeDetailController")]
+            || [vc isKindOfClass:NSClassFromString(@"OtherNoteBookVC")]
+            || [vc isKindOfClass:NSClassFromString(@"OtherFavoriteVC")]
+            || [vc isKindOfClass:NSClassFromString(@"TDInterLeterHomeViewController")]
+            || [vc isKindOfClass:NSClassFromString(@"NewMeetingFecordDetailsController")]
+            || [vc isKindOfClass:NSClassFromString(@"CommonHomeVC")]
+            || [vc isKindOfClass:NSClassFromString(@"CommonNoteVC")]
+            || [vc isKindOfClass:NSClassFromString(@"MyTDTopicBookVC")]
+            || [vc isKindOfClass:NSClassFromString(@"MyTDTopicDetailVC")]) {
+            [self.navigationController popToViewController:vc animated:YES];
             return;
         }
     }

smartRhino/Project/VCModel/ChatMessage/Controller/ChatMsgNotice/View/ChatMsgNoticeCell.h

@@ -33,6 +33,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (weak,nonatomic) IBOutlet UIButton *cell2EditBtn;
 @property (weak, nonatomic) IBOutlet UILabel *cell2UnReadNumberLbl;
 @property (weak, nonatomic) IBOutlet UILabel *yanRedNumL;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *topConstant;
 
 @property (assign,nonatomic) BOOL             isShow;
 + (CGFloat)configCell0Height;

smartRhino/Project/VCModel/ChatMessage/Controller/ChatMsgNotice/View/ChatMsgNoticeCell.xib

@@ -150,11 +150,8 @@
                             <constraint firstAttribute="height" constant="10" id="g66-B7-fK7"/>
                         </constraints>
                     </view>
-                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="751" text="出版传媒策划部" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Jiq-BD-Pe6">
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" horizontalCompressionResistancePriority="751" text="出版传媒策划部" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Jiq-BD-Pe6">
                         <rect key="frame" x="65" y="17" width="121.5" height="20.5"/>
-                        <constraints>
-                            <constraint firstAttribute="width" relation="lessThanOrEqual" constant="180" id="gJr-nH-tLP"/>
-                        </constraints>
                         <fontDescription key="fontDescription" type="system" pointSize="17"/>
                         <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
@@ -206,6 +203,7 @@
                     <constraint firstItem="Jiq-BD-Pe6" firstAttribute="leading" secondItem="I2f-nD-4rb" secondAttribute="leading" constant="65" id="GK6-Iw-79a"/>
                     <constraint firstItem="bC4-yw-AgH" firstAttribute="centerY" secondItem="I2f-nD-4rb" secondAttribute="centerY" id="HAc-Ca-UoR"/>
                     <constraint firstItem="REY-E2-Ceq" firstAttribute="centerY" secondItem="iCa-Eb-DBA" secondAttribute="centerY" id="LWw-w1-FaG"/>
+                    <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="Jiq-BD-Pe6" secondAttribute="trailing" constant="130" id="MWL-RR-y1c"/>
                     <constraint firstItem="iMM-zG-IQm" firstAttribute="centerY" secondItem="I2f-nD-4rb" secondAttribute="centerY" id="OdD-gv-s7M"/>
                     <constraint firstAttribute="bottom" secondItem="w9k-SR-rqO" secondAttribute="bottom" id="QVx-5J-yJj"/>
                     <constraint firstItem="T3D-Ha-UrF" firstAttribute="leading" secondItem="I2f-nD-4rb" secondAttribute="leading" constant="16.5" id="Qjb-bn-rRD"/>
@@ -236,8 +234,9 @@
                 <outlet property="cell2TitleLabel" destination="Jiq-BD-Pe6" id="xg0-Wz-ttK"/>
                 <outlet property="cell2UnReadNumberLbl" destination="REY-E2-Ceq" id="k9b-ec-jEA"/>
                 <outlet property="cell2UserImgView" destination="T3D-Ha-UrF" id="SC1-1t-TwB"/>
+                <outlet property="topConstant" destination="MWL-RR-y1c" id="3a0-6d-PoH"/>
             </connections>
-            <point key="canvasLocation" x="131.8840579710145" y="346.875"/>
+            <point key="canvasLocation" x="131.15942028985509" y="346.875"/>
         </tableViewCell>
         <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="ChatMsgNoticeCell10" id="3mM-Qh-WjH" customClass="ChatMsgNoticeCell">
             <rect key="frame" x="0.0" y="0.0" width="375" height="69"/>
@@ -262,10 +261,10 @@
                             <constraint firstAttribute="width" constant="41" id="Pok-b3-WrA"/>
                         </constraints>
                     </imageView>
-                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="chatmsg_rightArrow_icon" translatesAutoresizingMaskIntoConstraints="NO" id="ErY-SH-rCm">
+                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="253" verticalHuggingPriority="251" image="chatmsg_rightArrow_icon" translatesAutoresizingMaskIntoConstraints="NO" id="ErY-SH-rCm">
                         <rect key="frame" x="353" y="28.5" width="7" height="12"/>
                     </imageView>
-                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="28分钟前" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nmN-Lb-csU">
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" text="28分钟前" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nmN-Lb-csU">
                         <rect key="frame" x="296" y="27.5" width="52" height="14.5"/>
                         <constraints>
                             <constraint firstAttribute="width" relation="lessThanOrEqual" constant="60" id="9b5-BF-e83"/>
@@ -281,11 +280,8 @@
                             <constraint firstAttribute="height" constant="0.5" id="JBv-9m-MSB"/>
                         </constraints>
                     </view>
-                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="工作组" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="11W-3q-fjU">
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" text="工作组" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="11W-3q-fjU">
                         <rect key="frame" x="97" y="24.5" width="52" height="20.5"/>
-                        <constraints>
-                            <constraint firstAttribute="width" relation="lessThanOrEqual" constant="150" id="EkO-Xf-5f3"/>
-                        </constraints>
                         <fontDescription key="fontDescription" type="system" pointSize="17"/>
                         <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
@@ -319,6 +315,7 @@
                     <constraint firstAttribute="trailing" secondItem="hTt-Xw-w4M" secondAttribute="trailing" id="jFx-sq-r2b"/>
                     <constraint firstItem="R5f-G0-aHs" firstAttribute="leading" secondItem="xod-JK-vw5" secondAttribute="trailing" constant="4" id="kXj-6Q-nzF"/>
                     <constraint firstItem="xod-JK-vw5" firstAttribute="leading" secondItem="eeA-oz-O1d" secondAttribute="leading" constant="4" id="phR-3f-oLu"/>
+                    <constraint firstItem="nmN-Lb-csU" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="zAz-Rv-sGc" secondAttribute="trailing" constant="5" id="prY-VQ-53e"/>
                 </constraints>
             </tableViewCellContentView>
             <viewLayoutGuide key="safeArea" id="t72-xP-7fC"/>
@@ -342,9 +339,6 @@
                 <subviews>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="出版传媒策划部" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="NcS-EB-rQc">
                         <rect key="frame" x="94" y="17" width="121.5" height="20.5"/>
-                        <constraints>
-                            <constraint firstAttribute="width" relation="lessThanOrEqual" constant="150" id="o7P-gc-XhA"/>
-                        </constraints>
                         <fontDescription key="fontDescription" type="system" pointSize="17"/>
                         <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
@@ -433,6 +427,7 @@
                     <constraint firstAttribute="bottom" secondItem="XQR-mR-rKf" secondAttribute="bottom" id="tLB-ko-WAd"/>
                     <constraint firstItem="1hb-QE-1ga" firstAttribute="centerY" secondItem="Fha-89-BO0" secondAttribute="centerY" id="ulb-p8-erL"/>
                     <constraint firstAttribute="trailing" secondItem="8jj-El-Qda" secondAttribute="trailing" constant="15" id="vBZ-j8-UJa"/>
+                    <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="NcS-EB-rQc" secondAttribute="trailing" constant="130" id="xWG-9e-Pog"/>
                     <constraint firstItem="NcS-EB-rQc" firstAttribute="top" secondItem="Fha-89-BO0" secondAttribute="top" constant="17" id="zrC-jW-ssH"/>
                 </constraints>
             </tableViewCellContentView>
@@ -447,6 +442,7 @@
                 <outlet property="cell2TitleLabel" destination="NcS-EB-rQc" id="0Qz-eM-FBe"/>
                 <outlet property="cell2UnReadNumberLbl" destination="zHi-Yh-qDU" id="Yny-6J-57A"/>
                 <outlet property="cell2UserImgView" destination="1hb-QE-1ga" id="p1C-y2-VWg"/>
+                <outlet property="topConstant" destination="xWG-9e-Pog" id="h6t-8v-4Vc"/>
             </connections>
             <point key="canvasLocation" x="131.8840579710145" y="517.63392857142856"/>
         </tableViewCell>

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

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

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

@@ -275,6 +275,7 @@
             vc.TypeValue = model.TypeValue;
             vc.titleStr = model.Name;
             vc.IsSelect = self.IsSelect;
+            vc.isCheck = self.isCheck;
             vc.IsSelectDes = self.IsSelectDes;
             [self.navigationController pushViewController:vc animated:YES];
         }
@@ -285,6 +286,7 @@
         vc.TypeValue = model.TypeValue;
         vc.titleStr = model.Name;
         vc.IsSelect = self.IsSelect;
+        vc.isCheck = self.isCheck;
         vc.IsSelectDes = self.IsSelectDes;
         [self.navigationController pushViewController:vc animated:YES];
     }

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

@@ -29,6 +29,16 @@
     [self addObserver:self forKeyPath:@"searchText" options:NSKeyValueObservingOptionNew context:nil];
     WS(weakSelf);
     if (self.IsSelect) {
+        CGRect rect = self.topNavSearch.searchBar.frame;
+        CGFloat w = rect.size.width - 60;
+        rect.size.width = w;
+        self.topNavSearch.searchBar.frame = rect;
+        [self.topNavSearch addSubview:self.cancelBtn];
+        [self.cancelBtn mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.left.mas_equalTo(self.topNavSearch.searchBar.mas_right).offset(5);
+            make.top.bottom.mas_equalTo(self.topNavSearch.searchBar);
+            make.width.mas_greaterThanOrEqualTo(20);
+        }];
         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:^{

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

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

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

@@ -150,12 +150,31 @@
         [self countMailArray:@[smodel]];
         [tableView reloadRowAtIndexPath:indexPath withRowAnimation:UITableViewRowAnimationAutomatic];
     }else{
-        MailListDetailVC * userVC = [MailListDetailVC initMailListDetailVC];
-        userVC.indexId = smodel.UserId;
-        [self.navigationController pushViewController:userVC animated:YES];
+        if (self.isCheck) {
+            [self selecPeopleBack:[smodel modelToJSONObject]];
+        }else{
+            MailListDetailVC * userVC = [MailListDetailVC initMailListDetailVC];
+            userVC.indexId = smodel.UserId;
+            [self.navigationController pushViewController:userVC animated:YES];
+        }
+    }
+}
+- (void)selecPeopleBack:(NSDictionary *)dic{
+    NSMutableDictionary * mdic = [NSMutableDictionary dictionaryWithDictionary:dic];
+    if ([dic[@"Name"] length] > 0) {
+        [mdic setValue:dic[@"Name"] forKey:@"UserName"];
+        [mdic setValue:dic[@"Id"] forKey:@"UserId"];
+    }
+    [[NSNotificationCenter defaultCenter] postNotificationName:NOTIFI_ApprovalRen object:nil userInfo:mdic];
+    for ( int i = 0 ;i< self.navigationController.viewControllers.count;i++) {
+        NSLog(@"%@",self.navigationController.viewControllers[i]);
+        if ([self.navigationController.viewControllers[i] isKindOfClass:NSClassFromString(@"MyWorkWordVC")]
+            || ([self.navigationController.viewControllers[i] isKindOfClass:NSClassFromString(@"NextApprovalViewController")])) {
+            [self.navigationController popToViewController:self.navigationController.viewControllers[i] animated:YES];
+            return;
+        }
     }
 }
-
 - (void)getData{
     WS(weakSelf);
     [[HttpManager sharedHttpManager] POSTUrl:Host(API_APP_User_Group_Chat_Search) parameters:@{@"TypeValue":@(self.TypeValue),@"Id":@(self.Id),@"Keyword":@""} responseStyle:JOSN success:^(id  _Nonnull responseObject) {

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

@@ -19,6 +19,8 @@ NS_ASSUME_NONNULL_BEGIN
 @property (assign, nonatomic) CreateFileFolderType   type;
 @property (nonatomic, assign) NSInteger  TypeId;
 @property (assign, nonatomic) BOOL                   IsSelectDes;
+@property (nonatomic, assign) BOOL      isCheck;
+
 @end
 
 NS_ASSUME_NONNULL_END

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

@@ -496,6 +496,7 @@
                         MailGroupVC *vc = [[MailGroupVC alloc] init];
                         vc.ParentId = model.Id;
                         vc.titleStr = model.FolderName;
+                        vc.isCheck = self.isCheck;
                         vc.TypeValue = self.TypeValue;
                         vc.TypeId = self.TypeId;
                         [self.navigationController pushViewController:vc animated:YES];
@@ -513,6 +514,7 @@
                         vc.Id = model.GroupId;
                         vc.TypeValue = self.TypeValue;
                         vc.titleStr = model.GroupName;
+                        vc.isCheck = self.isCheck;
                         vc.IsSelect = YES;
                         [self.navigationController pushViewController:vc animated:YES];
                     }
@@ -526,6 +528,7 @@
                     vc.ParentId = model.Id;
                     vc.titleStr = model.FolderName;
                     vc.TypeValue = self.TypeValue;
+                    vc.isCheck = self.isCheck;
                     vc.TypeId = self.TypeId;
                     [self.navigationController pushViewController:vc animated:YES];
                 }break;
@@ -533,6 +536,7 @@
                     MailGroupListVC * vc = [MailGroupListVC initMailGroupListVC];
                     vc.Id = model.GroupId;
                     vc.TypeValue = self.TypeValue;
+                    vc.isCheck = self.isCheck;
                     vc.titleStr = model.GroupName;
                     [self.navigationController pushViewController:vc animated:YES];
                 }break;

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

@@ -17,6 +17,7 @@ NS_ASSUME_NONNULL_BEGIN
 +(MailListByZuVC *)initMailListByZuVC;
 @property (nonatomic, assign) BOOL      isCheck;
 @property (nonatomic, assign) BOOL      isShow;
+@property (nonatomic, assign) BOOL      isCreate;
 @property (nonatomic, copy) NSArray *   UserIds;
 @property (nonatomic,assign) NSInteger indexId;
 @property (strong,nonatomic) NSString *titleStr;

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

@@ -326,6 +326,9 @@
             [view show];
         }];
     }
+    if (self.isCreate) {
+        [self addCustomPeople];
+    }
     if (self.isSelectPeople == 1){
         self.rightBtn.hidden = YES;
     }
@@ -669,6 +672,8 @@
                     cell.rightConstant.constant = 0.f;
                 }
                 NSLog(@"====%@",titleStr);
+                NSDictionary * dict = dataArray.lastObject;
+                cell.countL.text = [NSString stringWithFormat:@"%ld",[dict[@"UserCount"] integerValue]];
                 return cell;
             }else{
                 NSDictionary *dic = dataArray.lastObject;

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

@@ -16,6 +16,7 @@
 #import "OtherFavoriteVC.h"
 #import "OtherNoteBookVC.h"
 #import "MailVerifyVC.h"
+#import "MyTDTopicBookVC.h"
 
 @interface MailListDetailVC ()<UITableViewDelegate,UITableViewDataSource>
 @property (strong,nonatomic) UIView *bottomView;
@@ -82,7 +83,7 @@
     self.tableView.delegate = self;
     self.tableView.dataSource = self;
     self.tableView.backgroundColor = [UIColor clearColor];
-    [self.tableView setScrollEnabled:NO];
+    [self.tableView setBounces:NO];
 
     NSAttributedString *leftString = [[NSAttributedString alloc] initWithString:@"站内信" attributes:@{NSFontAttributeName: [UIFont fontWithName:@"PingFang SC" size: 16],NSForegroundColorAttributeName:[UIColor whiteColor]}];
     NSAttributedString *rightString = [[NSAttributedString alloc] initWithString:@"发消息" attributes:@{NSFontAttributeName: [UIFont fontWithName:@"PingFang SC" size: 16],NSForegroundColorAttributeName:[UIColor whiteColor]}];
@@ -286,7 +287,7 @@
                       cell.cell2TitleLabel.text = [AppUserModel sharedAppUserModel].Id == self.indexId ? @"我的收藏" : @"他的收藏";
                   }break;
                   case 1:{
-                      cell.cell2TitleLabel.text = [AppUserModel sharedAppUserModel].Id == self.indexId ? @"我的笔记" : @"他的话题";
+                      cell.cell2TitleLabel.text = [AppUserModel sharedAppUserModel].Id == self.indexId ? @"我的话题" : @"他的话题";
                   }break;
                   default:
                       break;
@@ -357,11 +358,7 @@
                 }break;
                 case 1:{
                     if ([AppUserModel sharedAppUserModel].Id == self.model.Id) {
-                        NoteBookVC *vc = [NoteBookVC initNoteBookVC];
-                        vc.listType = MyNoteBookListLevelTypeA;
-                        vc.FolderId = 0;
-                        vc.myTitle = @"我的笔记";
-                        vc.VisitUserId = self.model.Id;
+                        MyTDTopicBookVC *vc = [MyTDTopicBookVC initMyTDTopicBookVC];
                         [self.navigationController pushViewController:vc animated:YES];
                     }else{
                         OtherNoteBookVC *vc = [OtherNoteBookVC initOtherNoteBookVC];
@@ -369,8 +366,7 @@
                         vc.FolderId = 0;
                         vc.CollectionType = CollectModel_NoteFile;
                         vc.Author = self.model.Name;
-                        vc.myTitle = @"我的笔记";
-                        vc.myTitle = [NSString stringWithFormat:@"%@的笔记",self.model.Name];
+                        vc.myTitle = [NSString stringWithFormat:@"%@的话题本",self.model.Name];
                         vc.VisitUserId = self.model.Id;
                         [self.navigationController pushViewController:vc animated:YES];
                         

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

@@ -134,6 +134,7 @@
                             vc.titleStr = responseObject[@"GroupName"];
                             vc.indexId = [responseObject[@"Id"] integerValue];
                             vc.pageType = MailListByZuPageType_custom;
+                            vc.isCreate = YES;
                             [weakSelf.navigationController pushViewController:vc animated:YES];
                         });
                     } failure:^(NSError * _Nonnull error) {
@@ -479,19 +480,39 @@
                 break;
             default:
             {
-                
+
             }
                 break;
         }
     }else{
         NSArray * array = self.cusNameArray[indexPath.section - self.dataSourceArray.count];
         SelectModel * sModel = [array objectAtIndex:indexPath.row];
-        MailListDetailVC * userVC = [MailListDetailVC initMailListDetailVC];
-        userVC.indexId = sModel.Id;
-        [self.navigationController pushViewController:userVC animated:YES];
+        if (self.isCheck) {
+            [self selecPeopleBack:[sModel modelToJSONObject]];
+        }else{
+
+            MailListDetailVC * userVC = [MailListDetailVC initMailListDetailVC];
+            userVC.indexId = sModel.Id;
+            [self.navigationController pushViewController:userVC animated:YES];
+        }
+    }
+}
+- (void)selecPeopleBack:(NSDictionary *)dic{
+    NSMutableDictionary * mdic = [NSMutableDictionary dictionaryWithDictionary:dic];
+    if ([dic[@"Name"] length] > 0) {
+        [mdic setValue:dic[@"Name"] forKey:@"UserName"];
+        [mdic setValue:dic[@"Id"] forKey:@"UserId"];
+    }
+    [[NSNotificationCenter defaultCenter] postNotificationName:NOTIFI_ApprovalRen object:nil userInfo:mdic];
+    for ( int i = 0 ;i< self.navigationController.viewControllers.count;i++) {
+        NSLog(@"%@",self.navigationController.viewControllers[i]);
+        if ([self.navigationController.viewControllers[i] isKindOfClass:NSClassFromString(@"MyWorkWordVC")]
+            || ([self.navigationController.viewControllers[i] isKindOfClass:NSClassFromString(@"NextApprovalViewController")])) {
+            [self.navigationController popToViewController:self.navigationController.viewControllers[i] animated:YES];
+            return;
+        }
     }
 }
-
 - (void)getData{
     WS(weakSelf);
     SHOWLOADING

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

@@ -14,6 +14,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, copy) FlowAttachmentsModel *   sendModel;
 @property (assign, nonatomic) BOOL                   isReturn;
 @property (assign, nonatomic) BOOL                   IsSelect;
+@property (nonatomic, assign) BOOL      isCheck;
 +(ShareCusVC *)initShareCusVC;
 @end
 

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

@@ -33,16 +33,18 @@
     self.view.backgroundColor = RGB(255, 255, 255);
      
     self.tableView.tableHeaderView = self.myHeaderView;
+    MyTDGroupView * groupView = [[MyTDGroupView alloc] initWithFrame:CGRectMake(0, 4 , SCREEN_WIDTH, 36)];
+    [self.myHeaderView addSubview:groupView];
+    self.myHeaderView.backgroundColor = UIColorHex(FFFFFF);
     WS(weakSelf);
-    UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithActionBlock:^(id  _Nonnull sender) {
+    [groupView.button setAction:^{
         MailListSearchVC *vc = [[MailListSearchVC alloc] init];
         vc.isReturn = weakSelf.isReturn;
         vc.sendModel = weakSelf.sendModel;
         vc.DepartmentId = 0;
-        vc.SearchType = 0;
+        vc.SearchType = 100;
         [weakSelf.navigationController pushViewController:vc animated:YES];
-     }];
-     [self.myHeaderView addGestureRecognizer:tap];
+    }];
     
     if (@available(iOS 11.0, *)) {
         self.tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
@@ -106,6 +108,7 @@
     cell.clipsToBounds = YES;
     NSDictionary *dic = self.dataSourceArray[indexPath.row];
     cell.cell0TitleLabel.text = dic[@"GroupName"];
+    cell.countL.text = [NSString stringWithFormat:@"%ld",[dic[@"UserCount"] integerValue]];
     return cell;
 }
 
@@ -119,6 +122,7 @@
     NSDictionary *dic = self.dataSourceArray[indexPath.row];
     vc.indexId = [dic[@"Id"] intValue];
     vc.pageType = MailListByZuPageType_custom;
+    vc.isCheck = self.isCheck;
     [self.navigationController pushViewController:vc animated:YES];
 }
 
@@ -126,9 +130,6 @@
 {
     if (!_myHeaderView) {
         _myHeaderView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, 44)];
-        MyTDGroupView * groupView = [[MyTDGroupView alloc] initWithFrame:CGRectMake(0, 4 , SCREEN_WIDTH, 36)];
-        [_myHeaderView addSubview:groupView];
-        _myHeaderView.backgroundColor = UIColorHex(FFFFFF);
     }
     return _myHeaderView;
 }

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

@@ -13,6 +13,7 @@ NS_ASSUME_NONNULL_BEGIN
 @interface ShareListVC : BaseViewController
 @property (nonatomic, copy) FlowAttachmentsModel *   sendModel;
 @property (assign, nonatomic) BOOL                   isReturn;
+@property (nonatomic, assign) BOOL      isCheck;
 +(ShareListVC *)initShareListVC;
 @end
 

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

@@ -35,16 +35,18 @@
     self.view.backgroundColor = RGB(255, 255, 255);
      
     self.tableView.tableHeaderView = self.myHeaderView;
+    MyTDGroupView * groupView = [[MyTDGroupView alloc] initWithFrame:CGRectMake(0, 4, SCREEN_WIDTH, 36)];
+    [self.myHeaderView addSubview:groupView];
+    self.myHeaderView.backgroundColor = UIColorHex(FFFFFF);
     WS(weakSelf);
-    UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithActionBlock:^(id  _Nonnull sender) {
+    [groupView.button setAction:^{
         MailListSearchVC *vc = [[MailListSearchVC alloc] init];
         vc.isReturn = weakSelf.isReturn;
         vc.sendModel = weakSelf.sendModel;
         vc.DepartmentId = 0;
-        vc.SearchType = 0;
+        vc.SearchType = 100;
         [weakSelf.navigationController pushViewController:vc animated:YES];
-     }];
-     [self.myHeaderView addGestureRecognizer:tap];
+    }];
     
     if (@available(iOS 11.0, *)) {
         self.tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
@@ -137,11 +139,13 @@
             if (indexPath.row == 0) {
                 ShareSysVC * vc = [ShareSysVC initShareSysVC];
                 vc.isReturn = self.isReturn;
+                vc.isCheck = self.isCheck;
                 vc.sendModel = self.sendModel;
                 [self.navigationController pushViewController:vc animated:YES];
             }else{
                 ShareCusVC * vc = [ShareCusVC initShareCusVC];
                 vc.isReturn = self.isReturn;
+                vc.isCheck = self.isCheck;
                 vc.sendModel = self.sendModel;
                 [self.navigationController pushViewController:vc animated:YES];
             }
@@ -180,9 +184,6 @@
 {
     if (!_myHeaderView) {
         _myHeaderView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, 44)];
-        MyTDGroupView * groupView = [[MyTDGroupView alloc] initWithFrame:CGRectMake(0, 4, SCREEN_WIDTH, 36)];
-        [_myHeaderView addSubview:groupView];
-        _myHeaderView.backgroundColor = UIColorHex(FFFFFF);
     }
     return _myHeaderView;
 }

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

@@ -14,6 +14,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, copy) FlowAttachmentsModel *   sendModel;
 @property (assign, nonatomic) BOOL                   isReturn;
 @property (assign, nonatomic) BOOL                   IsSelect;
+@property (nonatomic, assign) BOOL      isCheck;
 +(ShareSysVC *)initShareSysVC;
 @end
 

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

@@ -31,18 +31,20 @@
     [self getData];
     self.fd_prefersNavigationBarHidden = YES;
     self.view.backgroundColor = RGB(255, 255, 255);
-     
-    self.tableView.tableHeaderView = self.myHeaderView;
+    
+    MyTDGroupView * groupView = [[MyTDGroupView alloc] initWithFrame:CGRectMake(0, 4, SCREEN_WIDTH, 36)];
+    [self.myHeaderView addSubview:groupView];
+    self.myHeaderView.backgroundColor = UIColorHex(FFFFFF);
+    
     WS(weakSelf);
-    UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithActionBlock:^(id  _Nonnull sender) {
+    [groupView.button setAction:^{
         MailListSearchVC *vc = [[MailListSearchVC alloc] init];
         vc.isReturn = weakSelf.isReturn;
         vc.sendModel = weakSelf.sendModel;
         vc.DepartmentId = 0;
-        vc.SearchType = 0;
+        vc.SearchType = 100;
         [weakSelf.navigationController pushViewController:vc animated:YES];
-     }];
-     [self.myHeaderView addGestureRecognizer:tap];
+    }];
     
     if (@available(iOS 11.0, *)) {
         self.tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
@@ -52,6 +54,7 @@
     self.tableView.delegate = self;
     self.tableView.dataSource = self;
     self.tableView.backgroundColor = [UIColor clearColor];
+    self.tableView.tableHeaderView = self.myHeaderView;
 
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(messageReturnSuccess) name:MESSAGERETURNSUCCESS object:nil];
 }
@@ -106,6 +109,7 @@
     cell.clipsToBounds = YES;
     NSDictionary *dic = self.dataSourceArray[indexPath.row];
     cell.cell0TitleLabel.text = dic[@"Name"];
+    cell.countL.text = [NSString stringWithFormat:@"%ld",[dic[@"UserCount"] integerValue]];
 //    switch (indexPath.section) {
 //        case 0:{
 //           NSDictionary *dic = self.dataSourceArray[indexPath.section][indexPath.row];
@@ -145,9 +149,6 @@
 {
     if (!_myHeaderView) {
         _myHeaderView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, 44)];
-        MyTDGroupView * groupView = [[MyTDGroupView alloc] initWithFrame:CGRectMake(0, 4, SCREEN_WIDTH, 36)];
-        [_myHeaderView addSubview:groupView];
-        _myHeaderView.backgroundColor = UIColorHex(FFFFFF);
     }
     return _myHeaderView;
 }

smartRhino/Project/VCModel/ChatMessage/Controller/MailList/Model/Department.h

@@ -18,10 +18,11 @@
 @property (nonatomic ,assign) NSInteger TypeId;
 @property (nonatomic ,strong) NSString *Guid;
 @property (nonatomic ,assign) NSInteger Sort;
-
+@property (nonatomic ,assign) NSInteger UserCount;
 @property (nonatomic, strong) NSString *GroupName;
 @property (nonatomic, assign) NSInteger UserId;
-@property (nonatomic, assign) bool hasSon ;
+@property (nonatomic, assign) BOOL      IsChildren;
+@property (nonatomic, assign) bool hasSon;
 @property (nonatomic, assign) bool hadSelected ;
 
 /// 用户中间类型 1:通知收件人 2:通知抄送人 3:站内信收集人 4:站内信抄送人 5:话题 6:笔记共享文件夹 7:收藏共享文件夹

smartRhino/Project/VCModel/ChatMessage/Controller/MyTDGroup/Cell/TDGroupInfoDetailCell.h

@@ -27,6 +27,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (weak, nonatomic) IBOutlet UILabel *cell4LevelL;
 @property (weak, nonatomic) IBOutlet UILabel *cell4subL;
 @property (weak, nonatomic) IBOutlet UILabel *cell4TimeL;
+@property (weak, nonatomic) IBOutlet UILabel *subTitleL;
 
 
 + (TDGroupInfoDetailCell *)configCell0:(UITableView *)tableView indexPath:(NSIndexPath *)indexPath;

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

@@ -105,6 +105,12 @@
                         <nil key="textColor"/>
                         <nil key="highlightedColor"/>
                     </label>
+                    <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="本周" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="a41-lP-brE">
+                        <rect key="frame" x="261.5" y="24" width="29" height="17"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                        <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                        <nil key="highlightedColor"/>
+                    </label>
                 </subviews>
                 <constraints>
                     <constraint firstItem="GS3-Ox-3BP" firstAttribute="centerY" secondItem="ruO-kr-hzR" secondAttribute="centerY" id="8vr-EQ-D10"/>
@@ -112,6 +118,8 @@
                     <constraint firstItem="GS3-Ox-3BP" firstAttribute="leading" secondItem="ruO-kr-hzR" secondAttribute="leading" constant="15" id="HM7-1C-o5n"/>
                     <constraint firstAttribute="bottom" secondItem="zb5-cS-erR" secondAttribute="bottom" id="HgY-Rh-16R"/>
                     <constraint firstAttribute="trailing" secondItem="pWs-rh-7ci" secondAttribute="trailing" constant="15" id="OET-bZ-4Y9"/>
+                    <constraint firstItem="a41-lP-brE" firstAttribute="centerY" secondItem="ruO-kr-hzR" secondAttribute="centerY" id="aTX-7A-vDx"/>
+                    <constraint firstItem="pWs-rh-7ci" firstAttribute="leading" secondItem="a41-lP-brE" secondAttribute="trailing" constant="7" id="nbV-kT-9CK"/>
                     <constraint firstAttribute="trailing" secondItem="zb5-cS-erR" secondAttribute="trailing" id="tsc-ia-vdf"/>
                     <constraint firstItem="pWs-rh-7ci" firstAttribute="centerY" secondItem="ruO-kr-hzR" secondAttribute="centerY" id="xGv-bi-Rm8"/>
                 </constraints>
@@ -119,6 +127,7 @@
             <viewLayoutGuide key="safeArea" id="TaP-BK-Nwf"/>
             <connections>
                 <outlet property="cell1TitleL" destination="GS3-Ox-3BP" id="gMw-28-bKU"/>
+                <outlet property="subTitleL" destination="a41-lP-brE" id="AVD-9q-L1D"/>
             </connections>
             <point key="canvasLocation" x="-43" y="-24"/>
         </tableViewCell>

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

@@ -156,7 +156,7 @@
             break;
         case CollectModel_meetMian:
         {
-            iconV.image = IMG(@"会议");
+            iconV.image = IMG(@"会议纪要");
         }
             break;
         case CollectModel_CollectFile:

smartRhino/Project/VCModel/ChatMessage/Controller/MyTDGroup/Model/TDGroupInfoListModel.h

@@ -31,7 +31,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic,  copy) NSString                 *AvatarUrl;
 @property (nonatomic,  copy) NSString                 *CreatedDate;
 @property (nonatomic , copy) NSString                 *LabelName;
-
+@property (nonatomic , copy) NSString                 *CategroyName;
 @end
 
 NS_ASSUME_NONNULL_END

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

@@ -154,45 +154,6 @@
                                                     <constraint firstAttribute="height" constant="5" id="jwt-Al-TZo"/>
                                                 </constraints>
                                             </view>
-                                            <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="mYQ-U5-Lqa">
-                                                <rect key="frame" x="0.0" y="70" width="414" height="0.0"/>
-                                                <subviews>
-                                                    <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="小组介绍" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yWP-Lb-r1X">
-                                                        <rect key="frame" x="15.666666666666664" y="-10.333333333333329" width="69.333333333333343" height="21"/>
-                                                        <constraints>
-                                                            <constraint firstAttribute="width" relation="lessThanOrEqual" constant="100" id="RlQ-iQ-UqQ"/>
-                                                        </constraints>
-                                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                        <color key="textColor" red="0.039215686270000001" green="0.039215686270000001" blue="0.039215686270000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                                        <nil key="highlightedColor"/>
-                                                    </label>
-                                                    <textField hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入小组介绍" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="2ke-Ho-8aX">
-                                                        <rect key="frame" x="105" y="0.0" width="294" height="0.0"/>
-                                                        <constraints>
-                                                            <constraint firstAttribute="height" id="yN3-lW-9Na"/>
-                                                        </constraints>
-                                                        <color key="textColor" red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                        <textInputTraits key="textInputTraits"/>
-                                                    </textField>
-                                                </subviews>
-                                                <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
-                                                <constraints>
-                                                    <constraint firstItem="yWP-Lb-r1X" firstAttribute="centerY" secondItem="mYQ-U5-Lqa" secondAttribute="centerY" id="0VV-FT-DrW"/>
-                                                    <constraint firstItem="2ke-Ho-8aX" firstAttribute="leading" secondItem="yWP-Lb-r1X" secondAttribute="trailing" constant="20" id="AH3-ms-exX"/>
-                                                    <constraint firstAttribute="trailing" secondItem="2ke-Ho-8aX" secondAttribute="trailing" constant="15" id="I1C-ek-WNf"/>
-                                                    <constraint firstItem="yWP-Lb-r1X" firstAttribute="leading" secondItem="mYQ-U5-Lqa" secondAttribute="leading" constant="15.5" id="nTn-CX-sJG"/>
-                                                    <constraint firstItem="2ke-Ho-8aX" firstAttribute="centerY" secondItem="mYQ-U5-Lqa" secondAttribute="centerY" id="nbT-oY-GAX"/>
-                                                    <constraint firstAttribute="height" id="s9c-dq-6Rw"/>
-                                                </constraints>
-                                            </view>
-                                            <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="z5U-iQ-Yxe">
-                                                <rect key="frame" x="0.0" y="70" width="414" height="0.0"/>
-                                                <color key="backgroundColor" red="0.93333333330000001" green="0.93333333330000001" blue="0.93333333330000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                                <constraints>
-                                                    <constraint firstAttribute="height" id="sxL-Kz-VaX"/>
-                                                </constraints>
-                                            </view>
                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="SvT-qd-2ae">
                                                 <rect key="frame" x="0.0" y="70" width="414" height="65"/>
                                                 <subviews>
@@ -257,55 +218,104 @@
                                                     <constraint firstAttribute="height" constant="5" id="nxL-dH-iX4"/>
                                                 </constraints>
                                             </view>
-                                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="i3O-0B-he5">
-                                                <rect key="frame" x="0.0" y="140" width="414" height="85"/>
+                                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="SgR-fB-vtb">
+                                                <rect key="frame" x="0.0" y="140" width="414" height="65"/>
+                                                <subviews>
+                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="小组类型" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ozl-CQ-uyl">
+                                                        <rect key="frame" x="15.666666666666664" y="22" width="69.333333333333343" height="21"/>
+                                                        <constraints>
+                                                            <constraint firstAttribute="width" relation="lessThanOrEqual" constant="100" id="SSj-hD-oS7"/>
+                                                        </constraints>
+                                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                        <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="my_conter_rightArrow_hui_icon" translatesAutoresizingMaskIntoConstraints="NO" id="hhS-NV-hxg">
+                                                        <rect key="frame" x="391.33333333333331" y="25.666666666666657" width="7.6666666666666856" height="14"/>
+                                                    </imageView>
+                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="请选择" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="SpK-wJ-N6l">
+                                                        <rect key="frame" x="332.33333333333331" y="22" width="52" height="21"/>
+                                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                        <color key="textColor" red="0.73333333329999995" green="0.73333333329999995" blue="0.73333333329999995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                        <nil key="highlightedColor"/>
+                                                    </label>
+                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="QBE-dW-KFn">
+                                                        <rect key="frame" x="0.0" y="0.0" width="414" height="65"/>
+                                                    </button>
+                                                </subviews>
+                                                <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                                                <constraints>
+                                                    <constraint firstAttribute="height" constant="65" id="9ke-cI-Fdw"/>
+                                                    <constraint firstItem="Ozl-CQ-uyl" firstAttribute="centerY" secondItem="SgR-fB-vtb" secondAttribute="centerY" id="CEq-8A-Ytp"/>
+                                                    <constraint firstItem="hhS-NV-hxg" firstAttribute="leading" secondItem="SpK-wJ-N6l" secondAttribute="trailing" constant="7" id="EgY-f3-lCN"/>
+                                                    <constraint firstItem="QBE-dW-KFn" firstAttribute="top" secondItem="SgR-fB-vtb" secondAttribute="top" id="Eje-yO-CdH"/>
+                                                    <constraint firstItem="hhS-NV-hxg" firstAttribute="centerY" secondItem="SgR-fB-vtb" secondAttribute="centerY" id="RYo-MI-eIo"/>
+                                                    <constraint firstItem="Ozl-CQ-uyl" firstAttribute="leading" secondItem="SgR-fB-vtb" secondAttribute="leading" constant="15.5" id="YWa-xe-Jto"/>
+                                                    <constraint firstAttribute="trailing" secondItem="hhS-NV-hxg" secondAttribute="trailing" constant="15" id="d65-6v-cN5"/>
+                                                    <constraint firstAttribute="trailing" secondItem="QBE-dW-KFn" secondAttribute="trailing" id="fIQ-Iu-mQo"/>
+                                                    <constraint firstItem="QBE-dW-KFn" firstAttribute="leading" secondItem="SgR-fB-vtb" secondAttribute="leading" id="nP0-jN-fyH"/>
+                                                    <constraint firstItem="SpK-wJ-N6l" firstAttribute="centerY" secondItem="SgR-fB-vtb" secondAttribute="centerY" id="rko-cy-EiJ"/>
+                                                    <constraint firstAttribute="bottom" secondItem="QBE-dW-KFn" secondAttribute="bottom" id="tTn-Cu-XCQ"/>
+                                                </constraints>
+                                            </view>
+                                            <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="UXv-gC-2Fw">
+                                                <rect key="frame" x="0.0" y="205" width="414" height="5"/>
+                                                <color key="backgroundColor" red="0.93333333330000001" green="0.93333333330000001" blue="0.93333333330000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                <constraints>
+                                                    <constraint firstAttribute="height" constant="5" id="Ogv-3l-Bh6"/>
+                                                </constraints>
+                                            </view>
+                                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="9Vg-Ol-ofB">
+                                                <rect key="frame" x="0.0" y="210" width="414" height="85"/>
                                                 <subviews>
-                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="添加小组成员" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="VGd-HZ-lHK">
+                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="添加小组成员" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Vog-Tc-aSL">
                                                         <rect key="frame" x="15.666666666666671" y="20" width="104" height="21"/>
                                                         <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                         <color key="textColor" red="0.039215686270000001" green="0.039215686270000001" blue="0.039215686270000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                         <nil key="highlightedColor"/>
                                                     </label>
-                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="添加后,需等待对方验证同意加入本小组" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7dA-Pq-uer">
+                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="添加后,需等待对方验证同意加入本小组" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="AvP-dB-Kqb">
                                                         <rect key="frame" x="15" y="49" width="230" height="16"/>
                                                         <fontDescription key="fontDescription" type="system" pointSize="13"/>
-                                                        <color key="textColor" red="0.73333333333333328" green="0.73333333333333328" blue="0.73333333333333328" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                        <color key="textColor" red="0.73333333329999995" green="0.73333333329999995" blue="0.73333333329999995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                         <nil key="highlightedColor"/>
                                                     </label>
-                                                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="chatmsg_icon_circleAdd" translatesAutoresizingMaskIntoConstraints="NO" id="G8i-U7-0M8">
+                                                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="chatmsg_icon_circleAdd" translatesAutoresizingMaskIntoConstraints="NO" id="pSr-vX-3mQ">
                                                         <rect key="frame" x="378" y="20" width="21" height="21"/>
                                                     </imageView>
-                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="mJU-tn-nhp">
-                                                        <rect key="frame" x="0.0" y="0.0" width="414" height="85"/>
+                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="4Us-eo-UPi">
+                                                        <rect key="frame" x="354" y="0.0" width="60" height="85"/>
+                                                        <constraints>
+                                                            <constraint firstAttribute="width" constant="60" id="52T-j8-ote"/>
+                                                        </constraints>
                                                         <connections>
-                                                            <action selector="userDidAddFriendeAction:" destination="7wU-uu-Vpn" eventType="touchUpInside" id="Yut-kE-7Ra"/>
+                                                            <action selector="userDidAddFriendeAction:" destination="7wU-uu-Vpn" eventType="touchUpInside" id="qtp-hX-t2b"/>
                                                         </connections>
                                                     </button>
                                                 </subviews>
                                                 <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
                                                 <constraints>
-                                                    <constraint firstAttribute="trailing" secondItem="G8i-U7-0M8" secondAttribute="trailing" constant="15" id="8Ii-pN-3zt"/>
-                                                    <constraint firstItem="G8i-U7-0M8" firstAttribute="centerY" secondItem="VGd-HZ-lHK" secondAttribute="centerY" id="Gez-I4-Abk"/>
-                                                    <constraint firstAttribute="trailing" secondItem="mJU-tn-nhp" secondAttribute="trailing" id="MTf-oi-I7V"/>
-                                                    <constraint firstItem="mJU-tn-nhp" firstAttribute="leading" secondItem="i3O-0B-he5" secondAttribute="leading" id="REN-J0-u2y"/>
-                                                    <constraint firstItem="mJU-tn-nhp" firstAttribute="top" secondItem="i3O-0B-he5" secondAttribute="top" id="bcl-6h-cTK"/>
-                                                    <constraint firstItem="7dA-Pq-uer" firstAttribute="leading" secondItem="i3O-0B-he5" secondAttribute="leading" constant="15" id="ffP-Ru-ri3"/>
-                                                    <constraint firstAttribute="bottom" secondItem="7dA-Pq-uer" secondAttribute="bottom" constant="20" id="im7-vf-rfY"/>
-                                                    <constraint firstAttribute="height" constant="85" id="nTj-xn-ERh"/>
-                                                    <constraint firstAttribute="bottom" secondItem="mJU-tn-nhp" secondAttribute="bottom" id="qay-Ga-wRQ"/>
-                                                    <constraint firstItem="VGd-HZ-lHK" firstAttribute="top" secondItem="i3O-0B-he5" secondAttribute="top" constant="20" id="xNS-VE-wgw"/>
-                                                    <constraint firstItem="VGd-HZ-lHK" firstAttribute="leading" secondItem="i3O-0B-he5" secondAttribute="leading" constant="15.5" id="zYF-AE-PrZ"/>
+                                                    <constraint firstAttribute="bottom" secondItem="4Us-eo-UPi" secondAttribute="bottom" id="0wr-Md-byl"/>
+                                                    <constraint firstItem="Vog-Tc-aSL" firstAttribute="top" secondItem="9Vg-Ol-ofB" secondAttribute="top" constant="20" id="4ey-p2-ZkF"/>
+                                                    <constraint firstItem="pSr-vX-3mQ" firstAttribute="centerY" secondItem="Vog-Tc-aSL" secondAttribute="centerY" id="IrD-hF-kms"/>
+                                                    <constraint firstAttribute="height" constant="85" id="Iz5-hp-RHF"/>
+                                                    <constraint firstAttribute="bottom" secondItem="AvP-dB-Kqb" secondAttribute="bottom" constant="20" id="JCh-ym-QwO"/>
+                                                    <constraint firstAttribute="trailing" secondItem="pSr-vX-3mQ" secondAttribute="trailing" constant="15" id="JJS-Av-OWk"/>
+                                                    <constraint firstItem="AvP-dB-Kqb" firstAttribute="leading" secondItem="9Vg-Ol-ofB" secondAttribute="leading" constant="15" id="NFJ-dF-Mmm"/>
+                                                    <constraint firstItem="4Us-eo-UPi" firstAttribute="top" secondItem="9Vg-Ol-ofB" secondAttribute="top" id="Pae-Xa-Zhv"/>
+                                                    <constraint firstAttribute="trailing" secondItem="4Us-eo-UPi" secondAttribute="trailing" id="oe5-Ik-xc0"/>
+                                                    <constraint firstItem="Vog-Tc-aSL" firstAttribute="leading" secondItem="9Vg-Ol-ofB" secondAttribute="leading" constant="15.5" id="zwA-et-TcW"/>
                                                 </constraints>
                                             </view>
                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="nu7-D4-IkT">
-                                                <rect key="frame" x="0.0" y="225" width="414" height="0.66666666666665719"/>
+                                                <rect key="frame" x="0.0" y="295" width="414" height="0.66666666666668561"/>
                                                 <color key="backgroundColor" red="0.93333333330000001" green="0.93333333330000001" blue="0.93333333330000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <constraints>
                                                     <constraint firstAttribute="height" constant="0.5" id="Gve-1a-1cO"/>
                                                 </constraints>
                                             </view>
                                             <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="RJe-GP-VBB">
-                                                <rect key="frame" x="0.0" y="225.66666666666671" width="414" height="447.33333333333326"/>
+                                                <rect key="frame" x="0.0" y="295.66666666666674" width="414" height="377.33333333333326"/>
                                                 <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
                                             </tableView>
                                         </subviews>
@@ -314,30 +324,31 @@
                                             <constraint firstItem="pPR-Hc-CTp" firstAttribute="leading" secondItem="Mc6-9i-hHY" secondAttribute="leading" id="4Vl-jy-uGa"/>
                                             <constraint firstItem="vHL-5k-GeP" firstAttribute="leading" secondItem="Mc6-9i-hHY" secondAttribute="leading" id="4l2-HR-l4R"/>
                                             <constraint firstAttribute="trailing" secondItem="rI2-6m-Ahp" secondAttribute="trailing" id="4z0-Zz-Nkr"/>
-                                            <constraint firstItem="z5U-iQ-Yxe" firstAttribute="leading" secondItem="Mc6-9i-hHY" secondAttribute="leading" id="BMR-gi-uUv"/>
+                                            <constraint firstItem="9Vg-Ol-ofB" firstAttribute="top" secondItem="UXv-gC-2Fw" secondAttribute="bottom" id="8df-1H-zIW"/>
                                             <constraint firstItem="pPR-Hc-CTp" firstAttribute="top" secondItem="SvT-qd-2ae" secondAttribute="bottom" id="DeM-6v-icj"/>
+                                            <constraint firstItem="UXv-gC-2Fw" firstAttribute="top" secondItem="SgR-fB-vtb" secondAttribute="bottom" id="H9y-uA-82h"/>
+                                            <constraint firstItem="nu7-D4-IkT" firstAttribute="top" secondItem="9Vg-Ol-ofB" secondAttribute="bottom" id="HyM-i9-x9N"/>
                                             <constraint firstItem="vHL-5k-GeP" firstAttribute="top" secondItem="rI2-6m-Ahp" secondAttribute="bottom" id="IOU-vg-4rK"/>
                                             <constraint firstAttribute="bottom" secondItem="RJe-GP-VBB" secondAttribute="bottom" id="MgI-wW-uai"/>
                                             <constraint firstItem="RJe-GP-VBB" firstAttribute="leading" secondItem="Mc6-9i-hHY" secondAttribute="leading" id="PgM-uV-Xsm"/>
-                                            <constraint firstAttribute="trailing" secondItem="z5U-iQ-Yxe" secondAttribute="trailing" id="Rtu-z8-rIP"/>
+                                            <constraint firstItem="UXv-gC-2Fw" firstAttribute="leading" secondItem="Mc6-9i-hHY" secondAttribute="leading" id="QVh-8G-0gk"/>
                                             <constraint firstItem="nu7-D4-IkT" firstAttribute="leading" secondItem="Mc6-9i-hHY" secondAttribute="leading" id="TG4-nk-RY1"/>
-                                            <constraint firstItem="mYQ-U5-Lqa" firstAttribute="top" secondItem="vHL-5k-GeP" secondAttribute="bottom" id="U26-fh-xna"/>
+                                            <constraint firstAttribute="trailing" secondItem="SgR-fB-vtb" secondAttribute="trailing" id="Tca-u6-U5T"/>
+                                            <constraint firstItem="9Vg-Ol-ofB" firstAttribute="leading" secondItem="Mc6-9i-hHY" secondAttribute="leading" id="Tcl-R3-AU2"/>
                                             <constraint firstAttribute="trailing" secondItem="nu7-D4-IkT" secondAttribute="trailing" id="UvZ-W1-yoe"/>
-                                            <constraint firstItem="nu7-D4-IkT" firstAttribute="top" secondItem="i3O-0B-he5" secondAttribute="bottom" id="YFL-Qd-fQX"/>
-                                            <constraint firstItem="SvT-qd-2ae" firstAttribute="top" secondItem="z5U-iQ-Yxe" secondAttribute="bottom" id="ZJM-Rr-3Ys"/>
+                                            <constraint firstItem="SvT-qd-2ae" firstAttribute="top" secondItem="vHL-5k-GeP" secondAttribute="bottom" id="VlH-ep-tvx"/>
+                                            <constraint firstAttribute="trailing" secondItem="UXv-gC-2Fw" secondAttribute="trailing" id="WvH-EP-ELt"/>
                                             <constraint firstItem="rI2-6m-Ahp" firstAttribute="top" secondItem="Mc6-9i-hHY" secondAttribute="top" id="ahr-bH-70g"/>
+                                            <constraint firstItem="SgR-fB-vtb" firstAttribute="leading" secondItem="Mc6-9i-hHY" secondAttribute="leading" id="dbU-dh-d9E"/>
                                             <constraint firstAttribute="trailing" secondItem="SvT-qd-2ae" secondAttribute="trailing" id="djg-31-sdg"/>
                                             <constraint firstItem="RJe-GP-VBB" firstAttribute="top" secondItem="nu7-D4-IkT" secondAttribute="bottom" id="fh3-8J-01h"/>
                                             <constraint firstItem="rI2-6m-Ahp" firstAttribute="leading" secondItem="Mc6-9i-hHY" secondAttribute="leading" id="ieg-bA-kvb"/>
-                                            <constraint firstAttribute="trailing" secondItem="i3O-0B-he5" secondAttribute="trailing" id="kpI-Q4-8jg"/>
+                                            <constraint firstItem="UXv-gC-2Fw" firstAttribute="top" secondItem="SgR-fB-vtb" secondAttribute="bottom" id="m3Y-P4-3oc"/>
                                             <constraint firstAttribute="trailing" secondItem="vHL-5k-GeP" secondAttribute="trailing" id="mIu-yh-gGW"/>
-                                            <constraint firstItem="z5U-iQ-Yxe" firstAttribute="top" secondItem="mYQ-U5-Lqa" secondAttribute="bottom" id="no6-Mn-QXy"/>
-                                            <constraint firstItem="i3O-0B-he5" firstAttribute="top" secondItem="pPR-Hc-CTp" secondAttribute="bottom" id="ohK-st-IZv"/>
-                                            <constraint firstAttribute="trailing" secondItem="mYQ-U5-Lqa" secondAttribute="trailing" id="sp2-uC-F0O"/>
-                                            <constraint firstItem="i3O-0B-he5" firstAttribute="leading" secondItem="Mc6-9i-hHY" secondAttribute="leading" id="tTF-eT-RGp"/>
+                                            <constraint firstItem="SgR-fB-vtb" firstAttribute="top" secondItem="pPR-Hc-CTp" secondAttribute="bottom" id="qRA-dk-e9X"/>
                                             <constraint firstAttribute="trailing" secondItem="pPR-Hc-CTp" secondAttribute="trailing" id="vey-az-tJU"/>
                                             <constraint firstAttribute="trailing" secondItem="RJe-GP-VBB" secondAttribute="trailing" id="wkf-QM-gmk"/>
-                                            <constraint firstItem="mYQ-U5-Lqa" firstAttribute="leading" secondItem="Mc6-9i-hHY" secondAttribute="leading" id="xoT-1f-sFD"/>
+                                            <constraint firstAttribute="trailing" secondItem="9Vg-Ol-ofB" secondAttribute="trailing" id="yPY-A7-DzR"/>
                                             <constraint firstItem="SvT-qd-2ae" firstAttribute="leading" secondItem="Mc6-9i-hHY" secondAttribute="leading" id="zHs-Jd-9d5"/>
                                         </constraints>
                                     </view>
@@ -369,9 +380,10 @@
                     </view>
                     <navigationItem key="navigationItem" id="jGr-7V-GBX"/>
                     <connections>
+                        <outlet property="GroupTypeBtn" destination="QBE-dW-KFn" id="e6g-77-R8d"/>
+                        <outlet property="GroupTypeL" destination="SpK-wJ-N6l" id="sjd-dN-2Qp"/>
                         <outlet property="avatarTipLab" destination="URR-1U-N9T" id="Zei-BT-s0h"/>
                         <outlet property="groupImgView" destination="qiB-rf-DfY" id="bTa-X9-Ert"/>
-                        <outlet property="groupIntroTf" destination="2ke-Ho-8aX" id="gYO-6a-pL2"/>
                         <outlet property="groupNameTf" destination="gPg-Z1-z1P" id="CQv-JC-h66"/>
                         <outlet property="rightSureBtn" destination="Z1Y-Sd-Lrr" id="8pM-gK-5m3"/>
                         <outlet property="tableView" destination="RJe-GP-VBB" id="KWF-hZ-28T"/>

smartRhino/Project/VCModel/ChatMessage/Controller/MyTDGroup/VC/ChatNewRowVC.m

@@ -15,27 +15,35 @@
 #import "TDGroupQrcodeVC.h"
 #import "TDGroupInfoListModel.h"
 #import "NewRowUserCell.h"
+#import "MOFSPickerManager.h"
+#import "GroupSquareModel.h"
 
 @interface ChatNewRowVC ()<UITableViewDelegate,UITableViewDataSource,UITextFieldDelegate>
 
 @property (strong,nonatomic) IBOutlet UIButton *rightSureBtn;
 
 @property (weak, nonatomic) IBOutlet UITextField *groupNameTf;
-@property (weak, nonatomic) IBOutlet UITextField *groupIntroTf;
+@property (weak, nonatomic) IBOutlet UILabel *GroupTypeL;
+@property (weak, nonatomic) IBOutlet UIButton *GroupTypeBtn;
+
 @property (weak, nonatomic) IBOutlet UIImageView *groupImgView;
 @property (weak, nonatomic) IBOutlet UILabel *avatarTipLab;
 @property (weak, nonatomic) IBOutlet UITableView *tableView;
 
-@property (nonatomic, strong) NSString *groupName ;
+@property (nonatomic, strong) NSString *groupName;
 @property (nonatomic, strong) NSString *groupIntroduce ;
-@property (nonatomic, strong) NSString *avatarUrl ;
-@property (nonatomic, strong) NSString *imId ;
-@property (nonatomic, strong) UIImage *groupImage ;
+@property (nonatomic, strong) NSString *avatarUrl;
+@property (nonatomic, strong) NSString *imId;
+@property (nonatomic, strong) UIImage *groupImage;
+@property (nonatomic, strong) NSMutableArray * dataArray;
+@property (nonatomic, strong) NSMutableArray * showArray;
 @property (nonatomic, strong) NSMutableArray * selectArray;
 @property (nonatomic, strong) NSMutableArray * selectIdArray;
-@property (nonatomic, assign) bool isWords;
-@property (nonatomic, assign) bool isAdmin;
-@property (nonatomic, assign) bool isUDisturb ;
+@property (nonatomic, assign) NSInteger        selectId;
+
+@property (nonatomic, assign) BOOL isWords;
+@property (nonatomic, assign) BOOL isAdmin;
+@property (nonatomic, assign) BOOL isUDisturb ;
 
 @end
 
@@ -58,16 +66,59 @@
         [weakSelf createGroupChat];
     }];
     self.groupNameTf.delegate = self;
-    self.groupIntroTf.delegate = self;
     self.groupNameTf.returnKeyType = UIReturnKeyDone;
-    self.groupIntroTf.returnKeyType = UIReturnKeyDone;
     [self.groupNameTf becomeFirstResponder];
+    [self.GroupTypeBtn setAction:^{
+        [weakSelf.groupNameTf resignFirstResponder];
+        if (weakSelf.showArray.count > 0) {
+            [weakSelf showType];
+        }
+    }];
+    [self getData];
+}
+- (void)getData
+{
+    WS(weakSelf);
+    self.dataArray = [NSMutableArray array];
+    self.showArray = [NSMutableArray array];
+    SHOWLOADING
+    NSString * url = [NSString stringWithFormat:@"%@%@",Host(API_APP_GROUP_Group_Category),@"0"];
+    [[HttpManager sharedHttpManager] GET:url parameters:@{} success:^(NSURLSessionDataTask * _Nonnull task, id  _Nullable responseObject) {
+        NSLog(@"%@",responseObject);
+        REMOVESHOW
+        if ([responseObject isKindOfClass:[NSArray class]]) {
+            for (NSDictionary * dict in responseObject) {
+                GroupSquareModel * model = [GroupSquareModel modelWithDictionary:dict];
+                [weakSelf.dataArray addObject:model];
+                [weakSelf.showArray addObject:model.PiazzaName];
+            }
+        }
+    } failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) {
+        REMOVESHOW
+    }];
+}
+- (void)showType
+{
+    WS(weakSelf);
+    [MOFSPickerManager shareManger].pickView.toolBar.cancelBar.textColor = UIColorHex(#888888);
+    [MOFSPickerManager shareManger].pickView.toolBar.commitBar.textColor  =  UIColorHex(#3979D3);
+    MOFSPickerManager *manager = [[MOFSPickerManager alloc] init];
+    [manager showPickerViewWithDataArray:self.showArray tag:2 title:nil cancelTitle:@"取消" commitTitle:@"确定" commitBlock:^(NSString *string) {
+        for (GroupSquareModel * model in weakSelf.dataArray) {
+            if ([model.PiazzaName isEqualToString:string]) {
+                weakSelf.selectId = model.Id;
+                dispatch_async(dispatch_get_main_queue(), ^{
+                    weakSelf.GroupTypeL.text = string;
+                });
+            }
+        }
+    } cancelBlock:^{
+        
+    }];
 }
-
 -(IBAction)userDidUpImgAction:(id)sender{
     WEAKSELF
     [self.groupNameTf resignFirstResponder];
-    [self.groupIntroTf resignFirstResponder];
     [[ShowPhotoCameraAlertView initShowPhotoCameraAlertViewConfirm:^(ShowPhotoCameraType type) {
         if(type == ShowPhotoCameraType1){
             [[LYLPhotoTailoringTool sharedTool] selectPhotoWithPhoroOrCamera:SelectPhotoWithTypePhoroOrCamera2 crop:YES showImgBlock:^(NSString *imageUrlStr) {
@@ -170,12 +221,10 @@
     }else{
         self.groupName = self.groupNameTf.text;
     }
-//    if (self.groupIntroTf.text.length==0) {
-//        SHOWERROR(@"请添加小组介绍")
-//        return;
-//    }else{
-//        self.groupIntroduce = self.groupIntroTf.text;
-//    }
+    if ([self.GroupTypeL.text isEqualToString:@"请选择"]) {
+        SHOWERROR(@"请选择小组类型")
+        return;
+    }
     WEAKSELF
     self.rightSureBtn.enabled = NO;
     if (self.groupImage) {
@@ -204,6 +253,7 @@
     [dict setValue:@"" forKey:@"QRCoder"];
     [dict setValue:@(self.isUDisturb) forKey:@"IsUDisturb"];
     [dict setValue:@(self.GroupFolderId) forKey:@"GroupFolderId"];
+    [dict setValue:@(self.selectId) forKey:@"GroupCategroyId"];
 
     WS(weakSelf);
     SHOWLOADING

smartRhino/Project/VCModel/ChatMessage/Controller/MyTDGroup/VC/MyTDGroupViewController.m

@@ -39,7 +39,6 @@
 @property (nonatomic, assign) NSUInteger  currentPage;
 @property (nonatomic, assign) NSUInteger  totalPage;
 @property (nonatomic, assign) NSUInteger  totalRecord;
-@property (nonatomic, assign) BOOL        isFresh;
 @property (nonatomic, assign) BOOL        isAllSelect;
 
 @property (nonatomic, assign) Boolean iSViewEditor;
@@ -56,6 +55,7 @@
     [super viewDidLoad];
     self.fd_prefersNavigationBarHidden = YES;
     [self addNavbarView];
+    [self setTableViewRefresh];
     [self initBottomBgView];
     [self changeToOperation:NO];
     self.iSViewEditor = NO;
@@ -65,7 +65,6 @@
 }
 - (void)viewWillAppear:(BOOL)animated{
     [super viewWillAppear:animated];
-    [self setTableViewRefresh];
     [self headRefresh];
 }
 - (void)addNavbarView
@@ -256,6 +255,9 @@
     SHOWLOADING
     [[HttpManager sharedHttpManager] POSTUrl:Host(APP_Group_Find) parameters:paraDict responseStyle:JOSN success:^(id  _Nonnull responseObject) {
         NSLog(@"%@",responseObject);
+        if (weakSelf.currentPage == 1) {
+            [weakSelf.dataArray removeAllObjects];
+        }
         REMOVESHOW
         NoticeListModel *listModel = [[NoticeListModel alloc] initWithDictionary:responseObject error:nil];
         weakSelf.totalRecord = listModel.Total;
@@ -287,15 +289,12 @@
 }
 
 - (void)headRefresh{
-    self.isFresh = YES;
     self.currentPage = 1;
     self.totalPage = 1;
-    [self.dataArray removeAllObjects];
     [self getData];
 }
 
 - (void)footerRefresh{
-    self.isFresh = NO;
     self.currentPage += 1;
     if (self.totalRecord == self.dataArray.count) {
         self.currentPage --;
@@ -348,7 +347,6 @@
     self.currentPage = 1;
     self.totalPage = 1;
     [self.dataArray removeAllObjects];
-
     WS(weakSelf);
     NSDictionary * paraDict = @{@"GroupFolderId":@(self.ParentId),
                                 @"UserId":@([AppUserModel sharedAppUserModel].Id),

smartRhino/Project/VCModel/ChatMessage/Controller/MyTDGroup/VC/TDGroupRoleVC.m

@@ -8,9 +8,13 @@
 
 #import "TDGroupRoleVC.h"
 #import "TDGroupInfoDetailCell.h"
+#import "MOFSPickerManager.h"
+#import "GroupSquareModel.h"
 
 @interface TDGroupRoleVC ()<UITableViewDelegate,UITableViewDataSource>
 @property (weak, nonatomic) IBOutlet UITableView *tableView;
+@property (nonatomic, strong) NSMutableArray * dataArray;
+@property (nonatomic, strong) NSMutableArray * showArray;
 @end
 
 @implementation TDGroupRoleVC
@@ -24,6 +28,51 @@
     self.view.backgroundColor = UIColorHex(0xF1F1F1);
     self.tableView.delegate = self;
     self.tableView.dataSource = self;
+    [self getData];
+}
+- (void)getData
+{
+    WS(weakSelf);
+    self.dataArray = [NSMutableArray array];
+    self.showArray = [NSMutableArray array];
+    SHOWLOADING
+    NSString * url = [NSString stringWithFormat:@"%@%@",Host(API_APP_GROUP_Group_Category),@"0"];
+    [[HttpManager sharedHttpManager] GET:url parameters:@{} success:^(NSURLSessionDataTask * _Nonnull task, id  _Nullable responseObject) {
+        NSLog(@"%@",responseObject);
+        REMOVESHOW
+        if ([responseObject isKindOfClass:[NSArray class]]) {
+            for (NSDictionary * dict in responseObject) {
+                GroupSquareModel * model = [GroupSquareModel modelWithDictionary:dict];
+                [weakSelf.dataArray addObject:model];
+                [weakSelf.showArray addObject:model.PiazzaName];
+            }
+        }
+    } failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) {
+        REMOVESHOW
+    }];
+}
+- (void)showType
+{
+    WS(weakSelf);
+    [MOFSPickerManager shareManger].pickView.toolBar.cancelBar.textColor = UIColorHex(#888888);
+    [MOFSPickerManager shareManger].pickView.toolBar.commitBar.textColor  =  UIColorHex(#3979D3);
+    MOFSPickerManager *manager = [[MOFSPickerManager alloc] init];
+    [manager showPickerViewWithDataArray:self.showArray tag:2 title:nil cancelTitle:@"取消" commitTitle:@"确定" commitBlock:^(NSString *string) {
+        for (GroupSquareModel * model in weakSelf.dataArray) {
+            if ([model.PiazzaName isEqualToString:string]) {
+                weakSelf.model.CategroyName = string;
+                [[HttpManager sharedHttpManager] POSTUrl:Host(APP_Group_Update) parameters:@{@"GroupCategroyId":@(model.Id),@"Id":@(weakSelf.model.Id)} responseStyle:DATA success:^(id  _Nonnull responseObject) {
+                    dispatch_async(dispatch_get_main_queue(), ^{
+                        [weakSelf.tableView reloadData];
+                    });
+                } failure:^(NSError * _Nonnull error) {
+                    SHOWERROR([ZYCTool handerResultData:error]);
+                }];
+            }
+        }
+    } cancelBlock:^{
+        
+    }];
 }
 #pragma mark - UITableViewDelegate
 - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
@@ -32,7 +81,7 @@
 }
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
 {
-    return 3;
+    return 4;
 }
 - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
 {
@@ -47,7 +96,7 @@
             TDGroupInfoDetailCell *cell = [TDGroupInfoDetailCell configCell2:tableView indexPath:indexPath];
             cell.cell2TitleL.text = @"加入小组需要管理员同意";
             [cell.cell2Switch setBlockForControlEvents:UIControlEventValueChanged block:^(id  _Nonnull sender) {
-                [[HttpManager sharedHttpManager] POSTUrl:Host(APP_Group_Update) parameters:@{@"IsAdmin":cell.cell2Switch.isOn ? @"1" : @"2",@"Id":@(weakSelf.model.Id)} responseStyle:DATA success:^(id  _Nonnull responseObject) {
+                [[HttpManager sharedHttpManager] POSTUrl:Host(APP_Group_Update) parameters:@{@"IsAdmin":cell.cell2Switch.isOn ? @(1) : @(2),@"Id":@(weakSelf.model.Id)} responseStyle:DATA success:^(id  _Nonnull responseObject) {
                     if (weakSelf.refreshBlock) {
                         weakSelf.refreshBlock();
                     }
@@ -76,7 +125,7 @@
             return cell;
         }
             break;
-        default:
+        case 2:
         {
             TDGroupInfoDetailCell *cell = [TDGroupInfoDetailCell configCell2:tableView indexPath:indexPath];
             cell.cell2TitleL.text = @"小组广场可见";
@@ -93,6 +142,24 @@
             return cell;
         }
             break;
+        default:
+        {
+            TDGroupInfoDetailCell *cell = [TDGroupInfoDetailCell configCell1:tableView indexPath:indexPath];
+            cell.cell1TitleL.text = @"小组类型";
+            cell.subTitleL.hidden = NO;
+            cell.subTitleL.text = self.model.CategroyName;
+            return cell;
+        }
+            break;
     }
 }
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    if (indexPath.row == 3) {
+        if (self.showArray.count > 0) {
+            [self showType];
+        }
+    }
+}
+
 @end

smartRhino/Project/VCModel/ChatMessage/Controller/MyTDGroup/VC/TDQrJoinVC.m

@@ -48,32 +48,30 @@
 //            [self.navigationController popToRootViewControllerAnimated:NO];
 //        });
 //    }else{
-        [[HttpManager sharedHttpManager] POSTUrl:Host(APP_Group_Insert_User) parameters:paraDict responseStyle:DATA success:^(id  _Nonnull responseObject) {
-            NSString *data = [[NSString alloc] initWithData:responseObject encoding:NSUTF8StringEncoding];
-            if ([data isEqualToString:@"true"]) {
-                dispatch_async(dispatch_get_main_queue(), ^{
-                    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-                        [[NSNotificationCenter defaultCenter] postNotificationName:PUSHTDGROUPCOTROLLER object:nil userInfo:weakSelf.dict];
-//                        [weakSelf.navigationController popToRootViewControllerAnimated:NO];
-                    });
-                });
-            }else{
-                dispatch_async(dispatch_get_main_queue(), ^{
-                    UIAlertController *alert = [UIAlertController alertControllerWithTitle:@"提示" message:@"你的申请已提交，请耐心等候!" preferredStyle:(UIAlertControllerStyleAlert)];
-                    UIAlertAction * sureAction = [UIAlertAction actionWithTitle:@"确定" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
-                        dispatch_async(dispatch_get_main_queue(), ^{
-                            [weakSelf.navigationController popToRootViewControllerAnimated:NO];
-                        });
-                    }];
-                    [alert addAction:sureAction];
-                    [weakSelf presentViewController:alert animated:YES completion:^{
-                        
-                    }];
+    [[HttpManager sharedHttpManager] POSTUrl:Host(APP_Group_Insert_User) parameters:paraDict responseStyle:JOSN success:^(id  _Nonnull responseObject) {
+        if ([responseObject[@"Code"] integerValue] == 200) {
+            dispatch_async(dispatch_get_main_queue(), ^{
+                dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+                    [[NSNotificationCenter defaultCenter] postNotificationName:PUSHTDGROUPCOTROLLER object:nil userInfo:weakSelf.dict];
                 });
-            }
-        } failure:^(NSError * _Nonnull error) {
-            SHOWERROR([ZYCTool handerResultData:error]);
-        }];
+            });
+        }else{
+            dispatch_async(dispatch_get_main_queue(), ^{
+                UIAlertController *alert = [UIAlertController alertControllerWithTitle:@"提示" message:@"你的申请已提交，请耐心等候!" preferredStyle:(UIAlertControllerStyleAlert)];
+                UIAlertAction * sureAction = [UIAlertAction actionWithTitle:@"确定" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
+                    dispatch_async(dispatch_get_main_queue(), ^{
+                        [weakSelf.navigationController popToRootViewControllerAnimated:NO];
+                    });
+                }];
+                [alert addAction:sureAction];
+                [weakSelf presentViewController:alert animated:YES completion:^{
+                    
+                }];
+            });
+        }
+    } failure:^(NSError * _Nonnull error) {
+        SHOWERROR([ZYCTool handerResultData:error]);
+    }];
 //    }
 }
 

smartRhino/Project/VCModel/ChatMessage/Controller/TDInternalLeter/contoller/TDInterLeterHomeViewController.m

@@ -573,6 +573,7 @@
                                     [self setIntroLabelWithModel:model introLabel:cell.cell2IntroLabel unreadNumberLabel:cell.cell2UnReadNumberLbl];
                                     cell.cell2TimeLabel.text = [NSDate getTimeStringAutoShort2:model.CreatedDate];
                                     cell.IsTopImgV.hidden = !model.IsTop;
+                                    cell.topConstant.constant = model.IsTop ? 130.f : 90.f;
                                     cell.cell2RedBgView.hidden = model.IsRead;
                                     return cell;
                                 }
@@ -585,6 +586,7 @@
                                     [self setIntroLabelWithModel:model introLabel:cell.cell2IntroLabel unreadNumberLabel:cell.cell2UnReadNumberLbl];
                                     cell.cell2TimeLabel.text = [NSDate getTimeStringAutoShort2:model.CreatedDate];
                                     cell.cell2RedBgView.hidden = model.IsRead;
+                                    cell.topConstant.constant = model.IsTop ? 130.f : 90.f;
                                     cell.IsTopImgV.hidden = !model.IsTop;
                                     return cell;
                                 }
@@ -597,6 +599,7 @@
                                     [self setIntroLabelWithModel:model introLabel:cell.cell2IntroLabel unreadNumberLabel:cell.cell2UnReadNumberLbl];
                                     cell.cell2TimeLabel.text = [NSDate getTimeStringAutoShort2:model.CreatedDate];
                                     cell.cell2RedBgView.hidden = model.IsRead;
+                                    cell.topConstant.constant = model.IsTop ? 130.f : 90.f;
                                     cell.IsTopImgV.hidden = !model.IsTop;
                                     return cell;
                                 }
@@ -609,6 +612,7 @@
                                     [self setIntroLabelWithModel:model introLabel:cell.cell2IntroLabel unreadNumberLabel:cell.cell2UnReadNumberLbl];
                                     cell.cell2TimeLabel.text = [NSDate getTimeStringAutoShort2:model.CreatedDate];
                                     cell.cell2RedBgView.hidden = model.IsRead;
+                                    cell.topConstant.constant = model.IsTop ? 130.f : 90.f;
                                     cell.IsTopImgV.hidden = !model.IsTop;
                                     return cell;
                                 }
@@ -621,6 +625,7 @@
                                     [self setIntroLabelWithModel:model introLabel:cell.cell2IntroLabel unreadNumberLabel:cell.cell2UnReadNumberLbl];
                                     cell.cell2TimeLabel.text = [NSDate getTimeStringAutoShort2:model.CreatedDate];
                                     cell.cell2RedBgView.hidden = model.IsRead;
+                                    cell.topConstant.constant = model.IsTop ? 130.f : 90.f;
                                     cell.IsTopImgV.hidden = !model.IsTop;
                                     return cell;
                                 }
@@ -633,6 +638,7 @@
                                     [self setIntroLabelWithModel:model introLabel:cell.cell2IntroLabel unreadNumberLabel:cell.cell2UnReadNumberLbl];
                                     cell.cell2TimeLabel.text = [NSDate getTimeStringAutoShort2:model.CreatedDate];
                                     cell.cell2RedBgView.hidden = model.IsRead;
+                                    cell.topConstant.constant = model.IsTop ? 130.f : 90.f;
                                     cell.IsTopImgV.hidden = !model.IsTop;
                                     return cell;
                                 }
@@ -652,6 +658,8 @@
                                     cell.cell2EditBtn.hidden = NO;
                                     cell.cell2RedBgView.hidden = YES;
                                     cell.cell2TimeLabel.hidden = YES;
+                                    cell.cell2TimeLabel.text = [NSDate getTimeStringAutoShort2:model.CreatedDate];
+                                    cell.topConstant.constant = model.IsTop ? 130.f : 90.f;
                                     [cell.cell2EditBtn setTitle:@"恢复" forState:UIControlStateNormal];
                                     [cell.cell2EditBtn setAction:^{
                                         NSLog(@"恢复已删除站内信");
@@ -670,6 +678,8 @@
                                     cell.cell2EditBtn.hidden = NO;
                                     cell.cell2RedBgView.hidden = YES;
                                     cell.cell2TimeLabel.hidden = YES;
+                                    cell.cell2TimeLabel.text = [NSDate getTimeStringAutoShort2:model.CreatedDate];
+                                    cell.topConstant.constant = model.IsTop ? 130.f : 90.f;
                                     [cell.cell2EditBtn setTitle:@"恢复" forState:UIControlStateNormal];
                                     [cell.cell2EditBtn setAction:^{
                                         NSLog(@"恢复已删除站内信");
@@ -688,6 +698,8 @@
                                     cell.cell2EditBtn.hidden = NO;
                                     cell.cell2RedBgView.hidden = YES;
                                     cell.cell2TimeLabel.hidden = YES;
+                                    cell.cell2TimeLabel.text = [NSDate getTimeStringAutoShort2:model.CreatedDate];
+                                    cell.topConstant.constant = model.IsTop ? 130.f : 90.f;
                                     [cell.cell2EditBtn setTitle:@"恢复" forState:UIControlStateNormal];
                                     [cell.cell2EditBtn setAction:^{
                                         NSLog(@"恢复已删除站内信");
@@ -706,6 +718,8 @@
                                     cell.cell2EditBtn.hidden = NO;
                                     cell.cell2RedBgView.hidden = YES;
                                     cell.cell2TimeLabel.hidden = YES;
+                                    cell.cell2TimeLabel.text = [NSDate getTimeStringAutoShort2:model.CreatedDate];
+                                    cell.topConstant.constant = model.IsTop ? 130.f : 90.f;
                                     [cell.cell2EditBtn setTitle:@"恢复" forState:UIControlStateNormal];
                                     [cell.cell2EditBtn setAction:^{
                                         NSLog(@"恢复已删除站内信");
@@ -724,6 +738,8 @@
                                     cell.cell2EditBtn.hidden = NO;
                                     cell.cell2RedBgView.hidden = YES;
                                     cell.cell2TimeLabel.hidden = YES;
+                                    cell.cell2TimeLabel.text = [NSDate getTimeStringAutoShort2:model.CreatedDate];
+                                    cell.topConstant.constant = model.IsTop ? 130.f : 90.f;
                                     [cell.cell2EditBtn setTitle:@"恢复" forState:UIControlStateNormal];
                                     [cell.cell2EditBtn setAction:^{
                                         NSLog(@"恢复已删除站内信");
@@ -742,6 +758,8 @@
                                     cell.cell2EditBtn.hidden = NO;
                                     cell.cell2RedBgView.hidden = YES;
                                     cell.cell2TimeLabel.hidden = YES;
+                                    cell.cell2TimeLabel.text = [NSDate getTimeStringAutoShort2:model.CreatedDate];
+                                    cell.topConstant.constant = model.IsTop ? 130.f : 90.f;
                                     [cell.cell2EditBtn setTitle:@"恢复" forState:UIControlStateNormal];
                                     [cell.cell2EditBtn setAction:^{
                                         NSLog(@"恢复已删除站内信");
@@ -763,6 +781,8 @@
                                     [self setIntroLabelWithModel:model introLabel:cell.cell2IntroLabel unreadNumberLabel:cell.cell2UnReadNumberLbl];
                                     cell.IsTopImgV.hidden = !model.IsTop;
                                     cell.cell2EditBtn.hidden = NO;
+                                    cell.cell2TimeLabel.text = [NSDate getTimeStringAutoShort2:model.CreatedDate];
+                                    cell.topConstant.constant = model.IsTop ? 130.f : 90.f;
                                     [cell.cell2EditBtn setAction:^{
                                         [weakSelf editorButtonHander:indexPath];
                                     }];
@@ -779,6 +799,8 @@
                                     [self setIntroLabelWithModel:model introLabel:cell.cell2IntroLabel unreadNumberLabel:cell.cell2UnReadNumberLbl];
                                     cell.IsTopImgV.hidden = !model.IsTop;
                                     cell.cell2EditBtn.hidden = NO;
+                                    cell.cell2TimeLabel.text = [NSDate getTimeStringAutoShort2:model.CreatedDate];
+                                    cell.topConstant.constant = model.IsTop ? 130.f : 90.f;
                                     [cell.cell2EditBtn setAction:^{
                                         [weakSelf editorButtonHander:indexPath];
                                     }];
@@ -795,6 +817,8 @@
                                     [self setIntroLabelWithModel:model introLabel:cell.cell2IntroLabel unreadNumberLabel:cell.cell2UnReadNumberLbl];
                                     cell.IsTopImgV.hidden = !model.IsTop;
                                     cell.cell2EditBtn.hidden = NO;
+                                    cell.cell2TimeLabel.text = [NSDate getTimeStringAutoShort2:model.CreatedDate];
+                                    cell.topConstant.constant = model.IsTop ? 130.f : 90.f;
                                     [cell.cell2EditBtn setAction:^{
                                         [weakSelf editorButtonHander:indexPath];
                                     }];
@@ -810,6 +834,8 @@
                                     cell.cell2TitleLabel.text = model.Title;
                                     [self setIntroLabelWithModel:model introLabel:cell.cell2IntroLabel unreadNumberLabel:cell.cell2UnReadNumberLbl];
                                     cell.IsTopImgV.hidden = !model.IsTop;
+                                    cell.cell2TimeLabel.text = [NSDate getTimeStringAutoShort2:model.CreatedDate];
+                                    cell.topConstant.constant = model.IsTop ? 130.f : 90.f;
                                     cell.cell2EditBtn.hidden = NO;
                                     [cell.cell2EditBtn setAction:^{
                                         [weakSelf editorButtonHander:indexPath];
@@ -826,6 +852,8 @@
                                     cell.cell2TitleLabel.text = model.Title;
                                     [self setIntroLabelWithModel:model introLabel:cell.cell2IntroLabel unreadNumberLabel:cell.cell2UnReadNumberLbl];
                                     cell.IsTopImgV.hidden = !model.IsTop;
+                                    cell.cell2TimeLabel.text = [NSDate getTimeStringAutoShort2:model.CreatedDate];
+                                    cell.topConstant.constant = model.IsTop ? 130.f : 90.f;
                                     cell.cell2EditBtn.hidden = NO;
                                     [cell.cell2EditBtn setAction:^{
                                         [weakSelf editorButtonHander:indexPath];
@@ -842,6 +870,8 @@
                                     cell.cell2TitleLabel.text = model.Title;
                                     [self setIntroLabelWithModel:model introLabel:cell.cell2IntroLabel unreadNumberLabel:cell.cell2UnReadNumberLbl];
                                     cell.IsTopImgV.hidden = !model.IsTop;
+                                    cell.cell2TimeLabel.text = [NSDate getTimeStringAutoShort2:model.CreatedDate];
+                                    cell.topConstant.constant = model.IsTop ? 130.f : 90.f;
                                     cell.cell2EditBtn.hidden = NO;
                                     [cell.cell2EditBtn setAction:^{
                                         [weakSelf editorButtonHander:indexPath];
@@ -891,6 +921,7 @@
                                     cell.IsTopImgV.hidden = !model.IsTop;
                                     cell.cell2TimeLabel.hidden = YES;
                                     cell.cell2RedBgView.hidden = YES;
+                                    cell.topConstant.constant = model.IsTop ? 130.f : 90.f;
                                     cell.cell1SelectButton.selected = model.IsSelect;
                                     [cell.cell1SelectButton setAction:^{
                                         model.IsSelect = !model.IsSelect;
@@ -908,6 +939,7 @@
                                     cell.cell2TitleLabel.text = model.Title;
                                     [self setIntroLabelWithModel:model introLabel:cell.cell2IntroLabel unreadNumberLabel:cell.cell2UnReadNumberLbl];
                                     cell.cell2TimeLabel.text = [NSDate getTimeStringAutoShort2:model.CreatedDate];
+                                    cell.topConstant.constant = model.IsTop ? 130.f : 90.f;
                                     cell.cell2RedBgView.hidden = YES;
                                     cell.IsTopImgV.hidden = !model.IsTop;
                                     cell.cell2TimeLabel.hidden = YES;
@@ -925,6 +957,7 @@
                                 {
                                     ChatMsgNoticeCell *cell = [ChatMsgNoticeCell configCell20:tableView indexPath:indexPath];
                                     [self setShenIcon:model withCellImgV:cell.cell2UserImgView];
+                                    cell.topConstant.constant = model.IsTop ? 130.f : 90.f;
                                     cell.cell2TitleLabel.text = model.Title;
                                     [self setIntroLabelWithModel:model introLabel:cell.cell2IntroLabel unreadNumberLabel:cell.cell2UnReadNumberLbl];
                                     cell.cell2TimeLabel.text = [NSDate getTimeStringAutoShort2:model.CreatedDate];
@@ -948,6 +981,7 @@
                                     cell.cell2TitleLabel.text = model.Title;
                                     [self setIntroLabelWithModel:model introLabel:cell.cell2IntroLabel unreadNumberLabel:cell.cell2UnReadNumberLbl];
                                     cell.cell2TimeLabel.text = [NSDate getTimeStringAutoShort2:model.CreatedDate];
+                                    cell.topConstant.constant = model.IsTop ? 130.f : 90.f;
                                     cell.IsTopImgV.hidden = !model.IsTop;
                                     cell.cell2TimeLabel.hidden = YES;
                                     cell.cell2RedBgView.hidden = YES;
@@ -965,6 +999,7 @@
                                 {
                                     ChatMsgNoticeCell *cell = [ChatMsgNoticeCell configCell20:tableView indexPath:indexPath];
                                     [self setShenIcon:model withCellImgV:cell.cell2UserImgView];
+                                    cell.topConstant.constant = model.IsTop ? 130.f : 90.f;
                                     cell.cell2TitleLabel.text = model.Title;
                                     [self setIntroLabelWithModel:model introLabel:cell.cell2IntroLabel unreadNumberLabel:cell.cell2UnReadNumberLbl];
                                     cell.cell2TimeLabel.text = [NSDate getTimeStringAutoShort2:model.CreatedDate];
@@ -988,6 +1023,7 @@
                                     cell.cell2TitleLabel.text = model.Title;
                                     [self setIntroLabelWithModel:model introLabel:cell.cell2IntroLabel unreadNumberLabel:cell.cell2UnReadNumberLbl];
                                     cell.cell2TimeLabel.text = [NSDate getTimeStringAutoShort2:model.CreatedDate];
+                                    cell.topConstant.constant = model.IsTop ? 130.f : 90.f;
                                     cell.IsTopImgV.hidden = !model.IsTop;
                                     cell.cell2TimeLabel.hidden = YES;
                                     cell.cell2RedBgView.hidden = YES;
@@ -1011,6 +1047,8 @@
                                     ChatMsgNoticeCell *cell = [ChatMsgNoticeCell configCell20:tableView indexPath:indexPath];
                                     cell.cell2UserImgView.image = [UIImage imageNamed:@"站内信图"];
                                     cell.cell2TitleLabel.text = model.Title;
+                                    cell.cell2TimeLabel.text = [NSDate getTimeStringAutoShort2:model.CreatedDate];
+                                    cell.topConstant.constant = model.IsTop ? 130.f : 90.f;
                                     [self setIntroLabelWithModel:model introLabel:cell.cell2IntroLabel unreadNumberLabel:cell.cell2UnReadNumberLbl];
                                     cell.IsTopImgV.hidden = !model.IsTop;
                                     cell.cell2EditBtn.hidden = NO;
@@ -1039,6 +1077,8 @@
                                     cell.cell2TitleLabel.text = model.Title;
                                     [self setIntroLabelWithModel:model introLabel:cell.cell2IntroLabel unreadNumberLabel:cell.cell2UnReadNumberLbl];
                                     cell.IsTopImgV.hidden = !model.IsTop;
+                                    cell.cell2TimeLabel.text = [NSDate getTimeStringAutoShort2:model.CreatedDate];
+                                    cell.topConstant.constant = model.IsTop ? 130.f : 90.f;
                                     cell.cell2EditBtn.hidden = NO;
                                     cell.cell2RedBgView.hidden = YES;
                                     cell.cell2TimeLabel.hidden = YES;
@@ -1063,6 +1103,8 @@
                                     ChatMsgNoticeCell *cell = [ChatMsgNoticeCell configCell20:tableView indexPath:indexPath];
                                     [self setShenIcon:model withCellImgV:cell.cell2UserImgView];
                                     cell.cell2TitleLabel.text = model.Title;
+                                    cell.cell2TimeLabel.text = [NSDate getTimeStringAutoShort2:model.CreatedDate];
+                                    cell.topConstant.constant = model.IsTop ? 130.f : 90.f;
                                     [self setIntroLabelWithModel:model introLabel:cell.cell2IntroLabel unreadNumberLabel:cell.cell2UnReadNumberLbl];
                                     cell.IsTopImgV.hidden = !model.IsTop;
                                     cell.cell2EditBtn.hidden = NO;
@@ -1089,6 +1131,8 @@
                                     ChatMsgNoticeCell *cell = [ChatMsgNoticeCell configCell20:tableView indexPath:indexPath];
                                     [self setShenIcon:model withCellImgV:cell.cell2UserImgView];
                                     cell.cell2TitleLabel.text = model.Title;
+                                    cell.cell2TimeLabel.text = [NSDate getTimeStringAutoShort2:model.CreatedDate];
+                                    cell.topConstant.constant = model.IsTop ? 130.f : 90.f;
                                     [self setIntroLabelWithModel:model introLabel:cell.cell2IntroLabel unreadNumberLabel:cell.cell2UnReadNumberLbl];
                                     cell.IsTopImgV.hidden = !model.IsTop;
                                     cell.cell2EditBtn.hidden = NO;
@@ -1115,6 +1159,8 @@
                                     ChatMsgNoticeCell *cell = [ChatMsgNoticeCell configCell20:tableView indexPath:indexPath];
                                     [self setShenIcon:model withCellImgV:cell.cell2UserImgView];
                                     cell.cell2TitleLabel.text = model.Title;
+                                    cell.cell2TimeLabel.text = [NSDate getTimeStringAutoShort2:model.CreatedDate];
+                                    cell.topConstant.constant = model.IsTop ? 130.f : 90.f;
                                     [self setIntroLabelWithModel:model introLabel:cell.cell2IntroLabel unreadNumberLabel:cell.cell2UnReadNumberLbl];
                                     cell.IsTopImgV.hidden = !model.IsTop;
                                     cell.cell2EditBtn.hidden = NO;
@@ -1141,6 +1187,8 @@
                                     ChatMsgNoticeCell *cell = [ChatMsgNoticeCell configCell20:tableView indexPath:indexPath];
                                     cell.cell2UserImgView.image = [UIImage imageNamed:@"站内信图"];
                                     cell.cell2TitleLabel.text = model.Title;
+                                    cell.cell2TimeLabel.text = [NSDate getTimeStringAutoShort2:model.CreatedDate];
+                                    cell.topConstant.constant = model.IsTop ? 130.f : 90.f;
                                     [self setIntroLabelWithModel:model introLabel:cell.cell2IntroLabel unreadNumberLabel:cell.cell2UnReadNumberLbl];
                                     cell.IsTopImgV.hidden = !model.IsTop;
                                     cell.cell2EditBtn.hidden = NO;
@@ -1175,6 +1223,8 @@
                                     [self setIntroLabelWithModel:model introLabel:cell.cell2IntroLabel unreadNumberLabel:cell.cell2UnReadNumberLbl];
                                     cell.cell2TimeLabel.hidden = YES;
                                     cell.cell1TimeLabel.hidden = YES;
+                                    cell.cell2TimeLabel.text = [NSDate getTimeStringAutoShort2:model.CreatedDate];
+                                    cell.topConstant.constant = model.IsTop ? 130.f : 90.f;
                                     cell.IsTopImgV.hidden = !model.IsTop;
                                     cell.enterBtn.hidden = YES;
                                     cell.cell1SelectButton.selected = model.IsSelect;
@@ -1196,6 +1246,8 @@
                                     cell.cell2TimeLabel.hidden = YES;
                                     cell.cell1TimeLabel.hidden = YES;
                                     cell.IsTopImgV.hidden = !model.IsTop;
+                                    cell.cell2TimeLabel.text = [NSDate getTimeStringAutoShort2:model.CreatedDate];
+                                    cell.topConstant.constant = model.IsTop ? 130.f : 90.f;
                                     cell.enterBtn.hidden = YES;
                                     cell.cell1SelectButton.selected = model.IsSelect;
                                     [cell.cell1SelectButton setAction:^{
@@ -1215,6 +1267,8 @@
                                     [self setIntroLabelWithModel:model introLabel:cell.cell2IntroLabel unreadNumberLabel:cell.cell2UnReadNumberLbl];
                                     cell.cell2TimeLabel.hidden = YES;
                                     cell.cell1TimeLabel.hidden = YES;
+                                    cell.cell2TimeLabel.text = [NSDate getTimeStringAutoShort2:model.CreatedDate];
+                                    cell.topConstant.constant = model.IsTop ? 130.f : 90.f;
                                     cell.IsTopImgV.hidden = !model.IsTop;
                                     cell.enterBtn.hidden = YES;
                                     cell.cell1SelectButton.selected = model.IsSelect;
@@ -1236,6 +1290,8 @@
                                     cell.cell2TimeLabel.hidden = YES;
                                     cell.cell1TimeLabel.hidden = YES;
                                     cell.IsTopImgV.hidden = !model.IsTop;
+                                    cell.cell2TimeLabel.text = [NSDate getTimeStringAutoShort2:model.CreatedDate];
+                                    cell.topConstant.constant = model.IsTop ? 130.f : 90.f;
                                     cell.enterBtn.hidden = YES;
                                     cell.cell1SelectButton.selected = model.IsSelect;
                                     [cell.cell1SelectButton setAction:^{
@@ -1256,6 +1312,8 @@
                                     cell.cell2TimeLabel.hidden = YES;
                                     cell.cell1TimeLabel.hidden = YES;
                                     cell.IsTopImgV.hidden = !model.IsTop;
+                                    cell.cell2TimeLabel.text = [NSDate getTimeStringAutoShort2:model.CreatedDate];
+                                    cell.topConstant.constant = model.IsTop ? 130.f : 90.f;
                                     cell.enterBtn.hidden = YES;
                                     cell.cell1SelectButton.selected = model.IsSelect;
                                     [cell.cell1SelectButton setAction:^{
@@ -1276,6 +1334,8 @@
                                     cell.cell2TimeLabel.hidden = YES;
                                     cell.cell1TimeLabel.hidden = YES;
                                     cell.IsTopImgV.hidden = !model.IsTop;
+                                    cell.cell2TimeLabel.text = [NSDate getTimeStringAutoShort2:model.CreatedDate];
+                                    cell.topConstant.constant = model.IsTop ? 130.f : 90.f;
                                     cell.enterBtn.hidden = YES;
                                     cell.cell1SelectButton.selected = model.IsSelect;
                                     [cell.cell1SelectButton setAction:^{
@@ -1644,14 +1704,21 @@
             }
             NSMutableDictionary *dic = [[NSMutableDictionary alloc]init];
             [dic setValue:MiddleIds forKey:@"MiddleIds"];
-            [dic setValue:@(5) forKey:@"FolderType"];
-            [dic setValue:@(1) forKey:@"IsDelete"];
+            [dic setValue:@(800) forKey:@"FolderType"];
+            [dic setValue:@(0) forKey:@"IsDelete"];
             [dic setValue:@([AppUserModel sharedAppUserModel].Id) forKey:@"UserId"];
 
             SHOWLOADING
-            [[HttpManager sharedHttpManager] POSTUrl:Host(API_Find_DeleteRecord) parameters:dic responseStyle:DATA success:^(id  _Nonnull responseObject) {
+            [[HttpManager sharedHttpManager] POSTUrl:Host(API_Find_DeleteRecord_Redo) parameters:dic responseStyle:DATA success:^(id  _Nonnull responseObject) {
                 REMOVESHOW
-                [weakSelf headRefresh];
+                [weakSelf.interLetterArray enumerateObjectsUsingBlock:^(NoticeModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
+                    if (obj.IsSelect) {
+                        [weakSelf.interLetterArray removeObject:obj];
+                    }
+                }];
+                dispatch_async(dispatch_get_main_queue(), ^{
+                    [weakSelf.tableView reloadData];
+                });
             } failure:^(NSError * _Nonnull error) {
                 SHOWERROR([ZYCTool handerResultData:error]);
             }];
@@ -1960,7 +2027,7 @@
             weakSelf.tableView.backgroundColor = [UIColor clearColor];
             [weakSelf.tableView mas_makeConstraints:^(MASConstraintMaker *make) {
                 make.left.right.mas_equalTo(weakSelf.view);
-                make.top.mas_equalTo(weakSelf.NavBar.mas_bottom);
+                make.top.mas_equalTo(weakSelf.HeadView.mas_bottom);
                 if (@available(iOS 11.0, *)) {
                     make.bottom.equalTo(weakSelf.view.mas_safeAreaLayoutGuideBottom);
                 } else {

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

@@ -805,6 +805,7 @@
                 vc.ParentId = 0;
                 vc.FolderId = Id;
                 vc.myTitle = title;
+                vc.TypeValue = 1;
                 vc.VisitUserId = userId;
                 [self.navigationController pushViewController:vc animated:YES];
             }

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

@@ -167,9 +167,16 @@
             [self setMailBottomView:NO];
         }
             break;
+        case CollectModel_meetMian:
+        {
+            self.titleL.text = @"会议纪要";
+            self.musicBtn.hidden = NO;
+            [self setMailBottomView:NO];
+        }
+            break;
         default:
         {
-            self.titleL.text = @"话题";
+            self.titleL.text = @"正文";
             self.musicBtn.hidden = NO;
             [self setMailBottomView:NO];
         }
@@ -381,8 +388,8 @@
                         ///     1文章 2话题 3 收藏 4笔记 5通知 6站内信 7小组 8 会议详情 14工作流审批 300 文件 400 会议纪要
                         NSInteger type = weakSelf.type;
                         switch (weakSelf.type) {
-                            case CollectModel_meet:
-                                type = 400;
+                            case CollectModel_meetMian:
+                                type = CollectModel_meet;
                                 break;
                             default:
                                 break;
@@ -1413,6 +1420,7 @@
                 vc.ParentId = 0;
                 vc.FolderId = Id;
                 vc.myTitle = title;
+                vc.TypeValue = 1;
                 vc.VisitUserId = 0;
                 [self.navigationController pushViewController:vc animated:YES];
             }else{
@@ -1421,6 +1429,7 @@
                 vc.ParentId = 0;
                 vc.FolderId = Id;
                 vc.myTitle = title;
+                vc.TypeValue = 1;
                 vc.VisitUserId = userId;
                 [self.navigationController pushViewController:vc animated:YES];
             }
@@ -1944,9 +1953,9 @@
     vc.FolderIds = @[].mutableCopy;
     //    收藏类型 1文章 2话题 3 收藏 4笔记 5通知 6站内信 7小组 8 会议详情 14工作流审批 300 文件 400 会议纪要
     switch (self.type) {
-        case CollectModel_meet:
+        case CollectModel_meetMian:
         {
-            vc.CollectionType = 400;
+            vc.CollectionType = CollectModel_meet;
         }
             break;
         default:

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

@@ -718,6 +718,7 @@
                 vc.ParentId = 0;
                 vc.FolderId = model.Id;
                 vc.myTitle = model.Title;
+                vc.TypeValue = 1;
                 vc.VisitUserId = model.SourceUserId;
                 [self.navigationController pushViewController:vc animated:YES];
             }

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

@@ -805,6 +805,7 @@
         vc.Author = model.UserName;
         vc.myTitle = model.FolderResult.FolderName;
         vc.VisitUserId = model.UserId;
+        vc.TypeValue = 1;
         [self.navigationController pushViewController:vc animated:YES];
     }
 }
@@ -924,9 +925,10 @@
             }else{
                 OtherNoteBookVC *vc = [OtherNoteBookVC initOtherNoteBookVC];
                 vc.listType = model.Id == 0 ? MyFavoriteListLevelTypeA : MyFavoriteListLevelTypeB;
-                vc.ParentId = 0;
                 vc.FolderId = model.Id;
                 vc.myTitle = model.Title;
+                vc.TypeValue = 1;
+
                 vc.VisitUserId = model.SourceUserId;
                 [self.navigationController pushViewController:vc animated:YES];
             }
@@ -1093,6 +1095,9 @@
 
 - (NSAttributedString *)setTextWithStr:(NSString *)str
 {
+    if (str.length == 0) {
+        return [[NSAttributedString alloc] initWithString:@""];
+    }
     NSMutableAttributedString *attributedString = [[NSMutableAttributedString alloc] initWithString:str];
     [attributedString addAttribute:NSFontAttributeName value:[UIFont fontWithName:@"PingFang SC" size:16] range:NSMakeRange(0, str.length)];
     [attributedString addAttribute:NSForegroundColorAttributeName value:UIColorHex(#484848) range:NSMakeRange(0, str.length)];
@@ -1105,6 +1110,9 @@
 }
 - (NSAttributedString *)setTitleWithStr:(NSString *)str
 {
+    if (str.length == 0) {
+        return [[NSAttributedString alloc] initWithString:@""];
+    }
     NSMutableAttributedString *attributedString = [[NSMutableAttributedString alloc] initWithString:str];
     [attributedString addAttribute:NSFontAttributeName value:[UIFont systemFontOfSize:18] range:NSMakeRange(0, str.length)];
     [attributedString addAttribute:NSForegroundColorAttributeName value:UIColorHex(0x0a0a0a) range:NSMakeRange(0, str.length)];

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

@@ -95,6 +95,9 @@
 }
 - (NSAttributedString *)setTitleWithStr:(NSString *)str
 {
+    if (str.length == 0) {
+        return [[NSAttributedString alloc] initWithString:@""];
+    }
     NSMutableAttributedString *attributedString = [[NSMutableAttributedString alloc] initWithString:str];
     [attributedString addAttribute:NSFontAttributeName value:[UIFont systemFontOfSize:12] range:NSMakeRange(0, str.length)];
     [attributedString addAttribute:NSForegroundColorAttributeName value:UIColorHex(0x999999) range:NSMakeRange(0, str.length)];

smartRhino/Project/VCModel/My_Center/Controller/ColletionVC/Cell/MyFavoriteCell.m

@@ -70,6 +70,7 @@
             {
                 if ([view isKindOfClass: [UIImageView class]])
                 {
+                    view.hidden = NO;
                     UIImageView * imagV = (UIImageView *)view;
                     [imagV setFrame:CGRectMake(0, 0, 22, 18)];
                     imagV.center = supView.center;
@@ -80,7 +81,7 @@
                     [supView addSubview:label];
                     [label setFrame:CGRectMake(0, supView.frame.size.height - 0.5, supView.frame.size.width, 0.5)];
                 }else{
-                    [view removeFromSuperview];
+                    view.hidden = YES;
                 }
             }
         }

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

@@ -20,7 +20,6 @@
                     <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="V9Z-jl-CCz">
                         <rect key="frame" x="68" y="10" width="82" height="20"/>
                         <constraints>
-                            <constraint firstAttribute="width" relation="lessThanOrEqual" constant="180" id="I2e-VJ-isR"/>
                             <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="20" id="nxs-aa-cOn"/>
                         </constraints>
                         <fontDescription key="fontDescription" type="system" pointSize="16"/>
@@ -58,6 +57,7 @@
                     </imageView>
                 </subviews>
                 <constraints>
+                    <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="uc4-iu-T2S" secondAttribute="trailing" constant="15" id="3lj-IA-OVW"/>
                     <constraint firstItem="EGe-BE-2pA" firstAttribute="leading" secondItem="V9Z-jl-CCz" secondAttribute="leading" id="5h1-2r-Kmt"/>
                     <constraint firstAttribute="trailing" secondItem="AcH-Uz-mQE" secondAttribute="trailing" id="7vJ-5l-EVI"/>
                     <constraint firstItem="V9Z-jl-CCz" firstAttribute="top" secondItem="ya1-Sb-3o5" secondAttribute="top" constant="10" id="KRf-xj-sw4"/>
@@ -94,7 +94,6 @@
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="文件夹类型" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="m86-Bb-XHW">
                         <rect key="frame" x="65" y="10" width="82" height="20"/>
                         <constraints>
-                            <constraint firstAttribute="width" relation="lessThanOrEqual" constant="180" id="Ti3-6i-GvW"/>
                             <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="20" id="WAq-Jx-jbp"/>
                         </constraints>
                         <fontDescription key="fontDescription" type="system" pointSize="16"/>
@@ -141,6 +140,7 @@
                 </subviews>
                 <constraints>
                     <constraint firstItem="le9-Rw-Sgv" firstAttribute="top" secondItem="m86-Bb-XHW" secondAttribute="bottom" constant="8" id="16i-UH-HhT"/>
+                    <constraint firstItem="SuJ-3J-IWi" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="ad7-Uo-Ub5" secondAttribute="trailing" constant="15" id="2ub-gh-YEi"/>
                     <constraint firstItem="le9-Rw-Sgv" firstAttribute="leading" secondItem="m86-Bb-XHW" secondAttribute="leading" id="3DX-0f-zcq"/>
                     <constraint firstAttribute="bottom" secondItem="rmb-UX-GBF" secondAttribute="bottom" id="BFf-Jr-0td"/>
                     <constraint firstItem="ad7-Uo-Ub5" firstAttribute="leading" secondItem="m86-Bb-XHW" secondAttribute="trailing" constant="10" id="Cov-v0-EQj"/>
@@ -180,10 +180,9 @@
                 <rect key="frame" x="0.0" y="0.0" width="348" height="59"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
-                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="事件聚焦" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6cc-S2-zr6">
+                    <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="6cc-S2-zr6">
                         <rect key="frame" x="99" y="10" width="65.5" height="20"/>
                         <constraints>
-                            <constraint firstAttribute="width" relation="lessThanOrEqual" constant="160" id="gE6-W8-6rZ"/>
                             <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="20" id="nbL-04-3c5"/>
                         </constraints>
                         <fontDescription key="fontDescription" type="system" pointSize="16"/>
@@ -261,6 +260,7 @@
                     <constraint firstAttribute="trailing" secondItem="uVg-GU-9Mo" secondAttribute="trailing" constant="10" id="bEa-b4-flD"/>
                     <constraint firstItem="obx-Pj-VwT" firstAttribute="top" secondItem="PrP-87-mQ9" secondAttribute="bottom" constant="10" id="grv-Ot-KHb"/>
                     <constraint firstItem="PrP-87-mQ9" firstAttribute="top" secondItem="6cc-S2-zr6" secondAttribute="bottom" constant="8" id="h4b-fo-5T4"/>
+                    <constraint firstItem="uVg-GU-9Mo" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="txB-bF-Ybm" secondAttribute="trailing" constant="15" id="kA0-Mf-I30"/>
                     <constraint firstItem="ZCy-ZV-eP5" firstAttribute="centerY" secondItem="PrP-87-mQ9" secondAttribute="centerY" id="ksQ-Bg-0Tt"/>
                     <constraint firstItem="txB-bF-Ybm" firstAttribute="centerY" secondItem="6cc-S2-zr6" secondAttribute="centerY" id="pz6-EK-wKQ"/>
                     <constraint firstItem="PrP-87-mQ9" firstAttribute="leading" secondItem="6cc-S2-zr6" secondAttribute="leading" id="qbW-le-eRb"/>
@@ -293,7 +293,6 @@
                         <rect key="frame" x="96" y="10" width="65.5" height="20"/>
                         <constraints>
                             <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="20" id="d4e-bk-g5o"/>
-                            <constraint firstAttribute="width" relation="lessThanOrEqual" constant="160" id="mOz-qR-pES"/>
                         </constraints>
                         <fontDescription key="fontDescription" type="system" pointSize="16"/>
                         <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
@@ -358,6 +357,7 @@
                     <constraint firstItem="6Kn-PA-Bg3" firstAttribute="leading" secondItem="IyI-aU-zdG" secondAttribute="trailing" constant="4" id="Hj7-dy-KF8"/>
                     <constraint firstAttribute="trailing" secondItem="6Ml-Gj-9dA" secondAttribute="trailing" id="L9X-XA-zeZ"/>
                     <constraint firstAttribute="trailing" secondItem="H6C-RT-z8Y" secondAttribute="trailing" constant="10" id="P3J-O9-Iui"/>
+                    <constraint firstItem="H6C-RT-z8Y" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="NqB-wD-Xhz" secondAttribute="trailing" constant="15" id="QNg-Qv-fTu"/>
                     <constraint firstItem="6Ml-Gj-9dA" firstAttribute="top" secondItem="Lh1-sa-XhN" secondAttribute="bottom" constant="10" id="TB5-EF-yFL"/>
                     <constraint firstItem="Lh1-sa-XhN" firstAttribute="top" secondItem="9qw-uA-qDr" secondAttribute="bottom" constant="8" id="cxY-px-OJO"/>
                     <constraint firstItem="H6C-RT-z8Y" firstAttribute="leading" secondItem="Lh1-sa-XhN" secondAttribute="trailing" constant="5" id="eN5-xq-QZC"/>

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

@@ -106,11 +106,6 @@ NS_ASSUME_NONNULL_BEGIN
 @property (weak, nonatomic) IBOutlet UILabel *cell7AddfileNumberLabel;
 
 @property (weak, nonatomic) IBOutlet TDButton *selectButton;
-@property (weak, nonatomic) IBOutlet UIButton *moveButton;
-
-@property (weak, nonatomic) IBOutlet UIView *moveButtonView;
-
-
 
 
 @property (weak, nonatomic) IBOutlet UIImageView *cellNoticeIconImageView;

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

@@ -348,7 +348,8 @@
 
 - (void)awakeFromNib {
     [super awakeFromNib];
-    // Initialization code
+    [self.cell2IconImage setRadius:self.cell2IconImage.height / 2 corners:UIRectCornerAllCorners];
+    [self.cell4IconImage setRadius:5 corners:UIRectCornerAllCorners];
 }
 
 - (void)setSelected:(BOOL)selected animated:(BOOL)animated {
@@ -360,9 +361,6 @@
 
 - (void)layoutSubviews {
     [super layoutSubviews];
-    [self.cell2IconImage setRadius:self.cell2IconImage.height / 2 corners:UIRectCornerAllCorners];
-    [self.cell4IconImage setRadius:5 corners:UIRectCornerAllCorners];
-    self.moveButton.hidden = YES;
     CGRect rect = self.contentView.frame;
     rect.size.width += rect.origin.x;
     rect.origin.x = 0;
@@ -373,6 +371,7 @@
             {
                 if ([view isKindOfClass: [UIImageView class]])
                 {
+                    view.hidden = NO;
                     UIImageView * imagV = (UIImageView *)view;
                     [imagV setFrame:CGRectMake(0, 0, 22, 18)];
                     imagV.center = supView.center;
@@ -383,7 +382,7 @@
                     [supView addSubview:label];
                     [label setFrame:CGRectMake(0, supView.frame.size.height - 0.5, supView.frame.size.width, 0.5)];
                 }else{
-                    [view removeFromSuperview];
+                    view.hidden = YES;
                 }
             }
         }

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

@@ -1135,18 +1135,6 @@
                         <state key="normal" image="sendinfo_no"/>
                         <state key="selected" image="sendinfo_yes"/>
                     </button>
-                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="0HZ-p3-EJY">
-                        <rect key="frame" x="298" y="9.5" width="40" height="40"/>
-                        <constraints>
-                            <constraint firstAttribute="height" constant="40" id="8rB-yl-KvQ"/>
-                            <constraint firstAttribute="width" constant="40" id="vGL-WA-3Iy"/>
-                        </constraints>
-                        <state key="normal" image="收藏_移动"/>
-                    </button>
-                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="4f5-gi-fjg">
-                        <rect key="frame" x="298" y="9.5" width="40" height="40"/>
-                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                    </view>
                     <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="28" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qqS-wn-liQ">
                         <rect key="frame" x="306" y="22.5" width="15" height="14.5"/>
                         <fontDescription key="fontDescription" type="system" pointSize="12"/>
@@ -1163,19 +1151,14 @@
                 <constraints>
                     <constraint firstAttribute="bottom" secondItem="Vz3-ta-3Me" secondAttribute="bottom" id="5ec-dt-e6r"/>
                     <constraint firstItem="qqS-wn-liQ" firstAttribute="centerY" secondItem="4ZH-gq-y68" secondAttribute="centerY" id="7sv-Cf-Kb2"/>
-                    <constraint firstItem="4f5-gi-fjg" firstAttribute="bottom" secondItem="0HZ-p3-EJY" secondAttribute="bottom" id="97M-Zt-KOz"/>
                     <constraint firstItem="n1w-V2-6rb" firstAttribute="leading" secondItem="yIn-kM-NG5" secondAttribute="leading" id="9sq-5g-vSt"/>
-                    <constraint firstItem="0HZ-p3-EJY" firstAttribute="centerY" secondItem="4ZH-gq-y68" secondAttribute="centerY" id="ADP-OQ-OKj"/>
                     <constraint firstItem="EuU-Q7-ao8" firstAttribute="leading" secondItem="4ZH-gq-y68" secondAttribute="leading" id="ASX-M9-tfY"/>
                     <constraint firstItem="Vz3-ta-3Me" firstAttribute="leading" secondItem="4ZH-gq-y68" secondAttribute="leading" id="Eph-RX-YCv"/>
-                    <constraint firstAttribute="trailing" secondItem="0HZ-p3-EJY" secondAttribute="trailing" constant="10" id="GEO-cr-Ksj"/>
                     <constraint firstItem="Vz3-ta-3Me" firstAttribute="top" secondItem="n1w-V2-6rb" secondAttribute="bottom" constant="10" id="K43-56-dFw"/>
                     <constraint firstItem="yIn-kM-NG5" firstAttribute="leading" secondItem="hxp-KH-tAK" secondAttribute="trailing" constant="13" id="T8b-yF-KST"/>
                     <constraint firstAttribute="trailing" secondItem="b3t-BL-ON3" secondAttribute="trailing" constant="15" id="TrX-rN-KDN"/>
                     <constraint firstAttribute="trailing" secondItem="Vz3-ta-3Me" secondAttribute="trailing" id="V5t-ys-OeF"/>
                     <constraint firstItem="enU-cb-gfk" firstAttribute="leading" secondItem="yIn-kM-NG5" secondAttribute="trailing" constant="10" id="Why-PG-lLH"/>
-                    <constraint firstItem="4f5-gi-fjg" firstAttribute="top" secondItem="0HZ-p3-EJY" secondAttribute="top" id="WlD-n1-wTv"/>
-                    <constraint firstAttribute="trailing" secondItem="0HZ-p3-EJY" secondAttribute="trailing" constant="10" id="YdI-8r-bt6"/>
                     <constraint firstItem="enU-cb-gfk" firstAttribute="centerY" secondItem="yIn-kM-NG5" secondAttribute="centerY" id="Z9U-ps-nJL"/>
                     <constraint firstItem="hxp-KH-tAK" firstAttribute="centerY" secondItem="4ZH-gq-y68" secondAttribute="centerY" id="ZKn-UO-Cfb"/>
                     <constraint firstItem="hxp-KH-tAK" firstAttribute="leading" secondItem="EuU-Q7-ao8" secondAttribute="trailing" id="eCI-ya-DwO"/>
@@ -1184,8 +1167,6 @@
                     <constraint firstItem="yIn-kM-NG5" firstAttribute="top" secondItem="4ZH-gq-y68" secondAttribute="top" constant="10" id="kPx-0g-zex"/>
                     <constraint firstItem="n1w-V2-6rb" firstAttribute="top" secondItem="yIn-kM-NG5" secondAttribute="bottom" constant="8" id="oP5-Mw-sr3"/>
                     <constraint firstItem="b3t-BL-ON3" firstAttribute="centerY" secondItem="4ZH-gq-y68" secondAttribute="centerY" id="qha-bE-kbH"/>
-                    <constraint firstItem="4f5-gi-fjg" firstAttribute="trailing" secondItem="0HZ-p3-EJY" secondAttribute="trailing" id="sh6-z2-Mgu"/>
-                    <constraint firstItem="4f5-gi-fjg" firstAttribute="leading" secondItem="0HZ-p3-EJY" secondAttribute="leading" id="xS8-st-lJy"/>
                 </constraints>
             </tableViewCellContentView>
             <viewLayoutGuide key="safeArea" id="hRl-gq-vlP"/>
@@ -1199,8 +1180,6 @@
                 <outlet property="cell0Title" destination="yIn-kM-NG5" id="g7r-wM-pn9"/>
                 <outlet property="cell2FirstImageView" destination="0lH-4P-6T5" id="ErF-o5-ubc"/>
                 <outlet property="cell2SecondImageView" destination="W0T-aQ-Nqm" id="kGO-8M-E3O"/>
-                <outlet property="moveButton" destination="0HZ-p3-EJY" id="4og-pH-dE7"/>
-                <outlet property="moveButtonView" destination="4f5-gi-fjg" id="hFv-N2-Rft"/>
                 <outlet property="selectButton" destination="EuU-Q7-ao8" id="GBN-t9-ITK"/>
             </connections>
             <point key="canvasLocation" x="-400.00000000000006" y="239.39732142857142"/>
@@ -1309,14 +1288,6 @@
                         <state key="normal" image="sendinfo_no"/>
                         <state key="selected" image="sendinfo_yes"/>
                     </button>
-                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="pEs-SO-OeU">
-                        <rect key="frame" x="270" y="87" width="40" height="40"/>
-                        <constraints>
-                            <constraint firstAttribute="width" constant="40" id="qKN-BI-2WP"/>
-                            <constraint firstAttribute="height" constant="40" id="rP5-Gh-4aG"/>
-                        </constraints>
-                        <state key="normal" image="收藏_移动"/>
-                    </button>
                 </subviews>
                 <constraints>
                     <constraint firstItem="zPx-EH-yak" firstAttribute="centerY" secondItem="hje-Je-Eoo" secondAttribute="centerY" id="28o-xe-Akh"/>
@@ -1326,7 +1297,6 @@
                     <constraint firstItem="b3g-Q4-gm9" firstAttribute="top" secondItem="MCc-f9-sVg" secondAttribute="bottom" constant="10" id="Eip-bT-LEL"/>
                     <constraint firstItem="HPG-NW-SnJ" firstAttribute="leading" secondItem="qZ0-IM-wMy" secondAttribute="leading" constant="42" id="FYk-0k-R40"/>
                     <constraint firstItem="Vtd-Ir-ujy" firstAttribute="top" secondItem="HPG-NW-SnJ" secondAttribute="bottom" constant="10" id="JZw-YA-SEZ"/>
-                    <constraint firstItem="pEs-SO-OeU" firstAttribute="centerY" secondItem="qZ0-IM-wMy" secondAttribute="centerY" id="MSE-B5-1ir"/>
                     <constraint firstItem="4Yh-ct-4wv" firstAttribute="leading" secondItem="u1c-Hg-Fw9" secondAttribute="trailing" constant="13" id="Miv-ty-H3E"/>
                     <constraint firstItem="myC-wK-dxM" firstAttribute="centerY" secondItem="qZ0-IM-wMy" secondAttribute="centerY" id="Sv0-Ay-IdK"/>
                     <constraint firstItem="b3g-Q4-gm9" firstAttribute="leading" secondItem="qZ0-IM-wMy" secondAttribute="leading" id="Tih-tI-rcJ"/>
@@ -1339,7 +1309,6 @@
                     <constraint firstItem="HPG-NW-SnJ" firstAttribute="top" secondItem="hje-Je-Eoo" secondAttribute="bottom" constant="17" id="mA7-rU-Yly"/>
                     <constraint firstItem="MCc-f9-sVg" firstAttribute="leading" secondItem="7zi-CF-P6V" secondAttribute="trailing" id="mug-nL-zLb"/>
                     <constraint firstItem="Vtd-Ir-ujy" firstAttribute="leading" secondItem="qZ0-IM-wMy" secondAttribute="leading" constant="42" id="shT-SQ-7Gy"/>
-                    <constraint firstAttribute="trailing" secondItem="pEs-SO-OeU" secondAttribute="trailing" constant="10" id="uSP-GN-Wq1"/>
                     <constraint firstAttribute="bottom" secondItem="b3g-Q4-gm9" secondAttribute="bottom" id="w8B-85-cFn"/>
                     <constraint firstAttribute="trailing" secondItem="b3g-Q4-gm9" secondAttribute="trailing" id="wTS-I4-xez"/>
                     <constraint firstItem="u1c-Hg-Fw9" firstAttribute="top" secondItem="qZ0-IM-wMy" secondAttribute="top" constant="12" id="yp6-W0-EMy"/>
@@ -1359,7 +1328,6 @@
                 <outlet property="cell1contentTitleLabel" destination="HPG-NW-SnJ" id="URV-oG-pvf"/>
                 <outlet property="cell1ddfileTitleLabel" destination="onw-Ew-5P0" id="szw-Uc-X6K"/>
                 <outlet property="cell1readNumberLabel" destination="zPx-EH-yak" id="WPf-MG-P9j"/>
-                <outlet property="moveButton" destination="pEs-SO-OeU" id="tXy-YE-0Fd"/>
                 <outlet property="selectButton" destination="myC-wK-dxM" id="feq-5t-r7C"/>
             </connections>
             <point key="canvasLocation" x="-407" y="374"/>
@@ -1439,14 +1407,6 @@
                             <constraint firstItem="9sr-hn-zf9" firstAttribute="top" secondItem="PMz-SY-OIL" secondAttribute="top" id="m1h-ka-kIV"/>
                         </constraints>
                     </view>
-                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="xT5-Lk-SrV">
-                        <rect key="frame" x="270" y="71.5" width="40" height="40"/>
-                        <constraints>
-                            <constraint firstAttribute="width" constant="40" id="d2a-gz-gUC"/>
-                            <constraint firstAttribute="height" constant="40" id="jO2-i7-6kU"/>
-                        </constraints>
-                        <state key="normal" image="收藏_移动"/>
-                    </button>
                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="b9I-cx-ySh">
                         <rect key="frame" x="0.0" y="72.5" width="38" height="38"/>
                         <state key="normal" image="sendinfo_no"/>
@@ -1463,7 +1423,6 @@
                     <constraint firstItem="grN-cD-k8G" firstAttribute="top" secondItem="ucJ-Ho-pRe" secondAttribute="top" id="MI9-Wb-g3x"/>
                     <constraint firstItem="fQn-df-5wG" firstAttribute="centerY" secondItem="dxc-1u-qfX" secondAttribute="centerY" id="N9v-x4-WiA"/>
                     <constraint firstItem="LAA-GK-LDa" firstAttribute="leading" secondItem="K5E-sn-Q9E" secondAttribute="leading" constant="42" id="Qvw-kr-MEx"/>
-                    <constraint firstAttribute="trailing" secondItem="xT5-Lk-SrV" secondAttribute="trailing" constant="10" id="UZc-Wp-D4g"/>
                     <constraint firstItem="grN-cD-k8G" firstAttribute="leading" secondItem="ucJ-Ho-pRe" secondAttribute="trailing" constant="13" id="X43-aH-KMZ"/>
                     <constraint firstItem="ybT-SS-acx" firstAttribute="top" secondItem="PMz-SY-OIL" secondAttribute="bottom" constant="10" id="Xi8-KF-hQX"/>
                     <constraint firstItem="dxc-1u-qfX" firstAttribute="top" secondItem="grN-cD-k8G" secondAttribute="bottom" constant="6" id="Xo9-mP-syV"/>
@@ -1471,7 +1430,6 @@
                     <constraint firstItem="fQn-df-5wG" firstAttribute="leading" secondItem="ucJ-Ho-pRe" secondAttribute="trailing" constant="13" id="cMa-NJ-mEV"/>
                     <constraint firstItem="LAA-GK-LDa" firstAttribute="top" secondItem="dxc-1u-qfX" secondAttribute="bottom" constant="15" id="fAf-xO-0M3"/>
                     <constraint firstItem="dxc-1u-qfX" firstAttribute="leading" secondItem="grN-cD-k8G" secondAttribute="leading" id="hrx-rE-hAd"/>
-                    <constraint firstItem="xT5-Lk-SrV" firstAttribute="centerY" secondItem="K5E-sn-Q9E" secondAttribute="centerY" id="jlW-Ws-tjX"/>
                     <constraint firstItem="ucJ-Ho-pRe" firstAttribute="leading" secondItem="K5E-sn-Q9E" secondAttribute="leading" constant="42" id="oAJ-sk-0qH"/>
                     <constraint firstAttribute="trailing" secondItem="ybT-SS-acx" secondAttribute="trailing" id="ueO-cj-5mN"/>
                     <constraint firstAttribute="bottom" secondItem="ybT-SS-acx" secondAttribute="bottom" id="xZ8-Ng-bvY"/>
@@ -1486,7 +1444,6 @@
                 <outlet property="cell2Title" destination="grN-cD-k8G" id="Fm5-bO-DMN"/>
                 <outlet property="cell2contentTitleLabel" destination="LAA-GK-LDa" id="pII-Tu-L1p"/>
                 <outlet property="cell2readNumberLabel" destination="fQn-df-5wG" id="vfW-4H-baw"/>
-                <outlet property="moveButton" destination="xT5-Lk-SrV" id="fxU-84-xuc"/>
                 <outlet property="selectButton" destination="b9I-cx-ySh" id="zX8-0q-4fP"/>
             </connections>
             <point key="canvasLocation" x="-407.24637681159425" y="544.08482142857144"/>
@@ -1558,14 +1515,6 @@
                         <state key="normal" image="sendinfo_no"/>
                         <state key="selected" image="sendinfo_yes"/>
                     </button>
-                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="vUL-Bh-5PX">
-                        <rect key="frame" x="270" y="57.5" width="40" height="40"/>
-                        <constraints>
-                            <constraint firstAttribute="width" constant="40" id="K9A-UW-QmG"/>
-                            <constraint firstAttribute="height" constant="40" id="gm5-5Q-Yze"/>
-                        </constraints>
-                        <state key="normal" image="收藏_移动"/>
-                    </button>
                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="102" translatesAutoresizingMaskIntoConstraints="NO" id="1oM-Ye-30O">
                         <rect key="frame" x="52" y="139" width="15" height="11"/>
                         <constraints>
@@ -1591,8 +1540,6 @@
                     <constraint firstItem="TJX-zS-lcA" firstAttribute="leading" secondItem="Fhp-1z-SdL" secondAttribute="leading" constant="42" id="cpi-16-G2X"/>
                     <constraint firstItem="6lM-SM-M9c" firstAttribute="top" secondItem="TJX-zS-lcA" secondAttribute="bottom" constant="10" id="djy-sk-f7b"/>
                     <constraint firstItem="VrS-Sn-MB2" firstAttribute="centerY" secondItem="1oM-Ye-30O" secondAttribute="centerY" id="k2H-t1-Ag7"/>
-                    <constraint firstItem="vUL-Bh-5PX" firstAttribute="centerY" secondItem="Fhp-1z-SdL" secondAttribute="centerY" id="p0j-FR-p9b"/>
-                    <constraint firstAttribute="trailing" secondItem="vUL-Bh-5PX" secondAttribute="trailing" constant="10" id="r0v-gk-9Ji"/>
                     <constraint firstItem="WjZ-wP-y49" firstAttribute="top" secondItem="VrS-Sn-MB2" secondAttribute="bottom" constant="10" id="sdL-V6-2F1"/>
                     <constraint firstAttribute="trailing" secondItem="WjZ-wP-y49" secondAttribute="trailing" id="ytD-Eu-rZ3"/>
                 </constraints>
@@ -1605,7 +1552,6 @@
                 <outlet property="cell3SourceLabel" destination="VrS-Sn-MB2" id="uOE-Jq-Czw"/>
                 <outlet property="cell3ThirdImageView" destination="Bhm-4I-wBX" id="ddA-Bh-iAX"/>
                 <outlet property="cell3contentTitleLabel" destination="TJX-zS-lcA" id="Bg2-tt-8AI"/>
-                <outlet property="moveButton" destination="vUL-Bh-5PX" id="4I0-NR-31e"/>
                 <outlet property="selectButton" destination="U3V-8d-ofb" id="F8x-oU-sIm"/>
             </connections>
             <point key="canvasLocation" x="-1000" y="541"/>
@@ -1708,14 +1654,6 @@
                         <state key="normal" image="sendinfo_no"/>
                         <state key="selected" image="sendinfo_yes"/>
                     </button>
-                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="uNZ-5D-HkU">
-                        <rect key="frame" x="270" y="73" width="40" height="40"/>
-                        <constraints>
-                            <constraint firstAttribute="width" constant="40" id="Stt-1Z-iQp"/>
-                            <constraint firstAttribute="height" constant="40" id="wXb-sD-yyE"/>
-                        </constraints>
-                        <state key="normal" image="收藏_移动"/>
-                    </button>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="事件聚焦" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vqD-wu-uwo">
                         <rect key="frame" x="42" y="96" width="236" height="19.5"/>
                         <constraints>
@@ -1737,7 +1675,6 @@
                     <constraint firstItem="mFy-GA-foa" firstAttribute="top" secondItem="vqD-wu-uwo" secondAttribute="bottom" constant="10" id="Fie-Cm-2b9"/>
                     <constraint firstItem="vqD-wu-uwo" firstAttribute="top" secondItem="yjK-Nk-cJl" secondAttribute="bottom" constant="7.5" id="Nmf-bu-gaA"/>
                     <constraint firstItem="yjK-Nk-cJl" firstAttribute="top" secondItem="TH6-Kz-TjV" secondAttribute="bottom" constant="15" id="Nuz-NB-2S9"/>
-                    <constraint firstItem="uNZ-5D-HkU" firstAttribute="centerY" secondItem="ZdD-to-leC" secondAttribute="centerY" id="Old-f5-gpq"/>
                     <constraint firstItem="L7d-dK-Xv3" firstAttribute="leading" secondItem="ZdD-to-leC" secondAttribute="leading" id="Q9m-uy-B2l"/>
                     <constraint firstItem="mFy-GA-foa" firstAttribute="leading" secondItem="ZdD-to-leC" secondAttribute="leading" constant="42" id="QIB-Ks-oNI"/>
                     <constraint firstItem="v8b-k0-0St" firstAttribute="leading" secondItem="Mcm-a3-JxG" secondAttribute="trailing" constant="13" id="RoU-ny-alo"/>
@@ -1747,7 +1684,6 @@
                     <constraint firstItem="Mcm-a3-JxG" firstAttribute="leading" secondItem="ZdD-to-leC" secondAttribute="leading" constant="42" id="gPW-qR-q5F"/>
                     <constraint firstItem="yjK-Nk-cJl" firstAttribute="leading" secondItem="ZdD-to-leC" secondAttribute="leading" constant="42" id="isr-ya-hNK"/>
                     <constraint firstItem="R2l-Na-UG5" firstAttribute="centerY" secondItem="ZdD-to-leC" secondAttribute="centerY" id="miX-Ti-Bu7"/>
-                    <constraint firstAttribute="trailing" secondItem="uNZ-5D-HkU" secondAttribute="trailing" constant="10" id="oRW-mn-bor"/>
                     <constraint firstAttribute="trailing" secondItem="mFy-GA-foa" secondAttribute="trailing" constant="42" id="ppI-Jv-JWo"/>
                     <constraint firstAttribute="bottom" secondItem="L7d-dK-Xv3" secondAttribute="bottom" id="qje-5J-BMu"/>
                     <constraint firstItem="Mcm-a3-JxG" firstAttribute="top" secondItem="ZdD-to-leC" secondAttribute="top" constant="12" id="rho-o4-XID"/>
@@ -1770,7 +1706,6 @@
                 <outlet property="cell4contentTitleLabel" destination="yjK-Nk-cJl" id="NbW-9V-8hA"/>
                 <outlet property="cell4contentTitleSubLabel" destination="vqD-wu-uwo" id="2TC-Bn-4bz"/>
                 <outlet property="cell4readNumberLabel" destination="v8b-k0-0St" id="tEa-rL-nco"/>
-                <outlet property="moveButton" destination="uNZ-5D-HkU" id="hkH-mf-wN0"/>
                 <outlet property="selectButton" destination="R2l-Na-UG5" id="5cK-NQ-vzp"/>
             </connections>
             <point key="canvasLocation" x="-442" y="733"/>
@@ -1896,14 +1831,6 @@
                         <state key="normal" image="sendinfo_no"/>
                         <state key="selected" image="sendinfo_yes"/>
                     </button>
-                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="LX1-h0-n0d">
-                        <rect key="frame" x="270" y="87" width="40" height="40"/>
-                        <constraints>
-                            <constraint firstAttribute="height" constant="40" id="ZFR-wE-NbP"/>
-                            <constraint firstAttribute="width" constant="40" id="q8m-JQ-AiL"/>
-                        </constraints>
-                        <state key="normal" image="收藏_移动"/>
-                    </button>
                 </subviews>
                 <constraints>
                     <constraint firstItem="ZWw-z0-zGJ" firstAttribute="leading" secondItem="HKI-KL-g1i" secondAttribute="leading" constant="42" id="0lJ-vp-sz7"/>
@@ -1922,12 +1849,10 @@
                     <constraint firstItem="q39-89-hR4" firstAttribute="centerY" secondItem="6OS-g0-8uE" secondAttribute="centerY" id="VXz-yK-lUo"/>
                     <constraint firstItem="ydb-0e-ICg" firstAttribute="top" secondItem="TwU-Jr-yi4" secondAttribute="bottom" constant="10" id="YWh-jk-jjE"/>
                     <constraint firstItem="V5a-nS-hCR" firstAttribute="leading" secondItem="HKI-KL-g1i" secondAttribute="leading" constant="42" id="YyQ-vM-ZcD"/>
-                    <constraint firstItem="LX1-h0-n0d" firstAttribute="centerY" secondItem="HKI-KL-g1i" secondAttribute="centerY" id="bQ4-ln-GdC"/>
                     <constraint firstItem="TwU-Jr-yi4" firstAttribute="leading" secondItem="5MW-qZ-dFM" secondAttribute="trailing" id="efi-Mz-C67"/>
                     <constraint firstItem="6OS-g0-8uE" firstAttribute="top" secondItem="t10-hX-ZgF" secondAttribute="bottom" constant="6" id="fYT-73-xqP"/>
                     <constraint firstItem="q39-89-hR4" firstAttribute="leading" secondItem="ZWw-z0-zGJ" secondAttribute="trailing" constant="13" id="jyL-D3-pUg"/>
                     <constraint firstAttribute="trailing" secondItem="ydb-0e-ICg" secondAttribute="trailing" id="kN2-qF-nc1"/>
-                    <constraint firstAttribute="trailing" secondItem="LX1-h0-n0d" secondAttribute="trailing" constant="10" id="kZP-HI-Ctg"/>
                     <constraint firstAttribute="bottom" secondItem="ydb-0e-ICg" secondAttribute="bottom" id="pLp-pV-1Py"/>
                     <constraint firstItem="qti-Lt-eLL" firstAttribute="top" secondItem="6OS-g0-8uE" secondAttribute="bottom" constant="17" id="qUd-zG-mJM"/>
                     <constraint firstItem="t10-hX-ZgF" firstAttribute="top" secondItem="ZWw-z0-zGJ" secondAttribute="top" id="rvv-bW-f9Y"/>
@@ -1948,7 +1873,6 @@
                 <outlet property="cell5ShareType" destination="6OS-g0-8uE" id="tf0-53-Brm"/>
                 <outlet property="cell5Title" destination="t10-hX-ZgF" id="bg0-pt-ABK"/>
                 <outlet property="cell6Title" destination="sNb-fU-deX" id="SX8-8d-dZY"/>
-                <outlet property="moveButton" destination="LX1-h0-n0d" id="3m3-0I-2Ru"/>
                 <outlet property="selectButton" destination="m7w-rZ-GJ1" id="Tay-xY-3OX"/>
             </connections>
             <point key="canvasLocation" x="-1009" y="374"/>
@@ -2062,17 +1986,8 @@
                         <state key="normal" image="sendinfo_no"/>
                         <state key="selected" image="sendinfo_yes"/>
                     </button>
-                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="d0f-N3-oH1">
-                        <rect key="frame" x="270" y="87" width="40" height="40"/>
-                        <constraints>
-                            <constraint firstAttribute="height" constant="40" id="BLO-T7-NAJ"/>
-                            <constraint firstAttribute="width" constant="40" id="XA0-ib-7ie"/>
-                        </constraints>
-                        <state key="normal" image="收藏_移动"/>
-                    </button>
                 </subviews>
                 <constraints>
-                    <constraint firstItem="d0f-N3-oH1" firstAttribute="centerY" secondItem="ddm-s5-dhh" secondAttribute="centerY" id="0S0-7N-zAM"/>
                     <constraint firstAttribute="trailing" secondItem="kEv-8F-PtD" secondAttribute="trailing" constant="42" id="3eS-wE-jn9"/>
                     <constraint firstItem="u7p-YV-rZw" firstAttribute="top" secondItem="bi8-Ka-nKL" secondAttribute="bottom" constant="6" id="4iU-6o-ORk"/>
                     <constraint firstAttribute="trailing" secondItem="KEd-OE-MuO" secondAttribute="trailing" constant="42" id="6Eg-qa-9Gb"/>
@@ -2081,7 +1996,6 @@
                     <constraint firstItem="0LY-Wa-JbI" firstAttribute="leading" secondItem="ddm-s5-dhh" secondAttribute="leading" id="9Td-3A-5fm"/>
                     <constraint firstItem="2p3-8f-6vr" firstAttribute="leading" secondItem="5zk-s3-htb" secondAttribute="trailing" id="AR5-DD-oZZ"/>
                     <constraint firstItem="KEd-OE-MuO" firstAttribute="leading" secondItem="ddm-s5-dhh" secondAttribute="leading" constant="42" id="Glv-MM-pK4"/>
-                    <constraint firstAttribute="trailing" secondItem="d0f-N3-oH1" secondAttribute="trailing" constant="10" id="Ntd-xW-F6v"/>
                     <constraint firstItem="2p3-8f-6vr" firstAttribute="trailing" secondItem="ddm-s5-dhh" secondAttribute="trailing" constant="-42" id="O45-LJ-OqT"/>
                     <constraint firstItem="0LY-Wa-JbI" firstAttribute="centerY" secondItem="ddm-s5-dhh" secondAttribute="centerY" id="PgX-5G-j3X"/>
                     <constraint firstItem="Xb8-zU-XBK" firstAttribute="top" secondItem="2p3-8f-6vr" secondAttribute="bottom" constant="10" id="Q5w-BJ-jes"/>
@@ -2110,7 +2024,6 @@
                 <outlet property="cell6IconImage" destination="WSy-do-zbv" id="eoO-Jt-dtt"/>
                 <outlet property="cell6ReadNumberLabel" destination="odS-ET-Gce" id="X6v-fB-sbv"/>
                 <outlet property="cell6ShareType" destination="u7p-YV-rZw" id="cq4-QN-ZhN"/>
-                <outlet property="moveButton" destination="d0f-N3-oH1" id="Yym-DT-Q8Z"/>
                 <outlet property="selectButton" destination="0LY-Wa-JbI" id="L4j-bW-exL"/>
             </connections>
             <point key="canvasLocation" x="-1578.2608695652175" y="381.69642857142856"/>
@@ -2211,19 +2124,10 @@
                         <state key="normal" image="sendinfo_no"/>
                         <state key="selected" image="sendinfo_yes"/>
                     </button>
-                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="sc5-Mz-qIq">
-                        <rect key="frame" x="270" y="87" width="40" height="40"/>
-                        <constraints>
-                            <constraint firstAttribute="height" constant="40" id="nBy-YL-dgy"/>
-                            <constraint firstAttribute="width" constant="40" id="zIT-kO-crS"/>
-                        </constraints>
-                        <state key="normal" image="收藏_移动"/>
-                    </button>
                 </subviews>
                 <constraints>
                     <constraint firstItem="m1A-4p-khx" firstAttribute="leading" secondItem="GGX-en-OoK" secondAttribute="leading" id="0Qs-MJ-gXZ"/>
                     <constraint firstItem="m1A-4p-khx" firstAttribute="top" secondItem="qYk-T9-XXn" secondAttribute="bottom" constant="10" id="4ss-9x-D0p"/>
-                    <constraint firstItem="sc5-Mz-qIq" firstAttribute="centerY" secondItem="GGX-en-OoK" secondAttribute="centerY" id="9bL-2V-MnY"/>
                     <constraint firstItem="V6P-L1-X6q" firstAttribute="top" secondItem="GGX-en-OoK" secondAttribute="top" constant="12" id="B1n-3x-D5c"/>
                     <constraint firstAttribute="bottom" secondItem="m1A-4p-khx" secondAttribute="bottom" id="BMD-Bv-7lN"/>
                     <constraint firstItem="jdc-FR-9ch" firstAttribute="leading" secondItem="GGX-en-OoK" secondAttribute="leading" constant="42" id="Hmr-T8-gbZ"/>
@@ -2231,7 +2135,6 @@
                     <constraint firstItem="5WG-Qz-2yb" firstAttribute="top" secondItem="PBy-VU-mzj" secondAttribute="bottom" constant="6" id="Jqr-B7-grd"/>
                     <constraint firstItem="H1A-zV-bov" firstAttribute="centerY" secondItem="5WG-Qz-2yb" secondAttribute="centerY" id="Kty-Fy-ImS"/>
                     <constraint firstAttribute="trailing" secondItem="jdc-FR-9ch" secondAttribute="trailing" constant="42" id="MWf-kU-EF5"/>
-                    <constraint firstAttribute="trailing" secondItem="sc5-Mz-qIq" secondAttribute="trailing" constant="10" id="Oxw-AP-ths"/>
                     <constraint firstItem="ZLK-DG-H9v" firstAttribute="leading" secondItem="GGX-en-OoK" secondAttribute="leading" id="PCh-SO-9vR"/>
                     <constraint firstItem="V6P-L1-X6q" firstAttribute="leading" secondItem="GGX-en-OoK" secondAttribute="leading" constant="42" id="Pbe-Ps-l2P"/>
                     <constraint firstItem="qYk-T9-XXn" firstAttribute="centerY" secondItem="VIY-EI-pDe" secondAttribute="centerY" id="RIi-Ww-12f"/>
@@ -2260,7 +2163,6 @@
                 <outlet property="cell7ReadNumberLabel" destination="H1A-zV-bov" id="a3N-Q6-BtT"/>
                 <outlet property="cell7ShareType" destination="5WG-Qz-2yb" id="iEg-7c-0hy"/>
                 <outlet property="cell7Title" destination="PBy-VU-mzj" id="YER-9i-YlE"/>
-                <outlet property="moveButton" destination="sc5-Mz-qIq" id="iHT-En-XHA"/>
                 <outlet property="selectButton" destination="ZLK-DG-H9v" id="YWj-lF-aho"/>
             </connections>
             <point key="canvasLocation" x="-2123.1884057971015" y="381.69642857142856"/>
@@ -2499,7 +2401,6 @@
         <image name="img_placeHolderHorizon" width="345" height="170"/>
         <image name="sendinfo_no" width="38" height="38"/>
         <image name="sendinfo_yes" width="38" height="38"/>
-        <image name="收藏_移动" width="18" height="13"/>
         <image name="收藏_评论" width="18" height="18"/>
         <image name="收藏_赞" width="18" height="18"/>
         <image name="收藏_转发" width="18" height="18"/>

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

@@ -201,8 +201,13 @@
                     cell.fileImgV.image = IMG(@"站内信");
                 }break;
                 case CollectModel_meetMian:{
-                    cell.fileImgV.image = IMG(@"会议");
+                    cell.fileImgV.image = IMG(@"会议纪要");
                 }break;
+                case CollectModel_meetDetail:
+                {
+                    cell.fileImgV.image = IMG(@"会议");
+                }
+                    break;
                 case CollectModel_file:{
                     NSString * imageStr = [ZYCTool getFileNameImage:model.Data.FileName];
                     if (imageStr.length == 0) {
@@ -345,6 +350,7 @@
                         vc.FolderId = model.CollectionDataId;
                         vc.Author = model.Author;
                         vc.myTitle = model.Title;
+                        vc.TypeValue = 1;
                         vc.VisitUserId = model.SourceUserId;
                         [self.navigationController pushViewController:vc animated:YES];
                     }break;

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

@@ -151,6 +151,11 @@
         [weakSelf.tableView.mj_footer endRefreshing];
         MyFavoriteModel *listModel = [[MyFavoriteModel alloc] initWithDictionary:responseObject error:nil];
         weakSelf.totalPage = listModel.Total;
+        if (listModel.ParentId == 0) {
+            weakSelf.listType = weakSelf.FolderId == 0 ? MyNoteBookListLevelTypeA : MyNoteBookListLevelTypeB;
+        }else{
+            weakSelf.listType = MyNoteBookListLevelTypeC;
+        }
         [weakSelf.shouCangArray addObjectsFromArray:listModel.Items];
         
         for (MyFavoriteSubModel *model in weakSelf.shouCangArray) {
@@ -597,6 +602,14 @@
                             cell.fileImgV.image = IMG(@"find_1");
                             cell.subTitleL.attributedText = [self changeOfString:[NSString stringWithFormat:@"来自-%@的笔记",model.Data.Author]];
                         }break;
+                        case CollectModel_TopicBooK:{
+                            cell.fileImgV.image = IMG(@"find_1");
+                            cell.subTitleL.attributedText = [self changeOfString:[NSString stringWithFormat:@"来自-%@的话题本",model.Data.Author]];
+                        }break;
+                        case CollectModel_TopicSubBooK: {
+                            cell.fileImgV.image = IMG(@"find_1");
+                            cell.subTitleL.attributedText = [self changeOfString:[NSString stringWithFormat:@"来自-%@的话题本",model.Data.Author]];
+                        }break;
                             // 通知 || 站内信
                         case CollectModel_Notice:
                         {
@@ -606,12 +619,16 @@
                             cell.fileImgV.image = IMG(@"站内信");
                         }break;
                             // 会议
-                        case CollectModel_meetMian:{
-                            cell.fileImgV.image = IMG(@"会议");
-                        }break;
-                        case CollectModel_meetDetail:{
+                        case CollectModel_meetMian:
+                        {
+                            cell.fileImgV.image = IMG(@"会议纪要");
+                        }
+                            break;
+                        case CollectModel_meetDetail:
+                        {
                             cell.fileImgV.image = IMG(@"会议");
-                        }break;
+                        }
+                            break;
                         case CollectModel_file:{
                             NSString * imageStr = [ZYCTool getFileNameImage:model.Data.FileName];
                             if (imageStr.length == 0) {
@@ -744,8 +761,13 @@
                             cell.fileImgV.image = IMG(@"站内信");
                         }break;
                         case CollectModel_meetMian:{
-                            cell.fileImgV.image = IMG(@"会议");
+                            cell.fileImgV.image = IMG(@"会议纪要");
                         }break;
+                        case CollectModel_meetDetail:
+                        {
+                            cell.fileImgV.image = IMG(@"会议");
+                        }
+                            break;
                         case CollectModel_file:{
                             NSString * imageStr = [ZYCTool getFileNameImage:model.Data.FileName];
                             if (imageStr.length == 0) {
@@ -887,8 +909,13 @@
                             cell.fileImgV.image = IMG(@"站内信");
                         }break;
                         case CollectModel_meetMian:{
-                            cell.fileImgV.image = IMG(@"会议");
+                            cell.fileImgV.image = IMG(@"会议纪要");
                         }break;
+                        case CollectModel_meetDetail:
+                        {
+                            cell.fileImgV.image = IMG(@"会议");
+                        }
+                            break;
                         case CollectModel_file:{
                             NSString * imageStr = [ZYCTool getFileNameImage:model.Data.FileName];
                             if (imageStr.length == 0) {
@@ -1056,7 +1083,8 @@
                 vc.foldId = model.Id;
                 vc.createFoldType = CreateCollectionType;
                 vc.modifyTye = ModifyType;
-                vc.fileType = NewOtherFileType;
+                vc.fileType = weakSelf.listType == MyNoteBookListLevelTypeA
+                ? NewCollectFileType : NewNotFileType;
                 vc.fileName = model.FolderName;
                 vc.roleId = model.RoleId;
                 vc.titleStr = @"修改文件夹";
@@ -1243,6 +1271,31 @@
                             vc.CollectionDataId = model.CollectionDataId;
                             vc.CollectionType = model.CollectionType;
                             vc.Author = model.Data.Author;
+                            vc.TypeValue = 1;
+                            vc.myTitle = model.Title;
+                            vc.VisitUserId = model.SourceUserId;
+                            [self.navigationController pushViewController:vc animated:YES];
+                        }break;
+                        case CollectModel_TopicBooK:{
+                            OtherNoteBookVC * vc = [OtherNoteBookVC initOtherNoteBookVC];
+                            vc.listType = MyFavoriteListLevelTypeA ;
+                            vc.FolderId = model.CollectionDataId;
+                            vc.CollectionDataId = model.CollectionDataId;
+                            vc.CollectionType = model.CollectionType;
+                            vc.Author = model.Data.Author;
+                            vc.TypeValue = 1;
+                            vc.myTitle = model.Title;
+                            vc.VisitUserId = model.SourceUserId;
+                            [self.navigationController pushViewController:vc animated:YES];
+                        }break;
+                        case CollectModel_TopicSubBooK:{
+                            OtherNoteBookVC * vc = [OtherNoteBookVC initOtherNoteBookVC];
+                            vc.listType = MyFavoriteListLevelTypeB ;
+                            vc.FolderId = model.CollectionDataId;
+                            vc.CollectionDataId = model.CollectionDataId;
+                            vc.CollectionType = model.CollectionType;
+                            vc.Author = model.Data.Author;
+                            vc.TypeValue = 1;
                             vc.myTitle = model.Title;
                             vc.VisitUserId = model.SourceUserId;
                             [self.navigationController pushViewController:vc animated:YES];

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

@@ -518,11 +518,13 @@
                         }break;
                             // 会议
                         case CollectModel_meetMian:{
-                            cell.fileImgV.image = IMG(@"会议");
+                            cell.fileImgV.image = IMG(@"会议纪要");
                         }break;
-                        case CollectModel_meetDetail:{
+                        case CollectModel_meetDetail:
+                        {
                             cell.fileImgV.image = IMG(@"会议");
-                        }break;
+                        }
+                            break;
                         case CollectModel_file:{
                             NSString * imageStr = [ZYCTool getFileNameImage:model.Data.FileName];
                             if (imageStr.length == 0) {
@@ -639,8 +641,13 @@
                             cell.fileImgV.image = IMG(@"站内信");
                         }break;
                         case CollectModel_meetMian:{
-                            cell.fileImgV.image = IMG(@"会议");
+                            cell.fileImgV.image = IMG(@"会议纪要");
                         }break;
+                        case CollectModel_meetDetail:
+                        {
+                            cell.fileImgV.image = IMG(@"会议");
+                        }
+                            break;
                         case CollectModel_file:{
                             NSString * imageStr = [ZYCTool getFileNameImage:model.Data.FileName];
                             if (imageStr.length == 0) {
@@ -769,8 +776,13 @@
                             cell.fileImgV.image = IMG(@"站内信");
                         }break;
                         case CollectModel_meetMian:{
-                            cell.fileImgV.image = IMG(@"会议");
+                            cell.fileImgV.image = IMG(@"会议纪要");
                         }break;
+                        case CollectModel_meetDetail:
+                        {
+                            cell.fileImgV.image = IMG(@"会议");
+                        }
+                            break;
                         case CollectModel_file:{
                             NSString * imageStr = [ZYCTool getFileNameImage:model.Data.FileName];
                             if (imageStr.length == 0) {
@@ -936,6 +948,7 @@
                             vc.FolderId = model.CollectionDataId;
                             vc.Author = model.Data.Author;
                             vc.myTitle = model.Title;
+                            vc.TypeValue = 1;
                             vc.VisitUserId = model.SourceUserId;
                             [self.navigationController pushViewController:vc animated:YES];
                         }break;

smartRhino/Project/VCModel/My_Center/Controller/ColletionVC/Model/MyFavoriteModel.h

@@ -13,6 +13,7 @@ NS_ASSUME_NONNULL_BEGIN
 @interface MyFavoriteModel : BaseModel
 @property (nonatomic,assign) NSInteger  Total;
 @property (nonatomic,assign) BOOL       IsCollect;
+@property (nonatomic,assign) NSInteger  ParentId;
 @property (nonatomic,strong) NSMutableArray<MyFavoriteSubModel>*Items;
 @end
 

smartRhino/Project/VCModel/My_Center/Controller/ColletionVC/Model/MyFavoriteSubModel.h

@@ -89,6 +89,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic,strong) NSString * Content;
 //Data
 @property (nonatomic,assign) NSInteger  FileCount;
+@property (nonatomic,assign) NSInteger  FolderId;
 /// 文件夹名称
 @property (nonatomic,strong) NSString*  FolderName;
 

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

@@ -105,7 +105,7 @@
     }
     SHOWLOADING
     WS(weakSelf);
-    [[HttpManager sharedHttpManager] POSTUrl:Host(API_NoteBook) parameters:@{@"FolderId":@(self.FolderId),@"Page":@(self.currentPage),@"PerPage":@(10),@"VisitUserId":@(0),@"SearchKey":self.searchText,@"Sort":@"",@"TypeValue":@(self.TypeValue)} 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":self.searchText,@"Sort":@"",@"TypeValue":@(self.TypeValue)} responseStyle:JOSN success:^(id  _Nonnull responseObject) {
         REMOVESHOW
         NSLog(@"笔记列表数据 %@",responseObject);
         MyNoteBookModel *listModel = [[MyNoteBookModel alloc] initWithDictionary:responseObject error:nil];
@@ -1021,6 +1021,7 @@
             vc.FolderId = model.Id;
             vc.Author = model.Author;
             vc.myTitle = model.Title;
+            vc.TypeValue = 1;
             vc.VisitUserId = model.SourceUserId;
             [self.navigationController pushViewController:vc animated:YES];
         }break;

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

@@ -1004,7 +1004,7 @@
                             break;
                     }
                 }break;
-                default:{///文件夹
+                case 2:{///文件夹
                     MyFavoriteViewCell *cell = [MyFavoriteViewCell configCell00:tableView indexPath:indexPath];
                     switch (model.RoleId) {
                         case 1:
@@ -1036,6 +1036,11 @@
                     }];
                     return cell;
                 }break;
+                default:{///文件夹
+                    MyFavoriteViewCell *cell = [MyFavoriteViewCell configCell0:tableView indexPath:indexPath];
+                    cell.hidden = YES;
+                    return cell;
+                }break;
             }break;
         case OperationStateEnum0:{ // 正常
             switch (model.AttributeValue) {
@@ -2235,8 +2240,6 @@
                     
                     cell.cell0Number.text = [NSString stringWithFormat:@"%ld",(long)model.FileCount];
                     // 选择类的把movebutton隐藏，显示成多少和进入图标
-                    [cell.moveButton setHidden:YES];
-                    [cell.moveButtonView setHidden:YES];
                     [cell.cell0RightImage setHidden:NO];
                     [cell.cell0Number setHidden:NO];
                     // 选中按钮
@@ -2391,9 +2394,9 @@
                 MyFavoriteNewFindVC *vc = [MyFavoriteNewFindVC initMyFavoriteNewFindVC];
                 vc.ParentId = model.Id;
                 vc.foldId = model.Id;
-                vc.createFoldType = CreateNotesType;
+                vc.createFoldType = weakSelf.TypeValue == 1 ? CreateNewTopicType : CreateNotesType;
                 vc.modifyTye = ModifyType;
-                vc.fileType = NewOtherFileType;
+                vc.fileType = NewNotFileType;
                 vc.titleStr = @"修改文件夹";
                 vc.roleId = model.RoleId;
                 vc.fileName = model.FolderName;
@@ -3075,6 +3078,7 @@
             vc.FolderId = model.Id;
             vc.Author = model.Author;
             vc.myTitle = model.Title;
+            vc.TypeValue = 1;
             vc.VisitUserId = model.SourceUserId;
             [self.navigationController pushViewController:vc animated:YES];
         }break;
@@ -3336,6 +3340,9 @@
 }
 - (NSAttributedString *)setTextWithStr:(NSString *)str
 {
+    if (str.length == 0) {
+        return [[NSAttributedString alloc] initWithString:@""];
+    }
     NSMutableAttributedString *attributedString = [[NSMutableAttributedString alloc] initWithString:str];
     [attributedString addAttribute:NSFontAttributeName value:[UIFont fontWithName:@"PingFang SC" size:16] range:NSMakeRange(0, str.length)];
     [attributedString addAttribute:NSForegroundColorAttributeName value:UIColorHex(#484848) range:NSMakeRange(0, str.length)];
@@ -3348,6 +3355,9 @@
 }
 - (NSAttributedString *)setTitleWithStr:(NSString *)str
 {
+    if (str.length == 0) {
+        return [[NSAttributedString alloc] initWithString:@""];
+    }
     NSMutableAttributedString *attributedString = [[NSMutableAttributedString alloc] initWithString:str];
     [attributedString addAttribute:NSFontAttributeName value:[UIFont systemFontOfSize:18] range:NSMakeRange(0, str.length)];
     [attributedString addAttribute:NSForegroundColorAttributeName value:UIColorHex(0x0a0a0a) range:NSMakeRange(0, str.length)];

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

@@ -114,7 +114,7 @@
 - (void)getDataList{
     WS(weakSelf);
     [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) {
+    [[HttpManager sharedHttpManager] POSTUrl:Host(API_NoteBook) parameters:@{@"FolderId":@(self.FolderId),@"Page":@(1),@"PerPage":@(99999999),@"VisitUserId":@(self.VisitUserId),@"SearchKey":@"",@"Sort":@"",@"TypeValue":@(1)} responseStyle:JOSN success:^(id  _Nonnull responseObject) {
         NSLog(@"笔记列表数据 %@",responseObject);
         MyNoteBookModel *listModel = [[MyNoteBookModel alloc] initWithDictionary:responseObject error:nil];
         weakSelf.totalPage = listModel.Total;
@@ -155,7 +155,7 @@
     self.fd_prefersNavigationBarHidden = YES;
     self.collectBtn.hidden = NO;
     self.reSendBtn.hidden = NO;
-    
+    self.TypeValue = 1;
     self.tableView.delegate = self;
     self.tableView.dataSource = self;
     [self.view addSubview:self.tableView];
@@ -179,7 +179,7 @@
                 NSMutableDictionary *dic = [[NSMutableDictionary alloc]init];
                 [dic setValue:@(weakSelf.CollectionDataId) forKey:@"CollectionDataId"];
                 ///     1文章 2话题 3 收藏 4笔记 5通知 6站内信 7小组 8 会议详情 14工作流审批 300 文件 400 会议纪要
-                [dic setValue:@(weakSelf.CollectionType) forKey:@"CollectionType"];
+                [dic setValue:@(weakSelf.listType == MyNoteBookListLevelTypeA ? CollectModel_TopicBooK : CollectModel_TopicSubBooK) forKey:@"CollectionType"];
                 [dic setValue:@(weakSelf.FolderId) forKey:@"FolderId"];
                 [dic setValue:@(weakSelf.VisitUserId) forKey:@"SourceUserId"];
                 [[HttpManager sharedHttpManager] PUTUrl:Host(API_CreateCollect) parameters:dic success:^(id  _Nonnull responseObject) {
@@ -206,7 +206,7 @@
             vc.SourceUserId = weakSelf.VisitUserId;
             vc.TypeValue = weakSelf.TypeValue;
             vc.FolderIds = @[].mutableCopy;
-            vc.CollectionType = weakSelf.TypeValue == 1 ? CollectModel_NewTopic : CollectModel_NoteFile;
+            vc.CollectionType = weakSelf.listType == MyNoteBookListLevelTypeA ? CollectModel_TopicBooK : CollectModel_TopicSubBooK;
             [weakSelf.navigationController pushViewController:vc animated:YES];
         }
     }];
@@ -983,9 +983,6 @@
     [self.navigationController pushViewController:vc animated:YES];
 }
 
-- (void)tableView:(UITableView*)tableView commitEditingStyle:(UITableViewCellEditingStyle)editingStyle forRowAtIndexPath:(NSIndexPath*)indexPath
-{
-}
 - (void)eidtorNoteBook:(NSInteger)noteId{
     WS(weakSelf);
     [[HttpManager sharedHttpManager] GETUrl:[NSString stringWithFormat:@"%@%@%@",BaseUrl,API_NoteBook_Detail,@(noteId).stringValue] parameters:@{} responseStyle:JOSN success:^(id  _Nonnull responseObject) {
@@ -1006,7 +1003,7 @@
         case 1:{
             MyTDTopicDetailVC * vc = [MyTDTopicDetailVC initMyTDTopicDetailVC];
             vc.Id = model.MiddleId;
-            vc.type = CollectModel_NoteBook;
+            vc.type = self.TypeValue == 1 ? CollectModel_NewTopic : CollectModel_NoteBook;
             vc.isNoteBook = YES;
             [self.navigationController pushViewController:vc animated:YES];
         }break;
@@ -1022,6 +1019,7 @@
             vc.CollectionType = CollectModel_NoteFile;
             vc.FolderId = model.Id;
             vc.myTitle = model.FolderName;
+            vc.TypeValue = 1;
             vc.VisitUserId = self.VisitUserId;
             [self.navigationController pushViewController:vc animated:YES];
         }break;

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

@@ -340,12 +340,12 @@
             self.addImageV.image = IMG(@"笔记小组");
         }
             break;
-        case CollectModel_meetDetail:
+        case CollectModel_meetMian:
         {
-            self.addImageV.image = IMG(@"会议");
+            self.addImageV.image = IMG(@"会议纪要");
         }
             break;
-        case CollectModel_meetMian:
+        case CollectModel_meetDetail:
         {
             self.addImageV.image = IMG(@"会议");
         }

smartRhino/Project/VCModel/Source/Controller/GroupSquareSearchVC.h

@@ -0,0 +1,16 @@
+//
+//  GroupSquareSearchVC.h
+//  smartRhino
+//
+//  Created by niuzhen on 2020/1/17.
+//  Copyright © 2020 tederen. All rights reserved.
+//
+
+#import "SearchBaseVC.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface GroupSquareSearchVC : SearchBaseVC
+@end
+
+NS_ASSUME_NONNULL_END

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

@@ -0,0 +1,138 @@
+//
+//  GroupSquareSearchVC.m
+//  smartRhino
+//
+//  Created by niuzhen on 2020/1/17.
+//  Copyright © 2020 tederen. All rights reserved.
+//
+
+#import "GroupSquareSearchVC.h"
+#import "GroupSquareModel.h"
+#import "GroupSquareSubModel.h"
+#import "GroupSquareCell.h"
+#import "GroupSynopsisVC.h"
+#import "TDGroupInfoListVC.h"
+
+@interface GroupSquareSearchVC ()<UITableViewDelegate,UITableViewDataSource>
+@property (nonatomic, strong) NSMutableArray *listArray;
+@end
+
+@implementation GroupSquareSearchVC
+- (NSMutableArray *)listArray
+{
+    if (!_listArray) {
+        _listArray = [NSMutableArray array];
+    }
+    return _listArray;
+}
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    self.fd_prefersNavigationBarHidden = YES;
+    self.view.backgroundColor = RGB(255, 255, 255);
+    self.tableView.delegate = self;
+    self.tableView.dataSource = self;
+
+    self.historySearchType = HistorySearchType_Square;
+    [self addObserver:self forKeyPath:@"searchText" options:NSKeyValueObservingOptionNew context:nil];
+}
+
+- (void)dealloc
+{
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
+}
+- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary<NSKeyValueChangeKey,id> *)change context:(void *)context
+{
+    id obj = [change objectForKey:@"new"];
+    NSString * text = @"";
+    if ([obj isKindOfClass:[NSString class]]) {
+        text = obj;
+    }else{
+        text  = [obj stringValue];
+    }
+    if (text.length > 0) {
+        [self getData];
+    }
+}
+
+- (void)getData
+{
+    [self.listArray removeAllObjects];
+    WS(weakSelf);
+    [[HttpManager sharedHttpManager] GETUrl:Host(API_APP_GROUP_Search) parameters:@{@"keyWord":self.searchText} responseStyle:JOSN success:^(id  _Nonnull responseObject) {
+        if ([responseObject isKindOfClass:[NSArray class]]) {
+            for (NSDictionary * dict in responseObject) {
+                GroupSquareSubModel * model = [GroupSquareSubModel modelWithDictionary:dict];
+                [weakSelf.listArray addObject:model];
+            }
+        }
+        dispatch_async(dispatch_get_main_queue(), ^{
+            [weakSelf.tableView reloadData];
+        });
+    } failure:^(NSError * _Nonnull error) {
+        
+    }];
+}
+
+#pragma mark - UITableViewDelegate
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
+{
+    return self.listArray.count;
+}
+- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    return [GroupSquareCell configCell1Height];
+}
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    GroupSquareSubModel * model = [self.listArray objectAtIndex:indexPath.row];
+    GroupSquareCell * cell = [GroupSquareCell configCell1:tableView indexPath:indexPath];
+    [cell setRightDataSubModel:model withSearchText:self.searchText];
+    WS(weakSelf);
+    [cell.JoinBtn setAction:^{
+        [weakSelf JoinGroupIndex:indexPath withModel:model];
+    }];
+    return cell;
+}
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    [tableView deselectRowAtIndexPath:indexPath animated:YES];
+    GroupSquareSubModel * model = [self.listArray objectAtIndex:indexPath.row];
+    if (model.IsUser) {
+        TDGroupInfoListVC * vc = [TDGroupInfoListVC initTDGroupInfoListVC];
+        vc.GroupId = model.Id;
+        vc.titleStr = model.Name;
+        [self.navigationController pushViewController:vc animated:YES];
+    }else{
+        GroupSynopsisVC * vc = [GroupSynopsisVC initGroupSynopsisVC];
+        vc.GroupId = model.Id;
+        if (!model.IsUser && !model.IsApply) {
+            vc.IsJoin = NO;
+        }else{
+            vc.IsJoin = YES;
+        }
+        [self.navigationController pushViewController:vc animated:YES];
+    }
+}
+- (void)JoinGroupIndex:(NSIndexPath *)indexPath withModel:(GroupSquareSubModel *)model
+{
+    WS(weakSelf);
+    NSDictionary * paraDict = @{@"GroupId":@(model.Id),
+                                @"UserIds":@[@([AppUserModel sharedAppUserModel].Id)],
+                                @"UserId":@([AppUserModel sharedAppUserModel].Id),
+                                @"SourceType":@(1)///申请
+    };
+    [[HttpManager sharedHttpManager] POSTUrl:Host(APP_Group_Insert_User) parameters:paraDict responseStyle:DATA success:^(id  _Nonnull responseObject) {
+        SHOWSUCCESS(responseObject[@"Msg"]);
+        if ([responseObject[@"Code"] integerValue] == 200) {
+            TDGroupInfoListVC * vc = [TDGroupInfoListVC initTDGroupInfoListVC];
+            vc.GroupId = model.Id;
+            vc.titleStr = model.Name;
+            [weakSelf.navigationController pushViewController:vc animated:YES];
+        }
+        [weakSelf getData];
+    } failure:^(NSError * _Nonnull error) {
+        SHOWERROR([ZYCTool handerResultData:error]);
+    }];
+}
+
+@end

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

@@ -12,6 +12,8 @@
 #import "GroupSquareCell.h"
 #import "MyTDGroupView.h"
 #import "GroupSynopsisVC.h"
+#import "GroupSquareSearchVC.h"
+#import "TDGroupInfoListVC.h"
 
 @interface GroupSquareVC ()<UITableViewDelegate,UITableViewDataSource>
 @property (weak, nonatomic) IBOutlet UITableView *leftTable;
@@ -21,6 +23,8 @@
 @property (strong, nonatomic) MyTDGroupView      *SearchView;
 @property (copy, nonatomic) NSMutableArray       *leftArray;
 @property (copy, nonatomic) NSMutableArray       *rightArray;
+@property (assign, nonatomic) NSInteger           leftId;
+
 @end
 
 @implementation GroupSquareVC
@@ -38,8 +42,10 @@
         make.left.right.mas_equalTo(self.HeadView);
         make.height.mas_offset(36);
     }];
+    WS(weakSelf);
     [self.SearchView.button setAction:^{
-        NSLog(@"SearchView.button");
+        GroupSquareSearchVC * vc = [[GroupSquareSearchVC alloc] init];
+        [weakSelf.navigationController pushViewController:vc animated:YES];
     }];
     self.leftTable.delegate = self;
     self.leftTable.dataSource = self;
@@ -70,6 +76,7 @@
                 [weakSelf.leftArray addObject:model];
             }
             GroupSquareModel * fmodel = weakSelf.leftArray.firstObject;
+            weakSelf.leftId = fmodel.Id;
             [weakSelf getSubData:fmodel.Id];
         }
     } failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) {
@@ -81,18 +88,18 @@
     WS(weakSelf);
     [self.rightArray removeAllObjects];
     NSString * url = [NSString stringWithFormat:@"%@%ld",Host(API_APP_GROUP_Category_list),listID];
-    [[HttpManager sharedHttpManager] GET:url parameters:@{} success:^(NSURLSessionDataTask * _Nonnull task, id  _Nullable responseObject) {
-        NSArray * array = responseObject;
-        NSLog(@"====== %ld",array.count);
-        for (NSInteger i = 0; i < array.count; i ++) {
-            GroupSquareSubModel * model = [GroupSquareSubModel modelWithDictionary:array[i]];
-            [weakSelf.rightArray addObject:model];
+    [[HttpManager sharedHttpManager] GETUrl:url parameters:@{} responseStyle:JOSN success:^(id  _Nonnull responseObject) {
+        if ([responseObject isKindOfClass:[NSArray class]]) {
+            for (NSDictionary * dict in responseObject) {
+                GroupSquareSubModel * model = [GroupSquareSubModel modelWithDictionary:dict];
+                [weakSelf.rightArray addObject:model];
+            }
         }
         dispatch_async(dispatch_get_main_queue(), ^{
             [weakSelf reloadData];
         });
-    } failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) {
-        
+    } failure:^(NSError * _Nonnull error) {
+
     }];
 }
 
@@ -129,6 +136,10 @@
         GroupSquareSubModel * model = [self.rightArray objectAtIndex:indexPath.row];
         GroupSquareCell * cell = [GroupSquareCell configCell1:tableView indexPath:indexPath];
         [cell setRightDataSubModel:model];
+        WS(weakSelf);
+        [cell.JoinBtn setAction:^{
+            [weakSelf JoinGroupIndex:indexPath withModel:model];
+        }];
         return cell;
     }
 }
@@ -148,15 +159,49 @@
             }else{
                 self.height.constant = 19.f;
             }
+            self.leftId = model.Id;
             [self getSubData:model.Id];
         }
     }else{
         GroupSquareSubModel * model = [self.rightArray objectAtIndex:indexPath.row];
-        GroupSynopsisVC * vc = [GroupSynopsisVC initGroupSynopsisVC];
-        vc.GroupId = model.Id;
-        [self.navigationController pushViewController:vc animated:YES];
+        if (model.IsUser) {
+            TDGroupInfoListVC * vc = [TDGroupInfoListVC initTDGroupInfoListVC];
+            vc.GroupId = model.Id;
+            vc.titleStr = model.Name;
+            [self.navigationController pushViewController:vc animated:YES];
+        }else{
+            GroupSynopsisVC * vc = [GroupSynopsisVC initGroupSynopsisVC];
+            vc.GroupId = model.Id;
+            if (!model.IsUser && !model.IsApply) {
+                vc.IsJoin = NO;
+            }else{
+                vc.IsJoin = YES;
+            }
+            [self.navigationController pushViewController:vc animated:YES];
+        }
     }
 }
+- (void)JoinGroupIndex:(NSIndexPath *)indexPath withModel:(GroupSquareSubModel *)model
+{
+    WS(weakSelf);
+    NSDictionary * paraDict = @{@"GroupId":@(model.Id),
+                                @"UserIds":@[@([AppUserModel sharedAppUserModel].Id)],
+                                @"UserId":@([AppUserModel sharedAppUserModel].Id),
+                                @"SourceType":@(1)///申请
+    };
+    [[HttpManager sharedHttpManager] POSTUrl:Host(APP_Group_Insert_User) parameters:paraDict responseStyle:JOSN success:^(id  _Nonnull responseObject) {
+        SHOWSUCCESS(responseObject[@"Msg"]);
+        if ([responseObject[@"Code"] integerValue] == 200) {
+            TDGroupInfoListVC * vc = [TDGroupInfoListVC initTDGroupInfoListVC];
+            vc.GroupId = model.Id;
+            vc.titleStr = model.Name;
+            [weakSelf.navigationController pushViewController:vc animated:YES];
+        }
+        [weakSelf getSubData:weakSelf.leftId];
+    } failure:^(NSError * _Nonnull error) {
+        SHOWERROR([ZYCTool handerResultData:error]);
+    }];
+}
 #pragma mark - Load On Demand
 - (NSMutableArray *)leftArray
 {

smartRhino/Project/VCModel/Source/Controller/GroupSynopsisVC.h

@@ -12,6 +12,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface GroupSynopsisVC : BaseViewController
 @property (nonatomic, assign) NSInteger   GroupId;
+@property (nonatomic, assign) BOOL        IsJoin;
 +(GroupSynopsisVC *)initGroupSynopsisVC;
 @end
 

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

@@ -85,7 +85,7 @@
 {
     [self.listArray removeAllObjects];
     WS(weakSelf);
-    NSDictionary * paraDict = @{@"GroupId":@(0),
+    NSDictionary * paraDict = @{@"GroupIds":@[@(0)],
                                 @"UserId":@([AppUserModel sharedAppUserModel].Id),
                                 @"Key": searchKey,
                                 @"Page":@(1),
@@ -769,9 +769,9 @@
             }else{
                 OtherNoteBookVC *vc = [OtherNoteBookVC initOtherNoteBookVC];
                 vc.listType = model.Id == 0 ? MyFavoriteListLevelTypeA : MyFavoriteListLevelTypeB;
-                vc.ParentId = 0;
                 vc.FolderId = model.Id;
                 vc.myTitle = model.Title;
+                vc.TypeValue = 1;
                 vc.VisitUserId = model.SourceUserId;
                 [self.navigationController pushViewController:vc animated:YES];
             }

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

@@ -31,16 +31,27 @@
 #import "GroupSquareVC.h"
 #import "TDGroupInfoListVC.h"
 #import "SourceGroupSearchVC.h"
+#import "GroupListView.h"
+#import "ShowBtn.h"
+#import "TopicGroupManageModel.h"
 
 @interface SourceGroupVC ()<UITableViewDelegate,UITableViewDataSource,NoteBookShareVCDelegate>
 @property (weak, nonatomic) IBOutlet UIButton    *editBtn;
 @property (weak, nonatomic) IBOutlet UIButton    *squareBtn;
 @property (weak, nonatomic) IBOutlet UIView      *HeadView;
 @property (weak, nonatomic) IBOutlet UITableView *tableView;
+@property (weak, nonatomic) IBOutlet UIView      *NavBar;
+@property (strong, nonatomic) ShowBtn            *showBtn;
 @property (strong, nonatomic) MyTDGroupView      *SearchView;
 @property (copy, nonatomic) NSMutableArray       *dataArray;
 @property (strong, nonatomic) UIView             *groupView;
 @property (strong, nonatomic) NoteBookShareVC           *noteBookShareVC;
+@property (assign, nonatomic) NSInteger         currentPage;
+@property (assign, nonatomic) NSInteger         totalPage;
+@property (strong, nonatomic) GroupListView      *menuListView;
+@property (assign, nonatomic) BOOL                menuIsShow;
+@property (strong, nonatomic) NSMutableArray     *selectGIdArray;
+@property (strong, nonatomic) NSMutableArray     *groupListArray;
 
 @end
 
@@ -49,15 +60,23 @@
     SourceGroupVC *controller = [StoryboardManager.shared.Source instantiateViewControllerWithIdentifier:@"SourceGroupVC"];
     return controller;
 }
+- (ShowBtn *)showBtn
+{
+    if (!_showBtn) {
+        _showBtn = [ShowBtn new];
+    }
+    return _showBtn;
+}
 - (void)viewWillAppear:(BOOL)animated
 {
     [super viewWillAppear:animated];
-    [self getData];
+    [self headRefresh];
 }
 - (void)viewDidLoad {
     [super viewDidLoad];
     self.fd_prefersNavigationBarHidden = YES;
     [self addHeaderSubView];
+    [self setTableRefresh];
     self.tableView.delegate = self;
     self.tableView.dataSource = self;
     WS(weakSelf);
@@ -73,8 +92,82 @@
         };
         [weakSelf.navigationController pushViewController:vc animated:YES];
     }];
+    [self autoSizeBtn:@"全网"];
+    [self.NavBar addSubview:self.showBtn];
+    [self.showBtn mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.center.mas_equalTo(self.NavBar);
+    }];
+    [self setShowData];
+}
+- (void)autoSizeBtn:(NSString *)title
+{
+    [self.showBtn setLabelTitle:title];
 }
+- (void)setShowData
+{
+    [self getGroupList];
+    self.menuIsShow = NO;
+    WS(weakSelf);
+    [self.showBtn setAction:^{
+        if (!weakSelf.menuIsShow) {
+            [weakSelf.menuListView show];
+            [weakSelf.showBtn show];
+            weakSelf.menuListView.SelectBtnblock = ^(NSArray * _Nonnull array) {
+                [weakSelf.showBtn dismiss];
+                [weakSelf.selectGIdArray removeAllObjects];
+                NSMutableString * showName = [[NSMutableString alloc] init];
+                for (TopicGroupManageModel * model in array) {
+                    [showName appendString:model.Name];
+//                    [showName appendString:@"、"];
+                    [weakSelf.selectGIdArray addObject:@(model.Id)];
+                }
+                [weakSelf autoSizeBtn:showName];
+
+//                if (showName.length > 1) {
+//                    [showName deleteCharactersInRange:NSMakeRange(showName.length - 1, 1)];
+//                    if (showName.length >= 10) {
+//                        NSRange range1 = NSMakeRange(8, showName.length - 8);
+//                        NSString *resultStr1 = [showName stringByReplacingCharactersInRange:range1 withString:@"..."];
+//                        [weakSelf autoSizeBtn:resultStr1];
+//                    }else{
+//                        [weakSelf autoSizeBtn:showName];
+//                    }
+//                }
+                if (weakSelf.selectGIdArray.count > 0) {
+                    [weakSelf headRefresh];
+                }
+            };
+            weakSelf.menuListView.dismissBlock = ^{
+                [weakSelf.showBtn dismiss];
+            };
+            weakSelf.menuIsShow = YES;
+        }else{
+            weakSelf.menuIsShow = NO;
+            [weakSelf.showBtn dismiss];
+            [weakSelf.menuListView dismiss];
+        }
+    }];
+}
+- (void)getGroupList
+{
+    WS(weakSelf);
+    [[HttpManager sharedHttpManager] GETUrl:Host(API_APP_Group_List) parameters:@{} responseStyle:JOSN success:^(id  _Nonnull responseObject) {
+        NSLog(@"======%@",responseObject);
+        [weakSelf.groupListArray removeAllObjects];
+        if ([responseObject isKindOfClass:[NSArray class]]) {
+            [responseObject enumerateObjectsUsingBlock:^(id  _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
+                NSDictionary * dict = (NSDictionary *)obj;
+                TopicGroupManageModel * model = [TopicGroupManageModel modelWithDictionary:dict];
+                [weakSelf.groupListArray addObject:model];
+            }];
+            dispatch_async(dispatch_get_main_queue(), ^{
+                weakSelf.menuListView = [GroupListView GroupListViewaddArray:weakSelf.groupListArray showToView:weakSelf.NavBar];
+            });
+        }
+    } failure:^(NSError * _Nonnull error) {
 
+    }];
+}
 - (void)addHeaderSubView
 {
     [self.HeadView addSubview:self.SearchView];
@@ -136,17 +229,44 @@
     MyTDGroupViewController * vc = [[MyTDGroupViewController alloc] init];
     [self.navigationController pushViewController:vc animated:YES];
 }
+- (void)setTableRefresh
+{
+    WS(weakSelf);
+    self.tableView.mj_header = [MJRefreshNormalHeader headerWithRefreshingBlock:^{
+        [weakSelf headRefresh];
+    }];
+    self.tableView.mj_footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{
+        [weakSelf footerRefresh];
+    }];
+}
+
+- (void)headRefresh{
+    self.currentPage = 1;
+    self.totalPage = 1;
+    [self.dataArray removeAllObjects];
+    [self getData];
+}
+
+- (void)footerRefresh{
+    self.currentPage += 1;
+    if (self.totalPage == self.dataArray.count) {
+        self.currentPage --;
+        [self.tableView.mj_footer endRefreshingWithNoMoreData];
+        self.tableView.mj_footer.hidden = YES;
+        return;
+    }
+    [self getData];
+}
 - (void)getData
 {
     WS(weakSelf);
-    NSDictionary * paraDict = @{@"GroupId":@(0),
+    NSDictionary * paraDict = @{@"GroupIds":self.selectGIdArray.count == 0 ? @[@(0)] : self.selectGIdArray,
                                 @"UserId":@([AppUserModel sharedAppUserModel].Id),
                                 @"Keyword": @"",
-                                @"Page":@(1),
-                                @"PerPage": @(99999999),
+                                @"Page":@(self.currentPage),
+                                @"PerPage": @(10),
                                 @"Sort":@""
     };
-    [self.dataArray removeAllObjects];
     SHOWLOADING
     [[HttpManager sharedHttpManager] POSTUrl:Host(API_APP_Topic_Page) parameters:paraDict responseStyle:JOSN success:^(id  _Nonnull responseObject) {
         NSLog(@"%@",responseObject);
@@ -155,6 +275,7 @@
         [weakSelf.tableView.mj_footer endRefreshing];
         TopicListModel * model = [TopicListModel modelWithDictionary:responseObject];
         [weakSelf.dataArray addObjectsFromArray:model.Items];
+        weakSelf.totalPage = model.Total;
         dispatch_async(dispatch_get_main_queue(), ^{
             [weakSelf.tableView reloadData];
         });
@@ -164,6 +285,20 @@
         [weakSelf.tableView.mj_footer endRefreshing];
     }];
 }
+
+-(NSMutableArray *)selectGIdArray{
+    if(!_selectGIdArray){
+        _selectGIdArray = [[NSMutableArray alloc] init];
+    }
+    return _selectGIdArray;
+}
+-(NSMutableArray *)groupListArray{
+    if(!_groupListArray){
+        _groupListArray = [[NSMutableArray alloc] init];
+    }
+    return _groupListArray;
+}
+
 #pragma mark - UITableViewDelegate
 - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView{
     return 1;
@@ -835,9 +970,10 @@
             }else{
                 OtherNoteBookVC *vc = [OtherNoteBookVC initOtherNoteBookVC];
                 vc.listType = model.Id == 0 ? MyFavoriteListLevelTypeA : MyFavoriteListLevelTypeB;
-                vc.ParentId = 0;
+//                vc.ParentId = 0;
                 vc.FolderId = model.Id;
                 vc.myTitle = model.Title;
+                vc.TypeValue = 1;
                 vc.VisitUserId = model.SourceUserId;
                 [self.navigationController pushViewController:vc animated:YES];
             }

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

@@ -447,7 +447,7 @@
                 vc.hidesBottomBarWhenPushed = YES;
                 vc.type = CollectModel_NewTopic;
                 vc.upDateBlock = ^{
-                    
+                    [weakSelf headRefresh];
                 };
                 [weakSelf.navigationController pushViewController:vc animated:YES];
             }];
@@ -1161,15 +1161,20 @@
 - (void)enterFileWithModel:(TopicListItemModel *)model
 {
     if (model.UserId == [AppUserModel sharedAppUserModel].Id) {
-        NoteBookVC *vc = [NoteBookVC initNoteBookVC];
-        vc.listType = MyFavoriteListLevelTypeB;
-        vc.FolderId = model.FolderResult.Id;
-        vc.ParentId = model.FolderResult.Id;
-        vc.myTitle = model.FolderResult.FolderName;
-        vc.TypeValue = 1;
-        vc.isSubVC = model.FolderResult.Id == 0 ? NO : YES;
-        vc.hidesBottomBarWhenPushed = YES;
-        [self.navigationController pushViewController:vc animated:YES];
+        if (model.FolderResult.Id == 0) {
+            MyTDTopicBookVC * vc = [MyTDTopicBookVC initMyTDTopicBookVC];
+            [self.navigationController pushViewController:vc animated:YES];
+        }else{
+            NoteBookVC *vc = [NoteBookVC initNoteBookVC];
+            vc.listType = MyFavoriteListLevelTypeB;
+            vc.FolderId = model.FolderResult.Id;
+            vc.ParentId = model.FolderResult.Id;
+            vc.myTitle = model.FolderResult.FolderName;
+            vc.TypeValue = 1;
+            vc.isSubVC = YES;
+            vc.hidesBottomBarWhenPushed = YES;
+            [self.navigationController pushViewController:vc animated:YES];
+        }
     }else{
         OtherNoteBookVC *vc = [OtherNoteBookVC initOtherNoteBookVC];
         vc.listType = MyFavoriteListLevelTypeB;
@@ -1435,10 +1440,10 @@
             }else{
                 OtherNoteBookVC *vc = [OtherNoteBookVC initOtherNoteBookVC];
                 vc.listType = model.Id == 0 ? MyFavoriteListLevelTypeA : MyFavoriteListLevelTypeB;
-                vc.ParentId = 0;
                 vc.FolderId = model.Id;
                 vc.myTitle = model.Title;
                 vc.VisitUserId = model.SourceUserId;
+                vc.TypeValue = 1;
                 vc.hidesBottomBarWhenPushed = YES;
                 [self.navigationController pushViewController:vc animated:YES];
             }

smartRhino/Project/VCModel/Source/Model/GroupSquareSubModel.h

@@ -24,10 +24,13 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, assign) NSInteger   GroupCategroyId;
 @property (nonatomic, assign) NSInteger   Id;
 @property (nonatomic, assign) NSInteger   UserCount;
+@property (nonatomic, assign) NSInteger   TopicCount;
 @property (nonatomic, assign) BOOL        IsAdmin;
 @property (nonatomic, assign) BOOL        IsShow;
 @property (nonatomic, assign) BOOL        IsUDisturb;
 @property (nonatomic, assign) BOOL        IsWords;
+@property (nonatomic, assign) BOOL        IsUser;
+@property (nonatomic, assign) BOOL        IsApply;
 @end
 
 NS_ASSUME_NONNULL_END

smartRhino/Project/VCModel/Source/Source.storyboard

@@ -170,12 +170,6 @@
                                                     <action selector="menuAction:" destination="goK-I6-gIY" eventType="touchUpInside" id="Jg8-QA-62Y"/>
                                                 </connections>
                                             </button>
-                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="小组" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Dkd-dd-cfT">
-                                                <rect key="frame" x="190.66666666666666" y="12.333333333333334" width="32.666666666666657" height="19.333333333333329"/>
-                                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
-                                                <color key="textColor" red="0.039215686270000001" green="0.039215686270000001" blue="0.039215686270000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                                <nil key="highlightedColor"/>
-                                            </label>
                                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="0uu-hW-qJL">
                                                 <rect key="frame" x="366" y="0.0" width="44" height="44"/>
                                                 <constraints>
@@ -196,13 +190,11 @@
                                             <constraint firstAttribute="bottom" secondItem="jqO-Ch-kLx" secondAttribute="bottom" id="4An-Py-4dD"/>
                                             <constraint firstItem="yuq-66-lcT" firstAttribute="leading" secondItem="gqH-qw-YAL" secondAttribute="trailing" id="Ktz-dU-zOG"/>
                                             <constraint firstAttribute="bottom" secondItem="gqH-qw-YAL" secondAttribute="bottom" id="Lvn-bp-48M"/>
-                                            <constraint firstItem="Dkd-dd-cfT" firstAttribute="centerY" secondItem="gqH-qw-YAL" secondAttribute="centerY" id="NbA-OO-PNL"/>
                                             <constraint firstAttribute="trailing" secondItem="0uu-hW-qJL" secondAttribute="trailing" constant="4" id="YkC-T8-li7"/>
                                             <constraint firstItem="jqO-Ch-kLx" firstAttribute="top" secondItem="e3B-5m-6Pq" secondAttribute="top" id="gTs-u1-H10"/>
                                             <constraint firstAttribute="height" constant="44" id="gdh-fj-thz"/>
                                             <constraint firstItem="yuq-66-lcT" firstAttribute="top" secondItem="gqH-qw-YAL" secondAttribute="top" id="h2q-ZZ-A67"/>
                                             <constraint firstItem="gqH-qw-YAL" firstAttribute="leading" secondItem="e3B-5m-6Pq" secondAttribute="leading" id="iht-U8-6gi"/>
-                                            <constraint firstItem="Dkd-dd-cfT" firstAttribute="centerX" secondItem="e3B-5m-6Pq" secondAttribute="centerX" id="jJC-M7-e0O"/>
                                             <constraint firstItem="yuq-66-lcT" firstAttribute="bottom" secondItem="gqH-qw-YAL" secondAttribute="bottom" id="k9u-UI-dWx"/>
                                             <constraint firstItem="0uu-hW-qJL" firstAttribute="leading" secondItem="jqO-Ch-kLx" secondAttribute="trailing" id="n0c-mz-0Jp"/>
                                             <constraint firstAttribute="bottom" secondItem="0uu-hW-qJL" secondAttribute="bottom" id="rZj-1j-HF0"/>
@@ -250,6 +242,7 @@
                     <navigationItem key="navigationItem" id="6GY-jJ-3bN"/>
                     <connections>
                         <outlet property="HeadView" destination="NJz-mf-Xmb" id="idr-Mq-Z2t"/>
+                        <outlet property="NavBar" destination="e3B-5m-6Pq" id="xM1-K1-zyP"/>
                         <outlet property="editBtn" destination="0uu-hW-qJL" id="OmA-N3-Rd2"/>
                         <outlet property="squareBtn" destination="jqO-Ch-kLx" id="Rbt-lw-BN0"/>
                         <outlet property="tableView" destination="CTY-Wz-zKC" id="6p0-Tr-Ltp"/>

smartRhino/Project/VCModel/Source/View/GroupListView.h

@@ -0,0 +1,21 @@
+//
+//  GroupListView.h
+//  smartRhino
+//
+//  Created by niuzhen on 2019/12/12.
+//  Copyright © 2019 tederen. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface GroupListView : UIView
++ (instancetype)GroupListViewaddArray:(NSArray *)array showToView:(UIView *)view;
+@property (nonatomic, copy) void(^SelectBtnblock)(NSArray *array);
+@property (nonatomic, copy) void(^dismissBlock)(void);
+- (void)show;
+- (void)dismiss;
+@end
+
+NS_ASSUME_NONNULL_END

smartRhino/Project/VCModel/Source/View/GroupListView.m

@@ -0,0 +1,204 @@
+//
+//  GroupListView.m
+//  smartRhino
+//
+//  Created by niuzhen on 2019/12/12.
+//  Copyright © 2019 tederen. All rights reserved.
+//
+
+#import "GroupListView.h"
+#import "MenuListCell.h"
+#import "TopicGroupManageModel.h"
+
+@interface GroupListView()<UICollectionViewDelegate,UICollectionViewDataSource>
+@property (nonatomic, strong)NSMutableArray * listArray;
+@property (nonatomic, strong)UIView * topView;
+@property (nonatomic, assign)CGFloat  height;
+
+@property (nonatomic, strong)UIView * bgView;
+@property (nonatomic, strong)UICollectionView * collectionView;
+@end
+@implementation GroupListView
++ (instancetype)GroupListViewaddArray:(NSArray *)array showToView:(UIView *)view
+{
+    return [[GroupListView alloc] initWithArray:array view:view];
+}
+- (instancetype)initWithArray:(NSArray *)array view:(UIView *)view
+{
+    if (self = [super init]) {
+        self.listArray = [NSMutableArray arrayWithArray:array];
+        self.topView = view;
+        [self setCusView:NO];
+    }
+    return self;
+}
+- (UIView *)bgView
+{
+    if (!_bgView) {
+        _bgView = [UIView new];
+        _bgView.backgroundColor = [UIColor blackColor];
+        _bgView.alpha = 0.65f;
+    }
+    return _bgView;
+}
+- (void)setViewHeight:(CGFloat)height
+{
+    [self setFrame:CGRectMake(0, height, SCREEN_WIDTH, SCREEN_HEIGHT - height)];
+}
+- (void)setCusView:(BOOL)isHeight
+{
+    [self setFrame: CGRectMake(0, CGRectGetMaxY(self.topView.frame) , SCREEN_WIDTH, SCREEN_HEIGHT - CGRectGetMaxY(self.topView.frame))];
+    
+    [self addSubview:self.bgView];
+
+    [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.edges.mas_equalTo(self);
+    }];
+    WS(weakSelf);
+    UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithActionBlock:^(id  _Nonnull sender) {
+        [weakSelf dismiss];
+    }];
+    [self.bgView addGestureRecognizer:tap];
+    [self addSubview:self.collectionView];
+    [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.top.right.mas_equalTo(self);
+        make.height.mas_equalTo(SCREEN_HEIGHT * 0.6);
+    }];
+}
+- (NSMutableArray *)listArray
+{
+    if (!_listArray) {
+        _listArray = [NSMutableArray array];
+    }
+    return _listArray;
+}
+- (UICollectionView *)collectionView
+{
+    if (!_collectionView) {
+        _collectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:[[UICollectionViewFlowLayout alloc] init]];
+        [_collectionView registerNib:[UINib nibWithNibName:@"MenuListCell" bundle:nil] forCellWithReuseIdentifier:@"MenuListCell"];
+        _collectionView.backgroundColor = [UIColor whiteColor];
+        _collectionView.contentInset = UIEdgeInsetsMake(0, 15, 0, 15);
+        _collectionView.delegate = self;
+        _collectionView.dataSource = self;
+        [_collectionView registerClass:[UICollectionReusableView class] forSupplementaryViewOfKind:UICollectionElementKindSectionHeader withReuseIdentifier:@"HeaderView"];
+        [_collectionView registerClass:[UICollectionReusableView class] forSupplementaryViewOfKind:UICollectionElementKindSectionFooter withReuseIdentifier:@"FooterView"];
+    }
+    return _collectionView;
+}
+- (void)show
+{
+    [[UIApplication sharedApplication].keyWindow addSubview:self];
+    [UIView animateWithDuration:0.4 animations:^{
+        
+    } completion:^(BOOL finished) {}];
+}
+- (void)dismiss
+{
+    WS(weakSelf);
+    [[UIApplication sharedApplication].keyWindow addSubview:self];
+    [UIView animateWithDuration:0.4 animations:^{
+        
+    } completion:^(BOOL finished) {
+        if (weakSelf.dismissBlock) {
+            weakSelf.dismissBlock();
+        }
+        [weakSelf removeFromSuperview];
+    }];
+}
+#pragma mark - UICollectionViewDelegate
+- (nonnull __kindof UICollectionViewCell *)collectionView:(nonnull UICollectionView *)collectionView cellForItemAtIndexPath:(nonnull NSIndexPath *)indexPath {
+    MenuListCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"MenuListCell" forIndexPath:indexPath];
+    TopicGroupManageModel * model = [self.listArray objectAtIndex:indexPath.item];
+    cell.titleL.text = model.Name;
+    cell.titleL.backgroundColor = UIColorHex(#F5F6F8);
+    if (model.isBtn) {
+        cell.titleL.layer.borderColor = UIColorHex(#3979D3).CGColor;
+        cell.titleL.layer.borderWidth = 0.5f;
+        cell.titleL.backgroundColor = UIColorHex(#FFFFFF);
+        cell.titleL.textColor = UIColorHex(#3979D3);
+    }else{
+        cell.titleL.textColor = model.isSelect ? UIColorHex(#3979D3):UIColorHex(#0A0A0A);
+        cell.titleL.layer.borderColor = model.isSelect ? UIColorHex(#3979D3).CGColor : [UIColor clearColor].CGColor;
+        cell.titleL.layer.borderWidth = model.isSelect ? 0.5f : 0.f;
+    }
+    return cell;
+}
+- (NSInteger)collectionView:(nonnull UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section {
+    return self.listArray.count;
+}
+
+-(CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath{
+    TopicGroupManageModel * model = [self.listArray objectAtIndex:indexPath.item];
+    UILabel * label = [UILabel new];
+    label.font = Kfont(13);
+    label.text = model.Name;
+    CGFloat W = [label sizeThatFits:CGSizeMake(MAXFLOAT, 36)].width + 20;
+    return CGSizeMake(W, 36);
+}
+
+- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath{
+    TopicGroupManageModel * model = [self.listArray objectAtIndex:indexPath.item];
+    for (TopicGroupManageModel * subModel in self.listArray) {
+        subModel.isSelect = NO;
+    }
+    model.isSelect = !model.isSelect;
+    if (self.SelectBtnblock) {
+        self.SelectBtnblock(@[model]);
+    }
+    [collectionView reloadData];
+    [self dismiss];
+}
+
+//footer的size
+- (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout referenceSizeForFooterInSection:(NSInteger)section
+{
+    return CGSizeMake(0, 0);
+}
+
+//header的size
+- (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout referenceSizeForHeaderInSection:(NSInteger)section
+{
+    return CGSizeMake(SCREEN_WIDTH, 35);
+}
+
+//设置每个item的UIEdgeInsets
+- (UIEdgeInsets)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout insetForSectionAtIndex:(NSInteger)section
+{
+    return UIEdgeInsetsMake(0, 0, 0, 0);
+}
+
+//设置每个item水平间距
+- (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout minimumInteritemSpacingForSectionAtIndex:(NSInteger)section
+{
+    return 9.f;
+}
+
+
+//设置每个item垂直间距
+- (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout minimumLineSpacingForSectionAtIndex:(NSInteger)section
+{
+    return 18.f;
+}
+
+- (UICollectionReusableView *)collectionView:(UICollectionView *)collectionView viewForSupplementaryElementOfKind:(NSString *)kind atIndexPath:(NSIndexPath *)indexPath {
+    if ([kind isEqualToString:UICollectionElementKindSectionHeader]) {
+        UICollectionReusableView *headerView = [collectionView dequeueReusableSupplementaryViewOfKind:UICollectionElementKindSectionHeader withReuseIdentifier:@"HeaderView" forIndexPath:indexPath];
+        UILabel *lablel = [[UILabel alloc] init];
+        lablel.textColor = UIColorHex(0xBBBBBB);
+        [headerView addSubview:lablel];
+        lablel.text = @"选择显示";
+        lablel.font = [UIFont systemFontOfSize:11.f];
+        lablel.textAlignment = NSTextAlignmentLeft;
+        [headerView addSubview:lablel];
+        [lablel mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.left.mas_equalTo(headerView);
+            make.centerY.mas_equalTo(headerView);
+        }];
+        return headerView;
+    }else{
+        UICollectionReusableView *footerView = [collectionView dequeueReusableSupplementaryViewOfKind:UICollectionElementKindSectionFooter withReuseIdentifier:@"FooterView" forIndexPath:indexPath];
+        return footerView;
+    }
+}
+@end

smartRhino/Project/VCModel/Source/View/GroupSquareCell.h

@@ -28,6 +28,8 @@ NS_ASSUME_NONNULL_BEGIN
 + (GroupSquareCell *)configCell1:(UITableView *)tableView indexPath:(NSIndexPath *)indexPath;
 - (void)setLeftDataModel:(GroupSquareModel *)model;
 - (void)setRightDataSubModel:(GroupSquareSubModel *)model;
+- (void)setRightDataSubModel:(GroupSquareSubModel *)model withSearchText:(NSString *)text;
+
 @end
 
 NS_ASSUME_NONNULL_END

smartRhino/Project/VCModel/Source/View/GroupSquareCell.m

@@ -60,8 +60,52 @@
     [self.IconView sd_setImageWithURL:[NSURL URLWithString:model.AvatarUrl] placeholderImage:IMG(@"img_placeHolder")];
     self.titleL.text = model.Name;
     self.userCountL.text = [self userCountText:model.UserCount];
-    self.TopicCountL.text = [NSString stringWithFormat:@"%ld",model.GroupArticleCount];
+    self.TopicCountL.text = [self userCountText:model.TopicCount];
     self.subTitleL.text = model.Introduce;
+    if (model.IsUser) {
+        self.JoinBtn.layer.borderColor = UIColorHex(0xBBBBBB).CGColor;
+        [self.JoinBtn setTitle:@"已加入" forState:UIControlStateNormal];
+        [self.JoinBtn setTitleColor:UIColorHex(0xBBBBBB) forState:UIControlStateNormal];
+        self.JoinBtn.enabled = NO;
+    }else{
+        if (model.IsApply) {
+            self.JoinBtn.layer.borderColor = UIColorHex(0xBBBBBB).CGColor;
+            [self.JoinBtn setTitle:@"已申请" forState:UIControlStateNormal];
+            [self.JoinBtn setTitleColor:UIColorHex(0xBBBBBB) forState:UIControlStateNormal];
+            self.JoinBtn.enabled = NO;
+        }else{
+            self.JoinBtn.layer.borderColor = UIColorHex(0x13A3FF).CGColor;
+            [self.JoinBtn setTitle:@"加入" forState:UIControlStateNormal];
+            [self.JoinBtn setTitleColor:UIColorHex(0x13A3FF) forState:UIControlStateNormal];
+            self.JoinBtn.enabled = YES;
+        }
+    }
+}
+- (void)setRightDataSubModel:(GroupSquareSubModel *)model withSearchText:(NSString *)text
+{
+    [self.IconView sd_setImageWithURL:[NSURL URLWithString:model.AvatarUrl] placeholderImage:IMG(@"img_placeHolder")];
+    self.titleL.attributedText = [ZYCTool checkOfString:model.Name withSearchText:text withColor:UIColorHex(0xFF5252)];
+    self.userCountL.text = [self userCountText:model.UserCount];
+    self.TopicCountL.text = [self userCountText:model.TopicCount];
+    self.subTitleL.text = model.Introduce;
+    if (model.IsUser) {
+        self.JoinBtn.layer.borderColor = UIColorHex(0xBBBBBB).CGColor;
+        [self.JoinBtn setTitle:@"已加入" forState:UIControlStateNormal];
+        [self.JoinBtn setTitleColor:UIColorHex(0xBBBBBB) forState:UIControlStateNormal];
+        self.JoinBtn.enabled = NO;
+    }else{
+        if (model.IsApply) {
+            self.JoinBtn.layer.borderColor = UIColorHex(0xBBBBBB).CGColor;
+            [self.JoinBtn setTitle:@"已申请" forState:UIControlStateNormal];
+            [self.JoinBtn setTitleColor:UIColorHex(0xBBBBBB) forState:UIControlStateNormal];
+            self.JoinBtn.enabled = NO;
+        }else{
+            self.JoinBtn.layer.borderColor = UIColorHex(0x13A3FF).CGColor;
+            [self.JoinBtn setTitle:@"加入" forState:UIControlStateNormal];
+            [self.JoinBtn setTitleColor:UIColorHex(0x13A3FF) forState:UIControlStateNormal];
+            self.JoinBtn.enabled = YES;
+        }
+    }
 }
 - (NSString *)userCountText:(NSInteger)userCount
 {

smartRhino/Project/VCModel/Source/View/ReplayMeCell.m

@@ -96,12 +96,12 @@
             self.FileImgV.image = IMG(@"笔记小组");
         }
             break;
-        case CollectModel_meetDetail:
+        case CollectModel_meetMian:
         {
-            self.FileImgV.image = IMG(@"会议");
+            self.FileImgV.image = IMG(@"会议纪要");
         }
             break;
-        case CollectModel_meetMian:
+        case CollectModel_meetDetail:
         {
             self.FileImgV.image = IMG(@"会议");
         }

smartRhino/Project/VCModel/WorkFlow/AddLookUpUserSecondVC.m

@@ -506,6 +506,27 @@
                 }
             }
                 break;
+            case MailListCusType:
+            {
+                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;
             case MailListOtherType:
             {
                 if (model.IsSelect) {
@@ -696,9 +717,14 @@
     if ([model isKindOfClass:[Department class]]) {
         Department * mModel = (Department *)model;
         SelectModel * sModel = [[SelectModel alloc] init];
-        sModel.SourceType = 1;
+        if (self.isDefalutPage == 2 && self.isMyGroup == 2) {
+            sModel.SourceType = 3;
+            sModel.SourceName = mModel.GroupName;
+        }else{
+            sModel.SourceType = 1;
+            sModel.SourceName = mModel.Name;
+        }
         sModel.SourceId = mModel.Id;
-        sModel.SourceName = mModel.Name;
         sModel.TypeValue = 0;
         sModel.hadSelected = mModel.hadSelected;
         return sModel;

smartRhino/Project/VCModel/WorkFlow/AddPictureCell.m

@@ -90,6 +90,11 @@
                 break;
             case CollectModel_meetMian:
             {
+                cell.iconImage.image = IMG(@"会议纪要");
+            }
+                break;
+            case CollectModel_meetDetail:
+            {
                 cell.iconImage.image = IMG(@"会议");
             }
                 break;

smartRhino/Project/VCModel/WorkFlow/MyWordCell.m

@@ -12,6 +12,8 @@
 
 - (void)awakeFromNib {
     [super awakeFromNib];
+    self.iconImage.layer.cornerRadius = 4.f;
+    self.iconImage.layer.masksToBounds = YES;
 }
 - (void)looadDataHiden:(Boolean)hiden{
     self.deleteButton.hidden = hiden;
@@ -69,12 +71,12 @@
             self.iconImage.image = IMG(@"笔记小组");
         }
             break;
-        case CollectModel_meetDetail:
+        case CollectModel_meetMian:
         {
-            self.iconImage.image = IMG(@"会议");
+            self.iconImage.image = IMG(@"会议纪要");
         }
             break;
-        case CollectModel_meetMian:
+        case CollectModel_meetDetail:
         {
             self.iconImage.image = IMG(@"会议");
         }

smartRhino/Project/VCModel/WorkFlow/MyWordCell.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>
@@ -17,7 +17,7 @@
                 <rect key="frame" x="0.0" y="0.0" width="50" height="81"/>
                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                 <subviews>
-                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="添加审批人" translatesAutoresizingMaskIntoConstraints="NO" id="sPm-Cy-BoW">
+                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="添加审批人" translatesAutoresizingMaskIntoConstraints="NO" id="sPm-Cy-BoW">
                         <rect key="frame" x="4" y="4" width="42" height="42"/>
                         <constraints>
                             <constraint firstAttribute="width" constant="42" id="237-uA-oS3"/>

smartRhino/Project/VCModel/WorkFlow/MyWorkFlowCell/HistoricalWorkFlowCell/HistoricalWorkFlowDetailsContentCell.m

@@ -115,12 +115,12 @@
                     iconV.image = IMG(@"笔记小组");
                 }
                     break;
-                case CollectModel_meetDetail:
+                case CollectModel_meetMian:
                 {
-                    iconV.image = IMG(@"会议");
+                    iconV.image = IMG(@"会议纪要");
                 }
                     break;
-                case CollectModel_meetMian:
+                case CollectModel_meetDetail:
                 {
                     iconV.image = IMG(@"会议");
                 }

smartRhino/Project/VCModel/WorkFlow/MyWorkFlowCell/HistoricalWorkFlowCell/WorkFlowOrderCell/WorkFlowOrderCell.m

@@ -105,7 +105,6 @@
                         if ([value isKindOfClass:[NSDictionary class]]) {
                             if (([value[@"Key"] integerValue] - 7) == model.time) {
                                 model.IsUse = NO;
-                                
                                 model.Name = value[@"Value"];
                             }
                         }

smartRhino/Project/VCModel/WorkFlow/WorkFLowCell.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>
@@ -56,7 +56,7 @@
                                 </constraints>
                             </imageView>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="99+" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="PUb-Ug-B4W">
-                                <rect key="frame" x="145.5" y="65" width="16" height="16"/>
+                                <rect key="frame" x="156.5" y="65" width="16" height="16"/>
                                 <color key="backgroundColor" systemColor="systemRedColor" red="1" green="0.23137254900000001" blue="0.18823529410000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="16" id="XEY-YJ-IKM"/>
@@ -79,7 +79,7 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <imageView hidden="YES" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="FZC-YI-MRs">
-                                <rect key="frame" x="145" y="64.5" width="17" height="17"/>
+                                <rect key="frame" x="156" y="64.5" width="17" height="17"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="17" id="26h-yX-Nv5"/>
                                     <constraint firstAttribute="width" constant="17" id="isn-E8-N7P"/>
@@ -89,8 +89,8 @@
                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <constraints>
                             <constraint firstItem="oiv-WS-HhG" firstAttribute="leading" secondItem="bfa-Qh-JuC" secondAttribute="leading" constant="10" id="1Ze-mv-WGe"/>
-                            <constraint firstItem="PUb-Ug-B4W" firstAttribute="centerX" secondItem="iM3-Ty-tvY" secondAttribute="trailing" constant="-5" id="1gY-ze-HjH"/>
-                            <constraint firstItem="FZC-YI-MRs" firstAttribute="centerX" secondItem="iM3-Ty-tvY" secondAttribute="trailing" constant="-5" id="Gru-jp-6BJ"/>
+                            <constraint firstItem="PUb-Ug-B4W" firstAttribute="centerX" secondItem="iM3-Ty-tvY" secondAttribute="trailing" constant="6" id="1gY-ze-HjH"/>
+                            <constraint firstItem="FZC-YI-MRs" firstAttribute="centerX" secondItem="iM3-Ty-tvY" secondAttribute="trailing" constant="6" id="Gru-jp-6BJ"/>
                             <constraint firstItem="PUb-Ug-B4W" firstAttribute="centerY" secondItem="iM3-Ty-tvY" secondAttribute="top" constant="6" id="Kgz-c1-mUe"/>
                             <constraint firstAttribute="width" secondItem="bfa-Qh-JuC" secondAttribute="height" multiplier="270:181" id="KsH-Rp-iH4"/>
                             <constraint firstItem="iM3-Ty-tvY" firstAttribute="centerX" secondItem="bfa-Qh-JuC" secondAttribute="centerX" id="PKG-sp-Q8Z"/>

smartRhino/Project/VCModel/WorkFlow/WorkFlowHomeListController.m

@@ -36,14 +36,14 @@
 @implementation WorkFlowHomeListController
 
 -(IBAction)backAction:(id)sender{
-    [TabBarController sharedTabBarController].tabBar.hidden = NO;
+//    [TabBarController sharedTabBarController].tabBar.hidden = NO;
     [self.tabBarController.navigationController popViewControllerAnimated:YES];
 }
 
 - (void)viewWillAppear:(BOOL)animated
 {
     [super viewWillAppear:animated];
-    [TabBarController sharedTabBarController].tabBar.hidden = YES;
+//    [TabBarController sharedTabBarController].tabBar.hidden = YES;
 }
 - (BOOL)hidesBottomBarWhenPushed
 {

smartRhino/Project/VCModel/WorkFlow/WorkFlowOrderController.m

@@ -575,7 +575,21 @@ AddPeopleToGongWenCellDelegate,AddLookUpUserSecondVCDelegate>
 
  - (void)recviveChaoSongRen:(NSNotification *)notification{
      NSMutableArray <SelectModel *>* array = notification.userInfo[@"selectPeople"];
-     [self.chaoSongRenArr addObjectsFromArray:array];
+//     [self.chaoSongRenArr addObjectsFromArray:array];
+//     NSMutableArray * mArray = [NSMutableArray array];
+     WS(weakSelf);
+     [array enumerateObjectsUsingBlock:^(id  _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
+         SelectModel * obModel = (SelectModel *)obj;
+         BOOL isEquel = NO;
+         for (SelectModel * model in weakSelf.chaoSongRenArr) {
+             if (model.Id == obModel.Id) {
+                 isEquel = YES;
+             }
+         }
+         if (!isEquel) {
+             [weakSelf.chaoSongRenArr addObject:obModel];
+         }
+     }];
      [self.infoTabView reloadRowAtIndexPath:[NSIndexPath indexPathForRow:3 inSection:3] withRowAnimation:UITableViewRowAnimationAutomatic];
 }
 

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

@@ -163,6 +163,7 @@
             vc.CollectionType = model.CollectionType;
             vc.Author = model.Data.Author;
             vc.myTitle = model.Title;
+            vc.TypeValue = 1;
             vc.VisitUserId = model.SourceUserId;
             [self.navigationController pushViewController:vc animated:YES];
         }break;

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

@@ -79,6 +79,7 @@
 - (void)viewWillAppear:(BOOL)animated
 {
     [super viewWillAppear:animated];
+    self.tabBarController.tabBar.hidden = NO;
     [self getDataList];
 }
 - (void)viewDidLoad {
@@ -221,6 +222,14 @@
             CommonListCell *cell = [CommonListCell configCell1:tableView indexPath:indexPath];
             MyFavoriteSubModel * model = [self.dataArray objectAtIndex:indexPath.row];
             [cell setCell1Data:model];
+            WS(weakSelf);
+            [cell.desBtn setAction:^{
+                MyFavoriteVC * vc = [MyFavoriteVC initMyFavoriteVC];
+                vc.listType = model.FolderId == 0 ? MyFavoriteListLevelTypeA : MyFavoriteListLevelTypeB;
+                vc.FolderId = model.FolderId;
+                vc.myTitle =  model.FolderName;
+                [weakSelf.navigationController pushViewController:vc animated:YES];
+            }];
             return cell;
         }
             break;
@@ -289,6 +298,31 @@
                 vc.CollectionType = model.CollectionType;
                 vc.Author = model.Data.Author;
                 vc.myTitle = model.Title;
+                vc.TypeValue = 1;
+                vc.VisitUserId = model.SourceUserId;
+                [self.navigationController pushViewController:vc animated:YES];
+            }break;
+            case CollectModel_TopicBooK:{
+                OtherNoteBookVC * vc = [OtherNoteBookVC initOtherNoteBookVC];
+                vc.listType = MyFavoriteListLevelTypeA ;
+                vc.FolderId = model.CollectionDataId;
+                vc.CollectionDataId = model.CollectionDataId;
+                vc.CollectionType = model.CollectionType;
+                vc.Author = model.Data.Author;
+                vc.TypeValue = 1;
+                vc.myTitle = model.Title;
+                vc.VisitUserId = model.SourceUserId;
+                [self.navigationController pushViewController:vc animated:YES];
+            }break;
+            case CollectModel_TopicSubBooK:{
+                OtherNoteBookVC * vc = [OtherNoteBookVC initOtherNoteBookVC];
+                vc.listType = MyFavoriteListLevelTypeB ;
+                vc.FolderId = model.CollectionDataId;
+                vc.CollectionDataId = model.CollectionDataId;
+                vc.CollectionType = model.CollectionType;
+                vc.Author = model.Data.Author;
+                vc.TypeValue = 1;
+                vc.myTitle = model.Title;
                 vc.VisitUserId = model.SourceUserId;
                 [self.navigationController pushViewController:vc animated:YES];
             }break;
@@ -600,6 +634,7 @@
         action2.backgroundColor = UIColorHex(#9BA9CB);
         UIContextualAction *action3 = [UIContextualAction contextualActionWithStyle:UIContextualActionStyleNormal title:@"移动" handler:^(UIContextualAction * _Nonnull action, __kindof UIView * _Nonnull sourceView, void (^ _Nonnull completionHandler)(BOOL)) {
             [weakSelf launchMoveVC:@[@(model.Id)].mutableCopy];
+            completionHandler(YES);
         }];
         action3.backgroundColor = UIColorHex(#589AF1);
 

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

@@ -1400,6 +1400,7 @@
             vc.FolderId = model.Id;
             vc.Author = model.Author;
             vc.myTitle = model.Title;
+            vc.TypeValue = 1;
             vc.VisitUserId = model.SourceUserId;
             [self.navigationController pushViewController:vc animated:YES];
         }break;

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

@@ -104,19 +104,27 @@
                 bean.isCloseSectionFlag = YES;
                 NSArray * array = [chatMenuDict objectForKey:@"common"];
                 NSMutableArray * muArray = [NSMutableArray array];
-                for (NSDictionary * dict in array) {
-                    MoreAppInfoModel * model = [MoreAppInfoModel modelWithDictionary:dict];
+                for (NSInteger i = 0; i < 9; i ++) {
+                    MoreAppInfoModel * model = [MoreAppInfoModel modelWithDictionary:array.firstObject];
                     [muArray addObject:model];
                 }
+//                for (NSDictionary * dict in array) {
+//                    MoreAppInfoModel * model = [MoreAppInfoModel modelWithDictionary:dict];
+//                    [muArray addObject:model];
+//                }
                 bean.moreAppInfoArray = muArray;
             }break;
             case 1:{
                 NSArray * array = [chatMenuDict objectForKey:@"more"];
                 NSMutableArray * muArray = [NSMutableArray array];
-                for (NSDictionary * dict in array) {
-                    MoreAppInfoModel * model = [MoreAppInfoModel modelWithDictionary:dict];
+                for (NSInteger i = 0; i < 9; i ++) {
+                    MoreAppInfoModel * model = [MoreAppInfoModel modelWithDictionary:array.firstObject];
                     [muArray addObject:model];
                 }
+//                for (NSDictionary * dict in array) {
+//                    MoreAppInfoModel * model = [MoreAppInfoModel modelWithDictionary:dict];
+//                    [muArray addObject:model];
+//                }
                 bean.moreAppInfoArray = muArray;
             }break;
             default:
@@ -149,8 +157,8 @@
     UILongPressGestureRecognizer *longPressGesture = [[UILongPressGestureRecognizer alloc] initWithTarget:self action:@selector(moveCollectionViewCell:)];
     cell.userInteractionEnabled = YES;
     [cell addGestureRecognizer:longPressGesture];
-    cell.titleLabel.text = model.title;
-    cell.iconImageView.image = IMG(@"work_flow_approvalme");
+    cell.titleLabel.text = [NSString stringWithFormat:@"工具%ld",(indexPath.item + 1)];
+    cell.iconImageView.image = IMG(@"img_placeHolder");
     cell.leftLine.hidden = NO;
     cell.rightLine.hidden = NO;
     cell.bottomLine.hidden= NO;
@@ -170,49 +178,49 @@
 
 - (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath{
     [collectionView deselectItemAtIndexPath:indexPath animated:YES];
-    MoreAppModel *bean = [self.dataSourceArray objectAtIndex:indexPath.section];
-    MoreAppInfoModel *beanItem = [bean.moreAppInfoArray objectAtIndex:indexPath.item];
-    if(indexPath.section == 0){
-        if (indexPath.item == 0) {
-            return;
-        }
-        [bean.moreAppInfoArray removeObject:beanItem];
-        MoreAppModel *moreModel = [self.dataSourceArray lastObject];
-        [moreModel.moreAppInfoArray addObject:beanItem];
-        NSMutableArray * moreArray = [NSMutableArray array];
-        for (MoreAppInfoModel * model in moreModel.moreAppInfoArray) {
-            NSDictionary * dict = [model modelToJSONObject];
-            [moreArray addObject:dict];
-        }
-        
-        MoreAppModel *commonModel = [self.dataSourceArray firstObject];
-        NSMutableArray * commonArray = [NSMutableArray array];
-        for (MoreAppInfoModel * model in commonModel.moreAppInfoArray) {
-            NSDictionary * dict = [model modelToJSONObject];
-            [commonArray addObject:dict];
-        }
-        [[NSUserDefaults standardUserDefaults] setObject:@{@"common":commonArray,@"more":moreArray} forKey:CHATMENUBAR];
-        [[NSUserDefaults standardUserDefaults] synchronize];
-        [self.collectionView reloadData];
-    }else {
-        [bean.moreAppInfoArray removeObject:beanItem];
-        MoreAppModel *commonModel = [self.dataSourceArray firstObject];
-        [commonModel.moreAppInfoArray addObject:beanItem];
-        NSMutableArray * commonArray = [NSMutableArray array];
-        for (MoreAppInfoModel * model in commonModel.moreAppInfoArray) {
-            NSDictionary * dict = [model modelToJSONObject];
-            [commonArray addObject:dict];
-        }
-        MoreAppModel *moreModel = [self.dataSourceArray lastObject];
-        NSMutableArray * moreArray = [NSMutableArray array];
-        for (MoreAppInfoModel * model in moreModel.moreAppInfoArray) {
-            NSDictionary * dict = [model modelToJSONObject];
-            [moreArray addObject:dict];
-        }
-        [[NSUserDefaults standardUserDefaults] setObject:@{@"common":commonArray,@"more":moreArray} forKey:CHATMENUBAR];
-        [[NSUserDefaults standardUserDefaults] synchronize];
-        [self.collectionView reloadData];
-    }
+//    MoreAppModel *bean = [self.dataSourceArray objectAtIndex:indexPath.section];
+//    MoreAppInfoModel *beanItem = [bean.moreAppInfoArray objectAtIndex:indexPath.item];
+//    if(indexPath.section == 0){
+//        if (indexPath.item == 0) {
+//            return;
+//        }
+//        [bean.moreAppInfoArray removeObject:beanItem];
+//        MoreAppModel *moreModel = [self.dataSourceArray lastObject];
+//        [moreModel.moreAppInfoArray addObject:beanItem];
+//        NSMutableArray * moreArray = [NSMutableArray array];
+//        for (MoreAppInfoModel * model in moreModel.moreAppInfoArray) {
+//            NSDictionary * dict = [model modelToJSONObject];
+//            [moreArray addObject:dict];
+//        }
+//
+//        MoreAppModel *commonModel = [self.dataSourceArray firstObject];
+//        NSMutableArray * commonArray = [NSMutableArray array];
+//        for (MoreAppInfoModel * model in commonModel.moreAppInfoArray) {
+//            NSDictionary * dict = [model modelToJSONObject];
+//            [commonArray addObject:dict];
+//        }
+//        [[NSUserDefaults standardUserDefaults] setObject:@{@"common":commonArray,@"more":moreArray} forKey:CHATMENUBAR];
+//        [[NSUserDefaults standardUserDefaults] synchronize];
+//        [self.collectionView reloadData];
+//    }else {
+//        [bean.moreAppInfoArray removeObject:beanItem];
+//        MoreAppModel *commonModel = [self.dataSourceArray firstObject];
+//        [commonModel.moreAppInfoArray addObject:beanItem];
+//        NSMutableArray * commonArray = [NSMutableArray array];
+//        for (MoreAppInfoModel * model in commonModel.moreAppInfoArray) {
+//            NSDictionary * dict = [model modelToJSONObject];
+//            [commonArray addObject:dict];
+//        }
+//        MoreAppModel *moreModel = [self.dataSourceArray lastObject];
+//        NSMutableArray * moreArray = [NSMutableArray array];
+//        for (MoreAppInfoModel * model in moreModel.moreAppInfoArray) {
+//            NSDictionary * dict = [model modelToJSONObject];
+//            [moreArray addObject:dict];
+//        }
+//        [[NSUserDefaults standardUserDefaults] setObject:@{@"common":commonArray,@"more":moreArray} forKey:CHATMENUBAR];
+//        [[NSUserDefaults standardUserDefaults] synchronize];
+//        [self.collectionView reloadData];
+//    }
 }
 
 //footer的size
@@ -260,7 +268,7 @@
             [label1 mas_makeConstraints:^(MASConstraintMaker *make) {
                 make.center.mas_equalTo(headerView);
             }];
-            label1.text = @"长按拖动可进行排序";//@"长按可拖动排序";
+            label1.text = @"长按拖动可以进行排序";//@"长按可拖动排序";
             label1.font = [UIFont systemFontOfSize:15];
             label1.textColor = UIColorHex(0x999999);
         }
@@ -269,75 +277,75 @@
     return nil;
 }
 
-- (void)collectionView:(UICollectionView *)collectionView moveItemAtIndexPath:(NSIndexPath *)sourceIndexPath toIndexPath:(NSIndexPath *)destinationIndexPath {
-    WS(weakSelf);
-    if (destinationIndexPath.section == 0 && destinationIndexPath.item == 0) {
-        MoreAppModel *commonModel = [self.dataSourceArray firstObject];
-        NSMutableArray * commonArray = [NSMutableArray array];
-        for (MoreAppInfoModel * model in commonModel.moreAppInfoArray) {
-            NSDictionary * dict = [model modelToJSONObject];
-            [commonArray addObject:dict];
-        }
-        MoreAppModel *moreModel = [self.dataSourceArray lastObject];
-        NSMutableArray * moreArray = [NSMutableArray array];
-        for (MoreAppInfoModel * model in moreModel.moreAppInfoArray) {
-            NSDictionary * dict = [model modelToJSONObject];
-            [moreArray addObject:dict];
-        }
-        [[NSUserDefaults standardUserDefaults] setObject:@{@"common":commonArray,@"more":moreArray} forKey:CHATMENUBAR];
-        [[NSUserDefaults standardUserDefaults] synchronize];
-        dispatch_async(dispatch_get_main_queue(), ^{
-            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-                [weakSelf.collectionView reloadData];
-            });
-        });
-    }else{
-        if (sourceIndexPath.section == 0) {
-            if (sourceIndexPath.item == 0) {
-                return;
-            }
-            MoreAppModel *moreModel = [self.dataSourceArray lastObject];
-            MoreAppModel *commonModel = [self.dataSourceArray firstObject];
-            MoreAppInfoModel * model = commonModel.moreAppInfoArray[sourceIndexPath.item];
-            [commonModel.moreAppInfoArray removeObjectAtIndex:sourceIndexPath.item];
-            if (destinationIndexPath.section == 0) {
-                [commonModel.moreAppInfoArray insertObject:model atIndex:destinationIndexPath.item];
-            }else{
-                [moreModel.moreAppInfoArray insertObject:model atIndex:destinationIndexPath.item];
-            }
-        }else{
-            MoreAppModel *moreModel = [self.dataSourceArray lastObject];
-            MoreAppModel *commonModel = [self.dataSourceArray firstObject];
-            MoreAppInfoModel * model = moreModel.moreAppInfoArray[sourceIndexPath.item];
-            [moreModel.moreAppInfoArray removeObjectAtIndex:sourceIndexPath.item];
-            if (destinationIndexPath.section == 0) {
-                [commonModel.moreAppInfoArray insertObject:model atIndex:destinationIndexPath.item];
-            }else{
-                [moreModel.moreAppInfoArray insertObject:model atIndex:destinationIndexPath.item];
-            }
-        }
-
-        MoreAppModel *commonModel = [self.dataSourceArray firstObject];
-        NSMutableArray * commonArray = [NSMutableArray array];
-        for (MoreAppInfoModel * model in commonModel.moreAppInfoArray) {
-            NSDictionary * dict = [model modelToJSONObject];
-            [commonArray addObject:dict];
-        }
-        MoreAppModel *moreModel = [self.dataSourceArray lastObject];
-        NSMutableArray * moreArray = [NSMutableArray array];
-        for (MoreAppInfoModel * model in moreModel.moreAppInfoArray) {
-            NSDictionary * dict = [model modelToJSONObject];
-            [moreArray addObject:dict];
-        }
-        [[NSUserDefaults standardUserDefaults] setObject:@{@"common":commonArray,@"more":moreArray} forKey:CHATMENUBAR];
-        [[NSUserDefaults standardUserDefaults] synchronize];
-        dispatch_async(dispatch_get_main_queue(), ^{
-            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-                [weakSelf.collectionView reloadData];
-            });
-        });
-    }
-}
+//- (void)collectionView:(UICollectionView *)collectionView moveItemAtIndexPath:(NSIndexPath *)sourceIndexPath toIndexPath:(NSIndexPath *)destinationIndexPath {
+//    WS(weakSelf);
+//    if (destinationIndexPath.section == 0 && destinationIndexPath.item == 0) {
+//        MoreAppModel *commonModel = [self.dataSourceArray firstObject];
+//        NSMutableArray * commonArray = [NSMutableArray array];
+//        for (MoreAppInfoModel * model in commonModel.moreAppInfoArray) {
+//            NSDictionary * dict = [model modelToJSONObject];
+//            [commonArray addObject:dict];
+//        }
+//        MoreAppModel *moreModel = [self.dataSourceArray lastObject];
+//        NSMutableArray * moreArray = [NSMutableArray array];
+//        for (MoreAppInfoModel * model in moreModel.moreAppInfoArray) {
+//            NSDictionary * dict = [model modelToJSONObject];
+//            [moreArray addObject:dict];
+//        }
+//        [[NSUserDefaults standardUserDefaults] setObject:@{@"common":commonArray,@"more":moreArray} forKey:CHATMENUBAR];
+//        [[NSUserDefaults standardUserDefaults] synchronize];
+//        dispatch_async(dispatch_get_main_queue(), ^{
+//            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+//                [weakSelf.collectionView reloadData];
+//            });
+//        });
+//    }else{
+//        if (sourceIndexPath.section == 0) {
+//            if (sourceIndexPath.item == 0) {
+//                return;
+//            }
+//            MoreAppModel *moreModel = [self.dataSourceArray lastObject];
+//            MoreAppModel *commonModel = [self.dataSourceArray firstObject];
+//            MoreAppInfoModel * model = commonModel.moreAppInfoArray[sourceIndexPath.item];
+//            [commonModel.moreAppInfoArray removeObjectAtIndex:sourceIndexPath.item];
+//            if (destinationIndexPath.section == 0) {
+//                [commonModel.moreAppInfoArray insertObject:model atIndex:destinationIndexPath.item];
+//            }else{
+//                [moreModel.moreAppInfoArray insertObject:model atIndex:destinationIndexPath.item];
+//            }
+//        }else{
+//            MoreAppModel *moreModel = [self.dataSourceArray lastObject];
+//            MoreAppModel *commonModel = [self.dataSourceArray firstObject];
+//            MoreAppInfoModel * model = moreModel.moreAppInfoArray[sourceIndexPath.item];
+//            [moreModel.moreAppInfoArray removeObjectAtIndex:sourceIndexPath.item];
+//            if (destinationIndexPath.section == 0) {
+//                [commonModel.moreAppInfoArray insertObject:model atIndex:destinationIndexPath.item];
+//            }else{
+//                [moreModel.moreAppInfoArray insertObject:model atIndex:destinationIndexPath.item];
+//            }
+//        }
+//
+//        MoreAppModel *commonModel = [self.dataSourceArray firstObject];
+//        NSMutableArray * commonArray = [NSMutableArray array];
+//        for (MoreAppInfoModel * model in commonModel.moreAppInfoArray) {
+//            NSDictionary * dict = [model modelToJSONObject];
+//            [commonArray addObject:dict];
+//        }
+//        MoreAppModel *moreModel = [self.dataSourceArray lastObject];
+//        NSMutableArray * moreArray = [NSMutableArray array];
+//        for (MoreAppInfoModel * model in moreModel.moreAppInfoArray) {
+//            NSDictionary * dict = [model modelToJSONObject];
+//            [moreArray addObject:dict];
+//        }
+//        [[NSUserDefaults standardUserDefaults] setObject:@{@"common":commonArray,@"more":moreArray} forKey:CHATMENUBAR];
+//        [[NSUserDefaults standardUserDefaults] synchronize];
+//        dispatch_async(dispatch_get_main_queue(), ^{
+//            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+//                [weakSelf.collectionView reloadData];
+//            });
+//        });
+//    }
+//}
 
 
 -(NSMutableArray *)dataSourceArray{

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

@@ -927,6 +927,7 @@
             vc.FolderId = model.Id;
             vc.Author = model.Author;
             vc.myTitle = model.Title;
+            vc.TypeValue = 1;
             vc.VisitUserId = model.SourceUserId;
             [self.navigationController pushViewController:vc animated:YES];
         }break;
@@ -1002,6 +1003,9 @@
 
 - (NSAttributedString *)setTextWithStr:(NSString *)str
 {
+    if (str.length == 0) {
+        return [[NSAttributedString alloc] initWithString:@""];
+    }
     NSMutableAttributedString *attributedString = [[NSMutableAttributedString alloc] initWithString:str];
     [attributedString addAttribute:NSFontAttributeName value:[UIFont fontWithName:@"PingFang SC" size:16] range:NSMakeRange(0, str.length)];
     [attributedString addAttribute:NSForegroundColorAttributeName value:UIColorHex(#484848) range:NSMakeRange(0, str.length)];
@@ -1014,6 +1018,9 @@
 }
 - (NSAttributedString *)setTitleWithStr:(NSString *)str
 {
+    if (str.length == 0) {
+        return [[NSAttributedString alloc] initWithString:@""];
+    }
     NSMutableAttributedString *attributedString = [[NSMutableAttributedString alloc] initWithString:str];
     [attributedString addAttribute:NSFontAttributeName value:[UIFont systemFontOfSize:18] range:NSMakeRange(0, str.length)];
     [attributedString addAttribute:NSForegroundColorAttributeName value:UIColorHex(0x0a0a0a) range:NSMakeRange(0, str.length)];

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

@@ -14,7 +14,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (weak, nonatomic) IBOutlet UILabel *titleL;
 @property (weak, nonatomic) IBOutlet UIImageView *iconV;
 @property (weak, nonatomic) IBOutlet UILabel *nameL;
-@property (weak, nonatomic) IBOutlet UILabel *desL;
+@property (weak, nonatomic) IBOutlet UIButton *desBtn;
 @property (weak, nonatomic) IBOutlet UIImageView *isTopV;
 
 

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

@@ -70,6 +70,12 @@
         case CollectModel_NoteFile: {
             self.iconV.image = IMG(@"find_1");
         }break;
+        case CollectModel_TopicBooK:{
+            self.iconV.image = IMG(@"find_1");
+        }break;
+        case CollectModel_TopicSubBooK: {
+            self.iconV.image = IMG(@"find_1");
+        }break;
             // 通知 || 站内信
         case CollectModel_Notice:
         {
@@ -79,12 +85,16 @@
             self.iconV.image = IMG(@"站内信");
         }break;
             // 会议
-        case CollectModel_meetMian:{
-            self.iconV.image = IMG(@"会议");
-        }break;
-        case CollectModel_meetDetail:{
+        case CollectModel_meetMian:
+        {
+            self.iconV.image = IMG(@"会议纪要");
+        }
+            break;
+        case CollectModel_meetDetail:
+        {
             self.iconV.image = IMG(@"会议");
-        }break;
+        }
+            break;
         case CollectModel_file:{
             NSString * imageStr = [ZYCTool getFileNameImage:model.Data.FileName];
             if (imageStr.length == 0) {
@@ -130,8 +140,8 @@
         make.width.mas_lessThanOrEqualTo(SCREEN_WIDTH - (model.IsTop ? 125 : 85));
     }];
     self.titleL.text = model.Data.Title;
-    self.nameL.text = [model.Data.Author length] > 0 ? model.Data.Author :  @" ";
-    self.desL.text = [model.FolderName length] > 0 ? model.FolderName : @" ";
+    self.nameL.text = [model.Data.Author length] > 0 ? model.Data.Author : @" ";
+    [self.desBtn setTitle:[model.FolderName length] > 0 ? model.FolderName : @" " forState:UIControlStateNormal];
 }
 - (void)setCellData:(MyFavoriteSubModel *)model withText:(NSString *)text
 {
@@ -166,6 +176,12 @@
         case CollectModel_NoteFile: {
             self.iconV.image = IMG(@"find_1");
         }break;
+        case CollectModel_TopicBooK:{
+            self.iconV.image = IMG(@"find_1");
+        }break;
+        case CollectModel_TopicSubBooK: {
+            self.iconV.image = IMG(@"find_1");
+        }break;
             // 通知 || 站内信
         case CollectModel_Notice:
         {
@@ -175,12 +191,16 @@
             self.iconV.image = IMG(@"站内信");
         }break;
             // 会议
-        case CollectModel_meetMian:{
-            self.iconV.image = IMG(@"会议");
-        }break;
-        case CollectModel_meetDetail:{
+        case CollectModel_meetMian:
+        {
+            self.iconV.image = IMG(@"会议纪要");
+        }
+            break;
+        case CollectModel_meetDetail:
+        {
             self.iconV.image = IMG(@"会议");
-        }break;
+        }
+            break;
         case CollectModel_file:{
             NSString * imageStr = [ZYCTool getFileNameImage:model.Data.FileName];
             if (imageStr.length == 0) {
@@ -226,8 +246,8 @@
         make.width.mas_lessThanOrEqualTo(SCREEN_WIDTH - (model.IsTop ? 125 : 85));
     }];
     self.titleL.attributedText = [ZYCTool checkOfString:model.Data.Title withSearchText:text withColor:UIColorHex(0xFF5252)];
-    self.nameL.attributedText = [model.Data.Author length] > 0 ? [ZYCTool checkOfString:model.Data.Author withSearchText:text withColor:UIColorHex(0xFF5252)] :  [[NSAttributedString alloc] initWithString:@" "];
-    self.desL.attributedText = [model.FolderName length] > 0 ?  [ZYCTool checkOfString:model.FolderName withSearchText:text withColor:UIColorHex(0xFF5252)] :  [[NSAttributedString alloc] initWithString:@" "];
+    self.nameL.attributedText = [model.Data.Author length] > 0 ? [ZYCTool checkOfString:model.Data.Author withSearchText:text withColor:UIColorHex(0xFF5252)] : [[NSAttributedString alloc] initWithString:@" "];
+    [self.desBtn setAttributedTitle:[model.FolderName length] > 0 ?  [ZYCTool checkOfString:model.FolderName withSearchText:text withColor:UIColorHex(0xFF5252)] : [[NSAttributedString alloc] initWithString:@" "] forState:UIControlStateNormal];
 }
 - (void)setSelected:(BOOL)selected animated:(BOOL)animated {
     [super setSelected:selected animated:animated];

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

@@ -27,8 +27,8 @@
                 <rect key="frame" x="0.0" y="0.0" width="338" height="111"/>
                 <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="90.5" height="33.5"/>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" verticalCompressionResistancePriority="751" 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="90.5" height="25.5"/>
                         <constraints>
                             <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="20" id="Gea-xa-rYg"/>
                         </constraints>
@@ -37,7 +37,7 @@
                         <nil key="highlightedColor"/>
                     </label>
                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="img_placeHolder" translatesAutoresizingMaskIntoConstraints="NO" id="cCf-ee-0J6">
-                        <rect key="frame" x="15" y="22" width="40" height="40"/>
+                        <rect key="frame" x="15" y="18" width="40" height="40"/>
                         <constraints>
                             <constraint firstAttribute="width" constant="40" id="RiD-jb-W1S"/>
                             <constraint firstAttribute="height" constant="40" id="nyC-oA-kE5"/>
@@ -57,32 +57,33 @@
                         </constraints>
                     </view>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="252" text="公开" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="84L-UB-7zZ">
-                        <rect key="frame" x="70" y="53.5" width="24" height="17"/>
-                        <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="12"/>
-                        <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/>
-                        <nil key="highlightedColor"/>
-                    </label>
-                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="252" text="公开" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wln-0c-dGh">
-                        <rect key="frame" x="15" y="85.5" width="24" height="17"/>
+                        <rect key="frame" x="70" y="45.5" width="24" height="15.5"/>
                         <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="12"/>
                         <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="置顶" translatesAutoresizingMaskIntoConstraints="NO" id="QxE-nS-rLu">
-                        <rect key="frame" x="170.5" y="21" width="30" height="16"/>
+                        <rect key="frame" x="170.5" y="17" width="30" height="16"/>
                     </imageView>
+                    <button opaque="NO" contentMode="scaleToFill" verticalCompressionResistancePriority="751" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="3Fd-9i-Mm0">
+                        <rect key="frame" x="15" y="76" width="30" height="27"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="12"/>
+                        <state key="normal">
+                            <color key="titleColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/>
+                        </state>
+                    </button>
                 </subviews>
                 <constraints>
                     <constraint firstAttribute="trailing" secondItem="3d7-xH-uiA" secondAttribute="trailing" id="3hQ-AG-mYt"/>
-                    <constraint firstItem="wln-0c-dGh" firstAttribute="leading" secondItem="8Mf-6v-eUM" secondAttribute="leading" constant="15" id="69r-Pz-6ss"/>
+                    <constraint firstAttribute="bottom" secondItem="3Fd-9i-Mm0" secondAttribute="bottom" constant="8" id="86S-Io-EG6"/>
                     <constraint firstItem="7id-tv-Nnd" firstAttribute="leading" secondItem="cCf-ee-0J6" secondAttribute="trailing" constant="15" id="9Xy-Dc-JrN"/>
                     <constraint firstItem="3d7-xH-uiA" firstAttribute="leading" secondItem="8Mf-6v-eUM" secondAttribute="leading" id="B83-7R-eRX"/>
-                    <constraint firstItem="3d7-xH-uiA" firstAttribute="top" secondItem="wln-0c-dGh" secondAttribute="bottom" constant="8" id="DPq-4a-bXp"/>
                     <constraint firstItem="QxE-nS-rLu" firstAttribute="leading" secondItem="7id-tv-Nnd" secondAttribute="trailing" constant="10" id="LDS-P6-o7G"/>
-                    <constraint firstItem="wln-0c-dGh" firstAttribute="top" secondItem="84L-UB-7zZ" secondAttribute="bottom" constant="15" id="bNR-qP-d5g"/>
+                    <constraint firstItem="3Fd-9i-Mm0" firstAttribute="top" secondItem="84L-UB-7zZ" secondAttribute="bottom" constant="15" id="Wvh-yD-7dj"/>
                     <constraint firstItem="cCf-ee-0J6" firstAttribute="leading" secondItem="8Mf-6v-eUM" secondAttribute="leading" constant="15" id="dVe-Nj-QOF"/>
                     <constraint firstItem="84L-UB-7zZ" firstAttribute="leading" secondItem="7id-tv-Nnd" secondAttribute="leading" id="daM-2t-Cwl"/>
                     <constraint firstItem="7id-tv-Nnd" firstAttribute="top" secondItem="8Mf-6v-eUM" secondAttribute="top" constant="12" id="nin-UW-Lrc"/>
+                    <constraint firstItem="3Fd-9i-Mm0" firstAttribute="leading" secondItem="8Mf-6v-eUM" secondAttribute="leading" constant="15" id="qk0-Ib-Xbs"/>
                     <constraint firstAttribute="bottom" secondItem="3d7-xH-uiA" secondAttribute="bottom" id="r09-ZB-T6w"/>
                     <constraint firstItem="cCf-ee-0J6" firstAttribute="centerY" secondItem="7id-tv-Nnd" secondAttribute="centerY" constant="13.25" id="uaJ-Uh-xUy"/>
                     <constraint firstItem="QxE-nS-rLu" firstAttribute="centerY" secondItem="7id-tv-Nnd" secondAttribute="centerY" id="waU-ZC-4bn"/>
@@ -91,7 +92,7 @@
             </tableViewCellContentView>
             <viewLayoutGuide key="safeArea" id="ust-O5-9qD"/>
             <connections>
-                <outlet property="desL" destination="wln-0c-dGh" id="zVq-KH-QLW"/>
+                <outlet property="desBtn" destination="3Fd-9i-Mm0" id="pVT-jK-TqE"/>
                 <outlet property="iconV" destination="cCf-ee-0J6" id="oty-YI-zBu"/>
                 <outlet property="isTopV" destination="QxE-nS-rLu" id="jnz-J4-LIT"/>
                 <outlet property="nameL" destination="84L-UB-7zZ" id="Hy8-Pa-Bvn"/>