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-05-16 09:45:11 +08:00
parent 7b7b043a94
commit 0a0bd77089
11 changed files with 30 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
YuMi.xcodeproj/project.pbxproj
View File

@@ -12540,7 +12540,7 @@
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
MARKETING_VERSION = 20.20.19; MARKETING_VERSION = 20.20.20;
PRODUCT_BUNDLE_IDENTIFIER = com.peko.enterprise.ios; PRODUCT_BUNDLE_IDENTIFIER = com.peko.enterprise.ios;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = ""; PROVISIONING_PROFILE_SPECIFIER = "";
@@ -12578,7 +12578,7 @@
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
MARKETING_VERSION = 20.20.19; MARKETING_VERSION = 20.20.20;
PRODUCT_BUNDLE_IDENTIFIER = com.peko.enterprise.ios; PRODUCT_BUNDLE_IDENTIFIER = com.peko.enterprise.ios;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = ""; PROVISIONING_PROFILE_SPECIFIER = "";

2
YuMi/Global/YUMIMacroUitls.h
View File

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

7
YuMi/Modules/YMMessage/View/Session/Cell/MSSessionPublicChatHalImageCell.m
View File

@@ -203,7 +203,6 @@
}]; }];
self.rightBubbleImageView.image = nil; self.rightBubbleImageView.image = nil;
self.rightBgImage.image = [self resizableImage:kImage(@"ms_message_headlines_text_right")]; self.rightBgImage.image = [self resizableImage:kImage(@"ms_message_headlines_text_right")];
[self.rightBubbleImageView loadImageWithUrl:extModel.iosBubbleUrl completion:^(UIImage * _Nullable image, NSURL * _Nonnull url) { [self.rightBubbleImageView loadImageWithUrl:extModel.iosBubbleUrl completion:^(UIImage * _Nullable image, NSURL * _Nonnull url) {
self.rightBgImage.image = nil; self.rightBgImage.image = nil;
@@ -211,9 +210,11 @@
self.rightBubbleImageView.image = [self resizableImage:image1]; self.rightBubbleImageView.image = [self resizableImage:image1];
}]; }];
NSString *headwearUrl = extModel.headwearUrl; NSString *headwearUrl = extModel.headwearUrl;
self.rightHeadWearImageView.image = nil;
if (headwearUrl.length > 0) { if (headwearUrl.length > 0) {
NSURL *url = [NSURL URLWithString:headwearUrl]; NSURL *url = [NSURL URLWithString:headwearUrl];
@kWeakify(self); @kWeakify(self);
[self.manager loadSpriteSheetImageWithURL:url completionBlock:^(YYSpriteSheetImage * _Nullable sprit) { [self.manager loadSpriteSheetImageWithURL:url completionBlock:^(YYSpriteSheetImage * _Nullable sprit) {
@kStrongify(self); @kStrongify(self);
self.rightHeadWearImageView.image = sprit; self.rightHeadWearImageView.image = sprit;
@@ -241,9 +242,11 @@
make.height.mas_equalTo(model.contentSize.height+kGetScaleWidth(10)); make.height.mas_equalTo(model.contentSize.height+kGetScaleWidth(10));
}]; }];
NSString *headwearUrl = extModel.headwearUrl; NSString *headwearUrl = extModel.headwearUrl;
self.headWearImageView.image = nil;
if (headwearUrl.length > 0) { if (headwearUrl.length > 0) {
NSURL *url = [NSURL URLWithString:headwearUrl]; NSURL *url = [NSURL URLWithString:headwearUrl];
@kWeakify(self); @kWeakify(self);
[self.manager loadSpriteSheetImageWithURL:url completionBlock:^(YYSpriteSheetImage * _Nullable sprit) { [self.manager loadSpriteSheetImageWithURL:url completionBlock:^(YYSpriteSheetImage * _Nullable sprit) {
@kStrongify(self); @kStrongify(self);
self.headWearImageView.image = sprit; self.headWearImageView.image = sprit;
@@ -262,7 +265,7 @@
self.leftAvatar.image = image; self.leftAvatar.image = image;
}]; }];
self.leftBgImage.image = [self resizableImage:kImage(@"ms_message_headlines_text_left")]; self.leftBgImage.image = [self resizableImage:kImage(@"ms_message_headlines_text_left")];
self.leftBubbleImageView.image = nil;
[self.leftBubbleImageView loadImageWithUrl:extModel.iosBubbleUrl completion:^(UIImage * _Nullable image, NSURL * _Nonnull url) { [self.leftBubbleImageView loadImageWithUrl:extModel.iosBubbleUrl completion:^(UIImage * _Nullable image, NSURL * _Nonnull url) {
self.leftBgImage.image = nil; self.leftBgImage.image = nil;

7
YuMi/Modules/YMMessage/View/Session/Content/MessageContentHeadLinesText.m
View File

@@ -170,15 +170,18 @@
self.rightBubbleImageView.image = nil; self.rightBubbleImageView.image = nil;
self.rightBgImage.image = [self resizableImage:kImage(@"ms_message_headlines_text_right")]; self.rightBgImage.image = [self resizableImage:kImage(@"ms_message_headlines_text_right")];
self.rightBubbleImageView.image = nil;
[self.rightBubbleImageView loadImageWithUrl:extModel.iosBubbleUrl completion:^(UIImage * _Nullable image, NSURL * _Nonnull url) { [self.rightBubbleImageView loadImageWithUrl:extModel.iosBubbleUrl completion:^(UIImage * _Nullable image, NSURL * _Nonnull url) {
self.rightBgImage.image = nil; self.rightBgImage.image = nil;
UIImage *image1 = [UIImage imageWithCGImage:image.CGImage scale:2.0 orientation:UIImageOrientationUp]; UIImage *image1 = [UIImage imageWithCGImage:image.CGImage scale:2.0 orientation:UIImageOrientationUp];
self.rightBubbleImageView.image = [self resizableImage:image1]; self.rightBubbleImageView.image = [self resizableImage:image1];
}]; }];
NSString *headwearUrl = extModel.headwearUrl; NSString *headwearUrl = extModel.headwearUrl;
self.rightHeadWearImageView.image = nil;
if (headwearUrl.length > 0) { if (headwearUrl.length > 0) {
NSURL *url = [NSURL URLWithString:headwearUrl]; NSURL *url = [NSURL URLWithString:headwearUrl];
@kWeakify(self); @kWeakify(self);
[self.manager loadSpriteSheetImageWithURL:url completionBlock:^(YYSpriteSheetImage * _Nullable sprit) { [self.manager loadSpriteSheetImageWithURL:url completionBlock:^(YYSpriteSheetImage * _Nullable sprit) {
@kStrongify(self); @kStrongify(self);
self.rightHeadWearImageView.image = sprit; self.rightHeadWearImageView.image = sprit;
@@ -195,9 +198,11 @@
make.top.mas_equalTo(kGetScaleWidth(45)); make.top.mas_equalTo(kGetScaleWidth(45));
}]; }];
NSString *headwearUrl = extModel.headwearUrl; NSString *headwearUrl = extModel.headwearUrl;
self.headWearImageView.image = nil;
if (headwearUrl.length > 0) { if (headwearUrl.length > 0) {
NSURL *url = [NSURL URLWithString:headwearUrl]; NSURL *url = [NSURL URLWithString:headwearUrl];
@kWeakify(self); @kWeakify(self);
[self.manager loadSpriteSheetImageWithURL:url completionBlock:^(YYSpriteSheetImage * _Nullable sprit) { [self.manager loadSpriteSheetImageWithURL:url completionBlock:^(YYSpriteSheetImage * _Nullable sprit) {
@kStrongify(self); @kStrongify(self);
self.headWearImageView.image = sprit; self.headWearImageView.image = sprit;
@@ -211,11 +216,13 @@
self.messageText.hidden = NO; self.messageText.hidden = NO;
self.leftBubbleImageView.hidden = NO; self.leftBubbleImageView.hidden = NO;
self.leftAvatar.image = nil; self.leftAvatar.image = nil;
[self.leftAvatar loadImageWithUrl:extModel.avatar completion:^(UIImage * _Nullable image, NSURL * _Nonnull url) { [self.leftAvatar loadImageWithUrl:extModel.avatar completion:^(UIImage * _Nullable image, NSURL * _Nonnull url) {
self.leftAvatar.image = image; self.leftAvatar.image = image;
}]; }];
self.leftBgImage.image = [self resizableImage:kImage(@"ms_message_headlines_text_left")]; self.leftBgImage.image = [self resizableImage:kImage(@"ms_message_headlines_text_left")];
self.messageText.textColor = [UIColor whiteColor]; self.messageText.textColor = [UIColor whiteColor];
self.leftBubbleImageView.image = nil;
[self.leftBubbleImageView loadImageWithUrl:extModel.iosBubbleUrl completion:^(UIImage * _Nullable image, NSURL * _Nonnull url) { [self.leftBubbleImageView loadImageWithUrl:extModel.iosBubbleUrl completion:^(UIImage * _Nullable image, NSURL * _Nonnull url) {
self.leftBgImage.image = nil; self.leftBgImage.image = nil;
self.messageText.textColor = UIColorFromRGB(0x333333); self.messageText.textColor = UIColorFromRGB(0x333333);

3
YuMi/Modules/YMMessage/View/Session/View/MSSessionPublicChatHallHeadView.m
View File

@@ -93,9 +93,10 @@
} }
- (UILabel *)contentView{ - (UILabel *)contentView{
if(!_contentView){ if(!_contentView){
_contentView = [UILabel labelInitWithText:@"" font:kFontBold(9) textColor:UIColorFromRGB(0xFFFADF)]; _contentView = [UILabel labelInitWithText:@"" font:kFontBold(14) textColor:UIColorFromRGB(0xFFFADF)];
_contentView.numberOfLines = 0; _contentView.numberOfLines = 0;
_contentView.textAlignment = NSTextAlignmentCenter; _contentView.textAlignment = NSTextAlignmentCenter;
_contentView.minimumScaleFactor = 0.5;
} }
return _contentView; return _contentView;
} }

4
YuMi/Modules/YMMessage/View/Session/View/MSSessionScrollingView.m
View File

@@ -46,8 +46,8 @@ static const CGFloat ktimerSec = 0.01;
}]; }];
[self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) {
make.leading.trailing.equalTo(self).inset(kGetScaleWidth(3)); make.leading.trailing.equalTo(self).inset(kGetScaleWidth(3));
make.top.mas_equalTo(kGetScaleWidth(48)); make.top.mas_equalTo(kGetScaleWidth(51));
make.bottom.mas_equalTo(-kGetScaleWidth(3)); make.bottom.mas_equalTo(-kGetScaleWidth(5));
}]; }];
} }

2
YuMi/Modules/YMRTC/RtcImpl/TRTCRtcImpl.m
View File

@@ -35,7 +35,7 @@
return self; return self;
} }
#pragma mark - RtcInterface impl #pragma mark - RtcInterface impln
- (BOOL)joinChannel:(NSString *)channelId sign:(nonnull NSString *)sign completion:(void (^)(void))completion { - (BOOL)joinChannel:(NSString *)channelId sign:(nonnull NSString *)sign completion:(void (^)(void))completion {
[self.engine enableAudioVolumeEvaluation:900]; [self.engine enableAudioVolumeEvaluation:900];
TRTCParams *params = [[TRTCParams alloc] init]; TRTCParams *params = [[TRTCParams alloc] init];

8
YuMi/Modules/YMRoom/View/MessageContainerView/MsRoomMessagChatHallView.m
View File

@@ -451,18 +451,18 @@
} }
}]; }];
self.headerView.backgroundColor = UIColorRGBAlpha(0x593722, 0.4); self.headerView.backgroundColor = UIColorRGBAlpha(0xADF4FF, 0.2);
} }
- (void)onRoomEntered { - (void)onRoomEntered {
self.headerView.backgroundColor = UIColorRGBAlpha(0x593722, 0.4); self.headerView.backgroundColor = UIColorRGBAlpha(0xADF4FF, 0.2);
} }
- (void)onRoomUpdate { - (void)onRoomUpdate {
///改变公屏的背景样式 ///改变公屏的背景样式
if (self.hostDelegate.getRoomInfo.hadChangeRoomType) { if (self.hostDelegate.getRoomInfo.hadChangeRoomType) {
self.headerView.backgroundColor = UIColorRGBAlpha(0x593722, 0.4); self.headerView.backgroundColor = UIColorRGBAlpha(0xADF4FF, 0.2);
[self.messageTableView reloadData]; [self.messageTableView reloadData];
} }
} }
@@ -667,7 +667,7 @@
} }
- (UILabel *)titleView{ - (UILabel *)titleView{
if(!_titleView){ if(!_titleView){
_titleView = [UILabel labelInitWithText:@"" font:[UIFont systemFontOfSize:12 weight:UIFontWeightMedium] textColor:UIColorFromRGB(0xFDF4D5)]; _titleView = [UILabel labelInitWithText:@"" font:[UIFont systemFontOfSize:13 weight:UIFontWeightMedium] textColor:UIColorFromRGB(0x05FFE3)];
_titleView.textAlignment = NSTextAlignmentCenter; _titleView.textAlignment = NSTextAlignmentCenter;
_titleView.numberOfLines = 0; _titleView.numberOfLines = 0;
} }

4
YuMi/en.lproj/Localizable.strings
View File

@@ -164,8 +164,8 @@
"PKIDLoginViewController2" = "Please contact customer service"; "PKIDLoginViewController2" = "Please contact customer service";
"PKIDLoginViewController3" = "LINE：pekoyuyin"; "PKIDLoginViewController3" = "LINE：pekoyuyin";
"PKIDLoginViewController4" = "I understand"; "PKIDLoginViewController4" = "I understand";
"MessageLevelUpgradeModel0" = "Congratulations! Your charm level has reached Lv%@"; "MessageLevelUpgradeModel0" = "Congratulations! Your charm level has reached %@";
"MessageLevelUpgradeModel1" = "Congratulations! Your level has reached Lv%@"; "MessageLevelUpgradeModel1" = "Congratulations! Your level has reached %@";
"MessageTextModel0" = "Unknown message type"; "MessageTextModel0" = "Unknown message type";

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

@@ -1968,8 +1968,8 @@
"PKIDLoginViewController2" = "请联繫客服处理"; "PKIDLoginViewController2" = "请联繫客服处理";
"PKIDLoginViewController3" = "LINE：pekoyuyin"; "PKIDLoginViewController3" = "LINE：pekoyuyin";
"PKIDLoginViewController4" = "我知道了"; "PKIDLoginViewController4" = "我知道了";
"MessageLevelUpgradeModel0" = "恭喜！您的魅力等级已到达Lv%@"; "MessageLevelUpgradeModel0" = "恭喜！您的魅力等级已到达%@";
"MessageLevelUpgradeModel1" = "恭喜！您的等级已到达Lv%@"; "MessageLevelUpgradeModel1" = "恭喜！您的等级已到达%@";
"MessageTextModel0" = "未知消息类型"; "MessageTextModel0" = "未知消息类型";

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

@@ -1963,8 +1963,8 @@
"PKIDLoginViewController2" = "請聯繫客服處理"; "PKIDLoginViewController2" = "請聯繫客服處理";
"PKIDLoginViewController3" = "LINE：pekoyuyin"; "PKIDLoginViewController3" = "LINE：pekoyuyin";
"PKIDLoginViewController4" = "我知道了"; "PKIDLoginViewController4" = "我知道了";
"MessageLevelUpgradeModel0" = "恭喜！您的魅力等級已到達Lv%@"; "MessageLevelUpgradeModel0" = "恭喜！您的魅力等級已到達%@";
"MessageLevelUpgradeModel1" = "恭喜！您的等級已到達Lv%@"; "MessageLevelUpgradeModel1" = "恭喜！您的等級已到達%@";
"MessageTextModel0" = "未知消息類型"; "MessageTextModel0" = "未知消息類型";