标题的增加

image.xcassets/chat/chatMang2.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "群主@2x.png",
+      "filename" : "chatMang2@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "群主@3x.png",
+      "filename" : "chatMang2@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

image.xcassets/chat/chatManger.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "管理@2x.png",
+      "filename" : "chatManger@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "管理@3x.png",
+      "filename" : "chatManger@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

image.xcassets/吉利救援金活动/qqValue.imageset/Contents.json

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

image.xcassets/吉利救援金活动/wxValue.imageset/Contents.json

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

image.xcassets/我的每日福利/jyjbeijing.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "jyjbeijing@2x.png",
+      "filename" : "beig@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "jyjbeijing@3x.png",
+      "filename" : "beig@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

image.xcassets/金管家UI/jgj立即领取.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "jgj立即领取@2x.png",
+      "filename" : "点击领取@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "jgj立即领取@3x.png",
+      "filename" : "点击领取@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

shiku_im.xcodeproj/project.pbxproj

@@ -450,6 +450,8 @@
 		4C50530D24A525B100E839FA /* JXGoldMangerVc.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C50530C24A525B100E839FA /* JXGoldMangerVc.m */; };
 		4C5E8EF424AD88F900CB54C0 /* JXTableMsgChatVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C5E8EF324AD88F800CB54C0 /* JXTableMsgChatVC.m */; };
 		4C5E8EF724ADB3F800CB54C0 /* JXQuestionnnnVc.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C5E8EF624ADB3F800CB54C0 /* JXQuestionnnnVc.m */; };
+		4C61CFE624B5D3EF0000A2CB /* UIScrollView+JXUITouch.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C61CFE524B5D3EF0000A2CB /* UIScrollView+JXUITouch.m */; };
+		4C61CFED24B5D4BF0000A2CB /* JXHomeScrollView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C61CFEC24B5D4BF0000A2CB /* JXHomeScrollView.m */; };
 		4C8C2DA624AAE9D500E7ECAB /* YPTabBar.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C8C2D9C24AAE9D200E7ECAB /* YPTabBar.m */; };
 		4C8C2DA724AAE9D500E7ECAB /* YPTabBarController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C8C2DA224AAE9D300E7ECAB /* YPTabBarController.m */; };
 		4C8C2DA824AAE9D500E7ECAB /* YPTabItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C8C2DA424AAE9D400E7ECAB /* YPTabItem.m */; };
@@ -2602,6 +2604,10 @@
 		4C5E8EF324AD88F800CB54C0 /* JXTableMsgChatVC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JXTableMsgChatVC.m; sourceTree = "<group>"; };
 		4C5E8EF524ADB3F800CB54C0 /* JXQuestionnnnVc.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JXQuestionnnnVc.h; sourceTree = "<group>"; };
 		4C5E8EF624ADB3F800CB54C0 /* JXQuestionnnnVc.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = JXQuestionnnnVc.m; sourceTree = "<group>"; };
+		4C61CFE424B5D3EF0000A2CB /* UIScrollView+JXUITouch.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UIScrollView+JXUITouch.h"; sourceTree = "<group>"; };
+		4C61CFE524B5D3EF0000A2CB /* UIScrollView+JXUITouch.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UIScrollView+JXUITouch.m"; sourceTree = "<group>"; };
+		4C61CFEB24B5D4BF0000A2CB /* JXHomeScrollView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JXHomeScrollView.h; sourceTree = "<group>"; };
+		4C61CFEC24B5D4BF0000A2CB /* JXHomeScrollView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = JXHomeScrollView.m; sourceTree = "<group>"; };
 		4C8C2D9C24AAE9D200E7ECAB /* YPTabBar.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = YPTabBar.m; sourceTree = "<group>"; };
 		4C8C2DA124AAE9D200E7ECAB /* YPTabBar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YPTabBar.h; sourceTree = "<group>"; };
 		4C8C2DA224AAE9D300E7ECAB /* YPTabBarController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = YPTabBarController.m; sourceTree = "<group>"; };
@@ -6953,6 +6959,10 @@
 				9D52CB71245A832B00009803 /* JXMessageTableVc.m */,
 				9D4C2DC92469589A00A6A4F8 /* JXCsHomeVc.h */,
 				9D4C2DC82469589A00A6A4F8 /* JXCsHomeVc.m */,
+				4C61CFE424B5D3EF0000A2CB /* UIScrollView+JXUITouch.h */,
+				4C61CFE524B5D3EF0000A2CB /* UIScrollView+JXUITouch.m */,
+				4C61CFEB24B5D4BF0000A2CB /* JXHomeScrollView.h */,
+				4C61CFEC24B5D4BF0000A2CB /* JXHomeScrollView.m */,
 				B18B72A22418BA2D00FA2BCE /* CYWebAddPointVC.h */,
 				B18B72A32418BA2D00FA2BCE /* CYWebAddPointVC.m */,
 				B1C883C724A66835000BC2B4 /* CYWebViewProgressView.h */,
@@ -11118,6 +11128,7 @@
 				CC6E168719794906006ADA8A /* JXRoomPool.m in Sources */,
 				63DD4F4F21314DB800DC45F8 /* LLSegmentBar.m in Sources */,
 				0FA2D5B11FB05CCC00D51BB9 /* GPUImageCrosshatchFilter.m in Sources */,
+				4C61CFE624B5D3EF0000A2CB /* UIScrollView+JXUITouch.m in Sources */,
 				8819A02923220BD70081FA49 /* JXSearchRecordCell.m in Sources */,
 				B1DE175E241F4F620081AE8A /* JLSingleFaceViewController.m in Sources */,
 				0FA2D6591FB05CCD00D51BB9 /* GPUImageRGBClosingFilter.m in Sources */,
@@ -11247,6 +11258,7 @@
 				9D52CC38245AB51B00009803 /* JXGiftViewController.m in Sources */,
 				9D6DD7F52488D55A00BE033D /* JXVipDetailBottomView.m in Sources */,
 				CCC88BA51E4C526F00180080 /* SBJsonTokeniser.m in Sources */,
+				4C61CFED24B5D4BF0000A2CB /* JXHomeScrollView.m in Sources */,
 				0FA2D5D91FB05CCC00D51BB9 /* GPUImageGaussianBlurFilter.m in Sources */,
 				0FA2D57D1FB05CCC00D51BB9 /* GPUImage3x3TextureSamplingFilter.m in Sources */,
 				63E76FAF229D37B900C269BE /* JXReplyAideKeyManageVC.m in Sources */,

shiku_im/AppDelegate.mm

@@ -351,7 +351,7 @@ static  BMKMapManager* _baiduMapManager;
              //为告展示效果更好,可设置为XHLaunchAdImageCacheInBackground,先缓存,下次显示
              imageAdconfiguration.imageOption = XHLaunchAdImageDefault;
              //图片填充模式
-             imageAdconfiguration.contentMode = UIViewContentModeScaleAspectFill;
+             imageAdconfiguration.contentMode = UIViewContentModeScaleToFill;
               //广告点击打开页面参数(openModel可为NSString,模型,字典等任意类型)
              imageAdconfiguration.openModel = link;
              //广告显示完成动画

shiku_im/ClassesNew/MainClass/XMGMainViewController.m

@@ -74,7 +74,9 @@
     [self initViewControllers];
     self.tabBar.backgroundColor = [UIColor whiteColor];
     
+    NSLog(@"login_%@",g_server.myself.userId);
     
+    [g_server getUser:g_server.myself.userId toView:self];
 }
 
 - (void)viewDidAppear:(BOOL)animated {
@@ -206,6 +208,13 @@
 
 -(void) didServerResultSucces:(JXConnection*)aDownload dict:(NSDictionary*)dict array:(NSArray*)array1{
     //更新本地好友
+    if ([aDownload.action isEqualToString:act_UserGet]) {
+           NSString *memberAcc= dict[@"membershipAccount"];
+          [[NSUserDefaults standardUserDefaults] setObject:memberAcc forKey:@"membershipAccount_ID"];
+          [[NSUserDefaults standardUserDefaults] synchronize];
+
+       }
+    
     if ([aDownload.action isEqualToString:act_AttentionList]) {
         JXProgressVC * pv = [JXProgressVC alloc];
         pv.dataArray = array1;

shiku_im/ClassesNew/MainClass/XMGNavigationViewController.m

@@ -22,13 +22,21 @@
 //    [bar setTintColor:[UIColor blackColor]];
     [bar setBackgroundImage:bg forBarMetrics:UIBarMetricsDefault];
     [bar setTitleTextAttributes:@{NSFontAttributeName : [UIFont boldSystemFontOfSize:20]}];
+    
+}
+- (void)viewDidLoad{
+    [super viewDidLoad];
+    
+    self.interactivePopGestureRecognizer.delegate= (id)self;
 }
-
 - (void)pushViewController:(UIViewController *)viewController animated:(BOOL)animated
 {
+    if ([self respondsToSelector:@selector(interactivePopGestureRecognizer)]) {
+                 self.interactivePopGestureRecognizer.enabled = NO;
+      }
     if (self.childViewControllers.count) {
         viewController.hidesBottomBarWhenPushed = YES;
-        
+      
         UIButton *button = [[UIButton alloc] init];
         [button setImage:[UIImage imageNamed:@"navigationButtonReturn"] forState:UIControlStateNormal];
         [button setImage:[UIImage imageNamed:@"navigationButtonReturnClick"] forState:UIControlStateHighlighted];
@@ -50,5 +58,15 @@
 {
     [self popViewControllerAnimated:YES];
 }
+ 
 
+- (void)navigationController:(UINavigationController *)navigationController didShowViewController:(UIViewController *)viewController animated:(BOOL)animated{
+    if ([navigationController respondsToSelector:@selector(interactivePopGestureRecognizer)]) {
+        navigationController.interactivePopGestureRecognizer.enabled = YES;
+    }
+    
+    if (navigationController.viewControllers.count == 1) {
+        navigationController.interactivePopGestureRecognizer.enabled = NO;
+    }
+}
 @end

shiku_im/ClassesNew/MainClass/XMGOpenGLNavVc.m

@@ -34,12 +34,19 @@
     
     
 }
-
+/*
 -(void)viewDidLoad{
     [super viewDidLoad];
+    
+    if ([self respondsToSelector:@selector(interactivePopGestureRecognizer)]) {
+                           self.interactivePopGestureRecognizer.enabled = NO;
+                }
 }
+ */
 - (void)pushViewController:(UIViewController *)viewController animated:(BOOL)animated
     {
+       
+        
         if (self.childViewControllers.count) {
             viewController.hidesBottomBarWhenPushed = YES;
             UIButton *button = [[UIButton alloc] init];
@@ -72,9 +79,21 @@
 -(void)back{ 
     [self popViewControllerAnimated:YES];
 }
-- (BOOL)gestureRecognizerShouldBegin:(UIGestureRecognizer *)gestureRecognizer
-{
-    // 手势何时有效 : 当导航控制器的子控制器个数 > 1就有效
-    return self.childViewControllers.count > 1;
+
+
+- (void)navigationController:(UINavigationController *)navigationController didShowViewController:(UIViewController *)viewController animated:(BOOL)animated{
+    if ([navigationController respondsToSelector:@selector(interactivePopGestureRecognizer)]) {
+        navigationController.interactivePopGestureRecognizer.enabled = YES;
+    }
+    
+    if (navigationController.viewControllers.count == 1) {
+        navigationController.interactivePopGestureRecognizer.enabled = NO;
+    }
 }
+
+//- (BOOL)gestureRecognizerShouldBegin:(UIGestureRecognizer *)gestureRecognizer
+//{
+//    // 手势何时有效 : 当导航控制器的子控制器个数 > 1就有效
+//    return self.childViewControllers.count > 1;
+//}
 @end

shiku_im/ClassesNew/MainClass/YPTabBarController.m

@@ -7,6 +7,7 @@
 //
 
 #import "YPTabBarController.h"
+#import "JXHomeScrollView.h"
 #import <objc/runtime.h>
 
 #define TAB_BAR_HEIGHT 50
@@ -14,7 +15,7 @@
 @interface YPTabBarController () {
     BOOL _didViewAppeared;
 }
-@property (nonatomic, strong) UIScrollView *scrollView;
+@property (nonatomic, strong) JXHomeScrollView *scrollView;
 
 @property (nonatomic, assign) BOOL contentScrollEnabled;
 @property (nonatomic, assign) BOOL contentSwitchAnimated;
@@ -164,7 +165,7 @@
 
 - (void)setContentScrollEnabledAndTapSwitchAnimated:(BOOL)switchAnimated {
     if (!self.scrollView) {
-        self.scrollView = [[UIScrollView alloc] initWithFrame:self.contentViewFrame];
+        self.scrollView = [[JXHomeScrollView alloc] initWithFrame:self.contentViewFrame];
         self.scrollView.pagingEnabled = YES;
         self.scrollView.showsHorizontalScrollIndicator = NO;
         self.scrollView.showsVerticalScrollIndicator = NO;

shiku_im/ClassesNew/classes/fuliVc/JXBigReelVc.h

@@ -16,6 +16,9 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic,strong) NSDictionary *dictMoney;
 
 @property (nonatomic,strong) NSString *pushWheel;
+
+
+@property (nonatomic,assign) int   numberStr;
 @end
 
 NS_ASSUME_NONNULL_END

shiku_im/ClassesNew/classes/fuliVc/JXBigReelVc.m

@@ -255,6 +255,14 @@
 }
 - (void)rightBTClick:(UIButton *)sender{
     
+    
+    if (_numberStr<=0) {
+        
+      UIAlertView *alertShow=[[UIAlertView alloc]initWithTitle:nil message:[NSString stringWithFormat:@"%@",@"抽奖次数已用完！"] delegate:nil cancelButtonTitle:@"知道了" otherButtonTitles:nil, nil];
+          [alertShow show];
+        
+        return;
+    }
      sender.hidden=YES;
     _righBtpIMG.hidden=NO;
     
@@ -427,12 +435,8 @@
         
 
         _cjNums.text=[NSString stringWithFormat:@"今日剩余抽奖次数：%@次",dict[@"surplusCount"]];
-        
-        if ([dict[@"surplusCount"] intValue]==0) {
-            
-             UIAlertView *alertShow=[[UIAlertView alloc]initWithTitle:nil message:[NSString stringWithFormat:@"%@",@"今日抽奖次数已用完"] delegate:nil cancelButtonTitle:@"知道了" otherButtonTitles:nil, nil];
-                          [alertShow show];
-        }
+        _numberStr=[dict[@"surplusCount"] intValue];
+         
         
         
     } if([aDownload.action isEqualToString:act_firstNearTurntableHistory])

shiku_im/ClassesNew/classes/fuliVc/JXGoldMangVc.h

@@ -12,6 +12,11 @@
 NS_ASSUME_NONNULL_BEGIN
 
 @interface JXGoldMangVc : XMGMyBaseVC
+
+
+@property (nonatomic,strong) NSDictionary *vipDict;
+
+
 @property (nonatomic,copy) NSString *nameStr;
 @end
 

shiku_im/ClassesNew/classes/fuliVc/JXGoldMangVc.m

@@ -84,7 +84,8 @@
     _headIMG.layer.masksToBounds=YES;
     [g_server getHeadImageSmall:g_server.myself.userId userName:g_server.myself.userNickname imageView:self.headIMG];
     self.userName.text=g_myself.userNickname;
-       
+
+       _vipDict=[NSDictionary dictionary];
     
     if (JX_SCREEN_WIDTH>=414){
 
@@ -194,6 +195,10 @@
     
     if([aDownload.action isEqualToString:act_GetUserVipInformation])
     {
+        
+        
+        _vipDict=dict;
+        
         NSDictionary * currentDictionary = [dict objectForKey:@"current"];
         self.levelL.text=[NSString stringWithFormat:@"%@",currentDictionary[@"level"]];
         self.keLinL.text=[NSString stringWithFormat:@"%@",currentDictionary[@"money"]];
@@ -214,7 +219,7 @@
         self.weekFL2.text=[NSString stringWithFormat:@"%@",nextDictionary[@"weekRedPackageCoin"]];
         self.monthFL2.text=[NSString stringWithFormat:@"%@",nextDictionary[@"monthRedPackageCoin"]];
         
-        
+         return;
         if ([weeekStr floatValue]<=0) {
              
             self.nowLIngBtn.alpha=0.5;

shiku_im/ClassesNew/classes/fuliVc/JXGoldMangerVc.m

@@ -402,7 +402,7 @@
     time = (time *1000 + g_server.timeDifference);
    // NSString *salt = [NSString stringWithFormat:@"%ld", time];
            
-    [SVProgressHUD show];
+//    [SVProgressHUD show];
      
     [g_server getUserVipInformation:@"" andToView:self];
     
@@ -500,13 +500,11 @@
                     //可领取
 
                  
-                    long time = (long)[[NSDate date] timeIntervalSince1970];
-                    time = (time *1000 + g_server.timeDifference);
-                    NSString *salt = [NSString stringWithFormat:@"%ld", time];
-                    [g_server vipGainCoin:salt andToView:self];
                   
                     // [g_server getUserVipact_GainUserGoldMang:salt andToView:self]
                     [JXGoldShareView showView];
+                    
+                    return;
                 } else {
                     
                     int dataValue=[mydate intValue];
@@ -546,8 +544,8 @@
                             break;
                     
                     }
-                    
-                    show.nameStr= [NSString stringWithFormat:@"本活动奖励仅限每周%@ 中午12点开放领取！",week];
+                       
+                    show.nameStr= [NSString stringWithFormat:@"很抱歉，本活动仅限每周%d 中午12:00数据更新后开放领取",[_vipDict[@"configWeek"] intValue]-1];
                     
                     //不可领取
                 }
@@ -723,7 +721,9 @@
     NSString * errorCode = [NSString stringWithFormat:@"%@",[dict objectForKey:@"resultMsg"]];
     if([errorCode isEqualToString:@"权限验证失败"])
     {
-       
+ 
+         
+        [g_server getUserVipInformation:@"" andToView:self];
     }
     else
     {

shiku_im/ClassesNew/classes/fuliVc/JXLuckRescueFundVc.m

@@ -44,18 +44,18 @@
     titleIMG.userInteractionEnabled=YES;
     [backIMG addSubview:titleIMG];
     [titleIMG mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.top.mas_equalTo(JX_SCREEN_TOP);
+        make.top.mas_equalTo(0);
         make.centerX.mas_equalTo(backIMG.mas_centerX);
     }];
      
     UIImageView *titleIMG22  =[[UIImageView alloc]initWithImage:[UIImage imageNamed:@"尊敬的会员"]];
        [backIMG addSubview:titleIMG22];
        [titleIMG22 mas_makeConstraints:^(MASConstraintMaker *make) {
-           make.top.mas_equalTo(titleIMG.mas_bottom).mas_offset(30);
+           make.top.mas_equalTo(titleIMG.mas_bottom).mas_offset(1);
            make.centerX.mas_equalTo(backIMG.mas_centerX);
        }];
-    _titleIMG22 = titleIMG22;
-    _titleIMG22.hidden = YES;
+//    _titleIMG22 = titleIMG22;
+//    _titleIMG22.hidden = YES;
     
     UIImageView *moneyIMG  =[[UIImageView alloc]initWithImage:[UIImage imageNamed:@"jyj救援金"]];
     [backIMG addSubview:moneyIMG];

shiku_im/ClassesNew/classes/fuliVc/JXMeiRiShowView.m

@@ -36,7 +36,7 @@
          [backView addSubview:whiteShowView];
          [whiteShowView mas_makeConstraints:^(MASConstraintMaker *make) {
              make.centerX.mas_equalTo(backView.mas_centerX);
-             make.centerY.mas_equalTo(backView.mas_centerY);
+             make.centerY.mas_equalTo(backView.mas_centerY).mas_offset(10);
              make.width.mas_equalTo(JX_SCREEN_WIDTH-100);
              make.height.mas_equalTo(JX_SCREEN_WIDTH<414?160:150);
          }];
@@ -52,8 +52,8 @@
          [whiteShowView addSubview:subtitle];
          [subtitle mas_makeConstraints:^(MASConstraintMaker *make) {
               make.top.mas_equalTo(60);
-             make.left.mas_equalTo(0);
-             make.right.mas_equalTo(1);
+             make.left.mas_equalTo(5);
+             make.right.mas_equalTo(-5);
              make.centerX.mas_equalTo(whiteShowView.mas_centerX);
          }];
          

shiku_im/ClassesNew/classes/fuliVc/JXQuestionnnnVc.m

@@ -238,7 +238,7 @@
     __block QustionJX *modelS=nil;
     [_questionArr enumerateObjectsUsingBlock:^(QustionJX * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
        // if ([obj.sort intValue]==_currentSort) {
-        if ([obj.title isEqualToString:self.questionTitle.text]) {
+        if ([obj.title isEqualToString:self.questionLabel.text]) {
             modelS=obj;
         }
     }];

shiku_im/ClassesNew/classes/fuliVc/JXShenQinTiMoneyVc.xib

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16096" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
@@ -105,14 +105,14 @@
                             <color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                             <nil key="highlightedColor"/>
                         </label>
-                        <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" placeholder="请输入体现金额" textAlignment="right" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="HTK-OI-gNR">
+                        <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" placeholder="请输入提现金额" textAlignment="right" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="HTK-OI-gNR">
                             <rect key="frame" x="299" y="5" width="100" height="44"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="44" id="5z2-UI-5EF"/>
                             </constraints>
                             <color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                             <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                            <textInputTraits key="textInputTraits"/>
+                            <textInputTraits key="textInputTraits" keyboardType="decimalPad"/>
                         </textField>
                     </subviews>
                     <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>

shiku_im/ClassesNew/classes/fuliVc/JXWellBeingVc.m

@@ -139,7 +139,7 @@
 }
 -(void)initTalbelView
 {
-    NSArray *titles=@[@{@"icon":@"mei日renwu",@"title":@"每日任务"},@{@"icon":@"wzguilai",@"title":@"王者归来"}, @{@"icon":@"jljgj",@"title":@"吉利金管家"},@{@"icon":@"hysc",@"title":@"会员首存"},@{@"icon":@"shen请daili",@"title":@"申请代理"},
+    NSArray *titles=@[@{@"icon":@"mei日renwu",@"title":@"每日任务"},@{@"icon":@"wzguilai",@"title":@"王者归来"},@{@"icon":@"hysc",@"title":@"会员首存"}, @{@"icon":@"jljgj",@"title":@"吉利金管家"},@{@"icon":@"shen请daili",@"title":@"申请代理"},
           @{@"icon":@"qwhby",@"title":@"千万红包"}];
     
     _dataArr=[NSMutableArray array];

shiku_im/ClassesNew/classes/homeVc/JXAddrBookFriendVc.m

@@ -93,6 +93,7 @@
         self.tableView.frame=CGRectMake(0, JX_SCREEN_TOP, JX_SCREEN_WIDTH, JX_SCREEN_HEIGHT-JX_SCREEN_TOP-55);
         [self customView];
 
+        _table.contentInset=UIEdgeInsetsMake(55, 0, 0, 0);
         _selMenu = 0;
 //        self.title = Localized(@"JXInputVC_Friend");
         self.title = Localized(@"JX_MailList");

shiku_im/ClassesNew/classes/homeVc/JXCsHomeVc.m

@@ -12,6 +12,7 @@
 #import "XMGMainViewController.h"
 #import "JXShowMainView.h"
 #import "YPTabBarController.h"
+#import "JXHomeScrollView.h"
 
 @interface JXCsHomeVc ()<UIScrollViewDelegate>
 
@@ -74,7 +75,11 @@
     
    // [self.topButton addTarget:self action:@selector(topBtnClick) forControlEvents:UIControlEventTouchUpInside];
     [g_notify addObserver:self selector:@selector(showAD) name:kLaunchAdShowFinishNotifaction object:nil];
- }
+
+//    self.contentView.delaysContentTouches=NO;
+//    self.contentView.canCancelContentTouches=NO;
+  
+}
  
 
 - (void)showAD {
@@ -87,7 +92,7 @@
  
 - (void)setupContentView
 {
-    UIScrollView *contentView = [[UIScrollView alloc] init];
+    JXHomeScrollView *contentView = [[JXHomeScrollView alloc] init];
     contentView.backgroundColor = kRGBColor(250, 250, 250);
     contentView.frame = CGRectMake(0, JX_SCREEN_TOP, self.view.bounds.size.width, self.view.bounds.size.height-JX_SCREEN_TOP);
     contentView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
@@ -99,7 +104,7 @@
     contentView.contentSize = CGSizeMake(contentView.xmg_width * self.childViewControllers.count, 0);
     [self.view addSubview:contentView];
     self.contentView = contentView;
-     
+     return;
     id traget = self.navigationController.interactivePopGestureRecognizer.delegate;
     UIPanGestureRecognizer * pan = [[UIPanGestureRecognizer alloc]initWithTarget:traget action:nil];
     [contentView addGestureRecognizer:pan];

shiku_im/ClassesNew/classes/homeVc/JXHomeScrollView.h

@@ -0,0 +1,17 @@
+//
+//  JXHomeScrollView.h
+//  shiku_im
+//
+//  Created by os on 2020/7/8.
+//  Copyright © 2020 Reese. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface JXHomeScrollView : UIScrollView
+
+@end
+
+NS_ASSUME_NONNULL_END

shiku_im/ClassesNew/classes/homeVc/JXHomeScrollView.m

@@ -0,0 +1,47 @@
+//
+//  JXHomeScrollView.m
+//  shiku_im
+//
+//  Created by os on 2020/7/8.
+//  Copyright © 2020 Reese. All rights reserved.
+//
+
+#import "JXHomeScrollView.h"
+#import "UIScrollView+JXUITouch.h"
+
+
+@implementation JXHomeScrollView
+
+/*
+// Only override drawRect: if you perform custom drawing.
+// An empty implementation adversely affects performance during animation.
+- (void)drawRect:(CGRect)rect {
+    // Drawing code
+}
+*/
+-(id)initWithFrame:(CGRect)frame
+{
+    self = [super initWithFrame:frame];
+    if (self) {
+        
+    }
+    return self;
+}
+
+- (void)dealloc
+{
+    
+}
+
+- (BOOL)touchesShouldBegin:(NSSet *)touches withEvent:(UIEvent *)event inContentView:(UIView *)view
+{
+    NSLog(@"用户点击了scroll上的视图%@,是否开始滚动scroll",view);
+    //返回yes 是不滚动 scroll 返回no 是滚动scroll
+    return YES;
+}
+- (BOOL)touchesShouldCancelInContentView:(UIView *)view
+{
+    NSLog(@"用户点击的视图 %@",view);
+    return NO;
+}
+@end

shiku_im/ClassesNew/classes/homeVc/UIScrollView+JXUITouch.h

@@ -0,0 +1,17 @@
+//
+//  UIScrollView+JXUITouch.h
+//  shiku_im
+//
+//  Created by os on 2020/7/8.
+//  Copyright © 2020 Reese. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface UIScrollView (JXUITouch)
+
+@end
+
+NS_ASSUME_NONNULL_END

shiku_im/ClassesNew/classes/homeVc/UIScrollView+JXUITouch.m

@@ -0,0 +1,41 @@
+//
+//  UIScrollView+JXUITouch.m
+//  shiku_im
+//
+//  Created by os on 2020/7/8.
+//  Copyright © 2020 Reese. All rights reserved.
+//
+
+#import "UIScrollView+JXUITouch.h"
+
+@implementation UIScrollView (JXUITouch)
+ 
+
+- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event {
+
+    [[self nextResponder] touchesBegan:touches withEvent:event];
+
+    //[super touchesBegan:touches withEvent:event];
+
+}
+
+ 
+
+-(void)touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event {
+
+    [[self nextResponder] touchesMoved:touches withEvent:event];
+
+    //[super touchesMoved:touches withEvent:event];
+
+}
+
+ 
+
+- (void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event {
+
+    [[self nextResponder] touchesEnded:touches withEvent:event];
+
+    //[super touchesEnded:touches withEvent:event];
+
+}
+@end

shiku_im/ClassesNew/classes/loginmVc/JXLoginTopView.xib

@@ -22,15 +22,15 @@
                     <rect key="frame" x="0.0" y="0.0" width="160" height="100"/>
                     <subviews>
                         <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="PAGCOR" translatesAutoresizingMaskIntoConstraints="NO" id="xJo-bZ-CBn">
-                            <rect key="frame" x="35" y="7" width="50" height="50"/>
+                            <rect key="frame" x="25" y="7" width="50" height="50"/>
                             <constraints>
                                 <constraint firstAttribute="width" constant="50" id="Chs-oG-LzI"/>
                                 <constraint firstAttribute="height" constant="50" id="er9-cX-Ucm"/>
                             </constraints>
                         </imageView>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="菲律宾政府PAGCOR" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="KgC-nW-lkv">
-                            <rect key="frame" x="13.5" y="77" width="93" height="12"/>
-                            <fontDescription key="fontDescription" type="system" pointSize="10"/>
+                            <rect key="frame" x="-14.5" y="77" width="129" height="17"/>
+                            <fontDescription key="fontDescription" type="system" pointSize="14"/>
                             <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                             <nil key="highlightedColor"/>
                         </label>
@@ -38,33 +38,33 @@
                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     <constraints>
                         <constraint firstItem="xJo-bZ-CBn" firstAttribute="top" secondItem="Eg6-Rh-YRS" secondAttribute="top" constant="7" id="E6n-Ow-MVw"/>
-                        <constraint firstItem="KgC-nW-lkv" firstAttribute="centerX" secondItem="Eg6-Rh-YRS" secondAttribute="centerX" constant="-20" id="Glz-bN-INc"/>
+                        <constraint firstItem="KgC-nW-lkv" firstAttribute="centerX" secondItem="Eg6-Rh-YRS" secondAttribute="centerX" constant="-30" id="Glz-bN-INc"/>
                         <constraint firstItem="KgC-nW-lkv" firstAttribute="top" secondItem="xJo-bZ-CBn" secondAttribute="bottom" constant="20" id="Jy7-TM-m38"/>
-                        <constraint firstItem="xJo-bZ-CBn" firstAttribute="centerX" secondItem="Eg6-Rh-YRS" secondAttribute="centerX" constant="-20" id="ns0-bc-FK3"/>
+                        <constraint firstItem="xJo-bZ-CBn" firstAttribute="centerX" secondItem="Eg6-Rh-YRS" secondAttribute="centerX" constant="-30" id="ns0-bc-FK3"/>
                     </constraints>
                 </view>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="pba-XA-BAZ">
                     <rect key="frame" x="160" y="0.0" width="160" height="100"/>
                     <subviews>
                         <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ygmdbcjdwyh" translatesAutoresizingMaskIntoConstraints="NO" id="k2d-I5-mc7">
-                            <rect key="frame" x="75" y="7" width="50" height="50"/>
+                            <rect key="frame" x="85" y="7" width="50" height="50"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="50" id="2f9-Ep-zn9"/>
                                 <constraint firstAttribute="width" constant="50" id="9zW-rJ-pZP"/>
                             </constraints>
                         </imageView>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="英国曼岛博彩监督委员会" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="z9S-KK-W3L">
-                            <rect key="frame" x="44" y="77" width="112.5" height="12"/>
-                            <fontDescription key="fontDescription" type="system" pointSize="10"/>
+                            <rect key="frame" x="31.5" y="77" width="157.5" height="17"/>
+                            <fontDescription key="fontDescription" type="system" pointSize="14"/>
                             <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                             <nil key="highlightedColor"/>
                         </label>
                     </subviews>
                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     <constraints>
-                        <constraint firstItem="k2d-I5-mc7" firstAttribute="centerX" secondItem="pba-XA-BAZ" secondAttribute="centerX" constant="20" id="9qO-O6-Vac"/>
+                        <constraint firstItem="k2d-I5-mc7" firstAttribute="centerX" secondItem="pba-XA-BAZ" secondAttribute="centerX" constant="30" id="9qO-O6-Vac"/>
                         <constraint firstItem="z9S-KK-W3L" firstAttribute="top" secondItem="k2d-I5-mc7" secondAttribute="bottom" constant="20" id="Hv6-1X-5hs"/>
-                        <constraint firstItem="z9S-KK-W3L" firstAttribute="centerX" secondItem="pba-XA-BAZ" secondAttribute="centerX" constant="20" id="QUe-ck-wk9"/>
+                        <constraint firstItem="z9S-KK-W3L" firstAttribute="centerX" secondItem="pba-XA-BAZ" secondAttribute="centerX" constant="30" id="QUe-ck-wk9"/>
                         <constraint firstItem="k2d-I5-mc7" firstAttribute="top" secondItem="pba-XA-BAZ" secondAttribute="top" constant="7" id="dM2-DO-Mca"/>
                     </constraints>
                 </view>
@@ -72,23 +72,23 @@
                     <rect key="frame" x="0.0" y="100" width="160" height="100"/>
                     <subviews>
                         <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="mqtzxbcwyh" translatesAutoresizingMaskIntoConstraints="NO" id="gd3-Iq-jOe">
-                            <rect key="frame" x="35" y="10" width="50" height="50"/>
+                            <rect key="frame" x="25" y="10" width="50" height="50"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="50" id="C0W-FD-yrD"/>
                                 <constraint firstAttribute="width" constant="50" id="FXt-xY-Szo"/>
                             </constraints>
                         </imageView>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="马其他在线博彩委员会" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WQ3-va-Xog">
-                            <rect key="frame" x="9" y="80" width="102.5" height="12"/>
-                            <fontDescription key="fontDescription" type="system" pointSize="10"/>
+                            <rect key="frame" x="-21.5" y="80" width="143" height="17"/>
+                            <fontDescription key="fontDescription" type="system" pointSize="14"/>
                             <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                             <nil key="highlightedColor"/>
                         </label>
                     </subviews>
                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     <constraints>
-                        <constraint firstItem="gd3-Iq-jOe" firstAttribute="centerX" secondItem="JpG-R9-SHQ" secondAttribute="centerX" constant="-20" id="asA-ia-cV7"/>
-                        <constraint firstItem="WQ3-va-Xog" firstAttribute="centerX" secondItem="JpG-R9-SHQ" secondAttribute="centerX" constant="-20" id="c4g-vd-emA"/>
+                        <constraint firstItem="gd3-Iq-jOe" firstAttribute="centerX" secondItem="JpG-R9-SHQ" secondAttribute="centerX" constant="-30" id="asA-ia-cV7"/>
+                        <constraint firstItem="WQ3-va-Xog" firstAttribute="centerX" secondItem="JpG-R9-SHQ" secondAttribute="centerX" constant="-30" id="c4g-vd-emA"/>
                         <constraint firstItem="WQ3-va-Xog" firstAttribute="top" secondItem="gd3-Iq-jOe" secondAttribute="bottom" constant="20" id="t2g-oS-8v5"/>
                         <constraint firstItem="gd3-Iq-jOe" firstAttribute="top" secondItem="JpG-R9-SHQ" secondAttribute="top" constant="10" id="w1u-8j-scM"/>
                     </constraints>
@@ -97,15 +97,15 @@
                     <rect key="frame" x="160" y="100" width="160" height="100"/>
                     <subviews>
                         <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="zbltbcwyh" translatesAutoresizingMaskIntoConstraints="NO" id="BHF-cT-lAs">
-                            <rect key="frame" x="75" y="10" width="50" height="50"/>
+                            <rect key="frame" x="85" y="10" width="50" height="50"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="50" id="4Q2-lK-MR4"/>
                                 <constraint firstAttribute="width" constant="50" id="aar-br-aUd"/>
                             </constraints>
                         </imageView>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="直布罗陀博彩委员会" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="loT-cw-Sma">
-                            <rect key="frame" x="54" y="80" width="92" height="12"/>
-                            <fontDescription key="fontDescription" type="system" pointSize="10"/>
+                            <rect key="frame" x="45.5" y="80" width="129" height="17"/>
+                            <fontDescription key="fontDescription" type="system" pointSize="14"/>
                             <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                             <nil key="highlightedColor"/>
                         </label>
@@ -114,8 +114,8 @@
                     <constraints>
                         <constraint firstItem="loT-cw-Sma" firstAttribute="top" secondItem="BHF-cT-lAs" secondAttribute="bottom" constant="20" id="FXS-UD-5hT"/>
                         <constraint firstItem="BHF-cT-lAs" firstAttribute="top" secondItem="kkB-xC-ynp" secondAttribute="top" constant="10" id="Qyl-VN-tvo"/>
-                        <constraint firstItem="BHF-cT-lAs" firstAttribute="centerX" secondItem="kkB-xC-ynp" secondAttribute="centerX" constant="20" id="oN1-fX-jGl"/>
-                        <constraint firstItem="loT-cw-Sma" firstAttribute="centerX" secondItem="kkB-xC-ynp" secondAttribute="centerX" constant="20" id="wpy-pQ-1bt"/>
+                        <constraint firstItem="BHF-cT-lAs" firstAttribute="centerX" secondItem="kkB-xC-ynp" secondAttribute="centerX" constant="30" id="oN1-fX-jGl"/>
+                        <constraint firstItem="loT-cw-Sma" firstAttribute="centerX" secondItem="kkB-xC-ynp" secondAttribute="centerX" constant="30" id="wpy-pQ-1bt"/>
                     </constraints>
                 </view>
             </subviews>

shiku_im/ClassesNew/classes/loginmVc/JXMainLoginVc.m

@@ -724,26 +724,42 @@
               
         [array1 enumerateObjectsUsingBlock:^(NSDictionary * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
             if ([obj[@"code"] isEqualToString:@"loginermp4"]) {
-
-                 NSString *fileUrll=obj[@"fileUrl"];
-              
+                
+                NSString *fileUrll=obj[@"fileUrl"];
                 dispatch_async(dispatch_get_main_queue(), ^{
-
-//                     [self setMoviePlayer:fileUrll];
-//                     [g_App setupLunchADUrl:fileUrll link:@""];
+                    // [self setMoviePlayer:fileUrll];
+                    //  [g_App setupLunchADUrl:fileUrll link:@""];
+                    
+                });
+            }
+            
+            if (JX_SCREEN_HEIGHT>=812) {
+                 if ([obj[@"code"] isEqualToString:@"ggxcmp4_3x"]) {
+                     
+                     NSString *fileUrll=obj[@"fileUrl"];
+                     
+                     dispatch_async(dispatch_get_main_queue(), ^{
+                         
+                         
+                         [g_App setupLunchADUrl:fileUrll link:@""];
+                         
+                     });
+                 }
+            }else{
+                if ([obj[@"code"] isEqualToString:@"ggxcmp4_2x"]) {
+                    
+                    NSString *fileUrll=obj[@"fileUrl"];
+                    
+                    dispatch_async(dispatch_get_main_queue(), ^{
+                        
+                        
+                        [g_App setupLunchADUrl:fileUrll link:@""];
                         
                     });
-            } if ([obj[@"code"] isEqualToString:@"ggxcmp4"]) {
-
-                            NSString *fileUrll=obj[@"fileUrl"];
-                         
-                           dispatch_async(dispatch_get_main_queue(), ^{
-
-                                 
-                                [g_App setupLunchADUrl:fileUrll link:@""];
-                                   
-                               });
-                       }
+                }
+            }
+            
+            
             
             
             

shiku_im/ClassesNew/classes/messageVc/JXMsgCellView.m

@@ -45,7 +45,7 @@
      [_jixinView addGestureRecognizer:[[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(friendGrounAddresJiXinView:)]];
     
     
-    _dataArr =[[JXFriendObject sharedInstance] fetchAllFriendsFromLocal];
+//    _dataArr =[[JXFriendObject sharedInstance] fetchAllFriendsFromLocal];
     
     NSMutableArray *tempArr=[NSMutableArray array];
     [_dataArr enumerateObjectsUsingBlock:^(JXFriendObject * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {

shiku_im/ClassesNew/classes/messageVc/JXMsgViewController.m

@@ -159,9 +159,9 @@
 
              
                 
-                //[g_notify  addObserver:self selector:@selector(newFriend:) name:kXMPPNewFriendNotifaction object:nil];
+//                [g_notify  addObserver:self selector:@selector(newFriend:) name:kXMPPNewFriendNotifaction object:nil];
                 
-               // [g_notify addObserver:self selector:@selector(newRequest:) name:kXMPPNewRequestNotifaction object:nil];
+//                [g_notify addObserver:self selector:@selector(newRequest:) name:kXMPPNewRequestNotifaction object:nil];
                 [g_notify addObserver:self selector:@selector(showAD) name:kLaunchAdShowFinishNotifaction object:nil];
                 [g_notify  addObserver:self selector:@selector(allMsgCome) name:kXMPPAllMsgNotifaction object:nil];//收到了所有消息,一次性刷新
                 [g_notify  addObserver:self selector:@selector(newMsgCome:) name:kXMPPNewMsgNotifaction object:nil];//收到了一条新消息
@@ -273,7 +273,7 @@
     self.view.backgroundColor=kRGBColor250;
     [self customView];
     [self navGuese];
-    
+    [g_notify addObserver:self selector:@selector(onQuitRoom:) name:kQuitRoomNotifaction object:nil];//退出了房间
     [self getServerData];
     //self.tableView.contentInset=UIEdgeInsetsMake(64, 0, 0, 0);
    
@@ -987,7 +987,7 @@
        } else {
            cell.bage = [NSString stringWithFormat:@"%d",[dict.user.msgsNew intValue]];
        }
-    NSLog(@"zzzzzzz%d",[dict.user.msgsNew intValue]);
+   // NSLog(@"zzzzzzz%d",[dict.user.msgsNew intValue]);
     cell.isMsgVCCome = YES;
     cell.index = (int)indexPath.row;
     cell.bottomTitle  = [TimeUtil getTimeStrStyle1:[dict.message.timeSend timeIntervalSince1970]];
@@ -1768,6 +1768,7 @@
     sendView.lastMsg = p.message;
     sendView.chatPerson = p.user;
     sendView = [sendView init];
+   // [g_navigation pushViewController:sendView animated:YES];
    [self.navigationController pushViewController:sendView animated:YES];
     sendView.view.hidden = NO;
     p.user.msgsNew = [NSNumber numberWithInt:0];
@@ -2449,8 +2450,12 @@
        [[NSUserDefaults standardUserDefaults] setObject:memberAcc forKey:@"membershipAccount_ID"];
        [[NSUserDefaults standardUserDefaults] synchronize];
         
-        NSString *membershipAccount = [[NSUserDefaults standardUserDefaults] objectForKey:@"membershipAccount_ID"];
-        self.titleLb.text = [NSString stringWithFormat:@"我的即信号:%@",membershipAccount];
+        NSString *gradeIndexcc= dict[@"gradeIndex"];
+        [[NSUserDefaults standardUserDefaults] setObject:gradeIndexcc forKey:@"gradeIndexcc"];
+        [[NSUserDefaults standardUserDefaults] synchronize];
+        
+        //NSString *membershipAccount = [[NSUserDefaults standardUserDefaults] objectForKey:@"membershipAccount_ID"];
+         self.titleLb.text = [NSString stringWithFormat:@"我的即信号:%@",memberAcc];
     }
     
     //更新本地好友

shiku_im/ClassesNew/classes/messageVc/JXNewFriendViewController.m

@@ -506,7 +506,7 @@
     [SaveOrReadArr initSerializationFriendArray:arrxx];
 //加好友
     [_wait stop];
-    [g_notify postNotificationName:@"newFriend" object:nil userInfo:@{@"use":user}];
+   // [g_notify postNotificationName:@"newFriend" object:nil userInfo:@{@"use":user}];
     [self refresh];
     [_wait stop];
 }
@@ -654,7 +654,7 @@
     }
     
     
-     [g_notify postNotificationName:@"newFriend" object:nil userInfo:@{@"use":_user}];
+     //[g_notify postNotificationName:@"newFriend" object:nil userInfo:@{@"use":_user}];
 }
 
 @end

shiku_im/ClassesNew/classes/messageVc/JXTMsghomeVc.m

@@ -1082,7 +1082,7 @@
        } else {
            cell.bage = [NSString stringWithFormat:@"%d",[dict.user.msgsNew intValue]];
        }
-    NSLog(@"zzzzzzz%d",[dict.user.msgsNew intValue]);
+   // NSLog(@"zzzzzzz%d",[dict.user.msgsNew intValue]);
     cell.isMsgVCCome = YES;
     cell.index = (int)indexPath.row;
     cell.bottomTitle  = [TimeUtil getTimeStrStyle1:[dict.message.timeSend timeIntervalSince1970]];

shiku_im/ClassesNew/classes/messageVc/SaveOrReadArr.m

@@ -97,9 +97,9 @@
       
       // 此时data已经不空了
       // 5,把data写入文件
-      NSString *path = [NSHomeDirectory() stringByAppendingPathComponent:@"Documents/saveTempFriendnum.plist"];
+     // NSString *path = [NSHomeDirectory() stringByAppendingPathComponent:@"Documents/saveTempFriendnum.plist"];
       
-      [data writeToFile:path atomically:YES];
+      [data writeToFile:saveFrienTempCatch atomically:YES];
 }
 + (NSMutableArray *)initNSKeyedTempFriendUnarchiver{
  

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

@@ -71,7 +71,7 @@
     }];
     
     UIButton  *bossQQLValue=[[UIButton alloc]init];
-    [bossQQLValue  setTitle:@"13254650" forState:UIControlStateNormal];
+    [bossQQLValue  setTitle:@"" forState:UIControlStateNormal];
     //bossQQLValue.contentMode=UIViewContentModeScaleAspectFit;
     [bossQQLValue  setImage:[UIImage imageNamed:@"qqValue"] forState:UIControlStateNormal];
     [bossQQLValue setTitleColor:kRGBColor(11, 11, 11) forState:UIControlStateNormal];
@@ -119,7 +119,7 @@
     
     
     UIButton  *wxBtnValue=[[UIButton alloc]init];
-    [wxBtnValue  setTitle:@"13254650" forState:UIControlStateNormal];
+    [wxBtnValue  setTitle:@"" forState:UIControlStateNormal];
     [wxBtnValue  setImage:[UIImage imageNamed:@"wxValue"] forState:UIControlStateNormal];
     [wxBtnValue setTitleColor:kRGBColor(11, 11, 11) forState:UIControlStateNormal];
     [self.view addSubview:wxBtnValue];
@@ -169,13 +169,16 @@
     
     NSString *membershipAccount=[[NSUserDefaults standardUserDefaults] objectForKey:@"membershipAccount_ID"];
      
-     [g_server get_act_GetshangXiaJi:membershipAccount salt:salt toView:self];
+   [g_server get_act_GetshangXiaJi:membershipAccount salt:salt toView:self];
     
      
 }
 //复制qq
 - (void)fuzhiBtnQQClick{
-    
+    if (_strQQURL==nil) {
+        
+        return;
+    }
      UIPasteboard *paseBoard=[UIPasteboard generalPasteboard];
      paseBoard.string=_strWXURL[@"qq"];
     [SVProgressHUD showWithStatus:@"复制成功"];
@@ -184,7 +187,10 @@
 }
 //复制微信号
 - (void)fuzhiBtnWXClick{
-    
+    if (_strQQURL==nil) {
+        
+        return;
+    }
      UIPasteboard *paseBoard=[UIPasteboard generalPasteboard];
      paseBoard.string=_strWXURL[@"wx"];
     [SVProgressHUD showWithStatus:@"复制成功"];
@@ -199,6 +205,12 @@
              NSDictionary * currentDictionary = [dict objectForKey:@"superior"];
              
               _strWXURL=currentDictionary;
+         
+         
+         if (currentDictionary==nil) {
+             
+             return;
+         }
 
          //[self.bossQQL  setImage:[UIImage imageNamed:@"qqValue"] forState:UIControlStateNormal];
          [self.bossQQL  setTitle:[NSString stringWithFormat:@" %@ ",currentDictionary[@"qq"]] forState:UIControlStateNormal];

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

@@ -16,6 +16,9 @@
 
 @property (weak, nonatomic) IBOutlet UIImageView *shareIMG;
 @property (weak, nonatomic) IBOutlet UIImageView *topIMGView;
+
+@property (weak, nonatomic) IBOutlet UIImageView *shareKIMG;
+
 @end
 
 @implementation JXShareMVc
@@ -37,15 +40,15 @@
            [bottomBtn setImage:[UIImage imageNamed:imageS[i]] forState:UIControlStateNormal];
            [bottomBtn setTitle:titleS[i] forState:UIControlStateNormal];
            [bottomBtn addTarget:self action:@selector(saveBttIMG1:) forControlEvents:UIControlEventTouchUpInside];
-           [_shareIMG addSubview:bottomBtn];
+           [_shareKIMG addSubview:bottomBtn];
            
            //bottomBtn.frame=CGRectMake(i*((JX_SCREEN_WIDTH-60)/4), 0, (JX_SCREEN_WIDTH-60)/4, 60);
           
            [bottomBtn mas_makeConstraints:^(MASConstraintMaker *make) {
-               make.left.mas_equalTo(30+i*((JX_SCREEN_WIDTH-60)/4));
+               make.left.mas_equalTo(1+i*((JX_SCREEN_WIDTH-60)/4));
                make.width.mas_equalTo((JX_SCREEN_WIDTH-60)/4);
               // make.height.mas_equalTo(60);
-               make.bottom.mas_equalTo(-(JX_SCREEN_HEIGHT>=812?70:50));
+               make.top.mas_equalTo(1);
            }];
            
            

shiku_im/ClassesNew/classes/myVc/Vc/JXShareMVc.xib

@@ -11,6 +11,7 @@
             <connections>
                 <outlet property="inviteBtn" destination="y9o-cx-ILg" id="BvA-WK-NAC"/>
                 <outlet property="shareIMG" destination="R6n-dJ-Owv" id="0Jw-eR-Sn3"/>
+                <outlet property="shareKIMG" destination="W2R-Fi-dy0" id="4jh-AW-xXA"/>
                 <outlet property="topIMGView" destination="98Z-iR-1Wm" id="1EH-AP-jLy"/>
                 <outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
             </connections>
@@ -46,12 +47,21 @@
                         <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     </state>
                 </button>
+                <imageView clipsSubviews="YES" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="分享框" translatesAutoresizingMaskIntoConstraints="NO" id="W2R-Fi-dy0">
+                    <rect key="frame" x="30" y="821" width="354" height="60"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="60" id="pS9-5r-2zI"/>
+                    </constraints>
+                </imageView>
             </subviews>
             <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
             <constraints>
                 <constraint firstItem="y9o-cx-ILg" firstAttribute="centerX" secondItem="98Z-iR-1Wm" secondAttribute="centerX" id="2so-J9-L5W"/>
+                <constraint firstAttribute="trailing" secondItem="W2R-Fi-dy0" secondAttribute="trailing" constant="30" id="4UJ-PF-cNl"/>
                 <constraint firstAttribute="trailing" secondItem="R6n-dJ-Owv" secondAttribute="trailing" id="9y8-We-VhC"/>
+                <constraint firstAttribute="bottom" secondItem="W2R-Fi-dy0" secondAttribute="bottom" constant="15" id="B1b-1v-A79"/>
                 <constraint firstItem="98Z-iR-1Wm" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" constant="44" id="EcQ-Kh-pbI"/>
+                <constraint firstItem="W2R-Fi-dy0" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="30" id="UJH-P9-ciO"/>
                 <constraint firstItem="y9o-cx-ILg" firstAttribute="top" secondItem="98Z-iR-1Wm" secondAttribute="bottom" constant="30" id="ZLy-wB-W2n"/>
                 <constraint firstItem="Kgw-DA-jo6" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="h9N-lH-GnQ"/>
                 <constraint firstAttribute="trailing" secondItem="98Z-iR-1Wm" secondAttribute="trailing" constant="8" id="i7C-Do-yrh"/>
@@ -68,6 +78,7 @@
         <image name="BG" width="360" height="640"/>
         <image name="anniu" width="113" height="27"/>
         <image name="navigationButtonReturn" width="15" height="21"/>
+        <image name="分享框" width="293.5" height="40"/>
         <image name="分享赚钱title" width="325.5" height="375.5"/>
     </resources>
 </document>

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

@@ -17,7 +17,7 @@
 #import "JXMyHelpCerVc.h"
 #import "JXPaiHangBangVc.h"
 #import "JXMybossVc.h"
-#import "JXGouCaiVideoVc.h" 
+#import "JXGouCaiVideoVc.h"
 #import "JXAboutJiXinVc.h"
 #import "JXMyFeedVc.h"
 
@@ -192,6 +192,16 @@
                 vipVideoshow.backgroundColor=[UIColor colorWithWhite:0.0 alpha:0.5];
                 vipVideoshow.frame=[UIScreen mainScreen].bounds;
                 vipVideoshow.strURL=kefuID;
+                vipVideoshow.Block = ^(NSString * _Nonnull jixinStr) {
+                     
+                         UIPasteboard *paseBoard=[UIPasteboard generalPasteboard];
+                         paseBoard.string=kefuID;
+                        
+                 UIAlertView *alertShow=[[UIAlertView alloc]initWithTitle:nil message:@"复制成功" delegate:nil cancelButtonTitle:@"知道了" otherButtonTitles:nil, nil];
+                 [alertShow show];
+                        
+                         
+                };
                 [[UIApplication sharedApplication].keyWindow addSubview:vipVideoshow];
                 self.vipVideoshow=vipVideoshow;
 
@@ -585,9 +595,10 @@
         StatusesModel *model =_dataArr[indexPath.row];
         if ([model.text isEqualToString:@"新人必看"]) {
             //JXXinRenLookVc
-            [SVProgressHUD showWithStatus:@"该功能正在完善中，敬请期待"];
-            [SVProgressHUD dismissWithDelay:1.2];
-            
+            UIAlertView *alertShow=[[UIAlertView alloc]initWithTitle:nil message:@"该功能正在完善中，敬请期待" delegate:nil cancelButtonTitle:@"知道了" otherButtonTitles:nil, nil];
+            [alertShow show];
+             //[g_App showAlert:@"该功能正在完善中，敬请期待"];
+ 
             return;
             JXXinRenLookVc *vc=[JXXinRenLookVc new];
             [g_navigation pushViewController:vc animated:YES];

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

@@ -13,7 +13,7 @@
 -(instancetype)initWithFrame:(CGRect)frame{
     if (self=[super initWithFrame:frame]) {
         
-        [self setTitleColor:kRGBColor51 forState:UIControlStateNormal];
+       // [self setTitleColor:kRGBColor51 forState:UIControlStateNormal];
         self.titleLabel.font= [UIFont systemFontOfSize:12 weight:UIFontWeightMedium];
         
     }

shiku_im/ClassesNew/classes/myVc/view/JXSheBeiCell.m

@@ -102,7 +102,7 @@
     
     NSDateFormatter *matter = [[NSDateFormatter alloc]init];
     matter.dateFormat =@"YYYY-MM-dd HH:mm";
-    NSDate *date = [NSDate dateWithTimeIntervalSince1970:[Model.loginTime intValue]];
+    NSDate *date = [NSDate dateWithTimeIntervalSince1970:[Model.loginTime doubleValue]/1000];
     NSString*timeStr = [matter stringFromDate:date];
     self.subTitle.text=[NSString stringWithFormat:@"%@",timeStr];
 }

shiku_im/ClassesNew/classes/myVc/view/JXVipLevelView.h

@@ -10,12 +10,12 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
+typedef void(^JIxinBlock)(NSString *jixinStr);
 @interface JXVipLevelView : UIView
 
 @property (nonatomic,weak)   UIButton *vipVideoBtn;
 @property (nonatomic,weak) UILabel *subTitle;
-
-
+@property (nonatomic,copy) JIxinBlock Block;
 @property (nonatomic,copy) NSString *strURL;
 @end
 

shiku_im/ClassesNew/classes/myVc/view/JXVipLevelView.m

@@ -102,6 +102,16 @@
 
         
 
+//          long time = (long)[[NSDate date] timeIntervalSince1970];
+//          time = (time *1000 + g_server.timeDifference);
+//          NSString *salt = [NSString stringWithFormat:@"%ld", time];
+//
+//
+//         NSString *membershipAccount=[[NSUserDefaults standardUserDefaults] objectForKey:@"membershipAccount_ID"];
+//
+//        [g_server get_act_GetshangXiaJi:membershipAccount salt:salt toView:self];
+        
+        
         //long time = (long)[[NSDate date] timeIntervalSince1970];
         //time = (time *1000 + g_server.timeDifference);
        // NSString *salt = [NSString stringWithFormat:@"%ld", time];
@@ -128,21 +138,24 @@
 
 - (void)knowBtnclick{
       
-     UIPasteboard *paseBoard=[UIPasteboard generalPasteboard];
-     paseBoard.string=_strURL; 
-    [SVProgressHUD showWithStatus:@"复制成功"];
-    [SVProgressHUD dismissWithDelay:1.0];
-     
-    
+ 
+    if (_Block) {
+        _Block(@"");
+    }
+
+    [self removeFromSuperview];
 }
 
 
 //服务端返回数据
 -(void) didServerResultSucces:(JXConnection*)aDownload dict:(NSDictionary*)dict array:(NSArray*)array1{
   
-    if([aDownload.action isEqualToString:act_GetSerServeWxget]){
-        NSString * currentDictionary = [dict objectForKey:@"wx"];
-        _strURL=currentDictionary;
+    if([aDownload.action isEqualToString:act_GetshangXiaJi]){
+         
+
+      NSDictionary * currentDictionary = [dict objectForKey:@"superior"];
+      _strURL = [currentDictionary objectForKey:@"wx"];
+     
           
        self.subTitle.text=[NSString stringWithFormat:@"请添加微信号：%@,联系视频客服！",currentDictionary];
     }

shiku_im/audioRecorder/JXVolumeView.m

@@ -95,7 +95,7 @@
     float n = value;
     float m = 1.0-n;
     
-    _input.frame  =  CGRectMake(-0.2, 70*m -5 , 34, 70);
+    _input.frame  =  CGRectMake(-0.2, 150*m -5 , 34, 70);
     _input.image = [UIImage imageNamed:@"pub_microphone_volume"];
     NSLog(@"---n:%f  m:%f",n,m);
     

shiku_im/cell/ChatCell/JXBaseChatCell.m

@@ -798,7 +798,8 @@ static double g_timeSend=0;
 
     }
     else
-        [_wait startAnimating];
+    [_wait stopAnimating];
+       // [_wait startAnimating];
     if(n == transfer_status_no){
         _sendFailed.hidden = NO;
 //        _readImage.hidden = YES;
@@ -817,11 +818,12 @@ static double g_timeSend=0;
     //消息发送失败
     if([self.msg.isSend intValue] == transfer_status_no){
         _readImage.hidden = YES;
-        _sendFailed.hidden = NO;
+        _sendFailed.hidden = NO; //秀噶成 yes
         return;
     }
+   
     //消息发送成功
-    if([self.msg.isSend intValue] == transfer_status_yes){
+    if([_msg.isSend intValue] == transfer_status_yes){
         _sendFailed.hidden = YES;
         //不显示的条件
         if ([self.msg.type intValue] == kWCMessageTypeRemind || self.msg.isGroup || !self.msg.isVisible || [_msg isPinbaMsg]) {

shiku_im/cell/ChatCell/JXMessageCell.m

@@ -307,7 +307,7 @@
     if (!msg.isNotUpdateHeight) {
         [msg updateChatMsgHeight];
     }
-    NSLog(@"高度%f--内容高度%f--内容%@", n, messageConent.frame.size.height,msg.content);
+   // NSLog(@"高度%f--内容高度%f--内容%@", n, messageConent.frame.size.height,msg.content);
     return n;
 }
 

shiku_im/controller/ADView/DYAdAlertView/DYAdAlertView.m

@@ -332,23 +332,6 @@
                item.tag    = BaseTag+item.index;
                item.lable.text = adModel.content;
                //NSString  *filePath = [[NSBundle bundleWithPath:[[NSBundle mainBundle] bundlePath]] pathForResource:adModel.imgStr ofType:nil];
-       
-        
-//        UIImageView *animatedImageView = [[UIImageView alloc]initWithFrame:CGRectMake(0, JX_SCREEN_HEIGHT>=812?64:0, ScreenWidth, ScreenHeight>=812?JX_SCREEN_HEIGHT-JX_SCREEN_TOP-64:JX_SCREEN_HEIGHT)];
-//        animatedImageView.image=[UIImage imageNamed:@"010004"];
-//        [self addSubview:animatedImageView];
-//        animatedImageView.userInteractionEnabled = YES;
-//        self.animatedImageView=animatedImageView;
-//
-//
-//        CABasicAnimation *anima = [CABasicAnimation animation];
-//        anima.keyPath = @"transform.scale";
-//        anima.toValue = @0.5;
-//        anima.repeatCount = MAXFLOAT;
-//        anima.duration = 0.3;
-//        anima.autoreverses = YES;
-//        [animatedImageView.layer addAnimation:anima forKey:nil];
-//        self.animaaaa=anima;
         
         
         LOTAnimationView *animation = [LOTAnimationView animationNamed:@"red-packet-loop-animation"];
@@ -443,8 +426,8 @@
            [self addSubview:pageControl];
     
             _currentTime=4;
-            _timer = [NSTimer scheduledTimerWithTimeInterval:_currentTime target:self   selector:@selector(tapContentImgViewaaa:) userInfo:nil repeats:NO];
-                 [[NSRunLoop mainRunLoop] addTimer:_timer forMode: NSRunLoopCommonModes];
+          //  _timer = [NSTimer scheduledTimerWithTimeInterval:_currentTime target:self   selector:@selector(tapContentImgViewaaa:) userInfo:nil repeats:NO];
+                // [[NSRunLoop mainRunLoop] addTimer:_timer forMode: NSRunLoopCommonModes];
          
 
    

shiku_im/controller/JXChatViewC.mm

@@ -1607,10 +1607,10 @@
     //进入界面即开启定时器
     //[self.noticeTimer setFireDate:[NSDate distantPast]];
     _strURLGoback=@"1000";
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-
-         [self refresh:nil];
-    });
+//    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+//
+//         [self refresh:nil];
+//    });
     
       BOOL isOpen = [g_default boolForKey:kgoucaiComePush];
           
@@ -1719,7 +1719,7 @@ _strURLGoback=@"";
     [_noticeViewScrollView addSubview:lineView];
     
      UIButton *attionBtn=[[UIButton alloc]initWithFrame:CGRectMake(10, 7, 80, 24)];
-     [attionBtn setTitle:@"选择好友" forState:UIControlStateNormal];
+     [attionBtn setTitle:@"特别关心" forState:UIControlStateNormal];
      attionBtn.layer.cornerRadius=8;
      attionBtn.layer.masksToBounds=YES;
      attionBtn.backgroundColor=[UIColor whiteColor];

shiku_im/controller/JXChatViewController.h

@@ -75,6 +75,7 @@ typedef void(^PerBlockBtn)(memberData *personData);
 @property (nonatomic,strong) JXRoomObject* chatRoom;
 @property (nonatomic,strong) roomData * room;
 
+@property (nonatomic,strong) NSMutableArray * soundSendArray;
 @property (nonatomic,strong) NSDictionary * lotterDict;
 @property (nonatomic,strong) NSMutableArray * oneAtttenPersonArr;
 

shiku_im/controller/JXChatViewController.mm

@@ -135,7 +135,7 @@
 #import "JXLuckRescueFundVc.h"
 #import "JXApplyViewController.h"
 #import "JXGoldMangVc.h"
-
+#import "JXGoldMangerVc.h"
 
 #define toolHHH (THE_DEVICE_HAVE_HEAD ? 83 : 60)
 
@@ -395,6 +395,7 @@
         
         _pool     = [[NSMutableArray alloc]init];
         _array = [[NSMutableArray alloc]init];
+        _soundSendArray = [[NSMutableArray alloc]init];
         
         _isReadDelete = [self.chatPerson.isOpenReadDel boolValue];
 
@@ -462,7 +463,7 @@
 
     //进入后台UIApplicationDidEnterBackgroundNotification
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(didEnterBackground) name:UIApplicationDidEnterBackgroundNotification object:nil];
-    
+     
     return self;
 }
 
@@ -729,13 +730,13 @@
      
     showLongView.userInteractionEnabled=YES;
     if (_strURLGoback.length>0) {
-        [[[UIApplication sharedApplication].windows objectAtIndex:0] addSubview:showLongView];
+         [[[UIApplication sharedApplication].windows objectAtIndex:0] addSubview:showLongView];
     }
      self.showLongViewc=showLongView;
     
    // [showLongView.titleLong addTarget:self action:@selector(gotoGouCaiBtb) forControlEvents:UIControlStateNormal];
     
-   // [DYAdAlertView  showInView:self.view theDelegate:self theADInfo:arr placeHolderImage:@"1"];
+  // [DYAdAlertView  showInView:self.view theDelegate:self theADInfo:arr placeHolderImage:@"1"];
 }
 
 //去抢红包
@@ -855,7 +856,7 @@
             break;
     }
 }
-
+ 
 - (void)setupFloating {
     _floating = [[MISFloatingBall alloc] initWithFrame:CGRectMake(JX_SCREEN_WIDTH-60, JX_SCREEN_HEIGHT/3, 60, 60) inSpecifiedView:self.view effectiveEdgeInsets:(UIEdgeInsetsZero)];
     // 自动靠边
@@ -886,13 +887,14 @@
      _strURLGoback=@"1000";
 
 }
+ 
 - (void)viewDidLoad
 {
     [super viewDidLoad];
     [self getEmojsData];
     [g_notify addObserver:self selector:@selector(getEmojsData) name:kEmojiRefresh object:nil];
+ 
       
-  
     
     
     self.view.backgroundColor = HEXCOLOR(0xF9F9F9);
@@ -1248,10 +1250,15 @@
 //                     NSNumber *time = [sortedArray lastObject];
 //                     starTime =  [time longValue];
                       
-                      if([self.roomJid length]>0)
+            if([_roomJid length]>0){
                           [g_server tigaseMucMsgsWithRoomId:s StartTime:starTime EndTime:endTime PageIndex:0 PageSize:PAGECOUNT toView:self];
+            }
                       else
+                      {
                           [g_server tigaseMsgsWithReceiver:s StartTime:starTime EndTime:endTime  PageIndex:0 toView:self];
+                      }
+            
+             [_wait stop];
         }else {
             //获取本地聊天记录
             if (self.scrollLine == 0) {
@@ -1361,7 +1368,7 @@ NSMutableArray* temp = [[NSMutableArray alloc]init];
                 if(msg || _page == 0){
                     [_table reloadData];
                     
-                    [_table gotoLastRow:NO];
+                  //  [_table gotoLastRow:NO];
                     if (self.isSyncMsg || self.isGotoLast) {
                         [_table gotoLastRow:NO];
                     }
@@ -1402,22 +1409,22 @@ NSMutableArray* temp = [[NSMutableArray alloc]init];
     [self createHeadAndFoot];
     self.tableFooter.clipsToBounds = YES;
     // 设置聊天背景图片
-    self.backGroundImageView = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, JX_SCREEN_WIDTH, JX_SCREEN_HEIGHT - JX_SCREEN_BOTTOM)];
-    self.backGroundImageView.contentMode = UIViewContentModeScaleAspectFill;
-    [self.view insertSubview:self.backGroundImageView belowSubview:_table];
-
-    NSData *imageData = [g_constant.userBackGroundImage objectForKey:self.chatPerson.userId];
-    UIImage *backGroundImage = [UIImage imageWithContentsOfFile:kChatBackgroundImagePath];
-    if (imageData) {
-        _table.backgroundColor = [UIColor clearColor];
-        self.backGroundImageView.image = [UIImage imageWithData:imageData];
-    }else if (backGroundImage) {
-        _table.backgroundColor = [UIColor clearColor];
-        self.backGroundImageView.image = backGroundImage;
-
-    }else {
+//    self.backGroundImageView = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, JX_SCREEN_WIDTH, JX_SCREEN_HEIGHT - JX_SCREEN_BOTTOM)];
+//    self.backGroundImageView.contentMode = UIViewContentModeScaleAspectFill;
+//    [self.view insertSubview:self.backGroundImageView belowSubview:_table];
+//
+//    NSData *imageData = [g_constant.userBackGroundImage objectForKey:self.chatPerson.userId];
+//    UIImage *backGroundImage = [UIImage imageWithContentsOfFile:kChatBackgroundImagePath];
+//    if (imageData) {
+//        _table.backgroundColor = [UIColor clearColor];
+//        self.backGroundImageView.image = [UIImage imageWithData:imageData];
+//    }else if (backGroundImage) {
+//        _table.backgroundColor = [UIColor clearColor];
+//        self.backGroundImageView.image = backGroundImage;
+//
+//    }else {
         _table.backgroundColor = HEXCOLOR(0xF2F2F2);
-    }
+//    }
 //    _table.allowsSelection = NO;
     self.isShowFooterPull = NO;
     self.isShowHeaderPull = YES;
@@ -1518,7 +1525,7 @@ NSMutableArray* temp = [[NSMutableArray alloc]init];
         [g_server getRoomMember:roomId userId:[g_myself.userId intValue] toView:self];
         //获取群成员：
         NSArray * memberArray = [memberData fetchAllMembers:_room.roomId];
-        self.title = [NSString stringWithFormat:@"%@(%ld)", self.chatPerson.userNickname, memberArray.count];
+         self.title = [NSString stringWithFormat:@"%@(%ld)", self.chatPerson.userNickname, memberArray.count];
         
         _dataArrGetGroundPersonArr=[memberArray mutableCopy];
         
@@ -1959,14 +1966,24 @@ NSMutableArray* temp = [[NSMutableArray alloc]init];
         [self showOneMsg:msg];
     }
 }
+//删除房间
+- (void)deleRoom{
+    
 
-
+    [g_notify postNotificationName:kUpdateUserNotifaction object:nil];
+    [self.navigationController popViewControllerAnimated:YES];
+}
 -(void)viewWillAppear:(BOOL)animated{
     [super viewWillAppear:animated];
     //进入界面即开启定时器
   //  [self.noticeTimer setFireDate:[NSDate distantPast]];
     _strURLGoback=@"1000";
     _enterFirst=0;
+    
+   
+    
+    [g_notify addObserver:self selector:@selector(deleRoom) name:@"act_roomMemberDeljieshan" object:nil];
+    [g_notify addObserver:self selector:@selector(deleRoom) name:@"deleRoom" object:nil];
     [g_notify addObserver:self selector:@selector(openLong:) name:@"KOPENLONG" object:nil];
 //    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
 //
@@ -2011,16 +2028,21 @@ NSMutableArray* temp = [[NSMutableArray alloc]init];
        }
     
 //    [g_notify removeObserver:self];
-    
+
+    if ([_roomJid length]<=0) {
+        
+
+        _table.contentInset = UIEdgeInsetsMake(0, 0, 0, 0);
+    }
     [self.navigationController setNavigationBarHidden:NO];
     
 }
 
 - (void)viewDidDisappear:(BOOL)animated {
-    _strURLGoback=@"";
+  
     [super viewDidDisappear:animated];
-    
-    if (_enterFirst==100) 
+      _strURLGoback=@"";
+    if (_enterFirst==100) {
     
     _noticeView2=nil;
     _noticeViewScrollView=nil;
@@ -2067,7 +2089,7 @@ NSMutableArray* temp = [[NSMutableArray alloc]init];
 
     [self.view removeFromSuperview];
     self.view=nil;
-    
+    }
     [g_notify removeObserver:self name:@"KOPENLONG" object:nil];
     _strURLGoback=@"";
     //退出界面即关闭定时器
@@ -2113,6 +2135,7 @@ NSMutableArray* temp = [[NSMutableArray alloc]init];
     };  _strURLGoback=@"";
     pervc.dataArr=_dataArrGetGroundPersonArr;
     pervc.roomID=self.roomJid;
+    pervc.UserId=_backUserId;
     [g_navigation pushViewController:pervc animated:YES];
     
 }
@@ -2138,7 +2161,7 @@ NSMutableArray* temp = [[NSMutableArray alloc]init];
     [_noticeViewScrollView addSubview:lineView];
     
      UIButton *attionBtn=[[UIButton alloc]initWithFrame:CGRectMake(10, 7, 80, 24)];
-     [attionBtn setTitle:@"选择好友" forState:UIControlStateNormal];
+     [attionBtn setTitle:@"特别关心" forState:UIControlStateNormal];
      attionBtn.layer.cornerRadius=8;
      attionBtn.layer.masksToBounds=YES;
      attionBtn.backgroundColor=[UIColor whiteColor];
@@ -2680,6 +2703,8 @@ NSMutableArray* temp = [[NSMutableArray alloc]init];
         _messageText.userInteractionEnabled = YES;
     }
     
+    //self.navigationController.interactivePopGestureRecognizer.delaysTouchesBegan=NO;
+    
     //点击语音图片后出现的录制语音按钮
     btn = [UIButton buttonWithType:UIButtonTypeRoundedRect];
     btn.frame = CGRectMake(_messageText.frame.origin.x, 8, _messageText.frame.size.width, 32+5.5);
@@ -2703,7 +2728,7 @@ NSMutableArray* temp = [[NSMutableArray alloc]init];
     [btn addTarget:self action:@selector(showVoice:) forControlEvents:UIControlEventTouchDragInside];
     // 当手指拖动刚好在control的bounds 范围外的事件
     [btn addTarget:self action:@selector(showCancel:) forControlEvents:UIControlEventTouchDragOutside];
-
+ 
     btn.selected = NO;
     _recordBtn = btn;
     _recordBtn.hidden = YES;
@@ -2722,26 +2747,32 @@ NSMutableArray* temp = [[NSMutableArray alloc]init];
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
         [self createSelectMoreView];
     });
-    
 }
-
+  
 - (void)showVoice:(UIButton *)button {
+        
     _voice.isWillCancel = NO;
-}
-- (void)showCancel:(UIButton *)button {
-    _voice.isWillCancel = YES;
-}
+} //隐藏系统菜单的方法
+  
+//- (BOOL)canPerformAction:(SEL)action withSender:(id)sender{
+//
+//     if (action == @selector(selfMenu:)) {
+//               return YES;
+//        }
+//
+//    _voice.isWillCancel=NO;
+//
+//    return YES;
+//}
+
+
+
+ - (void)showCancel:(UIButton *)button {
+     _voice.isWillCancel = YES;
+     
+ }
+
 
-//隐藏系统菜单的方法
--(BOOL)canPerformAction:(SEL)action withSender:(id)sender
-{
-    //允许显示
-    if (action == @selector(selfMenu:)) {
-        return YES;
-    }
-    //其他不允许显示
-    return NO;
-}
 
 - (void)selfMenu:(id)sender {
     _messageText.text = [NSString stringWithFormat:@"%@\r",_messageText.text];
@@ -3178,6 +3209,10 @@ NSMutableArray* temp = [[NSMutableArray alloc]init];
 - (void)didReceiveMemoryWarning
 {
     [super didReceiveMemoryWarning];
+    
+    self.view=nil;
+    self.tableView=nil;
+    _strURLGoback=@"";
     // Dispose of any resources that can be recreated.
 }
 
@@ -3352,7 +3387,7 @@ NSMutableArray* temp = [[NSMutableArray alloc]init];
         return;
     }
     
-    NSString *userId = self.userIds[self.groupMessagesIndex];
+    NSString *userId = _userIds[self.groupMessagesIndex];
 //    NSString *userName = self.userNames[self.groupMessagesIndex];
     
     NSMutableArray * tempArray = [[NSMutableArray alloc] init];
@@ -4402,8 +4437,8 @@ NSMutableArray* temp = [[NSMutableArray alloc]init];
             [g_navigation pushViewController:vc animated:YES];
             
         }else if ([msg.content containsString:@"===jixinJXGoldMangVc"]) {
-            
-            JXGoldMangVc *vc = [JXGoldMangVc new];
+             
+            JXGoldMangerVc *vc = [JXGoldMangerVc new];
             [g_navigation pushViewController:vc animated:YES];
             
         }else if ([msg.content containsString:@"===jixinJXBigRellV"]) {
@@ -5878,6 +5913,8 @@ NSMutableArray* temp = [[NSMutableArray alloc]init];
 #pragma mark - 录制语音
 - (void)recordStart:(UIButton *)sender {
     NSLog(@"recordStart-------");
+    // [_soundSendArray removeAllObjects];
+   
     if([self showDisableSay])
         return;
     if(recording)
@@ -5890,6 +5927,8 @@ NSMutableArray* temp = [[NSMutableArray alloc]init];
         return;
     }
     
+    //[_soundSendArray addObject:@"1"];
+    
 //    _recordBtn.layer.borderColor = [[UIColor blueColor] CGColor];
     _recordBtn.backgroundColor = HEXCOLOR(0xB8B9BD);
 
@@ -6881,6 +6920,7 @@ NSMutableArray* temp = [[NSMutableArray alloc]init];
 -(void)scrollToPageUp{
     if(_isLoading)
         return;
+    self.isGetServerMsg = YES;
     NSLog(@"scrollToPageUp");
     _page ++;
     [self getServerData];
@@ -7494,7 +7534,7 @@ NSMutableArray* temp = [[NSMutableArray alloc]init];
     if( [aDownload.action isEqualToString:act_roomGet] ){
 //        [_room getDataFromDict:dict];
 //
-//        JXRoomMemberVC* vc = [JXRoomMemberVC alloc];
+        JXRoomMemberVC* vc = [JXRoomMemberVC alloc];
 //        vc.chatRoom   = chatRoom;
 //        vc.room       = _room;
 //        vc.delegate = self;
@@ -7574,7 +7614,7 @@ NSMutableArray* temp = [[NSMutableArray alloc]init];
         _videoMeetingNo = [NSString stringWithFormat:@"%@",dict[@"videoMeetingNo"]];
         _userNickName = dict[@"nickname"];
         [_table reloadData];
-        
+       // 增加的 [_table gotoLastRow:YES];
         if (_relayMsgArray.count > 0) {
             for (JXMessageObject *msg in self.relayMsgArray) {
                 if ([msg.type intValue] == kWCMessageTypeRedPacket) {
@@ -7756,7 +7796,17 @@ NSMutableArray* temp = [[NSMutableArray alloc]init];
                 
                 self.isGetServerMsg = NO;
                 self.scrollLine = 0;
-                [self refresh:nil];
+
+                /*  
+                _isRefreshing = NO;
+                [_array addObjectsFromArray:array1]; 
+                [self setIsShowTime];[_table  reloadData];
+              */
+                
+                 [self refresh:nil];
+                
+                
+                NSLog(@"JXSynTask ^刷新");
             }
 
         }
@@ -7770,6 +7820,9 @@ NSMutableArray* temp = [[NSMutableArray alloc]init];
                 self.isGetServerMsg = NO;
                 self.scrollLine = 0;
                 [self refresh:nil];
+                
+                NSLog(@"JXSynTask ^刷新");
+//                [_array addObjectsFromArray:p];
             }else {
                 self.isShowHeaderPull = NO;
             }
@@ -7900,7 +7953,9 @@ NSMutableArray* temp = [[NSMutableArray alloc]init];
                      
                  }else if (isOpen==1 && isOpen2==0) {
                        _noticeView2.hidden = YES;
-                     _noticeViewScrollView.hidden = NO;_table.contentInset = UIEdgeInsetsMake(36, 0, 0, 0);
+                     _noticeViewScrollView.hidden = NO;
+                     
+                     _table.contentInset = UIEdgeInsetsMake(36, 0, 0, 0);
                      _noticeViewScrollView.frame=CGRectMake(0, JX_SCREEN_TOP+(JX_SCREEN_HEIGHT>=812?-6:18), JX_SCREEN_WIDTH, 37);
                    
                  }else if (isOpen==0 && isOpen2==1){
@@ -7914,6 +7969,8 @@ NSMutableArray* temp = [[NSMutableArray alloc]init];
                      self.showTopView.xiaLineView.hidden=YES;
                      _noticeView2.hidden = NO;
                        _noticeViewScrollView.frame=CGRectMake(0, JX_SCREEN_TOP+(JX_SCREEN_HEIGHT>=812?-6:18), JX_SCREEN_WIDTH, 37);
+                     
+                     
                      _table.contentInset = UIEdgeInsetsMake(70, 0, 0, 0);
                  }
 
@@ -7925,15 +7982,20 @@ NSMutableArray* temp = [[NSMutableArray alloc]init];
                      
                       _noticeViewScrollView.hidden = YES;
                  }else{
-           _table.contentInset = UIEdgeInsetsMake(36, 0, 0, 0);
+        
          _noticeViewScrollView.frame=CGRectMake(0, JX_SCREEN_TOP+(JX_SCREEN_HEIGHT>=812?-44:-20), JX_SCREEN_WIDTH, 37);
                      _noticeViewScrollView.hidden = NO;
 
+                      
                      _table.contentInset = UIEdgeInsetsMake(38, 0, 0, 0); 
                  }
 
              }
         
+        if ([_roomJid  length]<=0) {
+
+             _table.contentInset = UIEdgeInsetsMake(0, 0, 0, 0);
+        }
         self.title = [NSString stringWithFormat:@"%@(%ld)", self.chatPerson.userNickname, [dict[@"userSize"] integerValue]];
         [self setAudioIconFrame];
         if ([dict objectForKey:@"jid"]) {
@@ -8145,13 +8207,25 @@ NSMutableArray* temp = [[NSMutableArray alloc]init];
     
     return hide_error;
 }
-
+ 
 -(int) didServerConnectError:(JXConnection*)aDownload error:(NSError *)error{//error为空时，代表超时
     [self doUploadError:aDownload];
+    
+    if([aDownload.action isEqualToString:act_tigaseMucMsgs]) {
+        [_table reloadData];
+//        if([_roomJid length]>0){
+//           [g_server tigaseMucMsgsWithRoomId:_roomJid StartTime:1262275200000 EndTime:(long)[self currentdateInterval] PageIndex:0 PageSize:PAGECOUNT toView:self];
+//        }
+    }
     [_wait stop];
     return hide_error;
 }
-
++(NSTimeInterval )currentdateInterval
+{
+    NSDate *datenow = [NSDate date];
+    NSTimeInterval timeSp=(long)([datenow timeIntervalSince1970]*1000);
+    return timeSp;
+}
 -(void) didServerConnectStart:(JXConnection*)aDownload{
     if([aDownload.action isEqualToString:act_UploadFile] || [aDownload.action isEqualToString:act_publicMenuList] || [aDownload.action isEqualToString:act_tigaseMsgs] || [aDownload.action isEqualToString:act_tigaseMucMsgs])
         return;
@@ -9302,7 +9376,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];
+          //  [self showAdAlertViewImageString:@"ad_treasureBox.png" linkUrl:nil audio:nil duration:0 content:@"恭喜您获得一个宝箱!" showCancelButton:YES type:(DYAdModelTypeGiftOpen) success:NO];
         }
     }
 }
@@ -10181,7 +10255,7 @@ NSMutableArray* temp = [[NSMutableArray alloc]init];
     UIImage *redImage = [UIImage imageNamed:@"red_packet_bg"];
     
     CGFloat h = JX_SCREEN_HEIGHT - JX_SCREEN_TOP - JX_SCREEN_BOTTOM - 30-50;
-    self.redBackV = [[UIImageView alloc] initWithFrame:CGRectMake(20, 30+JX_SCREEN_TOP, JX_SCREEN_WIDTH-40, h)];
+    self.redBackV = [[UIImageView alloc] initWithFrame:CGRectMake(20, 30+JX_SCREEN_TOP, JX_SCREEN_WIDTH-40, h-20)];
     self.redBackV.userInteractionEnabled = YES;
     self.redBackV.image = redImage;
     [self.redBaseView addSubview:self.redBackV];
@@ -10189,7 +10263,7 @@ NSMutableArray* temp = [[NSMutableArray alloc]init];
     [self shakeToShow:self.redBackV];
     
     CGSize size = [[NSString stringWithFormat:@"%@%@",userName,Localized(@"JX_FromRedPacket")] sizeWithAttributes:@{NSFontAttributeName:SYSFONT(18)}];
-    UIImageView *icon = [[UIImageView alloc] initWithFrame:CGRectMake((JX_SCREEN_WIDTH-40 - size.width-30-5)/2, 100, 30, 30)];
+    UIImageView *icon = [[UIImageView alloc] initWithFrame:CGRectMake((JX_SCREEN_WIDTH-40 - size.width-30-5)/2, 120, 30, 30)];
     icon.layer.masksToBounds = YES;
     icon.layer.cornerRadius = icon.frame.size.width/2;
     [self.redBackV addSubview:icon];
@@ -10231,7 +10305,7 @@ NSMutableArray* temp = [[NSMutableArray alloc]init];
     UITapGestureRecognizer *tap1 = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(CheckTheDetails)];
     [label addGestureRecognizer:tap1];
     
-    UIView *canView = [[UIView alloc] initWithFrame:CGRectMake((JX_SCREEN_WIDTH-40)/2, (JX_SCREEN_HEIGHT-CGRectGetMaxY(self.redBackV.frame)-40)/2+CGRectGetMaxY(self.redBackV.frame)-10, 40, 40)];
+    UIView *canView = [[UIView alloc] initWithFrame:CGRectMake((JX_SCREEN_WIDTH-40)/2, (JX_SCREEN_HEIGHT-CGRectGetMaxY(self.redBackV.frame)-40)/2+CGRectGetMaxY(self.redBackV.frame)-10-(JX_SCREEN_HEIGHT>=812?0:30), 40, 40)];
     canView.backgroundColor = [UIColor clearColor];
     canView.layer.masksToBounds = YES;
     canView.layer.cornerRadius = canView.frame.size.width/2;

shiku_im/controller/JXRelayVC.m

@@ -756,6 +756,11 @@ typedef enum : NSUInteger {
     
     if([aDownload.action isEqualToString:act_GainUserCoin])
     {
+
+//        long time = (long)[[NSDate date] timeIntervalSince1970];
+//        time = (time *1000 + g_server.timeDifference);
+//        NSString *salt = [NSString stringWithFormat:@"%ld", time];
+//        [g_server vipGainCoin:salt andToView:self];
         
         [_relayMsgArray removeAllObjects];
         NSMutableArray *tempArr=[NSMutableArray array];
@@ -768,13 +773,14 @@ typedef enum : NSUInteger {
         msg.timeSend = [NSDate date];
         msg.tempChat=7100;
         
-        NSString *coinStr=[NSString stringWithFormat:@"%@",dict[@"totalMoney"]];
+        NSString *coinStr=[NSString stringWithFormat:@"%@",dict[@"coinNum"]];
+        
         msg.content=[NSString stringWithFormat:@"我刚刚在金管家领取%@元 周礼金，点击查看我的礼金===jixin%@",coinStr,@"JXGoldMangVc"];
         [tempArr addObject:msg];
         _relayMsgArray = tempArr;
         
         _useObjectP= _useObjectP22;
-        _useObjectP.message.content=[NSString stringWithFormat:@"我刚刚在金管家领取%@元 周礼金，点击查看我的礼金===jixin%@",dict[@"totalMoney"],@"JXGoldMangVc"];
+        _useObjectP.message.content=[NSString stringWithFormat:@"我刚刚在金管家领取%@元 周礼金，点击查看我的礼金===jixin%@",dict[@"coinNum"],@"JXGoldMangVc"];
         
         [self shareMessage:_useObjectP tempUrl:0];
         
@@ -803,13 +809,13 @@ typedef enum : NSUInteger {
                return;
            }
            
-           
-           msg.content=[NSString stringWithFormat:@"我刚刚在每日任务领取%@元 周礼金，点击查看我的礼金===jixin%@",coinStr,@"JXApplyViewController"];
+            
+           msg.content=[NSString stringWithFormat:@"我刚刚完成每日任务获得了%@元 元礼金，点击立即参与!===jixin%@",coinStr,@"JXApplyViewController"];
            [tempArr addObject:msg];
            _relayMsgArray = tempArr;
            
            _useObjectP= _useObjectP22;
-           _useObjectP.message.content=[NSString stringWithFormat:@"我刚刚在每日任务领取%@元 周礼金，点击查看我的礼金===jixin%@",coinStr,@"JXApplyViewController"];
+           _useObjectP.message.content=[NSString stringWithFormat:@"我刚刚完成每日任务获得了%@元 元礼金，点击立即参与!===jixin%@",coinStr,@"JXApplyViewController"];
            
            [self shareMessage:_useObjectP tempUrl:0];
            

shiku_im/controller/JXRoomMemberVC.m

@@ -34,13 +34,14 @@
 #import "ImageResize.h"
 #import "JXMsgViewController.h"
 #import "JXGroupMemberCell.h"
+#import "JXMsgViewController.h"
 
 #define HEIGHT 55
 #define IMGSIZE 170
 #define TAG_LABEL 1999
 
 
-@interface JXRoomMemberVC ()<UITextFieldDelegate, UIPickerViewDelegate, JXRoomMemberListVCDelegate,JXCameraVCDelegate,JXActionSheetVCDelegate,UIImagePickerControllerDelegate,UIAlertViewDelegate,UIScrollViewDelegate,UICollectionViewDelegate,UICollectionViewDataSource,UICollectionViewDelegateFlowLayout>
+@interface JXRoomMemberVC ()<UITextFieldDelegate, UIPickerViewDelegate, JXRoomMemberListVCDelegate,JXCameraVCDelegate,JXActionSheetVCDelegate,UIImagePickerControllerDelegate,UIAlertViewDelegate,UIScrollViewDelegate,UICollectionViewDelegate,UICollectionViewDataSource,UICollectionViewDelegateFlowLayout,JXRoomObjectDelegate>
 
 @property (nonatomic,strong) JXImageView * unfoldView;
 @property (nonatomic,strong) UIImageView * memberView;
@@ -146,7 +147,6 @@
         [g_notify addObserver:self selector:@selector(updateRoomSet:) name:kOfflineOperationUpdateUserSet object:nil];
         [g_notify addObserver:self selector:@selector(updateRoomSet:) name:kXMPPMessageUpadteGroupNotification object:nil];
         [self createPickerView];
-        [g_navigation dismissViewController:self animated:YES];
         [g_server getRoom:self.roomId toView:self];
         
 //        [g_notify addObserver:self selector:@selector(reSetData:) name:@"ReloadRoomInfo" object:nil];
@@ -457,6 +457,10 @@
         chatRoom.delegate = self;
         [g_notify postNotificationName:kUpdateUserNotifaction object:nil];
         [g_notify postNotificationName:kUpdateUserNotifaction object:nil];
+        
+         
+//        [self actionQuit];
+//        [g_notify postNotificationName:@"deleRoom" object:nil];
     }
     if ([aDownload.action isEqualToString:act_roomMemberList]) {
         [room.members removeAllObjects];
@@ -494,9 +498,13 @@
 
         //通知自己界面
         [self onAfterDelMember:member];
-        member = nil;
+        member = nil; //退出群
         
+        //[g_navigation dismissViewController:self animated:YES];
+        //[g_notify postNotificationName:@"act_roomMemberDeljieshan" object:nil];
         [g_notify postNotificationName:kUpdateUserNotifaction object:nil];
+        
+         
     }
     
     if ([aDownload.action isEqualToString:act_roomSetAdmin]) {
@@ -829,6 +837,7 @@
 //    [_images addObject:line];
 }
 
+ 
 // 显示群成员
 - (void)onShowMembers {
     
@@ -1754,25 +1763,29 @@
     [g_navigation pushViewController:vc animated:YES];
 }
 
-- (void)xmppRoomDidDestroy{
-    [g_notify postNotificationName:kQuitRoomNotifaction object:chatRoom userInfo:nil];
-    [self actionQuit];
-}
+ 
+
+//解散房间
+//- (void)xmppRoomDidDestroy{
+//    [g_notify postNotificationName:kQuitRoomNotifaction object:chatRoom userInfo:nil];
+//    [self actionQuit];
+//}
 
 -(void)onDelRoom{
     [g_server delRoom:room.roomId toView:self];
 }
-
+  
 -(void)onQuitRoom{
     _delete = -1;
     [JXUserObject deleteUserAndMsg:room.roomJid];
     [g_server delRoomMember:room.roomId userId:[g_myself.userId intValue] toView:self];
 }
 
-- (void)xmppRoomDidLeave{
-    [g_notify postNotificationName:kQuitRoomNotifaction object:chatRoom userInfo:nil];
-    [self actionQuit];
-}
+//离开房间
+//- (void)xmppRoomDidLeave{
+//    [g_notify postNotificationName:kQuitRoomNotifaction object:chatRoom userInfo:nil];
+//    [self actionQuit];
+//}
 
 - (BOOL)textFieldShouldEndEditing:(UITextField *)textField{
     return _allowEdit;
@@ -1834,6 +1847,7 @@
         }
         if([p.type intValue] == kRoomRemind_DelRoom){
             if([p.toUserId isEqualToString:MY_USER_ID])
+
                 [self actionQuit];
         }
         if([p.type intValue] == kRoomRemind_NewNotice){

shiku_im/controller/JxChatGetNoticePersonGVc.h

@@ -12,6 +12,9 @@ typedef void(^successBtcaaaBlock)(memberData *responseObject);
 @interface JxChatGetNoticePersonGVc : UIViewController
 @property (nonatomic,strong) NSMutableArray *dataArr;
 @property (nonatomic,copy) NSString *roomID;
+
+@property (nonatomic,copy) NSString *UserId;
+
 @property (nonatomic, copy)successBtcaaaBlock block;
 
 @end

shiku_im/controller/JxChatGetNoticePersonGVc.m

@@ -260,7 +260,7 @@
     NSDictionary *dict= [[self.letterResultArr objectAtIndex:indexPath.section]objectAtIndex:indexPath.row];
     memberData *dictUser=dict[@"model"];
 
-    if (dictUser.clicked) {
+    if ([_UserId longLongValue]==dictUser.userId) {
         [tableView selectRowAtIndexPath:[NSIndexPath indexPathForRow:indexPath.row inSection:0] animated:YES scrollPosition:UITableViewScrollPositionNone];
 
         _selctIndexPath=[NSString stringWithFormat:@"%ld",dictUser.userId];

shiku_im/model/JXFriendObject.m

@@ -10,6 +10,7 @@
 #import "FMResultSet.h"
 #import "AppDelegate.h"
 #import "SBJsonParser.h"
+#import "SaveOrReadArr.h"
 
 @interface JXFriendObject ()
 @property (nonatomic, assign) BOOL isNewFriend;
@@ -270,6 +271,36 @@ static JXFriendObject *sharedUser;
     
     switch ([self.type intValue]) {
         case XMPP_TYPE_SAYHELLO:
+            
+        {
+            NSMutableArray *tempAArr=  [SaveOrReadArr initNSKeyedTempFriendUnarchiver];
+            
+            if (tempAArr.count>0) {
+                [tempAArr enumerateObjectsUsingBlock:^(JXUserObject * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
+                    
+                    if ([obj.userId isEqualToString:user.userId]) {
+                        
+                    }else{
+                        
+                        NSMutableArray *arrxx=[[NSMutableArray alloc]initWithArray:[SaveOrReadArr initNSKeyedFriendUnarchiver]];
+                        //本地存储
+                        [arrxx addObject:user];
+                        [SaveOrReadArr initSerializationTempFriend:arrxx];
+                        
+                    }
+                }];
+            }else{
+                
+                NSMutableArray *arrxx=[[NSMutableArray alloc]initWithArray:[SaveOrReadArr initNSKeyedFriendUnarchiver]];
+                //本地存储
+                [arrxx addObject:user];
+                [SaveOrReadArr initSerializationTempFriend:arrxx];
+            }
+            
+            [g_notify postNotificationName:@"newFriend" object:nil userInfo:@{@"use":user}];
+            
+                        
+        }
             break;
         case XMPP_TYPE_PASS:
         case XMPP_TYPE_CONTACTFRIEND:
@@ -593,7 +624,7 @@ static JXFriendObject *sharedUser;
         [self doMsgForNewUser];
         [g_notify postNotificationName:kFriendPassNotif object:self];
 
-        [g_notify postNotificationName:@"newFriend" object:nil userInfo:@{@"use":user}];
+       // [g_notify postNotificationName:@"newFriend" object:nil userInfo:@{@"use":user}];
     }
 }
 

shiku_im/model/JXXMPP.m

@@ -328,11 +328,10 @@ static JXXMPP *sharedManager;
     if (_receiptArray.count >= 100) {
         [self receiptTimerAction:nil];
     }
-    if (msg.content.length>0) {
+    if (msg.content.length<=5) {
          //NSLog(@"- 群收消息 -- %@",[msg mj_keyValues]);
-    }else{
-//        NSLog(@"- 收消息 单聊 -- %@  message%@",[msg mj_keyValues],[message mj_keyValues]);
-        
+
+        return;
     }
     
     // [self sendMessageReceipt:msg];
@@ -403,9 +402,23 @@ static JXXMPP *sharedManager;
             }else if (model.type == 4){
                 msg.content = model.content;
                
+                NSLog(@"红包 龙：model.type %ld",(long)model.type);
                 [g_notify postNotificationName:kRoomRemind_RoomIsRedMoneyGroupActivityRefresh object:model];
-            }else{
-                [g_notify postNotificationName:kRoomGroupActivityRefresh object:model];
+            }else if (model.type == 0){
+                NSDictionary *typeDic=[msg.content mj_keyValues];
+                
+//                if ([[msg.content mj_keyValues] isKindOfClass:[NSDictionary class]]) {
+                     if ([typeDic allKeysForObject:@"type"]) {
+                         
+                         
+                          [g_notify postNotificationName:kRoomGroupActivityRefresh object:model];
+                                     
+                     }
+//                }
+                
+                
+                NSLog(@"红包 model.type：%d",model.type);
+            
                 return;
             }
         

shiku_im/shiku_im-Info.plist

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