moliparty/peko-ios
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

商店包版本修改 此commit置顶 2.7.0

Browse Source
This commit is contained in:
liyuhua
2024-02-26 17:18:21 +08:00
parent 2f2456fa18
commit 12a1dd9284
11 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
YuMi/Appdelegate/AppDelegate+ThirdConfig.m
View File

@@ -100,7 +100,10 @@ UIKIT_EXTERN NSString * adImageName;
#else
option.apnsCername = @"newPiko";
#endif
[[NIMSDK sharedSDK] registerWithOption:option];
// NIM SDK初始化

4
YuMi/Appdelegate/AppDelegate.m
View File

@@ -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;
}
});

2
YuMi/Config/ClientConfig.h
View File

@@ -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;

2
YuMi/Global/YUMIConstant.m
View File

@@ -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==",

2
YuMi/Global/YUMIMacroUitls.h
View File

@@ -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"

2
YuMi/Modules/YMNewHome/View/PIHoemCategoryCollectionView.h
View File

@@ -11,7 +11,7 @@ NS_ASSUME_NONNULL_BEGIN
@protocol PIHoemCategoryCollectionViewDelegate <NSObject>
-(void)didSelectItemAtIndex:(NSInteger)index;
-(void)pi_didSelectItemAtIndex:(NSInteger)index;
@end

4
YuMi/Modules/YMNewHome/View/PIHoemCategoryCollectionView.m
View File

@@ -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;

2
YuMi/Modules/YMNewHome/View/PIHoemCategoryTitleView.m
View File

@@ -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);
}

7
YuMi/Modules/YMNewHome/View/XPNewHomeViewController.m
View File

@@ -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];

1
YuMi/Modules/YMRoom/Model/ActivityInfoModel.h
View File

@@ -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;

2
YuMi/Modules/YMRoom/View/ActivityContainerView/PIRoomActivityWebCell.m
View File

@@ -34,7 +34,7 @@
}
-(void)setInfoModel:(ActivityInfoModel *)infoModel{
_infoModel = infoModel;
_bgImageView.imageUrl = _infoModel.icon;
_bgImageView.imageUrl = _infoModel.url;
}
#pragma mark - 懒加载
- (NetImageView *)bgImageView{