Merge branch 'master' of http://129.204.155.107:3000/zengwei/jixin_new

* 'master' of http://129.204.155.107:3000/zengwei/jixin_new:
  群发助手

shiku_im.xcodeproj/project.pbxproj

@@ -7655,24 +7655,24 @@
 		B18B23BA242D91DE007E08F8 /* 群发助手 */ = {
 			isa = PBXGroup;
 			children = (
-				B18B23BF242D91DE007E08F8 /* CYGroupSendHelperViewController.h */,
-				B18B23C6242D91DE007E08F8 /* CYGroupSendHelperViewController.m */,
-				B18B23C5242D91DE007E08F8 /* CYGroupSendHelperViewController.xib */,
-				B18B23BB242D91DE007E08F8 /* CYSendMSGGroupViewController.m */,
-				B18B23BD242D91DE007E08F8 /* CYSelFriendyListView.m */,
-				B18B23C0242D91DE007E08F8 /* CYSelGroupListView.m */,
 				B18B23C2242D91DE007E08F8 /* CYFriendyTableViewCell.h */,
 				B18B23CC242D91DE007E08F8 /* CYFriendyTableViewCell.m */,
 				B18B23C1242D91DE007E08F8 /* CYGroupSendHelperCell.h */,
 				B18B23C9242D91DE007E08F8 /* CYGroupSendHelperCell.m */,
 				B18B23BC242D91DE007E08F8 /* CYGroupSendHelperCell.xib */,
-				B18B23BE242D91DE007E08F8 /* CYsendmsgFriendViewController.m */,
-				B18B23C4242D91DE007E08F8 /* CYSendMSGGroupViewController.h */,
-				B18B23C7242D91DE007E08F8 /* CYsendmsgFriendViewController.h */,
-				B18B23C8242D91DE007E08F8 /* CYSelFriendyListView.h */,
-				B18B23CA242D91DE007E08F8 /* CYSelGroupListView.h */,
+				B18B23BF242D91DE007E08F8 /* CYGroupSendHelperViewController.h */,
+				B18B23C6242D91DE007E08F8 /* CYGroupSendHelperViewController.m */,
+				B18B23C5242D91DE007E08F8 /* CYGroupSendHelperViewController.xib */,
 				B18B23C3242D91DE007E08F8 /* CYGroupSendMsgViewController.h */,
 				B18B23CB242D91DE007E08F8 /* CYGroupSendMsgViewController.m */,
+				B18B23C8242D91DE007E08F8 /* CYSelFriendyListView.h */,
+				B18B23BD242D91DE007E08F8 /* CYSelFriendyListView.m */,
+				B18B23CA242D91DE007E08F8 /* CYSelGroupListView.h */,
+				B18B23C0242D91DE007E08F8 /* CYSelGroupListView.m */,
+				B18B23C7242D91DE007E08F8 /* CYsendmsgFriendViewController.h */,
+				B18B23BE242D91DE007E08F8 /* CYsendmsgFriendViewController.m */,
+				B18B23C4242D91DE007E08F8 /* CYSendMSGGroupViewController.h */,
+				B18B23BB242D91DE007E08F8 /* CYSendMSGGroupViewController.m */,
 			);
 			path = "群发助手";
 			sourceTree = "<group>";

shiku_im/controller/群发助手/CYGroupSendHelperViewController.m

@@ -11,6 +11,7 @@
 #import "CYGroupSendMsgViewController.h"
 #import "JXLabelObject.h"
 #import "JXChatViewController.h"
+#import "JXChatViewC.h"
 
 #import "JXGroupMessagesSelectFriendVC.h"
 
@@ -84,7 +85,7 @@
     cell.resendClickCallback = ^(JXLabelObject * _Nonnull model) {
         
         // 再发送
-        JXChatViewController *vc = [[JXChatViewController alloc] init];
+        JXChatViewC *vc = [[JXChatViewC alloc] init];
  
         NSString *string = model.userNmaesWithFriend;
         NSArray *userNmaesWithFriend = [string componentsSeparatedByString:@","];

shiku_im/controller/群发助手/CYGroupSendMsgViewController.m

@@ -209,14 +209,14 @@
     
     JXChatViewC *vc = [[JXChatViewC alloc] init];
     
-    NSMutableArray *idArr = [NSMutableArray arrayWithArray:self.mode.selFriendyIdArr];
+    NSMutableArray *idArr = [NSMutableArray arrayWithArray:_mode.selFriendyIdArr];
     NSMutableArray *nameArr = [NSMutableArray arrayWithArray:self.mode.selFriendyNameArr];
     NSMutableArray *nameArrGroup = [NSMutableArray arrayWithArray:self.mode.selGroupNameArr];
     
     
     
     
-    vc.userNmaesWithFriend = [NSMutableArray arrayWithArray:self.mode.selFriendyNameArr];
+    vc.userNmaesWithFriend = [NSMutableArray arrayWithArray:_mode.selFriendyNameArr];
     
     [idArr addObjectsFromArray:self.mode.selGroupIdArr];
     [nameArr addObjectsFromArray:self.mode.selGroupNameArr];

shiku_im/shiku_im-Info.plist

@@ -67,7 +67,7 @@
 		<dict/>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>20200720</string>
+	<string>20200721</string>
 	<key>LSApplicationCategoryType</key>
 	<string></string>
 	<key>LSApplicationQueriesSchemes</key>