no message

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

@@ -2524,7 +2524,7 @@
                 break;
             case CollectModel_Aritle:
             {
-                [self _sendTextAction:@"[文章]" ext:@{@"app":@(YES),
+                [self _sendTextAction:@"文章" ext:@{@"app":@(YES),
                                                         @"app_type":@(CollectModel_Aritle),
                                                         @"app_title":self.sendModel.Title,
                                                         @"app_id":@(self.sendModel.SoureId),
@@ -2537,7 +2537,7 @@
                 break;
             case CollectModel_Notice:
             {
-                [self _sendTextAction:@"[通知]" ext:@{@"app":@(YES),
+                [self _sendTextAction:@"通知" ext:@{@"app":@(YES),
                                                         @"app_type":@(CollectModel_Notice),
                                                         @"app_title":self.sendModel.Title,
                                                         @"app_id":@(self.sendModel.SoureId),
@@ -2550,7 +2550,7 @@
                 break;
             case CollectModel_NoteBook:
             {
-                [self _sendTextAction:@"[笔记]" ext:@{@"app":@(YES),
+                [self _sendTextAction:@"笔记" ext:@{@"app":@(YES),
                                                         @"app_type":@(CollectModel_NoteBook),
                                                         @"app_title":self.sendModel.Title,
                                                         @"app_id":@(self.sendModel.SoureId),
@@ -2563,7 +2563,7 @@
                 break;
             case CollectModel_NewTopic:
             {
-                [self _sendTextAction:@"[话题]" ext:@{@"app":@(YES),
+                [self _sendTextAction:@"话题" ext:@{@"app":@(YES),
                                                         @"app_type":@(CollectModel_NewTopic),
                                                         @"app_title":self.sendModel.Title,
                                                         @"app_id":@(self.sendModel.SoureId),
@@ -2576,7 +2576,7 @@
                 break;
             case CollectModel_Toipc:
             {
-                [self _sendTextAction:@"[话题]" ext:@{@"app":@(YES),
+                [self _sendTextAction:@"话题" ext:@{@"app":@(YES),
                                                         @"app_type":@(CollectModel_Toipc),
                                                         @"app_title":self.sendModel.Title,
                                                         @"app_id":@(self.sendModel.SoureId),
@@ -2589,7 +2589,7 @@
                 break;
             case CollectModel_InterMail:
             {
-                [self _sendTextAction:@"[站内信]" ext:@{@"app":@(YES),
+                [self _sendTextAction:@"站内信" ext:@{@"app":@(YES),
                                                         @"app_type":@(CollectModel_InterMail),
                                                         @"app_title":self.sendModel.Title,
                                                         @"app_id":@(self.sendModel.SoureId),
@@ -2602,7 +2602,7 @@
                 break;
             case CollectModel_CollectFile:
             {
-                [self _sendTextAction:@"[收藏文件夹]" ext:@{@"app":@(YES),
+                [self _sendTextAction:@"收藏文件夹" ext:@{@"app":@(YES),
                                                         @"app_type":@(CollectModel_CollectFile),
                                                         @"app_title":self.sendModel.Title,
                                                         @"app_id":@(self.sendModel.SoureId),
@@ -2615,7 +2615,7 @@
                 break;
             case CollectModel_NoteFile:
             {
-                [self _sendTextAction:@"[笔记文件夹]" ext:@{@"app":@(YES),
+                [self _sendTextAction:@"笔记文件夹" ext:@{@"app":@(YES),
                                                         @"app_type":@(CollectModel_NoteFile),
                                                         @"app_title":self.sendModel.Title,
                                                         @"app_id":@(self.sendModel.SoureId),
@@ -2628,7 +2628,7 @@
                 break;
             case CollectModel_meetMian:
             {
-                [self _sendTextAction:@"[会议纪要]" ext:@{@"app":@(YES),
+                [self _sendTextAction:@"会议纪要" ext:@{@"app":@(YES),
                                                         @"app_type":@(CollectModel_meetMian),
                                                         @"app_title":self.sendModel.Title,
                                                         @"app_id":@(self.sendModel.SoureId),
@@ -2641,7 +2641,7 @@
                 break;
             case CollectModel_Image:///图片
             {
-                [self _sendTextAction:@"[审批]" ext:@{@"app":@(YES),
+                [self _sendTextAction:@"审批" ext:@{@"app":@(YES),
                                                         @"app_type":@(CollectModel_Image),
                                                         @"app_title":self.sendModel.Title,
                                                         @"app_id":@(self.sendModel.SoureId),
@@ -2654,7 +2654,7 @@
                 break;
             case CollectModel_file:///文件
             {
-                [self _sendTextAction:@"[文件]" ext:@{@"app":@(YES),
+                [self _sendTextAction:@"文件" ext:@{@"app":@(YES),
                                                         @"app_type":@(CollectModel_file),
                                                         @"app_title":self.sendModel.Title,
                                                         @"app_id":@(self.sendModel.SoureId),
@@ -2667,7 +2667,7 @@
                 break;
             case CollectModel_work:///工作
             {
-                [self _sendTextAction:@"[审批]" ext:@{@"app":@(YES),
+                [self _sendTextAction:@"审批" ext:@{@"app":@(YES),
                                                         @"app_type":@(CollectModel_work),
                                                         @"app_title":self.sendModel.Title,
                                                         @"app_id":@(self.sendModel.SoureId),
@@ -2680,7 +2680,7 @@
                 break;
             case CollectModel_meetDetail:///会议
             {
-                [self _sendTextAction:@"[会议]" ext:@{@"app":@(YES),
+                [self _sendTextAction:@"会议" ext:@{@"app":@(YES),
                                                         @"app_type":@(CollectModel_meetDetail),
                                                         @"app_title":self.sendModel.Title,
                                                         @"app_id":@(self.sendModel.SoureId),
@@ -2693,7 +2693,7 @@
                 break;
             case CollectModel_financeCount:///文本
             {
-                [self _sendTextAction:@"[财务统计]" ext:@{@"app":@(YES),
+                [self _sendTextAction:@"财务统计" ext:@{@"app":@(YES),
                                                         @"app_type":@(CollectModel_financeCount),
                                                         @"app_title":self.sendModel.Title,
                                                         @"app_id":@(self.sendModel.SoureId),
@@ -2706,7 +2706,7 @@
                 break;
             case CollectModel_affairsCount:///文本
             {
-                [self _sendTextAction:@"[人事统计]" ext:@{@"app":@(YES),
+                [self _sendTextAction:@"人事统计" ext:@{@"app":@(YES),
                                                         @"app_type":@(CollectModel_affairsCount),
                                                         @"app_title":self.sendModel.Title,
                                                         @"app_id":@(self.sendModel.SoureId),
@@ -2719,7 +2719,7 @@
                 break;
             case CollectModel_publishCount:///文本
             {
-                [self _sendTextAction:@"[出版统计]" ext:@{@"app":@(YES),
+                [self _sendTextAction:@"出版统计" ext:@{@"app":@(YES),
                                                         @"app_type":@(CollectModel_publishCount),
                                                         @"app_title":self.sendModel.Title,
                                                         @"app_id":@(self.sendModel.SoureId),
@@ -2732,7 +2732,7 @@
                 break;
             default:
             {
-                [self _sendTextAction:@"[出版统计]" ext:@{@"app":@(YES),
+                [self _sendTextAction:@"出版统计" ext:@{@"app":@(YES),
                                                         @"app_type":@(CollectModel_publishCount),
                                                         @"app_title":self.sendModel.Title,
                                                         @"app_id":@(self.sendModel.SoureId),

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

@@ -943,6 +943,7 @@
                             controller.sModel = sModel;
                             controller.sendModel = self.sendModel;
                             controller.isReturn = self.isReturn;
+                            controller.ReceiveIcon = [dic objectForKey:@"AvatarUrl"];
                             controller.chatType = 1;//单聊
                             [self.navigationController pushViewController:controller animated:YES];
                         }else{
@@ -999,6 +1000,7 @@
                             controller.sModel = sModel;
                             controller.sendModel = self.sendModel;
                             controller.isReturn = self.isReturn;
+                            controller.ReceiveIcon = model.AvatarUrl;
                             controller.chatType = 1;//单聊
                             [self.navigationController pushViewController:controller animated:YES];
                         }else{

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

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

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

@@ -182,6 +182,7 @@
                 controller.toUserId = model.SourceId;
                 emModel.name = model.SourceName ? model.SourceName : model.Phone;
                 controller.sModel = model;
+                controller.ReceiveIcon = model.AvatarUrl;
                 controller.sendModel = self.sendModel;
                 controller.isReturn = self.isReturn;
                 controller.chatType = 1;//单聊

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

@@ -166,6 +166,9 @@
             controller.sModel = sModel;
             controller.sendModel = self.sendModel;
             controller.isReturn = self.isReturn;
+            if (cmodel.ChatType == ChatType_SingleChat ) {
+                controller.ReceiveIcon = cmodel.AvatarUrl;
+            }
             controller.chatType = cmodel.ChatType;
             [self.navigationController pushViewController:controller animated:YES];
         }

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

@@ -883,7 +883,7 @@
         [[HttpManager sharedHttpManager] GETUrl:[NSString stringWithFormat:@"%@%@",BaseUrl,[NSString stringWithFormat:@"/api/app/article/detail/%ld",self.Id]] parameters:@{@"id":@(self.Id)}
                                   responseStyle:JOSN success:^(id  _Nonnull responseObject) {
             weakSelf.currentNoteModel = [[MyNoteBookDetailModel alloc]initWithDictionary:responseObject error:nil];
-            if (++httpFinishCount == 3) {
+            if (++httpFinishCount == 2) {
                 dispatch_semaphore_signal(sem);
             }
         } failure:^(NSError * _Nonnull error) {

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

@@ -194,6 +194,7 @@
     [self autoSizeBtn:@"全部"];
     [self getGroupList];
     [self setTableViewRefresh];
+    [self.view addSubview:self.noteBookShareVC.view];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(headRefresh) name:TOPICDATAUPDATA object:nil];
 }
 - (void)autoSizeBtn:(NSString *)title

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

@@ -62,6 +62,8 @@
 @property (weak, nonatomic) IBOutlet NSLayoutConstraint *seachBgViewH;
 @property (weak, nonatomic) IBOutlet NSLayoutConstraint *threeConstH;
 
+@property (nonatomic,assign) BOOL isBarReturn;
+
 @property (strong, nonatomic) NoteBookShareVC *noteBookShareVC;
 @property (strong, nonatomic) NoteBookCommentVC *noteBookCommentVC;
 @property (strong, nonatomic) FlowAttachmentsModel * returnModel;
@@ -473,6 +475,7 @@
                 fmodel.SoureId = weakSelf.FolderId;
                 fmodel.Author = [AppUserModel sharedAppUserModel].Name;
                 fmodel.SourceUserId = [AppUserModel sharedAppUserModel].Id;
+                weakSelf.isBarReturn = YES;
                 weakSelf.returnModel = fmodel;
                 weakSelf.noteBookShareVC.view.hidden = !weakSelf.noteBookShareVC.view.hidden;
             }
@@ -2792,6 +2795,7 @@
     fmodel.SoureId = model.MiddleId;
     fmodel.Author = model.Name;
     fmodel.SourceUserId = model.SourceUserId;
+    self.isBarReturn = NO;
     self.returnModel = fmodel;
     self.noteBookShareVC.view.hidden = !self.noteBookShareVC.view.hidden;
 }
@@ -2799,6 +2803,7 @@
 - (NoteBookShareVC *)noteBookShareVC{
     if (_noteBookShareVC == nil) {
         _noteBookShareVC = [NoteBookShareVC initNoteBookShareVC];
+        [_noteBookShareVC.view setFrame:CGRectMake(0,0, SCREEN_WIDTH, SCREEN_HEIGHT)];
         [_noteBookShareVC.view setHidden:YES];
         _noteBookShareVC.delegate = self;
     }
@@ -2806,8 +2811,6 @@
 }
 - (void)userSelectType:(NSString *)typeName WithIndexPath:(NSIndexPath *)indexPath
 {
-    //    TopicListItemModel * model = [self.dataArray objectAtIndex:(indexPath.section - 1)];
-    
     self.noteBookShareVC.view.hidden = !self.noteBookShareVC.view.hidden;
     if ([typeName isEqualToString:@"发给微信好友"]) {
         [self returnToWechatSession];
@@ -2855,24 +2858,29 @@
 }
 - (void)returnToWechatSession
 {
-    [self shareWebPageToPlatformType:UMSocialPlatformType_WechatSession title:self.myTitle desc:[NSString stringWithFormat:@"来自-%@",[AppUserModel sharedAppUserModel].Name] url:[self returnUrl]];
+    [self shareWebPageToPlatformType:UMSocialPlatformType_WechatSession title:self.returnModel.Title desc:[NSString stringWithFormat:@"来自-%@",self.returnModel.Author] url:[self returnUrl]];
 }
 - (void)returnToWechatTimeLine
 {
-    [self shareWebPageToPlatformType:UMSocialPlatformType_WechatTimeLine title:self.myTitle desc:[NSString stringWithFormat:@"来自-%@",[AppUserModel sharedAppUserModel].Name] url:[self returnUrl]];
+    [self shareWebPageToPlatformType:UMSocialPlatformType_WechatTimeLine title:self.returnModel.Title desc:[NSString stringWithFormat:@"来自-%@",self.returnModel.Author] url:[self returnUrl]];
 }
 - (void)returnToSina
 {
-    [self shareWebPageToPlatformType:UMSocialPlatformType_Sina title:self.myTitle desc:[NSString stringWithFormat:@"来自-%@",[AppUserModel sharedAppUserModel].Name] url:[self returnUrl]];
+    [self shareWebPageToPlatformType:UMSocialPlatformType_Sina title:self.returnModel.Title desc:[NSString stringWithFormat:@"来自-%@",self.returnModel.Author] url:[self returnUrl]];
 }
 - (void)returnToQQ
 {
-    [self shareWebPageToPlatformType:UMSocialPlatformType_QQ title:self.myTitle desc:[NSString stringWithFormat:@"来自-%@",[AppUserModel sharedAppUserModel].Name] url:[self returnUrl]];
+    [self shareWebPageToPlatformType:UMSocialPlatformType_QQ title:self.returnModel.Title desc:[NSString stringWithFormat:@"来自-%@",self.returnModel.Author] url:[self returnUrl]];
 }
 - (NSString *)returnUrl
 {
-    NSString * url = [NSString stringWithFormat:@"%@id=%ld&type=%d&userId=%ld&name=%@&describe=%@",Host(@"/admin/mobile/folderWx?"),(long)self.FolderId,CollectModel_NoteFile,(long)[AppUserModel sharedAppUserModel].Id,self.myTitle,[AppUserModel sharedAppUserModel].Name];
-    return url;
+    if (self.isBarReturn) {
+        NSString * url = [NSString stringWithFormat:@"%@id=%ld&type=%d&userId=%ld&name=%@&describe=%@",Host(@"/admin/mobile/folderWx?"),(long)self.returnModel.SoureId,CollectModel_NoteFile,(long)self.returnModel.SourceUserId,self.returnModel.Title,self.returnModel.Author];
+        return url;
+    }else{
+        NSString * url = [NSString stringWithFormat:@"%@%ld",Host(@"/admin/mobile/noteDetailsWx?"),(long)self.returnModel.SoureId];
+        return url;
+    }
 }
 #pragma mark - 分享功能
 - (void)returnToMessage