no message

smartRhino.xcodeproj/project.pbxproj

@@ -4454,10 +4454,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 */,

smartRhino/AppConfig.h

@@ -398,6 +398,9 @@ return;\
 #define APP_Group_DELETE_User    @"/api/app/group/delete-user"
 ///设置小组成员权限
 #define APP_Group_Update_User    @"/api/app/group/update-user"
+///转让小组
+#define API_APP_Group_Transfer    @"/api/app/group/transfer"
+
 ///消息免打扰
 #define APP_Group_Set_Words    @"/api/app/group/set-words/"
 ///只允许管理员发话题（禁言）

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

@@ -165,8 +165,12 @@
     }
 }
 + (NSString *)getTimeStringAutoShort2:(NSString *)date{
-    if (date.length == 0) {
+    if ([date isKindOfClass:[NSNull class]] || date == nil) {
         return @"";
+    }else{
+        if (date.length == 0) {
+            return @"";
+        }
     }
     NSDate * dt = [self getStringDate:date format:@"yyyy-MM-dd HH:mm:ss"];
     NSString * ret = nil;

smartRhino/Project/VCModel/ChatMessage/Controller/ChatMsgListVC.m

@@ -92,7 +92,6 @@ static int kConversation_AtAll = 2;
     self.tableView.mj_header = [MJRefreshNormalHeader headerWithRefreshingBlock:^{
         [weakSelf headRefresh];
     }];
-    [self.tableView.mj_header beginRefreshing];
 }
 - (void)removeTableRefresh
 {

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

@@ -97,7 +97,7 @@
 - (void)ModifydHanderWithId:(NSInteger)ID withTypeAdminVerifyTypeConst:(NSInteger)AdminVerifyTypeConst{
     WS(weakSelf);
     SHOWLOADING
-    NSLog(@"test 数据 类型  == %@ -----ID == %@",@(AdminVerifyTypeConst).stringValue,@(ID).stringValue);
+    [[HttpManager sharedHttpManager] cancelRequest];
     [[HttpManager sharedHttpManager] PUTUrl:Host(API_Verti_Modify) parameters:@{@"AdminVerifyTypeConst":@(AdminVerifyTypeConst),@"Id":@(ID)} responseStyle:DATA success:^(id  _Nonnull responseObject) {
         REMOVESHOW
         dispatch_async(dispatch_get_main_queue(), ^{

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

@@ -357,7 +357,7 @@
 - (void)moveFind:(NSMutableArray*)findModelArray withSuperModel:(NoticeFindModel *)supermodel{
     if (self.isReturn) {
         MyTDTopicCreateVC * vc = [MyTDTopicCreateVC initMyTDTopicCreateVC];
-        vc.type = CollectModel_NoteBook;
+        vc.type = self.TypeValue == 1 ? CollectModel_NewTopic : CollectModel_NoteBook;
         vc.sendModel = self.sendModel;
         vc.isReturn = self.isReturn;
         [self.navigationController pushViewController:vc animated:YES];
@@ -366,7 +366,7 @@
         [dic setValue:findModelArray forKey:@"Ids"];
         [dic setValue:@(supermodel.Id) forKey:@"ParentId"];
         if (self.TypeValue == 1) {
-            [dic setValue:@(-4) forKey:@"TypeId"];
+            [dic setValue:@(self.TypeId) forKey:@"TypeId"];
         }
         SHOWLOADING
         WEAKSELF

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

@@ -74,37 +74,37 @@
         case 100:
         {
             NSMutableDictionary *dict = [[NSMutableDictionary alloc] init];
-                   [dict setObject:searchKey ?: @"" forKey:@"Key"];
-                   [dict setObject:@(self.DepartmentId) forKey:@"DepartmentId"];
-                   [dict setObject:@(self.SearchType) forKey:@"SearchType"];
-                   [dict setObject:self.UserIds forKey:@"UserIds"];
-                   [dict setObject:@(self.isShow) forKey:@"IsShow"];
-                   [[HttpManager sharedHttpManager] POSTWithUrl:AddressBookGroup_Search_Post parameters:dict success:^(id  _Nonnull responseObject) {
-                       NSLog(@"%@",responseObject);
-                       for (NSDictionary *dic in responseObject) {
-                           SelectModel * model = [[SelectModel alloc] initDict:dic];
-                           model.SourceId = model.UserId;
-                           model.SourceType = 0;
-                           model.SourceName = model.UserName;
-                           [weakSelf.listArray addObject:model];
-                       }
-                       dispatch_async(dispatch_get_main_queue(), ^{
-                           if (weakSelf.listArray.count > 0) {
-                               weakSelf.collectionView.hidden = YES;
-                               weakSelf.noDataView.hidden = YES;
-                               weakSelf.tableView.hidden = NO;
-                               [weakSelf.tableView reloadData];
-                           }else{
-                               weakSelf.noDataView.hidden = NO;
-                               weakSelf.collectionView.hidden = YES;
-                               weakSelf.tableView.hidden = YES;
-                               weakSelf.noDataL.text = @"暂无用户";
-                           }
-                       });
-                   } failure:^(NSError * _Nonnull error) {
-                         SHOWERROR([ZYCTool handerResultData:error])
-                         
-                   }];
+            [dict setObject:searchKey ?: @"" forKey:@"Key"];
+            [dict setObject:@(self.DepartmentId) forKey:@"DepartmentId"];
+            [dict setObject:@(self.SearchType) forKey:@"SearchType"];
+            [dict setObject:self.UserIds forKey:@"UserIds"];
+            [dict setObject:@(self.isShow) forKey:@"IsShow"];
+            [[HttpManager sharedHttpManager] POSTWithUrl:AddressBookGroup_Search_Post parameters:dict success:^(id  _Nonnull responseObject) {
+                NSLog(@"%@",responseObject);
+                for (NSDictionary *dic in responseObject) {
+                    SelectModel * model = [[SelectModel alloc] initDict:dic];
+                    model.SourceId = model.UserId;
+                    model.SourceType = 0;
+                    model.SourceName = model.UserName;
+                    [weakSelf.listArray addObject:model];
+                }
+                dispatch_async(dispatch_get_main_queue(), ^{
+                    if (weakSelf.listArray.count > 0) {
+                        weakSelf.collectionView.hidden = YES;
+                        weakSelf.noDataView.hidden = YES;
+                        weakSelf.tableView.hidden = NO;
+                        [weakSelf.tableView reloadData];
+                    }else{
+                        weakSelf.noDataView.hidden = NO;
+                        weakSelf.collectionView.hidden = YES;
+                        weakSelf.tableView.hidden = YES;
+                        weakSelf.noDataL.text = @"暂无用户";
+                    }
+                });
+            } failure:^(NSError * _Nonnull error) {
+                SHOWERROR([ZYCTool handerResultData:error])
+                
+            }];
         }
             break;
         default:

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

@@ -84,7 +84,7 @@
         vc.isReturn = weakSelf.isReturn;
         vc.sendModel = weakSelf.sendModel;
         vc.DepartmentId = 0;
-        vc.SearchType = 0;
+        vc.SearchType = 100;
         [weakSelf.navigationController pushViewController:vc animated:YES];
     }];
 

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="16097" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="ap2-Fm-VRO">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="16097.2" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="ap2-Fm-VRO">
     <device id="retina5_5" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment version="4352" identifier="iOS"/>
@@ -154,11 +154,11 @@
                                                     <constraint firstAttribute="height" constant="5" id="jwt-Al-TZo"/>
                                                 </constraints>
                                             </view>
-                                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="mYQ-U5-Lqa">
-                                                <rect key="frame" x="0.0" y="70" width="414" height="65"/>
+                                            <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 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="22" width="69.333333333333343" height="21"/>
+                                                    <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>
@@ -166,10 +166,10 @@
                                                         <color key="textColor" red="0.039215686270000001" green="0.039215686270000001" blue="0.039215686270000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                         <nil key="highlightedColor"/>
                                                     </label>
-                                                    <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入小组介绍" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="2ke-Ho-8aX">
-                                                        <rect key="frame" x="105" y="7.6666666666666572" width="294" height="50"/>
+                                                    <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" constant="50" id="yN3-lW-9Na"/>
+                                                            <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"/>
@@ -183,18 +183,18 @@
                                                     <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" constant="65" id="s9c-dq-6Rw"/>
+                                                    <constraint firstAttribute="height" id="s9c-dq-6Rw"/>
                                                 </constraints>
                                             </view>
-                                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="z5U-iQ-Yxe">
-                                                <rect key="frame" x="0.0" y="135" width="414" height="5"/>
+                                            <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" constant="5" id="sxL-Kz-VaX"/>
+                                                    <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="140" width="414" height="65"/>
+                                                <rect key="frame" x="0.0" y="70" 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="UUh-o9-gbo">
                                                         <rect key="frame" x="15.666666666666664" y="22" width="69.333333333333343" height="21"/>
@@ -251,14 +251,14 @@
                                                 </constraints>
                                             </view>
                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="pPR-Hc-CTp">
-                                                <rect key="frame" x="0.0" y="205" width="414" height="5"/>
+                                                <rect key="frame" x="0.0" y="135" 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="nxL-dH-iX4"/>
                                                 </constraints>
                                             </view>
                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="i3O-0B-he5">
-                                                <rect key="frame" x="0.0" y="210" width="414" height="85"/>
+                                                <rect key="frame" x="0.0" y="140" 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">
                                                         <rect key="frame" x="15.666666666666671" y="20" width="104" height="21"/>
@@ -298,14 +298,14 @@
                                                 </constraints>
                                             </view>
                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="nu7-D4-IkT">
-                                                <rect key="frame" x="0.0" y="295" width="414" height="0.66666666666668561"/>
+                                                <rect key="frame" x="0.0" y="225" width="414" height="0.66666666666665719"/>
                                                 <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="295.66666666666674" width="414" height="377.33333333333326"/>
+                                                <rect key="frame" x="0.0" y="225.66666666666671" width="414" height="447.33333333333326"/>
                                                 <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
                                             </tableView>
                                         </subviews>

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

@@ -170,12 +170,12 @@
     }else{
         self.groupName = self.groupNameTf.text;
     }
-    if (self.groupIntroTf.text.length==0) {
-        SHOWERROR(@"请添加小组介绍")
-        return;
-    }else{
-        self.groupIntroduce = self.groupIntroTf.text;
-    }
+//    if (self.groupIntroTf.text.length==0) {
+//        SHOWERROR(@"请添加小组介绍")
+//        return;
+//    }else{
+//        self.groupIntroduce = self.groupIntroTf.text;
+//    }
     WEAKSELF
     self.rightSureBtn.enabled = NO;
     if (self.groupImage) {

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

@@ -431,7 +431,6 @@
     }];
 }
 #pragma Mark 左滑按钮 iOS8以上
-#if __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_11_0
 - (UISwipeActionsConfiguration *)tableView:(UITableView *)tableView trailingSwipeActionsConfigurationForRowAtIndexPath:(NSIndexPath *)indexPath API_AVAILABLE(ios(11.0)) API_UNAVAILABLE(tvos){// delete action
     WS(weakSelf);
     if (indexPath.section > 0) {
@@ -460,7 +459,11 @@
                     }];
                     
                     action2.backgroundColor = UIColorHex(#FF9503);
-                    UISwipeActionsConfiguration *actions = [UISwipeActionsConfiguration configurationWithActions:@[action1,action2]];
+                    UIContextualAction *action3 = [UIContextualAction contextualActionWithStyle:UIContextualActionStyleNormal title:@"转让小组" handler:^(UIContextualAction * _Nonnull action, __kindof UIView * _Nonnull sourceView, void (^ _Nonnull completionHandler)(BOOL)) {
+                        [weakSelf ReturnToOther:model];
+                    }];
+                    action3.backgroundColor = UIColorHex(#589AF1);
+                    UISwipeActionsConfiguration *actions = [UISwipeActionsConfiguration configurationWithActions:@[action1,action2,action3]];
                     actions.performsFirstActionWithFullSwipe = NO;
                     return actions;
                 }
@@ -499,49 +502,7 @@
     actions.performsFirstActionWithFullSwipe = NO;
     return actions;
 }
-#else
-- (NSArray<UITableViewRowAction *> *)tableView:(UITableView *)tableView editActionsForRowAtIndexPath:(NSIndexPath *)indexPath {
-    WEAKSELF
-    if (indexPath.section > 0) {
-        TDGroupInfoModel *model = [self.dataArray objectAtIndex:indexPath.row];
-        switch (self.listModel.GroupUserRoleId) {
-            case 1:{
-                if (model.GroupUserRoleId != 1) {
-                    UITableViewRowAction *action1 = [UITableViewRowAction rowActionWithStyle:UITableViewRowActionStyleDestructive title:@"删除" handler:^(UITableViewRowAction * _Nonnull action, NSIndexPath * _Nonnull indexPath) {
-                        [weakSelf deleteFind:model];
-                    }];
-                    action1.backgroundColor = UIColorHex(#FF3B2F);
-                    NSString * isAdmin = model.GroupUserRoleId == 2 ? @"取消管理员" : @"设为管理员";
-                    UITableViewRowAction *action2 = [UITableViewRowAction rowActionWithStyle:UITableViewRowActionStyleDestructive title:isAdmin handler:^(UITableViewRowAction * _Nonnull action, NSIndexPath * _Nonnull indexPath) {
-                        [weakSelf setRoleLevel:model];
-                    }];
-                    
-                    action2.backgroundColor = UIColorHex(#FF9503);
-                    return @[action1, action2];
-                }else{
-                    return @[];
-                }
-            }break;
-            case 2:{
-                if (model.GroupUserRoleId == 3) {
-                    UITableViewRowAction *action1 = [UITableViewRowAction rowActionWithStyle:UITableViewRowActionStyleDestructive title:@"删除" handler:^(UITableViewRowAction * _Nonnull action, NSIndexPath * _Nonnull indexPath) {
-                        [weakSelf deleteFind:@[model].mutableCopy];
-                    }];
-                    action1.backgroundColor = UIColorHex(#FF3B2F);
-                    return @[action1];
-                }else{
-                    return @[];
-                }
-            }break;
-            default:{
-                return @[];
-            }
-        }
-    }else{
-        return @[];
-    }
-}
-#endif
+
 
 - (void)deleteFind:(TDGroupInfoModel *)model
 {
@@ -561,13 +522,21 @@
     WS(weakSelf);
     [[HttpManager sharedHttpManager] POSTUrl:Host(APP_Group_Update_User) parameters:@{@"RoleId":@(level),@"Id":@(model.Id)} responseStyle:DATA success:^(id  _Nonnull responseObject) {
         SHOWSUCCESS(@"设置成功")
-        dispatch_async(dispatch_get_main_queue(), ^{
-            [weakSelf getData];
-        });
+        [weakSelf getData];
     } failure:^(NSError * _Nonnull error) {
         
     }];
 }
+- (void)ReturnToOther:(TDGroupInfoModel *)model
+{
+    WS(weakSelf);
+    [[HttpManager sharedHttpManager] PUTUrl:Host(API_APP_Group_Transfer) parameters:@{@"GroupId":@(self.GroupId),@"TransferUserId":@(model.UserId)} responseStyle:DATA success:^(id  _Nonnull responseObject) {
+        SHOWSUCCESS(@"转让成功")
+        [weakSelf getData];
+    } failure:^(NSError * _Nonnull error) {
+        SHOWERROR([ZYCTool handerResultData:error]);
+    }];
+}
 /// 退出小组
 - (IBAction)qiutGroupAction:(id)sender {
     SHOWLOADING
@@ -582,7 +551,14 @@
             }
         }
     } failure:^(NSError * _Nonnull error) {
-        SHOWERROR([ZYCTool handerResultData:error]);
+        REMOVESHOW
+        UIAlertController *alert = [UIAlertController alertControllerWithTitle:nil message:[ZYCTool handerResultData:error] preferredStyle:(UIAlertControllerStyleAlert)];
+        UIAlertAction * sureAction = [UIAlertAction actionWithTitle:@"确定" style:UIAlertActionStyleCancel handler:^(UIAlertAction * _Nonnull action) {
+        }];
+        [alert addAction:sureAction];
+        [self presentViewController:alert animated:YES completion:^{
+            
+        }];
     }];
 }
 - (IBAction)backAction:(id)sender {

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

@@ -190,7 +190,7 @@
     self.webView.scrollView.delegate = self;
 //    self.automaticallyAdjustsScrollViewInsets = YES;
     NSURL *pathUrl = [NSURL URLWithString:HtmlHost(@"/mobile/editor")];
-//    NSURL *pathUrl = [NSURL URLWithString:@"http://192.168.0.118:8080/admin/mobile/editor"];
+//    NSURL *pathUrl = [NSURL URLWithString:@"http://192.168.0.111:8080/admin/mobile/editor"];
     NSURLRequest *request = [NSURLRequest requestWithURL:pathUrl];
     [self.webView loadRequest:request];
 //    [self hideWKWebviewKeyboardShortcutBar:self.webView];

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

@@ -527,9 +527,9 @@
     return 1;
 }
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section{
-
+    
     return self.noteBookArray.count;
-
+    
 }
 - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
 {
@@ -603,8 +603,8 @@
                                 model.IsSelect = !model.IsSelect;
                                 [weakSelf.tableView reloadRowsAtIndexPaths:@[indexPath] withRowAnimation:UITableViewRowAnimationNone];
                             }];
-                            cell.bottomView.hidden = YES;
-                            cell.bottomHeight.constant = 0.f;
+                        cell.bottomView.hidden = YES;
+                        cell.bottomHeight.constant = 0.f;
                             cell.selectionStyle = UITableViewCellSelectionStyleNone;
                             return cell;
                         }
@@ -639,9 +639,9 @@
                                         [weakSelf.tableView reloadRowsAtIndexPaths:@[indexPath] withRowAnimation:UITableViewRowAnimationNone];
                                     }];
                                     cell.bottomView.hidden = YES;
-                            cell.bottomHeight.constant = 0.f;
-                            cell.selectionStyle = UITableViewCellSelectionStyleNone;
-                            return cell;
+                                    cell.bottomHeight.constant = 0.f;
+                                    cell.selectionStyle = UITableViewCellSelectionStyleNone;
+                                    return cell;
                                 }break;
                                 case 2:{
                                     NoteBookCell *cell = [NoteBookCell configCell10:tableView indexPath:indexPath];
@@ -671,9 +671,9 @@
                                         [weakSelf.tableView reloadRowsAtIndexPaths:@[indexPath] withRowAnimation:UITableViewRowAnimationNone];
                                     }];
                                     cell.bottomView.hidden = YES;
-                            cell.bottomHeight.constant = 0.f;
-                            cell.selectionStyle = UITableViewCellSelectionStyleNone;
-                            return cell;
+                                    cell.bottomHeight.constant = 0.f;
+                                    cell.selectionStyle = UITableViewCellSelectionStyleNone;
+                                    return cell;
                                 }break;
                                 case 3:{
                                     NoteBookCell *cell = [NoteBookCell configCell20:tableView indexPath:indexPath];
@@ -705,9 +705,9 @@
                                         [weakSelf.tableView reloadRowsAtIndexPaths:@[indexPath] withRowAnimation:UITableViewRowAnimationNone];
                                     }];
                                     cell.bottomView.hidden = YES;
-                            cell.bottomHeight.constant = 0.f;
-                            cell.selectionStyle = UITableViewCellSelectionStyleNone;
-                            return cell;
+                                    cell.bottomHeight.constant = 0.f;
+                                    cell.selectionStyle = UITableViewCellSelectionStyleNone;
+                                    return cell;
                                 }break;
                                 case 4:{
                                     NoteBookCell *cell = [NoteBookCell configCell30:tableView indexPath:indexPath];
@@ -741,9 +741,9 @@
                                         [weakSelf.tableView reloadRowsAtIndexPaths:@[indexPath] withRowAnimation:UITableViewRowAnimationNone];
                                     }];
                                     cell.bottomView.hidden = YES;
-                            cell.bottomHeight.constant = 0.f;
-                            cell.selectionStyle = UITableViewCellSelectionStyleNone;
-                            return cell;
+                                    cell.bottomHeight.constant = 0.f;
+                                    cell.selectionStyle = UITableViewCellSelectionStyleNone;
+                                    return cell;
                                 }break;
                                 case 5:{
                                     NoteBookCell *cell = [NoteBookCell configCell40:tableView indexPath:indexPath];
@@ -780,9 +780,9 @@
                                         [weakSelf.tableView reloadRowsAtIndexPaths:@[indexPath] withRowAnimation:UITableViewRowAnimationNone];
                                     }];
                                     cell.bottomView.hidden = YES;
-                            cell.bottomHeight.constant = 0.f;
-                            cell.selectionStyle = UITableViewCellSelectionStyleNone;
-                            return cell;
+                                    cell.bottomHeight.constant = 0.f;
+                                    cell.selectionStyle = UITableViewCellSelectionStyleNone;
+                                    return cell;
                                 }break;
                                 case 6:{
                                     NoteBookCell *cell = [NoteBookCell configCell40:tableView indexPath:indexPath];
@@ -820,9 +820,9 @@
                                         [weakSelf.tableView reloadRowsAtIndexPaths:@[indexPath] withRowAnimation:UITableViewRowAnimationNone];
                                     }];
                                     cell.bottomView.hidden = YES;
-                            cell.bottomHeight.constant = 0.f;
-                            cell.selectionStyle = UITableViewCellSelectionStyleNone;
-                            return cell;
+                                    cell.bottomHeight.constant = 0.f;
+                                    cell.selectionStyle = UITableViewCellSelectionStyleNone;
+                                    return cell;
                                 }break;
                                 case 7:{
                                     NoteBookCell *cell = [NoteBookCell configCell50:tableView indexPath:indexPath];
@@ -864,9 +864,9 @@
                                         [weakSelf.tableView reloadRowsAtIndexPaths:@[indexPath] withRowAnimation:UITableViewRowAnimationNone];
                                     }];
                                     cell.bottomView.hidden = YES;
-                            cell.bottomHeight.constant = 0.f;
-                            cell.selectionStyle = UITableViewCellSelectionStyleNone;
-                            return cell;
+                                    cell.bottomHeight.constant = 0.f;
+                                    cell.selectionStyle = UITableViewCellSelectionStyleNone;
+                                    return cell;
                                 }break;
                                 case 8:{
                                     NoteBookCell *cell = [NoteBookCell configCell50:tableView indexPath:indexPath];
@@ -909,9 +909,9 @@
                                         [weakSelf.tableView reloadRowsAtIndexPaths:@[indexPath] withRowAnimation:UITableViewRowAnimationNone];
                                     }];
                                     cell.bottomView.hidden = YES;
-                            cell.bottomHeight.constant = 0.f;
-                            cell.selectionStyle = UITableViewCellSelectionStyleNone;
-                            return cell;
+                                    cell.bottomHeight.constant = 0.f;
+                                    cell.selectionStyle = UITableViewCellSelectionStyleNone;
+                                    return cell;
                                 }break;
                                 default:{
                                     NoteBookCell *cell = [NoteBookCell configCell50:tableView indexPath:indexPath];
@@ -955,9 +955,9 @@
                                         [weakSelf.tableView reloadRowsAtIndexPaths:@[indexPath] withRowAnimation:UITableViewRowAnimationNone];
                                     }];
                                     cell.bottomView.hidden = YES;
-                            cell.bottomHeight.constant = 0.f;
-                            cell.selectionStyle = UITableViewCellSelectionStyleNone;
-                            return cell;
+                                    cell.bottomHeight.constant = 0.f;
+                                    cell.selectionStyle = UITableViewCellSelectionStyleNone;
+                                    return cell;
                                 }
                                     break;
                             }
@@ -996,7 +996,6 @@
                                 model.IsSelect = !model.IsSelect;
                                 [weakSelf.tableView reloadRowsAtIndexPaths:@[indexPath] withRowAnimation:UITableViewRowAnimationNone];
                             }];
-                            cell.selectionStyle = UITableViewCellSelectionStyleNone;
                             cell.bottomView.hidden = YES;
                             cell.bottomHeight.constant = 0.f;
                             cell.selectionStyle = UITableViewCellSelectionStyleNone;
@@ -1035,7 +1034,7 @@
                         model.IsSelect = !model.IsSelect;
                         [weakSelf.tableView reloadRowsAtIndexPaths:@[indexPath] withRowAnimation:UITableViewRowAnimationNone];
                     }];
-                            return cell;
+                    return cell;
                 }break;
             }break;
         case OperationStateEnum0:{ // 正常
@@ -1090,10 +1089,9 @@
                             cell.ClickUserBlock = ^{
                                 [weakSelf showUserInfo:model.UserId];
                             };
-                            cell.selectionStyle = UITableViewCellSelectionStyleNone;
                             cell.bottomView.hidden = YES;
                             cell.bottomHeight.constant = 0.f;
-                             
+                            
                             cell.selectionStyle = UITableViewCellSelectionStyleNone;
                             return cell;
                         }
@@ -1132,26 +1130,26 @@
                                     }else{
                                         [cell.cellCommentButton setTitle:@"评论" forState:UIControlStateNormal];
                                     }
-                                    WS(weakSelf);
-                                    [cell.cellCommentButton setAction:^{
-                                        [weakSelf CommentHanderIndex:indexPath];
-                                    }];
-                                    [cell.cellZanButton setAction:^{
-                                        [weakSelf zanHanderIndex:indexPath];
-                                    }];
-                                    [cell.cellShareButton setAction:^{
-                                        [weakSelf shareHanderModel:model];
-                                    }];
                                     cell.ClickUserBlock = ^{
                                         [weakSelf showUserInfo:model.UserId];
                                     };
+                                    if (self.TypeValue == 1) {
+                                        cell.bottomView.hidden = NO;
+                                        [cell.cellCommentButton setAction:^{
+                                            [weakSelf CommentHanderIndex:indexPath];
+                                        }];
+                                        [cell.cellShareButton setAction:^{
+                                            [weakSelf shareHanderModel:model];
+                                        }];
+                                        [cell.cellZanButton setAction:^{
+                                            [weakSelf zanHanderIndex:indexPath];
+                                        }];
+                                    }else{
+                                        cell.bottomView.hidden = YES;
+                                        cell.bottomHeight.constant = 0.f;
+                                    }
                                     cell.selectionStyle = UITableViewCellSelectionStyleNone;
-                                    cell.bottomView.hidden = YES;
-                            cell.bottomHeight.constant = 0.f;
-                                     
-
-                            cell.selectionStyle = UITableViewCellSelectionStyleNone;
-                            return cell;
+                                    return cell;
                                 }break;
                                 case 2:{
                                     NoteBookCell *cell = [NoteBookCell configCell1:tableView indexPath:indexPath];
@@ -1185,26 +1183,26 @@
                                     }else{
                                         [cell.cellCommentButton setTitle:@"评论" forState:UIControlStateNormal];
                                     }
-                                    WS(weakSelf);
-                                    [cell.cellCommentButton setAction:^{
-                                        [weakSelf CommentHanderIndex:indexPath];
-                                    }];
-                                    [cell.cellZanButton setAction:^{
-                                        [weakSelf zanHanderIndex:indexPath];
-                                    }];
-                                    [cell.cellShareButton setAction:^{
-                                        [weakSelf shareHanderModel:model];
-                                    }];
                                     cell.ClickUserBlock = ^{
                                         [weakSelf showUserInfo:model.UserId];
                                     };
+                                    if (self.TypeValue == 1) {
+                                        cell.bottomView.hidden = NO;
+                                        [cell.cellCommentButton setAction:^{
+                                            [weakSelf CommentHanderIndex:indexPath];
+                                        }];
+                                        [cell.cellShareButton setAction:^{
+                                            [weakSelf shareHanderModel:model];
+                                        }];
+                                        [cell.cellZanButton setAction:^{
+                                            [weakSelf zanHanderIndex:indexPath];
+                                        }];
+                                    }else{
+                                        cell.bottomView.hidden = YES;
+                                        cell.bottomHeight.constant = 0.f;
+                                    }
                                     cell.selectionStyle = UITableViewCellSelectionStyleNone;
-                                    cell.bottomView.hidden = YES;
-                            cell.bottomHeight.constant = 0.f;
-                                     
-
-                            cell.selectionStyle = UITableViewCellSelectionStyleNone;
-                            return cell;
+                                    return cell;
                                 }break;
                                 case 3:{
                                     NoteBookCell *cell = [NoteBookCell configCell2:tableView indexPath:indexPath];
@@ -1240,26 +1238,26 @@
                                     }else{
                                         [cell.cellCommentButton setTitle:@"评论" forState:UIControlStateNormal];
                                     }
-                                    WS(weakSelf);
-                                    [cell.cellCommentButton setAction:^{
-                                        [weakSelf CommentHanderIndex:indexPath];
-                                    }];
-                                    [cell.cellZanButton setAction:^{
-                                        [weakSelf zanHanderIndex:indexPath];
-                                    }];
-                                    [cell.cellShareButton setAction:^{
-                                        [weakSelf shareHanderModel:model];
-                                    }];
                                     cell.ClickUserBlock = ^{
                                         [weakSelf showUserInfo:model.UserId];
                                     };
+                                    if (self.TypeValue == 1) {
+                                        cell.bottomView.hidden = NO;
+                                        [cell.cellCommentButton setAction:^{
+                                            [weakSelf CommentHanderIndex:indexPath];
+                                        }];
+                                        [cell.cellShareButton setAction:^{
+                                            [weakSelf shareHanderModel:model];
+                                        }];
+                                        [cell.cellZanButton setAction:^{
+                                            [weakSelf zanHanderIndex:indexPath];
+                                        }];
+                                    }else{
+                                        cell.bottomView.hidden = YES;
+                                        cell.bottomHeight.constant = 0.f;
+                                    }
                                     cell.selectionStyle = UITableViewCellSelectionStyleNone;
-                                    cell.bottomView.hidden = YES;
-                            cell.bottomHeight.constant = 0.f;
-                                     
-
-                            cell.selectionStyle = UITableViewCellSelectionStyleNone;
-                            return cell;
+                                    return cell;
                                 }break;
                                 case 4:{
                                     NoteBookCell *cell = [NoteBookCell configCell3:tableView indexPath:indexPath];
@@ -1297,26 +1295,26 @@
                                     }else{
                                         [cell.cellCommentButton setTitle:@"评论" forState:UIControlStateNormal];
                                     }
-                                    WS(weakSelf);
-                                    [cell.cellCommentButton setAction:^{
-                                        [weakSelf CommentHanderIndex:indexPath];
-                                    }];
-                                    [cell.cellZanButton setAction:^{
-                                        [weakSelf zanHanderIndex:indexPath];
-                                    }];
-                                    [cell.cellShareButton setAction:^{
-                                        [weakSelf shareHanderModel:model];
-                                    }];
                                     cell.ClickUserBlock = ^{
                                         [weakSelf showUserInfo:model.UserId];
                                     };
+                                    if (self.TypeValue == 1) {
+                                        cell.bottomView.hidden = NO;
+                                        [cell.cellCommentButton setAction:^{
+                                            [weakSelf CommentHanderIndex:indexPath];
+                                        }];
+                                        [cell.cellShareButton setAction:^{
+                                            [weakSelf shareHanderModel:model];
+                                        }];
+                                        [cell.cellZanButton setAction:^{
+                                            [weakSelf zanHanderIndex:indexPath];
+                                        }];
+                                    }else{
+                                        cell.bottomView.hidden = YES;
+                                        cell.bottomHeight.constant = 0.f;
+                                    }
                                     cell.selectionStyle = UITableViewCellSelectionStyleNone;
-                                    cell.bottomView.hidden = YES;
-                            cell.bottomHeight.constant = 0.f;
-                                     
-
-                            cell.selectionStyle = UITableViewCellSelectionStyleNone;
-                            return cell;
+                                    return cell;
                                 }break;
                                 case 5:{
                                     NoteBookCell *cell = [NoteBookCell configCell4:tableView indexPath:indexPath];
@@ -1356,27 +1354,26 @@
                                     }else{
                                         [cell.cellCommentButton setTitle:@"评论" forState:UIControlStateNormal];
                                     }
-                                    WS(weakSelf);
-                                    [cell.cellCommentButton setAction:^{
-                                        [weakSelf CommentHanderIndex:indexPath];
-                                    }];
-                                    [cell.cellZanButton setAction:^{
-                                        [weakSelf zanHanderIndex:indexPath];
-                                    }];
-                                    [cell.cellShareButton setAction:^{
-                                        [weakSelf shareHanderModel:model];
-                                    }];
                                     cell.ClickUserBlock = ^{
                                         [weakSelf showUserInfo:model.UserId];
                                     };
-                                    cell.cell1IconImageView6.hidden = YES;
+                                    if (self.TypeValue == 1) {
+                                        cell.bottomView.hidden = NO;
+                                        [cell.cellCommentButton setAction:^{
+                                            [weakSelf CommentHanderIndex:indexPath];
+                                        }];
+                                        [cell.cellShareButton setAction:^{
+                                            [weakSelf shareHanderModel:model];
+                                        }];
+                                        [cell.cellZanButton setAction:^{
+                                            [weakSelf zanHanderIndex:indexPath];
+                                        }];
+                                    }else{
+                                        cell.bottomView.hidden = YES;
+                                        cell.bottomHeight.constant = 0.f;
+                                    }
                                     cell.selectionStyle = UITableViewCellSelectionStyleNone;
-                                    cell.bottomView.hidden = YES;
-                            cell.bottomHeight.constant = 0.f;
-                                     
-
-                            cell.selectionStyle = UITableViewCellSelectionStyleNone;
-                            return cell;
+                                    return cell;
                                 }break;
                                 case 6:{
                                     NoteBookCell *cell = [NoteBookCell configCell4:tableView indexPath:indexPath];
@@ -1418,26 +1415,26 @@
                                     }else{
                                         [cell.cellCommentButton setTitle:@"评论" forState:UIControlStateNormal];
                                     }
-                                    WS(weakSelf);
-                                    [cell.cellCommentButton setAction:^{
-                                        [weakSelf CommentHanderIndex:indexPath];
-                                    }];
-                                    [cell.cellZanButton setAction:^{
-                                        [weakSelf zanHanderIndex:indexPath];
-                                    }];
-                                    [cell.cellShareButton setAction:^{
-                                        [weakSelf shareHanderModel:model];
-                                    }];
                                     cell.ClickUserBlock = ^{
                                         [weakSelf showUserInfo:model.UserId];
                                     };
+                                    if (self.TypeValue == 1) {
+                                        cell.bottomView.hidden = NO;
+                                        [cell.cellCommentButton setAction:^{
+                                            [weakSelf CommentHanderIndex:indexPath];
+                                        }];
+                                        [cell.cellShareButton setAction:^{
+                                            [weakSelf shareHanderModel:model];
+                                        }];
+                                        [cell.cellZanButton setAction:^{
+                                            [weakSelf zanHanderIndex:indexPath];
+                                        }];
+                                    }else{
+                                        cell.bottomView.hidden = YES;
+                                        cell.bottomHeight.constant = 0.f;
+                                    }
                                     cell.selectionStyle = UITableViewCellSelectionStyleNone;
-                                    cell.bottomView.hidden = YES;
-                            cell.bottomHeight.constant = 0.f;
-                                     
-
-                            cell.selectionStyle = UITableViewCellSelectionStyleNone;
-                            return cell;
+                                    return cell;
                                 }break;
                                 case 7:{
                                     NoteBookCell *cell = [NoteBookCell configCell5:tableView indexPath:indexPath];
@@ -1481,28 +1478,27 @@
                                     }else{
                                         [cell.cellCommentButton setTitle:@"评论" forState:UIControlStateNormal];
                                     }
-                                    WS(weakSelf);
-                                    [cell.cellCommentButton setAction:^{
-                                        [weakSelf CommentHanderIndex:indexPath];
-                                    }];
-                                    [cell.cellZanButton setAction:^{
-                                        [weakSelf zanHanderIndex:indexPath];
-                                    }];
-                                    [cell.cellShareButton setAction:^{
-                                        [weakSelf shareHanderModel:model];
-                                    }];
                                     cell.ClickUserBlock = ^{
                                         [weakSelf showUserInfo:model.UserId];
                                     };
-                                    cell.cell1IconImageView8.hidden = YES;
-                                    cell.cell1IconImageView9.hidden = YES;
+                                    if (self.TypeValue == 1) {
+                                        cell.bottomView.hidden = NO;
+                                        [cell.cellCommentButton setAction:^{
+                                            [weakSelf CommentHanderIndex:indexPath];
+                                        }];
+                                        [cell.cellShareButton setAction:^{
+                                            [weakSelf shareHanderModel:model];
+                                        }];
+                                        [cell.cellZanButton setAction:^{
+                                            [weakSelf zanHanderIndex:indexPath];
+                                        }];
+                                    }else{
+                                        cell.bottomView.hidden = YES;
+                                        cell.bottomHeight.constant = 0.f;
+                                    }
+                                    
                                     cell.selectionStyle = UITableViewCellSelectionStyleNone;
-                                    cell.bottomView.hidden = YES;
-                            cell.bottomHeight.constant = 0.f;
-                                     
-
-                            cell.selectionStyle = UITableViewCellSelectionStyleNone;
-                            return cell;
+                                    return cell;
                                 }break;
                                 case 8:{
                                     NoteBookCell *cell = [NoteBookCell configCell5:tableView indexPath:indexPath];
@@ -1548,27 +1544,26 @@
                                     }else{
                                         [cell.cellCommentButton setTitle:@"评论" forState:UIControlStateNormal];
                                     }
-                                    WS(weakSelf);
-                                    [cell.cellCommentButton setAction:^{
-                                        [weakSelf CommentHanderIndex:indexPath];
-                                    }];
-                                    [cell.cellZanButton setAction:^{
-                                        [weakSelf zanHanderIndex:indexPath];
-                                    }];
-                                    [cell.cellShareButton setAction:^{
-                                        [weakSelf shareHanderModel:model];
-                                    }];
                                     cell.ClickUserBlock = ^{
                                         [weakSelf showUserInfo:model.UserId];
                                     };
-                                    cell.cell1IconImageView9.hidden = YES;
+                                    if (self.TypeValue == 1) {
+                                        cell.bottomView.hidden = NO;
+                                        [cell.cellCommentButton setAction:^{
+                                            [weakSelf CommentHanderIndex:indexPath];
+                                        }];
+                                        [cell.cellShareButton setAction:^{
+                                            [weakSelf shareHanderModel:model];
+                                        }];
+                                        [cell.cellZanButton setAction:^{
+                                            [weakSelf zanHanderIndex:indexPath];
+                                        }];
+                                    }else{
+                                        cell.bottomView.hidden = YES;
+                                        cell.bottomHeight.constant = 0.f;
+                                    }
                                     cell.selectionStyle = UITableViewCellSelectionStyleNone;
-                                    cell.bottomView.hidden = YES;
-                            cell.bottomHeight.constant = 0.f;
-                                     
-
-                            cell.selectionStyle = UITableViewCellSelectionStyleNone;
-                            return cell;
+                                    return cell;
                                 }break;
                                 default:{
                                     NoteBookCell *cell = [NoteBookCell configCell5:tableView indexPath:indexPath];
@@ -1616,26 +1611,26 @@
                                     }else{
                                         [cell.cellCommentButton setTitle:@"评论" forState:UIControlStateNormal];
                                     }
-                                    WS(weakSelf);
-                                    [cell.cellCommentButton setAction:^{
-                                        [weakSelf CommentHanderIndex:indexPath];
-                                    }];
-                                    [cell.cellZanButton setAction:^{
-                                        [weakSelf zanHanderIndex:indexPath];
-                                    }];
-                                    [cell.cellShareButton setAction:^{
-                                        [weakSelf shareHanderModel:model];
-                                    }];
                                     cell.ClickUserBlock = ^{
                                         [weakSelf showUserInfo:model.UserId];
                                     };
+                                    if (self.TypeValue == 1) {
+                                        cell.bottomView.hidden = NO;
+                                        [cell.cellCommentButton setAction:^{
+                                            [weakSelf CommentHanderIndex:indexPath];
+                                        }];
+                                        [cell.cellShareButton setAction:^{
+                                            [weakSelf shareHanderModel:model];
+                                        }];
+                                        [cell.cellZanButton setAction:^{
+                                            [weakSelf zanHanderIndex:indexPath];
+                                        }];
+                                    }else{
+                                        cell.bottomView.hidden = YES;
+                                        cell.bottomHeight.constant = 0.f;
+                                    }
                                     cell.selectionStyle = UITableViewCellSelectionStyleNone;
-                                    cell.bottomView.hidden = YES;
-                            cell.bottomHeight.constant = 0.f;
-                                     
-
-                            cell.selectionStyle = UITableViewCellSelectionStyleNone;
-                            return cell;
+                                    return cell;
                                 }
                                     break;
                             }
@@ -1678,26 +1673,25 @@
                             }else{
                                 [cell.cellCommentButton setTitle:@"评论" forState:UIControlStateNormal];
                             }
-                            WS(weakSelf);
-                            [cell.cellCommentButton setAction:^{
-                                [weakSelf CommentHanderIndex:indexPath];
-                            }];
-                            [cell.cellZanButton setAction:^{
-                                [weakSelf zanHanderIndex:indexPath];
-                            }];
-                            [cell.cellShareButton setAction:^{
-                                [weakSelf shareHanderModel:model];
-                            }];
-                            [cell.fileAction setAction:^{
-                                [weakSelf pushFileWithModel:dataModel];
-                            }];
                             cell.ClickUserBlock = ^{
                                 [weakSelf showUserInfo:model.UserId];
                             };
-                            cell.selectionStyle = UITableViewCellSelectionStyleNone;
-                            cell.bottomView.hidden = YES;
-                            cell.bottomHeight.constant = 0.f;
-                             
+                            if (self.TypeValue == 1) {
+                                cell.bottomView.hidden = NO;
+                                [cell.cellCommentButton setAction:^{
+                                    [weakSelf CommentHanderIndex:indexPath];
+                                }];
+                                [cell.cellShareButton setAction:^{
+                                    [weakSelf shareHanderModel:model];
+                                }];
+                                [cell.cellZanButton setAction:^{
+                                    [weakSelf zanHanderIndex:indexPath];
+                                }];
+                            }else{
+                                cell.bottomView.hidden = YES;
+                                cell.bottomHeight.constant = 0.f;
+                            }
+                            
                             cell.selectionStyle = UITableViewCellSelectionStyleNone;
                             return cell;
                         }
@@ -1731,7 +1725,7 @@
                     cell.cell0Number.hidden = model.FileCount == 0 ? YES : NO;
                     cell.cell0Title.text = model.FolderName;
                     cell.selectionStyle = UITableViewCellSelectionStyleNone;
-                            return cell;
+                    return cell;
                 }break;
                 default:{
                     TopicBookCell * cell = [TopicBookCell configCell0:tableView indexPath:indexPath];
@@ -1821,9 +1815,9 @@
                                         [weakSelf.tableView reloadRowsAtIndexPaths:@[indexPath] withRowAnimation:UITableViewRowAnimationNone];
                                     }];
                                     cell.bottomView.hidden = YES;
-                            cell.bottomHeight.constant = 0.f;
-                            cell.selectionStyle = UITableViewCellSelectionStyleNone;
-                            return cell;
+                                    cell.bottomHeight.constant = 0.f;
+                                    cell.selectionStyle = UITableViewCellSelectionStyleNone;
+                                    return cell;
                                 }break;
                                 case 2:{
                                     NoteBookCell *cell = [NoteBookCell configCell10:tableView indexPath:indexPath];
@@ -1856,9 +1850,9 @@
                                         [weakSelf.tableView reloadRowsAtIndexPaths:@[indexPath] withRowAnimation:UITableViewRowAnimationNone];
                                     }];
                                     cell.bottomView.hidden = YES;
-                            cell.bottomHeight.constant = 0.f;
-                            cell.selectionStyle = UITableViewCellSelectionStyleNone;
-                            return cell;
+                                    cell.bottomHeight.constant = 0.f;
+                                    cell.selectionStyle = UITableViewCellSelectionStyleNone;
+                                    return cell;
                                 }break;
                                 case 3:{
                                     NoteBookCell *cell = [NoteBookCell configCell20:tableView indexPath:indexPath];
@@ -1893,9 +1887,9 @@
                                         [weakSelf.tableView reloadRowsAtIndexPaths:@[indexPath] withRowAnimation:UITableViewRowAnimationNone];
                                     }];
                                     cell.bottomView.hidden = YES;
-                            cell.bottomHeight.constant = 0.f;
-                            cell.selectionStyle = UITableViewCellSelectionStyleNone;
-                            return cell;
+                                    cell.bottomHeight.constant = 0.f;
+                                    cell.selectionStyle = UITableViewCellSelectionStyleNone;
+                                    return cell;
                                 }break;
                                 case 4:{
                                     NoteBookCell *cell = [NoteBookCell configCell30:tableView indexPath:indexPath];
@@ -1932,9 +1926,9 @@
                                         [weakSelf.tableView reloadRowsAtIndexPaths:@[indexPath] withRowAnimation:UITableViewRowAnimationNone];
                                     }];
                                     cell.bottomView.hidden = YES;
-                            cell.bottomHeight.constant = 0.f;
-                            cell.selectionStyle = UITableViewCellSelectionStyleNone;
-                            return cell;
+                                    cell.bottomHeight.constant = 0.f;
+                                    cell.selectionStyle = UITableViewCellSelectionStyleNone;
+                                    return cell;
                                 }break;
                                 case 5:{
                                     NoteBookCell *cell = [NoteBookCell configCell40:tableView indexPath:indexPath];
@@ -1974,9 +1968,9 @@
                                         [weakSelf.tableView reloadRowsAtIndexPaths:@[indexPath] withRowAnimation:UITableViewRowAnimationNone];
                                     }];
                                     cell.bottomView.hidden = YES;
-                            cell.bottomHeight.constant = 0.f;
-                            cell.selectionStyle = UITableViewCellSelectionStyleNone;
-                            return cell;
+                                    cell.bottomHeight.constant = 0.f;
+                                    cell.selectionStyle = UITableViewCellSelectionStyleNone;
+                                    return cell;
                                 }break;
                                 case 6:{
                                     NoteBookCell *cell = [NoteBookCell configCell40:tableView indexPath:indexPath];
@@ -2017,9 +2011,9 @@
                                         [weakSelf.tableView reloadRowsAtIndexPaths:@[indexPath] withRowAnimation:UITableViewRowAnimationNone];
                                     }];
                                     cell.bottomView.hidden = YES;
-                            cell.bottomHeight.constant = 0.f;
-                            cell.selectionStyle = UITableViewCellSelectionStyleNone;
-                            return cell;
+                                    cell.bottomHeight.constant = 0.f;
+                                    cell.selectionStyle = UITableViewCellSelectionStyleNone;
+                                    return cell;
                                 }break;
                                 case 7:{
                                     NoteBookCell *cell = [NoteBookCell configCell50:tableView indexPath:indexPath];
@@ -2064,9 +2058,9 @@
                                         [weakSelf.tableView reloadRowsAtIndexPaths:@[indexPath] withRowAnimation:UITableViewRowAnimationNone];
                                     }];
                                     cell.bottomView.hidden = YES;
-                            cell.bottomHeight.constant = 0.f;
-                            cell.selectionStyle = UITableViewCellSelectionStyleNone;
-                            return cell;
+                                    cell.bottomHeight.constant = 0.f;
+                                    cell.selectionStyle = UITableViewCellSelectionStyleNone;
+                                    return cell;
                                 }break;
                                 case 8:{
                                     NoteBookCell *cell = [NoteBookCell configCell50:tableView indexPath:indexPath];
@@ -2112,9 +2106,9 @@
                                         [weakSelf.tableView reloadRowsAtIndexPaths:@[indexPath] withRowAnimation:UITableViewRowAnimationNone];
                                     }];
                                     cell.bottomView.hidden = YES;
-                            cell.bottomHeight.constant = 0.f;
-                            cell.selectionStyle = UITableViewCellSelectionStyleNone;
-                            return cell;
+                                    cell.bottomHeight.constant = 0.f;
+                                    cell.selectionStyle = UITableViewCellSelectionStyleNone;
+                                    return cell;
                                 }break;
                                 default:{
                                     NoteBookCell *cell = [NoteBookCell configCell50:tableView indexPath:indexPath];
@@ -2161,9 +2155,9 @@
                                         [weakSelf.tableView reloadRowsAtIndexPaths:@[indexPath] withRowAnimation:UITableViewRowAnimationNone];
                                     }];
                                     cell.bottomView.hidden = YES;
-                            cell.bottomHeight.constant = 0.f;
-                            cell.selectionStyle = UITableViewCellSelectionStyleNone;
-                            return cell;
+                                    cell.bottomHeight.constant = 0.f;
+                                    cell.selectionStyle = UITableViewCellSelectionStyleNone;
+                                    return cell;
                                 }
                                     break;
                             }
@@ -2264,7 +2258,7 @@
                         cell.selectButton.hidden = YES;
                     }
                     cell.selectionStyle = UITableViewCellSelectionStyleNone;
-                            return cell;
+                    return cell;
                 }break;
             }
         }
@@ -2453,22 +2447,22 @@
     }
 }
 - (void)eidtorNoteBook:(MyNoteBookSubModel *)model{
-//    WS(weakSelf);
-//    [[HttpManager sharedHttpManager] GETUrl:[NSString stringWithFormat:@"%@%@%@",BaseUrl,API_NoteBook_Detail,@(model.MiddleId).stringValue] parameters:@{} responseStyle:JOSN success:^(id  _Nonnull responseObject) {
-//        MyTDTopicCreateVC * vc = [MyTDTopicCreateVC initMyTDTopicCreateVC];
-//        vc.type = weakSelf.TypeValue == 1 ? CollectModel_NewTopic : CollectModel_NoteBook;
-//        vc.FolderId = weakSelf.FolderId;
-//        vc.FolderName = model.FolderName;
-//        vc.Id = model.MiddleId;
-//        vc.isEdit = YES;
-//        [weakSelf.navigationController pushViewController:vc animated:YES];
-//    } failure:^(NSError * _Nonnull error) {
-//        SHOWERROR([ZYCTool handerResultData:error]);
-//    }];
+    //    WS(weakSelf);
+    //    [[HttpManager sharedHttpManager] GETUrl:[NSString stringWithFormat:@"%@%@%@",BaseUrl,API_NoteBook_Detail,@(model.MiddleId).stringValue] parameters:@{} responseStyle:JOSN success:^(id  _Nonnull responseObject) {
+    //        MyTDTopicCreateVC * vc = [MyTDTopicCreateVC initMyTDTopicCreateVC];
+    //        vc.type = weakSelf.TypeValue == 1 ? CollectModel_NewTopic : CollectModel_NoteBook;
+    //        vc.FolderId = weakSelf.FolderId;
+    //        vc.FolderName = model.FolderName;
+    //        vc.Id = model.MiddleId;
+    //        vc.isEdit = YES;
+    //        [weakSelf.navigationController pushViewController:vc animated:YES];
+    //    } failure:^(NSError * _Nonnull error) {
+    //        SHOWERROR([ZYCTool handerResultData:error]);
+    //    }];
     MyTDTopicCreateVC * vc = [MyTDTopicCreateVC initMyTDTopicCreateVC];
     vc.type = self.TypeValue == 1 ? CollectModel_NewTopic : CollectModel_NoteBook;
     vc.FolderId = self.FolderId;
-    vc.FolderName = model.FolderName;
+    vc.FolderName = self.myTitle;
     vc.Id = model.MiddleId;
     vc.isEdit = YES;
     [self.navigationController pushViewController:vc animated:YES];
@@ -2503,8 +2497,8 @@
                 }break;
                 default:
                 {
-//                    NoteDraftVC * vc = [NoteDraftVC initNoteDraftVC];
-//                    [self.navigationController pushViewController:vc animated:YES];
+                    //                    NoteDraftVC * vc = [NoteDraftVC initNoteDraftVC];
+                    //                    [self.navigationController pushViewController:vc animated:YES];
                 }
                     break;
             }
@@ -2964,18 +2958,12 @@
                 _currentPath=newIndexPath;
                 _orignY-=60;
             }
-            
         }
-        
     }else if(recognise.state==UIGestureRecognizerStateEnded){
-        
         [_cellImage removeFromSuperview];
         _cellImage=nil;
         _currentCell.hidden=NO;
-        
-        
     }
-    
 }
 //MARK:截图
 - (UIImage *)getImageWithCell:(UITableViewCell*)cell {
@@ -3027,7 +3015,7 @@
     MyNoteBookSubModel *model =  self.noteBookArray[indexPath.row];
     MyTDTopicDetailVC * vc = [MyTDTopicDetailVC initMyTDTopicDetailVC];
     vc.Id = model.MiddleId;
-    vc.type = CollectModel_NoteBook;
+    vc.type = self.TypeValue == 1 ? CollectModel_NewTopic : CollectModel_NoteBook;
     [self.navigationController pushViewController:vc animated:YES];
 }
 

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

@@ -35,7 +35,7 @@
 #import "MyTDGroupView.h"
 
 @interface OtherNoteBookVC ()<UITableViewDataSource,UITableViewDelegate,NoteBookShareVCDelegate>
-@property (strong, nonatomic) ZFReOrderTableView *reOrderView;
+@property (strong, nonatomic) UITableView     *tableView;
 @property (weak, nonatomic) IBOutlet UIView  *HeadView;
 @property (strong, nonatomic) MyTDGroupView             *SearchView;
 
@@ -56,8 +56,6 @@
 @property(strong,nonatomic)NSIndexPath *currentPath;
 @property(strong,nonatomic)MyFavoriteViewCell *currentCell;
 @property(assign,nonatomic)CGFloat orignY;
-@property (weak, nonatomic) IBOutlet UIView *threeLIneView;
-@property (weak, nonatomic) IBOutlet UIView *SearchTopView;
 
 @property (strong, nonatomic) NoteBookShareVC *noteBookShareVC;
 @property (strong, nonatomic) NoteBookCommentVC *noteBookCommentVC;
@@ -89,7 +87,7 @@
 #pragma mark - UItableView刷新
 - (void)setTableViewRefresh{
     WeakSelf(self)
-    self.reOrderView.tableView.mj_header = [MJRefreshNormalHeader headerWithRefreshingBlock:^{
+    self.tableView.mj_header = [MJRefreshNormalHeader headerWithRefreshingBlock:^{
         [weakself headRefresh];
     }];
     //    self.reOrderView.tableView.mj_footer = [MJRefreshBackStateFooter footerWithRefreshingBlock:^{
@@ -108,7 +106,7 @@
     self.currentPage += 1;
     if (self.totalPage == self.noteBookArray.count) {
         self.currentPage --;
-        [self.reOrderView.tableView.mj_footer resetNoMoreData];
+        [self.tableView.mj_footer resetNoMoreData];
         return ;
     }
     [self getDataList];
@@ -128,41 +126,51 @@
             }else{
                 [weakSelf.collectBtn setImage:IMG(@"my_collect") forState:UIControlStateNormal];
             }
-            [weakSelf.reOrderView.tableView.mj_header endRefreshing];
-            [weakSelf.reOrderView.tableView.mj_footer endRefreshing];
-            [weakSelf.reOrderView.tableView reloadData];
+            [weakSelf.tableView.mj_header endRefreshing];
+            [weakSelf.tableView.mj_footer endRefreshing];
+            [weakSelf.tableView reloadData];
         });
     } failure:^(NSError * _Nonnull error) {
         
     }];
 }
+- (UITableView *)tableView
+{
+    if (!_tableView) {
+        _tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain];
+        _tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
+    }
+    return _tableView;
+}
 - (void)viewDidLoad {
     [super viewDidLoad];
-    self.reOrderView = [[ZFReOrderTableView alloc] initWithFrame:CGRectZero withObjects:self.noteBookArray canReorder:YES];
-    self.reOrderView.tableView.delegate = self;
-    self.reOrderView.tableView.dataSource = self;
-    [self.view addSubview:self.reOrderView];
-    [self.reOrderView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.left.right.mas_equalTo(self.view);
-        make.top.mas_equalTo(self.SearchTopView.mas_bottom);
-        if (@available(iOS 11.0, *)) {
-            make.bottom.equalTo(self.view.mas_safeAreaLayoutGuideBottom);
-        } else {
-            make.bottom.equalTo(self.view.mas_bottom);
-        }
-        
-    }];
+
     [self.HeadView addSubview:self.SearchView];
     [self.SearchView  mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.top.mas_offset(6);
+        make.top.mas_offset(4);
         make.left.right.mas_equalTo(self.HeadView);
         make.height.mas_offset(36);        
     }];
     [self setTableViewRefresh];
-    self.reOrderView.tableView.showsVerticalScrollIndicator= NO;
     self.fd_prefersNavigationBarHidden = YES;
     self.collectBtn.hidden = NO;
     self.reSendBtn.hidden = NO;
+    
+    self.tableView.delegate = self;
+    self.tableView.dataSource = self;
+    [self.view addSubview:self.tableView];
+    [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.right.mas_equalTo(self.view);
+        make.top.mas_equalTo(self.HeadView.mas_bottom);
+        if (@available(iOS 11.0, *)) {
+            make.bottom.equalTo(self.view.mas_safeAreaLayoutGuideBottom);
+        } else {
+            make.bottom.equalTo(self.view.mas_bottom);
+        }
+        
+    }];
+    self.tableView.showsVerticalScrollIndicator= NO;
+    
     WS(weakSelf);
     [self.collectBtn setAction:^{
         if (weakSelf.IsCollect) {
@@ -196,8 +204,9 @@
             vc.titleStr = @"我的收藏";
             vc.TypeId = CreateCollectionType;
             vc.SourceUserId = weakSelf.VisitUserId;
+            vc.TypeValue = weakSelf.TypeValue;
             vc.FolderIds = @[].mutableCopy;
-            vc.CollectionType = CollectModel_NoteFile;
+            vc.CollectionType = weakSelf.TypeValue == 1 ? CollectModel_NewTopic : CollectModel_NoteFile;
             [weakSelf.navigationController pushViewController:vc animated:YES];
         }
     }];
@@ -205,7 +214,7 @@
         [weakSelf.noteBookShareVC initNoteBookShareData];
         FlowAttachmentsModel * model = [[FlowAttachmentsModel alloc] init];
         model.SoureId = weakSelf.FolderId;
-        model.SoureTypeId = CollectModel_NoteFile;
+        model.SoureTypeId = weakSelf.TypeValue == 1 ? CollectModel_NewTopic : CollectModel_NoteFile;
         model.SourceUserId = weakSelf.VisitUserId;
         model.Title = weakSelf.myTitle;
         model.Author = weakSelf.Author;
@@ -221,7 +230,7 @@
         [weakSelf.navigationController pushViewController:vc animated:YES];
     }];
     
-    [self.reOrderView.tableView setAllowsSelectionDuringEditing:YES];
+    [self.tableView setAllowsSelectionDuringEditing:YES];
     
     
     self.vcTitleLabel.text = self.myTitle;
@@ -1064,54 +1073,7 @@
     return _noteBookArray;
 }
 
-//MARK:-PAN GESTURE
-- (void)panReg:(UILongPressGestureRecognizer*)recognise{
-    CGPoint currentPoint = [recognise locationInView:self.view];
-    if (recognise.state==UIGestureRecognizerStateBegan) {
-        _orignY=currentPoint.y;
-        _currentPath = [self.reOrderView.tableView indexPathForRowAtPoint:currentPoint];
-        _currentCell=[self.reOrderView.tableView cellForRowAtIndexPath:_currentPath];
-        _currentCell.hidden=YES;
-        _cellImage=[UIImageView new];
-        _cellImage.image=[self getImageWithCell:_currentCell];
-        _cellImage.frame=CGRectMake(0,currentPoint.y-30, kGXScreenWidth, 60);
-        _cellImage.backgroundColor =[UIColor clearColor];
-        [self.view addSubview:_cellImage];
-        
-    }else if(recognise.state==UIGestureRecognizerStateChanged){
-        _cellImage.frame=CGRectMake(0, currentPoint.y-30, kGXScreenWidth, 60);
-        //判断方向
-        if (currentPoint.y>_orignY) {
-            if (currentPoint.y-_orignY>30) {
-                NSIndexPath *newIndexPath=[NSIndexPath indexPathForRow:_currentPath.row+1 inSection:0];
-                if(newIndexPath.row<self.noteBookArray.count){
-                    [self.reOrderView.tableView moveRowAtIndexPath:_currentPath toIndexPath:newIndexPath];
-                    _currentPath=newIndexPath;
-                    _orignY+=60;
-                }
-                
-            }
-            
-        }else{
-            if (_orignY-currentPoint.y>30) {
-                NSIndexPath *newIndexPath=[NSIndexPath indexPathForRow:_currentPath.row-1 inSection:0];
-                [self.reOrderView.tableView moveRowAtIndexPath:_currentPath toIndexPath:newIndexPath];
-                _currentPath=newIndexPath;
-                _orignY-=60;
-            }
-            
-        }
-        
-    }else if(recognise.state==UIGestureRecognizerStateEnded){
-        
-        [_cellImage removeFromSuperview];
-        _cellImage=nil;
-        _currentCell.hidden=NO;
-        
-        
-    }
-    
-}
+
 //MARK:截图
 - (UIImage *)getImageWithCell:(UITableViewCell*)cell {
     
@@ -1137,7 +1099,7 @@
     [dic setValue:@([AppUserModel sharedAppUserModel].Id) forKey:@"UserId"];
     [dic setValue:@(1) forKey:@"AnalyzeType"];//详情点赞
     [dic setValue:@(0) forKey:@"CommentId"];
-    [dic setValue:@(3) forKey:@"TypeValue"];//笔记 3
+    [dic setValue:self.TypeValue == 1 ? [NSNumber numberWithInt:-4] : [NSNumber numberWithInt:4] forKey:@"TypeValue"];//笔记 3
     WS(weakSelf);
     
     [[HttpManager sharedHttpManager] POSTUrl:Host(API_APP_Analyze_Set) parameters:dic responseStyle:DATA success:^(id  _Nonnull responseObject) {
@@ -1151,7 +1113,7 @@
             -- mdoel.PraiseCount;
         }
         dispatch_async(dispatch_get_main_queue(), ^{
-            [weakSelf.reOrderView.tableView reloadRow:indexPath.row inSection:indexPath.section withRowAnimation:UITableViewRowAnimationNone];
+            [weakSelf.tableView reloadRow:indexPath.row inSection:indexPath.section withRowAnimation:UITableViewRowAnimationNone];
         });
     } failure:^(NSError * _Nonnull error) {
         SHOWERROR([ZYCTool handerResultData:error]);
@@ -1291,7 +1253,7 @@
     MyNoteBookSubModel *model =  self.noteBookArray[indexPath.row];
     MyTDTopicDetailVC * vc = [MyTDTopicDetailVC initMyTDTopicDetailVC];
     vc.Id = model.MiddleId;
-    vc.type = CollectModel_NoteBook;
+    vc.type = self.TypeValue == 1 ? CollectModel_NewTopic : CollectModel_NoteBook;
     [self.navigationController pushViewController:vc animated:YES];
 }
 - (NoteBookCommentVC *)noteBookCommentVC{
@@ -1408,7 +1370,7 @@
     }else{
         MyTDGroupViewController * vc = [[MyTDGroupViewController alloc] init];
         FlowAttachmentsModel * model = [[FlowAttachmentsModel alloc] init];
-        model.SoureTypeId = CollectModel_NoteBook;
+        model.SoureTypeId = self.TypeValue == 1 ? CollectModel_NewTopic : CollectModel_NoteFile;
         model.Title = self.returnModel.Title;
         model.SoureId = self.returnModel.MiddleId;
         model.Author = self.returnModel.Name;
@@ -1422,7 +1384,7 @@
 {
     if (self.isSend) {
         MyTDTopicCreateVC * vc = [MyTDTopicCreateVC initMyTDTopicCreateVC];
-        vc.type = CollectModel_NoteBook;
+        vc.type = CollectModel_NoteFile;
         vc.sendModel = self.sendModel;
         vc.isReturn = YES;
         [self.navigationController pushViewController:vc animated:YES];
@@ -1430,7 +1392,7 @@
         MyTDTopicCreateVC * vc = [MyTDTopicCreateVC initMyTDTopicCreateVC];
         vc.type = CollectModel_NoteBook;
         FlowAttachmentsModel * model = [[FlowAttachmentsModel alloc] init];
-        model.SoureTypeId =  CollectModel_NoteBook;
+        model.SoureTypeId = self.TypeValue == 1 ? CollectModel_NewTopic : CollectModel_NoteFile;
         model.Title = self.returnModel.Title;
         model.SoureId = self.returnModel.MiddleId;
         model.Author = self.returnModel.Name;
@@ -1443,13 +1405,13 @@
     if (self.isSend) {
         MyTDTopicCreateVC * vc = [MyTDTopicCreateVC initMyTDTopicCreateVC];
         vc.sendModel = self.sendModel;
-        vc.type = CollectModel_NewTopic;
+        vc.type = CollectModel_NoteFile;
         vc.isReturn = YES;
         [self.navigationController pushViewController:vc animated:YES];
     }else{
         MyTDTopicCreateVC * vc = [MyTDTopicCreateVC initMyTDTopicCreateVC];
         FlowAttachmentsModel * model = [[FlowAttachmentsModel alloc] init];
-        model.SoureTypeId =  CollectModel_NoteBook;
+        model.SoureTypeId = self.TypeValue == 1 ? CollectModel_NewTopic : CollectModel_NoteFile;
         model.Title = self.returnModel.Title;
         model.SoureId = self.returnModel.MiddleId;
         model.Author = self.returnModel.Name;
@@ -1460,6 +1422,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)];
@@ -1472,6 +1437,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/NoteBook.storyboard

@@ -2030,42 +2030,28 @@
                                     <outlet property="height" destination="e1O-Bf-2Y8" id="S7T-f1-bRx"/>
                                 </connections>
                             </view>
-                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="FOK-mZ-L02">
-                                <rect key="frame" x="0.0" y="64" width="375" height="60"/>
-                                <subviews>
-                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="tFT-tj-Y7B">
-                                        <rect key="frame" x="0.0" y="15.5" width="375" height="29.5"/>
-                                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                        <constraints>
-                                            <constraint firstAttribute="height" constant="29.5" id="CMF-8r-pXa"/>
-                                        </constraints>
-                                    </view>
-                                </subviews>
-                                <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="tFT-tj-Y7B">
+                                <rect key="frame" x="0.0" y="64" width="375" height="44"/>
+                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <constraints>
-                                    <constraint firstAttribute="height" constant="60" id="OIK-0Z-XIK"/>
-                                    <constraint firstItem="tFT-tj-Y7B" firstAttribute="centerX" secondItem="FOK-mZ-L02" secondAttribute="centerX" id="k1J-aE-hhg"/>
-                                    <constraint firstItem="tFT-tj-Y7B" firstAttribute="centerY" secondItem="FOK-mZ-L02" secondAttribute="centerY" id="oEZ-nw-XVG"/>
-                                    <constraint firstItem="tFT-tj-Y7B" firstAttribute="leading" secondItem="FOK-mZ-L02" secondAttribute="leading" id="qvb-0l-Vur"/>
-                                    <constraint firstAttribute="trailing" secondItem="tFT-tj-Y7B" secondAttribute="trailing" id="yV1-Er-lfE"/>
+                                    <constraint firstAttribute="height" constant="44" id="qwE-iU-KTy"/>
                                 </constraints>
                             </view>
                         </subviews>
                         <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
                         <constraints>
+                            <constraint firstItem="tFT-tj-Y7B" firstAttribute="leading" secondItem="uyr-Hk-WlE" secondAttribute="leading" id="6nM-Jk-tGv"/>
                             <constraint firstItem="RLt-FL-bYK" firstAttribute="top" secondItem="gwE-dV-goI" secondAttribute="top" id="JA6-u2-0AQ"/>
-                            <constraint firstItem="FOK-mZ-L02" firstAttribute="leading" secondItem="gwE-dV-goI" secondAttribute="leading" id="NNf-9j-lJn"/>
                             <constraint firstItem="RLt-FL-bYK" firstAttribute="trailing" secondItem="uyr-Hk-WlE" secondAttribute="trailing" id="PmJ-uU-mC1"/>
-                            <constraint firstItem="FOK-mZ-L02" firstAttribute="top" secondItem="RLt-FL-bYK" secondAttribute="bottom" id="THz-ok-piw"/>
+                            <constraint firstItem="tFT-tj-Y7B" firstAttribute="trailing" secondItem="uyr-Hk-WlE" secondAttribute="trailing" id="Rf0-7i-l0l"/>
                             <constraint firstItem="RLt-FL-bYK" firstAttribute="leading" secondItem="uyr-Hk-WlE" secondAttribute="leading" id="hmB-zF-4Hm"/>
-                            <constraint firstItem="uyr-Hk-WlE" firstAttribute="trailing" secondItem="FOK-mZ-L02" secondAttribute="trailing" id="mMb-F4-aYC"/>
+                            <constraint firstItem="tFT-tj-Y7B" firstAttribute="top" secondItem="RLt-FL-bYK" secondAttribute="bottom" id="jxd-fc-Bdx"/>
                         </constraints>
                         <viewLayoutGuide key="safeArea" id="uyr-Hk-WlE"/>
                     </view>
                     <navigationItem key="navigationItem" id="xRn-sx-9tX"/>
                     <connections>
                         <outlet property="HeadView" destination="tFT-tj-Y7B" id="Ydb-1V-Cbp"/>
-                        <outlet property="SearchTopView" destination="FOK-mZ-L02" id="Svb-sp-Z0f"/>
                         <outlet property="collectBtn" destination="gE0-M7-O7r" id="16R-AU-uTy"/>
                         <outlet property="reSendBtn" destination="hXo-4i-Vha" id="Rv2-gA-RtK"/>
                         <outlet property="vcTitleLabel" destination="6s5-iv-aAp" id="uxE-dC-icw"/>

smartRhino/Project/VCModel/WorkFlow/AddLookUpUserSecondVC.m

@@ -25,6 +25,7 @@
 @property (nonatomic, strong) UIView *listHeaderVIew;
 @property (nonatomic, strong) TDButton *serachButton;
 @property (nonatomic, strong) AddressBookGroupModel *addressBookModel;
+@property (nonatomic, strong) MyTDGroupView         *searchView;
 @property (nonatomic,assign) NSInteger indexflag;
 @property (nonatomic, strong) NSMutableArray <SelectModel*>*selectArray;
 @property (nonatomic, strong) NSMutableArray <Department *>*selectDepartArray;
@@ -53,6 +54,7 @@
         make.top.mas_equalTo(self.myNavigationBar.mas_bottom);
         make.height.mas_offset(44);
     }];
+    [self.listHeaderVIew addSubview:self.searchView];
     [self addSortV];
     [self.view addSubview:self.myTableView];
     [self.myTableView mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -61,12 +63,11 @@
         make.bottom.mas_equalTo(self.view.mas_safeAreaLayoutGuideBottom);
     }];
     WS(weakSelf);
-    UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithActionBlock:^(id  _Nonnull sender) {
+    [self.searchView.button setAction:^{
         MailGroupListSerachVC *vc = [[MailGroupListSerachVC alloc] init];
         vc.IsSelect = YES;
         [weakSelf.navigationController pushViewController:vc animated:YES];
     }];
-    [self.listHeaderVIew addGestureRecognizer:tap];
     self.fd_prefersNavigationBarHidden = YES;
     self.view.backgroundColor = UIColorHex(#FFFFFF);
     self.myTableView.backgroundColor =  UIColorHex(#F5F6F8);
@@ -229,11 +230,16 @@
     if (!_listHeaderVIew) {
         _listHeaderVIew = [UIView new];
         _listHeaderVIew.backgroundColor = UIColorHex(#FFFFFF);
-        MyTDGroupView * groupView = [[MyTDGroupView alloc] initWithFrame:CGRectMake(0, 4, SCREEN_WIDTH, 36)];
-        [_listHeaderVIew addSubview:groupView];
     }
     return _listHeaderVIew;
 }
+- (MyTDGroupView *)searchView
+{
+    if (!_searchView) {
+        _searchView = [[MyTDGroupView alloc] initWithFrame:CGRectMake(0, 4, SCREEN_WIDTH, 36)];
+    }
+    return _searchView;
+}
 - (TDButton *)serachButton{
     if (!_serachButton) {
         _serachButton = [[TDButton alloc]initWithFrame:CGRectMake(20,5, kGXScreenWidth-40,40)];

smartRhino/Project/VCModel/WorkFlow/MeetingModel/MeetingDataModel.h

@@ -12,6 +12,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface MeetingDataModel : BaseModel
 @property (nonatomic, assign) NSInteger    time;
+@property (nonatomic, copy) NSString     * Name;
 @property (nonatomic, assign) BOOL         IsUse;
 @property (nonatomic, assign) BOOL         IsSelect;
 @end

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

@@ -101,9 +101,13 @@
             MeetingDataModel * model = array[j];
             for (NSDictionary * dict in allList) {
                 if ([dict[@"TimeKey"] integerValue] == redTime) {
-                    for (id value in dict[@"TimeValues"]) {
-                        if (([value integerValue] - 7) == model.time) {
-                            model.IsUse = NO;
+                    for (id value in dict[@"NewTimeValues"]) {
+                        if ([value isKindOfClass:[NSDictionary class]]) {
+                            if (([value[@"Key"] integerValue] - 7) == model.time) {
+                                model.IsUse = NO;
+                                
+                                model.Name = value[@"Value"];
+                            }
                         }
                     }
                 }
@@ -117,10 +121,13 @@
             MeetingDataModel * model = array[j];
             for (NSDictionary * dict in list) {
                 if ([dict[@"TimeKey"] integerValue] == redTime) {
-                    for (id value in dict[@"TimeValues"]) {
-                        if (([value integerValue] - 7) == model.time) {
-                            model.IsUse = YES;
-                            model.IsSelect = YES;
+                    for (id value in dict[@"NewTimeValues"]) {
+                        if ([value isKindOfClass:[NSDictionary class]]) {
+                            if (([value[@"Key"] integerValue] - 7) == model.time) {
+                                model.IsUse = YES;
+                                model.IsSelect = YES;
+                                //                                model.Name = value[@"Value"];
+                            }
                         }
                     }
                 }

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

@@ -26,11 +26,15 @@
         if (model.IsUse) {
             if (model.IsSelect) {
                 [self.confirmButton setBackgroundColor:[UIColor colorWithHexString:@"75D49D"]];
+                [self.confirmButton setTitle:model.Name forState:UIControlStateNormal];
+                [self.confirmButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
             }else{
                 [self.confirmButton setBackgroundColor:[UIColor whiteColor]];
             }
         }else{
             [self.confirmButton setBackgroundColor:[UIColor colorWithHexString:@"FF7E7E"]];
+            [self.confirmButton setTitle:model.Name forState:UIControlStateNormal];
+            [self.confirmButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
         }
     }
 }

smartRhino/Project/VCModel/WorkFlow/MyWorkFlowListController.m

@@ -50,13 +50,16 @@
 #pragma mark - reload
 - (void)reloadData {
     [self.dataSource removeAllObjects];
+    WS(weakSelf);
     [[HttpManager sharedHttpManager] GETWithUrl:Host(MeetingCurrentList) parameters:@{} success:^(id  _Nonnull responseObject) {
-        self.dataSource = [NSArray modelArrayWithClass:[MyMeetingListModel class] json:responseObject].mutableCopy;
+        weakSelf.dataSource = [NSArray modelArrayWithClass:[MyMeetingListModel class] json:responseObject].mutableCopy;
         //添加一个历史记录
         MyMeetingListModel *historicalModel = [[MyMeetingListModel alloc] init];
         historicalModel.Name = @"历史记录";
-        [self.dataSource addObject:historicalModel];
-        [self.myWorkFlowTabView reloadData];
+        [weakSelf.dataSource addObject:historicalModel];
+        dispatch_async(dispatch_get_main_queue(), ^{
+            [weakSelf.myWorkFlowTabView reloadData];
+        });
     } failure:^(NSError * _Nonnull error) {
         SHOWERROR([ZYCTool handerResultData:error]);
     }];