no message

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

@@ -39,5 +39,37 @@
             breakpointStackSelectionBehavior = "1">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "B13976A5-107C-46DF-9E4E-8E962C4790C3"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "smartRhino/Project/VCModel/Source/Controller/GroupSynopsisVC.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "166"
+            endingLineNumber = "166"
+            landmarkName = "-tableView:cellForRowAtIndexPath:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "ACEC70EC-F238-4DC4-AE8F-88763DD952F7"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "smartRhino/Project/VCModel/Home/OtherHomeVC/MyTDTopic/VC/MyTDTopicCreateVC.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "1595"
+            endingLineNumber = "1595"
+            landmarkName = "-sentMailRequeast:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

smartRhino/AppConfig.h

@@ -132,8 +132,8 @@ return;\
 #define MHObjectIsNil(__object)  ((nil == __object) || [__object isKindOfClass:[NSNull class]])
 
 //#define BaseUrl @"http://111.12.8.69:83"///广西
-//#define HtmlUrl @"http://192.168.0.111:8081"
-//#define HtmlUrl @"http://192.168.0.116:8080"
+//#define HtmlUrl @"http://192.168.0.113:8081"
+//#define HtmlUrl @"http://192.168.0.114:8081"
 
 #define BaseUrl @"https://apk.tederen.com/service"
 #define HtmlUrl @"https://apk.tederen.com"
@@ -146,8 +146,6 @@ return;\
 
 #define Host(x) [NSString stringWithFormat:@"%@%@",BaseUrl,x]
 #define HtmlHost(x) [NSString stringWithFormat:@"%@%@",HtmlUrl,x]
-#pragma mark - 应用
-
 
 #pragma mark - 用户系统
 #define LoginSendCodeGet @"/api/app/user/sendSmsCode"

smartRhino/AppDelegate.m

@@ -89,53 +89,52 @@
 - (BOOL)application:(UIApplication *)application openURL:(NSURL *)url sourceApplication:(NSString *)sourceApplication annotation:(id)annotation
 {
     NSString * str = [url absoluteString];
-    if ([str hasPrefix:@"ioSsmartrhino"]) {
+    if ([str hasPrefix:@"iostedeapp"]) {
         if (![UserManager checkStringNull:kToken]){
-            str = [str substringFromIndex:20];
+            str = [str substringFromIndex:17];
             NSArray *array = [str componentsSeparatedByString:@"&"];
+            NSLog(@"%@",array);
             NSDictionary * dict= @{@"Id":array[0],@"type":array[1],@"userId":array[2],@"name":array[3],@"describe":array[4]};
-            [[NSNotificationCenter defaultCenter] postNotificationName:SHARERETURNSUCCESS object:nil userInfo:dict];
-            UIWindow *window = [UtilsTools getWindow];
-            window.rootViewController = [TabBarController sharedTabBarController];
-            [[TabBarController sharedTabBarController] setSelectedIndex:0];
-            [window makeKeyAndVisible];
+            [self pushVC:dict];
         }else{
             UIWindow *window = [UtilsTools getWindow];
             window.rootViewController = [StoryboardManager shared].login.instantiateInitialViewController;
             [window makeKeyAndVisible];
         }
+        return YES;
     }
     return [WXApi handleOpenURL:url delegate:self];
 }
-
 /// 分享回调
 - (BOOL)application:(UIApplication *)app openURL:(NSURL *)url options:(NSDictionary<UIApplicationOpenURLOptionsKey, id> *)options
 {
-    //6.3的新的API调用，是为了兼容国外平台(例如:新版facebookSDK,VK等)的调用[如果用6.2的api调用会没有回调],对国内平台没有影响
-//    NSString * str = [url absoluteString];
-//    if ([str hasPrefix:@"iossmartrhino"]) {
-//        if (![UserManager checkStringNull:kToken]){
-//            str = [str substringFromIndex:20];
-//            NSArray *array = [str componentsSeparatedByString:@"&"];
-//            NSDictionary * dict= @{@"Id":array[0],@"type":array[1],@"userId":array[2],@"name":array[3],@"describe":array[4]};
-//            [[NSNotificationCenter defaultCenter] postNotificationName:SHARERETURNSUCCESS object:nil userInfo:dict];
-//            UIWindow *window = [UtilsTools getWindow];
-//            window.rootViewController = [TabBarController sharedTabBarController];
-//            [[TabBarController sharedTabBarController] setSelectedIndex:0];
-//            [window makeKeyAndVisible];
-//        }else{
-//            UIWindow *window = [UtilsTools getWindow];
-//            window.rootViewController = [StoryboardManager shared].login.instantiateInitialViewController;
-//            [window makeKeyAndVisible];
-//        }
-//    }
-    BOOL result = [[UMSocialManager defaultManager]  handleOpenURL:url options:options];
-    if (!result) {
-        return [WXApi handleOpenURL:url delegate:self];
+    NSString * str = [url absoluteString];
+    if ([str hasPrefix:@"iostedeapp"]) {
+        if (![UserManager checkStringNull:kToken]){
+            str = [str substringFromIndex:17];
+            NSArray *array = [str componentsSeparatedByString:@"&"];
+            NSLog(@"%@",array);
+            NSDictionary * dict= @{@"Id":array[0],@"type":array[1],@"userId":array[2],@"name":array[3],@"describe":array[4]};
+            [self pushVC:dict];
+        }else{
+            UIWindow *window = [UtilsTools getWindow];
+            window.rootViewController = [StoryboardManager shared].login.instantiateInitialViewController;
+            [window makeKeyAndVisible];
+        }
+        return YES;
     }
-    return result;
+    return [WXApi handleOpenURL:url delegate:self];
+}
+-(void)pushVC:(NSDictionary *)dict
+{
+    UIWindow *window = [UtilsTools getWindow];
+    window.rootViewController = [TabBarController sharedTabBarController];
+    [[TabBarController sharedTabBarController] setSelectedIndex:0];
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        [[NSNotificationCenter defaultCenter] postNotificationName:SHARERETURNSUCCESS object:nil userInfo:dict];
+    });
+    [window makeKeyAndVisible];
 }
-
 + (UINavigationController *)getRootController {
     return (UINavigationController *)[UIApplication sharedApplication].keyWindow.rootViewController;
 }

smartRhino/Assets.xcassets/more_white.imageset/Contents.json

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

smartRhino/Assets.xcassets/首页/share_file.imageset/Contents.json

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

smartRhino/FwzAppConfig.h

@@ -53,9 +53,9 @@ typedef enum SuperPageTypeChatMsgNotice {
 ///文件夹类型 0 文章 1 通知 2话题 3 收藏 4笔记 5 普通站内信 6匿名站内信 7小组
 typedef enum CreateFileFolderType {
     ///0 文章
-    CreateArticleType = 0,
+    CreateArticleType = 100,
     ///1 通知
-    CreateNoticeType = 1,
+    CreateNoticeType = 5,
     ///2 话题
     CreateTopicType = 2,
     ///3 收藏
@@ -65,9 +65,9 @@ typedef enum CreateFileFolderType {
     ///- 4话题本
     CreateNewTopicType = -4,
     ///5 普通站内信
-    CreateCommonType = 5,
-    ///6匿名站内信
-    CreateAnonymousType = 6,
+    CreateCommonType = 6,
+//    ///6匿名站内信
+//    CreateAnonymousType = 6,
     ///7小组
     CreateGroupType = 7,
     ///8会议
@@ -310,7 +310,8 @@ typedef enum CollectModelType{
     CollectModel_Notice = 5,
     CollectModel_InterMail = 6,
     CollectModel_Group = 7,
-    CollectModel_meet = 8,
+//    CollectModel_meet = 8,
+    CollectModel_meetMian  = 8,
     CollectModel_CollectFile = 12,
     CollectModel_NoteFile = 13,
     CollectModel_work = 14,
@@ -323,11 +324,12 @@ typedef enum CollectModelType{
     CollectModel_Aritle = 100,
     CollectModel_file = 300,
     CollectModel_Image = 301,
-    CollectModel_meetMian  = 400,
+//    CollectModel_meetMian  = 8,
     CollectModel_meetDetail  = 500,
     CollectModel_financeCount  = 601,
     CollectModel_affairsCount  = 602,
     CollectModel_publishCount  = 603,
+    CollectModel_ShouJian  = 800,
 }CollectModelType;
  /// 0 新建 1 回复 2 回复全部 3 编辑
 typedef enum MailReplayType{

smartRhino/Info.plist

@@ -124,7 +124,9 @@
 			<key>CFBundleURLName</key>
 			<string>com.tedehezhong.tdxy</string>
 			<key>CFBundleURLSchemes</key>
-			<array/>
+			<array>
+				<string>iostedeApp</string>
+			</array>
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>

smartRhino/Project/Base/SubClass/SWQRCode/SWQRCodeViewController.m

@@ -287,17 +287,14 @@
 - (void)sw_handleWithValue:(NSString *)value {
     NSLog(@"sw_handleWithValue === %@", value);
     
-    
     if ([self.delegate respondsToSelector:@selector(scanResult:)]) {
+        [self.navigationController popViewControllerAnimated:NO];
         [self.delegate scanResult:value];
-        [self.navigationController popToRootViewControllerAnimated:YES];
     }
     
-    
 //    [[UIApplication sharedApplication] openURL:[NSURL URLWithString:[NSString stringWithFormat:@"http://www.baidu.com?%@",value]] options:@{} completionHandler:^(BOOL success) {
 //        [self.navigationController popToRootViewControllerAnimated:YES];
 //    }];
-   
 }
 
 /**

smartRhino/Project/Tools/ZYCTool.m

@@ -176,40 +176,46 @@
 
 /// 设置间距
 +(void)setLabelSpace:(UILabel*)label withSpace:(CGFloat)space withFont:(UIFont*)font  {
-    
-        NSMutableParagraphStyle *paraStyle = [[NSMutableParagraphStyle alloc] init];
-        paraStyle.lineBreakMode = NSLineBreakByCharWrapping;
-        paraStyle.alignment = NSTextAlignmentLeft;
-        paraStyle.lineSpacing = space; //设置行间距
-        paraStyle.hyphenationFactor = 1.0;
-        paraStyle.firstLineHeadIndent = 0.0;
-        paraStyle.paragraphSpacingBefore = 0.0;
-        paraStyle.headIndent = 0;
-        paraStyle.tailIndent = 0;
-        //设置字间距 NSKernAttributeName:@1.5f
-        NSDictionary *dic = @{NSFontAttributeName:font, NSParagraphStyleAttributeName:paraStyle, NSKernAttributeName:@0.0f
-                              };
-        NSAttributedString *attributeStr = [[NSAttributedString alloc] initWithString:label.text attributes:dic];
-        label.attributedText = attributeStr;
+    if (label.text.length == 0) {
+        label.text = @"";
+        return;
+    }
+    NSMutableParagraphStyle *paraStyle = [[NSMutableParagraphStyle alloc] init];
+    paraStyle.lineBreakMode = NSLineBreakByCharWrapping;
+    paraStyle.alignment = NSTextAlignmentLeft;
+    paraStyle.lineSpacing = space; //设置行间距
+    paraStyle.hyphenationFactor = 1.0;
+    paraStyle.firstLineHeadIndent = 0.0;
+    paraStyle.paragraphSpacingBefore = 0.0;
+    paraStyle.headIndent = 0;
+    paraStyle.tailIndent = 0;
+    //设置字间距 NSKernAttributeName:@1.5f
+    NSDictionary *dic = @{NSFontAttributeName:font, NSParagraphStyleAttributeName:paraStyle, NSKernAttributeName:@0.0f
+    };
+    NSAttributedString *attributeStr = [[NSAttributedString alloc] initWithString:label.text attributes:dic];
+    label.attributedText = attributeStr;
 }
 
 /// 设置首行缩进和行距
 +(void)setLabelFirstLineHeadIndent:(UILabel*)label withSpace:(CGFloat)space withFont:(UIFont*)font setTing:(NSUInteger)headIndent  {
-    
-        NSMutableParagraphStyle *paraStyle = [[NSMutableParagraphStyle alloc] init];
-        paraStyle.lineBreakMode = NSLineBreakByCharWrapping;
-        paraStyle.alignment = NSTextAlignmentLeft;
-        paraStyle.lineSpacing = space; //设置行间距
-        paraStyle.hyphenationFactor = 1.0;
-        paraStyle.firstLineHeadIndent = font.pointSize * headIndent;
-        paraStyle.paragraphSpacingBefore = 0.0;
-        paraStyle.headIndent = 0;
-        paraStyle.tailIndent = 0;
-        //设置字间距 NSKernAttributeName:@1.5f
-        NSDictionary *dic = @{NSFontAttributeName:font, NSParagraphStyleAttributeName:paraStyle, NSKernAttributeName:@0.0f
-                              };
-        NSAttributedString *attributeStr = [[NSAttributedString alloc] initWithString:label.text attributes:dic];
-        label.attributedText = attributeStr;
+    if (label.text.length == 0) {
+        label.text = @"";
+        return;
+    }
+    NSMutableParagraphStyle *paraStyle = [[NSMutableParagraphStyle alloc] init];
+    paraStyle.lineBreakMode = NSLineBreakByCharWrapping;
+    paraStyle.alignment = NSTextAlignmentLeft;
+    paraStyle.lineSpacing = space; //设置行间距
+    paraStyle.hyphenationFactor = 1.0;
+    paraStyle.firstLineHeadIndent = font.pointSize * headIndent;
+    paraStyle.paragraphSpacingBefore = 0.0;
+    paraStyle.headIndent = 0;
+    paraStyle.tailIndent = 0;
+    //设置字间距 NSKernAttributeName:@1.5f
+    NSDictionary *dic = @{NSFontAttributeName:font, NSParagraphStyleAttributeName:paraStyle, NSKernAttributeName:@0.0f
+    };
+    NSAttributedString *attributeStr = [[NSAttributedString alloc] initWithString:label.text attributes:dic];
+    label.attributedText = attributeStr;
 }
 
 /// 设置首行缩进和行距 字距
@@ -217,21 +223,21 @@
     if (ISEmptyString( label.text)) {
         return;
     }
-        NSMutableParagraphStyle *paraStyle = [[NSMutableParagraphStyle alloc] init];
-        paraStyle.lineBreakMode = NSLineBreakByCharWrapping;
-        paraStyle.alignment = NSTextAlignmentNatural;
-        paraStyle.lineSpacing = space; //设置行间距
-        paraStyle.hyphenationFactor = 1.0;
-        //paraStyle.firstLineHeadIndent = font.pointSize * headIndent;
-        paraStyle.paragraphSpacingBefore = 0.0;
-        paraStyle.headIndent = 0;
-        paraStyle.tailIndent = 0;
-        //设置字间距 NSKernAttributeName:@1.5f
-        NSDictionary *dic = @{NSFontAttributeName:font, NSParagraphStyleAttributeName:paraStyle, NSKernAttributeName:@(textspace)
-                              };
-        NSAttributedString *attributeStr = [[NSAttributedString alloc] initWithString:label.text attributes:dic];
-   
-        label.attributedText = attributeStr;
+    NSMutableParagraphStyle *paraStyle = [[NSMutableParagraphStyle alloc] init];
+    paraStyle.lineBreakMode = NSLineBreakByCharWrapping;
+    paraStyle.alignment = NSTextAlignmentNatural;
+    paraStyle.lineSpacing = space; //设置行间距
+    paraStyle.hyphenationFactor = 1.0;
+    //paraStyle.firstLineHeadIndent = font.pointSize * headIndent;
+    paraStyle.paragraphSpacingBefore = 0.0;
+    paraStyle.headIndent = 0;
+    paraStyle.tailIndent = 0;
+    //设置字间距 NSKernAttributeName:@1.5f
+    NSDictionary *dic = @{NSFontAttributeName:font, NSParagraphStyleAttributeName:paraStyle, NSKernAttributeName:@(textspace)
+    };
+    NSAttributedString *attributeStr = [[NSAttributedString alloc] initWithString:label.text attributes:dic];
+    
+    label.attributedText = attributeStr;
 }
 + (NSString *)handerResultData:(NSError *)error{
     NSParameterAssert(error);

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

@@ -390,6 +390,7 @@
             ||[self.navigationController.viewControllers[i] isKindOfClass:NSClassFromString(@"TDGroupInfoListVC")]
             ||[self.navigationController.viewControllers[i] isKindOfClass:NSClassFromString(@"CommonNoteVC")]
             ||[self.navigationController.viewControllers[i] isKindOfClass:NSClassFromString(@"SourceHomeVC")]
+            ||[self.navigationController.viewControllers[i] isKindOfClass:NSClassFromString(@"MyInfoVC")]
             ||[self.navigationController.viewControllers[i] isKindOfClass:NSClassFromString(@"MyFavoriteVC")]
             ||[self.navigationController.viewControllers[i] isKindOfClass:NSClassFromString(@"CommonHomeVC")]) {
             [self.navigationController popToViewController:self.navigationController.viewControllers[i] animated:YES];
@@ -2773,15 +2774,7 @@
                 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":@"来自-审批",
-                                                        @"app_sourceUserId":@(self.sendModel.SourceUserId),
-                                                        @"app_min_url":self.sendModel.MinUrl,
-                                                        @"app_url":self.sendModel.Url,
-                }];
+                [self _sendImageDataAction:[NSData dataWithContentsOfURL:[NSURL URLWithString:self.sendModel.Url]]];
             }
                 break;
             case CollectModel_file:///文件
@@ -3157,6 +3150,7 @@
     MoveViewController * vc = [MoveViewController initMoveViewController];
     vc.isFromCreateBookVc = YES;
     vc.TypeId = CreateNotesType;
+    vc.CollectionType = CollectModel_NoteBook;
     vc.ParentId = 0;
     vc.sendModel = self.sendModel;
     vc.sendImage = self.sendImage;

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

@@ -622,9 +622,7 @@
         NSString * url = [NSString stringWithFormat:@"%@%ld",Host(API_App_Group_Chat),(long)self.GroupChatImId];
         [[HttpManager sharedHttpManager] DeleteUrl:url parameters:@{} responseStyle:DATA success:^(id  _Nonnull responseObject) {
             REMOVESHOW
-            dispatch_async(dispatch_get_main_queue(), ^{
-                [weakSelf.navigationController popToRootViewControllerAnimated:YES];
-            });
+            [weakSelf back1];
         } failure:^(NSError * _Nonnull error) {
             REMOVESHOW
             SHOWERROR([ZYCTool handerResultData:error]);
@@ -639,16 +637,22 @@
         [[HttpManager sharedHttpManager] POSTUrl:Host(Group_chat_remove_users) parameters:dic responseStyle:DATA success:^(id  _Nonnull responseObject) {
             NSLog(@"%@",responseObject);
             REMOVESHOW
-            dispatch_async(dispatch_get_main_queue(), ^{
-                [weakSelf.navigationController popToRootViewControllerAnimated:YES];
-            });
-            
+            [weakSelf back1];
         } failure:^(NSError * _Nonnull error) {
             REMOVESHOW
             SHOWERROR([ZYCTool handerResultData:error]);
         }];
     }
 }
+- (void)back1
+{
+    for (NSInteger i = (self.navigationController.viewControllers.count - 1); i > 0 ;i --) {
+        if ([self.navigationController.viewControllers[i] isKindOfClass:NSClassFromString(@"ChatMsgListVC")]) {
+            [self.navigationController popToViewController:self.navigationController.viewControllers[i] animated:YES];
+            return;
+        }
+    }
+}
 #pragma mark UICollectionView
 - (NSInteger)numberOfSectionsInCollectionView:(GHRefreshCollectionView *)collectionView{
     return 1;

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

@@ -41,6 +41,7 @@
 #import "MyTDGroupView.h"
 #import "ChatTestingVC.h"
 #import "ReplayMeVC.h"
+#import "TDGroupInfoListVC.h"
 
 static NSString *kConversation_IsRead = @"kHaveAtMessage";
 static int kConversation_AtYou = 1;
@@ -75,6 +76,10 @@ static int kConversation_AtAll = 2;
 @property (strong,nonatomic) NSMutableArray *selectArray;
 @property (assign,nonatomic) BOOL            isAllselect;
 @property (copy,nonatomic) NSString         *ConfirmationDate;
+@property (copy,nonatomic) NSString         *ReplyDate;
+@property (assign,nonatomic) NSInteger       ReplyCount;
+@property (assign,nonatomic) NSInteger       UReadVerifyCount;
+
 @end
 
 @implementation ChatMsgListVC
@@ -368,6 +373,9 @@ static int kConversation_AtAll = 2;
             }
         }
         weakSelf.ConfirmationDate = responseObject[@"ConfirmationDate"];
+        weakSelf.ReplyDate = responseObject[@"ReplyDate"];
+        weakSelf.ReplyCount = [responseObject[@"ReplyCount"] integerValue];
+        weakSelf.UReadVerifyCount = [responseObject[@"UReadVerifyCount"] integerValue];
         [weakSelf _loadAllConversationsFromDBWithIsShowHud:NO];
     } failure:^(NSError * _Nonnull error) {
         REMOVESHOW
@@ -682,8 +690,16 @@ static int kConversation_AtAll = 2;
             return [ChatMsgListCell configCell2Height];
         }
             break;
+        case 0:
+        {
+            return [ChatMsgListCell configCell3Height];
+        }
+            break;
         default:
         {
+            if (self.operationStateEnum == OperationStateEnum1) {
+                return 0.01f;
+            }
             return [ChatMsgListCell configCell3Height];
         }
             break;
@@ -759,35 +775,56 @@ static int kConversation_AtAll = 2;
         }
         case 3:{
             ChatMsgListCell *cell = [ChatMsgListCell configCell2:tableView indexPath:indexPath];
-            cell.cell2TitleLabel.text = model.Name;
-            cell.cell2IconImgView.image = IMG(model.AvatarUrl);
-            cell.cell2isTop.hidden = YES;
-            cell.cell2TimeLabel.hidden = YES;
-            cell.cell2TimeLabel.text = [NSDate getTimeStringAutoShort2:model.LastModifiedDate];
-            cell.cell2TimeLabel.textColor = RGB(153, 153, 153);
-            cell.enterBtn.hidden = YES;
+            if(self.operationStateEnum == OperationStateEnum1){
+                cell.hidden = YES;
+            }else{
+                cell.hidden = NO;
+                cell.cell2TitleLabel.text = model.Name;
+                cell.cell2IconImgView.image = IMG(model.AvatarUrl);
+                cell.cell2isTop.hidden = YES;
+                cell.cell2TimeLabel.hidden = YES;
+                cell.cell2TimeLabel.text = [NSDate getTimeStringAutoShort2:model.LastModifiedDate];
+                cell.cell2TimeLabel.textColor = RGB(153, 153, 153);
+                cell.enterBtn.hidden = YES;
+            }
             return cell;
         }break;
         case 4:{
             ChatMsgListCell *cell = [ChatMsgListCell configCell2:tableView indexPath:indexPath];
-            cell.cell2TitleLabel.text = model.Name;
-            cell.cell2IconImgView.image = IMG(model.AvatarUrl);
-            cell.cell2isTop.hidden = YES;
-            cell.cell2TimeLabel.hidden = NO;
-            cell.cell2TimeLabel.text = [NSDate getTimeStringAutoShort2:self.ConfirmationDate];
-            cell.cell2TimeLabel.textColor = RGB(153, 153, 153);
-            cell.enterBtn.hidden = YES;
+            if(self.operationStateEnum == OperationStateEnum1){
+                cell.hidden = YES;
+            }else{
+                cell.hidden = NO;
+                cell.cell2RedBgView.hidden = self.UReadVerifyCount > 0 ? NO : YES;
+                cell.cell2TitleLabel.text = model.Name;
+                cell.cell2IconImgView.image = IMG(model.AvatarUrl);
+                cell.cell2isTop.hidden = YES;
+                cell.cell2TimeLabel.hidden = NO;
+                cell.cell2TimeLabel.text = [NSDate getTimeStringAutoShort2:self.ConfirmationDate];
+                cell.cell2TimeLabel.textColor = RGB(153, 153, 153);
+                cell.enterBtn.hidden = YES;
+            }
             return cell;
         }break;
         default:{
             ChatMsgListCell *cell = [ChatMsgListCell configCell2:tableView indexPath:indexPath];
-            cell.cell2TitleLabel.text = model.Name;
-            cell.cell2IconImgView.image = IMG(model.AvatarUrl);
-            cell.cell2isTop.hidden = YES;
-            cell.cell2TimeLabel.hidden = NO;
-            cell.cell2TimeLabel.text = @"12分钟前";
-            cell.cell2TimeLabel.textColor = RGB(153, 153, 153);
-            cell.enterBtn.hidden = YES;
+            if(self.operationStateEnum == OperationStateEnum1){
+                cell.hidden = YES;
+            }else{
+                cell.hidden = NO;
+                cell.cell2RedBgView.hidden = self.ReplyCount > 0 ? NO : YES;
+                cell.cell2TitleLabel.text = model.Name;
+                cell.cell2IconImgView.image = IMG(model.AvatarUrl);
+                cell.cell2isTop.hidden = YES;
+                if (self.ReplyDate.length > 0) {
+                    cell.cell2TimeLabel.hidden = NO;
+                    cell.cell2TimeLabel.text = [NSDate getTimeStringAutoShort2:self.ReplyDate];
+                }else{
+                    cell.cell2TimeLabel.hidden = YES;
+                }
+                cell.cell2TimeLabel.textColor = RGB(153, 153, 153);
+                cell.enterBtn.hidden = YES;
+            }
             return cell;
         }break;
             break;
@@ -1231,13 +1268,14 @@ static int kConversation_AtAll = 2;
             [self scanNetWork:model.value urlStrong:SaoYiSao_Post ScanKey:@"Guid"  success:^(id responseObject) {
                 NSDictionary *dic = responseObject;
                 AddressUserModel *model = [[AddressUserModel alloc] initWithDictionary:dic error:nil];
-                MailListDetailVC *vc = [MailListDetailVC initMailListDetailVC];
-                vc.indexId = model.Id;
-                [weakSelf.navigationController pushViewController:vc animated:YES];
-                
+                dispatch_async(dispatch_get_main_queue(), ^{
+                    MailListDetailVC *vc = [MailListDetailVC initMailListDetailVC];
+                    vc.indexId = model.Id;
+                    vc.isAdd = YES;
+                    [weakSelf.navigationController pushViewController:vc animated:YES];
+                });
             } failure:^(NSError *error) {
                 SHOWERROR([ZYCTool handerResultData:error]);
-                
             }];
         }
             break;
@@ -1256,8 +1294,10 @@ static int kConversation_AtAll = 2;
         {
             [self scanToNetWork:model.value urlStrong:SaoYiSao3_Post success:^(id responseObject) {
                 if ([responseObject[@"IsUser"] boolValue]) {
-                    [[NSNotificationCenter defaultCenter] postNotificationName:PUSHTDGROUPCOTROLLER object:nil userInfo:responseObject];
-                    [self.navigationController popToRootViewControllerAnimated:NO];
+                    TDGroupInfoListVC * vc = [TDGroupInfoListVC initTDGroupInfoListVC];
+                    vc.GroupId = [responseObject[@"Id"] integerValue];
+                    vc.titleStr = responseObject[@"Name"];
+                    [weakSelf.navigationController pushViewController:vc animated:YES];
                 }else{
                     dispatch_async(dispatch_get_main_queue(), ^{
                         TDQrJoinVC * vc = [TDQrJoinVC initTDQrJoinVC];

smartRhino/Project/VCModel/ChatMessage/Controller/ChatMsgNotice/Controller/MoveSearchVC.h

@@ -17,6 +17,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, assign) BOOL        isReturn;
 @property (copy, nonatomic)   FlowAttachmentsModel * sendModel;
 @property (strong, nonatomic) UIImage            *sendImage;
+@property (nonatomic,assign) CollectModelType     CollectionType;
 @end
 
 NS_ASSUME_NONNULL_END

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

@@ -46,7 +46,7 @@
     }
     NSMutableDictionary *dic = [NSMutableDictionary dictionary];
     [dic setValue:@(self.ParentId) forKey:@"ParentId"];
-    [dic setValue:@(self.TypeId) forKey:@"TypeId"];
+    [dic setValue:@(self.CollectionType) forKey:@"TypeId"];
     [dic setValue:self.FolderIds forKey:@"FolderIds"];
     [dic setValue:searchText forKey:@"KeyWord"];
 
@@ -80,7 +80,7 @@
     cell.enterBtn.hidden = YES;
     cell.rightImageView.hidden = YES;
 
-    if (self.TypeId == CreateNoticeType || self.TypeId == CreateGroupType || self.TypeId == CreateCommonType || self.TypeId == CreateTopicType) {
+    if (self.CollectionType == CollectModel_Notice || self.CollectionType == CollectModel_Group || self.CollectionType == CollectModel_InterMail || self.CollectionType == CollectModel_Toipc) {
         cell.powerLbl.hidden = YES;
     }else{
         NSInteger status = model.RoleId;

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

@@ -79,6 +79,7 @@
     [self.SearchView.button setAction:^{
         MoveSearchVC *vc = [[MoveSearchVC alloc] init];
         vc.TypeId = weakSelf.TypeId;
+        vc.CollectionType = weakSelf.CollectionType;
         vc.ParentId = weakSelf.ParentId;
         vc.FolderIds = weakSelf.FolderIds;
         vc.sendImage = weakSelf.sendImage;
@@ -88,7 +89,7 @@
     }];
     self.titleL.text = self.titleStr;
     [self.rightAddBtn setAction:^{
-        if (weakSelf.TypeId == CreateNoticeType || weakSelf.TypeId == CreateGroupType || weakSelf.TypeId == CreateCommonType || weakSelf.TypeId == CreateTopicType || weakSelf.TypeId == CreateNotesType || weakSelf.TypeId == CreateShouType) {
+        if (weakSelf.CollectionType == CollectModel_Notice || weakSelf.CollectionType == CollectModel_Group || weakSelf.CollectionType ==  CollectModel_InterMail || weakSelf.CollectionType == CollectModel_Toipc || weakSelf.CollectionType == CollectModel_NoteBook || weakSelf.CollectionType == CollectModel_ShouJian) {
             [[ShowNewGroupAlert initShowNewGroupAlertWithTitle:@"建文件夹" placeholder:@"请输入文件夹名称" confirm:^(NSString * _Nonnull groupName) {
                 NSLog(@"%@",groupName);
                 NSDictionary * paraDict = @{@"FolderName":groupName,
@@ -180,7 +181,7 @@
     if (self.collectType == CollectHanderType_Collect) {
         [dic setValue:@(CreateCollectionType) forKey:@"TypeId"];
     }else{
-        [dic setValue:@(self.TypeId) forKey:@"TypeId"];
+        [dic setValue:@(self.CollectionType) forKey:@"TypeId"];
     }
     [dic setValue:self.FolderIds forKey:@"FolderIds"];
     NSLog(@"%@",dic);
@@ -359,7 +360,7 @@
             NSMutableDictionary *dic = [[NSMutableDictionary alloc]init];
             [dic setValue:weakSelf.FolderIds forKey:@"Ids"];
             [dic setValue:@([dict[@"Id"] integerValue]) forKey:@"ParentId"];
-            if (weakSelf.TypeId == CreateNewTopicType) {
+            if (weakSelf.CollectionType == CollectModel_NewTopic) {
                 [dic setValue:@(self.TypeId) forKey:@"TypeId"];
             }
             SHOWLOADING

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

@@ -207,7 +207,7 @@
             NoticeUnreadCell *cell = [NoticeUnreadCell configCell1:tableView indexPath:indexPath];
             [cell.cell1ImageView sd_setImageWithURL:[NSURL URLWithString:model.AvatarUrl] placeholderImage:kUserDefaultHeadImage];
             cell.cell1TitleLabel.text = model.UserName;
-            cell.cell1IntroLabel.text = model.DepartmentName;
+            cell.cell1IntroLabel.text = ISEmpty(model.DepartmentName) ? @"" : model.DepartmentName;
             cell.cell1TimeLabel.hidden = self.searchType == 2 ? YES : NO;
             cell.cell1TimeLabel.text = [ZYCTool monthAndDayAndHoursAndMinutes:model.LastModifiedDate];
             return cell;

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

@@ -17,7 +17,7 @@
                 <rect key="frame" x="0.0" y="0.0" width="320" height="122"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
-                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="zhujun2" translatesAutoresizingMaskIntoConstraints="NO" id="MJ7-Lz-HHG">
+                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="zhujun2" translatesAutoresizingMaskIntoConstraints="NO" id="MJ7-Lz-HHG">
                         <rect key="frame" x="15" y="15" width="40" height="40"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="40" id="Jxg-IG-ODE"/>
@@ -129,7 +129,7 @@
                 <rect key="frame" x="0.0" y="0.0" width="320" height="138"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
-                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="zhujun2" translatesAutoresizingMaskIntoConstraints="NO" id="VPX-bR-MCy">
+                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="zhujun2" translatesAutoresizingMaskIntoConstraints="NO" id="VPX-bR-MCy">
                         <rect key="frame" x="15" y="15" width="40" height="40"/>
                         <constraints>
                             <constraint firstAttribute="width" constant="40" id="KaT-R0-bXe"/>
@@ -246,7 +246,7 @@
                 <rect key="frame" x="0.0" y="0.0" width="320" height="104"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
-                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="zhujun2" translatesAutoresizingMaskIntoConstraints="NO" id="9eR-UD-xOP">
+                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="zhujun2" translatesAutoresizingMaskIntoConstraints="NO" id="9eR-UD-xOP">
                         <rect key="frame" x="15" y="15" width="40" height="40"/>
                         <constraints>
                             <constraint firstAttribute="width" constant="40" id="2uJ-PR-qqd"/>

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

@@ -182,8 +182,7 @@
         self.groupName = self.groupNameTf.text;
     }
     if (self.groupIntroTf.text.length==0) {
-        SHOWERROR(@"请添加小组介绍")
-        return;
+        self.groupIntroduce = @"";
     }else{
         self.groupIntroduce = self.groupIntroTf.text;
     }

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

@@ -25,8 +25,11 @@
 #import "MailListMoveVC.h"
 #import "MailGroupVC.h"
 #import "MailChatVC.h"
+#import "SWQRCodeViewController.h"
+#import "ChatJoinGroupVC.h"
+#import "TDQrJoinVC.h"
 
-@interface MailListVC ()<UITableViewDelegate,UITableViewDataSource>
+@interface MailListVC ()<UITableViewDelegate,UITableViewDataSource,SWQRCodeViewControllerDelegate>
 @property (weak, nonatomic) IBOutlet UIView       *HeadView;
 @property (strong,nonatomic) IBOutlet UIButton    *rightButton;
 @property (strong,nonatomic) IBOutlet UITableView *tableView;
@@ -152,13 +155,94 @@
                 vc.pinyinArray = weakSelf.pinyinArray.mutableCopy;
                 [weakSelf.navigationController pushViewController:vc animated:YES];
             }else if ([@"扫一扫" isEqualToString:action.title]){
-                
+                [weakSelf scanAction];
             }
         }];
         [menuDataSourceArray addObject:actionMenu];
     }
     return menuDataSourceArray;
 }
+- (void)scanAction{
+    SWQRCodeConfig *config = [[SWQRCodeConfig alloc]init];
+    config.scannerType = SWScannerTypeBoth;
+    SWQRCodeViewController *qrcodeVC = [[SWQRCodeViewController alloc]init];
+    qrcodeVC.codeConfig = config;
+    qrcodeVC.delegate = self;
+    [self.navigationController pushViewController:qrcodeVC animated:YES];
+}
+#pragma mark - 扫一扫结果
+- (void)scanResult:(NSString *)scanStr{
+    ScanResultModel *model = [[ScanResultModel alloc]initWithString:scanStr error:nil];
+    NSLog(@"%@",model);
+    WEAKSELF
+    switch (model.key) {
+        case 1:// 用户
+        {
+            [self scanNetWork:model.value urlStrong:SaoYiSao_Post ScanKey:@"Guid"  success:^(id responseObject) {
+                NSDictionary *dic = responseObject;
+                AddressUserModel *model = [[AddressUserModel alloc] initWithDictionary:dic error:nil];
+                MailListDetailVC *vc = [MailListDetailVC initMailListDetailVC];
+                vc.indexId = model.Id;
+                [weakSelf.navigationController pushViewController:vc animated:YES];
+            } failure:^(NSError *error) {
+                SHOWERROR([ZYCTool handerResultData:error]);
+                
+            }];
+        }
+            break;
+        case 2:// 群聊
+        {
+            [self scanToNetWork:model.value urlStrong:SaoYiSao2_Post success:^(id responseObject) {
+                ChatJoinGroupVC * vc = [ChatJoinGroupVC initChatJoinGroupVC];
+                vc.dict = responseObject;
+                [weakSelf.navigationController pushViewController:vc animated:YES];
+            } failure:^(NSError *error) {
+                SHOWERROR([ZYCTool handerResultData:error]);
+            }];
+        }
+            break;
+        case 3://小组
+        {
+            [self scanToNetWork:model.value urlStrong:SaoYiSao3_Post success:^(id responseObject) {
+                if ([responseObject[@"IsUser"] boolValue]) {
+                    [[NSNotificationCenter defaultCenter] postNotificationName:PUSHTDGROUPCOTROLLER object:nil userInfo:responseObject];
+                    [self.navigationController popToRootViewControllerAnimated:NO];
+                }else{
+                    dispatch_async(dispatch_get_main_queue(), ^{
+                        TDQrJoinVC * vc = [TDQrJoinVC initTDQrJoinVC];
+                        vc.dict = responseObject;
+                        [weakSelf.navigationController pushViewController:vc animated:YES];
+                    });
+                }
+            } failure:^(NSError *error) {
+                SHOWERROR([ZYCTool handerResultData:error]);
+            }];
+        }
+            break;
+        default:
+            break;
+    }
+}
+- (void)scanNetWork:(NSString *)scanStr urlStrong:(NSString *)urlstring ScanKey:(NSString*)key success:(void (^) (id responseObject))successful failure:(void (^) (NSError *error))failure{
+    SHOWLOADING
+    [[HttpManager sharedHttpManager] POSTUrl:[NSString stringWithFormat:@"%@%@",BaseUrl,urlstring] parameters:@{key:scanStr} responseStyle:JOSN success:^(id  _Nonnull responseObject) {
+        successful(responseObject);
+        REMOVESHOW
+    } failure:^(NSError * _Nonnull error) {
+        REMOVESHOW
+        failure(error);
+    }];
+}
+- (void)scanToNetWork:(NSString *)scanStr urlStrong:(NSString *)urlstring success:(void (^) (id responseObject))successful failure:(void (^) (NSError *error))failure{
+    SHOWLOADING
+    NSString * url = [NSString stringWithFormat:@"%@%@",Host(urlstring),scanStr];
+    [[HttpManager sharedHttpManager] GETUrl:url parameters:@{} success:^(id  _Nonnull responseObject) {
+        REMOVESHOW
+        successful(responseObject);
+    } failure:^(NSError * _Nonnull error) {
+        REMOVESHOW
+    }];
+}
 - (void)messageReturnSuccess
 {
     self.isReturn = NO;

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

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

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

@@ -29,6 +29,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (weak, nonatomic) IBOutlet UILabel *cell4TimeL;
 @property (weak, nonatomic) IBOutlet UILabel *subTitleL;
 
+@property (weak, nonatomic) IBOutlet UIImageView *QrcodeV;
 
 + (TDGroupInfoDetailCell *)configCell0:(UITableView *)tableView indexPath:(NSIndexPath *)indexPath;
 + (TDGroupInfoDetailCell *)configCell1:(UITableView *)tableView indexPath:(NSIndexPath *)indexPath;

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

@@ -67,6 +67,7 @@
             </tableViewCellContentView>
             <viewLayoutGuide key="safeArea" id="aW0-zy-SZf"/>
             <connections>
+                <outlet property="QrcodeV" destination="1vv-hL-yQB" id="7vU-cu-4sA"/>
                 <outlet property="cell0ImgV" destination="jpS-G8-vDC" id="dMv-mP-Ohh"/>
                 <outlet property="cell0TitleL" destination="iYf-IJ-QAY" id="rQ2-K3-AdD"/>
             </connections>

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

@@ -88,11 +88,11 @@
             url = @"/#/mobile/noticeDetails";
         }
             break;
-        case CreateAnonymousType:
-        {
-            url = @"/#/mobile/noticeDetails";
-        }
-            break;
+//        case CreateAnonymousType:
+//        {
+//            url = @"/#/mobile/noticeDetails";
+//        }
+//            break;
         default:
         {
             url = @"/#/mobile/topicDetails";

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

@@ -17,6 +17,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, copy) NSString       * titleStr;
 @property (assign, nonatomic) CreateFileFolderType   type;
 @property (copy, nonatomic)   FlowAttachmentsModel * sendModel;
+@property (strong, nonatomic) UIImage              * sendImage;
 @property (assign, nonatomic) BOOL                   isReturn;
 @property (assign, nonatomic) BOOL           isPush;
 @property (assign, nonatomic) BOOL           isSelect;

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

@@ -515,6 +515,7 @@
 - (void)launchMoveVC:(NSMutableArray<NSNumber*>*)selectIDArray{
     MoveViewController * vc = [MoveViewController initMoveViewController];
     vc.TypeId = CreateGroupType;
+    vc.CollectionType = CollectModel_Group;
     vc.collectType = CollectHanderType_Move;
     vc.ParentId = 0;
     vc.titleStr = self.titleL.text;
@@ -942,6 +943,7 @@
                         vc.titleStr = model.FolderName;
                         vc.isReturn = self.isReturn;
                         vc.isSelect = self.isSelect;
+                        vc.sendImage = self.sendImage;
                         vc.sendModel = self.sendModel;
                         [self.navigationController pushViewController:vc animated:YES];
                     }break;
@@ -951,6 +953,7 @@
                             vc.FolderId = model.GroupId;
                             vc.type = CollectModel_Toipc;
                             vc.isReturn = self.isReturn;
+                            vc.sendImage = self.sendImage;
                             vc.sendModel = self.sendModel;
                             [self.navigationController pushViewController:vc animated:YES];
                         }else{
@@ -963,6 +966,7 @@
                                 vc.GroupId = model.GroupId;
                                 vc.type = self.type;
                                 vc.isReturn = self.isReturn;
+                                vc.sendImage = self.sendImage;
                                 vc.sendModel = self.sendModel;
                                 [self.navigationController pushViewController:vc animated:YES];
                             }

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

@@ -127,6 +127,13 @@
                         TDGroupInfoDetailCell *cell = [TDGroupInfoDetailCell configCell0:tableView indexPath:indexPath];
                         [cell.cell0ImgV sd_setImageWithURL:[NSURL URLWithString:self.listModel.AvatarUrl] placeholderImage:kUserDefaultHeadImage];
                         cell.cell0TitleL.text = self.listModel.Name;
+                        UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithActionBlock:^(id  _Nonnull sender) {
+                            TDGroupQrcodeVC * vc = [TDGroupQrcodeVC initTDGroupQrcodeVC];
+                            vc.model = weakSelf.listModel;
+                            [weakSelf.navigationController pushViewController:vc animated:YES];
+                        }];
+                        cell.QrcodeV.userInteractionEnabled = YES;
+                        [cell.QrcodeV addGestureRecognizer:tap];
                         return cell;
                     }
                         break;
@@ -193,6 +200,13 @@
                         TDGroupInfoDetailCell *cell = [TDGroupInfoDetailCell configCell0:tableView indexPath:indexPath];
                         [cell.cell0ImgV sd_setImageWithURL:[NSURL URLWithString:self.listModel.AvatarUrl] placeholderImage:kUserDefaultHeadImage];
                         cell.cell0TitleL.text = self.listModel.Name;
+                        UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithActionBlock:^(id  _Nonnull sender) {
+                            TDGroupQrcodeVC * vc = [TDGroupQrcodeVC initTDGroupQrcodeVC];
+                            vc.model = weakSelf.listModel;
+                            [weakSelf.navigationController pushViewController:vc animated:YES];
+                        }];
+                        cell.QrcodeV.userInteractionEnabled = YES;
+                        [cell.QrcodeV addGestureRecognizer:tap];
                         return cell;
                     }
                         break;
@@ -259,6 +273,13 @@
                         TDGroupInfoDetailCell *cell = [TDGroupInfoDetailCell configCell0:tableView indexPath:indexPath];
                         [cell.cell0ImgV sd_setImageWithURL:[NSURL URLWithString:self.listModel.AvatarUrl] placeholderImage:kUserDefaultHeadImage];
                         cell.cell0TitleL.text = self.listModel.Name;
+                        UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithActionBlock:^(id  _Nonnull sender) {
+                            TDGroupQrcodeVC * vc = [TDGroupQrcodeVC initTDGroupQrcodeVC];
+                            vc.model = weakSelf.listModel;
+                            [weakSelf.navigationController pushViewController:vc animated:YES];
+                        }];
+                        cell.QrcodeV.userInteractionEnabled = YES;
+                        [cell.QrcodeV addGestureRecognizer:tap];
                         return cell;
                     }
                         break;
@@ -364,6 +385,7 @@
             {
                 GroupInfoVC * vc= [GroupInfoVC initGroupInfoVC];
                 vc.Id = self.listModel.Id;
+                vc.GroupName = self.listModel.Name;
                 vc.IsOwner = self.listModel.GroupUserRoleId == 1 ? YES : NO;
                 [self.navigationController pushViewController:vc animated:YES];
             }

smartRhino/Project/VCModel/ChatMessage/Controller/MyTDGroup/VC/TDGroupInfoListVC.h

@@ -14,11 +14,13 @@ NS_ASSUME_NONNULL_BEGIN
 @interface TDGroupInfoListVC : BaseViewController
 +(TDGroupInfoListVC *)initTDGroupInfoListVC;
 @property (nonatomic, assign) NSInteger      GroupId;
+@property (nonatomic, copy) NSString        *Author;
 @property (nonatomic, assign) NSInteger      Id;
 @property (nonatomic,copy) NSString  *titleStr;
 @property (nonatomic,strong) NSArray *ItemsArray;
 @property (assign, nonatomic) CreateFileFolderType   type;
 @property (copy, nonatomic)   FlowAttachmentsModel * sendModel;
+@property (strong, nonatomic) UIImage              * sendImage;
 @property (assign, nonatomic) BOOL                   isReturn;
 @property (assign, nonatomic) BOOL                   isJoin;
 @end

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

@@ -112,7 +112,7 @@
     
     messageObject.title = title;
     //创建网页内容对象
-    UMShareWebpageObject *shareObject = [UMShareWebpageObject shareObjectWithTitle:title descr:desc thumImage:IMG(@"logo_60")];
+    UMShareWebpageObject *shareObject = [UMShareWebpageObject shareObjectWithTitle:title descr:desc thumImage:IMG(@"小组")];
     //设置网页地址
     shareObject.webpageUrl = url;
     

smartRhino/Project/VCModel/ChatMessage/View/ChatMsgListCell.h

@@ -29,6 +29,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong,nonatomic) IBOutlet UIImageView *cell2RightArrowImgView;
 @property (weak, nonatomic) IBOutlet UIImageView *cell2isTop;
 @property (weak, nonatomic) IBOutlet UIButton *enterBtn;
+@property (strong,nonatomic) IBOutlet UIView *cell2RedBgView;
 
 @property (strong,nonatomic) IBOutlet UIImageView *cell3UserImgView;
 @property (strong,nonatomic) IBOutlet UILabel *cell3TitleLabel;

smartRhino/Project/VCModel/ChatMessage/View/ChatMsgListCell.xib

@@ -118,6 +118,20 @@
                             <constraint firstAttribute="width" constant="40" id="gOa-12-2S7"/>
                         </constraints>
                     </imageView>
+                    <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="WVz-kk-0ZT">
+                        <rect key="frame" x="51.5" y="13.5" width="10" height="10"/>
+                        <color key="backgroundColor" systemColor="systemRedColor" red="1" green="0.23137254900000001" blue="0.18823529410000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="10" id="lSP-rD-shC"/>
+                            <constraint firstAttribute="width" constant="10" id="t3p-tK-nix"/>
+                        </constraints>
+                        <userDefinedRuntimeAttributes>
+                            <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
+                                <integer key="value" value="5"/>
+                            </userDefinedRuntimeAttribute>
+                            <userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/>
+                        </userDefinedRuntimeAttributes>
+                    </view>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="工作组" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="54b-tj-Jef">
                         <rect key="frame" x="66.5" y="24" width="52" height="21"/>
                         <fontDescription key="fontDescription" type="system" pointSize="17"/>
@@ -160,20 +174,23 @@
                     <constraint firstAttribute="trailing" secondItem="gkW-9F-Trm" secondAttribute="trailing" constant="15" id="bd0-YV-9Iu"/>
                     <constraint firstItem="gkW-9F-Trm" firstAttribute="leading" secondItem="kK7-QT-hJW" secondAttribute="trailing" constant="5" id="e1i-IP-Ff4"/>
                     <constraint firstAttribute="trailing" secondItem="FDY-87-MWZ" secondAttribute="trailing" id="ftj-Up-bdm"/>
+                    <constraint firstItem="WVz-kk-0ZT" firstAttribute="leading" secondItem="pIr-RR-aEj" secondAttribute="trailing" constant="-5" id="iXv-zg-3Pk"/>
                     <constraint firstAttribute="bottom" secondItem="FDY-87-MWZ" secondAttribute="bottom" id="n9q-U8-zvn"/>
                     <constraint firstItem="gkW-9F-Trm" firstAttribute="centerY" secondItem="8Em-ak-KJt" secondAttribute="centerY" id="smn-HV-xVs"/>
+                    <constraint firstItem="WVz-kk-0ZT" firstAttribute="bottom" secondItem="pIr-RR-aEj" secondAttribute="top" constant="5" id="vkC-6Y-834"/>
                 </constraints>
             </tableViewCellContentView>
             <viewLayoutGuide key="safeArea" id="nuM-GB-X2c"/>
             <connections>
                 <outlet property="cell2IconImgView" destination="pIr-RR-aEj" id="y63-Wk-5DW"/>
+                <outlet property="cell2RedBgView" destination="WVz-kk-0ZT" id="Jp6-na-wSy"/>
                 <outlet property="cell2TimeLabel" destination="gkW-9F-Trm" id="oUg-cr-3zB"/>
                 <outlet property="cell2TitleLabel" destination="54b-tj-Jef" id="vUg-ow-jOi"/>
                 <outlet property="cell2isTop" destination="kK7-QT-hJW" id="Mfj-3z-c8F"/>
                 <outlet property="enterBtn" destination="MBc-d1-Gg2" id="U65-ZV-6Ef"/>
                 <outlet property="leftW" destination="7vQ-7d-BoL" id="b51-GZ-CiE"/>
             </connections>
-            <point key="canvasLocation" x="131.8840579710145" y="258.81696428571428"/>
+            <point key="canvasLocation" x="132" y="260"/>
         </tableViewCell>
         <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="ChatMsgListCell3" id="mIG-BC-k84" customClass="ChatMsgListCell">
             <rect key="frame" x="0.0" y="0.0" width="320" height="76"/>

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

@@ -324,6 +324,7 @@
                 self.TitleL.hidden = NO;
                 self.titleBtn.hidden = YES;
                 self.TitleL.text = @"回复信函";
+                self.shouType = 6;
             }else{
                 self.TitleL.hidden = YES;
                 self.titleBtn.hidden = NO;
@@ -753,7 +754,11 @@
     if ([message.name isEqualToString:@"saveDrafts"]) {
         if ([message.body isKindOfClass:[NSDictionary class]]) {
             NSDictionary * dict = message.body;
-            if ([dict[@"Title"] length] > 0 || [dict[@"html"] length] > 0 ) {
+            NSString * html = @"";
+            if (![dict[@"html"] isKindOfClass:[NSNull class]]) {
+                html = dict[@"html"];
+            }
+            if ([dict[@"Title"] length] > 0 || [html length] > 0 ) {
                 self.isNull = NO;
                 [self.DoneBtn setEnabled:YES];
             }else{
@@ -1154,7 +1159,6 @@
     return mutStr;
 }
 #pragma mark - WKUIDelegete
-#pragma mark - WKUIDelegete
 - (void)webView:(WKWebView *)webView runJavaScriptAlertPanelWithMessage:(nonnull NSString *)message initiatedByFrame:(nonnull WKFrameInfo *)frame completionHandler:(nonnull void (^)(void))completionHandler
 {
     UIAlertController *alertController = [UIAlertController alertControllerWithTitle:@"提示" message:message?:@"" preferredStyle:UIAlertControllerStyleAlert];
@@ -1286,6 +1290,9 @@
         SHOWERROR(@"请填写标题或内容");
         return;
     }
+     if (self.replayType == MailReplayOne || self.replayType == MailReplayAll) {
+         [paraDict setObject:@(self.Id) forKey:@"ParentId"];///回复ID
+     }
     if (self.isEdit) {
         [paraDict setObject:@(self.Id) forKey:@"Id"];
         [self sentChangeNotice:paraDict withNoticeType:self.isDraft ? 2 : 1];
@@ -1758,6 +1765,7 @@
                 || [vc isKindOfClass:NSClassFromString(@"MyTDTopicBookVC")]
                 || [vc isKindOfClass:NSClassFromString(@"EMChatViewController")]
                 || [vc isKindOfClass:NSClassFromString(@"MyFavoriteVC")]
+                || [vc isKindOfClass:NSClassFromString(@"MyInfoVC")]
                 || [vc isKindOfClass:NSClassFromString(@"CommonHomeVC")]
                 || [vc isKindOfClass:NSClassFromString(@"HomeDetailController")]
                 || [vc isKindOfClass:NSClassFromString(@"MyTDTopicDetailVC")]) {

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

@@ -387,13 +387,6 @@
                         [dic setValue:@(weakSelf.Id) forKey:@"CollectionDataId"];
                         ///     1文章 2话题 3 收藏 4笔记 5通知 6站内信 7小组 8 会议详情 14工作流审批 300 文件 400 会议纪要
                         NSInteger type = weakSelf.type;
-                        switch (weakSelf.type) {
-                            case CollectModel_meetMian:
-                                type = CollectModel_meet;
-                                break;
-                            default:
-                                break;
-                        }
                         [dic setValue:@(type) forKey:@"CollectionType"];
                         [dic setValue:@(0) forKey:@"FolderId"];
                         [dic setValue:@(0) forKey:@"SourceUserId"];
@@ -2064,13 +2057,13 @@
             break;
         case CollectModel_NoteFile:
         {
-            NSString * url = @"find_1";
+            NSString * url = @"share_file";
             return url;
         }
             break;
         case CollectModel_CollectFile:
         {
-            NSString * url = @"find_1";
+            NSString * url = @"share_file";
             return url;
         }
             break;
@@ -2112,7 +2105,7 @@
             break;
         case CollectModel_TopicSubBooK:
         {
-            NSString * url = @"find_1";
+            NSString * url = @"share_file";
             return url;
         }
             break;
@@ -2157,6 +2150,7 @@
     MoveViewController * vc = [MoveViewController initMoveViewController];
     vc.isFromCreateBookVc = YES;
     vc.TypeId = CreateNotesType;
+    vc.CollectionType = CollectModel_NoteBook;
     vc.titleStr = @"我的笔记";
     vc.ParentId = 0;
     FlowAttachmentsModel * model = [[FlowAttachmentsModel alloc] init];
@@ -2226,23 +2220,12 @@
     //NSInteger meetId = [self.dataDict[@"MeetingId"] integerValue];
     vc.CollectionDataId = self.Id;
     vc.collectType = CollectHanderType_Collect;
+    vc.CollectionType = self.type;
     vc.ParentId = 0;
     vc.titleStr = @"我的收藏";
     vc.TypeId = CreateCollectionType;
     vc.FolderIds = @[].mutableCopy;
     //    收藏类型 1文章 2话题 3 收藏 4笔记 5通知 6站内信 7小组 8 会议详情 14工作流审批 300 文件 400 会议纪要
-    switch (self.type) {
-        case CollectModel_meetMian:
-        {
-            vc.CollectionType = CollectModel_meet;
-        }
-            break;
-        default:
-        {
-            vc.CollectionType = self.type;
-        }
-            break;
-    }
     [self.navigationController pushViewController:vc animated:YES];
 }
 - (void)collectSuccess
@@ -2632,13 +2615,6 @@
                     [dic setValue:@(weakSelf.Id) forKey:@"CollectionDataId"];
                     ///     1文章 2话题 3 收藏 4笔记 5通知 6站内信 7小组 8 会议详情 14工作流审批 300 文件 400 会议纪要
                     NSInteger type = weakSelf.type;
-                    switch (weakSelf.type) {
-                        case CollectModel_meet:
-                            type = 400;
-                            break;
-                        default:
-                            break;
-                    }
                     [dic setValue:@(type) forKey:@"CollectionType"];
                     [dic setValue:@(0) forKey:@"FolderId"];
                     [dic setValue:@(0) forKey:@"SourceUserId"];

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

@@ -141,6 +141,7 @@
 - (void)launchMoveVC:(NSMutableArray<NSNumber*>*)selectIDArray{
     MoveViewController * vc = [MoveViewController initMoveViewController];
     vc.TypeId = CreateNewTopicType;
+    vc.CollectionType = CollectModel_NewTopic;
     vc.collectType = CollectHanderType_Move;
     vc.ParentId = 0;
     vc.titleStr = @"移动";

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

@@ -427,6 +427,7 @@
 - (void)launchMoveVC:(NSMutableArray<NSNumber*>*)selectIDArray{
     MoveViewController * vc = [MoveViewController initMoveViewController];
     vc.TypeId = CreateNewTopicType;
+    vc.CollectionType = CollectModel_NewTopic;
     vc.collectType = CollectHanderType_Move;
     vc.ParentId = 0;
     vc.titleStr = @"移动到";

smartRhino/Project/VCModel/Home/VC/IndexViewController.m

@@ -52,6 +52,7 @@
 #import "HomeMingShiVC.h"
 #import "HomeUserVC.h"
 #import "HomeProblemVC.h"
+#import "WorkFlowDetailsController.h"
 
 @interface IndexViewController () <SLBannerViewDelegate,AddChannelControllerDelegate,EMChatManagerDelegate, EMGroupManagerDelegate, EMConversationsDelegate>
 @property (nonatomic, strong) UILabel *titleLabel;
@@ -102,7 +103,7 @@
     [self.view addSubview:self.titleLabel];
     [self.view addSubview:self.searchView];
     [self.searchView setFrame:CGRectMake(0, 0, SCREEN_WIDTH, 52)];
-
+    
     self.bannerView = [[SLBannerView alloc] initWithFrame:CGRectMake(15, 0, SCREEN_WIDTH - 30, 125)];
     self.bannerView.delegate = self;
     self.bannerView.durTimeInterval = 0.2;
@@ -110,8 +111,8 @@
     self.bannerBgV = [[UIView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, 132)];
     self.bannerBgV.backgroundColor = [UIColor clearColor];
     [self.bannerBgV addSubview:self.bannerView];
-
-
+    
+    
     [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
         make.top.equalTo(self.statusBar.mas_bottom);
         make.left.right.equalTo(self.view);
@@ -122,9 +123,9 @@
         make.left.right.equalTo(self.view);
         make.height.mas_offset(52);
     }];
-
+    
     [self getdata];
-
+    
     WEAKSELF
     self.searchView.buttonBlock = ^(){
         HomeSearchController *homeSearch = [[HomeSearchController alloc] init];
@@ -136,22 +137,22 @@
         vc.hidesBottomBarWhenPushed = YES;
         [weakSelf.navigationController pushViewController:vc animated:YES];
     };
-//    self.channelScroll.ClickSelectChannelBlock = ^(NSInteger channelId, NSString * _Nonnull StyleCss) {
-//        weakSelf.style = StyleCss;
-//        weakSelf.currentChannel = channelId;
-//        for (ChannelModel * model in weakSelf.myChannel) {
-//            model.IsSelect = NO;
-//        }
-//        for (ChannelModel * model in weakSelf.myChannel) {
-//            if (model.ArticleGroupId == channelId) {
-//                model.IsSelect = YES;
-//            }
-//        }
-//        dispatch_async(dispatch_get_main_queue(), ^{
-//            [weakSelf collectReload];
-//        });
-//    };
-
+    //    self.channelScroll.ClickSelectChannelBlock = ^(NSInteger channelId, NSString * _Nonnull StyleCss) {
+    //        weakSelf.style = StyleCss;
+    //        weakSelf.currentChannel = channelId;
+    //        for (ChannelModel * model in weakSelf.myChannel) {
+    //            model.IsSelect = NO;
+    //        }
+    //        for (ChannelModel * model in weakSelf.myChannel) {
+    //            if (model.ArticleGroupId == channelId) {
+    //                model.IsSelect = YES;
+    //            }
+    //        }
+    //        dispatch_async(dispatch_get_main_queue(), ^{
+    //            [weakSelf collectReload];
+    //        });
+    //    };
+    
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(tableViewScrollTop) name:HOMESCROLLVIEWTOTOP object:nil];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(shareReturnAction:) name:SHARERETURNSUCCESS object:nil];
 }
@@ -219,13 +220,13 @@
             vc.style = model.StyleCss;
             [vcArr addObject:vc];
         }
-//        if ([model.StyleCss isEqualToString:@"DayProblem"]) {///每日技能
-//            [data addObject:model.ArticleGroupName];
-//            HomeProblemVC * vc = [[HomeProblemVC alloc] init];
-//            vc.height = height;
-//            vc.style = model.StyleCss;
-//            [vcArr addObject:vc];
-//        }
+        //        if ([model.StyleCss isEqualToString:@"DayProblem"]) {///每日技能
+        //            [data addObject:model.ArticleGroupName];
+        //            HomeProblemVC * vc = [[HomeProblemVC alloc] init];
+        //            vc.height = height;
+        //            vc.style = model.StyleCss;
+        //            [vcArr addObject:vc];
+        //        }
     }
     WMZPageParam *param = PageParam()
     .wTitleArrSet(data)
@@ -353,7 +354,7 @@
 }
 - (void)messagesDidReceive:(NSArray *)aMessages
 {
-     [self performSelector:@selector(getUnreadCount) withObject:nil afterDelay:0.8];
+    [self performSelector:@selector(getUnreadCount) withObject:nil afterDelay:0.8];
 }
 
 - (void)tableViewScrollTop
@@ -446,7 +447,7 @@
                 HomeArticleModel *model = [HomeArticleModel modelWithDictionary:dic];
                 weakSelf.totalPage = model.Count;
                 [weakSelf.dataSource addObjectsFromArray:model.Items];
-
+                
             } failure:^(NSError * _Nonnull error) {
                 SHOWERROR([ZYCTool handerResultData:error])
             }];
@@ -477,7 +478,7 @@
 - (void)cellDidSelcet:(NSInteger )articleId{
     WEAKSELF
     UIButton *closeBtn = [UIButton buttonWithType:UIButtonTypeCustom];
-
+    
     [closeBtn addTarget:self action:@selector(closeBtn_Click) forControlEvents:UIControlEventTouchUpInside];
     [closeBtn setImage:IMG(@"guanbi") forState:UIControlStateNormal];
     UIAlertController *alertVC = [UIAlertController alertControllerWithTitle:@"对此内容进行操作" message:@"" preferredStyle:UIAlertControllerStyleAlert];
@@ -489,7 +490,7 @@
         make.size.mas_equalTo(CGSizeMake(22, 22));
     }];
     UIAlertAction *actionOK = [UIAlertAction actionWithTitle:@"屏蔽TA" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
-
+        
         STRONGSELF
         [strongSelf homeNewsHander:articleId withTypeId:1];
         
@@ -508,9 +509,9 @@
 - (void)homeNewsHander:(NSInteger )articleId withTypeId:(NSInteger)blacklistType{
     WS(weakSelf);
     [[HttpManager sharedHttpManager] POSTUrl:[NSString stringWithFormat:@"%@/%@",BaseUrl,Article_Hander_Post] parameters:@{@"ArticleId":@(articleId),@"BlacklistType":@(blacklistType)} responseStyle:DATA success:^(id  _Nonnull responseObject) {
-//        [weakSelf headRefresh];
+        //        [weakSelf headRefresh];
     } failure:^(NSError * _Nonnull error) {
-
+        
     }];
 }
 
@@ -550,12 +551,10 @@
 
 - (void)getArticleDetail:(NSInteger)index{
     HomeTopImageModel *model = self.bannerModelArray[index];
-      NSLog(@"点击轮播图%ld",(long)model.ArticleId);
+    NSLog(@"点击轮播图%ld",(long)model.ArticleId);
     WEAKSELF
     [[HttpManager sharedHttpManager] GETWithUrl:[NSString stringWithFormat:@"%@%ld",Article_Detail_Get,(long)model.ArticleId] parameters:@{} success:^(id  _Nonnull responseObject) {
         Item *model = [[Item alloc]initWithDictionary:responseObject error:nil];
-        //        HomeDetailController *homeDetail = [[HomeDetailController alloc] init];
-        //        [homeDetail loadCurrentModel:itemModel];
         MyTDTopicDetailVC * vc = [MyTDTopicDetailVC initMyTDTopicDetailVC];
         vc.type = CollectModel_Aritle;
         vc.Id = model.Id;
@@ -581,7 +580,7 @@
     if (!_searchView) {
         _searchView = [[SurfaceSearchView alloc] init];
         [_searchView setBgViewColor:[UIColor clearColor]];
-//        [_searchView setPlaceHolderText:@"输入关键字搜索"];
+        //        [_searchView setPlaceHolderText:@"输入关键字搜索"];
         [_searchView setMainType];
     }
     return _searchView;
@@ -617,62 +616,62 @@
 - (void)loadChannelModel
 {
     [self.myChannel removeAllObjects];
-//    ChannelModel * model = [[ChannelModel alloc] init];
-//    model.ArticleGroupId = 0;
-//    model.ArticleGroupName = @"推荐";
-//    model.StyleCss = @"default";
-//    model.IsSelect = YES;
-//    [self.myChannel addObject:model];
-//    ChannelModel * workModel = [[ChannelModel alloc] init];
-//    workModel.ArticleGroupId = 1;
-//    workModel.ArticleGroupName = @"待办工作";
-//    workModel.IsSelect = NO;
-//    [self.myChannel addObject:workModel];
-//    ChannelModel * sModel = [[ChannelModel alloc] init];
-//    sModel.ArticleGroupId = 2;
-//    sModel.ArticleGroupName = @"信源听说";
-//    sModel.IsSelect = NO;
-//    [self.myChannel addObject:sModel];
-//    ChannelModel * mModel = [[ChannelModel alloc] init];
-//    mModel.ArticleGroupId = 3;
-//    mModel.ArticleGroupName = @"名校";
-//    mModel.IsSelect = NO;
-//    [self.myChannel addObject:mModel];
-//    ChannelModel * aModel = [[ChannelModel alloc] init];
-//    aModel.ArticleGroupId = 4;
-//    aModel.ArticleGroupName = @"会员特供";
-//    aModel.IsSelect = NO;
-//    [self.myChannel addObject:aModel];
-//    ChannelModel * bModel = [[ChannelModel alloc] init];
-//    bModel.ArticleGroupId = 5;
-//    bModel.ArticleGroupName = @"每日微课";
-//    bModel.IsSelect = NO;
-//    [self.myChannel addObject:bModel];
-//    ChannelModel * cModel = [[ChannelModel alloc] init];
-//    cModel.ArticleGroupId = 6;
-//    cModel.ArticleGroupName = @"每日技能";
-//    cModel.IsSelect = NO;
-//    [self.myChannel addObject:cModel];
-//    ChannelModel * dModel = [[ChannelModel alloc] init];
-//    dModel.ArticleGroupId = 7;
-//    dModel.ArticleGroupName = @"每日好书";
-//    dModel.IsSelect = NO;
-//    [self.myChannel addObject:dModel];
-//    ChannelModel * eModel = [[ChannelModel alloc] init];
-//    eModel.ArticleGroupId = 8;
-//    eModel.ArticleGroupName = @"每日好文";
-//    eModel.IsSelect = NO;
-//    [self.myChannel addObject:eModel];
-//    ChannelModel * fModel = [[ChannelModel alloc] init];
-//    fModel.ArticleGroupId = 9;
-//    fModel.ArticleGroupName = @"名师";
-//    fModel.IsSelect = NO;
-//    [self.myChannel addObject:fModel];
-//    ChannelModel * gModel = [[ChannelModel alloc] init];
-//    gModel.ArticleGroupId = 10;
-//    gModel.ArticleGroupName = @"大咖讲座";
-//    gModel.IsSelect = NO;
-//    [self.myChannel addObject:gModel];
+    //    ChannelModel * model = [[ChannelModel alloc] init];
+    //    model.ArticleGroupId = 0;
+    //    model.ArticleGroupName = @"推荐";
+    //    model.StyleCss = @"default";
+    //    model.IsSelect = YES;
+    //    [self.myChannel addObject:model];
+    //    ChannelModel * workModel = [[ChannelModel alloc] init];
+    //    workModel.ArticleGroupId = 1;
+    //    workModel.ArticleGroupName = @"待办工作";
+    //    workModel.IsSelect = NO;
+    //    [self.myChannel addObject:workModel];
+    //    ChannelModel * sModel = [[ChannelModel alloc] init];
+    //    sModel.ArticleGroupId = 2;
+    //    sModel.ArticleGroupName = @"信源听说";
+    //    sModel.IsSelect = NO;
+    //    [self.myChannel addObject:sModel];
+    //    ChannelModel * mModel = [[ChannelModel alloc] init];
+    //    mModel.ArticleGroupId = 3;
+    //    mModel.ArticleGroupName = @"名校";
+    //    mModel.IsSelect = NO;
+    //    [self.myChannel addObject:mModel];
+    //    ChannelModel * aModel = [[ChannelModel alloc] init];
+    //    aModel.ArticleGroupId = 4;
+    //    aModel.ArticleGroupName = @"会员特供";
+    //    aModel.IsSelect = NO;
+    //    [self.myChannel addObject:aModel];
+    //    ChannelModel * bModel = [[ChannelModel alloc] init];
+    //    bModel.ArticleGroupId = 5;
+    //    bModel.ArticleGroupName = @"每日微课";
+    //    bModel.IsSelect = NO;
+    //    [self.myChannel addObject:bModel];
+    //    ChannelModel * cModel = [[ChannelModel alloc] init];
+    //    cModel.ArticleGroupId = 6;
+    //    cModel.ArticleGroupName = @"每日技能";
+    //    cModel.IsSelect = NO;
+    //    [self.myChannel addObject:cModel];
+    //    ChannelModel * dModel = [[ChannelModel alloc] init];
+    //    dModel.ArticleGroupId = 7;
+    //    dModel.ArticleGroupName = @"每日好书";
+    //    dModel.IsSelect = NO;
+    //    [self.myChannel addObject:dModel];
+    //    ChannelModel * eModel = [[ChannelModel alloc] init];
+    //    eModel.ArticleGroupId = 8;
+    //    eModel.ArticleGroupName = @"每日好文";
+    //    eModel.IsSelect = NO;
+    //    [self.myChannel addObject:eModel];
+    //    ChannelModel * fModel = [[ChannelModel alloc] init];
+    //    fModel.ArticleGroupId = 9;
+    //    fModel.ArticleGroupName = @"名师";
+    //    fModel.IsSelect = NO;
+    //    [self.myChannel addObject:fModel];
+    //    ChannelModel * gModel = [[ChannelModel alloc] init];
+    //    gModel.ArticleGroupId = 10;
+    //    gModel.ArticleGroupName = @"大咖讲座";
+    //    gModel.IsSelect = NO;
+    //    [self.myChannel addObject:gModel];
 }
 
 #pragma mark - 分享成功跳转
@@ -683,61 +682,182 @@
     NSInteger Id = [[dic objectForKey:@"Id"] integerValue];
     NSInteger userId = [[dic objectForKey:@"userId"] integerValue];
     NSString* name = [[dic objectForKey:@"name"] stringByRemovingPercentEncoding];
-    NSString* describe = [[dic objectForKey:@"describe"] stringByRemovingPercentEncoding];
+//    NSString* describe = [[dic objectForKey:@"describe"] stringByRemovingPercentEncoding];
     switch (type) {
-        case CollectModel_CollectFile:
+        case CollectModel_Aritle:
+        {
+            MyTDTopicDetailVC * vc = [MyTDTopicDetailVC initMyTDTopicDetailVC];
+            vc.type = CollectModel_Aritle;
+            vc.Id = Id;
+            vc.hidesBottomBarWhenPushed = YES;
+            [self.navigationController pushViewController:vc animated:YES];
+        }
+            break;
+        case CollectModel_work:
+        {
+            MyApprovalPageDetail * vc = [[MyApprovalPageDetail alloc]init];
+            vc.indexId = Id;
+            vc.title = name;
+            vc.TodoId = Id;
+            vc.hidesBottomBarWhenPushed = YES;
+            [self.navigationController pushViewController:vc animated:YES];
+        }
+            break;
+        case CollectModel_Toipc:
+        {
+            MyTDTopicDetailVC * vc = [MyTDTopicDetailVC initMyTDTopicDetailVC];
+            vc.Id = Id;
+            vc.type = CollectModel_Toipc;
+            vc.hidesBottomBarWhenPushed = YES;
+            [self.navigationController pushViewController:vc animated:YES];
+        }
+            break;
+        case CollectModel_NewTopic:
+        {
+            MyTDTopicDetailVC * vc = [MyTDTopicDetailVC initMyTDTopicDetailVC];
+            vc.Id = Id;
+            vc.type = CollectModel_NewTopic;
+            vc.hidesBottomBarWhenPushed = YES;
+            [self.navigationController pushViewController:vc animated:YES];
+        }
+            break;
+        case CollectModel_Notice:
+        {
+            MyTDTopicDetailVC * vc = [MyTDTopicDetailVC initMyTDTopicDetailVC];
+            vc.Id = Id;
+            vc.type = CollectModel_Notice;
+            vc.hidesBottomBarWhenPushed = YES;
+            [self.navigationController pushViewController:vc animated:YES];
+        }
+            break;
+        case CollectModel_InterMail:
+        {
+            MyTDTopicDetailVC * vc = [MyTDTopicDetailVC initMyTDTopicDetailVC];
+            vc.Id = Id;
+            vc.type = CollectModel_InterMail;
+            vc.hidesBottomBarWhenPushed = YES;
+            [self.navigationController pushViewController:vc animated:YES];
+        }
+            break;
+        case CollectModel_NoSignMail:
+        {
+            MyTDTopicDetailVC * vc = [MyTDTopicDetailVC initMyTDTopicDetailVC];
+            vc.Id = Id;
+            vc.type = CollectModel_NoSignMail;
+            vc.hidesBottomBarWhenPushed = YES;
+            [self.navigationController pushViewController:vc animated:YES];
+        }
+            break;
+        case CollectModel_NoteBook:
         {
-            if (userId == [AppUserModel sharedAppUserModel].Id) {
+            MyTDTopicDetailVC * vc = [MyTDTopicDetailVC initMyTDTopicDetailVC];
+            vc.Id = Id;
+            vc.type = CollectModel_NoteBook;
+            vc.hidesBottomBarWhenPushed = YES;
+            [self.navigationController pushViewController:vc animated:YES];
+        }
+            break;
+        case CollectModel_meetMian:
+        {
+            MyTDTopicDetailVC * vc = [MyTDTopicDetailVC initMyTDTopicDetailVC];
+            vc.Id = Id;
+            vc.type = CollectModel_meetMian;
+            vc.hidesBottomBarWhenPushed = YES;
+            [self.navigationController pushViewController:vc animated:YES];
+        }
+            break;
+        case CollectModel_meetDetail:
+        {
+            WorkFlowDetailsController *vc = [[WorkFlowDetailsController alloc] initWithId:Id];
+            vc.hidesBottomBarWhenPushed = YES;
+            [self.navigationController pushViewController:vc animated:YES];
+        }
+            break;
+        case CollectModel_CollectFile:{
+            if (userId == [AppUserModel sharedAppUserModel].Id || userId == 0) {
                 MyFavoriteVC *vc = [MyFavoriteVC initMyFavoriteVC];
                 vc.listType = Id == 0 ? MyFavoriteListLevelTypeA : MyFavoriteListLevelTypeB;
-                vc.ParentId = 0;
+                vc.ParentId = Id;
                 vc.FolderId = Id;
-                vc.myTitle =  Id == 0 ? @"我的收藏" :name;
+                vc.myTitle = name;
+                vc.hidesBottomBarWhenPushed = YES;
                 [self.navigationController pushViewController:vc animated:YES];
             }else{
-                OtherFavoriteVC * vc = [OtherFavoriteVC initOtherFavoriteVC];
+                OtherFavoriteVC *vc = [OtherFavoriteVC initOtherFavoriteVC];
                 vc.listType = Id == 0 ? MyFavoriteListLevelTypeA : MyFavoriteListLevelTypeB;
+                vc.ParentId = Id;
                 vc.FolderId = Id;
-                vc.Author = describe;
                 vc.myTitle = name;
                 vc.VisitUserId = userId;
+                vc.hidesBottomBarWhenPushed = YES;
                 [self.navigationController pushViewController:vc animated:YES];
             }
-        }
-            break;
-        case CollectModel_NoteFile:
-        {
-            if (userId == [AppUserModel sharedAppUserModel].Id) {
-                NoteBookVC * vc = [NoteBookVC initNoteBookVC];
-                if (Id == 0) {
-                    vc.listType = MyFavoriteListLevelTypeB;
-                    vc.myTitle = @"我的笔记";
-                }else{
-                    vc.listType = MyFavoriteListLevelTypeC;
-                    vc.myTitle = name;
-                }
-                vc.ParentId = 0;
+        }break;
+        case CollectModel_NoteFile:{
+            if (userId == [AppUserModel sharedAppUserModel].Id || userId == 0) {
+                NoteBookVC *vc = [NoteBookVC initNoteBookVC];
+                vc.listType = Id == 0 ? MyFavoriteListLevelTypeA : MyFavoriteListLevelTypeB;
+                vc.ParentId = Id;
                 vc.FolderId = Id;
-                vc.isSubVC = YES;
+                vc.myTitle = name;
+                vc.VisitUserId = 0;
                 [self.navigationController pushViewController:vc animated:YES];
             }else{
-                OtherNoteBookVC * vc = [OtherNoteBookVC initOtherNoteBookVC];
+                OtherNoteBookVC *vc = [OtherNoteBookVC initOtherNoteBookVC];
                 vc.listType = Id == 0 ? MyFavoriteListLevelTypeA : MyFavoriteListLevelTypeB;
+                vc.ParentId = Id;
                 vc.FolderId = Id;
-                vc.Author = describe;
                 vc.myTitle = name;
                 vc.VisitUserId = userId;
+                vc.hidesBottomBarWhenPushed = YES;
                 [self.navigationController pushViewController:vc animated:YES];
             }
-        }
-            break;
+        }break;
+        case CollectModel_TopicBooK:{
+            if (userId == [AppUserModel sharedAppUserModel].Id || userId == 0) {
+                NoteBookVC *vc = [NoteBookVC initNoteBookVC];
+                vc.listType = MyFavoriteListLevelTypeA;
+                vc.ParentId = 0;
+                vc.FolderId = Id;
+                vc.myTitle = name;
+                vc.VisitUserId = 0;
+                vc.TypeValue = 1;
+                [self.navigationController pushViewController:vc animated:YES];
+            }else{
+                OtherNoteBookVC *vc = [OtherNoteBookVC initOtherNoteBookVC];
+                vc.listType = MyFavoriteListLevelTypeA;
+                vc.ParentId = 0;
+                vc.FolderId = Id;
+                vc.myTitle = name;
+                vc.VisitUserId = userId;
+                vc.TypeValue = 1;
+                vc.hidesBottomBarWhenPushed = YES;
+                [self.navigationController pushViewController:vc animated:YES];
+            }
+        }break;
+        case CollectModel_TopicSubBooK:{
+            if (userId == [AppUserModel sharedAppUserModel].Id || userId == 0) {
+                NoteBookVC *vc = [NoteBookVC initNoteBookVC];
+                vc.listType = MyFavoriteListLevelTypeB;
+                vc.ParentId = Id;
+                vc.FolderId = Id;
+                vc.myTitle = name;
+                vc.VisitUserId = 0;
+                vc.TypeValue = 1;
+                [self.navigationController pushViewController:vc animated:YES];
+            }else{
+                OtherNoteBookVC *vc = [OtherNoteBookVC initOtherNoteBookVC];
+                vc.listType = MyFavoriteListLevelTypeB;
+                vc.ParentId = Id;
+                vc.FolderId = Id;
+                vc.myTitle = name;
+                vc.VisitUserId = userId;
+                vc.TypeValue = 1;
+                vc.hidesBottomBarWhenPushed = YES;
+                [self.navigationController pushViewController:vc animated:YES];
+            }
+        }break;
         default:
-        {
-            MyTDTopicDetailVC * vc = [MyTDTopicDetailVC initMyTDTopicDetailVC];
-            vc.type = type;
-            vc.Id = Id;
-            [self.navigationController pushViewController:vc animated:YES];
-        }
             break;
     }
 }
@@ -748,7 +868,7 @@
 - (void)musicAction:(UIButton *)sender
 {
     [[HKFloatManager shared] showVideo];
-
+    
 }
 - (TDButton *)addButton {
     if (!_addButton) {

smartRhino/Project/VCModel/Login/Model/AppUserModel.h

@@ -44,7 +44,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic ,copy) NSString *Nick;
 @property (nonatomic ,copy) NSString *QRCoder;
 @property (nonatomic ,copy) NSString *ImId;
-
+@property (nonatomic ,copy) NSString *HistoryAvatarUrl;
 ///归档登录信息
 - (void)saveUserInfor;
 ///读取登录信息

smartRhino/Project/VCModel/Login/Model/AppUserModel.m

@@ -44,6 +44,7 @@ static AppUserModel *user = nil;
      self.Email = (NSString*)[aDictionary valueForKey:@"Email"];
      self.Id = (NSInteger)[aDictionary valueForKey:@"Id"];
      self.Nick = (NSString*)[aDictionary valueForKey:@"Nick"];
+     self.HistoryAvatarUrl = (NSString*)[aDictionary valueForKey:@"HistoryAvatarUrl"];
      self.Description = (NSString*)[aDictionary valueForKey:@"Description"];
      self.DepartmentId = (NSInteger)[aDictionary valueForKey:@"DepartmentId"];
      self.DepartmentName = [aDictionary valueForKey:@"DepartmentName"];

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

@@ -163,9 +163,6 @@
             if (model.CollectionType == CollectModel_Text) {
                 model.CollectionType = CollectModel_Aritle;
             }
-            if (model.CollectionType == CollectModel_meet) {
-                model.CollectionType = CollectModel_meetMian;
-            }
         }
         [weakSelf.tableView.mj_header endRefreshing];
         [weakSelf.tableView.mj_footer endRefreshing];
@@ -258,6 +255,12 @@
                 case CollectModel_NoteFile: {
                     cell.fileImgV.image = IMG(@"find_1");
                 }break;
+                case CollectModel_TopicBooK:{
+                    cell.fileImgV.image = IMG(@"topicBook");
+                }break;
+                case CollectModel_TopicSubBooK: {
+                    cell.fileImgV.image = IMG(@"find_1");
+                }break;
                     // 通知 || 站内信
                 case CollectModel_Notice:
                 {

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

@@ -30,6 +30,7 @@
 #import "OtherNoteBookVC.h"
 #import "CountDataVC.h"
 #import "TDGroupInfoListVC.h"
+#import "NoteBookVC.h"
 
 @interface MyFavoriteSearchVC ()<UITableViewDelegate,UITableViewDataSource>
 @property (nonatomic, assign) NSUInteger  currentPage;
@@ -115,9 +116,6 @@
             if (model.CollectionType == CollectModel_Text) {
                 model.CollectionType = CollectModel_Aritle;
             }
-            if (model.CollectionType == CollectModel_meet) {
-                model.CollectionType = CollectModel_meetMian;
-            }
         }
         [weakSelf.tableView.mj_header endRefreshing];
         [weakSelf.tableView.mj_footer endRefreshing];
@@ -208,6 +206,12 @@
                 case CollectModel_NoteFile: {
                     cell.fileImgV.image = IMG(@"find_1");
                 }break;
+                case CollectModel_TopicBooK:{
+                    cell.fileImgV.image = IMG(@"topicBook");
+                }break;
+                case CollectModel_TopicSubBooK: {
+                    cell.fileImgV.image = IMG(@"find_1");
+                }break;
                     // 通知 || 站内信
                 case CollectModel_Notice:
                 {
@@ -312,21 +316,10 @@
             case 1:{
                 switch (model.CollectionType) {
                     case CollectModel_Aritle:{
-                        SHOWLOADING
-                        WEAKSELF
-                        [[HttpManager sharedHttpManager] GETWithUrl:[NSString stringWithFormat:@"%@%ld",Article_Detail_Get,(long)model.CollectionDataId] parameters:@{} success:^(id  _Nonnull responseObject) {
-                            REMOVESHOW;
-                            Item *itemModel = [[Item alloc]initWithDictionary:responseObject error:nil];
-//                            HomeDetailController *homeDetail = [[HomeDetailController alloc] init];
-//                            [homeDetail loadCurrentModel:itemModel];
-//                            [strongSelf.navigationController pushViewController:homeDetail animated:YES];
-                            MyTDTopicDetailVC * vc = [MyTDTopicDetailVC initMyTDTopicDetailVC];
-                            vc.type = CollectModel_Aritle;
-                            vc.Id = itemModel.Id;
-                            [weakSelf.navigationController pushViewController:vc animated:YES];
-                        } failure:^(NSError * _Nonnull error) {
-                            SHOWERROR([ZYCTool handerResultData:error]);
-                        }];
+                        MyTDTopicDetailVC * vc = [MyTDTopicDetailVC initMyTDTopicDetailVC];
+                        vc.type = CollectModel_Aritle;
+                        vc.Id = model.CollectionDataId;
+                        [self.navigationController pushViewController:vc animated:YES];
                     }break;
                     case CollectModel_Toipc:
                     {
@@ -352,23 +345,84 @@
                         [self.navigationController pushViewController:vc animated:YES];
                     }break;
                     case CollectModel_CollectFile:{
-                        OtherFavoriteVC * vc = [OtherFavoriteVC initOtherFavoriteVC];
-                        vc.listType = model.CollectionDataId == 0 ? MyFavoriteListLevelTypeA : MyFavoriteListLevelTypeB;
-                        vc.FolderId = model.CollectionDataId;
-                        vc.Author = model.Author;
-                        vc.myTitle = model.Title;
-                        vc.VisitUserId = model.SourceUserId;
-                        [self.navigationController pushViewController:vc animated:YES];
+                        if (model.SourceUserId == [AppUserModel sharedAppUserModel].Id || model.SourceUserId == 0) {
+                            MyFavoriteVC * vc = [MyFavoriteVC initMyFavoriteVC];
+                            vc.listType = model.CollectionDataId == 0 ? MyFavoriteListLevelTypeA : MyFavoriteListLevelTypeB;
+                            vc.FolderId = model.CollectionDataId;
+                            vc.myTitle = model.Title;
+                            [self.navigationController pushViewController:vc animated:YES];
+                        }else{
+                            OtherFavoriteVC * vc = [OtherFavoriteVC initOtherFavoriteVC];
+                            vc.listType = model.CollectionDataId == 0 ? MyFavoriteListLevelTypeA : MyFavoriteListLevelTypeB;
+                            vc.FolderId = model.CollectionDataId;
+                            vc.CollectionDataId = model.CollectionDataId;
+                            vc.CollectionType = model.CollectionType;
+                            vc.Author = model.Data.Author;
+                            vc.myTitle = model.Title;
+                            vc.VisitUserId = model.SourceUserId;
+                            [self.navigationController pushViewController:vc animated:YES];
+                        }
                     }break;
                     case CollectModel_NoteFile: {
-                        OtherNoteBookVC * vc = [OtherNoteBookVC initOtherNoteBookVC];
-                        vc.listType = model.CollectionDataId == 0 ? MyFavoriteListLevelTypeA : MyFavoriteListLevelTypeB;
-                        vc.FolderId = model.CollectionDataId;
-                        vc.Author = model.Author;
-                        vc.myTitle = model.Title;
-                        vc.TypeValue = 1;
-                        vc.VisitUserId = model.SourceUserId;
-                        [self.navigationController pushViewController:vc animated:YES];
+                        if (model.SourceUserId == [AppUserModel sharedAppUserModel].Id || model.SourceUserId == 0) {
+                            NoteBookVC * vc = [NoteBookVC initNoteBookVC];
+                            vc.listType = model.CollectionDataId == 0 ? MyFavoriteListLevelTypeA : MyFavoriteListLevelTypeB;
+                            vc.FolderId = model.CollectionDataId;
+                            vc.myTitle = model.Title;
+                            [self.navigationController pushViewController:vc animated:YES];
+                        }else{
+                            OtherNoteBookVC * vc = [OtherNoteBookVC initOtherNoteBookVC];
+                            vc.listType = model.CollectionDataId == 0 ? MyFavoriteListLevelTypeA : MyFavoriteListLevelTypeB;
+                            vc.FolderId = model.CollectionDataId;
+                            vc.CollectionDataId = model.CollectionDataId;
+                            vc.CollectionType = model.CollectionType;
+                            vc.Author = model.Data.Author;
+                            vc.myTitle = model.Title;
+                            vc.VisitUserId = model.SourceUserId;
+                            [self.navigationController pushViewController:vc animated:YES];
+                        }
+                    }break;
+                    case CollectModel_TopicBooK:{
+                        if (model.SourceUserId == [AppUserModel sharedAppUserModel].Id || model.SourceUserId == 0) {
+                            NoteBookVC * vc = [NoteBookVC initNoteBookVC];
+                            vc.listType = MyFavoriteListLevelTypeA;
+                            vc.FolderId = model.CollectionDataId;
+                            vc.TypeValue = 1;
+                            vc.myTitle = model.Title;
+                            [self.navigationController pushViewController:vc animated:YES];
+                        }else{
+                            OtherNoteBookVC * vc = [OtherNoteBookVC initOtherNoteBookVC];
+                            vc.listType = MyFavoriteListLevelTypeA ;
+                            vc.FolderId = model.CollectionDataId;
+                            vc.CollectionDataId = model.CollectionDataId;
+                            vc.CollectionType = model.CollectionType;
+                            vc.Author = model.Data.Author;
+                            vc.TypeValue = 1;
+                            vc.myTitle = model.Title;
+                            vc.VisitUserId = model.SourceUserId;
+                            [self.navigationController pushViewController:vc animated:YES];
+                        }
+                    }break;
+                    case CollectModel_TopicSubBooK:{
+                        if (model.SourceUserId == [AppUserModel sharedAppUserModel].Id || model.SourceUserId == 0) {
+                            NoteBookVC * vc = [NoteBookVC initNoteBookVC];
+                            vc.listType = MyFavoriteListLevelTypeB;
+                            vc.FolderId = model.CollectionDataId;
+                            vc.TypeValue = 1;
+                            vc.myTitle = model.Title;
+                            [self.navigationController pushViewController:vc animated:YES];
+                        }else{
+                            OtherNoteBookVC * vc = [OtherNoteBookVC initOtherNoteBookVC];
+                            vc.listType = MyFavoriteListLevelTypeB;
+                            vc.FolderId = model.CollectionDataId;
+                            vc.CollectionDataId = model.CollectionDataId;
+                            vc.CollectionType = model.CollectionType;
+                            vc.Author = model.Data.Author;
+                            vc.TypeValue = 1;
+                            vc.myTitle = model.Title;
+                            vc.VisitUserId = model.SourceUserId;
+                            [self.navigationController pushViewController:vc animated:YES];
+                        }
                     }break;
                     case CollectModel_Notice:{
                         MyTDTopicDetailVC * vc = [MyTDTopicDetailVC initMyTDTopicDetailVC];

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

@@ -35,6 +35,7 @@
 #import "MyTDGroupView.h"
 #import "TDGroupInfoListVC.h"
 #import "ShareListVC.h"
+#import "NoteBookVC.h"
 
 @interface MyFavoriteVC ()<UITableViewDataSource,UITableViewDelegate,NoteBookShareVCDelegate>
 @property (weak, nonatomic) IBOutlet UIButton *rightButton;
@@ -82,6 +83,7 @@
 }
 - (void)viewWillAppear:(BOOL)animated{
     [super viewWillAppear:animated];
+    [self.shouCangArray removeAllObjects];
     switch (self.operationStateEnum) {
         case OperationStateEnum1:
         {
@@ -104,44 +106,44 @@
     }
 }
 #pragma mark - UItableView刷新
-- (void)addRefresh
-{
-    WS(weakSelf);
-    self.tableView.mj_header = [MJRefreshNormalHeader headerWithRefreshingBlock:^{
-        [weakSelf headRefresh];
-    }];
-    //    self.tableView.mj_footer = [MJRefreshBackStateFooter footerWithRefreshingBlock:^{
-    //        [weakSelf footerRefresh];
-    //    }];
-}
-- (void)removeRefresh
-{
-    [self.tableView.mj_header endRefreshing];
-    [self.tableView.mj_header removeFromSuperview];
-    [self.tableView.mj_footer endRefreshing];
-    [self.tableView.mj_footer removeFromSuperview];
-    self.currentPage = 0;
-    self.totalPage = 1;
-    [self.shouCangArray removeAllObjects];
-    [self getDataList];
-}
-
-- (void)headRefresh{
-    self.currentPage = 1;
-    self.totalPage = 1;
-    [self.shouCangArray removeAllObjects];
-    [self getDataList];
-}
+//- (void)addRefresh
+//{
+//    WS(weakSelf);
+//    self.tableView.mj_header = [MJRefreshNormalHeader headerWithRefreshingBlock:^{
+//        [weakSelf headRefresh];
+//    }];
+//    //    self.tableView.mj_footer = [MJRefreshBackStateFooter footerWithRefreshingBlock:^{
+//    //        [weakSelf footerRefresh];
+//    //    }];
+//}
+//- (void)removeRefresh
+//{
+//    [self.tableView.mj_header endRefreshing];
+//    [self.tableView.mj_header removeFromSuperview];
+//    [self.tableView.mj_footer endRefreshing];
+//    [self.tableView.mj_footer removeFromSuperview];
+//    self.currentPage = 0;
+//    self.totalPage = 1;
+//    [self.shouCangArray removeAllObjects];
+//    [self getDataList];
+//}
 
-- (void)footerRefresh{
-    self.currentPage += 1;
-    if (self.totalPage == self.shouCangArray.count) {
-        self.currentPage --;
-        [self.tableView.mj_footer resetNoMoreData];
-        return ;
-    }
-    [self getDataList];
-}
+//- (void)headRefresh{
+//    self.currentPage = 1;
+//    self.totalPage = 1;
+//    [self.shouCangArray removeAllObjects];
+//    [self getDataList];
+//}
+//
+//- (void)footerRefresh{
+//    self.currentPage += 1;
+//    if (self.totalPage == self.shouCangArray.count) {
+//        self.currentPage --;
+//        [self.tableView.mj_footer resetNoMoreData];
+//        return ;
+//    }
+//    [self getDataList];
+//}
 - (void)getDataList {
     WS(weakSelf);
     NSArray * sArray = [self getSelectData];
@@ -165,9 +167,6 @@
             if (model.CollectionType == CollectModel_Text) {
                 model.CollectionType = CollectModel_Aritle;
             }
-            if (model.CollectionType == CollectModel_meet) {
-                model.CollectionType = CollectModel_meetMian;
-            }
             for (MyFavoriteSubModel * fModel in sArray) {
                 if (model.Id == fModel.Id) {
                     model.IsSelect = YES;
@@ -578,6 +577,7 @@
                     cell.subTitleL.textColor = model.Data.Author.length > 0 ? UIColorHex(0x999999) : [UIColor clearColor];
                     cell.topImgV.hidden = !model.IsTop;
                     cell.IconShowL.hidden = YES;
+                    cell.beComeL.hidden = YES;
                     switch (model.CollectionType) {
                             // 文章
                         case CollectModel_Aritle:{
@@ -591,15 +591,18 @@
                         case CollectModel_Toipc:
                         {
                             cell.fileImgV.image = IMG(@"话题");
-                            cell.beComeL.attributedText = [self changeOfString:[NSString stringWithFormat:@"来自-%@",model.Data.GroupName]];
-                            UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithActionBlock:^(id  _Nonnull sender) {
-                                TDGroupInfoListVC * vc = [TDGroupInfoListVC initTDGroupInfoListVC];
-                                vc.GroupId = model.Data.GroupId;
-                                vc.titleStr = model.Data.GroupName;
-                                [weakSelf.navigationController pushViewController:vc animated:YES];
-                            }];
-                            [cell.beComeL addGestureRecognizer:tap];
-                            cell.beComeL.userInteractionEnabled = YES;
+                            if (!ISEmpty(model.Data.GroupName)) {
+                                cell.beComeL.hidden = NO;
+                                cell.beComeL.attributedText = [self changeOfString:[NSString stringWithFormat:@"来自-%@",model.Data.GroupName]];
+                                UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithActionBlock:^(id  _Nonnull sender) {
+                                    TDGroupInfoListVC * vc = [TDGroupInfoListVC initTDGroupInfoListVC];
+                                    vc.GroupId = model.Data.GroupId;
+                                    vc.titleStr = model.Data.GroupName;
+                                    [weakSelf.navigationController pushViewController:vc animated:YES];
+                                }];
+                                [cell.beComeL addGestureRecognizer:tap];
+                                cell.beComeL.userInteractionEnabled = YES;
+                            }
                         }break;
                         case CollectModel_NewTopic:
                         {
@@ -687,7 +690,6 @@
                             }
                         }break;
                     }
-                    
                     return cell;
                 }break;
                     // 文件夹
@@ -1261,19 +1263,10 @@
                 case 1:{
                     switch (model.CollectionType) {
                         case CollectModel_Aritle:{
-                            WEAKSELF
-                            [[HttpManager sharedHttpManager] GETWithUrl:[NSString stringWithFormat:@"%@%ld",Article_Detail_Get,(long)model.CollectionDataId] parameters:@{} success:^(id  _Nonnull responseObject) {
-                                Item *itemModel = [[Item alloc]initWithDictionary:responseObject error:nil];
-                                //                                HomeDetailController *homeDetail = [[HomeDetailController alloc] init];
-                                //                                [homeDetail loadCurrentModel:itemModel];
-                                //                                [strongSelf.navigationController pushViewController:homeDetail animated:YES];
-                                MyTDTopicDetailVC * vc = [MyTDTopicDetailVC initMyTDTopicDetailVC];
-                                vc.type = CollectModel_Aritle;
-                                vc.Id = itemModel.Id;
-                                [weakSelf.navigationController pushViewController:vc animated:YES];
-                            } failure:^(NSError * _Nonnull error) {
-                                SHOWERROR([ZYCTool handerResultData:error]);
-                            }];
+                            MyTDTopicDetailVC * vc = [MyTDTopicDetailVC initMyTDTopicDetailVC];
+                            vc.type = CollectModel_Aritle;
+                            vc.Id = model.CollectionDataId;
+                            [self.navigationController pushViewController:vc animated:YES];
                         }break;
                         case CollectModel_Toipc:
                         {
@@ -1300,51 +1293,84 @@
                             [self.navigationController pushViewController:vc animated:YES];
                         }break;
                         case CollectModel_CollectFile:{
-                            OtherFavoriteVC * vc = [OtherFavoriteVC initOtherFavoriteVC];
-                            vc.listType = model.CollectionDataId == 0 ? MyFavoriteListLevelTypeA : MyFavoriteListLevelTypeB;
-                            vc.FolderId = model.CollectionDataId;
-                            vc.CollectionDataId = model.CollectionDataId;
-                            vc.CollectionType = model.CollectionType;
-                            vc.Author = model.Data.Author;
-                            vc.myTitle = model.Title;
-                            vc.VisitUserId = model.SourceUserId;
-                            [self.navigationController pushViewController:vc animated:YES];
+                            if (model.SourceUserId == [AppUserModel sharedAppUserModel].Id || model.SourceUserId == 0) {
+                                MyFavoriteVC * vc = [MyFavoriteVC initMyFavoriteVC];
+                                vc.listType = model.CollectionDataId == 0 ? MyFavoriteListLevelTypeA : MyFavoriteListLevelTypeB;
+                                vc.FolderId = model.CollectionDataId;
+                                vc.myTitle = model.Title;
+                                [self.navigationController pushViewController:vc animated:YES];
+                            }else{
+                                OtherFavoriteVC * vc = [OtherFavoriteVC initOtherFavoriteVC];
+                                vc.listType = model.CollectionDataId == 0 ? MyFavoriteListLevelTypeA : MyFavoriteListLevelTypeB;
+                                vc.FolderId = model.CollectionDataId;
+                                vc.CollectionDataId = model.CollectionDataId;
+                                vc.CollectionType = model.CollectionType;
+                                vc.Author = model.Data.Author;
+                                vc.myTitle = model.Title;
+                                vc.VisitUserId = model.SourceUserId;
+                                [self.navigationController pushViewController:vc animated:YES];
+                            }
                         }break;
                         case CollectModel_NoteFile: {
-                            OtherNoteBookVC * vc = [OtherNoteBookVC initOtherNoteBookVC];
-                            vc.listType = model.CollectionDataId == 0 ? MyFavoriteListLevelTypeA : MyFavoriteListLevelTypeB;
-                            vc.FolderId = model.CollectionDataId;
-                            vc.CollectionDataId = model.CollectionDataId;
-                            vc.CollectionType = model.CollectionType;
-                            vc.Author = model.Data.Author;
-                            vc.TypeValue = 1;
-                            vc.myTitle = model.Title;
-                            vc.VisitUserId = model.SourceUserId;
-                            [self.navigationController pushViewController:vc animated:YES];
+                            if (model.SourceUserId == [AppUserModel sharedAppUserModel].Id || model.SourceUserId == 0) {
+                                NoteBookVC * vc = [NoteBookVC initNoteBookVC];
+                                vc.listType = model.CollectionDataId == 0 ? MyFavoriteListLevelTypeA : MyFavoriteListLevelTypeB;
+                                vc.FolderId = model.CollectionDataId;
+                                vc.myTitle = model.Title;
+                                [self.navigationController pushViewController:vc animated:YES];
+                            }else{
+                                OtherNoteBookVC * vc = [OtherNoteBookVC initOtherNoteBookVC];
+                                vc.listType = model.CollectionDataId == 0 ? MyFavoriteListLevelTypeA : MyFavoriteListLevelTypeB;
+                                vc.FolderId = model.CollectionDataId;
+                                vc.CollectionDataId = model.CollectionDataId;
+                                vc.CollectionType = model.CollectionType;
+                                vc.Author = model.Data.Author;
+                                vc.myTitle = model.Title;
+                                vc.VisitUserId = model.SourceUserId;
+                                [self.navigationController pushViewController:vc animated:YES];
+                            }
                         }break;
                         case CollectModel_TopicBooK:{
-                            OtherNoteBookVC * vc = [OtherNoteBookVC initOtherNoteBookVC];
-                            vc.listType = MyFavoriteListLevelTypeA ;
-                            vc.FolderId = model.CollectionDataId;
-                            vc.CollectionDataId = model.CollectionDataId;
-                            vc.CollectionType = model.CollectionType;
-                            vc.Author = model.Data.Author;
-                            vc.TypeValue = 1;
-                            vc.myTitle = model.Title;
-                            vc.VisitUserId = model.SourceUserId;
-                            [self.navigationController pushViewController:vc animated:YES];
+                            if (model.SourceUserId == [AppUserModel sharedAppUserModel].Id || model.SourceUserId == 0) {
+                                NoteBookVC * vc = [NoteBookVC initNoteBookVC];
+                                vc.listType = MyFavoriteListLevelTypeA;
+                                vc.FolderId = model.CollectionDataId;
+                                vc.TypeValue = 1;
+                                vc.myTitle = model.Title;
+                                [self.navigationController pushViewController:vc animated:YES];
+                            }else{
+                                OtherNoteBookVC * vc = [OtherNoteBookVC initOtherNoteBookVC];
+                                vc.listType = MyFavoriteListLevelTypeA ;
+                                vc.FolderId = model.CollectionDataId;
+                                vc.CollectionDataId = model.CollectionDataId;
+                                vc.CollectionType = model.CollectionType;
+                                vc.Author = model.Data.Author;
+                                vc.TypeValue = 1;
+                                vc.myTitle = model.Title;
+                                vc.VisitUserId = model.SourceUserId;
+                                [self.navigationController pushViewController:vc animated:YES];
+                            }
                         }break;
                         case CollectModel_TopicSubBooK:{
-                            OtherNoteBookVC * vc = [OtherNoteBookVC initOtherNoteBookVC];
-                            vc.listType = MyFavoriteListLevelTypeB ;
-                            vc.FolderId = model.CollectionDataId;
-                            vc.CollectionDataId = model.CollectionDataId;
-                            vc.CollectionType = model.CollectionType;
-                            vc.Author = model.Data.Author;
-                            vc.TypeValue = 1;
-                            vc.myTitle = model.Title;
-                            vc.VisitUserId = model.SourceUserId;
-                            [self.navigationController pushViewController:vc animated:YES];
+                            if (model.SourceUserId == [AppUserModel sharedAppUserModel].Id || model.SourceUserId == 0) {
+                                NoteBookVC * vc = [NoteBookVC initNoteBookVC];
+                                vc.listType = MyFavoriteListLevelTypeB;
+                                vc.FolderId = model.CollectionDataId;
+                                vc.TypeValue = 1;
+                                vc.myTitle = model.Title;
+                                [self.navigationController pushViewController:vc animated:YES];
+                            }else{
+                                OtherNoteBookVC * vc = [OtherNoteBookVC initOtherNoteBookVC];
+                                vc.listType = MyFavoriteListLevelTypeB;
+                                vc.FolderId = model.CollectionDataId;
+                                vc.CollectionDataId = model.CollectionDataId;
+                                vc.CollectionType = model.CollectionType;
+                                vc.Author = model.Data.Author;
+                                vc.TypeValue = 1;
+                                vc.myTitle = model.Title;
+                                vc.VisitUserId = model.SourceUserId;
+                                [self.navigationController pushViewController:vc animated:YES];
+                            }
                         }break;
                         case CollectModel_Notice:{
                             MyTDTopicDetailVC * vc = [MyTDTopicDetailVC initMyTDTopicDetailVC];
@@ -1618,7 +1644,7 @@
             }];
         }
         [self.view layoutIfNeeded];
-        [self removeRefresh];
+//        [self removeRefresh];
         [self.tableView layoutIfNeeded];
         [self reSetSelect];
         self.threeLineView.hidden = NO;
@@ -1631,7 +1657,7 @@
         [self.rightButton setImage:IMG(@"chatmsg_right_add_icon") forState:UIControlStateNormal];
         [self.rightButton setTitle:nil forState:UIControlStateNormal];
         self.iSViewEditor = NO;
-        [self addRefresh];
+//        [self addRefresh];
         //默认操作状态为无状态
         self.operationStateEnum = OperationStateEnum0;
         self.operationAllSelectButton.hidden = NO;
@@ -1829,13 +1855,13 @@
     UIAlertController *alertVC = [UIAlertController alertControllerWithTitle:nil message:@"确认删除" preferredStyle:UIAlertControllerStyleAlert];
     UIAlertAction *ok = [UIAlertAction actionWithTitle:@"取消" style:UIAlertActionStyleCancel handler:^(UIAlertAction * _Nonnull action) {
         dispatch_async(dispatch_get_main_queue(), ^{
-            [weakSelf headRefresh];
+            [weakSelf getDataList];
         });
     }];
     [ok setValue:k9 forKey:@"_titleTextColor"];
     UIAlertAction *noOk = [UIAlertAction actionWithTitle:@"确认" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
         [[HttpManager sharedHttpManager] POSTUrl:Host(API_Find_DeleteRecord) parameters:dic responseStyle:DATA success:^(id  _Nonnull responseObject) {
-            [weakSelf headRefresh];
+            [weakSelf getDataList];
         } failure:^(NSError * _Nonnull error) {
             SHOWERROR([ZYCTool handerResultData:error]);
         }];
@@ -1858,13 +1884,13 @@
     UIAlertController *alertVC = [UIAlertController alertControllerWithTitle:nil message:@"确认删除" preferredStyle:UIAlertControllerStyleAlert];
     UIAlertAction *ok = [UIAlertAction actionWithTitle:@"取消" style:UIAlertActionStyleCancel handler:^(UIAlertAction * _Nonnull action) {
         dispatch_async(dispatch_get_main_queue(), ^{
-            [weakSelf headRefresh];
+            [weakSelf getDataList];
         });
     }];
     [ok setValue:k9 forKey:@"_titleTextColor"];
     UIAlertAction *noOk = [UIAlertAction actionWithTitle:@"确认" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
         [[HttpManager sharedHttpManager] POSTUrl:Host(API_Find_DeleteRecord) parameters:dic responseStyle:DATA success:^(id  _Nonnull responseObject) {
-            [weakSelf headRefresh];
+            [weakSelf getDataList];
         } failure:^(NSError * _Nonnull error) {
             SHOWERROR([ZYCTool handerResultData:error]);
         }];
@@ -1889,7 +1915,9 @@
             }
                 break;
             default:
+            {
                 [super backAction:sender];
+            }
                 break;
         }
     }else{
@@ -2037,7 +2065,7 @@
     
     messageObject.title = title;
     //创建网页内容对象
-    UMShareWebpageObject *shareObject = [UMShareWebpageObject shareObjectWithTitle:title descr:desc thumImage:IMG(@"logo_60")];
+    UMShareWebpageObject *shareObject = [UMShareWebpageObject shareObjectWithTitle:title descr:desc thumImage:IMG(@"share_file")];
     //设置网页地址
     shareObject.webpageUrl = url;
     
@@ -2113,6 +2141,9 @@
 }
 - (NSMutableAttributedString *)changeOfString:(NSString *)infoStr
 {
+    if (infoStr.length == 0) {
+        return [[NSMutableAttributedString alloc] initWithString:@""];
+    }
     NSMutableAttributedString *attrString = [[NSMutableAttributedString alloc] initWithString:infoStr];
     [attrString addAttribute:(NSString *)NSForegroundColorAttributeName
                        value:UIColorHex(0x999999)

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

@@ -124,9 +124,6 @@
             if (model.CollectionType == CollectModel_Text) {
                 model.CollectionType = CollectModel_Aritle;
             }
-            if (model.CollectionType == CollectModel_meet) {
-                model.CollectionType = CollectModel_meetMian;
-            }
         }
         [weakSelf changeMessageStatusWithNumber:weakSelf.shouCangArray.count];
         dispatch_async(dispatch_get_main_queue(), ^{
@@ -1449,7 +1446,7 @@
     
     messageObject.title = title;
     //创建网页内容对象
-    UMShareWebpageObject *shareObject = [UMShareWebpageObject shareObjectWithTitle:title descr:desc thumImage:IMG(@"find_1")];
+    UMShareWebpageObject *shareObject = [UMShareWebpageObject shareObjectWithTitle:title descr:desc thumImage:IMG(@"share_file")];
     //设置网页地址
     shareObject.webpageUrl = url;
     

smartRhino/Project/VCModel/My_Center/Controller/MyInfoVC.m

@@ -9,22 +9,27 @@
 #import "MyInfoVC.h"
 #import "MyInfoCell.h"
 #import "ShowPhotoCameraAlertView.h"
-#import "LYLPhotoTailoringTool.h"
 #import "EditUserNickVC.h"
 #import "ShowGenderAlertView.h"
 #import "EditMySignOrBriefVC.h"
-#import "MyQRCodeVC.h"
 #import "EditPhoneOrEmailVC.h"
 #import "H5ViewController.h"
 #import "H6ViewController.h"
 #import "MyUserIconVC.h"
+#import "MyQRCodeVC.h"
+#import "NoteBookShareVC.h"
+#import "ShareListVC.h"
+#import "MyTDGroupViewController.h"
+#import "MoveViewController.h"
 
-@interface MyInfoVC ()<UITableViewDelegate,UITableViewDataSource>
+@interface MyInfoVC ()<UITableViewDelegate,UITableViewDataSource,NoteBookShareVCDelegate>
 
 @property (strong,nonatomic) IBOutlet UITableView *tableView;
-
 @property (strong,nonatomic) UIImageView *showUserTestUserImg;
 @property (strong,nonatomic) UILabel *showUserGenderLabel;
+@property (strong,nonatomic) MyQRCodeVC *qrVC;
+@property (strong,nonatomic) NoteBookShareVC *noteBookShareVC;
+@property (strong,nonatomic) UIImage *shareImage;
 @end
 
 @implementation MyInfoVC
@@ -51,6 +56,8 @@
     self.tableView.estimatedRowHeight = 0;
     self.tableView.estimatedSectionHeaderHeight = 0;
     self.tableView.estimatedSectionFooterHeight = 0;
+    [self.view addSubview:self.qrVC.view];
+    [self.view addSubview:self.noteBookShareVC.view];
 }
 - (void)viewWillAppear:(BOOL)animated{
     [super viewWillAppear:animated];
@@ -130,12 +137,12 @@
                     cell.cell0TitleLabel.text = @"头像";
                     cell.cell0UserImgView.hidden = NO;
                     [cell.cell0UserImgView sd_setImageWithURL:[NSURL URLWithString:[AppUserModel sharedAppUserModel].AvatarUrl]];
-                    UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithActionBlock:^(id  _Nonnull sender) {
-                        MyUserIconVC * vc = [MyUserIconVC initMyUserIconVC];
-                        [weakSelf.navigationController pushViewController:vc animated:YES];
-                    }];
-                    [cell.cell0UserImgView addGestureRecognizer:tap];
-                    cell.cell0UserImgView.userInteractionEnabled = YES;
+//                    UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithActionBlock:^(id  _Nonnull sender) {
+//                        MyUserIconVC * vc = [MyUserIconVC initMyUserIconVC];
+//                        [weakSelf.navigationController pushViewController:vc animated:YES];
+//                    }];
+//                    [cell.cell0UserImgView addGestureRecognizer:tap];
+//                    cell.cell0UserImgView.userInteractionEnabled = YES;
                     self.showUserTestUserImg = cell.cell0UserImgView;
                     return cell;
                 }break;
@@ -221,125 +228,8 @@
         case 0:{
             switch (indexPath.row) {
                 case 0:{
-                    [[ShowPhotoCameraAlertView initShowPhotoCameraAlertViewConfirm:^(ShowPhotoCameraType type) {
-                        if(type == ShowPhotoCameraType1){
-                            NSLog(@"相册");
-                            [[LYLPhotoTailoringTool sharedTool] selectPhotoWithPhoroOrCamera:SelectPhotoWithTypePhoroOrCamera2 crop:YES showImgBlock:^(NSString *imageUrlStr) {
-                                NSLog(@"111111");
-                            } choosImgBlock:^(UIImage *image) {
-                                NSLog(@"aaaaaa");
-                                self.showUserTestUserImg.image = image;
-                                SHOWLOADING
-                               [[HttpManager sharedHttpManager] HeaderUploadUrl:[NSString stringWithFormat:@"%@%@",BaseUrl,Modify_UserImage_Post] parameters:@{@"":@""} pictureData:UIImageJPEGRepresentation(image,1.0f) pictureKey:@"file" success:^(id  _Nonnull responseObject) {
-                                   NSDictionary *dic = responseObject;
-                                   NSLog(@"/n图片上传成功=====绝对路径=====/n%@",responseObject[@"AbsolutePath"]);
-                                   NSLog(@"/n图片上传成功=====相对路径=====/n%@",responseObject[@"RelativePath"]);
-                                   [UserManager updateUserInfoDetail:IMAGE Param:dic[@"RelativePath"] Success:^(id  _Nonnull responseObject) {
-                                       REMOVESHOW;
-                                       [[HttpManager sharedHttpManager] GETUrl:[NSString stringWithFormat:@"%@%@",BaseUrl,UserDetailGet] parameters:@{} success:^(id  _Nonnull responseObject) {
-                                           NSDictionary *dic = responseObject;
-                                           [[AppUserModel sharedAppUserModel] modelSetWithDictionary:dic];
-                                           dispatch_async(dispatch_get_main_queue(), ^{
-                                               [weakSelf.tableView reloadRowAtIndexPath:[NSIndexPath indexPathForRow:0 inSection:0] withRowAnimation:UITableViewRowAnimationAutomatic];
-                                           });
-                                       } failure:^(NSError * _Nonnull error) {
-                                       }];
-                                   } failure:^(NSError * _Nonnull error) {
-                                       REMOVESHOW
-                                       SHOWERROR([ZYCTool handerResultData:error])
-                                   }];
-                               } failure:^(NSError * _Nonnull error) {
-                                  REMOVESHOW
-                                  SHOWERROR([ZYCTool handerResultData:error])
-                               }];
-                            }];
-                        }else if (type == ShowPhotoCameraType2){
-                            NSLog(@"相机");
-                            TZImagePickerController *imagePickerVc = [[TZImagePickerController alloc] initWithMaxImagesCount:1 delegate:nil];
-                            [imagePickerVc setNavLeftBarButtonSettingBlock:^(UIButton *leftButton){
-                                leftButton.hidden = YES;
-                            }];
-                            imagePickerVc.showSelectBtn = NO;
-                            imagePickerVc.allowCrop = YES;
-                            imagePickerVc.cropRect = CGRectMake(0, (SCREEN_HEIGHT - SCREEN_WIDTH) * 0.5, SCREEN_WIDTH, SCREEN_WIDTH);
-                            imagePickerVc.allowTakePicture = NO;
-                            imagePickerVc.allowTakeVideo = NO;
-                            imagePickerVc.allowPickingOriginalPhoto = NO;
-                            imagePickerVc.allowPickingGif = NO;
-                            [imagePickerVc setIsStatusBarDefault:YES];
-                            [imagePickerVc setNaviTitleColor:[UIColor blackColor]];
-                            [imagePickerVc setBarItemTextColor:[UIColor blackColor]];
-                            [imagePickerVc setDidFinishPickingPhotosHandle:^(NSArray<UIImage *> *photos, NSArray *assets, BOOL isSelectOriginalPhoto) {
-                                PHAsset *asset = assets.firstObject;
-                                switch (asset.mediaType) {
-                                    case PHAssetMediaTypeVideo: {
-
-                                    } break;
-                                    case PHAssetMediaTypeImage: {
-                                        UIImage * image = photos.firstObject;
-                                        [[HttpManager sharedHttpManager] HeaderUploadUrl:[NSString stringWithFormat:@"%@%@",BaseUrl,Modify_UserImage_Post] parameters:@{} pictureData:UIImageJPEGRepresentation(image,1.0f) pictureKey:@"file" success:^(id  _Nonnull responseObject) {
-                                            
-                                            NSDictionary *dic = responseObject;
-                                            NSLog(@"/n图片上传成功=====绝对路径=====/n%@",responseObject[@"AbsolutePath"]);
-                                            NSLog(@"/n图片上传成功=====相对路径=====/n%@",responseObject[@"RelativePath"]);
-                                            
-                                            [UserManager updateUserInfoDetail:IMAGE Param:dic[@"RelativePath"] Success:^(id  _Nonnull responseObject) {
-                                                REMOVESHOW;
-                                                [[HttpManager sharedHttpManager] GETUrl:[NSString stringWithFormat:@"%@%@",BaseUrl,UserDetailGet] parameters:@{} success:^(id  _Nonnull responseObject) {
-                                                    NSDictionary *dic = responseObject;
-                                                    [[AppUserModel sharedAppUserModel] modelSetWithDictionary:dic];
-                                                    dispatch_async(dispatch_get_main_queue(), ^{
-                                                        [weakSelf.tableView reloadRowAtIndexPath:[NSIndexPath indexPathForRow:0 inSection:0] withRowAnimation:UITableViewRowAnimationAutomatic];
-                                                    });
-                                                } failure:^(NSError * _Nonnull error) {
-                                                }];
-                                            } failure:^(NSError * _Nonnull error) {
-                                                REMOVESHOW
-                                                SHOWERROR([ZYCTool handerResultData:error])
-                                            }];
-                                            
-                                        } failure:^(NSError * _Nonnull error) {
-                                            REMOVESHOW
-                                            SHOWERROR([ZYCTool handerResultData:error])
-                                        }];
-                                    } break;
-                                    case PHAssetMediaTypeAudio:
-                                        break;
-                                    case PHAssetMediaTypeUnknown:
-                                        break;
-                                    default: break;
-                                }
-                            }];
-                            [self presentViewController:imagePickerVc animated:YES completion:nil];
-//                            [[LYLPhotoTailoringTool sharedTool] selectPhotoWithPhoroOrCamera:SelectPhotoWithTypePhoroOrCamera2 crop:YES showImgBlock:^(NSString *imageUrlStr) {
-//                                NSLog(@"222222");
-//
-//                            } choosImgBlock:^(UIImage *image) {
-//                                NSLog(@"oooooo");
-//                                self.showUserTestUserImg.image = image;
-//
-//                                [[HttpManager sharedHttpManager] HeaderUploadUrl:[NSString stringWithFormat:@"%@%@",BaseUrl,Modify_UserImage_Post] parameters:@{@"":@""} pictureData:UIImageJPEGRepresentation(image,1.0f) pictureKey:@"file" success:^(id  _Nonnull responseObject) {
-//
-//                                    NSDictionary *dic = responseObject;
-//                                    NSLog(@"/n图片上传成功=====绝对路径=====/n%@",responseObject[@"AbsolutePath"]);
-//                                    NSLog(@"/n图片上传成功=====相对路径=====/n%@",responseObject[@"RelativePath"]);
-//
-//                                    [UserManager updateUserInfoDetail:IMAGE Param:dic[@"RelativePath"] Success:^(id  _Nonnull responseObject) {
-//                                        REMOVESHOW;
-//                                        SHOWSUCCESS(@"修改成功");
-//                                    } failure:^(NSError * _Nonnull error) {
-//                                        REMOVESHOW
-//                                        SHOWERROR([ZYCTool handerResultData:error])
-//                                    }];
-//
-//                                } failure:^(NSError * _Nonnull error) {
-//                                    REMOVESHOW
-//                                    SHOWERROR([ZYCTool handerResultData:error])
-//                                }];
-//                            }];
-                        }
-                    } cancle:^{
-                    }] showWithAnimation:kAlertAnimationBottom];
+                    MyUserIconVC * vc = [MyUserIconVC initMyUserIconVC];
+                    [self.navigationController pushViewController:vc animated:YES];
                 }break;
                 case 1:{
 //                    EditMySignOrBriefVC *vc = [EditMySignOrBriefVC initEditMySignOrBriefVC];
@@ -348,7 +238,6 @@
 //                    [self.navigationController pushViewController:vc animated:YES];
                 }break;
                 case 2:{
-                    WS(weakSelf);
                     [[ShowGenderAlertView initShowGenderAlertViewWithGender:self.showUserGenderLabel.text confirm:^(NSString * _Nonnull gender) {
                         weakSelf.showUserGenderLabel.text = gender;
                         NSString *sexType = [gender isEqualToString:@"男"] ? @"Male":@"Female";
@@ -391,12 +280,17 @@
         case 2:{
             switch (indexPath.row) {
                 case 0:{
-                    MyQRCodeVC *vc = [MyQRCodeVC initMyQRCodeVC];
-                    vc.hidesBottomBarWhenPushed = YES;
-                    [self.navigationController pushViewController:vc animated:YES];
-//                    H5ViewController *vc = [[H5ViewController alloc] init];
-//                    vc.hidesBottomBarWhenPushed = YES;
-//                    [self.navigationController pushViewController:vc animated:YES];
+                    [self.noteBookShareVC initNoteBookShareData];
+                    self.qrVC.view.hidden = NO;
+                    WS(weakSelf);
+                    self.qrVC.ClickShareBlock = ^(UIImage * _Nonnull image) {
+                        if (image) {
+                            weakSelf.shareImage = image;
+                            weakSelf.noteBookShareVC.view.hidden = NO;
+                        }else{
+                            SHOWERROR(@"分享失败");
+                        }
+                    };
                 }break;
                 case 1:{
                     EditPhoneOrEmailVC *vc = [EditPhoneOrEmailVC initEditPhoneOrEmailVC];
@@ -425,6 +319,142 @@
             break;
     }
 }
+- (MyQRCodeVC *)qrVC
+{
+    if (!_qrVC) {
+        _qrVC = [MyQRCodeVC initMyQRCodeVC];
+        _qrVC.view.hidden = YES;
+    }
+    return _qrVC;
+}
+
+- (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;
+    }
+    return _noteBookShareVC;
+}
+
+-(void)userSelectType:(NSString *)typeName WithIndexPath:(NSIndexPath *)indexPath{
+    self.noteBookShareVC.view.hidden = !self.noteBookShareVC.view.hidden;
+    if ([typeName isEqualToString:@"发给微信好友"]) {
+        [self returnToWechatSession];
+    }else if ([typeName isEqualToString:@"发到朋友圈"]){
+        
+    }else if ([typeName isEqualToString:@"发到微博"]){
+        
+    }else if ([typeName isEqualToString:@"发给QQ好友"]){
+        
+    }else if ([typeName isEqualToString:@"发到消息"]){
+        [self returnToMessage];
+    }else if ([typeName isEqualToString:@"发到小组"]){
+        [self returnToGroup];
+    }else if ([typeName isEqualToString:@"发到笔记"]){
+        [self returnToNote];
+    }else if ([typeName isEqualToString:@"发到话题"]){
+        [self returnToTopic];
+    }else{
+        
+    }
+    NSLog(@"111");
+}
+#pragma mark - 分享功能
+- (void)shareWebPageToPlatformType:(UMSocialPlatformType)platformType
+{
+    //创建分享消息对象
+    UMSocialMessageObject *messageObject = [UMSocialMessageObject messageObject];
+    
+    messageObject.title = @"二维码";
+    //创建网页内容对象
+    UMShareImageObject *shareObject = [[UMShareImageObject alloc] init];
+    //获取图片
+    shareObject.shareImage = self.shareImage;
+    //分享消息对象设置分享内容对象
+    messageObject.shareObject = shareObject;
+    
+    //调用分享接口
+    [[UMSocialManager defaultManager] shareToPlatform:platformType messageObject:messageObject currentViewController:self completion:^(id data, NSError *error) {
+        if (error) {
+            NSLog(@"************Share fail with error %@*********",error);
+        }else{
+            NSLog(@"response data is %@",data);
+        }
+    }];
+}
+- (void)returnToWechatSession
+{
+    [self shareWebPageToPlatformType:UMSocialPlatformType_WechatSession];
+}
+- (void)returnToWechatTimeLine
+{
+    [self shareWebPageToPlatformType:UMSocialPlatformType_WechatTimeLine];
+}
+- (void)returnToSina
+{
+    [self shareWebPageToPlatformType:UMSocialPlatformType_Sina];
+}
+- (void)returnToQQ
+{
+    [self shareWebPageToPlatformType:UMSocialPlatformType_QQ];
+}
+
+- (void)returnToMessage
+{
+    ShareListVC * vc = [ShareListVC initShareListVC];
+    FlowAttachmentsModel * model = [[FlowAttachmentsModel alloc] init];
+    model.SoureTypeId = CollectModel_Image;
+    model.MinUrl = [AppUserModel sharedAppUserModel].QRCoder;
+    model.Url = [AppUserModel sharedAppUserModel].QRCoder;
+    vc.sendModel = model;
+    vc.isReturn = YES;
+    [self.navigationController pushViewController:vc animated:YES];
+}
+- (void)returnToGroup
+{
+    MyTDGroupViewController * vc = [[MyTDGroupViewController alloc] init];
+    vc.type =  CollectModel_Toipc;
+    FlowAttachmentsModel * model = [[FlowAttachmentsModel alloc] init];
+    model.SoureTypeId = CollectModel_Image;
+    model.MinUrl = [AppUserModel sharedAppUserModel].QRCoder;
+    model.Url = [AppUserModel sharedAppUserModel].QRCoder;
+    vc.sendModel = model;
+    vc.sendImage = self.shareImage;
+    vc.isReturn = YES;
+    [self.navigationController pushViewController:vc animated:YES];
+}
+- (void)returnToNote
+{
+    MoveViewController * vc = [MoveViewController initMoveViewController];
+    vc.isFromCreateBookVc = YES;
+    vc.CollectionType = CollectModel_NoteBook;
+    vc.TypeId = CreateNotesType;
+    vc.titleStr = @"我的笔记";
+    vc.ParentId = 0;
+    FlowAttachmentsModel * model = [[FlowAttachmentsModel alloc] init];
+    model.SoureTypeId = CollectModel_Image;
+    model.MinUrl = [AppUserModel sharedAppUserModel].QRCoder;
+    model.Url = [AppUserModel sharedAppUserModel].QRCoder;
+    vc.sendModel = model;
+    vc.sendImage = self.shareImage;
+    vc.isReturn = YES;
+    [self.navigationController pushViewController:vc animated:YES];
+}
+- (void)returnToTopic
+{
+    MyTDTopicCreateVC * vc = [MyTDTopicCreateVC initMyTDTopicCreateVC];
+    vc.type = CollectModel_NewTopic;
+    FlowAttachmentsModel * model = [[FlowAttachmentsModel alloc] init];
+    model.SoureTypeId = CollectModel_Image;
+    model.MinUrl = [AppUserModel sharedAppUserModel].QRCoder;
+    model.Url = [AppUserModel sharedAppUserModel].QRCoder;
+    vc.sendModel = model;
+    vc.sendImage = self.shareImage;
+    vc.isReturn = YES;
+    [self.navigationController pushViewController:vc animated:YES];
+}
 - (void)uploadImage{
 
 }

smartRhino/Project/VCModel/My_Center/Controller/MyQRCodeVC.h

@@ -11,7 +11,7 @@
 NS_ASSUME_NONNULL_BEGIN
 
 @interface MyQRCodeVC : BaseViewController
-
+@property (nonatomic, copy) void(^ClickShareBlock)(UIImage * image);
 +(MyQRCodeVC *)initMyQRCodeVC;
 
 @end

smartRhino/Project/VCModel/My_Center/Controller/MyQRCodeVC.m

@@ -8,18 +8,15 @@
 
 #import "MyQRCodeVC.h"
 #import <Photos/Photos.h>
-#import "NoteBookShareVC.h"
 #import "CreateNoteBookVC.h"
 
-@interface MyQRCodeVC ()<NoteBookShareVCDelegate>
+@interface MyQRCodeVC ()
 
 @property (strong,nonatomic) IBOutlet UIView *showContentBgView;
 
 @property (strong,nonatomic) IBOutlet UIButton *shareBtn;
-@property (strong,nonatomic) IBOutlet UIButton *backBtn;
 
 @property (strong,nonatomic) IBOutlet UIImageView *qrCodeImg;
-@property (strong, nonatomic) NoteBookShareVC *noteBookShareVC;
 
 @end
 
@@ -33,6 +30,11 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
     self.fd_prefersNavigationBarHidden = YES;
+    self.view.backgroundColor = [[UIColor blackColor] colorWithAlphaComponent:0.3f];
+    UITapGestureRecognizer *gr = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(dismiss)];
+    self.view.userInteractionEnabled = YES;
+    [gr setNumberOfTapsRequired:1];
+    [self.view addGestureRecognizer:gr];
     
     self.showContentBgView.layer.masksToBounds = YES;
     self.showContentBgView.layer.cornerRadius = 5.0;
@@ -41,57 +43,20 @@
     [self.showContentBgView addGestureRecognizer:longPressGesture];
       
     WS(weakSelf);
-    [self.backBtn setAction:^{
-        [weakSelf.navigationController popViewControllerAnimated:YES];
-    }];
     
     [self.qrCodeImg setImageWithURL:[NSURL URLWithString:[AppUserModel sharedAppUserModel].QRCoder] placeholder:IMG(@"zhujun")];
     [self.shareBtn setAction:^{
-        [weakSelf.noteBookShareVC initNoteBookShareData];
-        weakSelf.noteBookShareVC.view.hidden = !weakSelf.noteBookShareVC.view.hidden;
+        if (weakSelf.ClickShareBlock && weakSelf.qrCodeImg.image) {
+            weakSelf.ClickShareBlock(weakSelf.qrCodeImg.image);
+            [weakSelf dismiss];
+        }
     }];
-    [self.view addSubview:self.noteBookShareVC.view];
 }
-- (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;
-    }
-    return _noteBookShareVC;
+- (void)dismiss
+{
+    self.view.hidden = YES;
 }
 
--(void)userSelectType:(NSString *)typeName WithIndexPath:(NSIndexPath *)indexPath{
-    self.noteBookShareVC.view.hidden = !self.noteBookShareVC.view.hidden;
-    if ([typeName isEqualToString:@"发给微信好友"]) {
-        
-    }else if ([typeName isEqualToString:@"发到朋友圈"]){
-        
-    }else if ([typeName isEqualToString:@"发到微博"]){
-        
-    }else if ([typeName isEqualToString:@"发给QQ好友"]){
-        
-    }else if ([typeName isEqualToString:@"发到消息"]){
-        
-    }else if ([typeName isEqualToString:@"发到小组"]){
-        
-    }else if ([typeName isEqualToString:@"发到笔记"]){
-        CreateNoteBookVC *vc = [CreateNoteBookVC initCreateNoteBookVC];
-        vc.createNoteBookType = CreateNoteBookType_MyCode;
-        vc.shareModel.imageUrl = [AppUserModel sharedAppUserModel].QRCoder;
-        vc.shareModel.FileName = @"MyCode";
-        vc.shareModel.FileId = 0;
-        vc.shareModel.type = CollectDataType_IMG;
-        vc.shareModel.title = @"";
-        vc.shareModel.content = @"";
-        [self.navigationController pushViewController:vc animated:YES];
-    }else if ([typeName isEqualToString:@"发到话题"]){
-        
-    }else{
-        
-    }
-}
 /**
  * 长按
  */
@@ -109,16 +74,4 @@
         }
     }
 }
-
-
-/*
-#pragma mark - Navigation
-
-// In a storyboard-based application, you will often want to do a little preparation before navigation
-- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
-    // Get the new view controller using [segue destinationViewController].
-    // Pass the selected object to the new view controller.
-}
-*/
-
 @end

smartRhino/Project/VCModel/My_Center/Controller/MyUserIconVC.m

@@ -7,9 +7,11 @@
 //
 
 #import "MyUserIconVC.h"
+#import "LYLPhotoTailoringTool.h"
 
 @interface MyUserIconVC ()
 @property (weak, nonatomic) IBOutlet UIImageView *iconView;
+@property (weak, nonatomic) IBOutlet UIButton *moreBtn;
 
 @end
 
@@ -25,5 +27,159 @@
     NSString * urlString = [AppUserModel sharedAppUserModel].AvatarUrl;
     NSString *strUrl = [urlString stringByReplacingOccurrencesOfString:@"_50_50" withString:@""];
     [self.iconView sd_setImageWithURL:[NSURL URLWithString:strUrl]];
+    WS(weakSelf);
+    [self.moreBtn setAction:^{
+        UIAlertController *actionSheet = [UIAlertController alertControllerWithTitle:nil message:nil preferredStyle:UIAlertControllerStyleActionSheet];
+        UIAlertAction *action1 = [UIAlertAction actionWithTitle:@"拍照" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
+            [weakSelf selectCamera];
+            
+        }];
+        UIAlertAction *action2 = [UIAlertAction actionWithTitle:@"从手机相册选择" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
+            [weakSelf selectPhoto];
+            
+        }];
+        UIAlertAction *action3 = [UIAlertAction actionWithTitle:@"查看上一张头像" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
+            [weakSelf SeeUpIcon];
+            
+        }];
+        UIAlertAction *action4 = [UIAlertAction actionWithTitle:@"保存图片" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
+            [weakSelf savePhoto];
+            
+        }];
+        UIAlertAction *action5 = [UIAlertAction actionWithTitle:@"取消" style:UIAlertActionStyleCancel handler:^(UIAlertAction * _Nonnull action) {
+            NSLog(@"取消");
+        }];
+        [action1 setValue:k6 forKey:@"_titleTextColor"];
+        [action2 setValue:k6 forKey:@"_titleTextColor"];
+        [action3 setValue:k6 forKey:@"_titleTextColor"];
+        [action4 setValue:k6 forKey:@"_titleTextColor"];
+        [action5 setValue:k6 forKey:@"_titleTextColor"];
+
+        //把action添加到actionSheet里
+        [actionSheet addAction:action1];
+        [actionSheet addAction:action2];
+        [actionSheet addAction:action3];
+        [actionSheet addAction:action4];
+        [actionSheet addAction:action5];
+        //相当于之前的[actionSheet show];
+        [weakSelf presentViewController:actionSheet animated:YES completion:nil];
+    }];
+}
+- (void)selectPhoto
+{
+    WS(weakSelf);
+    TZImagePickerController *imagePickerVc = [[TZImagePickerController alloc] initWithMaxImagesCount:1 delegate:nil];
+    [imagePickerVc setNavLeftBarButtonSettingBlock:^(UIButton *leftButton){
+        leftButton.hidden = YES;
+    }];
+    imagePickerVc.showSelectBtn = NO;
+    imagePickerVc.allowCrop = YES;
+    imagePickerVc.cropRect = CGRectMake(0, (SCREEN_HEIGHT - SCREEN_WIDTH) * 0.5, SCREEN_WIDTH, SCREEN_WIDTH);
+    imagePickerVc.allowTakePicture = NO;
+    imagePickerVc.allowTakeVideo = NO;
+    imagePickerVc.allowPickingOriginalPhoto = NO;
+    imagePickerVc.allowPickingGif = NO;
+    [imagePickerVc setIsStatusBarDefault:YES];
+    [imagePickerVc setNaviTitleColor:[UIColor blackColor]];
+    [imagePickerVc setBarItemTextColor:[UIColor blackColor]];
+    [imagePickerVc setDidFinishPickingPhotosHandle:^(NSArray<UIImage *> *photos, NSArray *assets, BOOL isSelectOriginalPhoto) {
+        PHAsset *asset = assets.firstObject;
+        switch (asset.mediaType) {
+            case PHAssetMediaTypeVideo: {
+                
+            } break;
+            case PHAssetMediaTypeImage: {
+                UIImage * image = photos.firstObject;
+                [[HttpManager sharedHttpManager] HeaderUploadUrl:[NSString stringWithFormat:@"%@%@",BaseUrl,Modify_UserImage_Post] parameters:@{} pictureData:UIImageJPEGRepresentation(image,1.0f) pictureKey:@"file" success:^(id  _Nonnull responseObject) {
+                    
+                    NSDictionary *dic = responseObject;
+                    NSLog(@"/n图片上传成功=====绝对路径=====/n%@",responseObject[@"AbsolutePath"]);
+                    NSLog(@"/n图片上传成功=====相对路径=====/n%@",responseObject[@"RelativePath"]);
+                    
+                    [UserManager updateUserInfoDetail:IMAGE Param:dic[@"RelativePath"] Success:^(id  _Nonnull responseObject) {
+                        REMOVESHOW;
+                        [[HttpManager sharedHttpManager] GETUrl:[NSString stringWithFormat:@"%@%@",BaseUrl,UserDetailGet] parameters:@{} success:^(id  _Nonnull responseObject) {
+                            NSDictionary *dic = responseObject;
+                            [[AppUserModel sharedAppUserModel] modelSetWithDictionary:dic];
+                            dispatch_async(dispatch_get_main_queue(), ^{
+                                weakSelf.iconView.image = image;
+                            });
+                        } failure:^(NSError * _Nonnull error) {
+                        }];
+                    } failure:^(NSError * _Nonnull error) {
+                        REMOVESHOW
+                        SHOWERROR([ZYCTool handerResultData:error])
+                    }];
+                    
+                } failure:^(NSError * _Nonnull error) {
+                    REMOVESHOW
+                    SHOWERROR([ZYCTool handerResultData:error])
+                }];
+            } break;
+            case PHAssetMediaTypeAudio:
+                break;
+            case PHAssetMediaTypeUnknown:
+                break;
+            default: break;
+        }
+    }];
+    [self presentViewController:imagePickerVc animated:YES completion:nil];
+}
+- (void)selectCamera
+{
+    WS(weakSelf);
+    [[LYLPhotoTailoringTool sharedTool] selectPhotoWithPhoroOrCamera:SelectPhotoWithTypePhoroOrCamera2 crop:YES showImgBlock:^(NSString *imageUrlStr) {
+        NSLog(@"111111");
+    } choosImgBlock:^(UIImage *image) {
+        NSLog(@"aaaaaa");
+        SHOWLOADING
+        [[HttpManager sharedHttpManager] HeaderUploadUrl:[NSString stringWithFormat:@"%@%@",BaseUrl,Modify_UserImage_Post] parameters:@{@"":@""} pictureData:UIImageJPEGRepresentation(image,1.0f) pictureKey:@"file" success:^(id  _Nonnull responseObject) {
+            NSDictionary *dic = responseObject;
+            NSLog(@"/n图片上传成功=====绝对路径=====/n%@",responseObject[@"AbsolutePath"]);
+            NSLog(@"/n图片上传成功=====相对路径=====/n%@",responseObject[@"RelativePath"]);
+            [UserManager updateUserInfoDetail:IMAGE Param:dic[@"RelativePath"] Success:^(id  _Nonnull responseObject) {
+                REMOVESHOW;
+                [[HttpManager sharedHttpManager] GETUrl:[NSString stringWithFormat:@"%@%@",BaseUrl,UserDetailGet] parameters:@{} success:^(id  _Nonnull responseObject) {
+                    NSDictionary *dic = responseObject;
+                    [[AppUserModel sharedAppUserModel] modelSetWithDictionary:dic];
+                    dispatch_async(dispatch_get_main_queue(), ^{
+                        weakSelf.iconView.image = image;
+                    });
+                } failure:^(NSError * _Nonnull error) {
+                }];
+            } failure:^(NSError * _Nonnull error) {
+                REMOVESHOW
+                SHOWERROR([ZYCTool handerResultData:error])
+            }];
+        } failure:^(NSError * _Nonnull error) {
+            REMOVESHOW
+            SHOWERROR([ZYCTool handerResultData:error])
+        }];
+    }];
+}
+- (void)SeeUpIcon
+{
+    NSString * urlString = [AppUserModel sharedAppUserModel].HistoryAvatarUrl;
+    if (urlString.length > 0) {
+        NSString *strUrl = [urlString stringByReplacingOccurrencesOfString:@"_50_50" withString:@""];
+        [self.iconView sd_setImageWithURL:[NSURL URLWithString:strUrl]];
+    }else{
+        [ShowtipTool showMessageWithStatus:@"没有历史头像"];
+    }
+}
+- (void)savePhoto
+{
+    WS(weakSelf);
+    if (self.iconView.image) {
+        NSError *error = nil;
+        [[PHPhotoLibrary sharedPhotoLibrary] performChangesAndWait:^{
+            [PHAssetChangeRequest creationRequestForAssetFromImage:weakSelf.iconView.image];
+        } error:&error];
+        if(error){
+            [ShowtipTool showMessageWithStatus:@"保存失败"];
+        }else{
+            [ShowtipTool showMessageWithStatus:@"保存成功"];
+        }
+    }
 }
 @end

smartRhino/Project/VCModel/My_Center/Controller/My_CenterVC.m

@@ -16,8 +16,13 @@
 #import "NoteBookVC.h"
 #import "MyAccountVC.h"
 #import "MailListVC.h"
+#import "SWQRCodeViewController.h"
+#import "MailListDetailVC.h"
+#import "ChatJoinGroupVC.h"
+#import "TDGroupInfoListVC.h"
+#import "TDQrJoinVC.h"
 
-@interface My_CenterVC ()<UITableViewDelegate,UITableViewDataSource>
+@interface My_CenterVC ()<UITableViewDelegate,UITableViewDataSource,SWQRCodeViewControllerDelegate>
 
 @property (strong,nonatomic) IBOutlet UITableView *tableView;
 
@@ -96,7 +101,7 @@
             My_CenterCell *cell = [My_CenterCell configCell0:tableView indexPath:indexPath];
             [cell.cell0UserImgView sd_setImageWithURL:[NSURL URLWithString:[AppUserModel sharedAppUserModel].AvatarUrl] placeholderImage:[UIImage imageNamed:@"my_conter_TestUserImg"]];
             NSLog(@"%@",[AppUserModel sharedAppUserModel].Name);
-            cell.cell0UserName.text = ISEmptyString([AppUserModel sharedAppUserModel].Nick) ? @"昵称":[AppUserModel sharedAppUserModel].Nick;
+            cell.cell0UserName.text = ISEmptyString([AppUserModel sharedAppUserModel].Nick) ? @"昵称":[AppUserModel sharedAppUserModel].Name;
             cell.cell0Intrt.text = ISEmptyString([AppUserModel sharedAppUserModel].Description) ? @"自我介绍":[AppUserModel sharedAppUserModel].Description ;
             return cell;
         }break;
@@ -165,7 +170,7 @@
                     [self.navigationController pushViewController:vc animated:YES];
                 }break;
                 case 3:{
-
+                    [self scanAction];
                 }break;
                 default:
                 {
@@ -225,4 +230,89 @@
     }
 }
 
+- (void)scanAction{
+    SWQRCodeConfig *config = [[SWQRCodeConfig alloc]init];
+    config.scannerType = SWScannerTypeBoth;
+    SWQRCodeViewController *qrcodeVC = [[SWQRCodeViewController alloc]init];
+    qrcodeVC.codeConfig = config;
+    qrcodeVC.delegate = self;
+    [self.navigationController pushViewController:qrcodeVC animated:YES];
+}
+#pragma mark - 扫一扫结果
+- (void)scanResult:(NSString *)scanStr{
+    ScanResultModel *model = [[ScanResultModel alloc]initWithString:scanStr error:nil];
+    NSLog(@"%@",model);
+    WEAKSELF
+    switch (model.key) {
+        case 1:// 用户
+        {
+            [self scanNetWork:model.value urlStrong:SaoYiSao_Post ScanKey:@"Guid"  success:^(id responseObject) {
+                NSDictionary *dic = responseObject;
+                AddressUserModel *model = [[AddressUserModel alloc] initWithDictionary:dic error:nil];
+                dispatch_async(dispatch_get_main_queue(), ^{
+                    MailListDetailVC *vc = [MailListDetailVC initMailListDetailVC];
+                    vc.indexId = model.Id;
+                    vc.isAdd = YES;
+                    [weakSelf.navigationController pushViewController:vc animated:YES];
+                });
+            } failure:^(NSError *error) {
+                SHOWERROR([ZYCTool handerResultData:error]);
+            }];
+        }
+            break;
+        case 2:// 群聊
+        {
+            [self scanToNetWork:model.value urlStrong:SaoYiSao2_Post success:^(id responseObject) {
+                ChatJoinGroupVC * vc = [ChatJoinGroupVC initChatJoinGroupVC];
+                vc.dict = responseObject;
+                [weakSelf.navigationController pushViewController:vc animated:YES];
+            } failure:^(NSError *error) {
+                SHOWERROR([ZYCTool handerResultData:error]);
+            }];
+        }
+            break;
+        case 3://小组
+        {
+            [self scanToNetWork:model.value urlStrong:SaoYiSao3_Post success:^(id responseObject) {
+                if ([responseObject[@"IsUser"] boolValue]) {
+                    TDGroupInfoListVC * vc = [TDGroupInfoListVC initTDGroupInfoListVC];
+                    vc.GroupId = [responseObject[@"Id"] integerValue];
+                    vc.titleStr = responseObject[@"Name"];
+                    [weakSelf.navigationController pushViewController:vc animated:YES];
+                }else{
+                    dispatch_async(dispatch_get_main_queue(), ^{
+                        TDQrJoinVC * vc = [TDQrJoinVC initTDQrJoinVC];
+                        vc.dict = responseObject;
+                        [weakSelf.navigationController pushViewController:vc animated:YES];
+                    });
+                }
+            } failure:^(NSError *error) {
+                SHOWERROR([ZYCTool handerResultData:error]);
+            }];
+        }
+            break;
+        default:
+            break;
+    }
+}
+- (void)scanNetWork:(NSString *)scanStr urlStrong:(NSString *)urlstring ScanKey:(NSString*)key success:(void (^) (id responseObject))successful failure:(void (^) (NSError *error))failure{
+    SHOWLOADING
+    [[HttpManager sharedHttpManager] POSTUrl:[NSString stringWithFormat:@"%@%@",BaseUrl,urlstring] parameters:@{key:scanStr} responseStyle:JOSN success:^(id  _Nonnull responseObject) {
+        successful(responseObject);
+        REMOVESHOW
+    } failure:^(NSError * _Nonnull error) {
+        REMOVESHOW
+        failure(error);
+    }];
+}
+- (void)scanToNetWork:(NSString *)scanStr urlStrong:(NSString *)urlstring success:(void (^) (id responseObject))successful failure:(void (^) (NSError *error))failure{
+    SHOWLOADING
+    NSString * url = [NSString stringWithFormat:@"%@%@",Host(urlstring),scanStr];
+    [[HttpManager sharedHttpManager] GETUrl:url parameters:@{} success:^(id  _Nonnull responseObject) {
+        REMOVESHOW
+        successful(responseObject);
+    } failure:^(NSError * _Nonnull error) {
+        REMOVESHOW
+    }];
+}
 @end

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

@@ -1346,6 +1346,7 @@
 - (void)launchMoveVC:(NSMutableArray<NSNumber*>*)selectIDArray{
     MoveViewController * vc = [MoveViewController initMoveViewController];
     vc.TypeId = self.TypeValue == 1 ? CreateNewTopicType : CreateNotesType;
+    vc.CollectionType = self.TypeValue == 1 ? CollectModel_NewTopic : CollectModel_NoteBook;
     vc.collectType = CollectHanderType_Move;
     vc.ParentId = 0;
     vc.titleStr = @"移动到";

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

@@ -3055,6 +3055,7 @@
     MoveViewController * vc = [MoveViewController initMoveViewController];
     vc.TypeId = self.TypeValue == 1 ? CreateNewTopicType : CreateNotesType;
     vc.collectType = CollectHanderType_Move;
+    vc.CollectionType = self.TypeValue == 1 ? CollectModel_NewTopic : CollectModel_NoteBook;
     vc.ParentId = 0;
     vc.titleStr = @"移动到";
     vc.TypeValue = self.TypeValue;
@@ -3738,7 +3739,11 @@
     
     messageObject.title = title;
     //创建网页内容对象
-    UMShareWebpageObject *shareObject = [UMShareWebpageObject shareObjectWithTitle:title descr:desc thumImage:IMG(@"logo_60")];
+    NSString * imgName = @"share_file";
+    if (self.listType == MyNoteBookListLevelTypeA && self.TypeValue == 1) {
+        imgName = @"topicBook";
+    }
+    UMShareWebpageObject *shareObject = [UMShareWebpageObject shareObjectWithTitle:title descr:desc thumImage:IMG(imgName)];
     //设置网页地址
     shareObject.webpageUrl = url;
     
@@ -3773,7 +3778,15 @@
 - (NSString *)returnUrl
 {
     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];
+        NSInteger type = CollectModel_NoteFile;
+        if (self.TypeValue == 1) {
+            if (self.listType == MyNoteBookListLevelTypeA) {
+                type = CollectModel_TopicBooK;
+            }else{
+                type = CollectModel_TopicSubBooK;
+            }
+        }
+        NSString * url = [NSString stringWithFormat:@"%@id=%ld&type=%ld&userId=%ld&name=%@&describe=%@",Host(@"/admin/mobile/folderWx?"),(long)self.returnModel.SoureId,type,(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];

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

@@ -202,6 +202,7 @@
             vc.collectType = CollectHanderType_Collect;
             vc.ParentId = 0;
             vc.titleStr = @"我的收藏";
+            vc.CollectionType = self.TypeValue == 1 ? CollectModel_NewTopic : CollectModel_NoteBook;
             vc.TypeId = CreateCollectionType;
             vc.SourceUserId = weakSelf.VisitUserId;
             vc.TypeValue = weakSelf.TypeValue;
@@ -1333,7 +1334,11 @@
     
     messageObject.title = title;
     //创建网页内容对象
-    UMShareWebpageObject *shareObject = [UMShareWebpageObject shareObjectWithTitle:title descr:desc thumImage:IMG(@"find_1")];
+    NSString * imgName = @"share_file";
+    if (self.listType == MyNoteBookListLevelTypeA && self.TypeValue == 1) {
+        imgName = @"topicBook";
+    }
+    UMShareWebpageObject *shareObject = [UMShareWebpageObject shareObjectWithTitle:title descr:desc thumImage:IMG(imgName)];
     //设置网页地址
     shareObject.webpageUrl = url;
     
@@ -1351,23 +1356,31 @@
 }
 - (void)returnToWechatSession
 {
-    [self shareWebPageToPlatformType:UMSocialPlatformType_WechatSession title:self.myTitle desc:[NSString stringWithFormat:@"来自-%@",self.Author] url:[self returnUrl]];
+    [self shareWebPageToPlatformType:UMSocialPlatformType_WechatSession title:self.sendModel.Title desc:[NSString stringWithFormat:@"来自-%@",self.Author] url:[self returnUrl]];
 }
 - (void)returnToWechatTimeLine
 {
-    [self shareWebPageToPlatformType:UMSocialPlatformType_WechatTimeLine title:self.myTitle desc:[NSString stringWithFormat:@"来自-%@",self.Author] url:[self returnUrl]];
+    [self shareWebPageToPlatformType:UMSocialPlatformType_WechatTimeLine title:self.sendModel.Title desc:[NSString stringWithFormat:@"来自-%@",self.Author] url:[self returnUrl]];
 }
 - (void)returnToSina
 {
-    [self shareWebPageToPlatformType:UMSocialPlatformType_Sina title:self.myTitle desc:[NSString stringWithFormat:@"来自-%@",self.Author] url:[self returnUrl]];
+    [self shareWebPageToPlatformType:UMSocialPlatformType_Sina title:self.sendModel.Title desc:[NSString stringWithFormat:@"来自-%@",self.Author] url:[self returnUrl]];
 }
 - (void)returnToQQ
 {
-    [self shareWebPageToPlatformType:UMSocialPlatformType_QQ title:self.myTitle desc:[NSString stringWithFormat:@"来自-%@",self.Author] url:[self returnUrl]];
+    [self shareWebPageToPlatformType:UMSocialPlatformType_QQ title:self.sendModel.Title desc:[NSString stringWithFormat:@"来自-%@",self.Author] url:[self returnUrl]];
 }
 - (NSString *)returnUrl
 {
-    NSString * url = [NSString stringWithFormat:@"%@id=%ld&type=%d&userId=%ld&name=%@&describe=%@",ShareHost(@"mobile/folderWx?"),(long)self.FolderId,CollectModel_NoteFile,(long)self.VisitUserId,self.myTitle,self.Author];
+    NSInteger type = CollectModel_NoteFile;
+    if (self.TypeValue == 1) {
+        if (self.listType == MyNoteBookListLevelTypeA) {
+            type = CollectModel_TopicBooK;
+        }else{
+            type = CollectModel_TopicSubBooK;
+        }
+    }
+    NSString * url = [NSString stringWithFormat:@"%@id=%ld&type=%ld&userId=%ld&name=%@&describe=%@",ShareHost(@"mobile/folderWx?"),(long)self.FolderId,type,(long)self.VisitUserId,self.sendModel.Title,self.sendModel.Author];
     return url;
 }
 #pragma mark - 分享功能
@@ -1380,64 +1393,43 @@
 }
 - (void)returnToGroup
 {
-    if (self.isSend) {
-        MyTDGroupViewController * vc = [[MyTDGroupViewController alloc] init];
-        vc.sendModel = self.sendModel;
-        vc.type = CollectModel_Group;
-        vc.isReturn = YES;
-        [self.navigationController pushViewController:vc animated:YES];
-    }else{
-        MyTDGroupViewController * vc = [[MyTDGroupViewController alloc] init];
-        FlowAttachmentsModel * model = [[FlowAttachmentsModel alloc] init];
-        model.SoureTypeId = self.TypeValue == 1 ? CollectModel_NewTopic : CollectModel_NoteFile;
-        model.Title = self.returnModel.Title;
-        model.SoureId = self.returnModel.MiddleId;
-        model.Author = self.returnModel.Name;
-        vc.sendModel = model;
-        vc.type = CollectModel_Group;
-        vc.isReturn = YES;
-        [self.navigationController pushViewController:vc animated:YES];
-    }
+    MyTDGroupViewController * vc = [[MyTDGroupViewController alloc] init];
+    FlowAttachmentsModel * model = [[FlowAttachmentsModel alloc] init];
+    model.SoureTypeId = self.TypeValue == 1 ? CollectModel_NewTopic : CollectModel_NoteFile;
+    model.Title = self.returnModel.Title;
+    model.SoureId = self.returnModel.MiddleId;
+    model.Author = self.returnModel.Name;
+    vc.sendModel = model;
+    vc.type = CollectModel_Group;
+    vc.isReturn = YES;
+    [self.navigationController pushViewController:vc animated:YES];
 }
 - (void)returnToNote
 {
-    if (self.isSend) {
-        MyTDTopicCreateVC * vc = [MyTDTopicCreateVC initMyTDTopicCreateVC];
-        vc.type = CollectModel_NoteFile;
-        vc.sendModel = self.sendModel;
-        vc.isReturn = YES;
-        [self.navigationController pushViewController:vc animated:YES];
-    }else{
-        MoveViewController * vc = [MoveViewController initMoveViewController];
-        vc.isFromCreateBookVc = YES;
-        vc.TypeId = CreateNotesType;
-        vc.titleStr = @"我的笔记";
-        vc.ParentId = 0;
-        vc.type = CollectModel_NoteBook;
-        vc.sendModel = self.sendModel;
-        vc.isReturn = YES;
-        [self.navigationController pushViewController:vc animated:YES];
-    }
+    
+    MoveViewController * vc = [MoveViewController initMoveViewController];
+    vc.isFromCreateBookVc = YES;
+    vc.TypeId = CreateNotesType;
+    vc.titleStr = @"我的笔记";
+    vc.ParentId = 0;
+    vc.type = CollectModel_NoteBook;
+    vc.CollectionType = self.TypeValue == 1 ? CollectModel_NewTopic : CollectModel_NoteBook;
+    vc.sendModel = self.sendModel;
+    vc.isReturn = YES;
+    [self.navigationController pushViewController:vc animated:YES];
 }
 - (void)returnToTopic
 {
-    if (self.isSend) {
-        MyTDTopicCreateVC * vc = [MyTDTopicCreateVC initMyTDTopicCreateVC];
-        vc.sendModel = self.sendModel;
-        vc.type = CollectModel_NoteFile;
-        vc.isReturn = YES;
-        [self.navigationController pushViewController:vc animated:YES];
-    }else{
-        MyTDTopicCreateVC * vc = [MyTDTopicCreateVC initMyTDTopicCreateVC];
-        FlowAttachmentsModel * model = [[FlowAttachmentsModel alloc] init];
-        model.SoureTypeId = self.TypeValue == 1 ? CollectModel_NewTopic : CollectModel_NoteFile;
-        model.Title = self.returnModel.Title;
-        model.SoureId = self.returnModel.MiddleId;
-        model.Author = self.returnModel.Name;
-        vc.type = CollectModel_NewTopic;
-        vc.isReturn = YES;
-        [self.navigationController pushViewController:vc animated:YES];
-    }
+    
+    MyTDTopicCreateVC * vc = [MyTDTopicCreateVC initMyTDTopicCreateVC];
+    FlowAttachmentsModel * model = [[FlowAttachmentsModel alloc] init];
+    model.SoureTypeId = self.TypeValue == 1 ? CollectModel_NewTopic : CollectModel_NoteFile;
+    model.Title = self.returnModel.Title;
+    model.SoureId = self.returnModel.MiddleId;
+    model.Author = self.returnModel.Name;
+    vc.type = CollectModel_NewTopic;
+    vc.isReturn = YES;
+    [self.navigationController pushViewController:vc animated:YES];
 }
 - (NSAttributedString *)setTextWithStr:(NSString *)str
 {

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

@@ -809,7 +809,7 @@
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <view alpha="0.30000001192092896" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ZHa-Cl-5Ao">
+                            <view alpha="0.29999999999999999" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ZHa-Cl-5Ao">
                                 <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                                 <color key="backgroundColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <viewLayoutGuide key="safeArea" id="ytf-M7-kBf"/>

smartRhino/Project/VCModel/My_Center/My_Center.storyboard

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="J0J-uz-REN">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="16097.2" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="J0J-uz-REN">
     <device id="retina5_5" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -457,26 +457,14 @@
                         <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <view alpha="0.65000000000000002" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="vUO-2Y-hlh">
+                            <view opaque="NO" alpha="0.5" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="vUO-2Y-hlh">
                                 <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
-                                <subviews>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="MBh-Fe-cib">
-                                        <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
-                                        <color key="backgroundColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                    </button>
-                                </subviews>
                                 <color key="backgroundColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                <constraints>
-                                    <constraint firstAttribute="trailing" secondItem="MBh-Fe-cib" secondAttribute="trailing" id="8i9-lN-QNH"/>
-                                    <constraint firstAttribute="bottom" secondItem="MBh-Fe-cib" secondAttribute="bottom" id="GYH-ab-KWn"/>
-                                    <constraint firstItem="MBh-Fe-cib" firstAttribute="top" secondItem="vUO-2Y-hlh" secondAttribute="top" id="lgB-xO-fwo"/>
-                                    <constraint firstItem="MBh-Fe-cib" firstAttribute="leading" secondItem="vUO-2Y-hlh" secondAttribute="leading" id="zJ6-Wv-JmY"/>
-                                </constraints>
                             </view>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="EwL-WC-zqW">
                                 <rect key="frame" x="69.333333333333343" y="218.66666666666663" width="275.33333333333326" height="299"/>
                                 <subviews>
-                                    <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="lJZ-nS-hfD">
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="lJZ-nS-hfD">
                                         <rect key="frame" x="225.33333333333337" y="0.0" width="50" height="50"/>
                                         <constraints>
                                             <constraint firstAttribute="width" constant="50" id="I8M-Kn-hJZ"/>
@@ -538,7 +526,6 @@
                     </view>
                     <navigationItem key="navigationItem" id="Ygt-1A-xke"/>
                     <connections>
-                        <outlet property="backBtn" destination="MBh-Fe-cib" id="tdV-wb-2wG"/>
                         <outlet property="qrCodeImg" destination="YRA-5e-Zia" id="7Fu-4s-l3x"/>
                         <outlet property="shareBtn" destination="lJZ-nS-hfD" id="37f-7u-siT"/>
                         <outlet property="showContentBgView" destination="EwL-WC-zqW" id="3Yn-2L-iLm"/>
@@ -850,7 +837,7 @@
                                                     <constraint firstAttribute="height" constant="44" id="EKe-Qn-Slb"/>
                                                     <constraint firstAttribute="width" constant="50" id="qiG-yF-HeT"/>
                                                 </constraints>
-                                                <state key="normal" image="back_black_icon"/>
+                                                <state key="normal" image="back_white_icon"/>
                                                 <connections>
                                                     <action selector="backAction:" destination="90A-l3-bPF" eventType="touchUpInside" id="xgI-XG-vYE"/>
                                                 </connections>
@@ -861,7 +848,7 @@
                                                     <constraint firstAttribute="width" constant="35" id="Go4-fA-so6"/>
                                                     <constraint firstAttribute="height" constant="44" id="x5G-Mc-f3v"/>
                                                 </constraints>
-                                                <state key="normal" image="menu_black_icon"/>
+                                                <state key="normal" image="menu_white_icon"/>
                                                 <connections>
                                                     <action selector="menuAction:" destination="90A-l3-bPF" eventType="touchUpInside" id="S3p-CO-PJZ"/>
                                                 </connections>
@@ -869,21 +856,18 @@
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="个人头像" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="XDm-0n-KDt">
                                                 <rect key="frame" x="174.33333333333334" y="12.333333333333334" width="65.333333333333343" height="19.333333333333329"/>
                                                 <fontDescription key="fontDescription" type="system" pointSize="16"/>
-                                                <color key="textColor" red="0.039215686270000001" green="0.039215686270000001" blue="0.039215686270000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
-                                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="XGy-hf-Mya">
-                                                <rect key="frame" x="0.0" y="43.666666666666664" width="414" height="0.3333333333333357"/>
-                                                <color key="backgroundColor" red="0.93333333330000001" green="0.93333333330000001" blue="0.93333333330000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                                <constraints>
-                                                    <constraint firstAttribute="height" constant="0.5" id="us2-KA-Fb8"/>
-                                                </constraints>
-                                            </view>
+                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="pel-Da-Kgs">
+                                                <rect key="frame" x="359" y="2" width="40" height="40"/>
+                                                <state key="normal" image="more_white"/>
+                                            </button>
                                         </subviews>
                                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         <constraints>
-                                            <constraint firstAttribute="trailing" secondItem="XGy-hf-Mya" secondAttribute="trailing" id="7pA-Qy-gha"/>
-                                            <constraint firstItem="XGy-hf-Mya" firstAttribute="leading" secondItem="oOI-ij-Jwl" secondAttribute="leading" id="Z1e-P6-be9"/>
+                                            <constraint firstItem="pel-Da-Kgs" firstAttribute="centerY" secondItem="oOI-ij-Jwl" secondAttribute="centerY" id="LVR-rN-n9Q"/>
+                                            <constraint firstAttribute="trailing" secondItem="pel-Da-Kgs" secondAttribute="trailing" constant="15" id="R4O-RU-GHG"/>
                                             <constraint firstItem="nbX-1K-1Dd" firstAttribute="bottom" secondItem="6Vq-OX-oUh" secondAttribute="bottom" id="aXU-cy-4Re"/>
                                             <constraint firstItem="6Vq-OX-oUh" firstAttribute="leading" secondItem="oOI-ij-Jwl" secondAttribute="leading" id="dGB-PQ-tKM"/>
                                             <constraint firstItem="nbX-1K-1Dd" firstAttribute="top" secondItem="6Vq-OX-oUh" secondAttribute="top" id="eyk-9S-EWC"/>
@@ -891,12 +875,11 @@
                                             <constraint firstItem="XDm-0n-KDt" firstAttribute="centerY" secondItem="6Vq-OX-oUh" secondAttribute="centerY" id="gRQ-Mq-7sh"/>
                                             <constraint firstItem="XDm-0n-KDt" firstAttribute="centerX" secondItem="oOI-ij-Jwl" secondAttribute="centerX" id="il9-Cb-4Jq"/>
                                             <constraint firstAttribute="height" constant="44" id="tco-Ck-C7V"/>
-                                            <constraint firstAttribute="bottom" secondItem="XGy-hf-Mya" secondAttribute="bottom" id="xZ2-dU-fVc"/>
                                             <constraint firstItem="nbX-1K-1Dd" firstAttribute="leading" secondItem="6Vq-OX-oUh" secondAttribute="trailing" id="zuP-OD-h4o"/>
                                         </constraints>
                                     </view>
                                 </subviews>
-                                <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                <color key="backgroundColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <constraints>
                                     <constraint firstAttribute="bottom" secondItem="oOI-ij-Jwl" secondAttribute="bottom" id="JfU-sX-psy"/>
                                     <constraint firstItem="oOI-ij-Jwl" firstAttribute="leading" secondItem="Eic-uc-shE" secondAttribute="leading" id="QKU-Oe-8QQ"/>
@@ -929,6 +912,7 @@
                     <navigationItem key="navigationItem" id="Y5b-Vk-duy"/>
                     <connections>
                         <outlet property="iconView" destination="YEm-y9-6Dn" id="HTh-W2-iZX"/>
+                        <outlet property="moreBtn" destination="pel-Da-Kgs" id="SqF-v7-58N"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="DRy-pZ-RGB" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
@@ -1433,13 +1417,16 @@
     </scenes>
     <resources>
         <image name="back_black_icon" width="11" height="20"/>
+        <image name="back_white_icon" width="9.6666669845581055" height="17.666666030883789"/>
         <image name="menu_black_icon" width="16.666666030883789" height="14.666666984558105"/>
+        <image name="menu_white_icon" width="17" height="15.666666984558105"/>
         <image name="mine_book_icon" width="51.666667938232422" height="51.666667938232422"/>
         <image name="mine_cardBg_icon" width="343" height="190"/>
         <image name="mine_card_icon" width="83.666664123535156" height="19"/>
         <image name="mine_man_icon" width="51.666667938232422" height="51.666667938232422"/>
         <image name="mine_net_icon" width="51.666667938232422" height="51.666667938232422"/>
         <image name="mine_ting_icon" width="51.666667938232422" height="51.666667938232422"/>
+        <image name="more_white" width="40" height="40"/>
         <image name="my_edit_phoneOrEmail_icon" width="50.666667938232422" height="85.666664123535156"/>
         <image name="my_qrcode_share_icon" width="19" height="17.666666030883789"/>
         <image name="my_qrcode_testcode" width="175" height="175"/>

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

@@ -25,6 +25,7 @@
     self.fd_prefersNavigationBarHidden = YES;
     self.view.backgroundColor = UIColorHex(0xF8F8F8);
     [self.view addSubview:self.webView];
+
     WS(weakSelf);
     [self.webView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.top.mas_equalTo(weakSelf.NavBarV.mas_bottom);
@@ -40,9 +41,9 @@
     self.webView.navigationDelegate = self;
     self.webView.scrollView.delegate = self;
     //    self.automaticallyAdjustsScrollViewInsets = YES;
-    NSURL *pathUrl = [NSURL URLWithString:@"https://apk.tederen.com/mobile/appeditor"];
+//    NSURL *pathUrl = [NSURL URLWithString:@"https://apk.tederen.com/mobile/appeditor"];
+    NSURL *pathUrl = [NSURL URLWithString:HtmlHost(@"/mobile/appeditor")];
 
-//    NSURL *pathUrl = [NSURL URLWithString:@"http://192.168.0.111:8081/mobile/editor"];
     NSURLRequest *request = [NSURLRequest requestWithURL:pathUrl];
     [self.webView loadRequest:request];
     [self.DoneBtn setAction:^{
@@ -50,38 +51,37 @@
         [weakSelf.webView evaluateJavaScript:jsonString completionHandler:^(id _Nullable data, NSError * _Nullable error) {
             NSLog(@"submit:%@",data);
             if ([data isKindOfClass:[NSDictionary class]]) {
-                if ([data[@"json"] isKindOfClass:[NSArray class]]) {
-                    NSArray * array = data[@"json"];
-                    if ([array count] > 0) {
-                        NSDictionary * dict = @{@"Id":@(weakSelf.Id),
-                                                @"Introduce":[weakSelf arrayToJSONString:array]
-                        };
-                        SHOWLOADING
-                        [[HttpManager sharedHttpManager] POSTUrl:Host(APP_Group_Update) parameters:dict responseStyle:DATA success:^(id  _Nonnull responseObject) {
-                            REMOVESHOW
-                            SHOWSUCCESS(@"编辑成功");
-                            if (weakSelf.UpDateBlock) {
-                                weakSelf.UpDateBlock();
-                            }
-                            __block BOOL isFound = NO;
-                            dispatch_async(dispatch_get_main_queue(), ^{
-                                for (UIViewController * vc in weakSelf.navigationController.viewControllers) {
-                                    if ([vc isKindOfClass:NSClassFromString(@"GroupSynopsisVC")]
-                                        ||[vc isKindOfClass:NSClassFromString(@"TDGroupInfoDetailVC")]) {
-                                        isFound = YES;
-                                        [[NSNotificationCenter defaultCenter] postNotificationName:GROUPINFOUPDATE object:nil];
-                                        [weakSelf.navigationController popToViewController:vc animated:YES];
-                                    }
-                                }
-                                if (!isFound) {
-                                    [weakSelf.navigationController popViewControllerAnimated:YES];
-                                }
-                            });
-                        } failure:^(NSError * _Nonnull error) {
-                            REMOVESHOW
-                        }];
-                    }
+                NSString * html = data[@"html"];
+                if ([data[@"html"] isKindOfClass:[NSNull class]]) {
+                    html = @"";
                 }
+                NSDictionary * dict = @{@"Id":@(weakSelf.Id),
+                                        @"Introduce":html
+                };
+                SHOWLOADING
+                [[HttpManager sharedHttpManager] POSTUrl:Host(APP_Group_Update) parameters:dict responseStyle:DATA success:^(id  _Nonnull responseObject) {
+                    REMOVESHOW
+                    SHOWSUCCESS(@"编辑成功");
+                    if (weakSelf.UpDateBlock) {
+                        weakSelf.UpDateBlock();
+                    }
+                    __block BOOL isFound = NO;
+                    dispatch_async(dispatch_get_main_queue(), ^{
+                        for (UIViewController * vc in weakSelf.navigationController.viewControllers) {
+                            if ([vc isKindOfClass:NSClassFromString(@"GroupSynopsisVC")]
+                                ||[vc isKindOfClass:NSClassFromString(@"TDGroupInfoDetailVC")]) {
+                                isFound = YES;
+                                [[NSNotificationCenter defaultCenter] postNotificationName:GROUPINFOUPDATE object:nil];
+                                [weakSelf.navigationController popToViewController:vc animated:YES];
+                            }
+                        }
+                        if (!isFound) {
+                            [weakSelf.navigationController popViewControllerAnimated:YES];
+                        }
+                    });
+                } failure:^(NSError * _Nonnull error) {
+                    REMOVESHOW
+                }];
             }
         }];
     }];
@@ -126,14 +126,45 @@
 }
 #pragma mark - WKScriptMessageHandler
 - (void)userContentController:(nonnull WKUserContentController *)userContentController didReceiveScriptMessage:(nonnull WKScriptMessage *)message {
-    WS(weakSelf);
     NSLog(@"messageName:%@",message.name);
     if ([message.name isEqualToString:@"getType"]) {
-        NSString *jsonString = [NSString stringWithFormat:@"getType('%d','%d','%ld','%@','%d')",99,0,(long)self.Id,USERDEFAULTSGET(@"LOGINTOKEN"),0];
+        NSString *jsonString = [NSString stringWithFormat:@"getType('%d','%d','%ld','%@','%d')",99,1,(long)self.Id,USERDEFAULTSGET(@"LOGINTOKEN"),0];
         [self.webView evaluateJavaScript:jsonString completionHandler:^(id _Nullable data, NSError * _Nullable error) {
             
         }];
     }
 }
+- (void)webView:(WKWebView *)webView runJavaScriptAlertPanelWithMessage:(nonnull NSString *)message initiatedByFrame:(nonnull WKFrameInfo *)frame completionHandler:(nonnull void (^)(void))completionHandler
+{
+    UIAlertController *alertController = [UIAlertController alertControllerWithTitle:@"提示" message:message?:@"" preferredStyle:UIAlertControllerStyleAlert];
+    [alertController addAction:([UIAlertAction actionWithTitle:@"确认" style:UIAlertActionStyleCancel handler:^(UIAlertAction * _Nonnull action) {
 
+    }])];
+    [self presentViewController:alertController animated:YES completion:nil];
+    NSLog(@"Aleart=========%@",message);
+    completionHandler();
+}
+- (void)dealloc {
+    [self.webView stopLoading];
+    self.webView.UIDelegate = nil;
+    self.webView.navigationDelegate = nil;
+    self.webView.scrollView.delegate = nil;
+    [self.webView removeFromSuperview];
+    WKWebsiteDataStore *dateStore = [WKWebsiteDataStore defaultDataStore];
+    [dateStore fetchDataRecordsOfTypes:[WKWebsiteDataStore allWebsiteDataTypes]
+                     completionHandler:^(NSArray * __nonnull records) {
+        for (WKWebsiteDataRecord *record in records)
+        {
+            [[WKWebsiteDataStore defaultDataStore] removeDataOfTypes:record.dataTypes
+                                                      forDataRecords:@[record]
+                                                   completionHandler:^{
+                NSLog(@"Cookies for %@ deleted successfully",record.displayName);
+            }];
+        }
+    }];
+    WKUserContentController *userCC = self.webView.configuration.userContentController;
+    [userCC removeScriptMessageHandlerForName:@"getType"];
+    [userCC removeAllUserScripts];
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
+}
 @end

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

@@ -12,6 +12,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface GroupInfoVC : BaseViewController
 @property (assign, nonatomic) NSInteger   Id;
+@property (copy, nonatomic) NSString     *GroupName;
 @property (assign, nonatomic) BOOL   IsOwner;
 +(GroupInfoVC *)initGroupInfoVC;
 @end

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

@@ -9,11 +9,15 @@
 #import "GroupInfoVC.h"
 #import "_NoInputAccessoryView.h"
 #import "GroupEditerVC.h"
+#import "NoteBookShareVC.h"
+#import "ShareListVC.h"
+#import "MyTDGroupViewController.h"
 
-@interface GroupInfoVC ()<WKUIDelegate,WKNavigationDelegate,UIScrollViewDelegate,WKScriptMessageHandler>
+@interface GroupInfoVC ()<WKUIDelegate,WKNavigationDelegate,UIScrollViewDelegate,WKScriptMessageHandler,NoteBookShareVCDelegate>
 @property (weak, nonatomic) IBOutlet UIButton *shareBtn;
 @property (weak, nonatomic) IBOutlet UIView *NavBarV;
 @property (nonatomic,strong) WKWebView       *webView;
+@property (nonatomic,strong) NoteBookShareVC       *noteBookShareVC;
 @end
 
 @implementation GroupInfoVC
@@ -43,10 +47,14 @@
     //    self.automaticallyAdjustsScrollViewInsets = YES;
     NSURL *pathUrl = [NSURL URLWithString:@"https://apk.tederen.com/mobile/groupintroduce"];
 
-//    NSURL *pathUrl = [NSURL URLWithString:@"https://apk.tederen.com/mobile/groupintroduce"];
+//    NSURL *pathUrl = [NSURL URLWithString:HtmlHost(@"/mobile/groupintroduce")];
 //    NSURL *pathUrl = [NSURL URLWithString:@"http://192.168.0.111:8081/mobile/groupintroduce"];
     NSURLRequest *request = [NSURLRequest requestWithURL:pathUrl];
     [self.webView loadRequest:request];
+    [self.shareBtn setAction:^{
+        [weakSelf shareHander];
+    }];
+    [self.view addSubview:self.noteBookShareVC.view];
 
 }
 #pragma mark - layload
@@ -89,4 +97,137 @@
     }
 }
 
+
+- (void)shareHander{
+    [self.noteBookShareVC initNoteBookShareData];
+    self.noteBookShareVC.view.hidden = !self.noteBookShareVC.view.hidden;
+}
+
+- (NoteBookShareVC *)noteBookShareVC{
+    if (_noteBookShareVC == nil) {
+        _noteBookShareVC = [NoteBookShareVC initNoteBookShareVC];
+        [_noteBookShareVC.view setHidden:YES];
+        _noteBookShareVC.delegate = self;
+    }
+    return _noteBookShareVC;
+}
+- (void)userSelectType:(NSString *)typeName WithIndexPath:(NSIndexPath *)indexPath
+{
+    self.noteBookShareVC.view.hidden = !self.noteBookShareVC.view.hidden;
+    if ([typeName isEqualToString:@"发给微信好友"]) {
+        [self returnToWechatSession];
+    }else if ([typeName isEqualToString:@"发到朋友圈"]){
+        [self returnToWechatTimeLine];
+    }else if ([typeName isEqualToString:@"发到微博"]){
+        [self returnToSina];
+    }else if ([typeName isEqualToString:@"发给QQ好友"]){
+        [self returnToQQ];
+    }else if ([typeName isEqualToString:@"发到消息"]){
+        [self returnToMessage];
+    }else if ([typeName isEqualToString:@"发到小组"]){
+        [self returnToGroup];
+    }else if ([typeName isEqualToString:@"发到笔记"]){
+        [self returnToNote];
+    }else if ([typeName isEqualToString:@"发到话题"]){
+        [self returnToTopic];
+    }
+}
+
+- (void)shareWebPageToPlatformType:(UMSocialPlatformType)platformType title:(NSString *)title desc:(NSString *)desc url:(NSString *)url
+{
+    //创建分享消息对象
+    UMSocialMessageObject *messageObject = [UMSocialMessageObject messageObject];
+    
+    messageObject.title = title;
+    //创建网页内容对象
+    UMShareWebpageObject *shareObject = [UMShareWebpageObject shareObjectWithTitle:title descr:desc thumImage:IMG(@"小组")];
+    //设置网页地址
+    shareObject.webpageUrl = url;
+    
+    //分享消息对象设置分享内容对象
+    messageObject.shareObject = shareObject;
+    
+    //调用分享接口
+    [[UMSocialManager defaultManager] shareToPlatform:platformType messageObject:messageObject currentViewController:self completion:^(id data, NSError *error) {
+        if (error) {
+            NSLog(@"************Share fail with error %@*********",error);
+        }else{
+            NSLog(@"response data is %@",data);
+        }
+    }];
+}
+- (void)returnToWechatSession
+{
+    [self shareWebPageToPlatformType:UMSocialPlatformType_WechatSession title:self.GroupName desc:self.GroupName url:[self returnUrl]];
+}
+- (void)returnToWechatTimeLine
+{
+    [self shareWebPageToPlatformType:UMSocialPlatformType_WechatTimeLine title:self.GroupName desc:self.GroupName url:[self returnUrl]];
+}
+- (void)returnToSina
+{
+    [self shareWebPageToPlatformType:UMSocialPlatformType_Sina title:self.GroupName desc:self.GroupName url:[self returnUrl]];
+}
+- (void)returnToQQ
+{
+    [self shareWebPageToPlatformType:UMSocialPlatformType_QQ title:self.GroupName desc:self.GroupName url:[self returnUrl]];
+}
+- (NSString *)returnUrl
+{
+    NSString * url = [NSString stringWithFormat:@"%@%ld",ShareHost(@"mobile/topicDetailsWx?"),(long)self.Id];
+    return url;
+}
+#pragma mark - 分享功能
+- (void)returnToMessage
+{
+    ShareListVC * vc = [ShareListVC initShareListVC];
+    FlowAttachmentsModel * model = [[FlowAttachmentsModel alloc] init];
+    model.SoureId = self.Id;
+    model.SoureTypeId = CollectModel_Group;
+    model.Title = self.GroupName;
+    model.Author = self.GroupName;
+    vc.sendModel = model;
+    vc.isReturn = YES;
+    [self.navigationController pushViewController:vc animated:YES];
+}
+- (void)returnToGroup
+{
+    MyTDGroupViewController * vc = [[MyTDGroupViewController alloc] init];
+    vc.type =  CollectModel_Group;
+    FlowAttachmentsModel * model = [[FlowAttachmentsModel alloc] init];
+    model.SoureId = self.Id;
+    model.SoureTypeId = CollectModel_Group;
+    model.Title = self.GroupName;
+    model.Author = self.GroupName;
+    vc.sendModel = model;
+    vc.isReturn = YES;
+    [self.navigationController pushViewController:vc animated:YES];
+}
+- (void)returnToNote
+{
+    MyTDTopicCreateVC * vc = [MyTDTopicCreateVC initMyTDTopicCreateVC];
+    vc.type = CollectModel_NoteBook;
+    FlowAttachmentsModel * model = [[FlowAttachmentsModel alloc] init];
+    model.SoureId = self.Id;
+    model.SoureTypeId = CollectModel_Group;
+    model.Title = self.GroupName;
+    model.Author = self.GroupName;
+    vc.sendModel = model;
+    vc.isReturn = YES;
+    [self.navigationController pushViewController:vc animated:YES];
+}
+- (void)returnToTopic
+{
+    MyTDTopicCreateVC * vc = [MyTDTopicCreateVC initMyTDTopicCreateVC];
+    vc.type = CollectModel_NewTopic;
+    FlowAttachmentsModel * model = [[FlowAttachmentsModel alloc] init];
+    model.SoureId = self.Id;
+    model.SoureTypeId = CollectModel_Group;
+    model.Title = self.GroupName;
+    model.Author = self.GroupName;
+    vc.sendModel = model;
+    vc.isReturn = YES;
+    [self.navigationController pushViewController:vc animated:YES];
+}
+
 @end

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

@@ -162,6 +162,7 @@
             UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithActionBlock:^(id  _Nonnull sender) {
                 GroupInfoVC * vc = [GroupInfoVC initGroupInfoVC];
                 vc.Id = weakSelf.GroupModel.Id;
+                vc.GroupName = weakSelf.GroupModel.Name;
                 vc.IsOwner = weakSelf.model.GroupUserRoleId == 1 ? YES : NO;
                 [weakSelf.navigationController pushViewController:vc animated:YES];
             }];

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

@@ -94,12 +94,12 @@
    if (model.IsComment) {
        ReplayMeCell * cell = [ReplayMeCell configCell0:tableView indexPath:indexPath];
        cell.redV.hidden = YES;
-       [cell setDataCommentModel:model];
+       [cell setDataCommentModel:model searchText:self.searchText];
        return cell;
    }else{
        ReplayMeCell * cell = [ReplayMeCell configCell1:tableView indexPath:indexPath];
        cell.redV.hidden = YES;
-       [cell setDataModel:model];
+       [cell setDataModel:model searchText:self.searchText];
        return cell;
    }
 }

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

@@ -94,12 +94,12 @@
    if (model.IsComment) {
        ReplayMeCell * cell = [ReplayMeCell configCell0:tableView indexPath:indexPath];
        cell.redV.hidden = YES;
-       [cell setDataCommentModel:model];
+       [cell setDataCommentModel:model searchText:self.searchText];
        return cell;
    }else{
        ReplayMeCell * cell = [ReplayMeCell configCell1:tableView indexPath:indexPath];
        cell.redV.hidden = YES;
-       [cell setDataModel:model];
+       [cell setDataModel:model searchText:self.searchText];
        return cell;
    }
 }

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

@@ -60,7 +60,7 @@
 {
     [self.dataArray removeAllObjects];
     NSDictionary * paraDict = @{@"KeyWord":@"",
-                                @"TypeValue":self.replayMe ? @(1) : @(0),
+                                @"TypeValue":self.replayMe ? @(0) : @(1),
     };
     WS(weakSelf);
     SHOWLOADING
@@ -232,12 +232,12 @@
     ReplyModel * model = [self.dataArray objectAtIndex:indexPath.row];
     if (model.IsComment) {
         ReplayMeCell * cell = [ReplayMeCell configCell0:tableView indexPath:indexPath];
-        cell.redV.hidden = YES;
+        cell.redV.hidden = model.IsRead;
         [cell setDataCommentModel:model];
         return cell;
     }else{
         ReplayMeCell * cell = [ReplayMeCell configCell1:tableView indexPath:indexPath];
-        cell.redV.hidden = YES;
+        cell.redV.hidden = model.IsRead;
         [cell setDataModel:model];
         return cell;
     }

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

@@ -66,6 +66,7 @@
 @property (strong, nonatomic) WorkNumberModel       * numModel;
 @property (copy, nonatomic) NSString                * listName;
 @property (strong,nonatomic) UILabel                * noDataL;
+@property (assign, nonatomic) BOOL                    GroupNoUser;
 
 @end
 
@@ -204,7 +205,7 @@
         }];
     }];
     dispatch_async(dispatch_get_main_queue(), ^{
-        weakSelf.numModel.messageUnCount = weakSelf.unReadCount;
+        weakSelf.numModel.UReadChatCount += weakSelf.unReadCount;
         NSInteger count = weakSelf.numModel.allNumber + weakSelf.unReadCount;
         weakSelf.tabBarController.tabBar.items[2].badgeValue = count > 0 ? [NSString stringWithFormat:@"%ld",(long)count] : nil;
         [weakSelf initCollectionData:weakSelf.numModel];
@@ -307,11 +308,12 @@
                 [weakSelf.tableView.mj_footer endRefreshingWithNoMoreData];
                 weakSelf.tableView.mj_footer.hidden = YES;
                 weakSelf.noDataL.hidden = NO;
+                [weakSelf setNoDataMsg:weakSelf.GroupNoUser];
             }else{
                 weakSelf.noDataL.hidden = YES;
             }
+//            [weakSelf.collectionView reloadData];
             [weakSelf.tableView reloadData];
-            [weakSelf.collectionView reloadData];
         });
     } failure:^(NSError * _Nonnull error) {
         REMOVESHOW
@@ -332,15 +334,6 @@
     [self.noDataL mas_makeConstraints:^(MASConstraintMaker *make) {
         make.center.mas_equalTo(self.view);
     }];
-    NSString * str = @"该分组还没有人，快去 添加 吧";
-    NSMutableAttributedString * astr = [[NSMutableAttributedString alloc] initWithString:str];
-    [astr addAttribute:NSFontAttributeName value:[UIFont fontWithName:@"PingFang SC" size:16] range:NSMakeRange(0, str.length)];
-    [astr addAttribute:NSForegroundColorAttributeName value:UIColorHex(0x666666) range:NSMakeRange(0, str.length)];
-    [astr addAttribute:NSForegroundColorAttributeName value:UIColorHex(0x1E7AB9) range:NSMakeRange(11, 2)];
-    NSMutableParagraphStyle *paraStyle = [[NSMutableParagraphStyle alloc]init];
-    paraStyle.alignment = NSTextAlignmentCenter;
-    [astr addAttribute:NSParagraphStyleAttributeName value:paraStyle range:NSMakeRange(0, str.length)];
-    self.noDataL.attributedText = astr;
     self.noDataL.hidden = YES;
     WS(weakSelf);
     UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithActionBlock:^(id  _Nonnull sender) {
@@ -351,14 +344,40 @@
     self.noDataL.hidden = YES;
     self.noDataL.userInteractionEnabled = YES;
 }
+- (void)setNoDataMsg:(BOOL)noUser
+{
+    if (noUser) {
+        NSString * str = @"该分组还没有人，快去 添加 吧";
+        NSMutableAttributedString * astr = [[NSMutableAttributedString alloc] initWithString:str];
+        [astr addAttribute:NSFontAttributeName value:[UIFont fontWithName:@"PingFang SC" size:16] range:NSMakeRange(0, str.length)];
+        [astr addAttribute:NSForegroundColorAttributeName value:UIColorHex(0x666666) range:NSMakeRange(0, str.length)];
+        [astr addAttribute:NSForegroundColorAttributeName value:UIColorHex(0x1E7AB9) range:NSMakeRange(11, 2)];
+        NSMutableParagraphStyle *paraStyle = [[NSMutableParagraphStyle alloc]init];
+        paraStyle.alignment = NSTextAlignmentCenter;
+        [astr addAttribute:NSParagraphStyleAttributeName value:paraStyle range:NSMakeRange(0, str.length)];
+        self.noDataL.attributedText = astr;
+    }else{
+        NSString * str = @"暂无话题内容";
+        NSMutableAttributedString * astr = [[NSMutableAttributedString alloc] initWithString:str];
+        [astr addAttribute:NSFontAttributeName value:[UIFont fontWithName:@"PingFang SC" size:16] range:NSMakeRange(0, str.length)];
+        [astr addAttribute:NSForegroundColorAttributeName value:UIColorHex(0x666666) range:NSMakeRange(0, str.length)];
+//        [astr addAttribute:NSForegroundColorAttributeName value:UIColorHex(0x1E7AB9) range:NSMakeRange(11, 2)];
+        NSMutableParagraphStyle *paraStyle = [[NSMutableParagraphStyle alloc]init];
+        paraStyle.alignment = NSTextAlignmentCenter;
+        [astr addAttribute:NSParagraphStyleAttributeName value:paraStyle range:NSMakeRange(0, str.length)];
+        self.noDataL.attributedText = astr;
+    }
+}
 - (void)AddGroupUser
 {
-    AddLookUpUserSecondVC *vc = [[AddLookUpUserSecondVC alloc] init];
-    vc.titleStr = @"选人";
-    vc.isDefalutPage = 1;
-    vc.delegate = self;
-    USERDEFAULTSSET([NSMutableArray array], MAILSELECT);
-    [self.navigationController pushViewController:vc animated:YES];
+    if (self.GroupNoUser) {
+        AddLookUpUserSecondVC *vc = [[AddLookUpUserSecondVC alloc] init];
+        vc.titleStr = @"选人";
+        vc.isDefalutPage = 1;
+        vc.delegate = self;
+        USERDEFAULTSSET([NSMutableArray array], MAILSELECT);
+        [self.navigationController pushViewController:vc animated:YES];
+    }
 }
 #pragma mark - 注册通知 接受抄送人和审批人数据
 - (void)recviveChaoSongRen:(NSNotification *)notification{
@@ -417,14 +436,14 @@
                 model.imgName = @"Common_sixin_icon";
                 model.notImgName = @"Common_sixin_icon";
                 model.type = ChatMenuSiXinType;
-                model.readNum = numModel.messageUnCount;
+                model.readNum = numModel.UReadChatCount;
                 model.showEditFlag = YES;
             }break;
         }
         [array addObject:model];
     }
     self.collectionDataSource = array;
-    [self.collectionView reloadData];
+    [self.collectionView reloadView];
 }
 #pragma mark - UITableViewDelegate
 - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView{
@@ -549,6 +568,7 @@
                 for (NSArray * subArray in array) {
                     for (TopicGroupManageModel * model in subArray) {
                         if (model.isSelect) {
+                            weakSelf.GroupNoUser = model.IncludeCount == 0 ? YES : NO;
                             [showName appendString:model.Name];
 //                            [showName appendString:@"、"];
                             [weakSelf.selectGIdArray addObject:@(model.Id)];
@@ -619,7 +639,11 @@
             ChatMsgListCell *cell = [ChatMsgListCell configCell1:tableView indexPath:indexPath];
             [cell.cell1ContentBgView addSubview:self.collectionView];
             self.collectionView.frame = CGRectMake(0, 0, SCREEN_WIDTH, cell.cell1ContentBgView.height);
-            [self.collectionView reloadData];
+            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+                dispatch_async(dispatch_get_main_queue(), ^{
+                    [weakSelf.collectionView reloadData];
+                });
+            });
             return cell;
         }
             break;

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

@@ -26,6 +26,9 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (void)setDataModel:(ReplyModel *)model;
 - (void)setDataCommentModel:(ReplyModel *)model;
+
+- (void)setDataModel:(ReplyModel *)model searchText:(NSString *)searchText;
+- (void)setDataCommentModel:(ReplyModel *)model searchText:(NSString *)searchText;
 @end
 
 NS_ASSUME_NONNULL_END

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

@@ -138,6 +138,101 @@
             break;
     }
 }
+
+- (void)setDataModel:(ReplyModel *)model searchText:(NSString *)searchText
+{
+    NSString * comStr = [NSString stringWithFormat:@"来自 %@",model.Remark];
+    
+    [self.iconV sd_setImageWithURL:[NSURL URLWithString:model.AvatarUrl] placeholderImage:kUserDefaultHeadImage];
+    self.nameL.text = model.UserName;
+    self.timeL.text = [model.CreatedDate substringWithRange:NSMakeRange(5, 11)];
+    self.contentL.text = model.CommentContent;
+    self.contentL.attributedText = [self SearchOfString:model.CommentContent withSearchText:searchText];
+    self.subTitleL.attributedText = [self SearchOfString:model.Title withSearchText:searchText];
+    self.subComeL.attributedText = [self checkOfString:comStr withSearchText:model.Remark];
+    switch (model.TypeValue) {
+        case CollectModel_Aritle:
+        {
+            self.FileImgV.image = IMG(@"文章");
+        }
+            break;
+        case CollectModel_Toipc:
+        {
+            self.FileImgV.image = IMG(@"话题");
+        }
+            break;
+        case CollectModel_NewTopic:
+        {
+            self.FileImgV.image = IMG(@"话题");
+        }
+            break;
+        case CollectModel_Collect:
+        {
+            self.FileImgV.image = IMG(@"收藏");
+        }
+            break;
+        case CollectModel_NoteBook:
+        {
+            self.FileImgV.image = IMG(@"noteBook_icon");
+        }
+            break;
+        case CollectModel_Notice:
+        {
+            self.FileImgV.image = IMG(@"通知图标");
+        }
+            break;
+        case CollectModel_InterMail:
+        {
+            self.FileImgV.image = IMG(@"站内信");
+        }
+            break;
+        case CollectModel_Group:
+        {
+            self.FileImgV.image = IMG(@"笔记小组");
+        }
+            break;
+        case CollectModel_meetMian:
+        {
+            self.FileImgV.image = IMG(@"会议纪要");
+        }
+            break;
+        case CollectModel_meetDetail:
+        {
+            self.FileImgV.image = IMG(@"会议");
+        }
+            break;
+        case CollectModel_CollectFile:
+        {
+            self.FileImgV.image = IMG(@"find_1");
+        }
+            break;
+        case CollectModel_NoteFile:
+        {
+            self.FileImgV.image = IMG(@"find_1");
+        }
+            break;
+        case CollectModel_work:
+        {
+            self.FileImgV.image = IMG(@"审批");
+        }
+            break;
+        case CollectModel_financeCount:
+        {
+            self.FileImgV.image = IMG(@"报表");
+        }
+            break;
+        case CollectModel_affairsCount:
+        {
+            self.FileImgV.image = IMG(@"报表");
+        }
+            break;
+        default:
+        {
+            self.FileImgV.image = IMG(@"报表");
+        }
+            break;
+    }
+}
 - (void)setDataCommentModel:(ReplyModel *)model
 {
     NSString * str = [NSString stringWithFormat:@"%@:%@",model.Name,model.Title];
@@ -151,7 +246,30 @@
     self.subComeL.attributedText = [self checkOfString:comStr withSearchText:model.Remark];
     
 }
-
+- (void)setDataCommentModel:(ReplyModel *)model searchText:(NSString *)searchText
+{
+    NSString * str = [NSString stringWithFormat:@"%@:%@",model.Name,model.Title];
+    NSString * subtr = [NSString stringWithFormat:@"%@:",model.Name];
+    NSString * comStr = [NSString stringWithFormat:@"来自 %@",model.Remark];
+    [self.iconV sd_setImageWithURL:[NSURL URLWithString:model.AvatarUrl] placeholderImage:kUserDefaultHeadImage];
+    self.nameL.text = model.UserName;
+    self.timeL.text = [model.CreatedDate substringWithRange:NSMakeRange(5, 11)];
+    self.contentL.attributedText = [self SearchOfString:model.CommentContent withSearchText:searchText];
+    self.subTitleL.attributedText = [self checkOfString:str withSearchText:subtr];
+    self.subComeL.attributedText = [self checkOfString:comStr withSearchText:model.Remark];
+    
+}
+- (NSMutableAttributedString *)SearchOfString:(NSString *)infoStr withSearchText:(NSString *)text
+{
+    if (infoStr.length == 0) {
+        return nil;
+    }
+    NSMutableAttributedString *attrString = [[NSMutableAttributedString alloc] initWithString:infoStr];
+    [attrString addAttribute:(NSString *)NSForegroundColorAttributeName
+                       value:UIColorHex(0xFF5252)
+                       range:[infoStr rangeOfString:text]];
+    return attrString;
+}
 - (NSMutableAttributedString *)checkOfString:(NSString *)infoStr withSearchText:(NSString *)text
 {
     if (infoStr.length == 0) {

smartRhino/Project/VCModel/WorkFlow/AddLookUpUserSecondVC.m

@@ -212,7 +212,7 @@
             [[NSNotificationCenter defaultCenter] postNotificationName:NOTIFI_ChaoSongRen object:nil userInfo:@{@"selectPeople":weakSelf.selectArray}];
             [weakSelf back1];
         } failure:^(NSError * _Nonnull error) {
-            SHOWERROR([ZYCTool handerResultData:error]);
+//            SHOWERROR([ZYCTool handerResultData:error]);
         }];
     }
 }

smartRhino/Project/VCModel/WorkFlow/FlowAttachmentsModel.h

@@ -26,7 +26,6 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, copy) NSString  * Title;
 @property (nonatomic, copy) NSString  * Author;
 @property (nonatomic, assign) NSInteger SourceUserId;
-
 @end
 
 NS_ASSUME_NONNULL_END

smartRhino/Project/VCModel/WorkFlow/NewMeetingFecordDetailsController.m

@@ -421,6 +421,7 @@ static NSString *imageID = @"ArticleImageCell";
                 MoveViewController *vc = [MoveViewController initMoveViewController];
                 vc.CollectionDataId = _currentModel.MeetingId;
                 vc.collectType = CollectHanderType_Collect;
+                vc.CollectionType = CollectModel_meetDetail;
                 vc.ParentId = 0;
                 vc.titleStr = @"我的收藏";
                 vc.TypeId =  CreateCollectionType;

smartRhino/Project/VCModel/WorkFlow/WorkNumberModel.h

@@ -28,6 +28,8 @@ NS_ASSUME_NONNULL_BEGIN
 /// 工作抄送我的未读数量
 @property (nonatomic ,assign) NSInteger messageUnCount;
 
+@property (nonatomic ,assign) NSInteger UReadChatCount;
+
 /// 统计nunber
 - (NSInteger )allNumber;
 

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

@@ -17,6 +17,20 @@
 #import "MyApprovalPageDetail.h"
 #import "CountDataVC.h"
 #import "CommomSearchVC.h"
+#import "MyFavoriteVC.h"
+#import "NoteBookVC.h"
+#import "OtherFavoriteVC.h"
+#import "OtherNoteBookVC.h"
+#import "DownFileViewController.h"
+#import "WorkFlowDetailsController.h"
+#import "MyApprovalPageDetail.h"
+#import "CountDataVC.h"
+#import "CommomSearchVC.h"
+#import "NoteBookShareVC.h"
+#import "MyTDGroupViewController.h"
+#import "TDGroupInfoListVC.h"
+#import "MailListVC.h"
+#import "ShareListVC.h"
 
 @interface CommomSearchVC ()<UITableViewDelegate,UITableViewDataSource>
 @property (nonatomic, copy) NSMutableArray *listArray;
@@ -82,9 +96,6 @@
             if (model.CollectionType == CollectModel_Text) {
                 model.CollectionType = CollectModel_Aritle;
             }
-            if (model.CollectionType == CollectModel_meet) {
-                model.CollectionType = CollectModel_meetMian;
-            }
         }
         dispatch_async(dispatch_get_main_queue(), ^{
             [weakSelf.tableView reloadData];
@@ -145,27 +156,84 @@
             [self.navigationController pushViewController:vc animated:YES];
         }break;
         case CollectModel_CollectFile:{
-            OtherFavoriteVC * vc = [OtherFavoriteVC initOtherFavoriteVC];
-            vc.listType = model.CollectionDataId == 0 ? MyFavoriteListLevelTypeA : MyFavoriteListLevelTypeB;
-            vc.FolderId = model.CollectionDataId;
-            vc.CollectionDataId = model.CollectionDataId;
-            vc.CollectionType = model.CollectionType;
-            vc.Author = model.Data.Author;
-            vc.myTitle = model.Title;
-            vc.VisitUserId = model.SourceUserId;
-            [self.navigationController pushViewController:vc animated:YES];
+            if (model.SourceUserId == [AppUserModel sharedAppUserModel].Id || model.SourceUserId == 0) {
+                MyFavoriteVC * vc = [MyFavoriteVC initMyFavoriteVC];
+                vc.listType = model.CollectionDataId == 0 ? MyFavoriteListLevelTypeA : MyFavoriteListLevelTypeB;
+                vc.FolderId = model.CollectionDataId;
+                vc.myTitle = model.Title;
+                [self.navigationController pushViewController:vc animated:YES];
+            }else{
+                OtherFavoriteVC * vc = [OtherFavoriteVC initOtherFavoriteVC];
+                vc.listType = model.CollectionDataId == 0 ? MyFavoriteListLevelTypeA : MyFavoriteListLevelTypeB;
+                vc.FolderId = model.CollectionDataId;
+                vc.CollectionDataId = model.CollectionDataId;
+                vc.CollectionType = model.CollectionType;
+                vc.Author = model.Data.Author;
+                vc.myTitle = model.Title;
+                vc.VisitUserId = model.SourceUserId;
+                [self.navigationController pushViewController:vc animated:YES];
+            }
         }break;
         case CollectModel_NoteFile: {
-            OtherNoteBookVC * vc = [OtherNoteBookVC initOtherNoteBookVC];
-            vc.listType = model.CollectionDataId == 0 ? MyFavoriteListLevelTypeA : MyFavoriteListLevelTypeB;
-            vc.FolderId = model.CollectionDataId;
-            vc.CollectionDataId = model.CollectionDataId;
-            vc.CollectionType = model.CollectionType;
-            vc.Author = model.Data.Author;
-            vc.myTitle = model.Title;
-            vc.TypeValue = 1;
-            vc.VisitUserId = model.SourceUserId;
-            [self.navigationController pushViewController:vc animated:YES];
+            if (model.SourceUserId == [AppUserModel sharedAppUserModel].Id || model.SourceUserId == 0) {
+                NoteBookVC * vc = [NoteBookVC initNoteBookVC];
+                vc.listType = model.CollectionDataId == 0 ? MyFavoriteListLevelTypeA : MyFavoriteListLevelTypeB;
+                vc.FolderId = model.CollectionDataId;
+                vc.myTitle = model.Title;
+                [self.navigationController pushViewController:vc animated:YES];
+            }else{
+                OtherNoteBookVC * vc = [OtherNoteBookVC initOtherNoteBookVC];
+                vc.listType = model.CollectionDataId == 0 ? MyFavoriteListLevelTypeA : MyFavoriteListLevelTypeB;
+                vc.FolderId = model.CollectionDataId;
+                vc.CollectionDataId = model.CollectionDataId;
+                vc.CollectionType = model.CollectionType;
+                vc.Author = model.Data.Author;
+                vc.myTitle = model.Title;
+                vc.VisitUserId = model.SourceUserId;
+                [self.navigationController pushViewController:vc animated:YES];
+            }
+        }break;
+        case CollectModel_TopicBooK:{
+            if (model.SourceUserId == [AppUserModel sharedAppUserModel].Id || model.SourceUserId == 0) {
+                NoteBookVC * vc = [NoteBookVC initNoteBookVC];
+                vc.listType = MyFavoriteListLevelTypeA;
+                vc.FolderId = model.CollectionDataId;
+                vc.TypeValue = 1;
+                vc.myTitle = model.Title;
+                [self.navigationController pushViewController:vc animated:YES];
+            }else{
+                OtherNoteBookVC * vc = [OtherNoteBookVC initOtherNoteBookVC];
+                vc.listType = MyFavoriteListLevelTypeA ;
+                vc.FolderId = model.CollectionDataId;
+                vc.CollectionDataId = model.CollectionDataId;
+                vc.CollectionType = model.CollectionType;
+                vc.Author = model.Data.Author;
+                vc.TypeValue = 1;
+                vc.myTitle = model.Title;
+                vc.VisitUserId = model.SourceUserId;
+                [self.navigationController pushViewController:vc animated:YES];
+            }
+        }break;
+        case CollectModel_TopicSubBooK:{
+            if (model.SourceUserId == [AppUserModel sharedAppUserModel].Id || model.SourceUserId == 0) {
+                NoteBookVC * vc = [NoteBookVC initNoteBookVC];
+                vc.listType = MyFavoriteListLevelTypeB;
+                vc.FolderId = model.CollectionDataId;
+                vc.TypeValue = 1;
+                vc.myTitle = model.Title;
+                [self.navigationController pushViewController:vc animated:YES];
+            }else{
+                OtherNoteBookVC * vc = [OtherNoteBookVC initOtherNoteBookVC];
+                vc.listType = MyFavoriteListLevelTypeB;
+                vc.FolderId = model.CollectionDataId;
+                vc.CollectionDataId = model.CollectionDataId;
+                vc.CollectionType = model.CollectionType;
+                vc.Author = model.Data.Author;
+                vc.TypeValue = 1;
+                vc.myTitle = model.Title;
+                vc.VisitUserId = model.SourceUserId;
+                [self.navigationController pushViewController:vc animated:YES];
+            }
         }break;
         case CollectModel_Notice:{
             MyTDTopicDetailVC * vc = [MyTDTopicDetailVC initMyTDTopicDetailVC];

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

@@ -21,6 +21,8 @@
 #import "MoveViewController.h"
 #import "MyFavoriteVC.h"
 #import "CommonNoteVC.h"
+#import "MyFavoriteVC.h"
+#import "NoteBookVC.h"
 #import "OtherFavoriteVC.h"
 #import "OtherNoteBookVC.h"
 #import "DownFileViewController.h"
@@ -139,9 +141,6 @@
             if (model.CollectionType == CollectModel_Text) {
                 model.CollectionType = CollectModel_Aritle;
             }
-            if (model.CollectionType == CollectModel_meet) {
-                model.CollectionType = CollectModel_meetMian;
-            }
         }
         [weakSelf changeMessageStatusWithNumber:weakSelf.dataArray.count];
         dispatch_async(dispatch_get_main_queue(), ^{
@@ -287,19 +286,10 @@
         MyFavoriteSubModel * model = [self.dataArray objectAtIndex:indexPath.row];
         switch (model.CollectionType) {
             case CollectModel_Aritle:{
-                WEAKSELF
-                [[HttpManager sharedHttpManager] GETWithUrl:[NSString stringWithFormat:@"%@%ld",Article_Detail_Get,(long)model.CollectionDataId] parameters:@{} success:^(id  _Nonnull responseObject) {
-                    Item *itemModel = [[Item alloc]initWithDictionary:responseObject error:nil];
-                    //                                HomeDetailController *homeDetail = [[HomeDetailController alloc] init];
-                    //                                [homeDetail loadCurrentModel:itemModel];
-                    //                                [strongSelf.navigationController pushViewController:homeDetail animated:YES];
-                    MyTDTopicDetailVC * vc = [MyTDTopicDetailVC initMyTDTopicDetailVC];
-                    vc.type = CollectModel_Aritle;
-                    vc.Id = itemModel.Id;
-                    [weakSelf.navigationController pushViewController:vc animated:YES];
-                } failure:^(NSError * _Nonnull error) {
-                    SHOWERROR([ZYCTool handerResultData:error]);
-                }];
+                MyTDTopicDetailVC * vc = [MyTDTopicDetailVC initMyTDTopicDetailVC];
+                vc.type = CollectModel_Aritle;
+                vc.Id = model.CollectionDataId;
+                [self.navigationController pushViewController:vc animated:YES];
             }break;
             case CollectModel_Toipc:
             {
@@ -326,51 +316,84 @@
                 [self.navigationController pushViewController:vc animated:YES];
             }break;
             case CollectModel_CollectFile:{
-                OtherFavoriteVC * vc = [OtherFavoriteVC initOtherFavoriteVC];
-                vc.listType = model.CollectionDataId == 0 ? MyFavoriteListLevelTypeA : MyFavoriteListLevelTypeB;
-                vc.FolderId = model.CollectionDataId;
-                vc.CollectionDataId = model.CollectionDataId;
-                vc.CollectionType = model.CollectionType;
-                vc.Author = model.Data.Author;
-                vc.myTitle = model.Title;
-                vc.VisitUserId = model.SourceUserId;
-                [self.navigationController pushViewController:vc animated:YES];
+                if (model.SourceUserId == [AppUserModel sharedAppUserModel].Id || model.SourceUserId == 0) {
+                    MyFavoriteVC * vc = [MyFavoriteVC initMyFavoriteVC];
+                    vc.listType = model.CollectionDataId == 0 ? MyFavoriteListLevelTypeA : MyFavoriteListLevelTypeB;
+                    vc.FolderId = model.CollectionDataId;
+                    vc.myTitle = model.Title;
+                    [self.navigationController pushViewController:vc animated:YES];
+                }else{
+                    OtherFavoriteVC * vc = [OtherFavoriteVC initOtherFavoriteVC];
+                    vc.listType = model.CollectionDataId == 0 ? MyFavoriteListLevelTypeA : MyFavoriteListLevelTypeB;
+                    vc.FolderId = model.CollectionDataId;
+                    vc.CollectionDataId = model.CollectionDataId;
+                    vc.CollectionType = model.CollectionType;
+                    vc.Author = model.Data.Author;
+                    vc.myTitle = model.Title;
+                    vc.VisitUserId = model.SourceUserId;
+                    [self.navigationController pushViewController:vc animated:YES];
+                }
             }break;
             case CollectModel_NoteFile: {
-                OtherNoteBookVC * vc = [OtherNoteBookVC initOtherNoteBookVC];
-                vc.listType = model.CollectionDataId == 0 ? MyFavoriteListLevelTypeA : MyFavoriteListLevelTypeB;
-                vc.FolderId = model.CollectionDataId;
-                vc.CollectionDataId = model.CollectionDataId;
-                vc.CollectionType = model.CollectionType;
-                vc.Author = model.Data.Author;
-                vc.myTitle = model.Title;
-                vc.TypeValue = 1;
-                vc.VisitUserId = model.SourceUserId;
-                [self.navigationController pushViewController:vc animated:YES];
+                if (model.SourceUserId == [AppUserModel sharedAppUserModel].Id || model.SourceUserId == 0) {
+                    NoteBookVC * vc = [NoteBookVC initNoteBookVC];
+                    vc.listType = model.CollectionDataId == 0 ? MyFavoriteListLevelTypeA : MyFavoriteListLevelTypeB;
+                    vc.FolderId = model.CollectionDataId;
+                    vc.myTitle = model.Title;
+                    [self.navigationController pushViewController:vc animated:YES];
+                }else{
+                    OtherNoteBookVC * vc = [OtherNoteBookVC initOtherNoteBookVC];
+                    vc.listType = model.CollectionDataId == 0 ? MyFavoriteListLevelTypeA : MyFavoriteListLevelTypeB;
+                    vc.FolderId = model.CollectionDataId;
+                    vc.CollectionDataId = model.CollectionDataId;
+                    vc.CollectionType = model.CollectionType;
+                    vc.Author = model.Data.Author;
+                    vc.myTitle = model.Title;
+                    vc.VisitUserId = model.SourceUserId;
+                    [self.navigationController pushViewController:vc animated:YES];
+                }
             }break;
             case CollectModel_TopicBooK:{
-                OtherNoteBookVC * vc = [OtherNoteBookVC initOtherNoteBookVC];
-                vc.listType = MyFavoriteListLevelTypeA ;
-                vc.FolderId = model.CollectionDataId;
-                vc.CollectionDataId = model.CollectionDataId;
-                vc.CollectionType = model.CollectionType;
-                vc.Author = model.Data.Author;
-                vc.TypeValue = 1;
-                vc.myTitle = model.Title;
-                vc.VisitUserId = model.SourceUserId;
-                [self.navigationController pushViewController:vc animated:YES];
+                if (model.SourceUserId == [AppUserModel sharedAppUserModel].Id || model.SourceUserId == 0) {
+                    NoteBookVC * vc = [NoteBookVC initNoteBookVC];
+                    vc.listType = MyFavoriteListLevelTypeA;
+                    vc.FolderId = model.CollectionDataId;
+                    vc.TypeValue = 1;
+                    vc.myTitle = model.Title;
+                    [self.navigationController pushViewController:vc animated:YES];
+                }else{
+                    OtherNoteBookVC * vc = [OtherNoteBookVC initOtherNoteBookVC];
+                    vc.listType = MyFavoriteListLevelTypeA ;
+                    vc.FolderId = model.CollectionDataId;
+                    vc.CollectionDataId = model.CollectionDataId;
+                    vc.CollectionType = model.CollectionType;
+                    vc.Author = model.Data.Author;
+                    vc.TypeValue = 1;
+                    vc.myTitle = model.Title;
+                    vc.VisitUserId = model.SourceUserId;
+                    [self.navigationController pushViewController:vc animated:YES];
+                }
             }break;
             case CollectModel_TopicSubBooK:{
-                OtherNoteBookVC * vc = [OtherNoteBookVC initOtherNoteBookVC];
-                vc.listType = MyFavoriteListLevelTypeB ;
-                vc.FolderId = model.CollectionDataId;
-                vc.CollectionDataId = model.CollectionDataId;
-                vc.CollectionType = model.CollectionType;
-                vc.Author = model.Data.Author;
-                vc.TypeValue = 1;
-                vc.myTitle = model.Title;
-                vc.VisitUserId = model.SourceUserId;
-                [self.navigationController pushViewController:vc animated:YES];
+                if (model.SourceUserId == [AppUserModel sharedAppUserModel].Id || model.SourceUserId == 0) {
+                    NoteBookVC * vc = [NoteBookVC initNoteBookVC];
+                    vc.listType = MyFavoriteListLevelTypeB;
+                    vc.FolderId = model.CollectionDataId;
+                    vc.TypeValue = 1;
+                    vc.myTitle = model.Title;
+                    [self.navigationController pushViewController:vc animated:YES];
+                }else{
+                    OtherNoteBookVC * vc = [OtherNoteBookVC initOtherNoteBookVC];
+                    vc.listType = MyFavoriteListLevelTypeB;
+                    vc.FolderId = model.CollectionDataId;
+                    vc.CollectionDataId = model.CollectionDataId;
+                    vc.CollectionType = model.CollectionType;
+                    vc.Author = model.Data.Author;
+                    vc.TypeValue = 1;
+                    vc.myTitle = model.Title;
+                    vc.VisitUserId = model.SourceUserId;
+                    [self.navigationController pushViewController:vc animated:YES];
+                }
             }break;
             case CollectModel_Notice:{
                 MyTDTopicDetailVC * vc = [MyTDTopicDetailVC initMyTDTopicDetailVC];
@@ -782,14 +805,14 @@
     }
 }
 
-- (void)shareWebPageToPlatformType:(UMSocialPlatformType)platformType title:(NSString *)title desc:(NSString *)desc url:(NSString *)url
+- (void)shareWebPageToPlatformType:(UMSocialPlatformType)platformType title:(NSString *)title desc:(NSString *)desc url:(NSString *)url image:(NSString *)image
 {
     //创建分享消息对象
     UMSocialMessageObject *messageObject = [UMSocialMessageObject messageObject];
     
     messageObject.title = title;
     //创建网页内容对象
-    UMShareWebpageObject *shareObject = [UMShareWebpageObject shareObjectWithTitle:title descr:desc thumImage:IMG(@"logo_60")];
+    UMShareWebpageObject *shareObject = [UMShareWebpageObject shareObjectWithTitle:title descr:desc thumImage:IMG(image)];
     //设置网页地址
     shareObject.webpageUrl = url;
     
@@ -807,19 +830,19 @@
 }
 - (void)returnToWechatSession
 {
-    [self shareWebPageToPlatformType:UMSocialPlatformType_WechatSession title:self.sendModel.Title desc:[NSString stringWithFormat:@"来自-%@",self.sendModel.Name] url:[self returnUrl]];
+    [self shareWebPageToPlatformType:UMSocialPlatformType_WechatSession title:self.sendModel.Title desc:[NSString stringWithFormat:@"来自-%@",self.sendModel.Data.Author] url:[self returnUrl] image:[self returnImage]];
 }
 - (void)returnToWechatTimeLine
 {
-    [self shareWebPageToPlatformType:UMSocialPlatformType_WechatTimeLine title:self.sendModel.Title desc:[NSString stringWithFormat:@"来自-%@",self.sendModel.Name] url:[self returnUrl]];
+    [self shareWebPageToPlatformType:UMSocialPlatformType_WechatTimeLine title:self.sendModel.Title desc:[NSString stringWithFormat:@"来自-%@",self.sendModel.Data.Author] url:[self returnUrl] image:[self returnImage]];
 }
 - (void)returnToSina
 {
-    [self shareWebPageToPlatformType:UMSocialPlatformType_Sina title:self.sendModel.Title desc:[NSString stringWithFormat:@"来自-%@",self.sendModel.Name] url:[self returnUrl]];
+    [self shareWebPageToPlatformType:UMSocialPlatformType_Sina title:self.sendModel.Title desc:[NSString stringWithFormat:@"来自-%@",self.sendModel.Data.Author] url:[self returnUrl] image:[self returnImage]];
 }
 - (void)returnToQQ
 {
-    [self shareWebPageToPlatformType:UMSocialPlatformType_QQ title:self.sendModel.Title desc:[NSString stringWithFormat:@"来自-%@",self.sendModel.Name] url:[self returnUrl]];
+    [self shareWebPageToPlatformType:UMSocialPlatformType_QQ title:self.sendModel.Title desc:[NSString stringWithFormat:@"来自-%@",self.sendModel.Data.Author] url:[self returnUrl] image:[self returnImage]];
 }
 - (NSString *)returnUrl
 {
@@ -862,20 +885,55 @@
         }
             break;
         case CollectModel_NoSignMail:
-               {
-                   NSString * url = [NSString stringWithFormat:@"%@%ld",Host(@"/admin/mobile/mailWx?"),(long)self.sendModel.CollectionDataId];
-                   return url;
-               }
-                   break;
+        {
+            NSString * url = [NSString stringWithFormat:@"%@%ld",Host(@"/admin/mobile/mailWx?"),(long)self.sendModel.CollectionDataId];
+            return url;
+        }
+            break;
         case CollectModel_meetMian:
         {
-            NSString * url = [NSString stringWithFormat:@"%@%ld",Host(@"/admin/mobile/minutesMeetingWx?"),(long)self.sendModel.CollectionDataId];
+            NSString * url = [NSString stringWithFormat:@"%@%ld",ShareHost(@"mobile/minutesMeetingWx?"),(long)self.sendModel.CollectionDataId];
+            return url;
+        }
+            break;
+        case CollectModel_meetDetail:
+        {
+            NSString * url = [NSString stringWithFormat:@"%@%ld",ShareHost(@"mobile/meetingWx?"),(long)self.sendModel.CollectionDataId];
+            return url;
+        }
+            break;
+        case CollectModel_NoteFile:
+        {
+            NSString * url = [NSString stringWithFormat:@"%@id=%ld&type=13&userId=%ld&name=%@&describe=%@",ShareHost(@"mobile/folderWx?"),(long)self.sendModel.CollectionDataId,self.sendModel.SourceUserId,self.sendModel.Title,@"笔记文件夹"];
+            return url;
+        }
+            break;
+        case CollectModel_CollectFile:
+        {
+            NSString * url = [NSString stringWithFormat:@"%@id=%ld&type=12&userId=%ld&name=%@&describe=%@",ShareHost(@"mobile/folderWx?"),(long)self.sendModel.CollectionDataId,self.sendModel.SourceUserId,self.sendModel.Title,@"收藏文件夹"];
+            return url;
+        }
+            break;
+        case CollectModel_TopicBooK:
+        {
+            NSString * url = [NSString stringWithFormat:@"%@id=%ld&type=41&userId=%ld&name=%@&describe=%@",ShareHost(@"mobile/folderWx?"),(long)self.sendModel.CollectionDataId,self.sendModel.SourceUserId,self.sendModel.Title,@"话题本"];
+            return url;
+        }
+            break;
+        case CollectModel_TopicSubBooK:
+        {
+            NSString * url = [NSString stringWithFormat:@"%@id=%ld&type=42&userId=%ld&name=%@&describe=%@",ShareHost(@"mobile/folderWx?"),(long)self.sendModel.CollectionDataId,self.sendModel.SourceUserId,self.sendModel.Title,@"话题文件夹"];
+            return url;
+        }
+            break;
+        case CollectModel_work:
+        {
+            NSString * url = [NSString stringWithFormat:@"%@%ld",ShareHost(@"mobile/approvalWx?"),(long)self.sendModel.CollectionDataId];
             return url;
         }
             break;
         case CollectModel_Aritle:
         {
-//            NSString * url = [NSString stringWithFormat:@"%@%ld",@"http://192.168.0.119:8080/admin/mobile/mainText?",(long)self.currentNoteModel.Id];
             NSString * url = [NSString stringWithFormat:@"%@%ld",Host(@"/admin/mobile/mainText?"),(long)self.sendModel.CollectionDataId];
             return url;
         }
@@ -889,6 +947,102 @@
     }
     return @"";
 }
+- (NSString *)returnImage
+{
+    switch (self.sendModel.CollectionType) {
+        case CollectModel_Group:
+        {
+            NSString * url = @"笔记小组";
+            return url;
+        }
+            break;
+        case CollectModel_Toipc:
+        {
+            NSString * url = @"话题";
+            return url;
+        }
+            break;
+        case CollectModel_NewTopic:
+        {
+            NSString * url = @"话题";
+            return url;
+        }
+            break;
+        case CollectModel_Notice:
+        {
+            NSString * url = @"通知图标";
+            return url;
+        }
+            break;
+        case CollectModel_NoteBook:
+        {
+            NSString * url = @"noteBook_icon";
+            return url;
+        }
+            break;
+        case CollectModel_NoteFile:
+        {
+            NSString * url = @"share_file";
+            return url;
+        }
+            break;
+        case CollectModel_CollectFile:
+        {
+            NSString * url = @"share_file";
+            return url;
+        }
+            break;
+        case CollectModel_InterMail:
+        {
+            NSString * url = @"站内信";
+            return url;
+        }
+            break;
+        case CollectModel_NoSignMail:
+        {
+            NSString * url = @"站内信";
+            return url;
+        }
+            break;
+        case CollectModel_meetMian:
+        {
+            NSString * url = @"会议纪要";
+            return url;
+        }
+            break;
+        case CollectModel_meetDetail:
+        {
+            NSString * url = @"会议";
+            return url;
+        }
+            break;
+        case CollectModel_Aritle:
+        {
+            NSString * url = @"文章";
+            return url;
+        }
+            break;
+        case CollectModel_TopicBooK:
+        {
+            NSString * url = @"topicBook";
+            return url;
+        }
+            break;
+        case CollectModel_TopicSubBooK:
+        {
+            NSString * url = @"share_file";
+            return url;
+        }
+            break;
+        default:
+        {
+            NSString * url = @"笔记文章";
+            return url;
+        }
+            break;
+    }
+    return @"";
+}
 #pragma mark - 分享功能
 - (void)returnToMessage
 {
@@ -922,6 +1076,7 @@
     MoveViewController * vc = [MoveViewController initMoveViewController];
     vc.isFromCreateBookVc = YES;
     vc.TypeId = CreateNotesType;
+    vc.CollectionType = CollectModel_NoteBook;
     vc.titleStr = @"我的笔记";
     vc.ParentId = 0;
     FlowAttachmentsModel * model = [[FlowAttachmentsModel alloc] init];

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

@@ -1252,6 +1252,7 @@
 - (void)launchMoveVC:(NSMutableArray<NSNumber*>*)selectIDArray{
     MoveViewController * vc = [MoveViewController initMoveViewController];
     vc.TypeId = CreateNotesType;
+    vc.CollectionType = CollectModel_NoteBook;
     vc.collectType = CollectHanderType_Move;
     vc.ParentId = 0;
     vc.titleStr = @"移动";

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

@@ -326,7 +326,7 @@
             self.iconV.image = IMG(@"noteBook_icon");
         }break;
         case CollectModel_CollectFile:{
-            self.titleL.text = model.Title;
+            self.titleL.attributedText = [ZYCTool checkOfString:model.Title withSearchText:text withColor:UIColorHex(0xFF5252)];
             self.iconV.image = IMG(@"find_1");
             self.comeBtn.hidden = NO;
             self.nameL.text = @"";

smartRhino/泰德信源.entitlements

@@ -13,17 +13,13 @@
 		<string>applinks:apk.tederen.com</string>
 	</array>
 	<key>com.apple.developer.icloud-container-identifiers</key>
-	<array>
-		<string>iCloud.com.tedehezhong.smartRhino</string>
-	</array>
+	<array/>
 	<key>com.apple.developer.icloud-services</key>
 	<array>
 		<string>CloudDocuments</string>
 	</array>
 	<key>com.apple.developer.ubiquity-container-identifiers</key>
-	<array>
-		<string>iCloud.com.tedehezhong.smartRhino</string>
-	</array>
+	<array/>
 	<key>com.apple.developer.ubiquity-kvstore-identifier</key>
 	<string>$(TeamIdentifierPrefix)$(CFBundleIdentifier)</string>
 </dict>