1.5.3版本发版 此commit置顶

Podfile

@@ -49,7 +49,7 @@ target 'xplan-ios' do
 	pod 'mob_sharesdk/ShareSDKPlatforms/WeChat_Lite'
 	pod 'mob_sharesdk/ShareSDKPlatforms/Apple'
 	pod 'mob_sharesdk/ShareSDKExtension'
-	pod 'SVGAPlayer', '~> 2.3'
+	pod 'SVGAPlayer'
 	# 滑动标签栏
 	pod 'JXCategoryView'
 	pod 'JXPagingView/Pager'

Podfile.lock

@@ -153,7 +153,7 @@ DEPENDENCIES:
   - mob_sharesdk/ShareSDKPlatforms/WeChat_Lite
   - NIMSDK_LITE (~> 8.9.0)
   - NTESQuickPass
-  - pop
+  - pop (~> 1.0.12)
   - QGVAPlayer
   - Qiniu
   - QY_NIM_iOS_SDK (~> 6.6.1)
@@ -162,7 +162,7 @@ DEPENDENCIES:
   - SDWebImage
   - SDWebImageFLPlugin
   - SSKeychain
-  - SVGAPlayer (~> 2.3)
+  - SVGAPlayer
   - SZTextView
   - TXLiteAVSDK_TRTC (~> 11.4.14530)
   - TZImagePickerController
@@ -271,6 +271,6 @@ SPEC CHECKSUMS:
   YYText: 5c461d709e24d55a182d1441c41dc639a18a4849
   YYWebImage: 5f7f36aee2ae293f016d418c7d6ba05c4863e928
 
-PODFILE CHECKSUM: f44d894b616b0165722154f819e116f0d23597ff
+PODFILE CHECKSUM: 0f2e29ba8c875f839292918f612c6ec567ad4318
 
 COCOAPODS: 1.12.1

xplan-ios.xcodeproj/project.pbxproj

@@ -11395,7 +11395,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.5.0;
+				MARKETING_VERSION = 1.5.3;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -11658,7 +11658,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.5.0;
+				MARKETING_VERSION = 1.5.3;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",

xplan-ios.xcodeproj/xcshareddata/xcschemes/xplan-ios.xcscheme

@@ -31,7 +31,7 @@
       </Testables>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Debug"
+      buildConfiguration = "Release"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"

xplan-ios/Base/MVP/Model/UserLevelVo.m

@@ -8,13 +8,11 @@
 #import "UserLevelVo.h"
 
 @implementation UserLevelVo
-- (void)setCharmUrl:(NSString *)charmUrl{
-    _charmUrl = charmUrl;
-    _charmNewUrl = [NSString getCharmImageUrl:_charmUrl];
+- (NSString *)charmNewUrl{
+    return [NSString getCharmImageUrl:_charmUrl];;
 }
-- (void)setExperUrl:(NSString *)experUrl{
-    _experUrl = experUrl;
-    _experNewUrl = [NSString getWealthImageUrl:_experUrl];
+- (NSString *)experNewUrl{
+    return [NSString getWealthImageUrl:_experUrl];
 }
 
 @end

xplan-ios/Base/Tool/NSString/NSString+Utils.m

@@ -132,8 +132,13 @@
         NSArray *charmList = [url componentsSeparatedByString:@"charm_"];
         if(charmList.count == 2){
             NSString *charmUrl = charmList[1];
+            NSArray *curCharmList = [charmUrl componentsSeparatedByString:@"."];
+            if(curCharmList.count == 2){
+                return [NSString stringWithFormat:@"new_charm_%@",curCharmList.firstObject];
+              
+            }
             for (int i = 0;i < 110; i++) {
-                NSString *num = i < 10 ? [NSString stringWithFormat:@"0%d",i+1] : [NSString stringWithFormat:@"%d",i+1];
+                NSString *num = i < 9 ? [NSString stringWithFormat:@"0%d",i+1] : [NSString stringWithFormat:@"%d",i+1];
                 if([charmUrl containsString:num]){
                     getUrl = [NSString stringWithFormat:@"new_charm_%@",num];
                     break;
@@ -152,8 +157,12 @@
         NSArray *wealthList = [url componentsSeparatedByString:@"wealth_"];
         if(wealthList.count == 2){
             NSString *wealthUrl = wealthList[1];
+            NSArray *curWealthList = [wealthUrl componentsSeparatedByString:@"."];
+            if(curWealthList.count == 2){
+                return [NSString stringWithFormat:@"new_exper_%@",curWealthList.firstObject];;
+            }
             for (int i = 0;i < 110; i++) {
-                NSString *num = i < 10 ? [NSString stringWithFormat:@"0%d",i+1] : [NSString stringWithFormat:@"%d",i+1];
+                NSString *num = i < 9 ? [NSString stringWithFormat:@"0%d",i+1] : [NSString stringWithFormat:@"%d",i+1];
                 if([wealthUrl containsString:num]){
                     getUrl = [NSString stringWithFormat:@"new_exper_%@",num];
                     break;

xplan-ios/Base/UI/Adbvertise/XPAdvertiseView.m

@@ -14,7 +14,7 @@
 ///Tool
 #import "UIImage+Utils.h"
 NSString *const adImageName = @"adImageName";
-NSString *const adUrl = @"adUrl";
+
 // 广告显示的时间
 static int const showtime = 3;
 

xplan-ios/Global/XPConstant.m

@@ -43,7 +43,7 @@ NSString * const KeyWithType(KeyType type) {
 		///正式环境
 		@(YES):@{
 			@(KeyType_PasswordEncode)           : @"1ea53d260ecf11e7b56e00163e046a26",
-			@(KeyType_NTESQuickLoginBusinessId) : @"3a94ceb70b144963a03bf98cb55b812a",
+			@(KeyType_NTESQuickLoginBusinessId) : @"200c83103d4a413591c7969dd8d4d6e2",
 			@(KeyType_QQAppid)                  : @"102044928",
 			@(KeyType_QQSecret)                 : @"715dd2601777347cd57af77c3e28402f",
 			@(KeyType_WechatAppid)              : @"wx4b772d5ebc964a38",
@@ -66,7 +66,7 @@ NSString * const KeyWithType(KeyType type) {
         ///测试环境
 		@(NO):@{
 			@(KeyType_PasswordEncode)           : @"1ea53d260ecf11e7b56e00163e046a26",
-			@(KeyType_NTESQuickLoginBusinessId) : @"3a94ceb70b144963a03bf98cb55b812a",
+			@(KeyType_NTESQuickLoginBusinessId) : @"200c83103d4a413591c7969dd8d4d6e2",
 			@(KeyType_QQAppid)                  : @"102044928",
 			@(KeyType_QQSecret)                 : @"715dd2601777347cd57af77c3e28402f",
 			@(KeyType_WechatAppid)              : @"wx4b772d5ebc964a38",

xplan-ios/Main/Message/View/FindNew/Model/FindNewUserInfoModel.m

@@ -8,12 +8,10 @@
 #import "FindNewUserInfoModel.h"
 
 @implementation FindNewUserInfoModel
-- (void)setCharmUrl:(NSString *)charmUrl{
-    _charmUrl = charmUrl;
-    _charmNewUrl = [NSString getCharmImageUrl:_charmUrl];
+- (NSString *)charmNewUrl{
+    return [NSString getCharmImageUrl:_charmUrl];;
 }
-- (void)setExperUrl:(NSString *)experUrl{
-    _experUrl = experUrl;
-    _experNewUrl = [NSString getWealthImageUrl:_experUrl];
+- (NSString *)experNewUrl{
+    return [NSString getWealthImageUrl:_experUrl];
 }
 @end

xplan-ios/Main/Message/View/Session/SessionViewController.m

@@ -645,7 +645,11 @@
     
     [[NIMSDK sharedSDK].conversationManager markAllMessagesReadInSession:self.session];
 }
-
+- (void)onRecvRevokeMessageNotification:(NIMRevokeMessageNotification *)notification{
+    
+  
+    [[NIMSDK sharedSDK].conversationManager deleteMessage:notification.message];
+}
 - (void)sendMessage:(NIMMessage *)message didCompleteWithError:(NSError *)error {
     if (message.session.sessionType != NIMSessionTypeP2P) {
         return;

xplan-ios/Main/Message/View/SessionList/SessionListViewController.m

@@ -27,7 +27,7 @@ NSString * const kMessageShowReadDotKey = @"kMessageShowReadDotKey";
 
 #import <Masonry/Masonry.h>
 
-@interface SessionListViewController ()<UITableViewDataSource, UITableViewDelegate, NIMLoginManagerDelegate, NIMConversationManagerDelegate, XPSessionListHeadViewDelegate>
+@interface SessionListViewController ()<UITableViewDataSource, UITableViewDelegate, NIMLoginManagerDelegate, NIMConversationManagerDelegate, XPSessionListHeadViewDelegate,NIMChatManagerDelegate>
 
 @property (nonatomic, strong) XPSessionListHeadView *headView;
 /**
@@ -54,6 +54,7 @@ NSString * const kMessageShowReadDotKey = @"kMessageShowReadDotKey";
 - (void)dealloc {
     [[NIMSDK sharedSDK].conversationManager removeDelegate:self];
     [[NIMSDK sharedSDK].loginManager removeDelegate:self];
+    [[NIMSDK sharedSDK].chatManager removeDelegate:self];
 }
 
 - (BOOL)isHiddenNavBar {
@@ -98,6 +99,7 @@ NSString * const kMessageShowReadDotKey = @"kMessageShowReadDotKey";
         [self initDatas];
         [[NIMSDK sharedSDK].conversationManager addDelegate:self];
         [[NIMSDK sharedSDK].loginManager addDelegate:self];
+        [[NIMSDK sharedSDK].chatManager addDelegate:self];
 		///置顶会话同步
 		[[NIMSDKConfig sharedConfig] setShouldSyncStickTopSessionInfos:YES];
     }
@@ -293,7 +295,15 @@ NSString * const kMessageShowReadDotKey = @"kMessageShowReadDotKey";
     [self.sessionListView reloadData];
     [self setTabBarItemBadge:totalUnreadCount];
 }
-
+- (void)onRecvRevokeMessageNotification:(NIMRevokeMessageNotification *)notification{
+    for (NIMRecentSession *recent in self.recentSessions) {
+        if ([recent.session.sessionId isEqualToString:notification.session.sessionId]) {
+            id<NIMConversationManager> manager = [[NIMSDK sharedSDK] conversationManager];
+            [manager deleteRecentSession:recent];
+            break;
+        }
+    }
+}
 - (void)didUpdateRecentSession:(NIMRecentSession *)recentSession
               totalUnreadCount:(NSInteger)totalUnreadCount {
     if(self.openType != SessionListOpenTypeRoom && [[ClientConfig shareConfig].configInfo.officialMsgUids containsObject:recentSession.session.sessionId]) {

xplan-ios/Main/Mine/Model/Friend/FansInfoModel.m

@@ -16,12 +16,10 @@
 			 @"userInRoomUid": @"userInRoom.uid"
 	};
 }
-- (void)setCharmUrl:(NSString *)charmUrl{
-    _charmUrl = charmUrl;
-    _charmNewUrl = [NSString getCharmImageUrl:_charmUrl];
+- (NSString *)charmNewUrl{
+    return [NSString getCharmImageUrl:_charmUrl];;
 }
-- (void)setExperUrl:(NSString *)experUrl{
-    _experUrl = experUrl;
-    _experNewUrl = [NSString getWealthImageUrl:_experUrl];
+- (NSString *)experNewUrl{
+    return [NSString getWealthImageUrl:_experUrl];
 }
 @end

xplan-ios/Main/Mine/View/Friend/XPRoomMessageBubbleView.m

@@ -72,7 +72,8 @@
 		self.avatarImageView.imageUrl = avatarUrl;
 		self.nickLabel.text = user.userInfo.nickName;
 		[self.nickLabel sizeToFit];
-		self.contentLabel.text = [NIMMessageUtils messageContent:session.lastMessage];
+//		self.contentLabel.text = [NIMMessageUtils messageContent:session.lastMessage];
+        self.contentLabel.text = @"收到一条新消息";
 	}
 }
 
@@ -103,6 +104,7 @@
 		_contentLabel = [[UILabel alloc] init];
 		_contentLabel.font = [UIFont systemFontOfSize:10];
 		_contentLabel.textColor = [ThemeColor mainTextColor];
+        _contentLabel.adjustsFontSizeToFitWidth = YES;
 	}
 	return _contentLabel;
 }

xplan-ios/Main/Mine/View/Guild/Model/ClanMemberDetailInfoModel.m

@@ -21,12 +21,10 @@
 			 @"charmUrl":@"userLevelVo.charmUrl"
 	};
 }
-- (void)setCharmUrl:(NSString *)charmUrl{
-    _charmUrl = charmUrl;
-    _charmNewUrl = [NSString getCharmImageUrl:_charmUrl];
+- (NSString *)charmNewUrl{
+    return [NSString getCharmImageUrl:_charmUrl];;
 }
-- (void)setExperUrl:(NSString *)experUrl{
-    _experUrl = experUrl;
-    _experNewUrl = [NSString getWealthImageUrl:_experUrl];
+- (NSString *)experNewUrl{
+    return [NSString getWealthImageUrl:_experUrl];
 }
 @end

xplan-ios/Main/Mine/View/Guild/View/XPMineClanViewController.m

@@ -56,6 +56,7 @@
 @property (nonatomic,strong) XPClanSectionView *sectionView;
 ///是否请求了数据
 @property (nonatomic,assign) BOOL isRequest;
+@property(nonatomic,assign) NSInteger count;
 @end
 
 @implementation XPMineClanViewController
@@ -173,7 +174,7 @@
 			sectionView.delegate = self;
 			self.sectionView = sectionView;
 		}
-		self.sectionView.title = [NSString stringWithFormat:@"公会成员(%ld）", self.datasource.count];
+        self.sectionView.title = [NSString stringWithFormat:@"公会成员(%ld）", self.count];
 		return self.sectionView;
 	}
 	return [UIView new];
@@ -232,6 +233,8 @@
 	} else {
 		self.hasNoMoreData = YES;
 	}
+    self.count = memberInfo.count;
+    
 	[self.tableView reloadData];
 }
 

xplan-ios/Main/Room/View/BaseUIContainerView/Model/XPRoomRankListModel.m

@@ -8,12 +8,10 @@
 #import "XPRoomRankListModel.h"
 
 @implementation XPRoomRankListModel
-- (void)setCharmUrl:(NSString *)charmUrl{
-    _charmUrl = charmUrl;
-    _charmNewUrl = [NSString getCharmImageUrl:_charmUrl];
+- (NSString *)charmNewUrl{
+    return [NSString getCharmImageUrl:_charmUrl];;
 }
-- (void)setExperUrl:(NSString *)experUrl{
-    _experUrl = experUrl;
-    _experNewUrl = [NSString getWealthImageUrl:_experUrl];
+- (NSString *)experNewUrl{
+    return [NSString getWealthImageUrl:_experUrl];
 }
 @end

xplan-ios/Main/Room/View/MessageContainerView/Model/XPMessageInfoModel.h

@@ -9,6 +9,7 @@
 NS_ASSUME_NONNULL_BEGIN
 
 @interface XPMessageInfoModel : NSObject
+
 ///显示文本
 @property (nonatomic,strong) NSAttributedString *content;
 ///cell的高度

xplan-ios/Main/Room/View/MessageContainerView/Model/XPMessageRemoteExtModel.m

@@ -8,12 +8,11 @@
 #import "XPMessageRemoteExtModel.h"
 
 @implementation XPMessageRemoteExtModel
-- (void)setCharmUrl:(NSString *)charmUrl{
-    _charmUrl = charmUrl;
-    _charmNewUrl = [NSString getCharmImageUrl:_charmUrl];
+
+- (NSString *)charmNewUrl{
+    return [NSString getCharmImageUrl:_charmUrl];;
 }
-- (void)setExperUrl:(NSString *)experUrl{
-    _experUrl = experUrl;
-    _experNewUrl = [NSString getWealthImageUrl:_experUrl];
+- (NSString *)experNewUrl{
+    return [NSString getWealthImageUrl:_experUrl];
 }
 @end

xplan-ios/Main/Room/View/MessageContainerView/Tool/XPRoomMessageParser.m

@@ -182,11 +182,14 @@
 	if ([self isCurrentRoomSuperAdmin:message.from]) {
 		[attribute appendAttributedString:[self createLocalImageAttribute:@"common_super_admin"]];
 	}
+    
 	if (model.experUrl) {
 		[attribute appendAttributedString:[self createCharmOrExperImageAttribute:model.experNewUrl]];
 		[attribute appendAttributedString:[self createSapceAttribute:2]];
 	}
+    
 	if (model.charmUrl) {
+     
 		[attribute appendAttributedString:[self createCharmOrExperImageAttribute:model.charmNewUrl]];
 		[attribute appendAttributedString:[self createSapceAttribute:2]];
 	}

xplan-ios/Main/Room/View/Setting/View/XPRoomRoleViewController.m

@@ -157,7 +157,7 @@
             } roomUid:self.roomUid targetUid:member.userId opt:@"1" isSet:@(NO)];
         }else{
             NIMChatroomMemberUpdateRequest *request = [[NIMChatroomMemberUpdateRequest alloc]init];
-            request.roomId = self.roomUid;
+            request.roomId = self.roomId;
             request.userId = member.userId;
             request.enable = NO;
             [[NIMSDK sharedSDK].chatroomManager markMemberManager:request completion:^(NSError * _Nullable error) {