shiku_im/controller/JXChatViewC.h

@@ -69,6 +69,7 @@
 @property (nonatomic,assign) BOOL isAttritionRecall;
 @property (nonatomic,assign) BOOL isOpenIntegral;
 
+@property (nonatomic,assign) int groundSendHelp;
 @property (nonatomic,assign) int useInfoTempChat;
 
 @property (nonatomic,assign) int yunGoldtigerPush;

shiku_im/controller/JXChatViewC.mm

@@ -3466,10 +3466,12 @@ _strURLGoback=@"";
 //    NSString *userName = self.userNames[self.groupMessagesIndex];
     
     if (self.isCYMSGgroupANDFriendy) {
-        JXMessageObject *msg=[[JXMessageObject alloc]init];
+        
+        NSMutableArray *tempMsg=[NSMutableArray array];
+        JXMessageObject *msg=nil;
         
         for (NSString *userId in _userIds) {
-            
+            msg=[[JXMessageObject alloc]init];
             if ([file length]>0) {
                 msg.timeSend     = [NSDate date];
                 msg.fromUserId   = MY_USER_ID;
@@ -3499,17 +3501,28 @@ _strURLGoback=@"";
                 [msg insert:userId];
                 
                 [self showOneMsg:msg];
+
+                [tempMsg addObject:msg];
                 
-               
-            
+                NSLog(@"userIdxxxx %@",msg.messageId);
             }
-        
+           
+            
+ 
         }
-        [g_server uploadFile:file validTime:self.chatPerson.chatRecordTimeOut messageId:msg.messageId toView:self];
+         
+        
+        
+        [tempMsg enumerateObjectsUsingBlock:^(JXMessageObject  *msgX, NSUInteger idx, BOOL * _Nonnull stop) {
+
+            [g_server uploadFile:file validTime:chatPerson.chatRecordTimeOut messageId:msgX.messageId toView:self];
+      
+        }];
+        
 
         
         // 写入数据库
-       NSArray *array = self.userIds;
+       NSArray *array = _userIds;
        NSString *userIdsString = [array componentsJoinedByString:@","];
        array = self.userNames;
        NSString *userNamesString = [array componentsJoinedByString:@","];
@@ -4594,17 +4607,16 @@ _strURLGoback=@"";
          if (_useInfoTempChat==11) {
                   
                   p.tempChat = 11;
-          }else
-         {
-                  
-                  p.tempChat = 1;
-           }
+          }
+         
         
 //        [g_xmpp sendMessage:p roomName:self.roomJid];//发送消息
         if (self.isCYMSGgroupANDFriendy) {
                    for (NSString *userId in self.userIds) {
                        if (userId.length>10) {
-                           [g_xmpp sendMessage:p roomName:userId];
+                           if ([p.toUserId isEqualToString:userId]) {
+                                [g_xmpp sendMessage:p roomName:userId];
+                           }
                        }else {
                            [g_xmpp sendMessage:p roomName:userId];
                        }
@@ -4913,7 +4925,14 @@ _strURLGoback=@"";
         return;
     }
     RITLPhotosViewController *photoController = RITLPhotosViewController.photosViewController;
-    photoController.configuration.maxCount = 9;//最大的选择数目
+    
+    if (_groundSendHelp==100) {
+
+         photoController.configuration.maxCount = 1;//最大的选择数目
+    }else{
+
+        photoController.configuration.maxCount = 9;//最大的选择数目
+    }
     photoController.configuration.containVideo = YES;//选择类型，目前只选择图片不选择视频
     
     photoController.photo_delegate = self;
@@ -5061,7 +5080,7 @@ _strURLGoback=@"";
     if (_isGroupSendCancel) {
         return;
     }
-    NSString *userId = self.userIds[self.groupMessagesIndex];
+    NSString *userId = _userIds[self.groupMessagesIndex];
     NSArray *imageArr = [imageAndVideosDic objectForKey:@"images"];
     NSArray *mediaArr = [imageAndVideosDic objectForKey:@"videos"];
     if (imageArr.count > 0) {
@@ -5090,10 +5109,15 @@ _strURLGoback=@"";
     }
     self.groupMessagesIndex ++;
     if (self.groupMessagesIndex < self.userIds.count) {
-        if (_onceSendNum == 1 || self.groupMessagesIndex % _onceSendNum == 0) {
+        if (_onceSendNum == 1 || _groupMessagesIndex % _onceSendNum == 0) {
             return;
         }else{
-            [self sendImagesAndVideos:imageAndVideosDic];
+            
+            if (_groundSendHelp==100||_userIds.count>1) { 
+            }else{
+
+                [self sendImagesAndVideos:imageAndVideosDic];
+            }
         }
     }else if (self.userIds){
         self.groupMessagesIndex = 0;

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

@@ -208,7 +208,7 @@
     
     
     JXChatViewC *vc = [[JXChatViewC alloc] init];
-    
+    vc.groundSendHelp=100;
     NSMutableArray *idArr = [NSMutableArray arrayWithArray:_mode.selFriendyIdArr];
     NSMutableArray *nameArr = [NSMutableArray arrayWithArray:self.mode.selFriendyNameArr];
     NSMutableArray *nameArrGroup = [NSMutableArray arrayWithArray:self.mode.selGroupNameArr];

shiku_im/shiku_im-Info.plist

@@ -88,18 +88,6 @@
 	<dict>
 		<key>NSAllowsArbitraryLoads</key>
 		<true/>
-		<key>NSExceptionDomains</key>
-		<dict>
-			<key>http://qdzcie.com</key>
-			<dict>
-				<key>NSExceptionAllowInsecureHTTPLoads</key>
-				<string>YES</string>
-				<key>NSExceptionRequiresForwardSecrecy</key>
-				<false/>
-				<key>NSIncludesSubdomains：YES</key>
-				<true/>
-			</dict>
-		</dict>
 	</dict>
 	<key>NSCalendarsUsageDescription</key>
 	<string>允许应用程序在您使用该应用程序时访问您的日历吗？</string>

shiku_im/videoRecorder/JXVideoPlayerVC.m

@@ -295,11 +295,23 @@ static void *StreamPlayerViewControllerPlayerItemStatusObserverContext = &Stream
     {
         NSLog(@"JXVideoPlayerVC.暂停");
         if((_isIniting || !isUserPause) && !seekToZeroBeforePlay)
-            playStatus.text  = Localized(@"StreamPlayerViewController_Loading");
+            dispatch_async(dispatch_get_main_queue(), ^{
+                
+                
+                playStatus.text  = Localized(@"StreamPlayerViewController_Loading");
+            });
         else
-            playStatus.text  = Localized(@"StreamPlayerViewController_Paused");
-    }
-    self.pauseButton.selected = [self isPlaying];
+            dispatch_async(dispatch_get_main_queue(), ^{
+                           
+                           
+                playStatus.text  = Localized(@"StreamPlayerViewController_Paused");
+                       });
+    }
+    dispatch_async(dispatch_get_main_queue(), ^{
+                   
+                   
+        self.pauseButton.selected = [self isPlaying];
+               });
 }
 
 /* Called when the player item has played to its end time. */