去掉了一些资源图片

image.xcassets/ALOGO_120.imageset/Contents.json

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

image.xcassets/丝带/bg2xiao.imageset/Contents.json

@@ -1,11 +1,11 @@
 {
   "images" : [
     {
-      "filename" : "bg2xiao@2x.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
+      "filename" : "bg2xiao@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

image.xcassets/丝带/sidaiDD.imageset/Contents.json

@@ -1,11 +1,11 @@
 {
   "images" : [
     {
-      "filename" : "sidaiDD@2x.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
+      "filename" : "sidaiDD@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

image.xcassets/丝带/sidaiback2.imageset/Contents.json

@@ -10,7 +10,6 @@
       "scale" : "2x"
     },
     {
-      "filename" : "sidaiback2@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

image.xcassets/丝带/sidaiback22.imageset/Contents.json

@@ -1,11 +1,11 @@
 {
   "images" : [
     {
-      "filename" : "sidaiback22.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
+      "filename" : "sidaiback22.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

image.xcassets/丝带/xiaohaiRight.imageset/Contents.json

@@ -1,11 +1,11 @@
 {
   "images" : [
     {
-      "filename" : "xiaohaiRight.jpg",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
+      "filename" : "xiaohaiRight.jpg",
       "idiom" : "universal",
       "scale" : "2x"
     },

image.xcassets/分享我的邀请码/BG.imageset/Contents.json

@@ -10,7 +10,6 @@
       "scale" : "2x"
     },
     {
-      "filename" : "BG@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

image.xcassets/分享我的邀请码/bgYaoq.imageset/Contents.json

@@ -10,7 +10,6 @@
       "scale" : "2x"
     },
     {
-      "filename" : "bgYaoq@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

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

@@ -10,7 +10,6 @@
       "scale" : "2x"
     },
     {
-      "filename" : "jyj救援金@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

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

@@ -10,7 +10,6 @@
       "scale" : "2x"
     },
     {
-      "filename" : "zyjMoneyB@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

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

@@ -10,7 +10,6 @@
       "scale" : "2x"
     },
     {
-      "filename" : "BG111@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

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

@@ -1,11 +1,11 @@
 {
   "images" : [
     {
-      "filename" : "applyBackImage2.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
+      "filename" : "applyBackImage2.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

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

@@ -10,7 +10,6 @@
       "scale" : "2x"
     },
     {
-      "filename" : "beijing@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

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

@@ -1,11 +1,11 @@
 {
   "images" : [
     {
-      "filename" : "gundong11.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
+      "filename" : "gundong11.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

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

@@ -10,7 +10,6 @@
       "scale" : "2x"
     },
     {
-      "filename" : "jixin@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

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

@@ -10,7 +10,6 @@
       "scale" : "2x"
     },
     {
-      "filename" : "beig@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

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

@@ -10,7 +10,6 @@
       "scale" : "2x"
     },
     {
-      "filename" : "yinguo@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

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

@@ -1,11 +1,11 @@
 {
   "images" : [
     {
-      "filename" : "yxds1.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
+      "filename" : "yxds1.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

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

@@ -10,7 +10,6 @@
       "scale" : "2x"
     },
     {
-      "filename" : "zhongj@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

image.xcassets/我的第二版ios/组1.imageset/Contents.json

@@ -1,11 +1,11 @@
 {
   "images" : [
     {
-      "filename" : "组1@2x.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
+      "filename" : "组1@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

image.xcassets/我的第二版ios/组19.imageset/Contents.json

@@ -10,7 +10,6 @@
       "scale" : "2x"
     },
     {
-      "filename" : "组19@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

image.xcassets/我的第二版ios/组27.imageset/Contents.json

@@ -10,7 +10,6 @@
       "scale" : "2x"
     },
     {
-      "filename" : "组27@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

image.xcassets/我的第二版ios/组3.imageset/Contents.json

@@ -10,7 +10,6 @@
       "scale" : "2x"
     },
     {
-      "filename" : "组3@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

image.xcassets/我的第二版ios/组46.imageset/Contents.json

@@ -10,7 +10,6 @@
       "scale" : "2x"
     },
     {
-      "filename" : "组46@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

image.xcassets/我的第二版ios/组47.imageset/Contents.json

@@ -10,7 +10,6 @@
       "scale" : "2x"
     },
     {
-      "filename" : "组47@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

image.xcassets/我的第二版ios/组48.imageset/Contents.json

@@ -10,7 +10,6 @@
       "scale" : "2x"
     },
     {
-      "filename" : "组48@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

image.xcassets/我的第二版ios/组49.imageset/Contents.json

@@ -10,7 +10,6 @@
       "scale" : "2x"
     },
     {
-      "filename" : "组49@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

image.xcassets/我的第二版ios/组51.imageset/Contents.json

@@ -10,7 +10,6 @@
       "scale" : "2x"
     },
     {
-      "filename" : "组51@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

image.xcassets/我的第二版ios/组52.imageset/Contents.json

@@ -10,7 +10,6 @@
       "scale" : "2x"
     },
     {
-      "filename" : "组52@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

image.xcassets/我的第二版ios/组53.imageset/Contents.json

@@ -10,7 +10,6 @@
       "scale" : "2x"
     },
     {
-      "filename" : "组44@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

image.xcassets/我的第二版骰子/jixintouxiang.imageset/Contents.json

@@ -1,11 +1,11 @@
 {
   "images" : [
     {
-      "filename" : "jixintouxiang.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
+      "filename" : "jixintouxiang.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

image.xcassets/我的第二版骰子/yjduigou.imageset/Contents.json

@@ -1,11 +1,11 @@
 {
   "images" : [
     {
-      "filename" : "yjduigou.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
+      "filename" : "yjduigou.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

image.xcassets/金管家UI/title-bg.imageset/Contents.json

@@ -10,7 +10,6 @@
       "scale" : "2x"
     },
     {
-      "filename" : "title-bg@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

share/JXFriendCell.m

@@ -47,7 +47,7 @@
 -(void)getHeadImageSmall:(NSString*)userId imageView:(UIImageView*)iv{
     //    客服头像
     if([userId intValue]<10100 && [userId intValue]>=10000){ // im_10000
-        iv.image = [UIImage imageNamed:[NSString stringWithFormat:@"ALOGO_120"]];
+        iv.image = [UIImage imageNamed:[NSString stringWithFormat:@"ALOGO_1200"]];
         return;
     }
     // 支付

shiku_im.xcodeproj/project.pbxproj

@@ -11774,6 +11774,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 20200714;
 				DEVELOPMENT_TEAM = AW9TMUTWM5;
 				DOUBANGO_HOME = "";
 				DOUBANGO_LIBS = "";
@@ -11838,7 +11839,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/shiku_im/audioRecorder",
 				);
-				MARKETING_VERSION = 3.0.0;
+				MARKETING_VERSION = 3.0.1;
 				NGN_STACK_HOME = "";
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = "-ObjC";
@@ -11868,6 +11869,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 20200714;
 				DEVELOPMENT_TEAM = AW9TMUTWM5;
 				DOUBANGO_HOME = "";
 				DOUBANGO_LIBS = "";
@@ -11924,7 +11926,7 @@
 					"$(PROJECT_DIR)/shiku_im/3rd/UMSocial_Sdk_5.2.1/QQ",
 					"$(PROJECT_DIR)/shiku_im/3rd/QQ",
 				);
-				MARKETING_VERSION = 3.0.0;
+				MARKETING_VERSION = 3.0.1;
 				NGN_STACK_HOME = "";
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = "-ObjC";

shiku_im/3rd/BMChineseStringSort/BMChineseSort.m

@@ -154,8 +154,8 @@ dispatch_semaphore_t semaphore;
     
     semaphore = dispatch_semaphore_create(1);
     
-    //异步执行
-    dispatch_async(dispatch_get_global_queue(0, 0), ^{
+    //异步执行 加了异步线程通讯录奔溃
+//    dispatch_async(dispatch_get_global_queue(0, 0), ^{
         //将数据 转换为 BMChineseSortModel
         NSMutableArray *sortModelArray = [NSMutableArray arrayWithCapacity:0];
             [objectArray enumerateObjectsWithOptions:NSEnumerationConcurrent usingBlock:^(id  _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
@@ -222,7 +222,7 @@ dispatch_semaphore_t semaphore;
         dispatch_async(dispatch_get_main_queue(), ^{
             finish(YES,unSortedArr,sectionTitleArr,sortedObjArr);
         });
-    });
+//    });
 }
 
 //将对象 转为 BMChineseSortModel

shiku_im/AppDelegate.mm

@@ -1192,7 +1192,7 @@ static  BMKMapManager* _baiduMapManager;
         configInternal.maximumCallGroups = 1;
         configInternal.supportedHandleTypes = [NSSet setWithObject:@(CXHandleTypePhoneNumber)];
 
-        UIImage* iconMaskImage = [UIImage imageNamed:@"ALOGO_120"];
+        UIImage* iconMaskImage = [UIImage imageNamed:@"ALOGO_1200"];
         configInternal.iconTemplateImageData = UIImagePNGRepresentation(iconMaskImage);
         configInternal.ringtoneSound = @"whynotyou.caf";
     });

shiku_im/ClassesNew/MainClass/XMGMainViewController.m

@@ -4,7 +4,7 @@
 //
 //  Created by MJ Lee on 15/6/15.
 //  Copyright © 2015年 小码哥. All rights reserved.
-//
+// 20200714
 
 #import "XMGMainViewController.h"
  #import "JXMsgViewController.h"

shiku_im/ClassesNew/classes/homeVc/CYWebAddPointVC.m

@@ -143,6 +143,9 @@
       show.blockNode = ^(NSDictionary * _Nonnull dict) {
           [g_notify postNotificationName:@"changeNodeTitleNotifaction" object:dict[@"name"]];
           [self.wkWebView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:dict[@"url"]]]];
+
+          [g_default setObject:dict[@"url"] forKey:@"selectNodeUrl"];
+          [g_default synchronize];
           
           [self.wkWebView reload];
           

shiku_im/ClassesNew/classes/homeVc/JXCsHomeVc.m

@@ -360,8 +360,17 @@
         CYWebAddPointVC *vc = [[CYWebAddPointVC alloc] init];
           
          NSString *memberAcc=[[NSUserDefaults standardUserDefaults] objectForKey:@"www_url"];
-       
-         vc.strURL=memberAcc;
+        
+        NSString *selectNodeUrl=[[NSUserDefaults standardUserDefaults] objectForKey:@"selectNodeUrl"];
+         
+        if (selectNodeUrl.length>0) {
+
+             vc.strURL=selectNodeUrl;
+        }else{
+
+            vc.strURL=memberAcc;
+        }
+        
        
         [self addChildViewController:vc];
     }else{

shiku_im/ClassesNew/classes/homeVc/JXNodeView.m

@@ -76,7 +76,6 @@
 -(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{
     
     NSDictionary *nodeDict=_dataArr[indexPath.row];
-    
     if (_blockNode) {
         _blockNode(nodeDict);
     }

shiku_im/ClassesNew/classes/loginmVc/JXMainLoginVc.m

@@ -1266,7 +1266,7 @@
     CGPoint center = authView.center;
     
     UIImageView *imgV = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, 95, 95)];
-    imgV.image = [UIImage imageNamed:@"ALOGO_120"];
+    imgV.image = [UIImage imageNamed:@"ALOGO_1200"];
     [authView addSubview:imgV];
     imgV.center = CGPointMake(center.x, 20 + 95/2);
     

shiku_im/ClassesNew/classes/messageVc/JXMsgCellView.xib

@@ -115,21 +115,21 @@
                 <view tag="3" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="piq-oK-8vg">
                     <rect key="frame" x="0.0" y="221" width="489" height="69"/>
                     <subviews>
-                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ALOGO_120" translatesAutoresizingMaskIntoConstraints="NO" id="JhH-cb-9q7">
-                            <rect key="frame" x="15" y="8.5" width="52" height="52"/>
+                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ALOGO_1200" translatesAutoresizingMaskIntoConstraints="NO" id="JhH-cb-9q7">
+                            <rect key="frame" x="15" y="6.5" width="56" height="56"/>
                             <constraints>
-                                <constraint firstAttribute="height" constant="52" id="EfM-Yg-JdW"/>
-                                <constraint firstAttribute="width" constant="52" id="slV-f5-JiE"/>
+                                <constraint firstAttribute="height" constant="56" id="EfM-Yg-JdW"/>
+                                <constraint firstAttribute="width" constant="56" id="slV-f5-JiE"/>
                             </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="cYE-FK-fgs">
-                            <rect key="frame" x="82" y="24" width="35" height="21"/>
+                            <rect key="frame" x="86" y="24" width="35" height="21"/>
                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                             <nil key="textColor"/>
                             <nil key="highlightedColor"/>
                         </label>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="官方" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ho2-0y-kpt">
-                            <rect key="frame" x="137" y="24" width="42" height="21"/>
+                            <rect key="frame" x="141" y="24" width="42" height="21"/>
                             <color key="backgroundColor" systemColor="systemBlueColor" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="21" id="Avj-qq-aEA"/>
@@ -210,7 +210,7 @@
         </view>
     </objects>
     <resources>
-        <image name="ALOGO_120" width="76" height="76"/>
+        <image name="ALOGO_1200" width="86" height="88"/>
         <image name="FriendsNew" width="140" height="140"/>
         <image name="qunliaoNew" width="140" height="140"/>
         <image name="tongxunlu" width="144" height="142"/>

shiku_im/ClassesNew/classes/messageVc/JXMsgViewController.m

@@ -1020,11 +1020,11 @@
     cell.isNotPush = [dict.user.offlineNoPushMsg boolValue];
      
     if ([dict.message.fromUserId isEqualToString:@"10000"]) {
-        cell.headImageView.image=[UIImage imageNamed:@"ALOGO_120"];
+        cell.headImageView.image=[UIImage imageNamed:@"ALOGO_1200"];
         [cell.lbTitle setText:@"即信"];
         cell.bottomTitle=@"";
         cell.lbSubTitle.text=@"";
-        cell.headImage=@"ALOGO_120";
+        cell.headImage=@"ALOGO_1200";
       }
     
     
@@ -1513,17 +1513,22 @@
             
             [_array insertObject:newobj atIndex:_topNum];
             
-            NSMutableArray *indexPaths = [[NSMutableArray alloc] init];
-            NSIndexPath *indexPath = [NSIndexPath indexPathForRow:_topNum inSection:0];
-            [indexPaths addObject:indexPath];
-            
+//            NSMutableArray *indexPaths = [[NSMutableArray alloc] init];
+//            NSIndexPath *indexPath = [NSIndexPath indexPathForRow:_topNum inSection:0];
+//            [indexPaths addObject:indexPath];
+ 
+             [UIView performWithoutAnimation:^{
+                    NSIndexSet *reloadSet = [NSIndexSet indexSetWithIndex:0];
+                    [_table reloadSections:reloadSet withRowAnimation:UITableViewRowAnimationNone];
+            }];
             if (newobj==nil) {
-             [_table gotoFirstRow:YES];
+            // [_table gotoFirstRow:YES];
+            //[_table gotoLastRow:YES];
                 return;
             }
            
             @try {
-                [_table gotoFirstRow:YES];
+                //[_table gotoFirstRow:YES];
                 
            // [_table beginUpdates];
             //[_table insertRowsAtIndexPaths:indexPaths withRowAnimation:UITableViewRowAnimationNone];
@@ -1534,7 +1539,7 @@
                  
             }
        
-           // [_table gotoFirstRow:YES];
+            // [_table gotoLastRow:YES];
         }
         
         newobj = nil;
@@ -1668,8 +1673,7 @@
     
     NSLog(@"didselectRowAtIndexPath %@",[[[[self superclass] superclass] superclass] class]);
 
-    
-    [g_notify postNotificationName:@"tabbarFrame" object:nil userInfo:@{@"title":@"0"}];
+      [g_notify postNotificationName:@"hiddenTip" object:nil];
     
     //[self doneBtnAction:self.doneBtn];
     
@@ -1777,17 +1781,17 @@
     if ([[fromArr lastObject] intValue]==1||[p.user.status intValue]!=2) {
         
         
-        sendView.tempChat=11;
+        sendView.useInfoTempChat=11;
         
         
     }else{
         
         if (fromArr==nil) {
-            sendView.tempChat=11;
+            sendView.useInfoTempChat=11;
         }else{
         
         
-        sendView.tempChat=1;
+        sendView.useInfoTempChat=1;
         }
     }
     sendView.rowIndex = indexPath.row;
@@ -1800,7 +1804,6 @@
     p.user.msgsNew = [NSNumber numberWithInt:0];
     [p.message updateNewMsgsTo0];
   
-     [g_notify postNotificationName:@"hiddenTip" object:nil];
      //_homeVc.strURL=@"";
     [self cancelBtnAction];
     

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

@@ -164,7 +164,7 @@
     NSString *musicPath1=@"https://apps.apple.com/cn/app/%E8%81%8A%E5%95%B5-%E4%B8%8E%E6%9C%8B%E5%8F%8B%E4%B8%80%E8%B5%B7%E7%95%85%E8%81%8A/id1463401862";
         NSString *yaoqingM =@"";//self.jixinNoBtn.titleLabel.text;
           NSString *dicript = [NSString stringWithFormat:@"您的邀请码是：%@%@",yaoqingM,@" 即信—安全稳定的赚钱平台 \n给你推荐一款可以赚钱的APP。我今天又收入了999元，现在还有3个名额，快进来下载一起赚钱吧！"];
-          UIImage *shareImage = [UIImage imageNamed:@"ALOGO_120"];
+          UIImage *shareImage = [UIImage imageNamed:@"ALOGO_1200"];
           NSURL *url = [NSURL fileURLWithPath:musicPath1];
           NSArray * activityItems = @[dicript,shareImage,url];
            
@@ -236,7 +236,7 @@
      musicPath=@"https://apps.apple.com/cn/app/%E8%81%8A%E5%95%B5-%E4%B8%8E%E6%9C%8B%E5%8F%8B%E4%B8%80%E8%B5%B7%E7%95%85%E8%81%8A/id1463401862";
     NSString *yaoqingM =@"";//self.jixinNoBtn.titleLabel.text;
       NSString *dicript = [NSString stringWithFormat:@"您的邀请码是：%@%@",yaoqingM,@" 即信—安全稳定的赚钱平台 \n给你推荐一款可以赚钱的APP。我今天又收入了999元，现在还有3个名额，快进来下载一起赚钱吧！"];
-      UIImage *shareImage = [UIImage imageNamed:@"ALOGO_120"];
+      UIImage *shareImage = [UIImage imageNamed:@"ALOGO_1200"];
       NSURL *url = [NSURL fileURLWithPath:musicPath];
       NSArray * activityItems = @[dicript,musicPath];
        

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

@@ -141,7 +141,7 @@
     NSString *musicPath1=@"https://apps.apple.com/cn/app/%E8%81%8A%E5%95%B5-%E4%B8%8E%E6%9C%8B%E5%8F%8B%E4%B8%80%E8%B5%B7%E7%95%85%E8%81%8A/id1463401862";
           NSString *yaoqingM =self.jixinNoBtn.titleLabel.text;
           NSString *dicript = [NSString stringWithFormat:@"您的邀请码是：%@%@",yaoqingM,@" 即信—安全稳定的赚钱平台 \n给你推荐一款可以赚钱的APP。我今天又收入了999元，现在还有3个名额，快进来下载一起赚钱吧！"];
-          UIImage *shareImage = [UIImage imageNamed:@"ALOGO_120"];
+          UIImage *shareImage = [UIImage imageNamed:@"ALOGO_1200"];
           NSURL *url = [NSURL fileURLWithPath:musicPath1];
           NSArray * activityItems = @[dicript,shareImage,url];
            
@@ -212,7 +212,7 @@
      musicPath=@"https://apps.apple.com/cn/app/%E8%81%8A%E5%95%B5-%E4%B8%8E%E6%9C%8B%E5%8F%8B%E4%B8%80%E8%B5%B7%E7%95%85%E8%81%8A/id1463401862";
       NSString *yaoqingM =self.jixinNoBtn.titleLabel.text;
       NSString *dicript = [NSString stringWithFormat:@"您的邀请码是：%@%@",yaoqingM,@" 即信—安全稳定的赚钱平台 \n给你推荐一款可以赚钱的APP。我今天又收入了999元，现在还有3个名额，快进来下载一起赚钱吧！"];
-      UIImage *shareImage = [UIImage imageNamed:@"ALOGO_120"];
+      UIImage *shareImage = [UIImage imageNamed:@"ALOGO_1200"];
       NSURL *url = [NSURL fileURLWithPath:musicPath];
       NSArray * activityItems = @[dicript,musicPath];
        

shiku_im/ClassesNew/classes/myVc/view/JXMyTopView.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"/>
@@ -36,7 +36,7 @@
                                 <constraint firstAttribute="height" constant="1" id="jzn-7C-dbI"/>
                             </constraints>
                         </view>
-                        <imageView clipsSubviews="YES" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ALOGO_120" translatesAutoresizingMaskIntoConstraints="NO" id="sjV-LB-Uoo">
+                        <imageView clipsSubviews="YES" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ALOGO_1200" translatesAutoresizingMaskIntoConstraints="NO" id="sjV-LB-Uoo">
                             <rect key="frame" x="30" y="11" width="70" height="70"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="70" id="Xdh-ZF-eQ1"/>
@@ -225,7 +225,7 @@
         </view>
     </objects>
     <resources>
-        <image name="ALOGO_120" width="76" height="76"/>
+        <image name="ALOGO_1200" width="86" height="88"/>
         <image name="my_b1" width="666" height="146"/>
         <image name="my_view_female_icon" width="11" height="10"/>
         <image name="qianb" width="33" height="37"/>

shiku_im/Register&Login/inputPhoneVC.m

@@ -60,7 +60,7 @@
         //icon
         n += 20;
 
-        UIImageView * kuliaoIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"ALOGO_120"]];
+        UIImageView * kuliaoIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"ALOGO_1200"]];
         kuliaoIconView.frame = CGRectMake((JX_SCREEN_WIDTH-100)/2, n, 100, 100);
 //        [self.tableBody addSubview:kuliaoIconView];
         UILabel *titleLable = [[UILabel alloc] init];

shiku_im/Register&Login/loginVC.m

@@ -124,7 +124,7 @@
         n += 50;
 
         //icon
-        UIImageView * kuliaoIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"ALOGO_120"]];
+        UIImageView * kuliaoIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"ALOGO_1200"]];
         kuliaoIconView.frame = CGRectMake((JX_SCREEN_WIDTH-100)/2, n+20, 100, 100);
 //        [self.tableBody addSubview:kuliaoIconView];
         
@@ -1596,7 +1596,7 @@
     CGPoint center = authView.center;
     
     UIImageView *imgV = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, 95, 95)];
-    imgV.image = [UIImage imageNamed:@"ALOGO_120"];
+    imgV.image = [UIImage imageNamed:@"ALOGO_1200"];
     [authView addSubview:imgV];
     imgV.center = CGPointMake(center.x, 20 + 95/2);
     

shiku_im/SKShare/Controller/JXAuthViewController.m

@@ -25,7 +25,7 @@
     [self createHeadAndFoot];
     
     JXImageView *icon = [[JXImageView alloc] initWithFrame:CGRectMake(JX_SCREEN_WIDTH/2-85/2, 81, 85, 85)];
-    icon.image = [UIImage imageNamed:@"ALOGO_120"];
+    icon.image = [UIImage imageNamed:@"ALOGO_1200"];
     [self.tableBody addSubview:icon];
     
     UILabel *label = [[UILabel alloc] initWithFrame:CGRectMake(0, CGRectGetMaxY(icon.frame) + 21, JX_SCREEN_WIDTH, 18)];

shiku_im/cell/ChatCell/JXShareCell.m

@@ -40,7 +40,7 @@
     [_imageBackground addSubview:_lineView];
     
     _skIcon = [[UIImageView alloc] initWithFrame:CGRectMake(10, 7, 15, 15)];
-    _skIcon.image = [UIImage imageNamed:@"ALOGO_120"];
+    _skIcon.image = [UIImage imageNamed:@"ALOGO_1200"];
     [_imageBackground addSubview:_skIcon];
     
     _skLabel = [[UILabel alloc] initWithFrame:CGRectMake(CGRectGetMaxX(_skIcon.frame) + 5, 10, 100, 30)];
@@ -67,7 +67,7 @@
     }
     _skLabel.text = [msgDict objectForKey:@"appName"];
 
-    [_skIcon sd_setImageWithURL:[NSURL URLWithString:[msgDict objectForKey:@"appIcon"]] placeholderImage:[UIImage imageNamed:@"ALOGO_120"]];
+    [_skIcon sd_setImageWithURL:[NSURL URLWithString:[msgDict objectForKey:@"appIcon"]] placeholderImage:[UIImage imageNamed:@"ALOGO_1200"]];
     
     if(self.msg.isMySend)
     {

shiku_im/controller/JXAboutVC.m

@@ -43,7 +43,7 @@
                 
         JXImageView* iv;
         iv = [[JXImageView alloc]initWithFrame:CGRectMake((JX_SCREEN_WIDTH-67)/2, JX_SCREEN_TOP+40, 67, 67)];
-        iv.image = [UIImage imageNamed:@"ALOGO_120"];
+        iv.image = [UIImage imageNamed:@"ALOGO_1200"];
         [self.tableBody addSubview:iv];
         
         UILabel* p = [self createLabel:self.tableBody default:[NSString stringWithFormat:@"%@ %@",APP_NAME,g_config.version]];
@@ -146,7 +146,7 @@
     //分享头像
     
     //    shareModel.shareImageUrl = url;
-    shareModel.shareImage = [UIImage imageNamed:@"ALOGO_120"];
+    shareModel.shareImage = [UIImage imageNamed:@"ALOGO_1200"];
     [[JXShareManager defaultManager] shareWith:shareModel delegate:self];
     
     

shiku_im/controller/JXAutoReplyAideVC.m

@@ -142,7 +142,7 @@
         [_baseView addSubview:_noKeyView];
         
         imageView = [[UIImageView alloc] initWithFrame:CGRectMake((JX_SCREEN_WIDTH - 50) / 2, 0, 50, 50)];
-        imageView.image = [UIImage imageNamed:@"ALOGO_120"];
+        imageView.image = [UIImage imageNamed:@"ALOGO_1200"];
         [_noKeyView addSubview:imageView];
         
         label = [[UILabel alloc] initWithFrame:CGRectMake(0, CGRectGetMaxY(imageView.frame), JX_SCREEN_WIDTH, 30)];

shiku_im/controller/JXChatViewC.mm

@@ -10648,7 +10648,7 @@ _strURLGoback=@"";
             
             UIImageView *imageView = [[UIImageView alloc] initWithFrame:CGRectMake(0, 25, 50, 50)];
 
-            imageView.image = [UIImage imageNamed:@"ALOGO_120"];
+            imageView.image = [UIImage imageNamed:@"ALOGO_1200"];
             imageView.center = CGPointMake(view.frame.size.width / 2, imageView.center.y);
             [view addSubview:imageView];
             

shiku_im/controller/JXChatViewController.mm

@@ -902,8 +902,10 @@
     [self getEmojsData];
     [g_notify addObserver:self selector:@selector(getEmojsData) name:kEmojiRefresh object:nil];
  
-      
-    
+
+   [g_notify postNotificationName:@"tabbarFrame" object:nil userInfo:@{@"title":@"0"}];
+
+  
     
     self.view.backgroundColor = HEXCOLOR(0xF9F9F9);
     self.friendStatus = [self.chatPerson.status intValue];
@@ -9470,12 +9472,16 @@ NSMutableArray* temp = [[NSMutableArray alloc]init];
         return;
     }
     /**/
-    if ([model.roomJid isEqualToString:self.roomJid]) {
+    if ([model.roomJid isEqualToString:_roomJid]) {
         if (model.type == 1) {
             JXLabelObject *obj = [JXLabelObject sharedInstance];
             obj.roomJid = self.roomJid;
             NSString *groupAnnouncement = nil;
             NSString *selectItem = [obj fetchGroupAnnouncementSelectItemFromLocal];
+            
+           // NSString *selectItem2 = [obj fetchGroupAnnouncementSelectItemFromLocal];
+            
+            
             NSArray *response = [self dictionaryWithJsonString: model.content];
             NSMutableArray *modelArray  = [NSMutableArray array];
             for (NSDictionary *dict in response) {
@@ -11195,7 +11201,7 @@ NSMutableArray* temp = [[NSMutableArray alloc]init];
             
             UIImageView *imageView = [[UIImageView alloc] initWithFrame:CGRectMake(0, 25, 50, 50)];
 
-            imageView.image = [UIImage imageNamed:@"ALOGO_120"];
+            imageView.image = [UIImage imageNamed:@"ALOGO_1200"];
             imageView.center = CGPointMake(view.frame.size.width / 2, imageView.center.y);
             [view addSubview:imageView];
             

shiku_im/controller/JXDeviceAuthController.m

@@ -43,7 +43,7 @@
     self.baseView.backgroundColor = [UIColor whiteColor];
     [self.view addSubview:self.baseView];
     
-    UIImageView *imgV = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"ALOGO_120"]];
+    UIImageView *imgV = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"ALOGO_1200"]];
     imgV.frame = CGRectMake(0, 0, 87, 87);
     imgV.center = CGPointMake(JX_SCREEN_WIDTH/2, 124 + 87/2);
     [self.baseView addSubview:imgV];

shiku_im/controller/JXRoomMemberVC.m

@@ -2635,6 +2635,7 @@
         [self onShowDel];
     }else{
         memberData *data = [room getMember:g_myself.userId];
+        memberData *data22 = [room getMember:g_myself.userId];
 
         if ([data.role intValue] != 1 && [data.role intValue] != 2 && !self.room.allowSendCard) {
             [g_App showAlert:Localized(@"JX_OnlyManagerSeeInfo")];
@@ -2652,9 +2653,12 @@
         }else{
             user = room.members[indexPath.row];
         }
+        
         JXUserInfoVC* vc = [JXUserInfoVC alloc];
         vc.userId = [NSString stringWithFormat:@"%ld", user.userId];
         vc.fromAddType = 3;
+        
+        vc.data22=data22;
         vc.data=user;
         vc = [vc init];
         [g_navigation pushViewController:vc animated:YES];

shiku_im/controller/JXUserInfoVC.h

@@ -74,6 +74,9 @@
 @property (nonatomic, assign) BOOL isShowGoinBtn;
 @property (nonatomic, copy) NSString *userId;
 
+/**顶部列表点击头像*/
+@property (nonatomic,strong)  memberData *data22;
+
 @property (nonatomic,strong)  memberData *data;
 @property (nonatomic, assign) int fromAddType;
 

shiku_im/controller/JXUserInfoVC.m

@@ -345,7 +345,7 @@
     h+=_btnTemp.frame.size.height;
     h+=INSETS;
     
-    if ([_data.role intValue]==1 || [_data.role intValue]==2) {
+    if ([_data.role intValue]==1 || [_data.role intValue]==2||[_data22.role intValue]==1 || [_data22.role intValue]==2) {
         _btnTemp.hidden=NO;
         
     }else{

shiku_im/friendBlog/view/WeiboCell.m

@@ -222,8 +222,8 @@
         
         _shareIcon = [[JXImageView alloc] initWithFrame:CGRectMake(10, 10, 50, 50)];
 
-        //    imageView.image = [UIImage imageNamed:@"ALOGO_120"];
-        [_shareIcon sd_setImageWithURL:[NSURL URLWithString:weibo.sdkIcon] placeholderImage:[UIImage imageNamed:@"ALOGO_120"]];
+        //    imageView.image = [UIImage imageNamed:@"ALOGO_1200"];
+        [_shareIcon sd_setImageWithURL:[NSURL URLWithString:weibo.sdkIcon] placeholderImage:[UIImage imageNamed:@"ALOGO_1200"]];
         [_shareView addSubview:_shareIcon];
         
        _shareTitle = [[UILabel alloc] initWithFrame:CGRectMake(CGRectGetMaxX(_shareIcon.frame) + 5, _shareIcon.frame.origin.y, _shareView.frame.size.width - CGRectGetMaxX(_shareIcon.frame) - 15, _shareIcon.frame.size.height)];
@@ -683,7 +683,7 @@
         
         _shareTitle.text = weibo.sdkTitle;
 
-        [_shareIcon sd_setImageWithURL:[NSURL URLWithString:weibo.sdkIcon] placeholderImage:[UIImage imageNamed:@"ALOGO_120"]];
+        [_shareIcon sd_setImageWithURL:[NSURL URLWithString:weibo.sdkIcon] placeholderImage:[UIImage imageNamed:@"ALOGO_1200"]];
     }else {
         
         self.shareView.frame = CGRectZero;

shiku_im/friendBlog/view/addMsgVC.m

@@ -580,8 +580,8 @@ typedef enum {
     
     JXImageView *imageView = [[JXImageView alloc] initWithFrame:CGRectMake(10, 10, 50, 50)];
 
-//    imageView.image = [UIImage imageNamed:@"ALOGO_120"];
-    [imageView sd_setImageWithURL:[NSURL URLWithString:self.shareIcon] placeholderImage:[UIImage imageNamed:@"ALOGO_120"]];
+//    imageView.image = [UIImage imageNamed:@"ALOGO_1200"];
+    [imageView sd_setImageWithURL:[NSURL URLWithString:self.shareIcon] placeholderImage:[UIImage imageNamed:@"ALOGO_1200"]];
     [view addSubview:imageView];
     
     UILabel *label = [[UILabel alloc] initWithFrame:CGRectMake(CGRectGetMaxX(imageView.frame) + 5, imageView.frame.origin.y, view.frame.size.width - CGRectGetMaxX(imageView.frame) - 15, imageView.frame.size.height)];

shiku_im/meeting/UI/JXAVCallViewController.m

@@ -513,7 +513,7 @@
         UIImageView *headImage = [[UIImageView alloc] initWithFrame:CGRectMake(JX_SCREEN_WIDTH / 2 - 50, JX_SCREEN_HEIGHT / 2 - 110, 100, 100)];
         headImage.layer.cornerRadius = headImage.frame.size.width / 2;
         headImage.layer.masksToBounds = YES;
-        headImage.image = [UIImage imageNamed:@"ALOGO_120"];
+        headImage.image = [UIImage imageNamed:@"ALOGO_1200"];
         [self.localVideoView addSubview:headImage];
         
     }else {

shiku_im/model/JXLabelObject.m

@@ -95,8 +95,8 @@ static JXLabelObject *sharedLabel;
 
 
 - (NSString *)fetchAllGroupAnnouncementFromLocal {
-    NSString* sql = [NSString stringWithFormat:@"select content from groupAnnouncement where roomJid = '%@'", self.roomJid];
-    
+   // NSString* sql = [NSString stringWithFormat:@"select content from groupAnnouncement where roomJid = '%@'", self.roomJid];
+    NSString* sql = [NSString stringWithFormat:@"select content from groupAnnouncement"];
 //    NSMutableArray *resultArr=[[NSMutableArray alloc]init];
     
     NSString* myUserId = MY_USER_ID;
@@ -117,8 +117,8 @@ static JXLabelObject *sharedLabel;
 }
 
 - (NSString *)fetchGroupAnnouncementSelectItemFromLocal {
-    NSString* sql = [NSString stringWithFormat:@"select selectItem from groupAnnouncement where roomJid = '%@'", self.roomJid];
-    
+   // NSString* sql = [NSString stringWithFormat:@"select selectItem from groupAnnouncement where roomJid = '%@'", self.roomJid];
+    NSString* sql = [NSString stringWithFormat:@"select selectItem from groupAnnouncement"];
 //    NSMutableArray *resultArr=[[NSMutableArray alloc]init];
     
     NSString* myUserId = MY_USER_ID;

shiku_im/model/JXMessageObject.h

@@ -75,8 +75,11 @@ extern NSString* current_meeting_no;
 #define WEB_USERID [NSString stringWithFormat:@"%@_web",g_myself.userId]
 #define IOS_USERID [NSString stringWithFormat:@"%@_ios",g_myself.userId]
 
+//#define temp_USERID [NSString stringWithFormat:@"%@_ios/1",g_myself.userId]
+
 #define IS_OTHER_DEVICE(obj) [@[ANDROID_USERID, PC_USERID, MAC_USERID, WEB_USERID] containsObject:obj]// 多点登陆其他设备
 
+ 
 #define transfer_status_yes 1 //传输成功
 #define transfer_status_ing 0 //传输中
 #define transfer_status_no  -2 //传输失败

shiku_im/model/JXXMPP.m

@@ -383,7 +383,12 @@ static JXXMPP *sharedManager;
                     object.creatTime = timeString;
                      // 查询有没有roomId, 有 执行更新 , 没有 执行插入
                     BOOL isHaveRoomJid = [object checkGroupAnnouncementRoomJid];
+                    
+                    
+                    
                     if (isHaveRoomJid) {
+                      // [object updateRecordGroupAnnouncementSelectItem];
+ 
                         [object updateRecordGroupAnnouncement];
                     } else {
                         [object insertRecordGroupAnnouncement];
@@ -504,10 +509,20 @@ static JXXMPP *sharedManager;
                     fromUserId  = WEB_USERID;
                 }
             }
-            
+             
             if ([msg.fromUserName isKindOfClass:[NSString class]]) {
-                if([msg.fromUserName length]>0 && type == kWCChatTypeChat && ![msg.fromUserId isEqualToString:MY_USER_ID]){//保存陌生人信息：
+                
+                NSArray *fromIdArr=[msg.fromId componentsSeparatedByString:@"/"];
+                NSString *tempMsg=[fromIdArr lastObject];
+                    
+                if(([msg.fromUserName length]>0 && type == kWCChatTypeChat && ![msg.fromUserId isEqualToString:MY_USER_ID])||[tempMsg isEqualToString:@"1"]){//保存陌生人信息：
+                  
+                    
                     [self saveFromUser:msg];
+                
+                
+                
+                
                 }
             }
             
@@ -1036,6 +1051,14 @@ static JXXMPP *sharedManager;
 -(void)saveFromUser:(JXMessageObject*)msg{
     JXUserObject *user=[[JXUserObject alloc]init];
     user.userId = msg.fromUserId;
+    NSArray *fromIdArr=[msg.fromId componentsSeparatedByString:@"/"];
+    
+    NSString *tempMsg=[fromIdArr lastObject];
+    if ([tempMsg isEqualToString:@"1"]) {
+        user.userNickname = msg.fromUserName;
+        user.userDescription = msg.fromUserName;
+        [user insert];
+    }
     if (![user haveTheUser]) {
         user.userNickname = msg.fromUserName;
         user.userDescription = msg.fromUserName;

shiku_im/network/JXServer.h

@@ -485,7 +485,7 @@
 #define act_fuwenBenGetAllt @"user/AnUrgentMessage/getAll"
 
 /**获取用户的安全吗*/
-#define act_UserdeviceLogsecurity @"/user/deviceLog/security"
+#define act_UserdeviceLogsecurity @"user/deviceLog/security"
 
 
 /** 反馈类型列表 */

shiku_im/network/JXServer.m

@@ -372,7 +372,7 @@
     }
     //    客服头像
     if([userId intValue]<10100 && [userId intValue]>=10000){ // im_10000
-        iv.image = [UIImage imageNamed:[NSString stringWithFormat:@"ALOGO_120"]];
+        iv.image = [UIImage imageNamed:[NSString stringWithFormat:@"ALOGO_1200"]];
         return;
     }
     // 支付公众号
@@ -426,7 +426,7 @@
     }
     //    客服头像
     if([userId intValue]<10100 && [userId intValue]>=10000){ // im_10000
-        iv.image = [UIImage imageNamed:[NSString stringWithFormat:@"ALOGO_120"]];
+        iv.image = [UIImage imageNamed:[NSString stringWithFormat:@"ALOGO_1200"]];
         return;
     }
     // 支付公众号

shiku_im/shiku_im-Info.plist

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