diff --git a/YuMi/Appdelegate/AppDelegate+ThirdConfig.m b/YuMi/Appdelegate/AppDelegate+ThirdConfig.m index cbb4f6ef..22341f38 100644 --- a/YuMi/Appdelegate/AppDelegate+ThirdConfig.m +++ b/YuMi/Appdelegate/AppDelegate+ThirdConfig.m @@ -100,7 +100,10 @@ UIKIT_EXTERN NSString * adImageName; #else option.apnsCername = @"newPiko"; #endif - + + + + [[NIMSDK sharedSDK] registerWithOption:option]; // NIM SDK初始化 diff --git a/YuMi/Appdelegate/AppDelegate.m b/YuMi/Appdelegate/AppDelegate.m index f24b7c8f..63f3b47b 100644 --- a/YuMi/Appdelegate/AppDelegate.m +++ b/YuMi/Appdelegate/AppDelegate.m @@ -116,7 +116,7 @@ UIKIT_EXTERN NSString * const kOpenRoomNotification; dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ [[NSNotificationCenter defaultCenter]postNotificationName:kOpenRoomNotification object:nil userInfo:@{@"type":@"kOpenChat",@"uid":userId,@"isNoAttention":@(YES)}]; ClientConfig *config = [ClientConfig shareConfig]; - config.chatId = userId; + config.pushChatId = userId; }); return; @@ -128,7 +128,7 @@ UIKIT_EXTERN NSString * const kOpenRoomNotification; if(userId){ [[NSNotificationCenter defaultCenter]postNotificationName:kOpenRoomNotification object:nil userInfo:@{@"type":@"kOpenChat",@"uid":userId}]; ClientConfig *config = [ClientConfig shareConfig]; - config.chatId = userId; + config.pushChatId = userId; } }); diff --git a/YuMi/Config/ClientConfig.h b/YuMi/Config/ClientConfig.h index dc4a5068..abd1ab00 100644 --- a/YuMi/Config/ClientConfig.h +++ b/YuMi/Config/ClientConfig.h @@ -29,6 +29,8 @@ NS_ASSUME_NONNULL_BEGIN @property (nonatomic, copy) NSString *__nullable roomId; ///用户id,用于外部h5跳转到聊天页面 @property (nonatomic, copy) NSString *__nullable chatId; +///用户id,推送跳转到聊天页面 +@property (nonatomic, copy) NSString *__nullable pushChatId; ///表情--- @property (nonatomic, copy) NSString *version; @property (nonatomic, copy) NSString *zipMd5; diff --git a/YuMi/Global/YUMIConstant.m b/YuMi/Global/YUMIConstant.m index 914b5806..c1bec603 100644 --- a/YuMi/Global/YUMIConstant.m +++ b/YuMi/Global/YUMIConstant.m @@ -97,7 +97,7 @@ NSString * const KeyWithType(Pi_KeyType type) { @(KeyType_NTESQuickLoginBusinessId) : @"sCsa0RnuPYtEeE+efSDuHRYEfCObccfLfAK/Sn1LC8X/YifkZfyHNlCts1syZE3R",///60cdaa83aa654e5ea184de7160b4073d @(KeyType_TRTC) : @"Phn3JPi/ZvZ7zVM099Q3dg==",///1400600174 ///h+GaKZVuHTQz0wEHbg8HLaUTL9mCjNDRcRo1OJTESWhiE/lzcnvMEv00/dxu8cOq - @(KeyType_NetEase) : @"d55LVCUFT72SVZskbk1L3ZCVjG+tRnUnOqAGuG04kb9uz+qIvbyudhJLDmbOFDtE",///14ef7a0d0a84cb49bae1c22d78cf1ddf + @(KeyType_NetEase) : @"d55LVCUFT72SVZskbk1L3ZCVjG+tRnUnOqAGuG04kb9uz+qIvbyudhJLDmbOFDtE",///d4d74e9ba6ac3364ccc7526ea4791215 @(keyType_YiDunBussinessId) : @"tl2ZVgj6Mrf9lhoJ9ikxgu8tHJoloM5pxk+hsHIB4pulU6r531Qc7Ol5X8QR5Jy0", @(KeyType_FacePwdEncode) : @"mjaN83evhuwnbE4yEiLQpvH7sALhxCuJ6aPjPlq5amVpHsQtSdbgri3JoHqf/I9+",///1ea53d260ecf11e7b56e00163e046a26 @(KeyType_GuildUidKey) : @"umyLNHTFzWIPw2FWQcYIeQ==", diff --git a/YuMi/Global/YUMIMacroUitls.h b/YuMi/Global/YUMIMacroUitls.h index a427ab29..74153503 100644 --- a/YuMi/Global/YUMIMacroUitls.h +++ b/YuMi/Global/YUMIMacroUitls.h @@ -49,7 +49,7 @@ isPhoneXSeries = [[UIApplication sharedApplication] delegate].window.safeAreaIns ///内置版本号 -#define PI_App_Version @"2.6.0" +#define PI_App_Version @"2.7.0" ///渠道 #define PI_App_Source @"appstore" //#define PI_App_Source @"pi_tf" diff --git a/YuMi/Modules/YMNewHome/View/PIHoemCategoryCollectionView.h b/YuMi/Modules/YMNewHome/View/PIHoemCategoryCollectionView.h index 5f9c1f8f..ab57ba2b 100644 --- a/YuMi/Modules/YMNewHome/View/PIHoemCategoryCollectionView.h +++ b/YuMi/Modules/YMNewHome/View/PIHoemCategoryCollectionView.h @@ -11,7 +11,7 @@ NS_ASSUME_NONNULL_BEGIN @protocol PIHoemCategoryCollectionViewDelegate --(void)didSelectItemAtIndex:(NSInteger)index; +-(void)pi_didSelectItemAtIndex:(NSInteger)index; @end diff --git a/YuMi/Modules/YMNewHome/View/PIHoemCategoryCollectionView.m b/YuMi/Modules/YMNewHome/View/PIHoemCategoryCollectionView.m index d69fc431..af260bec 100644 --- a/YuMi/Modules/YMNewHome/View/PIHoemCategoryCollectionView.m +++ b/YuMi/Modules/YMNewHome/View/PIHoemCategoryCollectionView.m @@ -56,8 +56,8 @@ selectModel.isChecked = YES; [self.pi_collectionView reloadData]; - if(self.delegate && [self.delegate respondsToSelector:@selector(didSelectItemAtIndex:)]){ - [self.delegate didSelectItemAtIndex:indexPath.row]; + if(self.delegate && [self.delegate respondsToSelector:@selector(pi_didSelectItemAtIndex:)]){ + [self.delegate pi_didSelectItemAtIndex:indexPath.row]; } // int i = [selectModel.id isEqualToString:@"-1"] ? 0 : 1; diff --git a/YuMi/Modules/YMNewHome/View/PIHoemCategoryTitleView.m b/YuMi/Modules/YMNewHome/View/PIHoemCategoryTitleView.m index 5d15c6aa..75a59f59 100644 --- a/YuMi/Modules/YMNewHome/View/PIHoemCategoryTitleView.m +++ b/YuMi/Modules/YMNewHome/View/PIHoemCategoryTitleView.m @@ -42,7 +42,7 @@ self.pi_collectionView.index = _index; } #pragma mark - PIHoemCategoryCollectionViewDelegate -- (void)didSelectItemAtIndex:(NSInteger)index{ +- (void)pi_didSelectItemAtIndex:(NSInteger)index{ if(self.scrolledHandle){ self.scrolledHandle(index); } diff --git a/YuMi/Modules/YMNewHome/View/XPNewHomeViewController.m b/YuMi/Modules/YMNewHome/View/XPNewHomeViewController.m index 2144c17b..c3b25622 100644 --- a/YuMi/Modules/YMNewHome/View/XPNewHomeViewController.m +++ b/YuMi/Modules/YMNewHome/View/XPNewHomeViewController.m @@ -176,7 +176,12 @@ UIKIT_EXTERN NSString * const kOpenRoomNotification; [ClientConfig shareConfig].chatId = nil; } - + if([ClientConfig shareConfig].pushChatId != nil){ + NIMSession * session = [NIMSession session:[ClientConfig shareConfig].pushChatId type:NIMSessionTypeP2P]; + SessionViewController * sessionVC = [[SessionViewController alloc] initWithSession:session]; + [self.navigationController pushViewController:sessionVC animated:YES]; + [ClientConfig shareConfig].pushChatId = nil; + } MJRefreshNormalHeader *header = [MJRefreshNormalHeader headerWithRefreshingTarget:self refreshingAction:@selector(headerRefresh)]; header.stateLabel.font = [UIFont systemFontOfSize:10.0]; header.lastUpdatedTimeLabel.font = [UIFont systemFontOfSize:10.0]; diff --git a/YuMi/Modules/YMRoom/Model/ActivityInfoModel.h b/YuMi/Modules/YMRoom/Model/ActivityInfoModel.h index 40a33e2e..26921fbb 100644 --- a/YuMi/Modules/YMRoom/Model/ActivityInfoModel.h +++ b/YuMi/Modules/YMRoom/Model/ActivityInfoModel.h @@ -28,6 +28,7 @@ typedef NS_ENUM(NSInteger, ActivityType) { }; @interface ActivityInfoModel : PIBaseModel +@property(nonatomic,copy) NSString *url; @property(nonatomic,copy) NSString *code; @property(nonatomic,copy) NSString *icon; @property(nonatomic,copy) NSString *skipContent; diff --git a/YuMi/Modules/YMRoom/View/ActivityContainerView/PIRoomActivityWebCell.m b/YuMi/Modules/YMRoom/View/ActivityContainerView/PIRoomActivityWebCell.m index 7494e2d9..ddee113f 100644 --- a/YuMi/Modules/YMRoom/View/ActivityContainerView/PIRoomActivityWebCell.m +++ b/YuMi/Modules/YMRoom/View/ActivityContainerView/PIRoomActivityWebCell.m @@ -34,7 +34,7 @@ } -(void)setInfoModel:(ActivityInfoModel *)infoModel{ _infoModel = infoModel; - _bgImageView.imageUrl = _infoModel.icon; + _bgImageView.imageUrl = _infoModel.url; } #pragma mark - 懒加载 - (NetImageView *)bgImageView{