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

修复bug

Browse Source
This commit is contained in:
liyuhua
2024-01-05 17:05:27 +08:00
parent c670d7be6d
commit 470ecd99e7
14 changed files with 139 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
YuMi.xcodeproj/project.pbxproj
View File

@@ -12217,7 +12217,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 20.20.6;
MARKETING_VERSION = 20.20.7;
PRODUCT_BUNDLE_IDENTIFIER = com.peko.enterprise.ios;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -12253,7 +12253,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 20.20.6;
MARKETING_VERSION = 20.20.7;
PRODUCT_BUNDLE_IDENTIFIER = com.peko.enterprise.ios;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";

5
YuMi/CustomUI/ShareView/XPShareView.m
View File

@@ -161,6 +161,7 @@
UIPasteboard *pasteboard = [UIPasteboard generalPasteboard];
[pasteboard setString:urlString];
[XNDJTDDLoadingTool showSuccessWithMessage:YMLocalizedString(@"XPShareView0")];
[TTPopup dismiss];
return;
}
@@ -185,7 +186,9 @@
}];
if (self.delegate && [self.delegate respondsToSelector:@selector(shareView:didSuccess:)]) {
[self.delegate shareView:self didSuccess:self.shareInfo];
}
// FBtype = PlatformOfLine;
// [shareParams SSDKSetupLineParamsByText:encodedUrl image:nil type:SSDKContentTypeAuto];

2
YuMi/Global/YUMIMacroUitls.h
View File

@@ -49,7 +49,7 @@ isPhoneXSeries = [[UIApplication sharedApplication] delegate].window.safeAreaIns
///内置版本号
#define PI_App_Version @"2.4.6"
#define PI_App_Version @"2.5.0"
///渠道
#define PI_App_Source @"appstore"
//#define PI_App_Source @"pi_tf"

75
YuMi/Modules/YMMessage/View/Session/SessionViewController.m
View File

@@ -746,11 +746,18 @@
}
- (void)didFailRetry:(NIMMessage *)message {
if (message.isReceivedMsg) {
[[NIMSDK sharedSDK].chatManager fetchMessageAttachment:message error:nil];
} else {
[[NIMSDK sharedSDK].chatManager resendMessage:message error:nil];
}
[Api getPrivateChatCheck:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) {
if(code == 200){
if (message.isReceivedMsg) {
[[NIMSDK sharedSDK].chatManager fetchMessageAttachment:message error:nil];
} else {
[[NIMSDK sharedSDK].chatManager resendMessage:message error:nil];
}
return;
}
[self showErrorToast:msg];
} content:@"" toUid:self.session.sessionId];
}
- (void)sendTextMessage:(NSString *)text {
@@ -763,22 +770,36 @@
[self showErrorToast:msg];
} content:text toUid:self.session.sessionId];
}
- (void)audioRecordCompletion:(NSString *)recordPath {
NIMMessage *message = [NIMMessageMaker msgWithAudio:recordPath];
[[[NIMSDK sharedSDK] chatManager] sendMessage:message toSession:self.session error:nil];
[Api getPrivateChatCheck:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) {
if(code == 200){
NIMMessage *message = [NIMMessageMaker msgWithAudio:recordPath];
[[[NIMSDK sharedSDK] chatManager] sendMessage:message toSession:self.session error:nil];
return;
}
[self showErrorToast:msg];
} content:@"" toUid:self.session.sessionId];
}
#pragma mark - TZImagePickerControllerDelegate
- (void)imagePickerController:(TZImagePickerController *)picker didFinishPickingPhotos:(NSArray<UIImage *> *)photos sourceAssets:(NSArray *)assets isSelectOriginalPhoto:(BOOL)isSelectOriginalPhoto infos:(NSArray<NSDictionary *> *)infos {
[photos enumerateObjectsUsingBlock:^(UIImage * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
if (obj) {
// 构造出具体会话
NIMMessage * message = [NIMMessageMaker msgWithImage:obj];
// 发送消息
[[NIMSDK sharedSDK].chatManager sendMessage:message toSession:self.session error:nil];
[Api getPrivateChatCheck:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) {
if(code == 200){
// 构造出具体会话
NIMMessage * message = [NIMMessageMaker msgWithImage:obj];
// 发送消息
[[NIMSDK sharedSDK].chatManager sendMessage:message toSession:self.session error:nil];
return;
}
[self showErrorToast:msg];
} content:@"" toUid:self.session.sessionId];
}
}];
}
@@ -1032,11 +1053,18 @@
if (image == nil){
continue;
}
// 发送消息
NIMMessage * message = [NIMMessageMaker msgWithImage:image];
// 发送消息
[[NIMSDK sharedSDK].chatManager sendMessage:message toSession:self.session error:nil];
[view resetChoosePhotos];
[Api getPrivateChatCheck:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) {
if(code == 200){
[[NIMSDK sharedSDK].chatManager sendMessage:message toSession:self.session error:nil];
[view resetChoosePhotos];
return;
}
[self showErrorToast:msg];
} content:@"" toUid:self.session.sessionId];
}
}
@@ -1059,10 +1087,17 @@
if (picker.sourceType == UIImagePickerControllerSourceTypeCamera) {
UIImageWriteToSavedPhotosAlbum(selectedPhoto, nil, nil, nil);
}
// 构造出具体会话
NIMMessage * message = [NIMMessageMaker msgWithImage:selectedPhoto];
// 发送消息
[[NIMSDK sharedSDK].chatManager sendMessage:message toSession:self.session error:nil];
[Api getPrivateChatCheck:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) {
if(code == 200){
// 构造出具体会话
NIMMessage * message = [NIMMessageMaker msgWithImage:selectedPhoto];
// 发送消息
[[NIMSDK sharedSDK].chatManager sendMessage:message toSession:self.session error:nil];
return;
}
[self showErrorToast:msg];
} content:@"" toUid:self.session.sessionId];
}
[picker dismissViewControllerAnimated:YES completion:^{}];
}

5
YuMi/Modules/YMRTC/RtcImpl/AgoraRtcImpl.m
View File

@@ -53,6 +53,11 @@
}];
return code == 0;
}
/// 静音某个人
/// @param userId 用户id
- (BOOL)muteRemote:(BOOL)mute userId:(NSString *)userId {
return [self.engine muteRemoteAudioStream:[userId integerValue] mute:mute];
}
- (BOOL)muteRemote:(BOOL)mute {
return [self.engine muteAllRemoteAudioStreams:mute] == 0;

2
YuMi/Modules/YMRoom/Api/Api+Room.m
View File

@@ -127,7 +127,7 @@
/// @param roomUserId 房主的uid
/// @param roundId 相亲进行到哪一步
+ (void)changeRoomDatingState:(HttpRequestHelperCompletion)completion roomUserId:(NSString *)roomUserId roundId:(NSString *)roundId {
NSString * fang = [NSString stringFromBase64String:@"dXNlcnJvb20vaW5WMg=="];///
NSString * fang = @"blind-date/state";///
[self makeRequest:fang method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, roomUserId, roundId, nil];
}

5
YuMi/Modules/YMRoom/View/AcrossRoomPK/Model/AcrossRoomPKPanelModel.m
View File

@@ -18,7 +18,10 @@
@"csRank" : [AcrossRoomPkRankModel class]
};
}
///如果一个模型中需要字段映射的话 比如id -> ID name -> other.name
+ (NSDictionary *)replacedKeyFromPropertyName {
return @{@"aMicStatus":@"amicStatus"};
}
@end

3
YuMi/Modules/YMRoom/View/AnimationView/XPRoomDatingAnimationView.m
View File

@@ -277,7 +277,8 @@
[leftAttribut addAttributes:@{NSFontAttributeName:[UIFont systemFontOfSize:28], NSForegroundColorAttributeName:[UIColor whiteColor]} range:NSMakeRange(0, leftTitle.length)];
[self.datingSvgaImageView setAttributedText:leftAttribut forKey:@"y_yhname"];
@kWeakify(self);
[self.parser parseWithURL:[NSURL URLWithString:model.svgaUrl] completionBlock:^(SVGAVideoEntity * _Nonnull videoItem) {
NSString *url = [model.svgaUrl stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
[self.parser parseWithURL:[NSURL URLWithString:url] completionBlock:^(SVGAVideoEntity * _Nonnull videoItem) {
@kStrongify(self);
self.datingSvgaImageView.hidden = NO;
self.datingSvgaImageView.videoItem = videoItem;

4
YuMi/Modules/YMRoom/View/ArrangeMic/Presenter/XPArrangeMicPresenter.m
View File

@@ -28,7 +28,7 @@
[[self getView] getRoomArrangeMicListSuccess:model state:state];
} fail:^(NSInteger code, NSString * _Nullable msg) {
[[self getView] getRoomArrangeMicListFail:msg state:state];
} showLoading:YES] roomUid:roomUid operUid:uid page:pageStr pageSize:pageSizeStr];
} showLoading:NO] roomUid:roomUid operUid:uid page:pageStr pageSize:pageSizeStr];
}
/// 申请排麦
@@ -67,7 +67,7 @@
[[self getView] getRoomPKMemberListSuccess:model state:state];
}fail:^(NSInteger code, NSString * _Nullable msg) {
[[self getView] getRoomPKMemberListFail:msg state:state];
} showLoading:YES] roomUid:roomUid operUid:uid page:pageStr pageSize:pageSizeStr];
} showLoading:NO] roomUid:roomUid operUid:uid page:pageStr pageSize:pageSizeStr];
}
/// 申请房间内PK排麦

1
YuMi/Modules/YMRoom/View/ArrangeMic/View/XPArrangeMicViewController.m
View File

@@ -501,6 +501,7 @@
}
- (void)getRoomPKMemberListSuccess:(ArrangeMicModel *)listModel state:(int)state {
self.arrangeMicInfo = listModel;
if (state == 0) {
[self.datasource removeAllObjects];

1
YuMi/Modules/YMRoom/View/LittleGame/View/XPRoomLittleGameContainerView.m
View File

@@ -594,6 +594,7 @@
/// 命中 关键词状态 （你画我猜）
- (void)notifyChangeTextHitState:(NSString *)keyWord {
if([keyWord isKindOfClass:[NSNull class]])return;
if (keyWord.length && [keyWord containsString:self.DrawSomethingKeyWord]) {
NSDictionary *dic = [NSDictionary dictionaryWithObjectsAndKeys:@(true), @"isHit", self.DrawSomethingKeyWord, @"keyWord", self.DrawSomethingKeyWord, @"text", nil];
[self notifyStateChange:APP_COMMON_SELF_TEXT_HIT dataJson:[SudCommon dictionaryToJson:dic]];

119
YuMi/Modules/YMRoom/View/Setting/View/Cell/XPRoomOnlineTableViewCell.m
View File

@@ -156,33 +156,33 @@
self.sexImageView.titleEdgeInsets = userInfo.gender != GenderType_Male ? UIEdgeInsetsMake(0, 2, 0, 0):UIEdgeInsetsMake(0, -1, 0, 0);
self.sexImageView.selected = userInfo.gender != GenderType_Male;
if (userInfo.userLevelVo.experUrl) {
self.experImageView.imageUrl = userInfo.userLevelVo.experUrl;
}
self.experImageView.hidden = userInfo.userLevelVo.experUrl.length <= 0;
if (userInfo.userLevelVo.charmUrl) {
self.charmImageView.imageUrl = userInfo.userLevelVo.charmUrl;
}
self.charmImageView.hidden = userInfo.userLevelVo.charmUrl.length <= 0;
if(userInfo.isCustomWord == YES){
if (userInfo.nameplatePic.length > 0){
self.nameplateImageView.imageUrl = userInfo.nameplatePic;
}
}else{
if (userInfo.nameplatePic.length>0 && userInfo.nameplateWord.length>0) {
self.nameplateImageView.imageUrl = userInfo.nameplatePic;
self.nameplateLabel.text = userInfo.nameplateWord;
self.namePlateView.hidden = NO;
} else {
self.namePlateView.hidden = YES;
}
}
self.roleButton.hidden = YES;
if ([userInfo.memberType isEqualToString:@"CREATOR"] || [userInfo.memberType isEqualToString:@"MANAGER"]) {
self.tagStackView.hidden = NO;
if (userInfo.userLevelVo.experUrl) {
self.experImageView.imageUrl = userInfo.userLevelVo.experUrl;
}
self.experImageView.hidden = userInfo.userLevelVo.experUrl.length <= 0;
if (userInfo.userLevelVo.charmUrl) {
self.charmImageView.imageUrl = userInfo.userLevelVo.charmUrl;
}
self.charmImageView.hidden = userInfo.userLevelVo.charmUrl.length <= 0;
if(userInfo.isCustomWord == YES){
if (userInfo.nameplatePic.length > 0){
self.nameplateImageView.imageUrl = userInfo.nameplatePic;
}
}else{
if (userInfo.nameplatePic.length>0 && userInfo.nameplateWord.length>0) {
self.nameplateImageView.imageUrl = userInfo.nameplatePic;
self.nameplateLabel.text = userInfo.nameplateWord;
self.namePlateView.hidden = NO;
} else {
self.namePlateView.hidden = YES;
}
}
if ([userInfo.memberType isEqualToString:@"CREATOR"]) {
self.roleButton.hidden = NO;
[self.roleButton setBackgroundColor:[DJDKMIMOMColor appEmphasizeColor2]];
@@ -191,11 +191,10 @@
self.roleButton.hidden = NO;
[self.roleButton setBackgroundColor:[DJDKMIMOMColor appEmphasizeColor]];
[self.roleButton setTitle:YMLocalizedString(@"XPRoomOnlineTableViewCell1") forState:UIControlStateNormal];
} else {
self.roleButton.hidden = YES;
}
} else {
self.tagStackView.hidden = YES;
}
if(self.roleButton.hidden == NO){
}
self.isOnMicro = userInfo.inMic;
if (userInfo.userVipInfoVO.enterHide == YES) {
@@ -229,36 +228,33 @@
self.sexImageView.titleEdgeInsets = user.userInfo.gender != GenderType_Male ? UIEdgeInsetsMake(0, 2, 0, 0):UIEdgeInsetsMake(0, -1, 0, 0);
self.sexImageView.selected = user.userInfo.gender != GenderType_Male;
}
if (extDic.allKeys.count > 0 || (member.type == NIMTeamMemberTypeOwner || member.type == NIMChatroomMemberTypeManager)) {
self.tagStackView.hidden = NO;
if (userInfo.experUrl) {
self.experImageView.imageUrl = userInfo.experUrl;
}
self.experImageView.hidden = userInfo.experUrl.length <= 0;
if (userInfo.charmUrl) {
self.charmImageView.imageUrl = userInfo.charmUrl;
}
self.charmImageView.hidden = userInfo.charmUrl.length <= 0;
if(userInfo.isCustomWord == YES){
if (userInfo.inRoomNameplatePic.length>0) {
self.nameplateImageView.imageUrl = userInfo.inRoomNameplatePic;
self.namePlateView.hidden = NO;
} else {
self.namePlateView.hidden = YES;
}
}else{
if (userInfo.inRoomNameplatePic.length>0 && userInfo.inRoomNameplateWord.length>0) {
self.nameplateImageView.imageUrl = userInfo.inRoomNameplatePic;
self.nameplateLabel.text = userInfo.inRoomNameplateWord;
self.namePlateView.hidden = NO;
} else {
self.namePlateView.hidden = YES;
}
if (userInfo.experUrl) {
self.experImageView.imageUrl = userInfo.experUrl;
}
self.experImageView.hidden = userInfo.experUrl.length <= 0;
if (userInfo.charmUrl) {
self.charmImageView.imageUrl = userInfo.charmUrl;
}
self.charmImageView.hidden = userInfo.charmUrl.length <= 0;
if(userInfo.isCustomWord == YES){
if (userInfo.inRoomNameplatePic.length>0) {
self.nameplateImageView.imageUrl = userInfo.inRoomNameplatePic;
self.namePlateView.hidden = NO;
} else {
self.namePlateView.hidden = YES;
}
}else{
if (userInfo.inRoomNameplatePic.length>0 && userInfo.inRoomNameplateWord.length>0) {
self.nameplateImageView.imageUrl = userInfo.inRoomNameplatePic;
self.nameplateLabel.text = userInfo.inRoomNameplateWord;
self.namePlateView.hidden = NO;
} else {
self.namePlateView.hidden = YES;
}
}
self.roleButton.hidden = YES;
if (extDic.allKeys.count > 0 || (member.type == NIMTeamMemberTypeOwner || member.type == NIMChatroomMemberTypeManager)) {
if (_member.type == NIMTeamMemberTypeOwner) {
self.roleButton.hidden = NO;
[self.roleButton setBackgroundColor:[DJDKMIMOMColor appEmphasizeColor2]];
@@ -267,12 +263,9 @@
self.roleButton.hidden = NO;
[self.roleButton setBackgroundColor:[DJDKMIMOMColor appEmphasizeColor]];
[self.roleButton setTitle:YMLocalizedString(@"XPRoomOnlineTableViewCell1") forState:UIControlStateNormal];
} else {
self.roleButton.hidden = YES;
}
} else {
self.tagStackView.hidden = YES;
}
if (userInfo.enterHide) {
self.nickLabel.text = YMLocalizedString(@"XPRoomOnlineTableViewCell2");
self.avatarImageView.image = [UIImage imageNamed:@"room_secretMan"];

5
YuMi/zh-Hans.lproj/Localizable.strings
View File

@@ -1626,7 +1626,10 @@
"XPRoomAnchorRankBannerView1" = "小时榜TOP1";
"XPRoomLuckyBigPrizeView0" = "恭喜！%@ 在 %@ 中欧气爆棚开出了价值 %@钻 的 %@";
"XPRoomLuckyBigPrizeView0" = "%@运气爆表！在%@ 中开出了价值 %@钻 的 %@";
"XPRoomActivityPlayView0" = "更多玩法";

2
YuMi/zh-Hant.lproj/Localizable.strings
View File

@@ -1625,7 +1625,7 @@
"XPRoomAnchorRankBannerView0" = "恭喜 %@ 成為上時段 小時榜TOP1";
"XPRoomAnchorRankBannerView1" = "小時榜TOP1";
"XPRoomLuckyBigPrizeView0" = "恭喜！%@ 在 %@ 中歐氣爆棚開出了價值 %@鉆 的 %@";
"XPRoomLuckyBigPrizeView0" = "%@運氣爆表！在%@ 中開出了價值 %@鉆 的 %@";
"XPRoomActivityPlayView0" = "更多玩法";