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

* 'master' of http://129.204.155.107:3000/zengwei/jixin_new:
  消息
  11
  修改了丝带 和红包 不消失

# Conflicts:
#	shiku_im/shiku_im-Info.plist

shiku_im.xcodeproj/xcshareddata/xcschemes/shiku_im.xcscheme

@@ -66,6 +66,23 @@
             isEnabled = "YES">
          </EnvironmentVariable>
       </EnvironmentVariables>
+      <AdditionalOptions>
+         <AdditionalOption
+            key = "MallocStackLogging"
+            value = ""
+            isEnabled = "YES">
+         </AdditionalOption>
+         <AdditionalOption
+            key = "PrefersMallocStackLoggingLite"
+            value = ""
+            isEnabled = "YES">
+         </AdditionalOption>
+         <AdditionalOption
+            key = "NSZombieEnabled"
+            value = "YES"
+            isEnabled = "YES">
+         </AdditionalOption>
+      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

shiku_im/3rd/AvoidCrash/NSString+AvoidCrash.m

@@ -201,4 +201,42 @@
 }
 
 
+/*
+版权声明：本文为CSDN博主「wangruiIOS」的原创文章，遵循CC 4.0 BY-SA版权协议，转载请附上原文出处链接及本声明。
+原文链接：https://blog.csdn.net/wangrui13931182709/article/details/51423566
+ */
++(void)load
+{
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        
+        SEL systemSel = @selector(containsString:);
+        Method systemMethod = class_getInstanceMethod([self class], systemSel);
+ 
+        //如果没有找到，说明不包含此方法，需要动态添加此方法
+        if (systemMethod == NULL) {
+            SEL customSel = @selector(customContainsString:);
+            Method customMethod = class_getInstanceMethod([self class], customSel);
+            
+            BOOL isAdd = class_addMethod(self, systemSel, method_getImplementation(customMethod), method_getTypeEncoding(customMethod));
+            
+            if (!isAdd) {
+                NSLog(@"%@ runtime add method 'customContainsString:' failed",NSStringFromClass([self class]));
+            }
+        }
+        
+    });
+}
+ 
+-(BOOL)customContainsString:(NSString *)str
+{
+    NSRange range = [self rangeOfString:str];
+    
+    if (range.location < self.length && range.length > 0) {
+        return YES;
+    }
+    
+    return NO;
+}
+
 @end

shiku_im/3rd/FMDB/FMDatabase.m

@@ -968,7 +968,7 @@
     }
     
     if (closeErrorCode != SQLITE_OK) {
-        NSLog(@"Unknown error finalizing or resetting statement (%d: %s)", closeErrorCode, sqlite3_errmsg(_db));
+       // NSLog(@"Unknown error finalizing or resetting statement (%d: %s)", closeErrorCode, sqlite3_errmsg(_db));
         //NSLog(@"DB Query: %@", sql);
     }
     

shiku_im/AppDelegate.mm

@@ -40,7 +40,7 @@
 #import <Bugly/Bugly.h>
 //#define BUGLY_APP_ID @"d31e99928e"
 
-#define BUGLY_APP_ID @"1606171"
+#define BUGLY_APP_ID @"a5a29670ad"
 
 #import "AvoidCrash.h"
 
@@ -99,8 +99,9 @@ static  BMKMapManager* _baiduMapManager;
     if (@available(iOS 13.0, *)) {
          //  window.overrideUserInterfaceStyle = UIUserInterfaceStyleLight;
     }
-    [AvoidCrash makeAllEffective];
-     NSArray *noneSelClassStrings = @[
+    
+   [AvoidCrash makeAllEffective];
+    NSArray *noneSelClassStrings = @[
                                 @"NSNull",
                                 @"NSNumber",
                                 @"NSString",
@@ -108,7 +109,13 @@ static  BMKMapManager* _baiduMapManager;
                                 @"NSArray"
                                 ];
     [AvoidCrash setupNoneSelClassStringsArr:noneSelClassStrings];
+ 
+    
     [Bugly startWithAppId:BUGLY_APP_ID];
+    
+
+     
+    
     // 网络监听
     [self networkStatusChange];
 
@@ -140,9 +147,9 @@ static  BMKMapManager* _baiduMapManager;
     //[self startVoIPPush];
 #endif
 #endif
-    
+     
 //    [NSThread sleepForTimeInterval:0.3];
-    
+
     if ([[[NSUserDefaults standardUserDefaults] stringForKey:@"cylunch"] isEqualToString:@"1"]) {
            [self showLoginUI];
        }else {
@@ -503,7 +510,7 @@ static  BMKMapManager* _baiduMapManager;
     
     
     
-    int height = 258;
+    int height = 218;
            if (THE_DEVICE_HAVE_HEAD) {
                height = 263;
            }

shiku_im/ClassesNew/classes/messageVc/JXMsgCellView.m

@@ -19,6 +19,10 @@
 @property (weak, nonatomic) IBOutlet UILabel *gufangL;
 
 @property (nonatomic,strong) NSMutableArray *dataArr;
+@property (weak, nonatomic) IBOutlet UIImageView *iconFriendIMG;
+
+@property (weak, nonatomic) IBOutlet UIImageView *grounpIMG;
+
 @end
 @implementation JXMsgCellView
 
@@ -31,6 +35,11 @@
     [super awakeFromNib];
     _dataArr=[NSMutableArray array];
     
+    _grounpIMG.layer.cornerRadius=3;
+    _grounpIMG.layer.masksToBounds=YES;
+    _iconFriendIMG.layer.cornerRadius=5;
+    _iconFriendIMG.layer.masksToBounds=YES;
+    
     [g_notify addObserver:self selector:@selector(newFriend:) name:@"newFriend" object:nil];
       
     

shiku_im/ClassesNew/classes/messageVc/JXMsgCellView.xib

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097.2" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
@@ -202,7 +202,9 @@
                 <outlet property="addresView" destination="1y8-cs-L42" id="jty-9l-LDV"/>
                 <outlet property="friendView" destination="hVh-zm-Ewc" id="glP-8l-T14"/>
                 <outlet property="groundChatView" destination="uYo-do-CTe" id="DXn-5R-dSR"/>
+                <outlet property="grounpIMG" destination="BHv-to-RMO" id="CFr-V8-1le"/>
                 <outlet property="gufangL" destination="ho2-0y-kpt" id="Wyd-j9-2j9"/>
+                <outlet property="iconFriendIMG" destination="HNu-CB-L2q" id="eFs-sY-R4Y"/>
                 <outlet property="jixinView" destination="piq-oK-8vg" id="88a-LW-I1u"/>
                 <outlet property="tipLabel" destination="564-6e-Z3Z" id="ESy-wQ-lCW"/>
             </connections>

shiku_im/ClassesNew/classes/messageVc/JXMsgViewController.m

@@ -211,6 +211,11 @@
         }
          
        // _table.frame =CGRectMake(0, 0, JX_SCREEN_WIDTH, JX_SCREEN_HEIGHT-(JX_SCREEN_HEIGHT>=812?88:64)-JX_SCREEN_BOTTOM);
+       
+        
+
+        
+        
     }
     return self;
 }
@@ -3016,6 +3021,7 @@
     if ([aDownload.action isEqualToString:act_tigaseGetLastChatList]) {
         [self.header endRefreshing];
         [self getAllChatList];
+        //[self getFriend];
 //        [g_xmpp.roomPool createAll];
     }
         if ([aDownload.action isEqualToString:act_getGroupOneType]) {

shiku_im/ClassesNew/classes/myVc/Vc/JXXMGMyVc.m

@@ -151,11 +151,11 @@
             
             NSString *kefuID=_videoDict[@"qqService"];
             
-            NSString *url = [NSString stringWithFormat:@"mqqwpa://im/chat?chat_type=crm&uin=%@&version=1&src_type=web&web_src=http:://wpa.b.qq.com",kefuID];
-            NSURL *qqURL = [NSURL URLWithString:url];
-
-            [[UIApplication sharedApplication] openURL:qqURL];
-            return;
+//            NSString *url = [NSString stringWithFormat:@"mqqwpa://im/chat?chat_type=crm&uin=%@&version=1&src_type=web&web_src=http:://wpa.b.qq.com",kefuID];
+//            NSURL *qqURL = [NSURL URLWithString:url];
+//
+//            [[UIApplication sharedApplication] openURL:qqURL];
+//            return;
             JXChatViewC *vc = [[JXChatViewC alloc] init]; //10000656 10000
             JXUserObject *user = [[JXUserObject sharedInstance] getUserById:kefuID];
             vc.chatPerson = user;
@@ -165,15 +165,15 @@
  
         }else if(sender.tag==2){ //电话客服：点击电话发起本机拨打电话  拨打 和取消
             NSString *kefuID=_videoDict[@"phoneService"];
-            NSMutableString* str=[[NSMutableString alloc] initWithFormat:@"tel:%@",kefuID];
-
-            UIWebView * callWebview = [[UIWebView alloc] init];
-
-            [callWebview loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:str]]];
-
-            [self.view addSubview:callWebview];
-            
-            return;
+//            NSMutableString* str=[[NSMutableString alloc] initWithFormat:@"tel:%@",kefuID];
+//
+//            UIWebView * callWebview = [[UIWebView alloc] init];
+//
+//            [callWebview loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:str]]];
+//
+//            [self.view addSubview:callWebview];
+//            
+//            return;
             JXChatViewC *vc = [[JXChatViewC alloc] init]; //10000656 10000
             JXUserObject *user = [[JXUserObject sharedInstance] getUserById:kefuID];
             vc.chatPerson = user;

shiku_im/Register&Login/inputPhoneVC.m

@@ -922,7 +922,7 @@
 
 -(int) didServerResultFailed:(JXConnection*)aDownload dict:(NSDictionary*)dict{
     [_wait stop];
-    if([aDownload.action isEqualToString:act_SendSMS]){
+    if([aDownload.action isEqualToString:act_SendSMS] || [aDownload.action isEqualToString:act_CheckPhone]){
         
         [_send setTitle:Localized(@"JX_Send") forState:UIControlStateNormal];
         [g_App showAlert:dict[@"resultMsg"]];
@@ -956,7 +956,7 @@
     if(_seconds<=0){
         but.selected = NO;
         but.userInteractionEnabled = YES;
-        but.backgroundColor = g_theme.themeColor;
+        but.backgroundColor = [UIColor whiteColor];
         [_send setTitle:Localized(@"JX_SendAngin") forState:UIControlStateNormal];
         if (_timer) {
             _timer = nil;

shiku_im/cell/ChatCell/JXBaseChatCell.m

@@ -182,10 +182,10 @@ static double g_timeSend=0;
                    // 为label添加Attributed
                    if (allUser.userId.length==0) {
                     //  _msg;
-                       self.nicknameLabel.text=[NSString stringWithFormat:@"%@",data.userNickName];
+                       self.nicknameLabel.text=[NSString stringWithFormat:@"%@",_msg.fromUserName];
                    }else{
 
-                       self.nicknameLabel.text=[NSString stringWithFormat:@"%@",allUser.userId];
+                       self.nicknameLabel.text=[NSString stringWithFormat:@"%@",_msg.fromUserName];
                    }
                    //[self.nicknameLabel setAttributedText:noteStr];
                }

shiku_im/controller/ADView/DYAdAlertView/DYAdAlertView.m

@@ -406,7 +406,7 @@
 //                   item.userInteractionEnabled = YES;
                }
                UITapGestureRecognizer *singleTap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(tapContentImgView:)];
-               [item.imageView addGestureRecognizer:singleTap];
+               [self addGestureRecognizer:singleTap];
                [_scrollView addSubview:item];
                // 正常显示取消按钮
                if (adModel.showCancelButton) {
@@ -466,6 +466,7 @@
                    item.userInteractionEnabled = YES;
                }
                [_scrollView addSubview:item];
+         
         
                 // containerView
                 UIView *containerView = [[UIView alloc] initWithFrame:CGRectMake(ScreenWidth/2-250/2+i*ScrollWidth,ScrollHeight/2-100, 250, 250)];
@@ -521,11 +522,11 @@
                 label4.textColor = [UIColor whiteColor];
                 [containerView addSubview:label4];
                 UITapGestureRecognizer *singleTap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(tapContentImgView:)];
-                [label4 addGestureRecognizer:singleTap];
+                [self addGestureRecognizer:singleTap];
                 label4.userInteractionEnabled = YES;
         
                // 正常显示取消按钮
-               if (adModel.showCancelButton) {
+               //if (adModel.showCancelButton) {
                    cancelBtn       = [UIButton buttonWithType:UIButtonTypeCustom];
 
                    cancelBtn.frame=CGRectMake(JX_SCREEN_WIDTH-60, JX_SCREEN_WIDTH/3+ (JX_SCREEN_HEIGHT>=812?0:0), 44, 44);
@@ -533,7 +534,7 @@
                    [cancelBtn setImage:[UIImage imageNamed:@"close"] forState:UIControlStateNormal];
                    [cancelBtn addTarget:self action:@selector(removeSelfFromSuperview) forControlEvents:UIControlEventTouchUpInside];
 //                   [self addSubview:cancelBtn];
-               }
+              // }
            }
            
            //初始化pageControl
@@ -544,6 +545,8 @@
            pageControl.hidden          = self.hiddenPageControl;
            
            [self addSubview:pageControl];
+    
+    
 }
 
 - (void)setupView5 {
@@ -556,12 +559,12 @@
         
          
 //        UITapGestureRecognizer *singleTap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(tapContentImgView:)];
-//        [item.imageView addGestureRecognizer:singleTap];
+//        [self addGestureRecognizer:singleTap];
 //        [_scrollView addSubview:item];
         // 正常显示取消按钮
         
         cancelBtn       = [UIButton buttonWithType:UIButtonTypeCustom];
-//        cancelBtn.frame = CGRectMake(ScreenWidth-100, JX_SCREEN_HEIGHT/6, 44, 44);
+         cancelBtn.frame = CGRectMake(ScreenWidth-100, 88, 44, 44);
         [cancelBtn setImage:[UIImage imageNamed:@"close"] forState:UIControlStateNormal];
         [cancelBtn addTarget:self action:@selector(removeSelfFromSuperview) forControlEvents:UIControlEventTouchUpInside];
         

shiku_im/controller/JXChatViewC.h

@@ -75,6 +75,10 @@
 
 @property (nonatomic,assign) int isCustomerAA;
 
+@property (nonatomic,copy) NSString *sidaiPushTitle;
+@property (nonatomic,copy) NSString *sidaiPushstr;
+
+@property (nonatomic,assign) int sidaiPushstrInt;
 
 @property (nonatomic,copy) NSString *customerPush;
 

shiku_im/controller/JXChatViewC.mm

@@ -467,6 +467,10 @@
     self.title =[NSString stringWithFormat:@"%@ (%@) ",userName, str]; ;
     
     if ([g_config.isOpenOnlineStatus boolValue]) {
+        
+        if (userName==nil) {
+            userName=@"";
+        }
         if (_useInfoTempChat==11) {
 
              self.title = [NSString stringWithFormat:@"%@ 临时会话 (%@) ",userName, str];
@@ -474,6 +478,10 @@
              self.title = [NSString stringWithFormat:@"%@ (%@) ",userName, str];
         }
     }else {
+        if (userName==nil) {
+                userName=@"";
+            }
+        
          if (_useInfoTempChat==11) {
              
         self.title =[NSString stringWithFormat:@"%@(%@)",userName, @"临时会话"] ;
@@ -490,6 +498,11 @@
          
     }
     
+    if (_sidaiPushstrInt==123456) {
+
+         self.title =[NSString stringWithFormat:@"%@(%@)",_sidaiPushTitle, @"临时会话"] ;
+    }
+    
     [self setAudioIconFrame];
 }
 
@@ -3246,12 +3259,17 @@ _strURLGoback=@"";
         JXMessageObject *msg=[[JXMessageObject alloc]init];
         msg.timeSend     = [NSDate date];
         msg.fromUserId   = MY_USER_ID;
+        
+
+      
+        
         if([self.roomJid length]>0){
-            msg.toUserId = self.roomJid;
+            msg.toUserId = _roomJid;
             msg.isGroup = YES;
             msg.fromUserName = _userNickName;
-        }
-        else{
+        }  else{
+            
+            
             /*
             if (self.isGroupMessages) {
                 if (_isGroupSendCancel) {
@@ -3267,10 +3285,22 @@ _strURLGoback=@"";
             }
             msg.isGroup = NO;
             */
+            msg.fromUserName  = MY_USER_NAME;
             if (self.isGroupMessages) {
                    msg.toUserId = userId;
                }else {
+                   
+                   
+                   
                    msg.toUserId     = chatPerson.userId;
+                   
+                   if (_sidaiPushstrInt==123456&&chatPerson==nil) {
+                       
+                       //userId  = _sidaiPushstr;
+                       msg.toUserId  = _sidaiPushstr;
+                       msg.fromUserName  = MY_USER_NAME;
+                   }
+                   
                }
                msg.isGroup = NO;
         }
@@ -3302,12 +3332,18 @@ _strURLGoback=@"";
         
         
         //发往哪里
-        if (self.isGroupMessages) {
+        if (_isGroupMessages) {
             [msg insert:userId];
             [g_xmpp sendMessage:msg roomName:userId];//发送消息
+        
+        
         }else {
-            [msg insert:self.roomJid];
+            
+            
+            [msg insert:_roomJid];
             [g_xmpp sendMessage:msg roomName:self.roomJid];//发送消息
+     
+        
         }
         if (self.isCYMSGgroupANDFriendy){
             
@@ -7178,7 +7214,15 @@ _strURLGoback=@"";
                         [self setChatTitle:chatPerson.remarkName.length > 0 ? chatPerson.remarkName : chatPerson.userNickname];
                     }else {
 //                        self.title = [NSString stringWithFormat:@"%@(%@)",dict[@"nickname"],str];
-                        [self setChatTitle:dict[@"nickname"]];
+                      
+                        if (_sidaiPushstrInt==123456) {
+                            
+                              
+                              [self setChatTitle:_sidaiPushTitle];
+                        }else{
+                        
+                          [self setChatTitle:dict[@"nickname"]];
+                        }
                     }
                 }
                 

shiku_im/controller/JXChatViewController.h

@@ -137,6 +137,9 @@ typedef void(^PerBlockBtn)(memberData *personData);
 
 @property (nonatomic, assign) int useInfoTempChat;
 
+@property (nonatomic, assign) int iscpGourp;
+
+
 @property (nonatomic, assign) int lotterInt;
 
 @property (nonatomic, assign) int enterFirst;

shiku_im/controller/JXChatViewController.mm

@@ -833,7 +833,7 @@
                 // 发网络请求
               //  [g_server getRroomActivity:_activityModel.id ToView:self];
                //[g_server getRroomActivity:_activityModel.id ToView:self];
-                _isShowRedPackage=0;
+                //_isShowRedPackage=0;
                 long time = (long)[[NSDate date] timeIntervalSince1970];
                 time = time *1000 + g_server.timeDifference;
                 NSString *salt = [NSString stringWithFormat:@"%ld",time];
@@ -2297,6 +2297,21 @@ NSMutableArray* temp = [[NSMutableArray alloc]init];
 }
 
 - (void)notice2ndClick {
+    
+    
+    JXLabelObject *obj = [JXLabelObject sharedInstance]; 
+    
+    NSString *selectItemqq = [obj fetchAllGroupAnnouncementFromLocal];
+     
+    
+    
+    if (selectItemqq.length==0) {
+         
+        [g_App showAlert:@"请等待开奖"];
+        
+        return;
+    }
+    
     JLSelectView *customView = [[JLSelectView alloc] init];
     __weak __typeof(self)weakSelf = self;
     customView.returnModelBlock = ^(JLSelectModel *model, NSIndexPath *indexPath) {
@@ -2314,7 +2329,7 @@ NSMutableArray* temp = [[NSMutableArray alloc]init];
        weakSelf.showTopView.selectItemModel=selectItemModel;
     };
     
-    JXLabelObject *obj = [JXLabelObject sharedInstance];
+//    JXLabelObject *obj = [JXLabelObject sharedInstance];
     obj.roomJid = self.roomJid;
     NSString *groupAnnouncement = [obj fetchAllGroupAnnouncementFromLocal];
     NSArray *response = [self dictionaryWithJsonString: groupAnnouncement];
@@ -8006,13 +8021,15 @@ NSMutableArray* temp = [[NSMutableArray alloc]init];
      
         BOOL isOpen = [g_default boolForKey:kgoucaiComePush];
               
-             BOOL isOpen2 = [g_default boolForKey:kGuanXinComePush];
+           BOOL isOpen2 = [g_default boolForKey:kGuanXinComePush];
         _lotterInt=[dict[@"lottery"] intValue];
         if ([dict[@"lottery"] intValue]==1) {
             _floating.hidden=NO;
+            _iscpGourp=100;
+            
         }else{
             _floating.hidden=YES;
-            
+            _iscpGourp=0;
         }
         
         
@@ -9453,8 +9470,11 @@ NSMutableArray* temp = [[NSMutableArray alloc]init];
     _activityModel = model;
     [_container dismiss];
     
-    if ([model.roomJid isEqualToString:self.roomJid]) {
+    if ([model.roomJid isEqualToString:_roomJid]) {
 
+        NSLog(@"---红包红包---%@",@"--------");
+              
+              
         [self hideKeyboard:NO];
          [self showAdAlertViewImageRedPackage:@"ad_treasureBox.png" linkUrl:nil audio:nil duration:3 content:model showCancelButton:YES type:(DYAdModelTypeGiftOpen) success:NO];
         
@@ -9487,8 +9507,13 @@ NSMutableArray* temp = [[NSMutableArray alloc]init];
         
         return;
     }
+    
+    if (_iscpGourp==0) {
+         
+        return;
+    }
     /**/
-    if ([model.roomJid isEqualToString:_roomJid]) {
+//    if ([model.roomJid isEqualToString:_roomJid]) {
         if (model.type == 1) {
             JXLabelObject *obj = [JXLabelObject sharedInstance];
             obj.roomJid = self.roomJid;
@@ -9535,7 +9560,7 @@ NSMutableArray* temp = [[NSMutableArray alloc]init];
             
             _noticeView2.hidden = NO;
         }
-        if(model.type == 0) {
+        if(model.type == 10) {
             
             [self hideKeyboard:NO];
             // 第一次设置
@@ -9557,7 +9582,7 @@ NSMutableArray* temp = [[NSMutableArray alloc]init];
         if(model.type == 3) {
           //  [self showAdAlertViewImageString:@"ad_treasureBox.png" linkUrl:nil audio:nil duration:0 content:@"恭喜您获得一个宝箱!" showCancelButton:YES type:(DYAdModelTypeGiftOpen) success:NO];
         }
-    }
+//    }
 }
 
 // 群头衔开关控制

shiku_im/controller/JXSiDaiWebView.m

@@ -165,9 +165,32 @@
     cell.yuyueblock = ^(UIButton *btn) {
         
         NSString *menberShipAccout = [NSString stringWithFormat:@"%@",dict[@"membershipAccount"]];
+        
+        
+        
+        
         JXChatViewC *vc = [[JXChatViewC alloc] init]; //10000656 10000
         JXUserObject *user = [[JXUserObject sharedInstance] getUserById:menberShipAccout];
         vc.chatPerson = user;
+
+        
+        if (user==nil) {
+
+            vc.useInfoTempChat=11;
+            vc.sidaiPushstrInt=123456;
+            vc.sidaiPushstr=menberShipAccout;
+             vc.sidaiPushTitle=dict[@"name"];
+        }else{
+            
+            if ([user.status intValue]==2) {
+                
+            }else{
+                vc.useInfoTempChat=11; 
+            }
+            
+//            vc.sidaiPushstrInt=123456;
+            
+        }
         [g_navigation pushViewController:vc animated:YES];
     };
     

shiku_im/model/JXMessageObject.h

@@ -223,6 +223,9 @@ typedef enum {
 @property (nonatomic,strong) NSString*  messageId;//消息标识号，字符串,UUID <message>里
 @property (nonatomic,strong) NSString*  fromId;//发送ID <message>里
 @property (nonatomic,strong) NSString*  toId;//目标ID <message>里
+
+@property (nonatomic,strong) NSString*  msgtype;//目标ID <message>里
+
 //以下字段用于通讯，Body里：
 @property (nonatomic,strong) NSNumber*  type;//消息类型 <body>里
 @property (nonatomic,strong) NSString*  fromUserId;//源

shiku_im/model/JXXMPP.m

@@ -405,7 +405,7 @@ static JXXMPP *sharedManager;
                
                 NSLog(@"红包 龙：model.type %ld",(long)model.type);
                 [g_notify postNotificationName:kRoomRemind_RoomIsRedMoneyGroupActivityRefresh object:model];
-            }else if (model.type == 0){
+            }else if (model.type == 10){
               
                 
                 //if ([[msg.content mj_keyValues] isKindOfClass:[NSDictionary class]]) {

shiku_im/shiku_im-Info.plist

@@ -5,7 +5,7 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleDisplayName</key>
-	<string>即信</string>
+	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIcons</key>
@@ -21,7 +21,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.0.1</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -67,7 +67,7 @@
 		<dict/>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>20200717</string>
+	<string>20200720</string>
 	<key>LSApplicationCategoryType</key>
 	<string></string>
 	<key>LSApplicationQueriesSchemes</key>

shiku_im/shiku_im-Prefix.pch

@@ -14,7 +14,7 @@
 #define APIKEY @"a891a7a6-03af-475c-8ae1-7fb4b230e958"
 
 //#define APIURL @"47.57.16.13"
-
+ 
 
 #define APIURL @"qdzcie.com"
 
@@ -24,7 +24,7 @@
 //#define APIURL @"47.57.16.13"
 
 #define JPUSHAPPKEY @"23862a54c91a5e635f6dd1f2"
-#define JPUSHAPPKEY2 @"87934988728622492cbb45a2"
+#define JPUSHAPPKEY2 @"247d5f7506b27d1fb4d0d373"
 
 // AppStore版本
 #define AppStore 0