no message

smartRhino.xcodeproj/project.pbxproj

@@ -1380,6 +1380,7 @@
 		EBFDFE4C247762280046E847 /* BookSelectCollectCell.m in Sources */ = {isa = PBXBuildFile; fileRef = EBFDFE4A247762280046E847 /* BookSelectCollectCell.m */; };
 		EBFDFE4D247762280046E847 /* BookSelectCollectCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = EBFDFE4B247762280046E847 /* BookSelectCollectCell.xib */; };
 		EBFDFE50247778CC0046E847 /* BookSelectModel.m in Sources */ = {isa = PBXBuildFile; fileRef = EBFDFE4F247778CC0046E847 /* BookSelectModel.m */; };
+		EBFE261824D934CA00FC4A10 /* NoteDraftVC.m in Sources */ = {isa = PBXBuildFile; fileRef = EBFE261724D934CA00FC4A10 /* NoteDraftVC.m */; };
 		EBFF89BC24CC102D00018E76 /* CommomSearchVC.m in Sources */ = {isa = PBXBuildFile; fileRef = EBFF89BA24CC102D00018E76 /* CommomSearchVC.m */; };
 		EBFFE22924234238008D4312 /* OtherFavoriteVC.m in Sources */ = {isa = PBXBuildFile; fileRef = EBFFE22824234238008D4312 /* OtherFavoriteVC.m */; };
 /* End PBXBuildFile section */
@@ -3771,6 +3772,8 @@
 		EBFDFE4B247762280046E847 /* BookSelectCollectCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = BookSelectCollectCell.xib; sourceTree = "<group>"; };
 		EBFDFE4E247778CC0046E847 /* BookSelectModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BookSelectModel.h; sourceTree = "<group>"; };
 		EBFDFE4F247778CC0046E847 /* BookSelectModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BookSelectModel.m; sourceTree = "<group>"; };
+		EBFE261624D934CA00FC4A10 /* NoteDraftVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NoteDraftVC.h; sourceTree = "<group>"; };
+		EBFE261724D934CA00FC4A10 /* NoteDraftVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = NoteDraftVC.m; sourceTree = "<group>"; };
 		EBFF89BA24CC102D00018E76 /* CommomSearchVC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CommomSearchVC.m; sourceTree = "<group>"; };
 		EBFF89BB24CC102D00018E76 /* CommomSearchVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CommomSearchVC.h; sourceTree = "<group>"; };
 		EBFFE22724234238008D4312 /* OtherFavoriteVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OtherFavoriteVC.h; sourceTree = "<group>"; };
@@ -5576,7 +5579,6 @@
 		C76DB429236ACAF300369F5C /* VC */ = {
 			isa = PBXGroup;
 			children = (
-				EB7955C824C6959700EE9A55 /* TopicBook */,
 				C76DB42D236ACB4B00369F5C /* MyTDTopicViewController.h */,
 				C76DB42E236ACB4B00369F5C /* MyTDTopicViewController.m */,
 				EB0F64C323A9DA2B00AD56A0 /* MyTDTopicGroupManageVC.h */,
@@ -6406,6 +6408,7 @@
 				C7D6B9E4235DA18700770E7C /* Project */,
 				C7D6BAD7235DA18800770E7C /* SmartRhino-Prefix.pch */,
 				C6F2E1F1236D1794009E6903 /* WclAppConfig.h */,
+				EB7955C824C6959700EE9A55 /* TopicBook */,
 				C7CA60A8237310010062B8B8 /* FwzAppConfig.h */,
 				C59D0A4923824E80007D0760 /* PhbAppConfig.h */,
 				C74BCC84238FC39000169982 /* smartRhino-Bridging-Header.h */,
@@ -8727,6 +8730,8 @@
 				EBE5EF182459478A00AD59C4 /* CommonToolMoveVC.m */,
 				EBE5EF1A2459645800AD59C4 /* CommonNoteVC.h */,
 				EBE5EF1B2459645800AD59C4 /* CommonNoteVC.m */,
+				EBFE261624D934CA00FC4A10 /* NoteDraftVC.h */,
+				EBFE261724D934CA00FC4A10 /* NoteDraftVC.m */,
 			);
 			path = Controller;
 			sourceTree = "<group>";
@@ -9316,6 +9321,7 @@
 				EBE36C4723A863FC002BE674 /* NewTopicTextView.m in Sources */,
 				C7D6BBA0235DA18A00770E7C /* UIView+Frame.m in Sources */,
 				C7954B4A237E799200EDC479 /* AddressBookGroupModel.m in Sources */,
+				EBFE261824D934CA00FC4A10 /* NoteDraftVC.m in Sources */,
 				C625AABE237000010010E967 /* WorkingGroupMainVC.m in Sources */,
 				C69A8DC72373AB470098FA26 /* MailListDetailVC.m in Sources */,
 				EB1E0F77246CE49100D4C3DE /* BookContentNavVC.m in Sources */,

smartRhino/AppDelegate.m

@@ -137,14 +137,13 @@
 }
 
 - (void)applicationWillResignActive:(UIApplication *)application {
-    // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
-    // Use this method to pause ongoing tasks, disable timers, and invalidate graphics rendering callbacks. Games should use this method to pause the game.
+    NSLog(@"applicationWillResignActive");
+//    [[NSNotificationCenter defaultCenter] postNotificationName:NOTEBOOKSAVE object:nil];
 }
 
 
 - (void)applicationDidEnterBackground:(UIApplication *)application {
-    // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
-    // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
+    NSLog(@"applicationDidEnterBackground");
 }
 
 
@@ -154,12 +153,12 @@
 
 
 - (void)applicationDidBecomeActive:(UIApplication *)application {
-    // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
+    NSLog(@"applicationDidBecomeActive");
 }
 
 
 - (void)applicationWillTerminate:(UIApplication *)application {
-    // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
+    NSLog(@"applicationWillTerminate");
 }
 #pragma mark - 极光
 - (void)settingPush:(NSDictionary *)launchOptions {

smartRhino/Assets.xcassets/我的/Draft_Icon.imageset/Contents.json

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

smartRhino/FwzAppConfig.h

@@ -62,6 +62,8 @@ typedef enum CreateFileFolderType {
     CreateCollectionType = 3,
     ///4笔记
     CreateNotesType = 4,
+    ///- 4话题本
+    CreateNewTopicType = -4,
     ///5 普通站内信
     CreateCommonType = 5,
     ///6匿名站内信
@@ -451,4 +453,5 @@ typedef enum MediaType{
 #define NOTIFI_SELECTCREATENOTEFOLDER @"NOTIFI_SELECTCREATENOTEFOLDER"
 #define BOOKMUSICSELECTARRAY   @"BOOKMUSICSELECTARRAY"
 #define NEWFILESUCCESS         @"NEWFILESUCCESS"
+#define NOTEBOOKSAVE           @"NOTEBOOKSAVE"
 #endif /* FwzAppConfig_h */

smartRhino/PhbAppConfig.h

@@ -136,6 +136,9 @@
 #define API_NoteBook @"/api/app/note/search"
 #define API_Note_List @"/api/app/note/list"
 
+#define API_APP_Note_Draft_List @"/api/app/note/draft-list"
+
+
 #define API_NoteBook_Detail @"/api/app/note/"
 #define API_NoteBook_ZanList @"/api/app/note/praise-page"
 #define API_NoteBook_Zan  @"/api/app/note/laud"

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

@@ -67,7 +67,8 @@
 }
 -(void)back1{
     for ( NSInteger i = (self.navigationController.viewControllers.count - 1); i > 0 ;i --) {
-        if ([self.navigationController.viewControllers[i] isKindOfClass:NSClassFromString(@"TDGroupInfoListVC")]) {
+        if ([self.navigationController.viewControllers[i] isKindOfClass:NSClassFromString(@"TDGroupInfoListVC")]
+            ||[self.navigationController.viewControllers[i] isKindOfClass:NSClassFromString(@"MailListByZuVC")]) {
             [self.navigationController popToViewController:self.navigationController.viewControllers[i] animated:YES];
             return;
         }

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

@@ -665,6 +665,9 @@
             if ([dataArray.firstObject boolValue]) {
                 MailListCell *cell = [MailListCell configCell0:tableView indexPath:indexPath];
                 cell.cell0TitleLabel.text = titleStr;
+                if (self.pinyinArray.count > 0) {
+                    cell.rightConstant.constant = 0.f;
+                }
                 NSLog(@"====%@",titleStr);
                 return cell;
             }else{
@@ -1101,6 +1104,7 @@
                     model.UserName = dic[@"UserName"];
                     model.UserId = [dic[@"UserId"] integerValue];
                     model.Id = [dic[@"Id"] integerValue];
+                    model.AvatarUrl = dic[@"AvatarUrl"];
                     [strongSelf.nameModelArray addObject:model];
                 }
                 if (strongSelf.nameArray.count == 0) {

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

@@ -401,6 +401,9 @@
     if (indexPath.section <= (self.dataSourceArray.count - 1)) {
         MailModel * model = self.dataSourceArray[indexPath.section];
         MailListCell *cell = [MailListCell configCell0:tableView indexPath:indexPath];
+        if (self.pinyinArray.count > 0) {
+            cell.rightConstant.constant = 0.f;
+        }
         MailSubModel * sModel = [model.Items objectAtIndex:indexPath.row];
         [cell setDataModel:sModel];
         return cell;

smartRhino/Project/VCModel/ChatMessage/Controller/MailList/View/MailListCell.h

@@ -19,6 +19,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (weak, nonatomic) IBOutlet UIView *editorVIew;
 @property (weak, nonatomic) IBOutlet UILabel *countL;
 @property (weak, nonatomic) IBOutlet UIButton *selectBtn;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *rightConstant;
 
 @property (weak,nonatomic) IBOutlet UIView *cell1SearchBgView;
 @property (weak,nonatomic) IBOutlet UIButton *cell1SearchButton;

smartRhino/Project/VCModel/ChatMessage/Controller/MailList/View/MailListCell.xib

@@ -23,8 +23,8 @@
                         <color key="textColor" red="0.039215686270000001" green="0.039215686270000001" blue="0.039215686270000001" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
-                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="my_conter_rightArrow_hui_icon" translatesAutoresizingMaskIntoConstraints="NO" id="EOM-XB-NQJ">
-                        <rect key="frame" x="297.5" y="18" width="7.5" height="14"/>
+                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="chatmsg_rightArrow_icon" translatesAutoresizingMaskIntoConstraints="NO" id="EOM-XB-NQJ">
+                        <rect key="frame" x="298.5" y="19" width="6.5" height="12"/>
                     </imageView>
                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="UGY-TQ-5ZY">
                         <rect key="frame" x="15" y="49.5" width="305" height="0.5"/>
@@ -34,7 +34,7 @@
                         </constraints>
                     </view>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="DlQ-3W-LsB">
-                        <rect key="frame" x="285.5" y="17.5" width="8" height="15"/>
+                        <rect key="frame" x="286.5" y="17.5" width="8" height="15"/>
                         <fontDescription key="fontDescription" type="system" pointSize="12"/>
                         <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
@@ -57,6 +57,7 @@
                 <outlet property="cell0TitleLabel" destination="NI3-gy-CTW" id="SN0-VZ-e63"/>
                 <outlet property="cell1SearchButton" destination="imM-dP-KU6" id="gIA-jC-zP1"/>
                 <outlet property="countL" destination="DlQ-3W-LsB" id="EI7-By-ckZ"/>
+                <outlet property="rightConstant" destination="FBI-GY-cYY" id="Cfn-wB-1q0"/>
                 <outlet property="rightView" destination="EOM-XB-NQJ" id="cC3-8D-dCs"/>
             </connections>
             <point key="canvasLocation" x="131.8840579710145" y="132.58928571428572"/>
@@ -163,8 +164,8 @@
                         <color key="textColor" red="0.039215686270000001" green="0.039215686270000001" blue="0.039215686270000001" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
-                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="my_conter_rightArrow_hui_icon" translatesAutoresizingMaskIntoConstraints="NO" id="vh7-pM-sOo">
-                        <rect key="frame" x="297.5" y="18" width="7.5" height="14"/>
+                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="chatmsg_rightArrow_icon" translatesAutoresizingMaskIntoConstraints="NO" id="vh7-pM-sOo">
+                        <rect key="frame" x="298.5" y="19" width="6.5" height="12"/>
                     </imageView>
                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="1qa-Wc-WOh">
                         <rect key="frame" x="48" y="49.5" width="272" height="0.5"/>
@@ -174,7 +175,7 @@
                         </constraints>
                     </view>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="KBl-u4-iBa">
-                        <rect key="frame" x="285.5" y="17.5" width="8" height="15"/>
+                        <rect key="frame" x="286.5" y="17.5" width="8" height="15"/>
                         <fontDescription key="fontDescription" type="system" pointSize="12"/>
                         <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
@@ -211,7 +212,7 @@
         </tableViewCell>
     </objects>
     <resources>
-        <image name="my_conter_rightArrow_hui_icon" width="7.5" height="14"/>
+        <image name="chatmsg_rightArrow_icon" width="6.5" height="12"/>
         <image name="sendinfo_no" width="38" height="38"/>
         <image name="sendinfo_yes" width="38" height="38"/>
         <image name="sousuo" width="17" height="16.5"/>

smartRhino/Project/VCModel/Home/OtherHomeVC/MyTDTopic/Model/TopicBookModel.h

@@ -15,6 +15,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, assign) NSInteger      RoleId;
 @property (nonatomic, assign) NSInteger      FileCount;
 @property (nonatomic, assign) BOOL        IsTop;
+@property (nonatomic, assign) BOOL        IsDraft;
 @property (nonatomic, assign) BOOL        IsFolder;
 @property (nonatomic, assign) BOOL        IsSelect;
 @property (nonatomic, assign) BOOL        IsSystemDefault;

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

@@ -333,6 +333,7 @@
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(recviveChaoSongRen:) name:NOTIFI_ChaoSongRen object:nil];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(selectFolder:) name:NOTIFI_SELECTCREATENOTEFOLDER object:nil];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(newFileSuccess:) name:NEWFILESUCCESS object:nil];
+//    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(SaveNoteBook:) name:NOTEBOOKSAVE object:nil];
 }
 - (void)selectMailType
 {
@@ -360,7 +361,7 @@
 - (void)getTopicDefault
 {
     WS(weakSelf);
-    NSString * url = [NSString stringWithFormat:@"%@%d",Host(API_APP_Middle_Enjoy_Defaul),21];
+    NSString * url = [NSString stringWithFormat:@"%@%d",Host(API_APP_Middle_Enjoy_Defaul),-4];
     [[HttpManager sharedHttpManager] GETUrl:url parameters:@{} responseStyle:JOSN success:^(id  _Nonnull responseObject) {
         dispatch_async(dispatch_get_main_queue(), ^{
             NSInteger MiddleId = [[responseObject objectForKey:@"MiddleId"] integerValue];
@@ -417,6 +418,10 @@
         [self setSelectTopicBook:title];
     }
 }
+//- (void)SaveNoteBook:(NSNotification *)noti
+//{
+//    NSLog(@"SaveNoteBook");
+//}
 - (void)selectFolder:(NSNotification *)noti
 {
     NSDictionary * dict = noti.userInfo;

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

@@ -273,7 +273,14 @@
     self.webView.navigationDelegate = self;
     self.webView.scrollView.delegate = self;
     [self headRefresh];
-
+    UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithActionBlock:^(id  _Nonnull sender) {
+        if (weakSelf.currentNoteModel.UserId == [AppUserModel sharedAppUserModel].Id) {
+            [weakSelf editorButtonHander];
+        }
+    }];
+    [self.webView addGestureRecognizer:tap];
+    self.webView.userInteractionEnabled = YES;
+    tap.numberOfTouchesRequired = 2;
 //    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(menuShow) name:UIMenuControllerDidShowMenuNotification object:nil];
 //
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(collectSuccess) name:COLLECTSUCCESS object:nil];
@@ -386,6 +393,7 @@
                         dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
                             [[HttpManager sharedHttpManager] PUTUrl:Host(API_CreateCollect) parameters:dic success:^(id  _Nonnull responseObject) {
                                 [weakSelf refreshData];
+                                weakSelf.IsCollect = NO;
                             } failure:^(NSError * _Nonnull error) {
                                 //                    SHOWERROR([ZYCTool handerResultData:error]);
                             }];
@@ -1932,7 +1940,7 @@
     vc.collectType = CollectHanderType_Collect;
     vc.ParentId = 0;
     vc.titleStr = @"我的收藏";
-    vc.TypeId =  CreateCollectionType;
+    vc.TypeId = CreateCollectionType;
     vc.FolderIds = @[].mutableCopy;
     //    收藏类型 1文章 2话题 3 收藏 4笔记 5通知 6站内信 7小组 8 会议详情 14工作流审批 300 文件 400 会议纪要
     switch (self.type) {
@@ -1951,7 +1959,13 @@
 }
 - (void)collectSuccess
 {
+    NSString *jsonString = [NSString stringWithFormat:@"showCollection('%d')",1];
+    [self.webView evaluateJavaScript:jsonString completionHandler:^(id _Nullable data, NSError * _Nullable error) {
+        NSLog(@"data:%@",data);
+        NSLog(@"error:%@",error);
+    }];
     [self refreshData];
+    self.IsCollect = YES;
 }
 - (NSMutableArray<MyNoteBookCommentSubModel *> *)commentArray{
     if (!_commentArray) {
@@ -2282,7 +2296,7 @@
         [self editorButtonHander];
     }
     if ([message.name isEqualToString:@"postTopicDetailsData"]) {
-        NSString *jsonString = [NSString stringWithFormat:@"getData('%ld','%@','%ld')",(long)self.Id,USERDEFAULTSGET(@"LOGINTOKEN"),(long)self.type];
+        NSString *jsonString = [NSString stringWithFormat:@"getData('%ld','%@','%ld','%ld')",(long)self.Id,USERDEFAULTSGET(@"LOGINTOKEN"),(long)self.type,[AppUserModel sharedAppUserModel].Id];
         [self.webView evaluateJavaScript:jsonString completionHandler:^(id _Nullable data, NSError * _Nullable error) {
             NSLog(@"data:%@",data);
             NSLog(@"error:%@",error);
@@ -2343,6 +2357,7 @@
                     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
                         [[HttpManager sharedHttpManager] PUTUrl:Host(API_CreateCollect) parameters:dic success:^(id  _Nonnull responseObject) {
                             [weakSelf refreshData];
+                            weakSelf.IsCollect = NO;
                             NSString *jsonString = [NSString stringWithFormat:@"showCollection('%d')",0];
                             [weakSelf.webView evaluateJavaScript:jsonString completionHandler:^(id _Nullable data, NSError * _Nullable error) {
                                 NSLog(@"data:%@",data);

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

@@ -462,7 +462,7 @@
                 MyFavoriteNewFindVC *vc = [MyFavoriteNewFindVC initMyFavoriteNewFindVC];
                 vc.ParentId = weakSelf.FolderId;
                 vc.roleId = weakSelf.RoleId;
-                vc.createFoldType = CreateNotesType;
+                vc.createFoldType = weakSelf.TypeValue == 1 ? CreateNewTopicType : CreateNotesType;
                 vc.modifyTye = CreateType;
                 if (weakSelf.isSubVC) {
                     vc.fileType = NewNotFileType;
@@ -477,7 +477,7 @@
             }else if ([@"共享范围" isEqualToString:action.title]){
                 MyFavoriteNewFindVC *vc = [MyFavoriteNewFindVC initMyFavoriteNewFindVC];
                 vc.ParentId = weakSelf.FolderId;
-                vc.createFoldType = CreateNotesType;
+                vc.createFoldType = weakSelf.TypeValue == 1 ? CreateNewTopicType : CreateNotesType;
                 vc.foldId = weakSelf.FolderId;
                 vc.roleId = weakSelf.RoleId;
                 vc.modifyTye = ModifyType;
@@ -2434,7 +2434,7 @@
                 case 1:{
                     MyTDTopicDetailVC * vc = [MyTDTopicDetailVC initMyTDTopicDetailVC];
                     vc.Id = model.MiddleId;
-                    vc.type = CollectModel_NoteBook;
+                    vc.type = self.TypeValue == 1 ? CollectModel_NewTopic : CollectModel_NoteBook;
                     vc.isNoteBook = YES;
                     [self.navigationController pushViewController:vc animated:YES];
                 }break;
@@ -2559,7 +2559,7 @@
 /// 移动
 - (void)launchMoveVC:(NSMutableArray<NSNumber*>*)selectIDArray{
     MoveViewController * vc = [MoveViewController initMoveViewController];
-    vc.TypeId = CreateNotesType;
+    vc.TypeId = self.TypeValue == 1 ? CreateNewTopicType : CreateNotesType;
     vc.collectType = CollectHanderType_Move;
     vc.ParentId = 0;
     vc.titleStr = @"移动到";
@@ -2746,7 +2746,7 @@
     WS(weakSelf);
     NSArray * sArray = [self getSelectData];
     NSLog(@"%@",@{@"FolderId":@(self.FolderId),@"Page":@(self.currentPage),@"PerPage":@(10),@"VisitUserId":@(self.VisitUserId)});
-    [[HttpManager sharedHttpManager] POSTUrl:Host(API_NoteBook) parameters:@{@"FolderId":@(self.FolderId),@"Page":@(self.currentPage),@"PerPage":@(10),@"VisitUserId":@(self.VisitUserId),@"SearchKey":@"",@"Sort":@""} responseStyle:JOSN success:^(id  _Nonnull responseObject) {
+    [[HttpManager sharedHttpManager] POSTUrl:Host(API_NoteBook) parameters:@{@"FolderId":@(self.FolderId),@"Page":@(self.currentPage),@"PerPage":@(10),@"VisitUserId":@(self.VisitUserId),@"SearchKey":@"",@"Sort":@"",@"TypeValue":@(self.TypeValue)} responseStyle:JOSN success:^(id  _Nonnull responseObject) {
         NSLog(@"笔记列表数据 %@",responseObject);
         MyNoteBookModel *listModel = [[MyNoteBookModel alloc] initWithDictionary:responseObject error:nil];
         weakSelf.totalPage = listModel.Total;
@@ -2789,7 +2789,7 @@
     }
     NSMutableDictionary *dic = [[NSMutableDictionary alloc]init];
     [dic setValue:MiddleIds forKey:@"MiddleIds"];
-    [dic setValue:@(4) forKey:@"FolderType"];
+    [dic setValue:self.TypeValue == 1 ? [NSNumber numberWithInt:-4] : [NSNumber numberWithInt:4] forKey:@"FolderType"];
     
     WEAKSELF
     [[HttpManager sharedHttpManager] POSTUrl:Host(API_Find_DeleteRecord) parameters:dic responseStyle:DATA success:^(id  _Nonnull responseObject) {
@@ -2950,7 +2950,7 @@
     [dic setValue:@([AppUserModel sharedAppUserModel].Id) forKey:@"UserId"];
     [dic setValue:@(1) forKey:@"AnalyzeType"];//详情点赞
     [dic setValue:@(0) forKey:@"CommentId"];
-    [dic setValue:@(4) forKey:@"TypeValue"];//笔记 4
+    [dic setValue:self.TypeValue == 1 ? [NSNumber numberWithInt:-4] : [NSNumber numberWithInt:4] forKey:@"TypeValue"];//笔记 4
     WS(weakSelf);
     
     [[HttpManager sharedHttpManager] POSTUrl:Host(API_APP_Analyze_Set) parameters:dic responseStyle:DATA success:^(id  _Nonnull responseObject) {

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

@@ -192,6 +192,7 @@
         redL.font = Kfont(11);
         redL.textColor = UIColorHex(0xFFFFFF);
         redL.backgroundColor = [UIColor redColor];
+        redL.hidden = self.PraiseCount == 0 ? YES : NO;
         redL.text = [NSString stringWithFormat:@"%ld",self.PraiseCount];
         redL.textAlignment = NSTextAlignmentCenter;
         [view addSubview:redL];

smartRhino/Project/VCModel/common/Common.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"/>
@@ -525,6 +525,106 @@
             </objects>
             <point key="canvasLocation" x="-265.21739130434787" y="795.6521739130435"/>
         </scene>
+        <!--Note DraftVC-->
+        <scene sceneID="dQg-jR-Wff">
+            <objects>
+                <viewController storyboardIdentifier="NoteDraftVC" id="532-Yx-Ghr" customClass="NoteDraftVC" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="eGp-od-DGm">
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="tSd-kK-m6i" customClass="WQNavigationBar">
+                                <rect key="frame" x="0.0" y="0.0" width="414" height="64"/>
+                                <subviews>
+                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ief-he-wrx">
+                                        <rect key="frame" x="0.0" y="20" width="414" height="44"/>
+                                        <subviews>
+                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="2TO-Po-bNF">
+                                                <rect key="frame" x="0.0" y="0.0" width="50" height="44"/>
+                                                <constraints>
+                                                    <constraint firstAttribute="width" constant="50" id="E0T-pe-HwR"/>
+                                                    <constraint firstAttribute="height" constant="44" id="dHI-RZ-skK"/>
+                                                </constraints>
+                                                <state key="normal" image="back_black_icon"/>
+                                                <connections>
+                                                    <action selector="backAction:" destination="532-Yx-Ghr" eventType="touchUpInside" id="6ER-fS-137"/>
+                                                </connections>
+                                            </button>
+                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="leading" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="8IF-Mt-dxG">
+                                                <rect key="frame" x="50" y="0.0" width="35" height="44"/>
+                                                <constraints>
+                                                    <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="35" id="ZlT-Jr-Muy"/>
+                                                    <constraint firstAttribute="height" constant="44" id="gyj-pO-DEO"/>
+                                                </constraints>
+                                                <state key="normal" image="menu_black_icon"/>
+                                                <connections>
+                                                    <action selector="menuAction:" destination="532-Yx-Ghr" eventType="touchUpInside" id="UNI-gX-FOL"/>
+                                                </connections>
+                                            </button>
+                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="aUh-09-B5a">
+                                                <rect key="frame" x="366" y="0.0" width="33" height="44"/>
+                                                <constraints>
+                                                    <constraint firstAttribute="height" constant="44" id="opi-Ou-jKX"/>
+                                                </constraints>
+                                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
+                                                <state key="normal" title="清空">
+                                                    <color key="titleColor" red="0.22352941179999999" green="0.47450980390000003" blue="0.82745098039999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                </state>
+                                            </button>
+                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="草稿箱" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="sFu-uB-6YO">
+                                                <rect key="frame" x="182.66666666666666" y="11.999999999999998" width="49" height="20.333333333333329"/>
+                                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
+                                                <nil key="textColor"/>
+                                                <nil key="highlightedColor"/>
+                                            </label>
+                                        </subviews>
+                                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                        <constraints>
+                                            <constraint firstAttribute="height" constant="44" id="ChI-mk-RMm"/>
+                                            <constraint firstAttribute="bottom" secondItem="2TO-Po-bNF" secondAttribute="bottom" id="EGt-Fm-RPK"/>
+                                            <constraint firstItem="8IF-Mt-dxG" firstAttribute="leading" secondItem="2TO-Po-bNF" secondAttribute="trailing" id="KOX-Rf-Xwj"/>
+                                            <constraint firstItem="2TO-Po-bNF" firstAttribute="leading" secondItem="ief-he-wrx" secondAttribute="leading" id="LfJ-SN-dwo"/>
+                                            <constraint firstAttribute="bottom" secondItem="aUh-09-B5a" secondAttribute="bottom" id="PWE-8b-nR9"/>
+                                            <constraint firstItem="aUh-09-B5a" firstAttribute="top" secondItem="ief-he-wrx" secondAttribute="top" id="QKS-PF-xxd"/>
+                                            <constraint firstAttribute="trailing" secondItem="aUh-09-B5a" secondAttribute="trailing" constant="15" id="XRj-Yy-oKo"/>
+                                            <constraint firstItem="sFu-uB-6YO" firstAttribute="centerX" secondItem="ief-he-wrx" secondAttribute="centerX" id="f4Z-Wc-u4x"/>
+                                            <constraint firstAttribute="bottom" secondItem="aUh-09-B5a" secondAttribute="bottom" id="ggB-Pz-nfb"/>
+                                            <constraint firstItem="8IF-Mt-dxG" firstAttribute="centerY" secondItem="ief-he-wrx" secondAttribute="centerY" id="rCi-UM-pNT"/>
+                                            <constraint firstItem="sFu-uB-6YO" firstAttribute="centerY" secondItem="ief-he-wrx" secondAttribute="centerY" id="v9W-ii-6dh"/>
+                                        </constraints>
+                                    </view>
+                                </subviews>
+                                <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                <constraints>
+                                    <constraint firstItem="ief-he-wrx" firstAttribute="trailing" secondItem="tSd-kK-m6i" secondAttribute="trailing" id="2ev-Cc-ybd"/>
+                                    <constraint firstAttribute="bottom" secondItem="ief-he-wrx" secondAttribute="bottom" id="Ndv-b9-gIg"/>
+                                    <constraint firstItem="ief-he-wrx" firstAttribute="leading" secondItem="tSd-kK-m6i" secondAttribute="leading" id="bvA-tl-9W8"/>
+                                    <constraint firstAttribute="height" constant="64" id="ixi-yV-vzQ"/>
+                                </constraints>
+                                <connections>
+                                    <outlet property="height" destination="ixi-yV-vzQ" id="bMt-E7-AbN"/>
+                                </connections>
+                            </view>
+                        </subviews>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                        <constraints>
+                            <constraint firstItem="tSd-kK-m6i" firstAttribute="leading" secondItem="5ww-fk-vwF" secondAttribute="leading" id="2fM-ov-n6e"/>
+                            <constraint firstItem="tSd-kK-m6i" firstAttribute="trailing" secondItem="5ww-fk-vwF" secondAttribute="trailing" id="JtX-Ag-92p"/>
+                            <constraint firstItem="tSd-kK-m6i" firstAttribute="top" secondItem="eGp-od-DGm" secondAttribute="top" id="oPb-aD-DOT"/>
+                        </constraints>
+                        <viewLayoutGuide key="safeArea" id="5ww-fk-vwF"/>
+                    </view>
+                    <navigationItem key="navigationItem" id="4TD-ip-WN1"/>
+                    <connections>
+                        <outlet property="operationAllSelectButton" destination="8IF-Mt-dxG" id="qDO-My-V7f"/>
+                        <outlet property="rightAddButton" destination="aUh-09-B5a" id="uG7-8v-NgK"/>
+                        <outlet property="vcTitleLabel" destination="sFu-uB-6YO" id="18b-GV-AAd"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="jfP-Fw-GuG" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="445" y="796"/>
+        </scene>
     </scenes>
     <resources>
         <image name="Common_set" width="20" height="20"/>

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

@@ -0,0 +1,18 @@
+//
+//  NoteDraftVC.h
+//  smartRhino
+//
+//  Created by niuzhen on 2020/8/4.
+//  Copyright © 2020 tederen. All rights reserved.
+//
+
+#import "BaseViewController.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface NoteDraftVC : BaseViewController
+@property (nonatomic,assign) NSInteger  TypeValue;
++(NoteDraftVC *)initNoteDraftVC;
+@end
+
+NS_ASSUME_NONNULL_END

smartRhino/Project/VCModel/Home/OtherHomeVC/MyTDTopic/VC/TopicBook/MyTDTopicBookEditVC.m

@@ -86,7 +86,7 @@
 - (void)getData
 {
     NSDictionary * paraDict = @{@"ParentId":@(self.ParentId),
-                                @"TypeId":@(4),///4笔记
+                                @"TypeId":[NSNumber numberWithInt:-4],///4笔记
                                 @"RoleId":@(0),
                                 @"KeyWord":@"",
     };
@@ -116,7 +116,7 @@
     }
     NSMutableDictionary *dic = [[NSMutableDictionary alloc]init];
     [dic setValue:MiddleIds forKey:@"MiddleIds"];
-    [dic setValue:@(4) forKey:@"FolderType"];
+    [dic setValue:[NSNumber numberWithInt:-4] forKey:@"FolderType"];
 
     WS(weakSelf);
     [[HttpManager sharedHttpManager] POSTUrl:Host(API_Find_DeleteRecord) parameters:dic responseStyle:DATA success:^(id  _Nonnull responseObject) {
@@ -130,7 +130,7 @@
 }
 - (void)launchMoveVC:(NSMutableArray<NSNumber*>*)selectIDArray{
     MoveViewController * vc = [MoveViewController initMoveViewController];
-    vc.TypeId = CreateNotesType;
+    vc.TypeId = CreateNewTopicType;
     vc.collectType = CollectHanderType_Move;
     vc.ParentId = 0;
     vc.titleStr = @"移动";

smartRhino/Project/VCModel/Home/OtherHomeVC/MyTDTopic/VC/TopicBook/MyTDTopicBookVC.h

@@ -13,6 +13,7 @@ NS_ASSUME_NONNULL_BEGIN
 @interface MyTDTopicBookVC : BaseViewController
 @property (nonatomic,assign) NSInteger  FolderId;
 @property (nonatomic,assign) NSInteger  ParentId;
+@property (nonatomic,assign) NSInteger  roleId;
 @property (nonatomic,assign) BOOL       isSelect;
 @property (nonatomic,assign) BOOL       isNotRoot;
 @property (nonatomic,copy) NSString     * titleStr;

smartRhino/Project/VCModel/Home/OtherHomeVC/MyTDTopic/VC/TopicBook/MyTDTopicBookVC.m

@@ -85,8 +85,8 @@
     [self.addBtn setAction:^{
         if (weakSelf.isSelect) {
             MyFavoriteNewFindVC *vc = [MyFavoriteNewFindVC initMyFavoriteNewFindVC];
-            vc.ParentId = 0;
-            vc.roleId = 0;
+            vc.ParentId = weakSelf.ParentId;
+            vc.roleId = weakSelf.roleId;
             vc.createFoldType = CreateNotesType;
             vc.modifyTye = CreateType;
             vc.fileType = NewTopicFileType;
@@ -111,12 +111,11 @@
     }];
     UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithActionBlock:^(id  _Nonnull sender) {
         MyFavoriteNewFindVC *vc = [MyFavoriteNewFindVC initMyFavoriteNewFindVC];
-        vc.ParentId = 0;
-        vc.roleId = 0;
-        vc.createFoldType = CreateNotesType;
+        vc.ParentId = weakSelf.ParentId;
+        vc.roleId = weakSelf.roleId;
+        vc.createFoldType = CreateNewTopicType;
         vc.modifyTye = CreateType;
-        vc.titleStr = @"移动到";
-        vc.fileType = NewTopicFileType;
+        vc.fileType = weakSelf.ParentId == 0 ? NewTopicFileType : NewNotFileType;
         [weakSelf.navigationController pushViewController:vc animated:YES];
     }];
     self.noDataL.userInteractionEnabled = YES;
@@ -130,11 +129,11 @@
         YCMenuAction *actionMenu = [YCMenuAction actionWithTitle:titleStr image:nil handler:^(YCMenuAction *action) {
             if([@"建文件夹" isEqualToString:action.title]){
                 MyFavoriteNewFindVC *vc = [MyFavoriteNewFindVC initMyFavoriteNewFindVC];
-                vc.ParentId = 0;
-                vc.roleId = 0;
-                vc.createFoldType = CreateNotesType;
+                vc.ParentId = weakSelf.ParentId;
+                vc.roleId = weakSelf.roleId;
+                vc.createFoldType = CreateNewTopicType;
                 vc.modifyTye = CreateType;
-                vc.fileType = NewTopicFileType;
+                vc.fileType = weakSelf.ParentId == 0 ? NewTopicFileType : NewNotFileType;
                 [weakSelf.navigationController pushViewController:vc animated:YES];
             }else if ([@"批量编辑" isEqualToString:action.title]){
                 MyTDTopicBookEditVC * vc = [MyTDTopicBookEditVC initMyTDTopicBookEditVC];
@@ -151,7 +150,7 @@
 - (void)getData
 {
     NSDictionary * paraDict = @{@"ParentId":@(self.ParentId),
-                                @"TypeId":@(4),///4笔记
+                                @"TypeId":[NSNumber numberWithInt:-4],///4笔记
                                 @"RoleId":@(0),
                                 @"KeyWord":@"",
     };
@@ -166,12 +165,14 @@
             [weakSelf.dataArray addObject:model];
         }
         dispatch_async(dispatch_get_main_queue(), ^{
-            if (weakSelf.dataArray.count == (weakSelf.isNotRoot ? 0 : 1)) {
-                weakSelf.noDataView.hidden = NO;
-                weakSelf.tableView.scrollEnabled = NO;
-            }else{
-                weakSelf.noDataView.hidden = YES;
-                weakSelf.tableView.scrollEnabled = YES;
+            if (weakSelf.ParentId == 0) {
+                if (weakSelf.dataArray.count == (weakSelf.isNotRoot ? 0 : 1)) {
+                    weakSelf.noDataView.hidden = NO;
+                    weakSelf.tableView.scrollEnabled = NO;
+                }else{
+                    weakSelf.noDataView.hidden = YES;
+                    weakSelf.tableView.scrollEnabled = YES;
+                }
             }
             [weakSelf.tableView reloadData];
         });
@@ -196,6 +197,9 @@
         TopicBookCell * cell = [TopicBookCell configCell0:tableView indexPath:indexPath];
         cell.titleL.text = model.Name;
         cell.lineV.hidden = self.dataArray.count == 1 ? YES : NO;
+        if (model.IsDraft) {
+            cell.imagV.image = IMG(@"Draft_Icon");
+        }
         if (self.isSelect) {
             cell.countL.hidden = YES;
             cell.enterBtn.hidden = !model.IsFolder;
@@ -246,16 +250,20 @@
         [[NSNotificationCenter defaultCenter] postNotificationName:SELECTETOPICBOOK object:nil userInfo:@{@"Id":@(model.Id),@"Name":model.Name}];
         [self back1];
     }else{
-        NoteBookVC *vc = [NoteBookVC initNoteBookVC];
-        vc.listType = MyFavoriteListLevelTypeB;
-        vc.ParentId = 0;
-        vc.FolderId = model.Id;
-        vc.RoleId = model.RoleId;
-        vc.myTitle = model.Name;
-        vc.IsSystemDefault = model.IsSystemDefault;
-        vc.TypeValue = 1;
-        vc.isSubVC = YES;
-        [self.navigationController pushViewController:vc animated:YES];
+        if (model.IsDraft) {
+            
+        }else{
+            NoteBookVC *vc = [NoteBookVC initNoteBookVC];
+            vc.listType = MyFavoriteListLevelTypeB;
+            vc.ParentId = 0;
+            vc.FolderId = model.Id;
+            vc.RoleId = model.RoleId;
+            vc.myTitle = model.Name;
+            vc.IsSystemDefault = model.IsSystemDefault;
+            vc.TypeValue = 1;
+            vc.isSubVC = YES;
+            [self.navigationController pushViewController:vc animated:YES];
+        }
     }
 }
 
@@ -283,7 +291,6 @@
     WS(weakSelf);
     TopicBookModel *model  = self.dataArray[indexPath.row];
     if (!model.IsSystemDefault) {
-        
         UIContextualAction *action1 = [UIContextualAction contextualActionWithStyle:UIContextualActionStyleDestructive title:@"删除" handler:^(UIContextualAction * _Nonnull action, __kindof UIView * _Nonnull sourceView, void (^ _Nonnull completionHandler)(BOOL)) {
             [tableView setEditing:NO animated:YES];
             UIAlertController *alertVC = [UIAlertController alertControllerWithTitle:nil message:@"确认删除" preferredStyle:UIAlertControllerStyleAlert];
@@ -305,9 +312,9 @@
             MyFavoriteNewFindVC *vc = [MyFavoriteNewFindVC initMyFavoriteNewFindVC];
             vc.ParentId = model.Id;
             vc.foldId = model.Id;
-            vc.createFoldType = CreateNotesType;
+            vc.createFoldType = CreateNewTopicType;
             vc.modifyTye = ModifyType;
-            vc.fileType = NewOtherFileType;
+            vc.fileType = NewTopicFileType;
             vc.titleStr = @"修改文件夹";
             vc.roleId = model.RoleId;
             vc.fileName = model.Name;
@@ -348,7 +355,7 @@
 - (void)reCreateTable
 {
     NSDictionary * paraDict = @{@"ParentId":@(self.ParentId),
-                                @"TypeId":@(4),///4笔记
+                                @"TypeId":[NSNumber numberWithInt:-4],///4笔记
                                 @"RoleId":@(0),
                                 @"KeyWord":@"",
     };
@@ -398,7 +405,7 @@
     }
     NSMutableDictionary *dic = [[NSMutableDictionary alloc]init];
     [dic setValue:MiddleIds forKey:@"MiddleIds"];
-    [dic setValue:@(4) forKey:@"FolderType"];
+    [dic setValue:[NSNumber numberWithInt:-4] forKey:@"FolderType"];
     
     WEAKSELF
     [[HttpManager sharedHttpManager] POSTUrl:Host(API_Find_DeleteRecord) parameters:dic responseStyle:DATA success:^(id  _Nonnull responseObject) {
@@ -409,7 +416,7 @@
 }
 - (void)launchMoveVC:(NSMutableArray<NSNumber*>*)selectIDArray{
     MoveViewController * vc = [MoveViewController initMoveViewController];
-    vc.TypeId = CreateNotesType;
+    vc.TypeId = CreateNewTopicType;
     vc.collectType = CollectHanderType_Move;
     vc.ParentId = 0;
     vc.titleStr = @"移动到";