修改了丝带 和红包 不消失

shiku_im.xcodeproj/project.pbxproj

@@ -452,6 +452,8 @@
 		4C61D06C24B9D9C90000A2CB /* JXHomeScrollView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C61D06B24B9D9C80000A2CB /* JXHomeScrollView.m */; };
 		4C61D06F24B9EE710000A2CB /* JXShadeShowView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C61D06E24B9EE710000A2CB /* JXShadeShowView.m */; };
 		4C61D09724BA06270000A2CB /* JXNodeView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C61D09624BA06270000A2CB /* JXNodeView.m */; };
+		4C84579D24C28CA6002D54AF /* JitsiMeet.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 88AE16022369905C00BB1215 /* JitsiMeet.framework */; };
+		4C84579E24C28CA6002D54AF /* JitsiMeet.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 88AE16022369905C00BB1215 /* JitsiMeet.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		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 */; };
@@ -828,8 +830,6 @@
 		886923B91F67FAA300824159 /* ic_selected_done_2@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 886923B71F67FAA300824159 /* ic_selected_done_2@2x.png */; };
 		886923BA1F67FAA300824159 /* ic_selected_done_2@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 886923B81F67FAA300824159 /* ic_selected_done_2@3x.png */; };
 		889F31721F7F2CAE00450C2F /* JXAudioRecorderViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 889F31701F7F2CAE00450C2F /* JXAudioRecorderViewController.m */; };
-		88AE16042369908F00BB1215 /* JitsiMeet.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 88AE16022369905C00BB1215 /* JitsiMeet.framework */; };
-		88AE16052369908F00BB1215 /* JitsiMeet.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 88AE16022369905C00BB1215 /* JitsiMeet.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		88B111851F458CA300F53E23 /* playvideo@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 88B111841F458CA300F53E23 /* playvideo@3x.png */; };
 		88BDA8771F4726260013ED83 /* JXLinkCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 88BDA8751F4726260013ED83 /* JXLinkCell.m */; };
 		88BFF92F23557B27009A3A4F /* WebRTC.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 88BFF92D23557B27009A3A4F /* WebRTC.framework */; };
@@ -1794,7 +1794,7 @@
 			dstSubfolderSpec = 10;
 			files = (
 				88BFF93323557B4A009A3A4F /* WebRTC.framework in Embed Frameworks */,
-				88AE16052369908F00BB1215 /* JitsiMeet.framework in Embed Frameworks */,
+				4C84579E24C28CA6002D54AF /* JitsiMeet.framework in Embed Frameworks */,
 			);
 			name = "Embed Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -4771,6 +4771,7 @@
 				8409055C17B693CF00F5C28D /* Foundation.framework in Frameworks */,
 				CC875892193613C7007D2DA1 /* CoreFoundation.framework in Frameworks */,
 				8409057F17B694CA00F5C28D /* CFNetwork.framework in Frameworks */,
+				4C84579D24C28CA6002D54AF /* JitsiMeet.framework in Frameworks */,
 				CCC88D001E4C761C00180080 /* CoreMotion.framework in Frameworks */,
 				CC30178E1951BED80059BADA /* CoreText.framework in Frameworks */,
 				8472A9F217B697E900129DBB /* QuartzCore.framework in Frameworks */,
@@ -4823,7 +4824,6 @@
 				8472A9EE17B697A000129DBB /* MobileCoreServices.framework in Frameworks */,
 				CCFD208A19592D1D00B98494 /* libmp3lame.a in Frameworks */,
 				9D0F2DF5248AF0BC00CF60D0 /* TencentOpenAPI.framework in Frameworks */,
-				88AE16042369908F00BB1215 /* JitsiMeet.framework in Frameworks */,
 				CCC46F151E2F9EAA005A13E8 /* libbz2.tbd in Frameworks */,
 				63C624A51EC0069500CE3216 /* GoogleMaps.framework in Frameworks */,
 				B8DB56BBF177C51C837023A2 /* Pods_shiku_im.framework in Frameworks */,
@@ -11789,7 +11789,7 @@
 					"$(PROJECT_DIR)/shiku_im/Socket/ProtocolBuffer",
 				);
 				INFOPLIST_FILE = "shiku_im/shiku_im-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = (
 					"$(PROJECT_DIR)",
@@ -11826,7 +11826,7 @@
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				REZ_SEARCH_PATHS = "$(PROJECT_DIR)/shiku_im/Socket/ProtocolBuffer";
 				SWIFT_VERSION = 4.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
+				TARGETED_DEVICE_FAMILY = 1;
 				VALID_ARCHS = arm64;
 				WRAPPER_EXTENSION = app;
 			};
@@ -11880,7 +11880,7 @@
 					"$(PROJECT_DIR)/shiku_im/Socket/ProtocolBuffer",
 				);
 				INFOPLIST_FILE = "shiku_im/shiku_im-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
@@ -11913,7 +11913,7 @@
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				REZ_SEARCH_PATHS = "$(PROJECT_DIR)/shiku_im/Socket/ProtocolBuffer";
 				SWIFT_VERSION = 4.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
+				TARGETED_DEVICE_FAMILY = 1;
 				VALID_ARCHS = arm64;
 				WRAPPER_EXTENSION = app;
 			};

shiku_im/Register&Login/inputPhoneVC.m

@@ -922,7 +922,7 @@
 
 -(int) didServerResultFailed:(JXConnection*)aDownload dict:(NSDictionary*)dict{
     [_wait stop];
-    if([aDownload.action isEqualToString:act_SendSMS]){
+    if([aDownload.action isEqualToString:act_SendSMS] || [aDownload.action isEqualToString:act_CheckPhone]){
         
         [_send setTitle:Localized(@"JX_Send") forState:UIControlStateNormal];
         [g_App showAlert:dict[@"resultMsg"]];

shiku_im/cell/ChatCell/JXBaseChatCell.m

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

shiku_im/controller/ADView/DYAdAlertView/DYAdAlertView.m

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

shiku_im/controller/JXChatViewC.h

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

shiku_im/controller/JXChatViewC.mm

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

shiku_im/controller/JXSiDaiWebView.m

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

shiku_im/shiku_im-Info.plist

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