diff --git a/YuMi.xcodeproj/project.pbxproj b/YuMi.xcodeproj/project.pbxproj index 4b3be28a..5d9b40ea 100644 --- a/YuMi.xcodeproj/project.pbxproj +++ b/YuMi.xcodeproj/project.pbxproj @@ -12540,7 +12540,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 20.20.19; + MARKETING_VERSION = 20.20.20; PRODUCT_BUNDLE_IDENTIFIER = com.peko.enterprise.ios; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -12578,7 +12578,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 20.20.19; + MARKETING_VERSION = 20.20.20; PRODUCT_BUNDLE_IDENTIFIER = com.peko.enterprise.ios; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; diff --git a/YuMi/Global/YUMIMacroUitls.h b/YuMi/Global/YUMIMacroUitls.h index 5ed8284f..de5ec485 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 @"1.0.5" +#define PI_App_Version @"1.0.6" ///渠道 #define PI_App_Source @"appstore" #define PI_Test_Flight @"TestFlight" diff --git a/YuMi/Modules/YMMessage/View/Session/Cell/MSSessionPublicChatHalImageCell.m b/YuMi/Modules/YMMessage/View/Session/Cell/MSSessionPublicChatHalImageCell.m index a7b61222..dd2c9828 100644 --- a/YuMi/Modules/YMMessage/View/Session/Cell/MSSessionPublicChatHalImageCell.m +++ b/YuMi/Modules/YMMessage/View/Session/Cell/MSSessionPublicChatHalImageCell.m @@ -203,7 +203,6 @@ }]; self.rightBubbleImageView.image = nil; - self.rightBgImage.image = [self resizableImage:kImage(@"ms_message_headlines_text_right")]; [self.rightBubbleImageView loadImageWithUrl:extModel.iosBubbleUrl completion:^(UIImage * _Nullable image, NSURL * _Nonnull url) { self.rightBgImage.image = nil; @@ -211,9 +210,11 @@ self.rightBubbleImageView.image = [self resizableImage:image1]; }]; NSString *headwearUrl = extModel.headwearUrl; + self.rightHeadWearImageView.image = nil; if (headwearUrl.length > 0) { NSURL *url = [NSURL URLWithString:headwearUrl]; @kWeakify(self); + [self.manager loadSpriteSheetImageWithURL:url completionBlock:^(YYSpriteSheetImage * _Nullable sprit) { @kStrongify(self); self.rightHeadWearImageView.image = sprit; @@ -241,9 +242,11 @@ make.height.mas_equalTo(model.contentSize.height+kGetScaleWidth(10)); }]; NSString *headwearUrl = extModel.headwearUrl; + self.headWearImageView.image = nil; if (headwearUrl.length > 0) { NSURL *url = [NSURL URLWithString:headwearUrl]; @kWeakify(self); + [self.manager loadSpriteSheetImageWithURL:url completionBlock:^(YYSpriteSheetImage * _Nullable sprit) { @kStrongify(self); self.headWearImageView.image = sprit; @@ -262,7 +265,7 @@ self.leftAvatar.image = image; }]; 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.leftBgImage.image = nil; diff --git a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentHeadLinesText.m b/YuMi/Modules/YMMessage/View/Session/Content/MessageContentHeadLinesText.m index 78506259..fd3bf732 100644 --- a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentHeadLinesText.m +++ b/YuMi/Modules/YMMessage/View/Session/Content/MessageContentHeadLinesText.m @@ -170,15 +170,18 @@ self.rightBubbleImageView.image = nil; 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.rightBgImage.image = nil; UIImage *image1 = [UIImage imageWithCGImage:image.CGImage scale:2.0 orientation:UIImageOrientationUp]; self.rightBubbleImageView.image = [self resizableImage:image1]; }]; NSString *headwearUrl = extModel.headwearUrl; + self.rightHeadWearImageView.image = nil; if (headwearUrl.length > 0) { NSURL *url = [NSURL URLWithString:headwearUrl]; @kWeakify(self); + [self.manager loadSpriteSheetImageWithURL:url completionBlock:^(YYSpriteSheetImage * _Nullable sprit) { @kStrongify(self); self.rightHeadWearImageView.image = sprit; @@ -195,9 +198,11 @@ make.top.mas_equalTo(kGetScaleWidth(45)); }]; NSString *headwearUrl = extModel.headwearUrl; + self.headWearImageView.image = nil; if (headwearUrl.length > 0) { NSURL *url = [NSURL URLWithString:headwearUrl]; @kWeakify(self); + [self.manager loadSpriteSheetImageWithURL:url completionBlock:^(YYSpriteSheetImage * _Nullable sprit) { @kStrongify(self); self.headWearImageView.image = sprit; @@ -211,11 +216,13 @@ self.messageText.hidden = NO; self.leftBubbleImageView.hidden = NO; self.leftAvatar.image = nil; + [self.leftAvatar loadImageWithUrl:extModel.avatar completion:^(UIImage * _Nullable image, NSURL * _Nonnull url) { self.leftAvatar.image = image; }]; self.leftBgImage.image = [self resizableImage:kImage(@"ms_message_headlines_text_left")]; self.messageText.textColor = [UIColor whiteColor]; + self.leftBubbleImageView.image = nil; [self.leftBubbleImageView loadImageWithUrl:extModel.iosBubbleUrl completion:^(UIImage * _Nullable image, NSURL * _Nonnull url) { self.leftBgImage.image = nil; self.messageText.textColor = UIColorFromRGB(0x333333); diff --git a/YuMi/Modules/YMMessage/View/Session/View/MSSessionPublicChatHallHeadView.m b/YuMi/Modules/YMMessage/View/Session/View/MSSessionPublicChatHallHeadView.m index 066fbf5b..4688a9cd 100644 --- a/YuMi/Modules/YMMessage/View/Session/View/MSSessionPublicChatHallHeadView.m +++ b/YuMi/Modules/YMMessage/View/Session/View/MSSessionPublicChatHallHeadView.m @@ -93,9 +93,10 @@ } - (UILabel *)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.textAlignment = NSTextAlignmentCenter; + _contentView.minimumScaleFactor = 0.5; } return _contentView; } diff --git a/YuMi/Modules/YMMessage/View/Session/View/MSSessionScrollingView.m b/YuMi/Modules/YMMessage/View/Session/View/MSSessionScrollingView.m index 5f836b43..d1489e31 100644 --- a/YuMi/Modules/YMMessage/View/Session/View/MSSessionScrollingView.m +++ b/YuMi/Modules/YMMessage/View/Session/View/MSSessionScrollingView.m @@ -46,8 +46,8 @@ static const CGFloat ktimerSec = 0.01; }]; [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { make.leading.trailing.equalTo(self).inset(kGetScaleWidth(3)); - make.top.mas_equalTo(kGetScaleWidth(48)); - make.bottom.mas_equalTo(-kGetScaleWidth(3)); + make.top.mas_equalTo(kGetScaleWidth(51)); + make.bottom.mas_equalTo(-kGetScaleWidth(5)); }]; } diff --git a/YuMi/Modules/YMRTC/RtcImpl/TRTCRtcImpl.m b/YuMi/Modules/YMRTC/RtcImpl/TRTCRtcImpl.m index bb19ec34..9a8c4682 100644 --- a/YuMi/Modules/YMRTC/RtcImpl/TRTCRtcImpl.m +++ b/YuMi/Modules/YMRTC/RtcImpl/TRTCRtcImpl.m @@ -35,7 +35,7 @@ return self; } -#pragma mark - RtcInterface impl +#pragma mark - RtcInterface impln - (BOOL)joinChannel:(NSString *)channelId sign:(nonnull NSString *)sign completion:(void (^)(void))completion { [self.engine enableAudioVolumeEvaluation:900]; TRTCParams *params = [[TRTCParams alloc] init]; diff --git a/YuMi/Modules/YMRoom/View/MessageContainerView/MsRoomMessagChatHallView.m b/YuMi/Modules/YMRoom/View/MessageContainerView/MsRoomMessagChatHallView.m index 852f3022..d7fc1dd7 100644 --- a/YuMi/Modules/YMRoom/View/MessageContainerView/MsRoomMessagChatHallView.m +++ b/YuMi/Modules/YMRoom/View/MessageContainerView/MsRoomMessagChatHallView.m @@ -451,18 +451,18 @@ } }]; - self.headerView.backgroundColor = UIColorRGBAlpha(0x593722, 0.4); + self.headerView.backgroundColor = UIColorRGBAlpha(0xADF4FF, 0.2); } - (void)onRoomEntered { - self.headerView.backgroundColor = UIColorRGBAlpha(0x593722, 0.4); + self.headerView.backgroundColor = UIColorRGBAlpha(0xADF4FF, 0.2); } - (void)onRoomUpdate { ///改变公屏的背景样式 if (self.hostDelegate.getRoomInfo.hadChangeRoomType) { - self.headerView.backgroundColor = UIColorRGBAlpha(0x593722, 0.4); + self.headerView.backgroundColor = UIColorRGBAlpha(0xADF4FF, 0.2); [self.messageTableView reloadData]; } } @@ -667,7 +667,7 @@ } - (UILabel *)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.numberOfLines = 0; } diff --git a/YuMi/en.lproj/Localizable.strings b/YuMi/en.lproj/Localizable.strings index 9174c9e5..dfbdedcc 100644 --- a/YuMi/en.lproj/Localizable.strings +++ b/YuMi/en.lproj/Localizable.strings @@ -164,8 +164,8 @@ "PKIDLoginViewController2" = "Please contact customer service"; "PKIDLoginViewController3" = "LINE：pekoyuyin"; "PKIDLoginViewController4" = "I understand"; -"MessageLevelUpgradeModel0" = "Congratulations! Your charm level has reached Lv%@"; -"MessageLevelUpgradeModel1" = "Congratulations! Your level has reached Lv%@"; +"MessageLevelUpgradeModel0" = "Congratulations! Your charm level has reached %@"; +"MessageLevelUpgradeModel1" = "Congratulations! Your level has reached %@"; "MessageTextModel0" = "Unknown message type"; diff --git a/YuMi/zh-Hans.lproj/Localizable.strings b/YuMi/zh-Hans.lproj/Localizable.strings index 64fa8997..088758e7 100644 --- a/YuMi/zh-Hans.lproj/Localizable.strings +++ b/YuMi/zh-Hans.lproj/Localizable.strings @@ -1968,8 +1968,8 @@ "PKIDLoginViewController2" = "请联繫客服处理"; "PKIDLoginViewController3" = "LINE：pekoyuyin"; "PKIDLoginViewController4" = "我知道了"; -"MessageLevelUpgradeModel0" = "恭喜！您的魅力等级已到达Lv%@"; -"MessageLevelUpgradeModel1" = "恭喜！您的等级已到达Lv%@"; +"MessageLevelUpgradeModel0" = "恭喜！您的魅力等级已到达%@"; +"MessageLevelUpgradeModel1" = "恭喜！您的等级已到达%@"; "MessageTextModel0" = "未知消息类型"; diff --git a/YuMi/zh-Hant.lproj/Localizable.strings b/YuMi/zh-Hant.lproj/Localizable.strings index 9f2b4b42..7a7a95c3 100644 --- a/YuMi/zh-Hant.lproj/Localizable.strings +++ b/YuMi/zh-Hant.lproj/Localizable.strings @@ -1963,8 +1963,8 @@ "PKIDLoginViewController2" = "請聯繫客服處理"; "PKIDLoginViewController3" = "LINE：pekoyuyin"; "PKIDLoginViewController4" = "我知道了"; -"MessageLevelUpgradeModel0" = "恭喜！您的魅力等級已到達Lv%@"; -"MessageLevelUpgradeModel1" = "恭喜！您的等級已到達Lv%@"; +"MessageLevelUpgradeModel0" = "恭喜！您的魅力等級已到達%@"; +"MessageLevelUpgradeModel1" = "恭喜！您的等級已到達%@"; "MessageTextModel0" = "未知消息類型";