4.21

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

@@ -25,6 +25,9 @@ NS_ASSUME_NONNULL_BEGIN
 @property(nonatomic, assign) NSInteger          listId;
 @property(nonatomic, assign) BOOL               isTop;
 @property(nonatomic, copy) SelectModel          * sModel;
+
+@property (nonatomic, copy) FlowAttachmentsModel *   sendModel;///转发
+@property (assign, nonatomic) BOOL                   isReturn;
 - (instancetype)initWithConversationId:(NSString *)aId
                                   type:(EMConversationType)aType
                       createIfNotExist:(BOOL)aIsCreate;

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

@@ -48,6 +48,7 @@
 #import "MyApprovalPageDetail.h"
 #import "NoteBookShareVC.h"
 #import "MoveViewController.h"
+#import "CountDataVC.h"
 
 @interface EMChatViewController ()<UIScrollViewDelegate, UINavigationControllerDelegate, UIImagePickerControllerDelegate, EMMultiDevicesDelegate, EMChatManagerDelegate, EMGroupManagerDelegate, EMChatroomManagerDelegate, EMChatBarDelegate, EMMessageCellDelegate, EMChatBarEmoticonViewDelegate, EMChatBarRecordAudioViewDelegate,EMMoreFunctionViewDelegate,EMReadReceiptMsgDelegate,NoteBookShareVCDelegate>
 
@@ -91,8 +92,6 @@
 @property (strong, nonatomic) NoteBookShareVC *noteBookShareVC;
 @property (strong, nonatomic) UIImage         *sendImage;
 
-@property (copy, nonatomic) FlowAttachmentsModel *sendModel;
-
 //Typing
 @property (nonatomic) BOOL isTyping;
 @property (nonatomic) BOOL enableTyping;
@@ -983,6 +982,7 @@
     vc.indexId = self.UserId;
     [self.navigationController pushViewController:vc animated:YES];
 }
+#pragma mark - 点击自定义消息体
 - (void)appPushWithDictionary:(NSDictionary *)dict
 {
     WS(weakSelf);
@@ -1127,6 +1127,24 @@
             vc.Id = Id;
             [self.navigationController pushViewController:vc animated:YES];
         }break;
+        case CollectModel_financeCount:{
+            CountDataVC *vc = [CountDataVC initCountDataVC];
+            vc.index = 0;
+            vc.titleStr = @"财务统计";
+            [self.navigationController pushViewController:vc animated:YES];
+        }break;
+        case CollectModel_affairsCount:{
+            CountDataVC *vc = [CountDataVC initCountDataVC];
+            vc.index = 1;
+            vc.titleStr = @"人事统计";
+            [self.navigationController pushViewController:vc animated:YES];
+        }break;
+        case CollectModel_publishCount:{
+            CountDataVC *vc = [CountDataVC initCountDataVC];
+            vc.index = 2;
+            vc.titleStr = @"出版统计";
+            [self.navigationController pushViewController:vc animated:YES];
+        }break;
         default:
             break;
     }
@@ -2455,6 +2473,7 @@
                 }
                 dispatch_async(dispatch_get_main_queue(), ^{
                     [weakself.tableView reloadData];
+                    [weakself returnMessge];
                     if (weakself.isFirstLoadMsg) {
                         weakself.isFirstLoadMsg = NO;
                         [weakself _scrollToBottomRow];
@@ -2462,6 +2481,9 @@
                 });
             });
         }
+        if (!aError && [aMessages count] == 0) {
+            [weakself returnMessge];
+        }
         
         [weakself tableViewDidFinishTriggerHeader:YES reload:NO];
     };
@@ -2486,7 +2508,240 @@
         }
     }
 }
-
+#pragma mark - 转发消息
+- (void)returnMessge
+{
+    if (self.isReturn) {
+        switch (self.sendModel.SoureTypeId) {
+            case CollectModel_Text:///文本
+            {
+                [self _sendTextAction:self.sendModel.Title ext:nil];
+            }
+                break;
+            case CollectModel_Aritle:
+            {
+                [self _sendTextAction:@"[文章]" ext:@{@"app":@(YES),
+                                                        @"app_type":@(CollectModel_Aritle),
+                                                        @"app_title":self.sendModel.Title,
+                                                        @"app_id":@(self.sendModel.SoureId),
+                                                        @"app_content":self.sendModel.Author.length > 0 ? [NSString stringWithFormat:@"来自-%@",self.sendModel.Author] : @"",
+                                                        @"app_sourceUserId":@(self.sendModel.SourceUserId),
+                                                        @"app_min_url":self.sendModel.MinUrl,
+                                                        @"app_url":self.sendModel.Url,
+                }];
+            }
+                break;
+            case CollectModel_Notice:
+            {
+                [self _sendTextAction:@"[通知]" ext:@{@"app":@(YES),
+                                                        @"app_type":@(CollectModel_Notice),
+                                                        @"app_title":self.sendModel.Title,
+                                                        @"app_id":@(self.sendModel.SoureId),
+                                                        @"app_content":self.sendModel.Author.length > 0 ? [NSString stringWithFormat:@"来自-%@",self.sendModel.Author] : @"",
+                                                        @"app_sourceUserId":@(self.sendModel.SourceUserId),
+                                                        @"app_min_url":self.sendModel.MinUrl,
+                                                        @"app_url":self.sendModel.Url,
+                }];
+            }
+                break;
+            case CollectModel_NoteBook:
+            {
+                [self _sendTextAction:@"[笔记]" ext:@{@"app":@(YES),
+                                                        @"app_type":@(CollectModel_NoteBook),
+                                                        @"app_title":self.sendModel.Title,
+                                                        @"app_id":@(self.sendModel.SoureId),
+                                                        @"app_content":self.sendModel.Author.length > 0 ? [NSString stringWithFormat:@"来自-%@",self.sendModel.Author] : @"",
+                                                        @"app_sourceUserId":@(self.sendModel.SourceUserId),
+                                                        @"app_min_url":self.sendModel.MinUrl,
+                                                        @"app_url":self.sendModel.Url,
+                }];
+            }
+                break;
+            case CollectModel_NewTopic:
+            {
+                [self _sendTextAction:@"[话题]" ext:@{@"app":@(YES),
+                                                        @"app_type":@(CollectModel_NewTopic),
+                                                        @"app_title":self.sendModel.Title,
+                                                        @"app_id":@(self.sendModel.SoureId),
+                                                        @"app_content":self.sendModel.Author.length > 0 ? [NSString stringWithFormat:@"来自-%@",self.sendModel.Author] : @"",
+                                                        @"app_sourceUserId":@(self.sendModel.SourceUserId),
+                                                        @"app_min_url":self.sendModel.MinUrl,
+                                                        @"app_url":self.sendModel.Url,
+                }];
+            }
+                break;
+            case CollectModel_Toipc:
+            {
+                [self _sendTextAction:@"[话题]" ext:@{@"app":@(YES),
+                                                        @"app_type":@(CollectModel_Toipc),
+                                                        @"app_title":self.sendModel.Title,
+                                                        @"app_id":@(self.sendModel.SoureId),
+                                                        @"app_content":self.sendModel.Author.length > 0 ? [NSString stringWithFormat:@"来自-%@",self.sendModel.Author] : @"",
+                                                        @"app_sourceUserId":@(self.sendModel.SourceUserId),
+                                                        @"app_min_url":self.sendModel.MinUrl,
+                                                        @"app_url":self.sendModel.Url,
+                }];
+            }
+                break;
+            case CollectModel_InterMail:
+            {
+                [self _sendTextAction:@"[站内信]" ext:@{@"app":@(YES),
+                                                        @"app_type":@(CollectModel_InterMail),
+                                                        @"app_title":self.sendModel.Title,
+                                                        @"app_id":@(self.sendModel.SoureId),
+                                                        @"app_content":self.sendModel.Author.length > 0 ? [NSString stringWithFormat:@"来自-%@",self.sendModel.Author] : @"",
+                                                        @"app_sourceUserId":@(self.sendModel.SourceUserId),
+                                                        @"app_min_url":self.sendModel.MinUrl,
+                                                        @"app_url":self.sendModel.Url,
+                }];
+            }
+                break;
+            case CollectModel_CollectFile:
+            {
+                [self _sendTextAction:@"[收藏文件夹]" ext:@{@"app":@(YES),
+                                                        @"app_type":@(CollectModel_CollectFile),
+                                                        @"app_title":self.sendModel.Title,
+                                                        @"app_id":@(self.sendModel.SoureId),
+                                                        @"app_content":self.sendModel.Author.length > 0 ? [NSString stringWithFormat:@"来自-%@",self.sendModel.Author] : @"",
+                                                        @"app_sourceUserId":@(self.sendModel.SourceUserId),
+                                                        @"app_min_url":self.sendModel.MinUrl,
+                                                        @"app_url":self.sendModel.Url,
+                }];
+            }
+                break;
+            case CollectModel_NoteFile:
+            {
+                [self _sendTextAction:@"[笔记文件夹]" ext:@{@"app":@(YES),
+                                                        @"app_type":@(CollectModel_NoteFile),
+                                                        @"app_title":self.sendModel.Title,
+                                                        @"app_id":@(self.sendModel.SoureId),
+                                                        @"app_content":self.sendModel.Author.length > 0 ? [NSString stringWithFormat:@"来自-%@",self.sendModel.Author] : @"",
+                                                        @"app_sourceUserId":@(self.sendModel.SourceUserId),
+                                                        @"app_min_url":self.sendModel.MinUrl,
+                                                        @"app_url":self.sendModel.Url,
+                }];
+            }
+                break;
+            case CollectModel_meetMian:
+            {
+                [self _sendTextAction:@"[会议纪要]" ext:@{@"app":@(YES),
+                                                        @"app_type":@(CollectModel_meetMian),
+                                                        @"app_title":self.sendModel.Title,
+                                                        @"app_id":@(self.sendModel.SoureId),
+                                                        @"app_content":self.sendModel.Author.length > 0 ? [NSString stringWithFormat:@"来自-%@",self.sendModel.Author] : @"",
+                                                        @"app_sourceUserId":@(self.sendModel.SourceUserId),
+                                                        @"app_min_url":self.sendModel.MinUrl,
+                                                        @"app_url":self.sendModel.Url,
+                }];
+            }
+                break;
+            case CollectModel_Image:///图片
+            {
+                [self _sendTextAction:@"[审批]" ext:@{@"app":@(YES),
+                                                        @"app_type":@(CollectModel_Image),
+                                                        @"app_title":self.sendModel.Title,
+                                                        @"app_id":@(self.sendModel.SoureId),
+                                                        @"app_content":self.sendModel.Author.length > 0 ? [NSString stringWithFormat:@"来自-%@",self.sendModel.Author] : @"",
+                                                        @"app_sourceUserId":@(self.sendModel.SourceUserId),
+                                                        @"app_min_url":self.sendModel.MinUrl,
+                                                        @"app_url":self.sendModel.Url,
+                }];
+            }
+                break;
+            case CollectModel_file:///文件
+            {
+                [self _sendTextAction:@"[文件]" ext:@{@"app":@(YES),
+                                                        @"app_type":@(CollectModel_file),
+                                                        @"app_title":self.sendModel.Title,
+                                                        @"app_id":@(self.sendModel.SoureId),
+                                                        @"app_content":self.sendModel.Author.length > 0 ? [NSString stringWithFormat:@"来自-%@",self.sendModel.Author] : @"",
+                                                        @"app_sourceUserId":@(self.sendModel.SourceUserId),
+                                                        @"app_min_url":self.sendModel.MinUrl,
+                                                        @"app_url":self.sendModel.Url,
+                }];
+            }
+                break;
+            case CollectModel_work:///工作
+            {
+                [self _sendTextAction:@"[审批]" ext:@{@"app":@(YES),
+                                                        @"app_type":@(CollectModel_work),
+                                                        @"app_title":self.sendModel.Title,
+                                                        @"app_id":@(self.sendModel.SoureId),
+                                                        @"app_content":[NSString stringWithFormat:@"来自-%@",self.sendModel.Author],
+                                                        @"app_sourceUserId":@(self.sendModel.SourceUserId),
+                                                        @"app_min_url":@"",
+                                                        @"app_url":@""
+                }];
+            }
+                break;
+            case CollectModel_meetDetail:///会议
+            {
+                [self _sendTextAction:@"[会议]" ext:@{@"app":@(YES),
+                                                        @"app_type":@(CollectModel_meetDetail),
+                                                        @"app_title":self.sendModel.Title,
+                                                        @"app_id":@(self.sendModel.SoureId),
+                                                        @"app_content":[NSString stringWithFormat:@"来自-%@",self.sendModel.Author],
+                                                        @"app_sourceUserId":@(self.sendModel.SourceUserId),
+                                                        @"app_min_url":@"",
+                                                        @"app_url":@""
+                }];
+            }
+                break;
+            case CollectModel_financeCount:///文本
+            {
+                [self _sendTextAction:@"[财务统计]" ext:@{@"app":@(YES),
+                                                        @"app_type":@(CollectModel_financeCount),
+                                                        @"app_title":self.sendModel.Title,
+                                                        @"app_id":@(self.sendModel.SoureId),
+                                                        @"app_content":@"来自-财务统计",
+                                                        @"app_sourceUserId":@(self.sendModel.SourceUserId),
+                                                        @"app_min_url":@"",
+                                                        @"app_url":@""
+                }];
+            }
+                break;
+            case CollectModel_affairsCount:///文本
+            {
+                [self _sendTextAction:@"[人事统计]" ext:@{@"app":@(YES),
+                                                        @"app_type":@(CollectModel_affairsCount),
+                                                        @"app_title":self.sendModel.Title,
+                                                        @"app_id":@(self.sendModel.SoureId),
+                                                        @"app_content":@"来自-人事统计",
+                                                        @"app_sourceUserId":@(self.sendModel.SourceUserId),
+                                                        @"app_min_url":@"",
+                                                        @"app_url":@""
+                }];
+            }
+                break;
+            case CollectModel_publishCount:///文本
+            {
+                [self _sendTextAction:@"[出版统计]" ext:@{@"app":@(YES),
+                                                        @"app_type":@(CollectModel_publishCount),
+                                                        @"app_title":self.sendModel.Title,
+                                                        @"app_id":@(self.sendModel.SoureId),
+                                                        @"app_content":@"来自-出版统计",
+                                                        @"app_sourceUserId":@(self.sendModel.SourceUserId),
+                                                        @"app_min_url":@"",
+                                                        @"app_url":@""
+                }];
+            }
+                break;
+            default:
+            {
+                [self _sendTextAction:@"[出版统计]" ext:@{@"app":@(YES),
+                                                        @"app_type":@(CollectModel_publishCount),
+                                                        @"app_title":self.sendModel.Title,
+                                                        @"app_id":@(self.sendModel.SoureId),
+                                                        @"app_content":@"来自-出版统计",
+                                                        @"app_sourceUserId":@(self.sendModel.SourceUserId),
+                                                        @"app_min_url":@"",
+                                                        @"app_url":@""
+                }];
+            }
+                break;
+        }
+    }
+}
 #pragma mark - Action
 
 - (void)backAction

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

@@ -137,6 +137,11 @@
             self.iconView.image = IMG(@"会议");
         }
             break;
+        case CollectModel_meetDetail:
+        {
+            self.iconView.image = IMG(@"会议");
+        }
+            break;
         case CollectModel_Image:
         {
             [self.iconView setImageWithURL:[NSURL URLWithString:[extDcit objectForKey:@"app_min_url"]] placeholder:nil];
@@ -151,6 +156,26 @@
             }
         }
             break;
+        case CollectModel_work:
+        {
+            self.iconView.image = IMG(@"审批");
+        }
+            break;
+        case CollectModel_financeCount:
+        {
+            self.iconView.image = IMG(@"报表");
+        }
+            break;
+        case CollectModel_affairsCount:
+        {
+            self.iconView.image = IMG(@"报表");
+        }
+            break;
+        case CollectModel_publishCount:
+        {
+            self.iconView.image = IMG(@"报表");
+        }
+            break;
         default:
             break;
     }

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

@@ -24,7 +24,8 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, assign) BOOL      isChat;//信源进来
 @property (assign,nonatomic) MailListByZuPageType pageType;
 @property (nonatomic, assign) BOOL notChangeSearchColor;
-
+@property (nonatomic, copy) FlowAttachmentsModel *   sendModel;
+@property (assign, nonatomic) BOOL                   isReturn;
 @end
 
 NS_ASSUME_NONNULL_END

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

@@ -899,6 +899,8 @@
                         vc.pageType = MailListByZuPageType_Sys;
                         vc.isShow = self.isShow;
                         vc.UserIds = self.UserIds;
+                        vc.isReturn = self.isReturn;
+                        vc.sendModel = self.sendModel;
                         vc.isCheck = self.isCheck;
                         vc.isSelectPeople  = self.isSelectPeople;
                         NSLog(@"%@",dataArray);
@@ -917,6 +919,8 @@
                         }
                         MailListDetailVC *vc = [MailListDetailVC initMailListDetailVC];
                         vc.indexId = [dic[@"Id"] integerValue];
+                        vc.isReturn = self.isReturn;
+                        vc.sendModel = self.sendModel;
                         NSLog(@"%@",dataArray);
                         [self.navigationController pushViewController:vc animated:YES];
                     }
@@ -949,6 +953,8 @@
                 switch (self.operationStateEnum) {
                     case OperationStateEnum0:{
                         MailListDetailVC *vc = [MailListDetailVC initMailListDetailVC];
+                        vc.isReturn = self.isReturn;
+                        vc.sendModel = self.sendModel;
                         vc.indexId = model.UserId;
                         [self.navigationController pushViewController:vc animated:YES];
                     }break;
@@ -998,6 +1004,8 @@
     vc.isShow = self.isShow;
     vc.isCheck = self.isCheck;
     vc.UserIds = self.UserIds;
+    vc.isReturn = self.isReturn;
+    vc.sendModel = self.sendModel;
     vc.DepartmentId = self.indexId;
     vc.SearchType = self.pageType;
     [self.navigationController pushViewController:vc animated:YES];

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

@@ -15,7 +15,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 +(MailListDetailVC *)initMailListDetailVC;
 @property(nonatomic, assign) NSInteger   indexId;
-
+@property (nonatomic, copy) FlowAttachmentsModel *   sendModel;
+@property (assign, nonatomic) BOOL                   isReturn;
 
 @end
 

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

@@ -122,6 +122,8 @@
         sModel.SourceId = weakSelf.model.Id;
         sModel.SourceName = weakSelf.model.Name;
         controller.sModel = sModel;
+        controller.sendModel = weakSelf.sendModel;
+        controller.isReturn = weakSelf.isReturn;
         controller.chatType = 1;//单聊
         [weakSelf.navigationController pushViewController:controller animated:YES];
     }];

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

@@ -18,6 +18,8 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, assign) BOOL IsAddUser;
 @property (nonatomic, assign) NSInteger DepartmentId;
 @property (nonatomic, assign) NSInteger SearchType;///搜索类型 1 部门 2 自建 0全部
+@property (nonatomic, copy) FlowAttachmentsModel *   sendModel;
+@property (assign, nonatomic) BOOL                   isReturn;
 @end
 
 NS_ASSUME_NONNULL_END

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

@@ -166,6 +166,8 @@
         }else{
             MailListDetailVC *vc = [MailListDetailVC initMailListDetailVC];
             vc.indexId = model.UserId;
+            vc.isReturn = self.isReturn;
+            vc.sendModel = self.sendModel;
             [self.navigationController pushViewController:vc animated:YES];
         }
     }

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

@@ -19,6 +19,10 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, assign) BOOL      isSelectPeople;
 @property (nonatomic, assign) BOOL      isChat;//信源进来
 @property (assign, nonatomic) BOOL isHiddenSearchView;
+@property (nonatomic, copy) FlowAttachmentsModel *   sendModel;
+@property (assign, nonatomic) BOOL                   isReturn;
+
+
 /// 搜索不需要变色
 @property (assign, nonatomic) BOOL notSearchChangeColor;
 +(MailListVC *)initMailListVC;

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

@@ -45,6 +45,8 @@
         vc.isShow = weakSelf.isShow;
         vc.UserIds = weakSelf.UserIds;
         vc.isCheck = weakSelf.isCheck;
+        vc.isReturn = weakSelf.isReturn;
+        vc.sendModel = weakSelf.sendModel;
         vc.DepartmentId = 0;
         vc.SearchType = 0;
         [weakSelf.navigationController pushViewController:vc animated:YES];
@@ -75,6 +77,8 @@
                     vc.isShow = weakSelf.isShow;
                     vc.isCheck = weakSelf.isCheck;
                     vc.UserIds = weakSelf.UserIds;
+                    vc.isReturn = weakSelf.isReturn;
+                    vc.sendModel = weakSelf.sendModel;
                     vc.titleStr = responseObject[@"GroupName"];
                     vc.indexId = [responseObject[@"Id"] integerValue];
                     vc.pageType = MailListByZuPageType_custom;
@@ -329,6 +333,8 @@
     vc.isShow = self.isShow;
     vc.isCheck = self.isCheck;
     vc.UserIds = self.UserIds;
+    vc.isReturn = self.isReturn;
+    vc.sendModel = self.sendModel;
     vc.titleStr = cell.cell0TitleLabel.text;
     if(indexPath.section == 0){
         NSDictionary *dic = self.dataSourceArray[0][indexPath.row];

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

@@ -39,6 +39,7 @@
 #import "OtherNoteBookVC.h"
 #import "MailListDetailVC.h"
 #import "ReadListVC.h"
+#import "MailListVC.h"
 
 @interface MyTDTopicDetailVC ()<UITableViewDataSource,UITableViewDelegate,NoteBookShareVCDelegate,MHTopicCellDelegate,WKUIDelegate,WKNavigationDelegate,UIScrollViewDelegate,WKScriptMessageHandler>
 @property (strong,nonatomic) IBOutlet UITableView *tableView;
@@ -1498,7 +1499,7 @@
     }else if ([typeName isEqualToString:@"发给QQ好友"]){
         
     }else if ([typeName isEqualToString:@"发到消息"]){
-        
+        [self returnToMessage];
     }else if ([typeName isEqualToString:@"发到小组"]){
         [self returnToGroup];
     }else if ([typeName isEqualToString:@"发到笔记"]){
@@ -1509,6 +1510,18 @@
     }
 }
 #pragma mark - 分享功能
+- (void)returnToMessage
+{
+    MailListVC * vc = [MailListVC initMailListVC];
+    FlowAttachmentsModel * model = [[FlowAttachmentsModel alloc] init];
+    model.SoureId = self.Id;
+    model.SoureTypeId = self.type;
+    model.Title = self.currentNoteModel.Title;
+    model.Author = self.currentNoteModel.UserName;
+    vc.sendModel = model;
+    vc.isReturn = YES;
+    [self.navigationController pushViewController:vc animated:YES];
+}
 - (void)returnToGroup
 {
     MyTDGroupViewController * vc = [[MyTDGroupViewController alloc] init];

smartRhino/Project/VCModel/My_Center/Controller/NoteBook/Controller/NoteBookShareVC.h

@@ -16,21 +16,21 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 @interface NoteBookShareVC : BaseViewController
-//@property (weak, nonatomic) IBOutlet UIImageView *title00ImageView;
-//@property (weak, nonatomic) IBOutlet UILabel *title00Lablel;
-//@property (weak, nonatomic) IBOutlet UIButton *tititle00Button;
-//
-//@property (weak, nonatomic) IBOutlet UIImageView *title01ImageView;
-//@property (weak, nonatomic) IBOutlet UILabel *title01Lablel;
-//@property (weak, nonatomic) IBOutlet UIButton *tititle01Button;
-//
-//@property (weak, nonatomic) IBOutlet UIImageView *title02ImageView;
-//@property (weak, nonatomic) IBOutlet UILabel *title02Lablel;
-//@property (weak, nonatomic) IBOutlet UIButton *tititle02Button;
-//
-//@property (weak, nonatomic) IBOutlet UIImageView *title03ImageView;
-//@property (weak, nonatomic) IBOutlet UILabel *title03Lablel;
-//@property (weak, nonatomic) IBOutlet UIButton *tititle03Button;
+@property (weak, nonatomic) IBOutlet UIImageView *title00ImageView;
+@property (weak, nonatomic) IBOutlet UILabel *title00Lablel;
+@property (weak, nonatomic) IBOutlet UIButton *tititle00Button;
+
+@property (weak, nonatomic) IBOutlet UIImageView *title01ImageView;
+@property (weak, nonatomic) IBOutlet UILabel *title01Lablel;
+@property (weak, nonatomic) IBOutlet UIButton *tititle01Button;
+
+@property (weak, nonatomic) IBOutlet UIImageView *title02ImageView;
+@property (weak, nonatomic) IBOutlet UILabel *title02Lablel;
+@property (weak, nonatomic) IBOutlet UIButton *tititle02Button;
+
+@property (weak, nonatomic) IBOutlet UIImageView *title03ImageView;
+@property (weak, nonatomic) IBOutlet UILabel *title03Lablel;
+@property (weak, nonatomic) IBOutlet UIButton *tititle03Button;
 
 @property (weak, nonatomic) IBOutlet UIImageView *title10ImageView;
 @property (weak, nonatomic) IBOutlet UILabel *title10Lablel;
@@ -40,19 +40,21 @@ NS_ASSUME_NONNULL_BEGIN
 @property (weak, nonatomic) IBOutlet UILabel *title11Lablel;
 @property (weak, nonatomic) IBOutlet UIButton *tititle11Button;
 
-//@property (weak, nonatomic) IBOutlet UIImageView *title12ImageView;
-//@property (weak, nonatomic) IBOutlet UILabel *title12Lablel;
-//@property (weak, nonatomic) IBOutlet UIButton *tititle12Button;
-//
-//@property (weak, nonatomic) IBOutlet UIImageView *title13ImageView;
-//@property (weak, nonatomic) IBOutlet UILabel *title13Lablel;
-//@property (weak, nonatomic) IBOutlet UIButton *tititle13Button;
+@property (weak, nonatomic) IBOutlet UIImageView *title12ImageView;
+@property (weak, nonatomic) IBOutlet UILabel *title12Lablel;
+@property (weak, nonatomic) IBOutlet UIButton *tititle12Button;
 
+@property (weak, nonatomic) IBOutlet UIImageView *title13ImageView;
+@property (weak, nonatomic) IBOutlet UILabel *title13Lablel;
+@property (weak, nonatomic) IBOutlet UIButton *tititle13Button;
+
+@property (weak, nonatomic) IBOutlet UIView *fristView;
+@property (weak, nonatomic) IBOutlet UIView *showView;
 
 +(NoteBookShareVC *)initNoteBookShareVC;
 @property (weak,nonatomic) id<NoteBookShareVCDelegate> delegate;
 @property (strong,nonatomic) NSIndexPath *indexpath;
-
+@property (assign,nonatomic) BOOL         isWork;
 -(void)initNoteBookShareData;
 @end
 

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

@@ -25,76 +25,66 @@
     [gr setNumberOfTapsRequired:1];
     [self.view addGestureRecognizer:gr];
 }
+- (void)setIsWork:(BOOL)isWork
+{
+    if (isWork) {
+        self.fristView.hidden = YES;
+        [self.showView mas_updateConstraints:^(MASConstraintMaker *make) {
+            make.height.mas_offset(180);
+        }];
+    }
+}
 -(void)initNoteBookShareData{
-    self.title10Lablel.text = @"发到笔记";
-       self.title10ImageView.image = IMG(@"icon_share_note");
-       [self.tititle10Button addTarget:self action:@selector(userDidTypeAction:) forControlEvents:UIControlEventTouchDown];
-       [self.tititle10Button setTitle: self.title10Lablel.text forState:UIControlStateNormal];
-       [self.allBtnArray addObject:self.tititle10Button];
+    self.title00Lablel.text = @"发给微信好友";
+    self.title00ImageView.image = IMG(@"icon_share_wechat");
+    [self.tititle00Button addTarget:self action:@selector(userDidTypeAction:) forControlEvents:UIControlEventTouchDown];
+    [self.tititle00Button setTitle: self.title00Lablel.text forState:UIControlStateNormal];
+    [self.allBtnArray addObject:self.tititle00Button];
+    
+    self.title01Lablel.text = @"发到朋友圈";
+    self.title01ImageView.image = IMG(@"icon_share_friend");
+    [self.tititle01Button addTarget:self action:@selector(userDidTypeAction:) forControlEvents:UIControlEventTouchDown];
+    [self.tititle01Button setTitle: self.title01Lablel.text forState:UIControlStateNormal];
+    [self.allBtnArray addObject:self.tititle01Button];
+    
+    self.title02Lablel.text = @"发到微博";
+    self.title02ImageView.image = IMG(@"icon_share_weibo");
+    [self.tititle02Button addTarget:self action:@selector(userDidTypeAction:) forControlEvents:UIControlEventTouchDown];
+    [self.tititle02Button setTitle: self.title02Lablel.text forState:UIControlStateNormal];
+    [self.allBtnArray addObject:self.tititle02Button];
+    
+    self.title03Lablel.text = @"发给QQ好友";
+    self.title03ImageView.image = IMG(@"icon_share_tencent");
+    [self.tititle03Button addTarget:self action:@selector(userDidTypeAction:) forControlEvents:UIControlEventTouchDown];
+    [self.tititle03Button setTitle: self.title03Lablel.text forState:UIControlStateNormal];
+    [self.allBtnArray addObject:self.tititle03Button];
+    
     
+    self.title10Lablel.text = @"发到消息";
+    self.title10ImageView.image = IMG(@"icon_share_info");
+    [self.tititle10Button addTarget:self action:@selector(userDidTypeAction:) forControlEvents:UIControlEventTouchDown];
+    [self.tititle10Button setTitle: self.title10Lablel.text forState:UIControlStateNormal];
+    [self.allBtnArray addObject:self.tititle10Button];
     
-    self.title11Lablel.text = @"发到话题";
-       self.title11ImageView.image = IMG(@"icon_share_topic");
-       [self.tititle11Button addTarget:self action:@selector(userDidTypeAction:) forControlEvents:UIControlEventTouchDown];
-       [self.tititle11Button setTitle: self.title11Lablel.text forState:UIControlStateNormal];
-       [self.allBtnArray addObject:self.tititle11Button];
+    
+    self.title11Lablel.text = @"发到小组";
+    self.title11ImageView.image = IMG(@"icon_share_xiaozu");
+    [self.tititle11Button addTarget:self action:@selector(userDidTypeAction:) forControlEvents:UIControlEventTouchDown];
+    [self.tititle11Button setTitle: self.title11Lablel.text forState:UIControlStateNormal];
+    [self.allBtnArray addObject:self.tititle11Button];
+    
+    
+    self.title12Lablel.text = @"发到笔记";
+    self.title12ImageView.image = IMG(@"icon_share_note");
+    [self.tititle12Button addTarget:self action:@selector(userDidTypeAction:) forControlEvents:UIControlEventTouchDown];
+    [self.tititle12Button setTitle: self.title12Lablel.text forState:UIControlStateNormal];
+    [self.allBtnArray addObject:self.tititle12Button];
+    self.title13Lablel.text = @"发到话题";
+    self.title13ImageView.image = IMG(@"icon_share_topic");
+    [self.tititle13Button addTarget:self action:@selector(userDidTypeAction:) forControlEvents:UIControlEventTouchDown];
+    [self.tititle13Button setTitle: self.title13Lablel.text forState:UIControlStateNormal];
+    [self.allBtnArray addObject:self.tititle13Button];
 }
-//-(void)initNoteBookShareData{
-//    self.title00Lablel.text = @"发给微信好友";
-//    self.title00ImageView.image = IMG(@"icon_share_wechat");
-//    [self.tititle00Button addTarget:self action:@selector(userDidTypeAction:) forControlEvents:UIControlEventTouchDown];
-//    [self.tititle00Button setTitle: self.title00Lablel.text forState:UIControlStateNormal];
-//    [self.allBtnArray addObject:self.tititle00Button];
-//
-//
-//    self.title01Lablel.text = @"发到朋友圈";
-//    self.title01ImageView.image = IMG(@"icon_share_friend");
-//    [self.tititle01Button addTarget:self action:@selector(userDidTypeAction:) forControlEvents:UIControlEventTouchDown];
-//    [self.tititle01Button setTitle: self.title01Lablel.text forState:UIControlStateNormal];
-//    [self.allBtnArray addObject:self.tititle01Button];
-//
-//
-//
-//    self.title02Lablel.text = @"发到微博";
-//       self.title02ImageView.image = IMG(@"icon_share_weibo");
-//       [self.tititle02Button addTarget:self action:@selector(userDidTypeAction:) forControlEvents:UIControlEventTouchDown];
-//       [self.tititle02Button setTitle: self.title02Lablel.text forState:UIControlStateNormal];
-//       [self.allBtnArray addObject:self.tititle02Button];
-//
-//
-//
-//    self.title03Lablel.text = @"发给QQ好友";
-//       self.title03ImageView.image = IMG(@"icon_share_tencent");
-//       [self.tititle03Button addTarget:self action:@selector(userDidTypeAction:) forControlEvents:UIControlEventTouchDown];
-//       [self.tititle03Button setTitle: self.title03Lablel.text forState:UIControlStateNormal];
-//       [self.allBtnArray addObject:self.tititle03Button];
-//
-//
-//    self.title10Lablel.text = @"发到消息";
-//       self.title10ImageView.image = IMG(@"icon_share_info");
-//       [self.tititle10Button addTarget:self action:@selector(userDidTypeAction:) forControlEvents:UIControlEventTouchDown];
-//       [self.tititle10Button setTitle: self.title10Lablel.text forState:UIControlStateNormal];
-//       [self.allBtnArray addObject:self.tititle10Button];
-//
-//
-//    self.title11Lablel.text = @"发到小组";
-//       self.title11ImageView.image = IMG(@"icon_share_xiaozu");
-//       [self.tititle11Button addTarget:self action:@selector(userDidTypeAction:) forControlEvents:UIControlEventTouchDown];
-//       [self.tititle11Button setTitle: self.title11Lablel.text forState:UIControlStateNormal];
-//       [self.allBtnArray addObject:self.tititle11Button];
-//
-//
-//    self.title12Lablel.text = @"发到笔记";
-//       self.title12ImageView.image = IMG(@"icon_share_note");
-//       [self.tititle12Button addTarget:self action:@selector(userDidTypeAction:) forControlEvents:UIControlEventTouchDown];
-//       [self.tititle12Button setTitle: self.title12Lablel.text forState:UIControlStateNormal];
-//       [self.allBtnArray addObject:self.tititle12Button];
-//    self.title13Lablel.text = @"发到话题";
-//       self.title13ImageView.image = IMG(@"icon_share_topic");
-//       [self.tititle13Button addTarget:self action:@selector(userDidTypeAction:) forControlEvents:UIControlEventTouchDown];
-//       [self.tititle13Button setTitle: self.title13Lablel.text forState:UIControlStateNormal];
-//       [self.allBtnArray addObject:self.tititle13Button];
-//}
 -(void)userDidTypeAction:(UIButton *)sender{
     for (UIButton *bbb in self.allBtnArray) {
         bbb.selected = NO;

smartRhino/Project/VCModel/My_Center/Controller/NoteBook/NoteBook.storyboard

@@ -833,11 +833,157 @@
                                 <viewLayoutGuide key="safeArea" id="ytf-M7-kBf"/>
                             </view>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="m5o-2N-tPT">
-                                <rect key="frame" x="0.0" y="487" width="375" height="180"/>
+                                <rect key="frame" x="0.0" y="367" width="375" height="300"/>
                                 <subviews>
-                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="29P-QN-AFb" userLabel="sencod">
+                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="jc5-6Y-KCT" userLabel="sencod">
                                         <rect key="frame" x="0.0" y="0.0" width="375" height="120"/>
                                         <subviews>
+                                            <stackView opaque="NO" contentMode="scaleToFill" distribution="fillEqually" baselineRelativeArrangement="YES" translatesAutoresizingMaskIntoConstraints="NO" id="F6H-7R-sbg">
+                                                <rect key="frame" x="15" y="0.0" width="345" height="120"/>
+                                                <subviews>
+                                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="jdN-Pt-fKh">
+                                                        <rect key="frame" x="0.0" y="0.0" width="86.5" height="120"/>
+                                                        <subviews>
+                                                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_share_wechat" translatesAutoresizingMaskIntoConstraints="NO" id="H4z-p4-WD1">
+                                                                <rect key="frame" x="13" y="18" width="60" height="60"/>
+                                                            </imageView>
+                                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="发给微信好友" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ri7-ce-2x9">
+                                                                <rect key="frame" x="6" y="90" width="74" height="14.5"/>
+                                                                <fontDescription key="fontDescription" type="system" pointSize="12"/>
+                                                                <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
+                                                                <nil key="highlightedColor"/>
+                                                            </label>
+                                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="mgC-NC-Izu">
+                                                                <rect key="frame" x="0.0" y="0.0" width="86.5" height="120"/>
+                                                                <color key="tintColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                                <state key="normal">
+                                                                    <color key="titleColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                                </state>
+                                                            </button>
+                                                        </subviews>
+                                                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                        <constraints>
+                                                            <constraint firstAttribute="trailing" secondItem="mgC-NC-Izu" secondAttribute="trailing" id="I10-SE-zph"/>
+                                                            <constraint firstItem="mgC-NC-Izu" firstAttribute="leading" secondItem="jdN-Pt-fKh" secondAttribute="leading" id="NPj-L8-GGR"/>
+                                                            <constraint firstItem="mgC-NC-Izu" firstAttribute="top" secondItem="jdN-Pt-fKh" secondAttribute="top" id="cxe-ah-tOS"/>
+                                                            <constraint firstItem="Ri7-ce-2x9" firstAttribute="centerX" secondItem="jdN-Pt-fKh" secondAttribute="centerX" id="edB-W0-9gJ"/>
+                                                            <constraint firstItem="Ri7-ce-2x9" firstAttribute="top" secondItem="H4z-p4-WD1" secondAttribute="bottom" constant="12" id="lRV-6e-zDf"/>
+                                                            <constraint firstAttribute="bottom" secondItem="mgC-NC-Izu" secondAttribute="bottom" id="sgA-jl-0gb"/>
+                                                            <constraint firstItem="H4z-p4-WD1" firstAttribute="centerX" secondItem="jdN-Pt-fKh" secondAttribute="centerX" id="vN2-bf-GUu"/>
+                                                            <constraint firstItem="H4z-p4-WD1" firstAttribute="top" secondItem="jdN-Pt-fKh" secondAttribute="top" constant="18" id="wWO-fA-GEr"/>
+                                                        </constraints>
+                                                    </view>
+                                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="VyG-W3-wBo">
+                                                        <rect key="frame" x="86.5" y="0.0" width="86" height="120"/>
+                                                        <subviews>
+                                                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_share_wechat" translatesAutoresizingMaskIntoConstraints="NO" id="T6p-74-Qsk">
+                                                                <rect key="frame" x="13" y="18" width="60" height="60"/>
+                                                            </imageView>
+                                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="发给微信好友" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FM0-Ti-QV7">
+                                                                <rect key="frame" x="6" y="90" width="74" height="14.5"/>
+                                                                <fontDescription key="fontDescription" type="system" pointSize="12"/>
+                                                                <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
+                                                                <nil key="highlightedColor"/>
+                                                            </label>
+                                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Jbb-tr-PVv">
+                                                                <rect key="frame" x="0.0" y="0.0" width="86" height="120"/>
+                                                                <color key="tintColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                                <state key="normal">
+                                                                    <color key="titleColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                                </state>
+                                                            </button>
+                                                        </subviews>
+                                                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                        <constraints>
+                                                            <constraint firstAttribute="trailing" secondItem="Jbb-tr-PVv" secondAttribute="trailing" id="3Fr-1y-viF"/>
+                                                            <constraint firstAttribute="bottom" secondItem="Jbb-tr-PVv" secondAttribute="bottom" id="3Xi-hA-FeO"/>
+                                                            <constraint firstItem="T6p-74-Qsk" firstAttribute="centerX" secondItem="VyG-W3-wBo" secondAttribute="centerX" id="G8s-qX-3c0"/>
+                                                            <constraint firstItem="Jbb-tr-PVv" firstAttribute="top" secondItem="VyG-W3-wBo" secondAttribute="top" id="KVC-nK-dfP"/>
+                                                            <constraint firstItem="T6p-74-Qsk" firstAttribute="top" secondItem="VyG-W3-wBo" secondAttribute="top" constant="18" id="OP7-uE-6a4"/>
+                                                            <constraint firstItem="FM0-Ti-QV7" firstAttribute="centerX" secondItem="VyG-W3-wBo" secondAttribute="centerX" id="Zi2-sd-ikc"/>
+                                                            <constraint firstItem="Jbb-tr-PVv" firstAttribute="leading" secondItem="VyG-W3-wBo" secondAttribute="leading" id="vWZ-vl-YaI"/>
+                                                            <constraint firstItem="FM0-Ti-QV7" firstAttribute="top" secondItem="T6p-74-Qsk" secondAttribute="bottom" constant="12" id="z8y-hM-WpM"/>
+                                                        </constraints>
+                                                    </view>
+                                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ax2-EG-Nj9">
+                                                        <rect key="frame" x="172.5" y="0.0" width="86.5" height="120"/>
+                                                        <subviews>
+                                                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_share_wechat" translatesAutoresizingMaskIntoConstraints="NO" id="fAa-cX-vV5">
+                                                                <rect key="frame" x="13" y="18" width="60" height="60"/>
+                                                            </imageView>
+                                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="发给微信好友" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qSS-SV-zB6">
+                                                                <rect key="frame" x="6" y="90" width="74" height="14.5"/>
+                                                                <fontDescription key="fontDescription" type="system" pointSize="12"/>
+                                                                <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
+                                                                <nil key="highlightedColor"/>
+                                                            </label>
+                                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="XfD-3K-8k9">
+                                                                <rect key="frame" x="0.0" y="0.0" width="86.5" height="120"/>
+                                                                <color key="tintColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                                <state key="normal">
+                                                                    <color key="titleColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                                </state>
+                                                            </button>
+                                                        </subviews>
+                                                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                        <constraints>
+                                                            <constraint firstItem="XfD-3K-8k9" firstAttribute="top" secondItem="ax2-EG-Nj9" secondAttribute="top" id="1Yl-dC-fP8"/>
+                                                            <constraint firstItem="XfD-3K-8k9" firstAttribute="leading" secondItem="ax2-EG-Nj9" secondAttribute="leading" id="5EV-4x-ZC8"/>
+                                                            <constraint firstItem="fAa-cX-vV5" firstAttribute="centerX" secondItem="ax2-EG-Nj9" secondAttribute="centerX" id="5JX-HS-7E1"/>
+                                                            <constraint firstItem="fAa-cX-vV5" firstAttribute="top" secondItem="ax2-EG-Nj9" secondAttribute="top" constant="18" id="6L7-Hb-8fP"/>
+                                                            <constraint firstItem="qSS-SV-zB6" firstAttribute="top" secondItem="fAa-cX-vV5" secondAttribute="bottom" constant="12" id="K16-2E-w0D"/>
+                                                            <constraint firstAttribute="trailing" secondItem="XfD-3K-8k9" secondAttribute="trailing" id="ZwI-HI-l2C"/>
+                                                            <constraint firstItem="qSS-SV-zB6" firstAttribute="centerX" secondItem="ax2-EG-Nj9" secondAttribute="centerX" id="ww9-yl-cyN"/>
+                                                            <constraint firstAttribute="bottom" secondItem="XfD-3K-8k9" secondAttribute="bottom" id="zcY-Ll-lpH"/>
+                                                        </constraints>
+                                                    </view>
+                                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="kus-2I-LC7">
+                                                        <rect key="frame" x="259" y="0.0" width="86" height="120"/>
+                                                        <subviews>
+                                                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_share_wechat" translatesAutoresizingMaskIntoConstraints="NO" id="Oo7-in-h6i">
+                                                                <rect key="frame" x="13" y="18" width="60" height="60"/>
+                                                            </imageView>
+                                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="发给微信好友" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fD3-Au-wYt">
+                                                                <rect key="frame" x="6" y="90" width="74" height="14.5"/>
+                                                                <fontDescription key="fontDescription" type="system" pointSize="12"/>
+                                                                <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
+                                                                <nil key="highlightedColor"/>
+                                                            </label>
+                                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="DLc-bc-Jv0">
+                                                                <rect key="frame" x="0.0" y="0.0" width="86" height="120"/>
+                                                                <color key="tintColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                                <state key="normal">
+                                                                    <color key="titleColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                                </state>
+                                                            </button>
+                                                        </subviews>
+                                                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                        <constraints>
+                                                            <constraint firstItem="Oo7-in-h6i" firstAttribute="centerX" secondItem="kus-2I-LC7" secondAttribute="centerX" id="7sq-h4-TW4"/>
+                                                            <constraint firstItem="fD3-Au-wYt" firstAttribute="top" secondItem="Oo7-in-h6i" secondAttribute="bottom" constant="12" id="8P5-gp-ljx"/>
+                                                            <constraint firstItem="DLc-bc-Jv0" firstAttribute="leading" secondItem="kus-2I-LC7" secondAttribute="leading" id="QQ7-at-dtN"/>
+                                                            <constraint firstAttribute="bottom" secondItem="DLc-bc-Jv0" secondAttribute="bottom" id="QmU-3u-iXg"/>
+                                                            <constraint firstItem="DLc-bc-Jv0" firstAttribute="top" secondItem="kus-2I-LC7" secondAttribute="top" id="WdA-hZ-Ayf"/>
+                                                            <constraint firstAttribute="trailing" secondItem="DLc-bc-Jv0" secondAttribute="trailing" id="dnv-el-Svj"/>
+                                                            <constraint firstItem="fD3-Au-wYt" firstAttribute="centerX" secondItem="kus-2I-LC7" secondAttribute="centerX" id="w97-Lm-R75"/>
+                                                            <constraint firstItem="Oo7-in-h6i" firstAttribute="top" secondItem="kus-2I-LC7" secondAttribute="top" constant="18" id="yKq-bH-Fx0"/>
+                                                        </constraints>
+                                                    </view>
+                                                </subviews>
+                                            </stackView>
+                                        </subviews>
+                                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                        <constraints>
+                                            <constraint firstItem="F6H-7R-sbg" firstAttribute="top" secondItem="jc5-6Y-KCT" secondAttribute="top" id="095-s1-f5E"/>
+                                            <constraint firstAttribute="height" constant="120" id="AvW-ZJ-Kr2"/>
+                                            <constraint firstItem="F6H-7R-sbg" firstAttribute="leading" secondItem="jc5-6Y-KCT" secondAttribute="leading" constant="15" id="IFW-aH-uJ7"/>
+                                            <constraint firstAttribute="trailing" secondItem="F6H-7R-sbg" secondAttribute="trailing" constant="15" id="L0K-cr-1nC"/>
+                                            <constraint firstAttribute="bottom" secondItem="F6H-7R-sbg" secondAttribute="bottom" id="RSy-6u-79s"/>
+                                        </constraints>
+                                    </view>
+                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="29P-QN-AFb" userLabel="sencod">
+                                        <rect key="frame" x="0.0" y="120" width="375" height="120"/>
+                                        <subviews>
                                             <stackView opaque="NO" contentMode="scaleToFill" distribution="fillEqually" baselineRelativeArrangement="YES" translatesAutoresizingMaskIntoConstraints="NO" id="fNm-Fk-qRU">
                                                 <rect key="frame" x="15" y="0.0" width="345" height="120"/>
                                                 <subviews>
@@ -905,13 +1051,69 @@
                                                             <constraint firstItem="br0-mR-OWf" firstAttribute="leading" secondItem="mff-LZ-9ON" secondAttribute="leading" id="uX0-q2-Ri9"/>
                                                         </constraints>
                                                     </view>
-                                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="eia-cM-9m7">
+                                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="dsi-56-2Tq">
                                                         <rect key="frame" x="172.5" y="0.0" width="86.5" height="120"/>
+                                                        <subviews>
+                                                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_share_wechat" translatesAutoresizingMaskIntoConstraints="NO" id="ksY-8j-OW2">
+                                                                <rect key="frame" x="13" y="18" width="60" height="60"/>
+                                                            </imageView>
+                                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="发给微信好友" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tTt-st-oa3">
+                                                                <rect key="frame" x="6" y="90" width="74" height="14.5"/>
+                                                                <fontDescription key="fontDescription" type="system" pointSize="12"/>
+                                                                <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
+                                                                <nil key="highlightedColor"/>
+                                                            </label>
+                                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ykG-Ws-s9G">
+                                                                <rect key="frame" x="0.0" y="0.0" width="86.5" height="120"/>
+                                                                <color key="tintColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                                <state key="normal">
+                                                                    <color key="titleColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                                </state>
+                                                            </button>
+                                                        </subviews>
                                                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                        <constraints>
+                                                            <constraint firstItem="tTt-st-oa3" firstAttribute="top" secondItem="ksY-8j-OW2" secondAttribute="bottom" constant="12" id="8ok-04-cPu"/>
+                                                            <constraint firstItem="ykG-Ws-s9G" firstAttribute="leading" secondItem="dsi-56-2Tq" secondAttribute="leading" id="A7s-cD-sp6"/>
+                                                            <constraint firstAttribute="bottom" secondItem="ykG-Ws-s9G" secondAttribute="bottom" id="BfB-l5-ihM"/>
+                                                            <constraint firstItem="ksY-8j-OW2" firstAttribute="top" secondItem="dsi-56-2Tq" secondAttribute="top" constant="18" id="CRr-tC-Bjl"/>
+                                                            <constraint firstAttribute="trailing" secondItem="ykG-Ws-s9G" secondAttribute="trailing" id="a2h-oG-ND5"/>
+                                                            <constraint firstItem="ykG-Ws-s9G" firstAttribute="top" secondItem="dsi-56-2Tq" secondAttribute="top" id="h2c-xq-LdI"/>
+                                                            <constraint firstItem="tTt-st-oa3" firstAttribute="centerX" secondItem="dsi-56-2Tq" secondAttribute="centerX" id="hiG-VP-Vgw"/>
+                                                            <constraint firstItem="ksY-8j-OW2" firstAttribute="centerX" secondItem="dsi-56-2Tq" secondAttribute="centerX" id="t5Q-m6-pHA"/>
+                                                        </constraints>
                                                     </view>
-                                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3Gn-Ac-tax">
+                                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Nhp-8n-61g">
                                                         <rect key="frame" x="259" y="0.0" width="86" height="120"/>
+                                                        <subviews>
+                                                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_share_wechat" translatesAutoresizingMaskIntoConstraints="NO" id="sSy-sW-KiU">
+                                                                <rect key="frame" x="13" y="18" width="60" height="60"/>
+                                                            </imageView>
+                                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="发给微信好友" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Xx5-C8-goc">
+                                                                <rect key="frame" x="6" y="90" width="74" height="14.5"/>
+                                                                <fontDescription key="fontDescription" type="system" pointSize="12"/>
+                                                                <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
+                                                                <nil key="highlightedColor"/>
+                                                            </label>
+                                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="f64-pv-sCH">
+                                                                <rect key="frame" x="0.0" y="0.0" width="86" height="120"/>
+                                                                <color key="tintColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                                <state key="normal">
+                                                                    <color key="titleColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                                </state>
+                                                            </button>
+                                                        </subviews>
                                                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                        <constraints>
+                                                            <constraint firstItem="Xx5-C8-goc" firstAttribute="centerX" secondItem="Nhp-8n-61g" secondAttribute="centerX" id="DZ4-gV-BKc"/>
+                                                            <constraint firstItem="sSy-sW-KiU" firstAttribute="centerX" secondItem="Nhp-8n-61g" secondAttribute="centerX" id="Jcp-7N-gge"/>
+                                                            <constraint firstItem="f64-pv-sCH" firstAttribute="leading" secondItem="Nhp-8n-61g" secondAttribute="leading" id="Sxw-aY-t2F"/>
+                                                            <constraint firstItem="sSy-sW-KiU" firstAttribute="top" secondItem="Nhp-8n-61g" secondAttribute="top" constant="18" id="V9d-bC-miy"/>
+                                                            <constraint firstAttribute="bottom" secondItem="f64-pv-sCH" secondAttribute="bottom" id="ZCd-yt-A6z"/>
+                                                            <constraint firstItem="Xx5-C8-goc" firstAttribute="top" secondItem="sSy-sW-KiU" secondAttribute="bottom" constant="12" id="ha9-Fz-IQ1"/>
+                                                            <constraint firstAttribute="trailing" secondItem="f64-pv-sCH" secondAttribute="trailing" id="rcP-g6-cZe"/>
+                                                            <constraint firstItem="f64-pv-sCH" firstAttribute="top" secondItem="Nhp-8n-61g" secondAttribute="top" id="wbV-aQ-haf"/>
+                                                        </constraints>
                                                     </view>
                                                 </subviews>
                                             </stackView>
@@ -926,7 +1128,7 @@
                                         </constraints>
                                     </view>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="RZZ-Ur-Aky">
-                                        <rect key="frame" x="0.0" y="120" width="375" height="60"/>
+                                        <rect key="frame" x="0.0" y="240" width="375" height="60"/>
                                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="60" id="MJy-L6-h7h"/>
@@ -942,9 +1144,12 @@
                                 </subviews>
                                 <color key="backgroundColor" red="0.96078431372549022" green="0.96470588235294119" blue="0.96470588235294119" alpha="1" colorSpace="calibratedRGB"/>
                                 <constraints>
+                                    <constraint firstItem="jc5-6Y-KCT" firstAttribute="trailing" secondItem="FaU-sL-52r" secondAttribute="trailing" id="0B1-n0-OWG"/>
+                                    <constraint firstItem="jc5-6Y-KCT" firstAttribute="leading" secondItem="FaU-sL-52r" secondAttribute="leading" id="8Tz-QR-6eB"/>
                                     <constraint firstItem="29P-QN-AFb" firstAttribute="leading" secondItem="m5o-2N-tPT" secondAttribute="leading" id="8lB-fJ-anP"/>
                                     <constraint firstItem="RZZ-Ur-Aky" firstAttribute="leading" secondItem="m5o-2N-tPT" secondAttribute="leading" id="IZ8-Yn-WQB"/>
-                                    <constraint firstAttribute="height" constant="180" id="UjF-ZP-e1t"/>
+                                    <constraint firstItem="jc5-6Y-KCT" firstAttribute="top" secondItem="FaU-sL-52r" secondAttribute="top" id="PU0-20-vTm"/>
+                                    <constraint firstAttribute="height" constant="300" id="UjF-ZP-e1t"/>
                                     <constraint firstAttribute="bottom" secondItem="RZZ-Ur-Aky" secondAttribute="bottom" id="Vx0-2s-tvw"/>
                                     <constraint firstAttribute="trailing" secondItem="29P-QN-AFb" secondAttribute="trailing" id="j0C-1I-hMz"/>
                                     <constraint firstItem="RZZ-Ur-Aky" firstAttribute="top" secondItem="29P-QN-AFb" secondAttribute="bottom" id="l7f-mU-pka"/>
@@ -966,12 +1171,32 @@
                         <viewLayoutGuide key="safeArea" id="Oqr-nW-tcc"/>
                     </view>
                     <connections>
+                        <outlet property="fristView" destination="jc5-6Y-KCT" id="H3U-Lh-Co6"/>
+                        <outlet property="showView" destination="m5o-2N-tPT" id="0o6-ct-HgX"/>
+                        <outlet property="tititle00Button" destination="mgC-NC-Izu" id="GT8-wC-fkH"/>
+                        <outlet property="tititle01Button" destination="Jbb-tr-PVv" id="hey-3Z-sq1"/>
+                        <outlet property="tititle02Button" destination="XfD-3K-8k9" id="vjY-1O-a5P"/>
+                        <outlet property="tititle03Button" destination="DLc-bc-Jv0" id="cFS-jH-va5"/>
                         <outlet property="tititle10Button" destination="Tv7-GH-AB0" id="3JE-L9-wvp"/>
                         <outlet property="tititle11Button" destination="br0-mR-OWf" id="1rc-lV-p6N"/>
+                        <outlet property="tititle12Button" destination="ykG-Ws-s9G" id="VZW-j7-bUh"/>
+                        <outlet property="tititle13Button" destination="f64-pv-sCH" id="7VK-DR-gEb"/>
+                        <outlet property="title00ImageView" destination="H4z-p4-WD1" id="f0Q-OW-QMv"/>
+                        <outlet property="title00Lablel" destination="Ri7-ce-2x9" id="xSQ-Ms-g1w"/>
+                        <outlet property="title01ImageView" destination="T6p-74-Qsk" id="IZm-HV-Pao"/>
+                        <outlet property="title01Lablel" destination="FM0-Ti-QV7" id="Nts-Ny-JiM"/>
+                        <outlet property="title02ImageView" destination="fAa-cX-vV5" id="1md-MI-BJx"/>
+                        <outlet property="title02Lablel" destination="qSS-SV-zB6" id="cf9-Si-8am"/>
+                        <outlet property="title03ImageView" destination="Oo7-in-h6i" id="oui-NH-u38"/>
+                        <outlet property="title03Lablel" destination="fD3-Au-wYt" id="kjN-bk-suo"/>
                         <outlet property="title10ImageView" destination="bD0-qS-F7h" id="bZf-Kf-1SG"/>
                         <outlet property="title10Lablel" destination="6kh-uj-WYK" id="GtG-Qy-ay6"/>
                         <outlet property="title11ImageView" destination="gcB-D9-6EZ" id="EQm-jj-69Y"/>
                         <outlet property="title11Lablel" destination="ZMq-j9-m9T" id="ukc-Oe-lgn"/>
+                        <outlet property="title12ImageView" destination="ksY-8j-OW2" id="1dH-ZI-61m"/>
+                        <outlet property="title12Lablel" destination="tTt-st-oa3" id="afR-gT-Vsa"/>
+                        <outlet property="title13ImageView" destination="sSy-sW-KiU" id="Nrc-Cb-s4Z"/>
+                        <outlet property="title13Lablel" destination="Xx5-C8-goc" id="EvB-IU-8sf"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="L1S-QS-k18" userLabel="First Responder" sceneMemberID="firstResponder"/>

smartRhino/Project/VCModel/WorkFlow/CountDataVC.m

@@ -12,6 +12,7 @@
 #import "MoveViewController.h"
 #import "TDGroupInfoListVC.h"
 #import "NoteBookShareVC.h"
+#import "MailListVC.h"
 
 @interface CountDataVC ()<WKUIDelegate,WKNavigationDelegate,WKScriptMessageHandler,NoteBookShareVCDelegate>
 @property (weak, nonatomic) IBOutlet UIView *navBar;
@@ -29,6 +30,7 @@
 }
 - (void)shareHander{
     [self.noteBookShareVC initNoteBookShareData];
+    self.noteBookShareVC.isWork = YES;
     self.noteBookShareVC.view.hidden = !self.noteBookShareVC.view.hidden;
 }
 
@@ -53,7 +55,7 @@
     }else if ([typeName isEqualToString:@"发给QQ好友"]){
         
     }else if ([typeName isEqualToString:@"发到消息"]){
-        
+        [self returnToMessage];
     }else if ([typeName isEqualToString:@"发到小组"]){
         [self returnToGroup];
     }else if ([typeName isEqualToString:@"发到笔记"]){
@@ -63,7 +65,16 @@
     }else{
     }
 }
-
+- (void)returnToMessage
+{
+    MailListVC * vc = [MailListVC initMailListVC];
+    FlowAttachmentsModel * model = [[FlowAttachmentsModel alloc] init];
+    model.SoureTypeId = [self returnType:self.index];
+    model.Title = self.titleStr;
+    vc.sendModel = model;
+    vc.isReturn = YES;
+    [self.navigationController pushViewController:vc animated:YES];
+}
 - (void)returnToGroup
 {
     MyTDGroupViewController * vc = [[MyTDGroupViewController alloc] init];

smartRhino/Project/VCModel/WorkFlow/DownFileViewController.m

@@ -17,6 +17,7 @@
 #import "MyTDTopicViewController.h"
 #import <Social/Social.h>
 #import "MoveViewController.h"
+#import "MailListVC.h"
 
 @interface DownFileViewController ()<WKNavigationDelegate,WKUIDelegate,NoteBookShareVCDelegate>
 //@property (nonatomic, strong) UIImageView *imagview;
@@ -342,6 +343,7 @@
 #pragma mark -转发
 - (void)shareButtonHander{
     [self.noteBookShareVC initNoteBookShareData];
+    self.noteBookShareVC.isWork = YES;
     self.noteBookShareVC.view.hidden = !self.noteBookShareVC.view.hidden;
 }
 - (NoteBookShareVC *)noteBookShareVC{
@@ -364,7 +366,7 @@
     }else if ([typeName isEqualToString:@"发给QQ好友"]){
         
     }else if ([typeName isEqualToString:@"发到消息"]){
-        
+        [self returnToMessage];
     }else if ([typeName isEqualToString:@"发到小组"]){
         [self returnToGroup];
     }else if ([typeName isEqualToString:@"发到笔记"]){
@@ -374,6 +376,17 @@
     }else{
     }
 }
+- (void)returnToMessage
+{
+    MailListVC * vc = [MailListVC initMailListVC];
+    FlowAttachmentsModel * fModel = self.model;
+    if (fModel.SoureTypeId != 301) {
+        fModel.MinUrl = @"";
+    }
+    vc.sendModel = fModel;
+    vc.isReturn = YES;
+    [self.navigationController pushViewController:vc animated:YES];
+}
 - (void)returnToGroup
 {
     MyTDGroupViewController * vc = [[MyTDGroupViewController alloc] init];

smartRhino/Project/VCModel/WorkFlow/MyApprovalPageDetail.m

@@ -31,6 +31,7 @@
 #import "NoteBookDetailVC.h"
 #import "TDGroupInfoListVC.h"
 #import "WorkFlowDetailsController.h"
+#import "MailListVC.h"
 
 @interface MyApprovalPageDetail ()<UITableViewDelegate,UITableViewDataSource,MyWorkFlowFooterViewDelegate,TDNavigationBarDelegate,NoteBookShareVCDelegate>
 @property (nonatomic, strong) TDNavigationBar *myNavigationBar;
@@ -551,6 +552,7 @@
 
 - (void)rightButtonAction:(TDButton *)sender{
     [self.noteBookShareVC initNoteBookShareData];
+    self.noteBookShareVC.isWork = YES;
     self.noteBookShareVC.view.hidden = !self.noteBookShareVC.view.hidden;
 }
 
@@ -576,7 +578,7 @@
     }else if ([typeName isEqualToString:@"发给QQ好友"]){
         [self shareWebPageToPlatformType:UMSocialPlatformType_QQ title:self.title desc:@"微信" url:@"https://www.baidu.com/"];
     }else if ([typeName isEqualToString:@"发到消息"]){
-        
+        [self returnToMessage];
     }else if ([typeName isEqualToString:@"发到小组"]){
         [self returnToGroup];
     }else if ([typeName isEqualToString:@"发到笔记"]){
@@ -615,6 +617,18 @@
         }
     }];
 }
+- (void)returnToMessage
+{
+    MailListVC * vc = [MailListVC initMailListVC];
+    FlowAttachmentsModel * model = [[FlowAttachmentsModel alloc] init];
+    model.SoureId = self.indexId;
+    model.SoureTypeId = CollectModel_work;
+    model.Title = self.title;
+    model.Author = self.currentModel.UserName;
+    vc.sendModel = model;
+    vc.isReturn = YES;
+    [self.navigationController pushViewController:vc animated:YES];
+}
 - (void)returnToGroup
 {
     MyTDGroupViewController * vc = [[MyTDGroupViewController alloc] init];

smartRhino/Project/VCModel/WorkFlow/WorkFlowDetailsController.m

@@ -28,6 +28,7 @@
 #import "WorkFlowOrderController.h"
 #import "WorkFlowFecordController.h"
 #import "MyApprovalPageDetail.h"
+#import "MailListVC.h"
 
 @interface WorkFlowDetailsController ()<UITableViewDelegate,UITableViewDataSource,NoteBookShareVCDelegate>
 
@@ -52,6 +53,7 @@
 
 - (void)shareHander{
     [self.noteBookShareVC initNoteBookShareData];
+    self.noteBookShareVC.isWork = YES;
     self.noteBookShareVC.view.hidden = !self.noteBookShareVC.view.hidden;
 }
 - (NoteBookShareVC *)noteBookShareVC{
@@ -75,7 +77,7 @@
     }else if ([typeName isEqualToString:@"发给QQ好友"]){
         
     }else if ([typeName isEqualToString:@"发到消息"]){
-        
+        [self returnToMessage];
     }else if ([typeName isEqualToString:@"发到小组"]){
         [self returnToGroup];
     }else if ([typeName isEqualToString:@"发到笔记"]){
@@ -86,7 +88,18 @@
     }
 }
 
-
+- (void)returnToMessage
+{
+    MailListVC * vc = [MailListVC initMailListVC];
+    FlowAttachmentsModel * model = [[FlowAttachmentsModel alloc] init];
+    model.SoureTypeId = CollectModel_meetDetail;
+    model.Title = self.meetingModel.Name;
+    model.SoureId = [self.meetingModel.Id integerValue];
+    model.Author = self.meetingModel.UserName;
+    vc.sendModel = model;
+    vc.isReturn = YES;
+    [self.navigationController pushViewController:vc animated:YES];
+}
 - (void)returnToGroup
 {
     MyTDGroupViewController * vc = [[MyTDGroupViewController alloc] init];