11

smartRhino.xcodeproj/project.pbxproj

@@ -733,6 +733,7 @@
 		EB09BF2D23B1A32B001CCBC7 /* WaitWorkLabelModel.m in Sources */ = {isa = PBXBuildFile; fileRef = EB09BF2C23B1A32B001CCBC7 /* WaitWorkLabelModel.m */; };
 		EB09BF3023B1AA19001CCBC7 /* WaitWorkWarnAlert.m in Sources */ = {isa = PBXBuildFile; fileRef = EB09BF2F23B1AA19001CCBC7 /* WaitWorkWarnAlert.m */; };
 		EB0BBB7C23D2978F005C850C /* ChatMsgNoticeSearchVC.m in Sources */ = {isa = PBXBuildFile; fileRef = EB0BBB7B23D2978E005C850C /* ChatMsgNoticeSearchVC.m */; };
+		EB0BDF4D244D49F1009F6434 /* MailListSortVC.m in Sources */ = {isa = PBXBuildFile; fileRef = EB0BDF4C244D49F1009F6434 /* MailListSortVC.m */; };
 		EB0DBF0323ADA8A200E977ED /* MyTDTopicSelectExtentCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = EB0DBF0023ADA8A200E977ED /* MyTDTopicSelectExtentCell.xib */; };
 		EB0DBF0423ADA8A200E977ED /* MyTDTopicSelectExtentCell.m in Sources */ = {isa = PBXBuildFile; fileRef = EB0DBF0123ADA8A200E977ED /* MyTDTopicSelectExtentCell.m */; };
 		EB0DBF0723ADA8EE00E977ED /* MyTDTSEModel.m in Sources */ = {isa = PBXBuildFile; fileRef = EB0DBF0623ADA8EE00E977ED /* MyTDTSEModel.m */; };
@@ -2422,6 +2423,8 @@
 		EB0BBB7A23D2978E005C850C /* ChatMsgNoticeSearchVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ChatMsgNoticeSearchVC.h; sourceTree = "<group>"; };
 		EB0BBB7B23D2978E005C850C /* ChatMsgNoticeSearchVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ChatMsgNoticeSearchVC.m; sourceTree = "<group>"; };
 		EB0BDF4A244D313A009F6434 /* 泰德信源.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = "泰德信源.entitlements"; sourceTree = "<group>"; };
+		EB0BDF4B244D49F1009F6434 /* MailListSortVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MailListSortVC.h; sourceTree = "<group>"; };
+		EB0BDF4C244D49F1009F6434 /* MailListSortVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MailListSortVC.m; sourceTree = "<group>"; };
 		EB0C773F2411DCFB00807684 /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
 		EB0DBF0023ADA8A200E977ED /* MyTDTopicSelectExtentCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MyTDTopicSelectExtentCell.xib; sourceTree = "<group>"; };
 		EB0DBF0123ADA8A200E977ED /* MyTDTopicSelectExtentCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MyTDTopicSelectExtentCell.m; sourceTree = "<group>"; };
@@ -3708,6 +3711,8 @@
 			children = (
 				C622159A2372C0F9006F5D7F /* MailListVC.h */,
 				C622159B2372C0F9006F5D7F /* MailListVC.m */,
+				EB0BDF4B244D49F1009F6434 /* MailListSortVC.h */,
+				EB0BDF4C244D49F1009F6434 /* MailListSortVC.m */,
 				C62215A22372CC89006F5D7F /* MailListByZuVC.h */,
 				C62215A32372CC89006F5D7F /* MailListByZuVC.m */,
 				C69A8DC52373AB470098FA26 /* MailListDetailVC.h */,
@@ -8547,6 +8552,7 @@
 				C7AB8435235EA93B00F2363F /* SWQRCodeManager.m in Sources */,
 				EB8E2D7A239666A900CDFBDA /* EMMsgAudioBubbleView.m in Sources */,
 				C6F2E1DD236D126B009E6903 /* UIButton+XTExtension.m in Sources */,
+				EB0BDF4D244D49F1009F6434 /* MailListSortVC.m in Sources */,
 				C69A8DF7237446670098FA26 /* ChatInfoUserCollectionCell.m in Sources */,
 				C7D6BCB0235DA1CE00770E7C /* SettingModel.m in Sources */,
 				C59D0C0123825DE1007D0760 /* YYImageCache.m in Sources */,

smartRhino.xcodeproj/xcshareddata/xcschemes/smartRhino.xcscheme

@@ -15,7 +15,7 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "C7D6B9C6235D7D7200770E7C"
-               BuildableName = "&#x7075;&#x7280;&#x529e;&#x516c;.app"
+               BuildableName = "&#x6cf0;&#x5fb7;&#x4fe1;&#x6e90;.app"
                BlueprintName = "smartRhino"
                ReferencedContainer = "container:smartRhino.xcodeproj">
             </BuildableReference>
@@ -47,7 +47,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "C7D6B9C6235D7D7200770E7C"
-            BuildableName = "&#x7075;&#x7280;&#x529e;&#x516c;.app"
+            BuildableName = "&#x6cf0;&#x5fb7;&#x4fe1;&#x6e90;.app"
             BlueprintName = "smartRhino"
             ReferencedContainer = "container:smartRhino.xcodeproj">
          </BuildableReference>
@@ -71,7 +71,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "C7D6B9C6235D7D7200770E7C"
-            BuildableName = "&#x7075;&#x7280;&#x529e;&#x516c;.app"
+            BuildableName = "&#x6cf0;&#x5fb7;&#x4fe1;&#x6e90;.app"
             BlueprintName = "smartRhino"
             ReferencedContainer = "container:smartRhino.xcodeproj">
          </BuildableReference>

smartRhino/AppConfig.h

@@ -130,11 +130,11 @@ return;\
 // 是否为空对象
 #define MHObjectIsNil(__object)  ((nil == __object) || [__object isKindOfClass:[NSNull class]])
 //url
-#define BaseUrl @"http://111.12.8.69:83"///广西
-#define HtmlUrl @"http://111.12.8.69:82"
+//#define BaseUrl @"http://111.12.8.69:83"///广西
+//#define HtmlUrl @"http://111.12.8.69:82"
 
-//#define BaseUrl @"http://apk.tederen.com"
-//#define HtmlUrl @"http://apk.tederen.com/admin"
+#define BaseUrl @"http://apk.tederen.com"
+#define HtmlUrl @"http://apk.tederen.com/admin"
 #define MyChannelUrl @"/api/v1/channels/1"
 #define ContentUrl @"/api/v1/contents/1"
 #define MainSearchUrl @"/api/v1/contents/1325"
@@ -234,6 +234,9 @@ return;\
 #define AddressBookGroupUser_Add_Post @"/api/app/address-book-group-user/add"  // addressBookGroupId
 /// 添加 自建分组成员  移动
 #define AddressBookGroupUser_Move_Post @"/api/app/address-book-group-user/move"
+/// 添加 自建分组成员  排序
+#define AddressBookGroupUser_Sort @"/api/app/address-book-group/sort"
+
 
 /// 添加 自建分组成员  群加
 #define AddressBookGroupUser_GroupAdd_Post @"/api/app/address-book-group/add-address-book-user"

smartRhino/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -3,49 +3,49 @@
     {
       "size" : "20x20",
       "idiom" : "iphone",
-      "filename" : "logo20@2x.png",
+      "filename" : "logo_40.png",
       "scale" : "2x"
     },
     {
       "size" : "20x20",
       "idiom" : "iphone",
-      "filename" : "logo20@3x.png",
+      "filename" : "logo_60.png",
       "scale" : "3x"
     },
     {
       "size" : "29x29",
       "idiom" : "iphone",
-      "filename" : "logo29@2x.png",
+      "filename" : "logo_58.png",
       "scale" : "2x"
     },
     {
       "size" : "29x29",
       "idiom" : "iphone",
-      "filename" : "logo29@3x.png",
+      "filename" : "logo_87.png",
       "scale" : "3x"
     },
     {
       "size" : "40x40",
       "idiom" : "iphone",
-      "filename" : "logo40@2x.png",
+      "filename" : "logo_80.png",
       "scale" : "2x"
     },
     {
       "size" : "40x40",
       "idiom" : "iphone",
-      "filename" : "logo40@3x.png",
+      "filename" : "logo_120.png",
       "scale" : "3x"
     },
     {
       "size" : "60x60",
       "idiom" : "iphone",
-      "filename" : "logo120-120.png",
+      "filename" : "logo_120-1.png",
       "scale" : "2x"
     },
     {
       "size" : "60x60",
       "idiom" : "iphone",
-      "filename" : "logo180-180.png",
+      "filename" : "logo_180.png",
       "scale" : "3x"
     },
     {
@@ -96,7 +96,7 @@
     {
       "size" : "1024x1024",
       "idiom" : "ios-marketing",
-      "filename" : "LOGO-1024-1024.png",
+      "filename" : "1024-1024.png",
       "scale" : "1x"
     },
     {

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

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

smartRhino/Info.plist

@@ -49,7 +49,7 @@
 			<key>CFBundleTypeRole</key>
 			<string>Editor</string>
 			<key>CFBundleURLName</key>
-			<string></string>
+			<string>tdqq</string>
 			<key>CFBundleURLSchemes</key>
 			<array>
 				<string>tencent1110276123</string>

smartRhino/PhbAppConfig.h

@@ -21,12 +21,16 @@
 #define UIColorHex(_hex_)   [UIColor hexStringToColor:((__bridge NSString *)CFSTR(#_hex_))]
 #endif
 ///广西环信账号
-#define kHuanXinAppKey  @"1104200313107569#gxcbcm"  //环信appkey
+//#define kHuanXinAppKey  @"1104200313107569#gxcbcm"  //环信appkey
 
-    //#define kHuanXinAppKey  @"1126191023010818#smartrhino-tederen123"  //环信appkey
+#define kHuanXinAppKey  @"1126191023010818#smartrhino-tederen123"  //环信appkey
 
 #define kHuanXinApnsName  @"smartRhino_tederen"  //环信推送证书名称
 
+///微信广西
+#define wxAppKey     @"wxbc44299578fee300"
+#define wxAppSecret  @"17dcdb2fffc15728cb392485a5fc41ea"
+
 ///友盟Key
 #define UMengAppKey  @"5e7426ef570df3d20e00019e"
 
@@ -34,10 +38,6 @@
 #define QQAppKey     @"1110276123"
 #define QQAppSecret  @"AfJ6aYxxWSsY1ilQ"
 
-///微信
-#define wxAppKey     @"wxbc44299578fee300"
-#define wxAppSecret  @"17dcdb2fffc15728cb392485a5fc41ea"
-
 ///微博
 #define WBAppKey     @"1039156716"
 #define WBAppSecret  @"51bf65ceb9fe47410204a71d5deec300"
@@ -45,7 +45,6 @@
 #define WeiChatSuccess  @"WeiChatSuccess"
 
 #import "JSONModelLib.h"
-
 #import "UIColor+HexCustomer.h"
 #import "NSDictionary+NilSafe.h"
 #import "NSArray+NilSafe.h"

smartRhino/Project/Tools/H5ViewController.m

@@ -200,19 +200,19 @@
     AddLookUpUserSecondVC *vc = [[AddLookUpUserSecondVC alloc] init];
     vc.isAllSelected = YES;
     Department *defaltGroupSetion = [[Department alloc]init];
-    defaltGroupSetion.Name  = @"默认分组";
+    defaltGroupSetion.Name  = @"单位通讯录";
     defaltGroupSetion.Id = 0;
     defaltGroupSetion.SourceId = 0;
     defaltGroupSetion.SourceType = 1;
-    defaltGroupSetion.SourceName = @"默认分组";
+    defaltGroupSetion.SourceName = @"单位通讯录";
     defaltGroupSetion.MiddleType = type;
     Department *myGroupSetion = [[Department alloc]init];
-    myGroupSetion.Name  = @"我的分组";
+    myGroupSetion.Name  = @"自建通讯录";
     myGroupSetion.Id = 0;
     myGroupSetion.MiddleType = type;
     myGroupSetion.SourceType = 3;
     myGroupSetion.SourceId = 0;
-    myGroupSetion.SourceName = @"我的分组";
+    myGroupSetion.SourceName = @"自建通讯录";
     vc.departSourceDataArray = @[defaltGroupSetion,myGroupSetion].mutableCopy;
     vc.isDefalutPage = 1;
     vc.titleStr = @"选人";

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

@@ -744,11 +744,11 @@
                [self.navigationController pushViewController:vc animated:YES];
            }else if (indexPath.item == (self.collectionDataSource.count -2)){
                Department *defaltGroupSetion = [[Department alloc]init];
-               defaltGroupSetion.Name  = @"默认分组";
+               defaltGroupSetion.Name  = @"单位通讯录";
                defaltGroupSetion.Id = 0;
                
                Department *myGroupSetion = [[Department alloc]init];
-               myGroupSetion.Name  = @"我的分组";
+               myGroupSetion.Name  = @"自建通讯录";
                defaltGroupSetion.Id = 0;
                
                NSMutableArray * array = [NSMutableArray array];
@@ -781,11 +781,11 @@
     }else{
         if (indexPath.item == (self.collectionDataSource.count -1)) {//添加群成员
                Department *defaltGroupSetion = [[Department alloc]init];
-               defaltGroupSetion.Name  = @"默认分组";
+               defaltGroupSetion.Name  = @"单位通讯录";
                defaltGroupSetion.Id = 0;
                
                Department *myGroupSetion = [[Department alloc]init];
-               myGroupSetion.Name  = @"我的分组";
+               myGroupSetion.Name  = @"自建通讯录";
                defaltGroupSetion.Id = 0;
                
                NSMutableArray * array = [NSMutableArray array];

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

@@ -194,11 +194,11 @@
                 [self.navigationController pushViewController:vc animated:YES];
             }else if (indexPath.item == (self.collectionDataSource.count -2)){
                 Department *defaltGroupSetion = [[Department alloc]init];
-                defaltGroupSetion.Name  = @"默认分组";
+                defaltGroupSetion.Name  = @"单位通讯录";
                 defaltGroupSetion.Id = 0;
                 
                 Department *myGroupSetion = [[Department alloc]init];
-                myGroupSetion.Name  = @"我的分组";
+                myGroupSetion.Name  = @"自建通讯录";
                 defaltGroupSetion.Id = 0;
                 
                 NSMutableArray * array = [NSMutableArray array];
@@ -231,11 +231,11 @@
         }else{
             if (indexPath.item == (self.collectionDataSource.count -1)) {//添加群成员
                 Department *defaltGroupSetion = [[Department alloc]init];
-                defaltGroupSetion.Name  = @"默认分组";
+                defaltGroupSetion.Name  = @"单位通讯录";
                 defaltGroupSetion.Id = 0;
                 
                 Department *myGroupSetion = [[Department alloc]init];
-                myGroupSetion.Name  = @"我的分组";
+                myGroupSetion.Name  = @"自建通讯录";
                 defaltGroupSetion.Id = 0;
                 
                 NSMutableArray * array = [NSMutableArray array];

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

@@ -252,121 +252,81 @@ static int kConversation_AtAll = 2;
 
 -(void)initCollectionData{
     [self.collectionDataSource removeAllObjects];
-    for (int i = 0;i < 4; i++) {
-        MoreAppInfoModel *model = [[MoreAppInfoModel alloc] init];
-        switch (i) {
-            case 0:{
-                model.title = @"通知";
-                model.imgName = @"chatmsg_tz_icon";
-                model.notImgName = @"chatmsg_tz_hui_icon";
-                model.type = ChatMenuNoticeType;
-                model.readNum = 0;
-                model.showEditFlag = NO;
-            }break;
-            case 1:{
-                model.title = @"站内信";
-                model.imgName = @"chatmsg_znx_icon";
-                model.notImgName = @"chatmsg_tz_hui_icon";
-                model.type = ChatMenuZhanXinType;
-                model.readNum = 0;
-                model.showEditFlag = YES;
-            }break;
-            case 2:{
-                model.title = @"话题";
-                model.imgName = @"chatmsg_ht_icon";
-                model.notImgName = @"chatmsg_tz_hui_icon";
-                model.type = ChatMenutopicType;
-                model.readNum = 0;
-                model.showEditFlag = YES;
-            }break;
-            case 3:{
-                model.title = @"通讯录";
-                model.imgName = @"chatmsg_txl_icon";
-                model.notImgName = @"chatmsg_tz_hui_icon";
-                model.type = ChatMenuTeleListType;
-                model.readNum = 0;
-                model.showEditFlag = YES;
-            }break;
-            default:
-                break;
+    id chatMenuDict = [[NSUserDefaults standardUserDefaults] objectForKey:CHATMENUBAR];
+    NSMutableArray * commonArray = [NSMutableArray array];
+    NSMutableArray * moreArray = [NSMutableArray array];
+    NSMutableArray * array = [NSMutableArray array];
+    if (![chatMenuDict isKindOfClass:[NSDictionary class]]) {
+        for (int i= 0;i < 5; i++) {
+                MoreAppInfoModel *model = [[MoreAppInfoModel alloc] init];
+                switch (i) {
+                    case 0:{
+                        model.title = @"通知";
+                        model.imgName = @"chatmsg_tz_icon";
+                        model.notImgName = @"chatmsg_tz_hui_icon";
+                        model.type = ChatMenuNoticeType;
+                        model.readNum = 0;
+                        model.showEditFlag = NO;
+                    }break;
+                    case 1:{
+                        model.title = @"站内信";
+                        model.imgName = @"chatmsg_znx_icon";
+                        model.notImgName = @"chatmsg_tz_hui_icon";
+                        model.type = ChatMenuZhanXinType;
+                        model.readNum = 0;
+                        model.showEditFlag = YES;
+                    }break;
+                    case 2:{
+                        model.title = @"通讯录";
+                        model.imgName = @"chatmsg_txl_icon";
+                        model.notImgName = @"chatmsg_tz_hui_icon";
+                        model.type = ChatMenuTeleListType;
+                        model.readNum = 0;
+                        model.showEditFlag = YES;
+                    }break;
+                    case 3:{
+                        model.title = @"小组";
+                        model.imgName = @"chatmsg_xiaozu_icon";
+                        model.notImgName = @"chatmsg_tz_hui_icon";
+                        model.type = ChatMenuGroupType;
+                        model.readNum = 0;
+                        model.showEditFlag = YES;
+                    }break;
+                    case 4:{
+                        model.title = @"话题";
+                        model.imgName = @"chatmsg_ht_icon";
+                        model.notImgName = @"chatmsg_tz_hui_icon";
+                        model.type = ChatMenutopicType;
+                        model.readNum = 0;
+                        model.showEditFlag = YES;
+                    }break;
+                    default:
+                        break;
+                }
+                [array addObject:model];
+                NSDictionary *json = [model modelToJSONObject];
+                [commonArray addObject:json];
+            }
+        for (NSInteger j = 0; j < 1; j ++) {
+            MoreAppInfoModel *model = [[MoreAppInfoModel alloc] init];
+            model.title = @"待办事项";
+            model.imgName = @"chatmsg_dbsx_icon";
+            model.notImgName = @"chatmsg_tz_hui_icon";
+            model.type = ChatMenuWaitType;
+            model.readNum = 0;
+            model.showEditFlag = YES;
+            [moreArray addObject:[model modelToJSONObject]];
+        }
+        self.collectionDataSource = array;
+        [[NSUserDefaults standardUserDefaults] setObject:@{@"common":[NSArray arrayWithArray:commonArray],@"more":[NSArray arrayWithArray:moreArray]} forKey:CHATMENUBAR];
+        [[NSUserDefaults standardUserDefaults] synchronize];
+    }else{
+        NSArray * array = [chatMenuDict objectForKey:@"common"];
+        for (NSDictionary * dict in array) {
+            MoreAppInfoModel *model = [MoreAppInfoModel modelWithDictionary:dict];
+            [self.collectionDataSource addObject:model];
         }
-        [self.collectionDataSource addObject:model];
     }
-//    id chatMenuDict = [[NSUserDefaults standardUserDefaults] objectForKey:CHATMENUBAR];
-//    NSMutableArray * commonArray = [NSMutableArray array];
-//    NSMutableArray * moreArray = [NSMutableArray array];
-//    NSMutableArray * array = [NSMutableArray array];
-//    if (![chatMenuDict isKindOfClass:[NSDictionary class]]) {
-//        for (int i=0;i < 5; i++) {
-//                MoreAppInfoModel *model = [[MoreAppInfoModel alloc] init];
-//                switch (i) {
-//                    case 0:{
-//                        model.title = @"通知";
-//                        model.imgName = @"chatmsg_tz_icon";
-//                        model.notImgName = @"chatmsg_tz_hui_icon";
-//                        model.type = ChatMenuNoticeType;
-//                        model.readNum = 0;
-//                        model.showEditFlag = NO;
-//                    }break;
-//                    case 1:{
-//                        model.title = @"站内信";
-//                        model.imgName = @"chatmsg_znx_icon";
-//                        model.notImgName = @"chatmsg_tz_hui_icon";
-//                        model.type = ChatMenuZhanXinType;
-//                        model.readNum = 0;
-//                        model.showEditFlag = YES;
-//                    }break;
-//                    case 2:{
-//                        model.title = @"通讯录";
-//                        model.imgName = @"chatmsg_txl_icon";
-//                        model.notImgName = @"chatmsg_tz_hui_icon";
-//                        model.type = ChatMenuTeleListType;
-//                        model.readNum = 0;
-//                        model.showEditFlag = YES;
-//                    }break;
-//                    case 3:{
-//                        model.title = @"小组";
-//                        model.imgName = @"chatmsg_xiaozu_icon";
-//                        model.notImgName = @"chatmsg_tz_hui_icon";
-//                        model.type = ChatMenuGroupType;
-//                        model.readNum = 0;
-//                        model.showEditFlag = YES;
-//                    }break;
-//                    case 4:{
-//                        model.title = @"话题";
-//                        model.imgName = @"chatmsg_ht_icon";
-//                        model.notImgName = @"chatmsg_tz_hui_icon";
-//                        model.type = ChatMenutopicType;
-//                        model.readNum = 0;
-//                        model.showEditFlag = YES;
-//                    }break;
-//                    default:
-//                        break;
-//                }
-//                [array addObject:model];
-//                NSDictionary *json = [model modelToJSONObject];
-//                [commonArray addObject:json];
-//            }
-//        for (NSInteger j = 0; j < 1; j ++) {
-//            MoreAppInfoModel *model = [[MoreAppInfoModel alloc] init];
-//            model.title = @"待办事项";
-//            model.imgName = @"chatmsg_dbsx_icon";
-//            model.notImgName = @"chatmsg_tz_hui_icon";
-//            model.type = ChatMenuWaitType;
-//            model.readNum = 0;
-//            model.showEditFlag = YES;
-//            [moreArray addObject:[model modelToJSONObject]];
-//        }
-//        self.collectionDataSource = array;
-//        [[NSUserDefaults standardUserDefaults] setObject:@{@"common":[NSArray arrayWithArray:commonArray],@"more":[NSArray arrayWithArray:moreArray]} forKey:CHATMENUBAR];
-//        [[NSUserDefaults standardUserDefaults] synchronize];
-//    }else{
-//        NSArray * array = [chatMenuDict objectForKey:@"common"];
-//        for (NSDictionary * dict in array) {
-//            MoreAppInfoModel *model = [MoreAppInfoModel modelWithDictionary:dict];
-//            [self.collectionDataSource addObject:model];
-//        }
-//    }
 }
 
 
@@ -754,9 +714,9 @@ static int kConversation_AtAll = 2;
         case 1:{
             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.frame = CGRectMake(0, 0, SCREEN_WIDTH, cell.cell1ContentBgView.height);
 
-//            self.collectionView.frame = CGRectMake(0, 0, (SCREEN_WIDTH - 15 - 7), cell.cell1ContentBgView.height);
+            self.collectionView.frame = CGRectMake(0, 0, (SCREEN_WIDTH - 15 - 7), cell.cell1ContentBgView.height);
             [self.collectionView reloadData];
             if(self.operationStateEnum == OperationStateEnum0){
                 WS(weakSelf);
@@ -923,8 +883,8 @@ static int kConversation_AtAll = 2;
     }];
     dispatch_async(dispatch_get_main_queue(), ^{
         [weakSelf.tableView reloadData];
-        NSInteger count = (weakSelf.countUnredNum + weakSelf.noticeNum + weakSelf.missiveNum);
-//        NSInteger count = (weakSelf.countUnredNum + weakSelf.noticeNum + weakSelf.missiveNum + weakSelf.waitNum);
+//        NSInteger count = (weakSelf.countUnredNum + weakSelf.noticeNum + weakSelf.missiveNum);
+        NSInteger count = (weakSelf.countUnredNum + weakSelf.noticeNum + weakSelf.missiveNum + weakSelf.waitNum);
         weakSelf.tabBarController.tabBar.items[2].badgeValue = count > 0 ? [NSString stringWithFormat:@"%ld",(long)count] : nil;
     });
 }
@@ -1130,9 +1090,9 @@ static int kConversation_AtAll = 2;
 /****************************************************/
 - (CGSize)collectionView:(GHRefreshCollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath
 {
-    CGFloat width = SCREEN_WIDTH / 4;
+//    CGFloat width = SCREEN_WIDTH / 4;
 
-//    CGFloat width = (SCREEN_WIDTH - (15 + 7)) / 5;
+    CGFloat width = (SCREEN_WIDTH - (15 + 7)) / 5;
     CGFloat height = 90;
     return CGSizeMake(width, height);
 }

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

@@ -1029,19 +1029,19 @@
     AddLookUpUserSecondVC *vc = [[AddLookUpUserSecondVC alloc] init];
     vc.isAllSelected = YES;
     Department *defaltGroupSetion = [[Department alloc]init];
-    defaltGroupSetion.Name  = @"默认分组";
+    defaltGroupSetion.Name  = @"单位通讯录";
     defaltGroupSetion.Id = 0;
     defaltGroupSetion.SourceId = 0;
     defaltGroupSetion.SourceType = 1;
-    defaltGroupSetion.SourceName = @"默认分组";
+    defaltGroupSetion.SourceName = @"单位通讯录";
     defaltGroupSetion.MiddleType = type;
     Department *myGroupSetion = [[Department alloc]init];
-    myGroupSetion.Name  = @"我的分组";
+    myGroupSetion.Name  = @"自建通讯录";
     myGroupSetion.Id = 0;
     myGroupSetion.MiddleType = type;
     myGroupSetion.SourceType = 3;
     myGroupSetion.SourceId = 0;
-    myGroupSetion.SourceName = @"我的分组";
+    myGroupSetion.SourceName = @"自建通讯录";
     vc.departSourceDataArray = @[defaltGroupSetion,myGroupSetion].mutableCopy;
     vc.isDefalutPage = 1;
     vc.titleStr = @"选人";

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

@@ -121,11 +121,11 @@
 
 -(IBAction)userDidAddFriendeAction:(id)sender{
     Department *defaltGroupSetion = [[Department alloc]init];
-    defaltGroupSetion.Name  = @"默认分组";
+    defaltGroupSetion.Name  = @"单位通讯录";
     defaltGroupSetion.Id = 0;
     
     Department *myGroupSetion = [[Department alloc]init];
-    myGroupSetion.Name  = @"我的分组";
+    myGroupSetion.Name  = @"自建通讯录";
     defaltGroupSetion.Id = 0;
     
     AddLookUpUserSecondVC *vc = [[AddLookUpUserSecondVC alloc] init];

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

@@ -323,11 +323,11 @@
 }
 - (void)addCustomPeople{
     Department *defaltGroupSetion = [[Department alloc]init];
-    defaltGroupSetion.Name  = @"默认分组";
+    defaltGroupSetion.Name  = @"单位通讯录";
     defaltGroupSetion.Id = 0;
     
     Department *myGroupSetion = [[Department alloc]init];
-    myGroupSetion.Name  = @"我的分组";
+    myGroupSetion.Name  = @"自建通讯录";
     defaltGroupSetion.Id = 0;
     
     AddLookUpUserSecondVC *vc = [[AddLookUpUserSecondVC alloc] init];
@@ -659,7 +659,7 @@
                     if ([dataArray.firstObject boolValue]) {
                         MailListCell *cell = [MailListCell configCell0:tableView indexPath:indexPath];
                         cell.cell0TitleLabel.text = titleStr;
-                        cell.cell0ZiJianLabel.hidden = YES;
+//                        cell.cell0ZiJianLabel.hidden = YES;
                         return cell;
                     }else{
                         NSDictionary *dic = dataArray.lastObject;

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

@@ -58,7 +58,7 @@
     cell.clipsToBounds = YES;
     NSDictionary *dic = self.dataSourceArray[indexPath.row];
     cell.cell0TitleLabel.text = dic[@"GroupName"];
-    cell.cell0ZiJianLabel.hidden = NO;
+//    cell.cell0ZiJianLabel.hidden = NO;
     return cell;
 }
 

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

@@ -0,0 +1,19 @@
+//
+//  MailListSortVC.h
+//  smartRhino
+//
+//  Created by niuzhen on 2020/4/20.
+//  Copyright © 2020 tederen. All rights reserved.
+//
+
+#import "BaseViewController.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface MailListSortVC : BaseViewController
+@property (nonatomic, copy) NSMutableArray * dataArray;
+@property (nonatomic, copy) void(^sortBlock)(void);
++(MailListSortVC *)initMailListSortVC;
+@end
+
+NS_ASSUME_NONNULL_END

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

@@ -0,0 +1,104 @@
+//
+//  MailListSortVC.m
+//  smartRhino
+//
+//  Created by niuzhen on 2020/4/20.
+//  Copyright © 2020 tederen. All rights reserved.
+//
+
+#import "MailListSortVC.h"
+#import "MailListCell.h"
+
+@interface MailListSortVC ()<UITableViewDelegate,UITableViewDataSource>
+
+@property (nonatomic, strong) IBOutlet UIButton *allSelectButton;
+@property (weak, nonatomic) IBOutlet UILabel *pageTitleLabel;
+@property (nonatomic, strong) IBOutlet UITableView *myTableView;
+@property (weak, nonatomic) IBOutlet UIButton *sureBtn;
+@property (copy, nonatomic) NSMutableArray    *listArray;
+@end
+
+@implementation MailListSortVC
++(MailListSortVC *)initMailListSortVC{
+    MailListSortVC *controller = [StoryboardManager.shared.mailList instantiateViewControllerWithIdentifier:@"MailListSortVC"];
+    return controller;
+}
+- (NSMutableArray *)listArray
+{
+    if (!_listArray) {
+        _listArray = [NSMutableArray array];
+    }
+    return _listArray;
+}
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    self.fd_prefersNavigationBarHidden = YES;
+    self.myTableView.delegate = self;
+    self.myTableView.dataSource = self;
+    WS(weakSelf);
+    [self.sureBtn setAction:^{
+        [weakSelf.navigationController popViewControllerAnimated:YES];
+    }];
+    [self.listArray removeAllObjects];
+    for (id dict in self.dataArray) {
+        if ([dict isKindOfClass:[NSDictionary class]]) {
+            [self.listArray addObject:dict];
+        }
+    }
+    [self.myTableView reloadData];
+    [self.myTableView setEditing:YES];
+}
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
+{
+    return self.listArray.count;
+}
+- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath{
+    return [MailListCell configCell0Height];
+}
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath{
+    MailListCell *cell = [MailListCell configCell0:tableView indexPath:indexPath];
+    cell.clipsToBounds = YES;
+    NSDictionary *dic = self.listArray[indexPath.row];
+    cell.cell0TitleLabel.text = dic[@"GroupName"];
+    cell.rightView.image = IMG(@"list_sort");
+    cell.isSort = YES;
+    return cell;
+}
+- (UITableViewCellEditingStyle)tableView:(UITableView *)tableView editingStyleForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    return UITableViewCellEditingStyleNone;
+}
+- (BOOL)tableView:(UITableView *)tableView shouldIndentWhileEditingRowAtIndexPath:(NSIndexPath *)indexPath
+{ return NO;}
+- (BOOL)tableView:(UITableView *)tableView shouldShowMenuForRowAtIndexPath:(NSIndexPath *)indexPath
+{ return NO;}
+
+#pragma mark 排序 当移动了某一行时候会调用
+//编辑状态下。仅仅要实现这种方法，就能实现拖动排序
+-(void)tableView:(UITableView *)tableView moveRowAtIndexPath:(NSIndexPath *)sourceIndexPath toIndexPath:(NSIndexPath *)destinationIndexPath
+{
+    // 取出要拖动的模型数据
+    WS(weakSelf);
+    NSDictionary *dic = self.listArray[sourceIndexPath.row];
+    NSDictionary *deDic = self.listArray[destinationIndexPath.row];
+    NSLog(@"%@,%@",dic[@"Id"],deDic[@"Id"]);
+    if (sourceIndexPath != destinationIndexPath) {
+        [[HttpManager sharedHttpManager] POSTUrl:Host(AddressBookGroupUser_Sort) parameters:@{@"FristId":dic[@"Id"],@"LastId":deDic[@"Id"]} responseStyle:DATA success:^(id  _Nonnull responseObject) {
+            //删除之前行的数据
+            [weakSelf.listArray removeObject:dic];
+            // 插入数据到新的位置
+            [weakSelf.listArray insertObject:dic atIndex:destinationIndexPath.row];
+        } failure:^(NSError * _Nonnull error) {
+            
+        }];
+    }
+}
+- (void)viewWillDisappear:(BOOL)animated
+{
+    [super viewWillDisappear:animated];
+    if (self.sortBlock) {
+        self.sortBlock();
+    }
+}
+@end

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

@@ -12,6 +12,8 @@
 #import "ShowNewGroupAlert.h"
 #import "MyTDGroupView.h"
 #import "MailListSearchVC.h"
+#import "MailListSortVC.h"
+
 @interface MailListVC ()<UITableViewDelegate,UITableViewDataSource>
    
 @property (strong,nonatomic) IBOutlet UIButton *rightButton;
@@ -61,9 +63,23 @@
     [self.rightButton setAction:^{
         [[ShowNewGroupAlert initShowNewGroupAlertWithTitle:@"新建通讯录" placeholder:@"请输入通讯录名称" confirm:^(NSString * _Nonnull groupName) {
             SHOWLOADING
-            [[HttpManager sharedHttpManager] POSTUrl:[NSString stringWithFormat:@"%@%@",BaseUrl,AddressBookGroup_Add_Post] parameters:@{@"addressBookGroupName":groupName} responseStyle:DATA success:^(id  _Nonnull responseObject) {
+            [[HttpManager sharedHttpManager] POSTUrl:[NSString stringWithFormat:@"%@%@",BaseUrl,AddressBookGroup_Add_Post] parameters:@{@"addressBookGroupName":groupName} responseStyle:JOSN success:^(id  _Nonnull responseObject) {
                 REMOVESHOW
+                NSLog(@"%@",responseObject);
                 [weakSelf getData];
+                dispatch_async(dispatch_get_main_queue(), ^{
+                    MailListByZuVC *vc = [MailListByZuVC initMailListByZuVC];
+                    vc.notChangeSearchColor = weakSelf.notSearchChangeColor;
+                    vc.isSelectPeople = weakSelf.isSelectPeople;
+                    vc.isChat = weakSelf.isChat;
+                    vc.isShow = weakSelf.isShow;
+                    vc.isCheck = weakSelf.isCheck;
+                    vc.UserIds = weakSelf.UserIds;
+                    vc.titleStr = responseObject[@"GroupName"];
+                    vc.indexId = [responseObject[@"Id"] integerValue];
+                    vc.pageType = MailListByZuPageType_custom;
+                    [weakSelf.navigationController pushViewController:vc animated:YES];
+                });
             } failure:^(NSError * _Nonnull error) {
                 SHOWERROR([ZYCTool handerResultData:error]);
             }];
@@ -233,24 +249,43 @@
 }
 
 - (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section{
-    UIView *headerView = [[UIView alloc]init];
+    UIView *headerView = [[UIView alloc]initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, 30)];
     [headerView setBackgroundColor:UIColorHex(0xF5F6F8)];
-    
+    WS(weakSelf);
     if(section == 0 || section == 1){
         UILabel *sectionTitle = [[UILabel alloc] init];
         [headerView addSubview:sectionTitle];
-        sectionTitle.frame = CGRectMake(15, 0, 200, 30);
+        [sectionTitle mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.left.mas_offset(15);
+            make.centerY.mas_equalTo(headerView);
+        }];
         sectionTitle.font = [UIFont systemFontOfSize:12];
         sectionTitle.textColor = RGB(153, 153, 153);
         sectionTitle.textAlignment = NSTextAlignmentLeft;
         if(section == 0){
-            sectionTitle.text = @"默认分组";
+            sectionTitle.text = @"单位通讯录";
         }
         else if (section == 1){
-            sectionTitle.text = @"我的分组";
+            UIImageView * imagV = [UIImageView new];
+            imagV.image = IMG(@"create_mlist");
+            UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithActionBlock:^(id  _Nonnull sender) {
+                MailListSortVC * vc = [MailListSortVC initMailListSortVC];
+                vc.dataArray = [NSMutableArray arrayWithArray:weakSelf.dataSourceArray[section]];
+                vc.sortBlock = ^{
+                    [weakSelf getData];
+                };
+                [weakSelf.navigationController pushViewController:vc animated:YES];
+            }];
+            [headerView addGestureRecognizer:tap];
+            headerView.userInteractionEnabled = YES;
+            [headerView addSubview:imagV];
+            [imagV mas_makeConstraints:^(MASConstraintMaker *make) {
+                make.left.mas_equalTo(sectionTitle.mas_right).offset(8);
+                make.centerY.mas_equalTo(headerView);
+            }];
+            sectionTitle.text = @"自建通讯录";
         }
     }
-    
     return headerView;
 }
  
@@ -262,7 +297,6 @@
     return 0;
 }
 
-
 - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath{
     return [MailListCell configCell0Height];
 }
@@ -274,12 +308,12 @@
          case 0:{
             NSDictionary *dic = self.dataSourceArray[indexPath.section][indexPath.row];
              cell.cell0TitleLabel.text = dic[@"Name"];
-             cell.cell0ZiJianLabel.hidden = YES;
+//             cell.cell0ZiJianLabel.hidden = YES;
          }break;
          default:{
              NSDictionary *dic = self.dataSourceArray[indexPath.section][indexPath.row];
              cell.cell0TitleLabel.text = dic[@"GroupName"];
-             cell.cell0ZiJianLabel.hidden = NO;
+//             cell.cell0ZiJianLabel.hidden = NO;
          }break;
      }
      return cell;

smartRhino/Project/VCModel/ChatMessage/Controller/MailList/MailList.storyboard

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="dSM-TJ-aDT">
+<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="dSM-TJ-aDT">
     <device id="retina5_5" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -527,6 +527,151 @@
             </objects>
             <point key="canvasLocation" x="-533.33333333333337" y="2245.9239130434785"/>
         </scene>
+        <!--Mail List SortVC-->
+        <scene sceneID="FQ1-g5-NaD">
+            <objects>
+                <viewController storyboardIdentifier="MailListSortVC" id="8dk-jQ-YDX" customClass="MailListSortVC" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="anB-zG-UwO">
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="MgQ-pv-t8V" customClass="WQNavigationBar">
+                                <rect key="frame" x="0.0" y="0.0" width="414" height="64"/>
+                                <subviews>
+                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="PhE-nj-CyJ">
+                                        <rect key="frame" x="0.0" y="20" width="414" height="44"/>
+                                        <subviews>
+                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="MAe-kh-w2v">
+                                                <rect key="frame" x="0.0" y="0.0" width="44" height="44"/>
+                                                <constraints>
+                                                    <constraint firstAttribute="width" constant="44" id="Gyo-HC-RFg"/>
+                                                    <constraint firstAttribute="height" constant="44" id="z6q-UF-zlP"/>
+                                                </constraints>
+                                                <state key="normal" image="back_black_icon"/>
+                                                <connections>
+                                                    <action selector="backAction:" destination="8dk-jQ-YDX" eventType="touchUpInside" id="YmC-PE-bsP"/>
+                                                </connections>
+                                            </button>
+                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="rC4-1z-L2x">
+                                                <rect key="frame" x="46" y="0.0" width="44" height="44"/>
+                                                <constraints>
+                                                    <constraint firstAttribute="height" constant="44" id="Umv-vL-5Fy"/>
+                                                    <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="44" id="cfZ-bo-cgc"/>
+                                                </constraints>
+                                                <state key="normal" image="menu_black_icon">
+                                                    <color key="titleColor" red="0.058823529409999999" green="0.49803921569999998" blue="0.85098039219999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                </state>
+                                                <connections>
+                                                    <action selector="menuAction:" destination="8dk-jQ-YDX" eventType="touchUpInside" id="NRC-Jz-RXS"/>
+                                                </connections>
+                                            </button>
+                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="自建通讯录" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="v6n-ej-FIw">
+                                                <rect key="frame" x="132.33333333333331" y="11.666666666666668" width="149.33333333333331" height="21.000000000000004"/>
+                                                <fontDescription key="fontDescription" type="system" pointSize="18"/>
+                                                <color key="textColor" red="0.039215686270000001" green="0.039215686270000001" blue="0.039215686270000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                <nil key="highlightedColor"/>
+                                            </label>
+                                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="a9T-bR-2w5">
+                                                <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="xGD-AA-4az"/>
+                                                </constraints>
+                                            </view>
+                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ppj-HJ-W4B">
+                                                <rect key="frame" x="354" y="0.0" width="50" height="43.666666666666664"/>
+                                                <constraints>
+                                                    <constraint firstAttribute="width" constant="50" id="aaH-xj-FqY"/>
+                                                </constraints>
+                                                <state key="normal" title="完成">
+                                                    <color key="titleColor" red="0.1215686275" green="0.52941176469999995" blue="0.85882352939999995" alpha="1" colorSpace="calibratedRGB"/>
+                                                </state>
+                                            </button>
+                                        </subviews>
+                                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                        <constraints>
+                                            <constraint firstAttribute="bottom" secondItem="MAe-kh-w2v" secondAttribute="bottom" id="1SM-Fb-xKb"/>
+                                            <constraint firstItem="rC4-1z-L2x" firstAttribute="centerY" secondItem="MAe-kh-w2v" secondAttribute="centerY" id="8rM-BY-c7W"/>
+                                            <constraint firstAttribute="trailing" secondItem="ppj-HJ-W4B" secondAttribute="trailing" constant="10" id="CJF-Mf-I6Y"/>
+                                            <constraint firstAttribute="height" constant="44" id="GZf-gN-zr1"/>
+                                            <constraint firstItem="a9T-bR-2w5" firstAttribute="top" secondItem="ppj-HJ-W4B" secondAttribute="bottom" id="Jgp-xX-2Zm"/>
+                                            <constraint firstItem="v6n-ej-FIw" firstAttribute="centerY" secondItem="rC4-1z-L2x" secondAttribute="centerY" id="K5r-xe-Pv8"/>
+                                            <constraint firstItem="v6n-ej-FIw" firstAttribute="centerX" secondItem="PhE-nj-CyJ" secondAttribute="centerX" id="Uqf-Cp-wRf"/>
+                                            <constraint firstItem="MAe-kh-w2v" firstAttribute="leading" secondItem="PhE-nj-CyJ" secondAttribute="leading" id="Xsp-O8-e4h"/>
+                                            <constraint firstItem="ppj-HJ-W4B" firstAttribute="top" secondItem="PhE-nj-CyJ" secondAttribute="top" id="Yz5-zx-wel"/>
+                                            <constraint firstAttribute="trailing" secondItem="a9T-bR-2w5" secondAttribute="trailing" id="ei1-hA-7MW"/>
+                                            <constraint firstItem="a9T-bR-2w5" firstAttribute="leading" secondItem="PhE-nj-CyJ" secondAttribute="leading" id="gvg-6Q-pKK"/>
+                                            <constraint firstItem="rC4-1z-L2x" firstAttribute="leading" secondItem="MAe-kh-w2v" secondAttribute="trailing" constant="2" id="hQ1-zB-1Mk"/>
+                                            <constraint firstAttribute="bottom" secondItem="a9T-bR-2w5" secondAttribute="bottom" id="ofO-mX-VaG"/>
+                                            <constraint firstItem="v6n-ej-FIw" firstAttribute="width" secondItem="PhE-nj-CyJ" secondAttribute="width" multiplier="0.36" id="tJv-EP-Krw"/>
+                                        </constraints>
+                                    </view>
+                                </subviews>
+                                <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="64" id="Fpv-Hn-8K1"/>
+                                    <constraint firstAttribute="bottom" secondItem="PhE-nj-CyJ" secondAttribute="bottom" id="IUu-77-qAT"/>
+                                    <constraint firstItem="PhE-nj-CyJ" firstAttribute="leading" secondItem="MgQ-pv-t8V" secondAttribute="leading" id="wDm-g6-Ylt"/>
+                                    <constraint firstItem="PhE-nj-CyJ" firstAttribute="trailing" secondItem="MgQ-pv-t8V" secondAttribute="trailing" id="xd8-WY-ZfX"/>
+                                </constraints>
+                                <viewLayoutGuide key="safeArea" id="NDN-fa-Xkj"/>
+                                <connections>
+                                    <outlet property="height" destination="Fpv-Hn-8K1" id="BxF-XW-YJm"/>
+                                </connections>
+                            </view>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="EAG-pb-0lX">
+                                <rect key="frame" x="0.0" y="64" width="414" height="35"/>
+                                <subviews>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="长按右侧三横，拖动可以进行排序" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="H0b-TE-e67">
+                                        <rect key="frame" x="107.66666666666669" y="9.6666666666666714" width="199" height="16"/>
+                                        <fontDescription key="fontDescription" type="system" pointSize="13"/>
+                                        <color key="textColor" red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="calibratedRGB"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
+                                </subviews>
+                                <color key="backgroundColor" red="0.94117647059999998" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="calibratedRGB"/>
+                                <constraints>
+                                    <constraint firstItem="H0b-TE-e67" firstAttribute="centerX" secondItem="EAG-pb-0lX" secondAttribute="centerX" id="N49-lB-SeQ"/>
+                                    <constraint firstAttribute="height" constant="35" id="kf1-Yq-EsJ"/>
+                                    <constraint firstItem="H0b-TE-e67" firstAttribute="centerY" secondItem="EAG-pb-0lX" secondAttribute="centerY" id="qur-3B-6Yt"/>
+                                </constraints>
+                            </view>
+                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="4uB-Lq-UIM">
+                                <rect key="frame" x="0.0" y="99" width="414" height="637"/>
+                                <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                                <connections>
+                                    <outlet property="dataSource" destination="8dk-jQ-YDX" id="hwm-Gx-rVy"/>
+                                    <outlet property="delegate" destination="8dk-jQ-YDX" id="a16-vl-OaT"/>
+                                </connections>
+                            </tableView>
+                        </subviews>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                        <constraints>
+                            <constraint firstItem="eH1-BK-oeg" firstAttribute="trailing" secondItem="EAG-pb-0lX" secondAttribute="trailing" id="14u-8f-RMo"/>
+                            <constraint firstItem="eH1-BK-oeg" firstAttribute="trailing" secondItem="4uB-Lq-UIM" secondAttribute="trailing" id="2de-af-Mfg"/>
+                            <constraint firstItem="MgQ-pv-t8V" firstAttribute="top" secondItem="anB-zG-UwO" secondAttribute="top" id="576-ym-beP"/>
+                            <constraint firstItem="4uB-Lq-UIM" firstAttribute="top" secondItem="EAG-pb-0lX" secondAttribute="bottom" id="J1b-Th-j2Z"/>
+                            <constraint firstItem="EAG-pb-0lX" firstAttribute="leading" secondItem="eH1-BK-oeg" secondAttribute="leading" id="dgg-7d-Gie"/>
+                            <constraint firstItem="EAG-pb-0lX" firstAttribute="top" secondItem="MgQ-pv-t8V" secondAttribute="bottom" id="hNT-gG-dKh"/>
+                            <constraint firstItem="MgQ-pv-t8V" firstAttribute="trailing" secondItem="eH1-BK-oeg" secondAttribute="trailing" id="mfh-Ah-3H5"/>
+                            <constraint firstItem="4uB-Lq-UIM" firstAttribute="leading" secondItem="eH1-BK-oeg" secondAttribute="leading" id="rmI-JO-bI8"/>
+                            <constraint firstItem="MgQ-pv-t8V" firstAttribute="leading" secondItem="eH1-BK-oeg" secondAttribute="leading" id="rtH-Jr-eGH"/>
+                            <constraint firstItem="eH1-BK-oeg" firstAttribute="bottom" secondItem="4uB-Lq-UIM" secondAttribute="bottom" id="xMh-r4-VPQ"/>
+                        </constraints>
+                        <viewLayoutGuide key="safeArea" id="eH1-BK-oeg"/>
+                    </view>
+                    <navigationItem key="navigationItem" id="UgG-6u-sIG"/>
+                    <connections>
+                        <outlet property="allSelectButton" destination="rC4-1z-L2x" id="h51-oF-VuH"/>
+                        <outlet property="myTableView" destination="4uB-Lq-UIM" id="Rwo-V5-inI"/>
+                        <outlet property="pageTitleLabel" destination="v6n-ej-FIw" id="Dsd-n1-Uut"/>
+                        <outlet property="sureBtn" destination="ppj-HJ-W4B" id="eLE-T1-byt"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="8FW-3W-EO9" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="-86.956521739130437" y="823.36956521739137"/>
+        </scene>
     </scenes>
     <resources>
         <image name="back_black_icon" width="11" height="20"/>

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

@@ -13,13 +13,13 @@ NS_ASSUME_NONNULL_BEGIN
 @interface MailListCell : UITableViewCell
 
 @property (strong,nonatomic) IBOutlet UILabel *cell0TitleLabel;
-@property (strong,nonatomic) IBOutlet UILabel *cell0ZiJianLabel;
+@property (weak, nonatomic) IBOutlet UIImageView *rightView;
 
 @property (weak, nonatomic) IBOutlet UIView *editorVIew;
 
 @property (strong,nonatomic) IBOutlet UIView *cell1SearchBgView;
 @property (weak,nonatomic) IBOutlet UIButton *cell1SearchButton;
-
+@property (assign,nonatomic) BOOL             isSort;
 + (CGFloat)configCell0Height;
 + (CGFloat)configCell1Height;
 

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

@@ -35,10 +35,11 @@
         cell = [[[NSBundle mainBundle] loadNibNamed:@"MailListCell" owner:nil options:nil] objectAtIndex:0];
     }
     cell.selectionStyle = UITableViewCellSelectionStyleNone;
-    cell.cell0ZiJianLabel.hidden = YES;
+//    cell.cell0ZiJianLabel.hidden = YES;
+//    
+//    [cell.cell0ZiJianLabel setRadius:2 corners:UIRectCornerAllCorners];
+//    cell.cell0ZiJianLabel.backgroundColor = RGB(57, 121, 211);
     
-    [cell.cell0ZiJianLabel setRadius:2 corners:UIRectCornerAllCorners];
-    cell.cell0ZiJianLabel.backgroundColor = RGB(57, 121, 211);
     return cell;
 }
 
@@ -51,4 +52,34 @@
     cell.selectionStyle = UITableViewCellSelectionStyleNone;
     return cell;
 }
+- (void)layoutSubviews
+{
+    [super layoutSubviews];
+    if (self.isSort) {
+        self.rightView.hidden = YES;
+        for (UIView *supView in self.subviews){
+            if ([supView isKindOfClass:NSClassFromString(@"UITableViewCellReorderControl")]){
+                for (UIView *view in supView.subviews)
+                {
+                    if ([view isKindOfClass: [UIImageView class]])
+                    {
+                        UIImageView * imagV = (UIImageView *)view;
+                        [imagV setFrame:CGRectMake(0, 0, 22, 18)];
+                        imagV.center = supView.center;
+                        imagV.contentMode = UIViewContentModeCenter;
+                        imagV.image = [UIImage imageNamed: @"list_sort"];
+                        UILabel * label = [UILabel new];
+                        label.backgroundColor = UIColorHex(#EAEAEA);
+                        [supView addSubview:label];
+                        [label setFrame:CGRectMake(0, supView.frame.size.height - 0.5, supView.frame.size.width, 0.5)];
+                    }else{
+                        [view removeFromSuperview];
+                    }
+                }
+            }
+        }
+    }else{
+        self.rightView.hidden = NO;
+    }
+}
 @end

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

@@ -23,17 +23,6 @@
                         <color key="textColor" red="0.039215686270000001" green="0.039215686270000001" blue="0.039215686270000001" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
-                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="自建" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="frr-y0-SeA">
-                        <rect key="frame" x="69.5" y="15" width="42" height="20"/>
-                        <color key="backgroundColor" red="0.058823529409999999" green="0.49803921569999998" blue="0.85098039219999999" alpha="1" colorSpace="calibratedRGB"/>
-                        <constraints>
-                            <constraint firstAttribute="height" constant="20" id="Bjs-gw-KVB"/>
-                            <constraint firstAttribute="width" constant="42" id="OlR-gG-Q16"/>
-                        </constraints>
-                        <fontDescription key="fontDescription" type="system" pointSize="11"/>
-                        <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                        <nil key="highlightedColor"/>
-                    </label>
                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="my_conter_rightArrow_hui_icon" translatesAutoresizingMaskIntoConstraints="NO" id="EOM-XB-NQJ">
                         <rect key="frame" x="297.5" y="18" width="7.5" height="14"/>
                     </imageView>
@@ -46,13 +35,11 @@
                     </view>
                 </subviews>
                 <constraints>
-                    <constraint firstItem="frr-y0-SeA" firstAttribute="leading" secondItem="NI3-gy-CTW" secondAttribute="trailing" constant="15" id="2SA-9n-SSk"/>
                     <constraint firstAttribute="trailing" secondItem="EOM-XB-NQJ" secondAttribute="trailing" constant="15" id="FBI-GY-cYY"/>
                     <constraint firstItem="NI3-gy-CTW" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" id="HLv-Hc-xwo"/>
                     <constraint firstAttribute="bottom" secondItem="UGY-TQ-5ZY" secondAttribute="bottom" id="Hnb-e2-xfJ"/>
                     <constraint firstItem="NI3-gy-CTW" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="KOa-Fc-vnF"/>
                     <constraint firstAttribute="trailing" secondItem="UGY-TQ-5ZY" secondAttribute="trailing" id="MuN-Nr-Mmx"/>
-                    <constraint firstItem="frr-y0-SeA" firstAttribute="centerY" secondItem="NI3-gy-CTW" secondAttribute="centerY" id="YvQ-B0-6Eo"/>
                     <constraint firstItem="EOM-XB-NQJ" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" id="gCt-Kd-INB"/>
                     <constraint firstItem="UGY-TQ-5ZY" firstAttribute="leading" secondItem="NI3-gy-CTW" secondAttribute="leading" id="pfJ-uN-e9b"/>
                 </constraints>
@@ -60,8 +47,8 @@
             <viewLayoutGuide key="safeArea" id="aW0-zy-SZf"/>
             <connections>
                 <outlet property="cell0TitleLabel" destination="NI3-gy-CTW" id="SN0-VZ-e63"/>
-                <outlet property="cell0ZiJianLabel" destination="frr-y0-SeA" id="D2k-2t-W3O"/>
                 <outlet property="cell1SearchButton" destination="imM-dP-KU6" id="gIA-jC-zP1"/>
+                <outlet property="rightView" destination="EOM-XB-NQJ" id="cC3-8D-dCs"/>
             </connections>
             <point key="canvasLocation" x="131.8840579710145" y="132.58928571428572"/>
         </tableViewCell>

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

@@ -120,11 +120,11 @@
 -(IBAction)userDidAddFriendeAction:(id)sender{
     [self.view endEditing:YES];
     Department *defaltGroupSetion = [[Department alloc]init];
-    defaltGroupSetion.Name  = @"默认分组";
+    defaltGroupSetion.Name  = @"单位通讯录";
     defaltGroupSetion.Id = 0;
     
     Department *myGroupSetion = [[Department alloc]init];
-    myGroupSetion.Name  = @"我的分组";
+    myGroupSetion.Name  = @"自建通讯录";
     defaltGroupSetion.Id = 0;
     
     AddLookUpUserSecondVC *vc = [[AddLookUpUserSecondVC alloc] init];
@@ -175,6 +175,7 @@
         self.groupIntroduce = self.groupIntroTf.text;
     }
     WEAKSELF
+    self.rightSureBtn.enabled = NO;
     if (self.groupImage) {
         [self postGroupAvatar:self.groupImage withCompletion:^(BOOL success, NSString *imageUrl) {
             if (success) {
@@ -183,13 +184,13 @@
             }
         }];
     }else{
-        SHOWERROR(@"请上传小组头像")
+        SHOWERROR(@"请上传小组头像");
+        self.rightSureBtn.enabled = YES;
         return;
     }
 }
 
 - (void)postGroupMsg{
-    self.rightSureBtn.enabled = NO;
     NSMutableDictionary *dict = [[NSMutableDictionary alloc] init];
     [dict setValue:self.groupName forKey:@"Name"];
     [dict setValue:self.groupIntroduce forKey:@"Introduce"];

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

@@ -192,19 +192,19 @@
     AddLookUpUserSecondVC *vc = [[AddLookUpUserSecondVC alloc] init];
     vc.isAllSelected = YES;
     Department *defaltGroupSetion = [[Department alloc]init];
-    defaltGroupSetion.Name  = @"默认分组";
+    defaltGroupSetion.Name  = @"单位通讯录";
     defaltGroupSetion.Id = 0;
     defaltGroupSetion.SourceId = 0;
     defaltGroupSetion.SourceType = 1;
-    defaltGroupSetion.SourceName = @"默认分组";
+    defaltGroupSetion.SourceName = @"单位通讯录";
     defaltGroupSetion.MiddleType = type;
     Department *myGroupSetion = [[Department alloc]init];
-    myGroupSetion.Name  = @"我的分组";
+    myGroupSetion.Name  = @"自建通讯录";
     myGroupSetion.Id = 0;
     myGroupSetion.MiddleType = type;
     myGroupSetion.SourceType = 3;
     myGroupSetion.SourceId = 0;
-    myGroupSetion.SourceName = @"我的分组";
+    myGroupSetion.SourceName = @"自建通讯录";
     vc.departSourceDataArray = @[defaltGroupSetion,myGroupSetion].mutableCopy;
     vc.isDefalutPage = 1;
     vc.titleStr = @"选人";

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

@@ -152,11 +152,11 @@
                         cell.cell3TitleL.text = @"添加成员";
                         [cell.cell3AddBtn setAction:^{
                             Department *defaltGroupSetion = [[Department alloc]init];
-                            defaltGroupSetion.Name  = @"默认分组";
+                            defaltGroupSetion.Name  = @"单位通讯录";
                             defaltGroupSetion.Id = 0;
                             
                             Department *myGroupSetion = [[Department alloc]init];
-                            myGroupSetion.Name  = @"我的分组";
+                            myGroupSetion.Name  = @"自建通讯录";
                             defaltGroupSetion.Id = 0;
                             
                             vc.departSourceDataArray = @[defaltGroupSetion,myGroupSetion].mutableCopy;
@@ -214,11 +214,11 @@
                         cell.cell3TitleL.text = @"添加成员";
                         [cell.cell3AddBtn setAction:^{
                             Department *defaltGroupSetion = [[Department alloc]init];
-                            defaltGroupSetion.Name  = @"默认分组";
+                            defaltGroupSetion.Name  = @"单位通讯录";
                             defaltGroupSetion.Id = 0;
                             
                             Department *myGroupSetion = [[Department alloc]init];
-                            myGroupSetion.Name  = @"我的分组";
+                            myGroupSetion.Name  = @"自建通讯录";
                             defaltGroupSetion.Id = 0;
                             
                             ChatGroupAddVC *vc = [[ChatGroupAddVC alloc] init];

smartRhino/Project/VCModel/ChatMessage/Controller/TDInternalLeter/contoller/CreateInterLeterVC.m

@@ -324,19 +324,19 @@
     AddLookUpUserSecondVC *vc = [[AddLookUpUserSecondVC alloc] init];
     vc.isAllSelected = YES;
     Department *defaltGroupSetion = [[Department alloc]init];
-    defaltGroupSetion.Name  = @"默认分组";
+    defaltGroupSetion.Name  = @"单位通讯录";
     defaltGroupSetion.Id = 0;
     defaltGroupSetion.SourceId = 0;
     defaltGroupSetion.SourceType = 1;
-    defaltGroupSetion.SourceName = @"默认分组";
+    defaltGroupSetion.SourceName = @"单位通讯录";
     defaltGroupSetion.MiddleType = 1;
     Department *myGroupSetion = [[Department alloc]init];
-    myGroupSetion.Name  = @"我的分组";
+    myGroupSetion.Name  = @"自建通讯录";
     myGroupSetion.Id = 0;
     myGroupSetion.MiddleType = 3;
     myGroupSetion.SourceType = 3;
     myGroupSetion.SourceId = 0;
-    myGroupSetion.SourceName = @"我的分组";
+    myGroupSetion.SourceName = @"自建通讯录";
     
     vc.departSourceDataArray = @[defaltGroupSetion,myGroupSetion].mutableCopy;
     vc.isDefalutPage = 1;

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

@@ -65,8 +65,8 @@
     if (cell == nil) {
         cell = [[[NSBundle mainBundle] loadNibNamed:@"ChatMsgListCell" owner:nil options:nil] objectAtIndex:1];
     }
-    cell.rightImg.hidden = YES;
-    cell.cell1RightIntoBtn.hidden = YES;
+    cell.rightImg.hidden = NO;
+    cell.cell1RightIntoBtn.hidden = NO;
     cell.selectionStyle = UITableViewCellSelectionStyleNone;
     return cell;
 }
@@ -206,19 +206,21 @@
         if ([supView isKindOfClass:NSClassFromString(@"UITableViewCellReorderControl")]){
             for (UIView *view in supView.subviews)
             {
-                if ([view isKindOfClass: [UIImageView class]])
+               if ([view isKindOfClass: [UIImageView class]])
                 {
                     UIImageView * imagV = (UIImageView *)view;
                     [imagV setFrame:CGRectMake(0, 0, 22, 18)];
                     imagV.center = supView.center;
                     imagV.contentMode = UIViewContentModeCenter;
                     imagV.image = [UIImage imageNamed: @"list_sort"];
+                    UILabel * label = [UILabel new];
+                    label.backgroundColor = UIColorHex(#EAEAEA);
+                    [supView addSubview:label];
+                    [label setFrame:CGRectMake(0, supView.frame.size.height - 0.5, supView.frame.size.width, 0.5)];
+                }else{
+                    [view removeFromSuperview];
                 }
             }
-            UILabel * label = [UILabel new];
-            label.backgroundColor = UIColorHex(#EAEAEA);
-            [supView addSubview:label];
-            [label setFrame:CGRectMake(0, supView.frame.size.height - 0.5, supView.frame.size.width, 0.5)];
         }
         if ([supView isKindOfClass:NSClassFromString(@"_UITableViewCellSeparatorView")]){
 

smartRhino/Project/VCModel/Home/OtherHomeVC/HomeSearch/HomeSearchController.m

@@ -509,6 +509,7 @@ static NSString * MyApprovalBCellID = @"MyApprovalBCell";
             myApprovalPageDetail.indexId = model.FlowId;
             myApprovalPageDetail.title = model.Title;
             myApprovalPageDetail.TodoId = model.Id;
+            myApprovalPageDetail.userId = model.UserId;
             if ([model.Type isEqualToString:@"ApproverCheck"]) {
                 myApprovalPageDetail.pageType = Type_ONEA;
             }else{

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

@@ -747,19 +747,19 @@
     AddLookUpUserSecondVC *vc = [[AddLookUpUserSecondVC alloc] init];
     vc.isAllSelected = YES;
     Department *defaltGroupSetion = [[Department alloc]init];
-    defaltGroupSetion.Name  = @"默认分组";
+    defaltGroupSetion.Name  = @"单位通讯录";
     defaltGroupSetion.Id = 0;
     defaltGroupSetion.SourceId = 0;
     defaltGroupSetion.SourceType = 1;
-    defaltGroupSetion.SourceName = @"默认分组";
+    defaltGroupSetion.SourceName = @"单位通讯录";
     defaltGroupSetion.MiddleType = type;
     Department *myGroupSetion = [[Department alloc]init];
-    myGroupSetion.Name  = @"我的分组";
+    myGroupSetion.Name  = @"自建通讯录";
     myGroupSetion.Id = 0;
     myGroupSetion.MiddleType = type;
     myGroupSetion.SourceType = 3;
     myGroupSetion.SourceId = 0;
-    myGroupSetion.SourceName = @"我的分组";
+    myGroupSetion.SourceName = @"自建通讯录";
     vc.isAllSelected = YES;
     vc.departSourceDataArray = @[defaltGroupSetion,myGroupSetion].mutableCopy;
     vc.isDefalutPage = 1;

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

@@ -335,11 +335,11 @@
         YCMenuAction *actionMenu = [YCMenuAction actionWithTitle:titleStr image:nil handler:^(YCMenuAction *action) {
             if([@"添加人员" isEqualToString:action.title]){
                 Department *defaltGroupSetion = [[Department alloc]init];
-                defaltGroupSetion.Name  = @"默认分组";
+                defaltGroupSetion.Name  = @"单位通讯录";
                 defaltGroupSetion.Id = 0;
                 
                 Department *myGroupSetion = [[Department alloc]init];
-                myGroupSetion.Name  = @"我的分组";
+                myGroupSetion.Name  = @"自建通讯录";
                 defaltGroupSetion.Id = 0;
                 
                 AddLookUpUserSecondVC *vc = [[AddLookUpUserSecondVC alloc] init];

smartRhino/Project/VCModel/Home/OtherHomeVC/MyTDTopic/View/TopicGroupManageCell.m

@@ -52,12 +52,14 @@
                     imagV.center = supView.center;
                     imagV.contentMode = UIViewContentModeCenter;
                     imagV.image = [UIImage imageNamed: @"list_sort"];
+                    UILabel * label = [UILabel new];
+                    label.backgroundColor = UIColorHex(#EAEAEA);
+                    [supView addSubview:label];
+                    [label setFrame:CGRectMake(0, supView.frame.size.height - 0.5, supView.frame.size.width, 0.5)];
+                }else{
+                    [view removeFromSuperview];
                 }
             }
-            UILabel * label = [UILabel new];
-            label.backgroundColor = UIColorHex(#EAEAEA);
-            [supView addSubview:label];
-            [label setFrame:CGRectMake(0, supView.frame.size.height - 0.5, supView.frame.size.width, 0.5)];
         }
     }
     [super layoutSubviews];

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

@@ -486,7 +486,7 @@
             model.approvalText = @"待审核";
         }
         myApprovalPageDetail.pageType = Type_ONEA;
-
+        myApprovalPageDetail.userId = model.UserId;
         myApprovalPageDetail.indexId = model.Id;
         myApprovalPageDetail.TodoId = model.TodoId;
         myApprovalPageDetail.title = model.Title;

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

@@ -435,18 +435,18 @@
     self.roleId = 3;
     [self.tableView reloadRowsAtIndexPaths:@[indexPath] withRowAnimation:UITableViewRowAnimationNone];
     Department *defaltGroupSetion = [[Department alloc]init];
-    defaltGroupSetion.Name  = @"默认分组";
+    defaltGroupSetion.Name  = @"单位通讯录";
     defaltGroupSetion.Id = 0;
     defaltGroupSetion.SourceType = 1;
     defaltGroupSetion.SourceId = 0;
-    defaltGroupSetion.SourceName = @"默认分组";
+    defaltGroupSetion.SourceName = @"单位通讯录";
 
     Department *myGroupSetion = [[Department alloc]init];
-    myGroupSetion.Name  = @"我的分组";
+    myGroupSetion.Name  = @"自建通讯录";
     defaltGroupSetion.Id = 0;
     defaltGroupSetion.SourceType = 3;
     defaltGroupSetion.SourceId = 0;
-    defaltGroupSetion.SourceName = @"我的分组";
+    defaltGroupSetion.SourceName = @"自建通讯录";
 
     AddLookUpUserSecondVC *vc = [[AddLookUpUserSecondVC alloc] init];
     vc.isAllSelected = YES;

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

@@ -997,7 +997,7 @@
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="UIC-9G-aKy">
                                 <rect key="frame" x="0.0" y="352" width="375" height="100"/>
                                 <subviews>
-                                    <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Ish-pq-8vQ" customClass="UIPlaceHolderTextView" customModule="灵犀办公" customModuleProvider="target">
+                                    <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Ish-pq-8vQ" customClass="UIPlaceHolderTextView" customModule="泰德信源" customModuleProvider="target">
                                         <rect key="frame" x="10" y="10" width="231" height="90"/>
                                         <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
                                         <color key="textColor" systemColor="labelColor" cocoaTouchSystemColor="darkTextColor"/>

smartRhino/Project/VCModel/My_Center/Controller/NoteBook/View/NoteBookCell.m

@@ -409,12 +409,14 @@
                         imagV.center = supView.center;
                         imagV.contentMode = UIViewContentModeCenter;
                         imagV.image = [UIImage imageNamed: @"list_sort"];
+                        UILabel * label = [UILabel new];
+                        label.backgroundColor = UIColorHex(#EAEAEA);
+                        [supView addSubview:label];
+                        [label setFrame:CGRectMake(0, supView.frame.size.height - 0.5, supView.frame.size.width, 0.5)];
+                    }else{
+                        [view removeFromSuperview];
                     }
                 }
-                UILabel * label = [UILabel new];
-                label.backgroundColor = UIColorHex(#EAEAEA);
-                [supView addSubview:label];
-                [label setFrame:CGRectMake(0, supView.frame.size.height - 0.5, supView.frame.size.width, 0.5)];
             }
         }
     }else{

smartRhino/Project/VCModel/WorkFlow/AddLookUpUserSecondVC.m

@@ -159,9 +159,9 @@
                 selectModel.SourceId = model.Id;
                 selectModel.SourceName = model.Name ? model.Name : model.GroupName;
                 [selectedUsers addObject:selectModel];
-                if ([model.Name isEqualToString:@"默认分组"]) {
+                if ([model.Name isEqualToString:@"单位通讯录"]) {
                     selectModel.SourceType = 1;
-                }else if ([model.Name isEqualToString:@"我的分组"]) {
+                }else if ([model.Name isEqualToString:@"自建通讯录"]) {
                     selectModel.SourceType = 3;
                 }
             }

smartRhino/Project/VCModel/WorkFlow/EditorWorkFlowFecordController.m

@@ -311,10 +311,10 @@ BOOL wenziIsOpen;
 - (void)selectPeople{
     AddLookUpUserSecondVC *vc = [[AddLookUpUserSecondVC alloc] init];
     Department *defaltGroupSetion = [[Department alloc]init];
-    defaltGroupSetion.Name  = @"默认分组";
+    defaltGroupSetion.Name  = @"单位通讯录";
     defaltGroupSetion.Id = 0;
     Department *myGroupSetion = [[Department alloc]init];
-    myGroupSetion.Name  = @"我的分组";
+    myGroupSetion.Name  = @"自建通讯录";
     defaltGroupSetion.Id = 0;
     vc.departSourceDataArray = @[defaltGroupSetion,myGroupSetion].mutableCopy;
     vc.isDefalutPage = 1;

smartRhino/Project/VCModel/WorkFlow/MyApprovalPageDetail.h

@@ -14,6 +14,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic,assign) MyApprovalPageType pageType;
 @property (nonatomic, assign) NSInteger indexId;
 @property (nonatomic, assign) NSInteger TodoId;
+@property (nonatomic, assign) NSInteger userId;
 @property (copy, nonatomic) void(^ActionSussBlock)(void);
 
 @end

smartRhino/Project/VCModel/WorkFlow/MyApprovalPageDetail.m

@@ -874,6 +874,7 @@
 - (void)goNextApproval:(NSString *)titleName{
     NextApprovalViewController * nextApprovalViewController = [[NextApprovalViewController alloc]init];
     nextApprovalViewController.title = @"审批";
+    nextApprovalViewController.userIds = @[@(self.userId),@([AppUserModel sharedAppUserModel].Id)];
     nextApprovalViewController.TodoId = self.TodoId;
     [nextApprovalViewController setActionSussBlock:self.ActionSussBlock];
     [self.navigationController pushViewController:nextApprovalViewController animated:YES];

smartRhino/Project/VCModel/WorkFlow/MyApprovalPageVC.m

@@ -506,6 +506,7 @@
         myApprovalPageDetail.indexId = model.Id;
         myApprovalPageDetail.title = model.Title;
         myApprovalPageDetail.TodoId = model.TodoId;
+        myApprovalPageDetail.userId = model.UserId;
         WS(weakSelf);
         [myApprovalPageDetail setActionSussBlock:^{
             //重新获取数据

smartRhino/Project/VCModel/WorkFlow/MyWorkCarVC.m

@@ -701,11 +701,11 @@
     NSLog(@"点击添加抄送人");
     self.isShenPinRen = NO;
     Department *defaltGroupSetion = [[Department alloc]init];
-    defaltGroupSetion.Name  = @"默认分组";
+    defaltGroupSetion.Name  = @"单位通讯录";
     defaltGroupSetion.Id = 0;
     
     Department *myGroupSetion = [[Department alloc]init];
-    myGroupSetion.Name  = @"我的分组";
+    myGroupSetion.Name  = @"自建通讯录";
     defaltGroupSetion.Id = 0;
     
     AddLookUpUserSecondVC *vc = [[AddLookUpUserSecondVC alloc] init];
@@ -719,11 +719,11 @@
     NSLog(@"点击添加抄送人");
     self.isShenPinRen = YES;
     Department *defaltGroupSetion = [[Department alloc]init];
-    defaltGroupSetion.Name  = @"默认分组";
+    defaltGroupSetion.Name  = @"单位通讯录";
     defaltGroupSetion.Id = 0;
     
     Department *myGroupSetion = [[Department alloc]init];
-    myGroupSetion.Name  = @"我的分组";
+    myGroupSetion.Name  = @"自建通讯录";
     defaltGroupSetion.Id = 0;
     
     AddLookUpUserSecondVC *vc = [[AddLookUpUserSecondVC alloc] init];

smartRhino/Project/VCModel/WorkFlow/MyWorkWordVC.m

@@ -937,10 +937,10 @@
     NSLog(@"点击添加抄送人");
     self.isShenPinRen = NO;
     Department *defaltGroupSetion = [[Department alloc]init];
-    defaltGroupSetion.Name  = @"默认分组";
+    defaltGroupSetion.Name  = @"单位通讯录";
     defaltGroupSetion.Id = 0;
     Department *myGroupSetion = [[Department alloc]init];
-    myGroupSetion.Name  = @"我的分组";
+    myGroupSetion.Name  = @"自建通讯录";
     defaltGroupSetion.Id = 0;
     AddLookUpUserSecondVC *vc = [[AddLookUpUserSecondVC alloc] init];
     vc.notSearchChangeColor = YES;

smartRhino/Project/VCModel/WorkFlow/NewEditorWorkFlowFecordController.m

@@ -232,10 +232,10 @@
 - (void)selectPeople{
     AddLookUpUserSecondVC *vc = [[AddLookUpUserSecondVC alloc] init];
     Department *defaltGroupSetion = [[Department alloc]init];
-    defaltGroupSetion.Name  = @"默认分组";
+    defaltGroupSetion.Name  = @"单位通讯录";
     defaltGroupSetion.Id = 0;
     Department *myGroupSetion = [[Department alloc]init];
-    myGroupSetion.Name  = @"我的分组";
+    myGroupSetion.Name  = @"自建通讯录";
     defaltGroupSetion.Id = 0;
     vc.departSourceDataArray = @[defaltGroupSetion,myGroupSetion].mutableCopy;
     vc.isDefalutPage = 1;

smartRhino/Project/VCModel/WorkFlow/NextApprovalViewController.h

@@ -12,6 +12,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface NextApprovalViewController : AgreeApprovalViewController
 @property (nonatomic, assign) NSInteger TodoId;
+@property (nonatomic, copy) NSArray   * userIds;
 @property (nonatomic, copy) void(^ActionSussBlock)(void);
 @end
 

smartRhino/Project/VCModel/WorkFlow/NextApprovalViewController.m

@@ -188,6 +188,7 @@
     vc.isCheck = YES;
     vc.isHiddenSearchView = YES;
     NSMutableArray * UserIds = [NSMutableArray array];
+    [UserIds addObjectsFromArray:self.userIds];
     for (SelectModel * model in self.shenPiRenArr) {
         [UserIds addObject:@(model.UserId)];
     }

smartRhino/Project/VCModel/WorkFlow/WorkFlowOrderController.m

@@ -544,10 +544,10 @@ AddPeopleToGongWenCellDelegate,AddLookUpUserSecondVCDelegate>
 - (void)addLookUpPeopleSuccess:(void (^)(id _Nullable))success failure:(void (^)(NSError * _Nonnull))failure{
     NSLog(@"点击添加抄送人");
     Department *defaltGroupSetion = [[Department alloc]init];
-    defaltGroupSetion.Name  = @"默认分组";
+    defaltGroupSetion.Name  = @"单位通讯录";
     defaltGroupSetion.Id = 0;
     Department *myGroupSetion = [[Department alloc]init];
-    myGroupSetion.Name  = @"我的分组";
+    myGroupSetion.Name  = @"自建通讯录";
     defaltGroupSetion.Id = 0;
     AddLookUpUserSecondVC *vc = [[AddLookUpUserSecondVC alloc] init];
     vc.isAllSelected = NO;

smartRhino/Project/VCModel/WorkFlow/WorkFlowSearchDetailVC.m

@@ -195,6 +195,7 @@
         myApprovalPageDetail.indexId = model.Id;
         myApprovalPageDetail.title = model.Title;
         myApprovalPageDetail.TodoId = model.TodoId;
+        myApprovalPageDetail.userId = model.UserId;
         [self.navigationController pushViewController:myApprovalPageDetail animated:YES];
     }
 }