修复bug

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 = "";

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"

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;
       

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

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

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

YuMi/Modules/YMNewHome/Model/HomePlayRoomModel.h

@@ -46,7 +46,6 @@ NS_ASSUME_NONNULL_BEGIN
 //是否为周榜top1
 @property(nonatomic,assign) BOOL isWeekTop1;
 @property(nonatomic,copy) NSString *inRoomUid;
-
 //是否在麦位
 @property(nonatomic,assign) BOOL inMic;
 ///是否在线

YuMi/Modules/YMNewHome/View/Cell/XPNewHomePartyTableViewCell.h

@@ -24,7 +24,7 @@ NS_ASSUME_NONNULL_BEGIN
 @interface XPNewHomePartyTableViewCell : UITableViewCell
 
 @property (nonatomic,strong) HomePlayRoomModel *roomInfo;
-@property (nonatomic,strong) HomeRecommendRoomModel *roomInfo1;
+
 @property(nonatomic,weak) id<XPNewHomePartyTableViewCellDelegate>delegate;
 ///声音卡时，svga是否播放动画
 -(void)setPlaySoundStatus:(BOOL)isPlay;

YuMi/Modules/YMNewHome/View/Cell/XPNewHomePartyTableViewCell.m

@@ -243,14 +243,7 @@
 -(void)setPlaySoundTime:(NSInteger)time{
     _audioView.voiceDura = @(time).stringValue;
 }
-- (void)setRoomInfo1:(HomeRecommendRoomModel *)roomInfo1 {
-	_roomInfo1 = roomInfo1;
-	if (_roomInfo1) {
-		
-		
-		
-	}
-}
+
 
 -(void)didSelectItemAction{
  

YuMi/Modules/YMNewHome/View/XPHomeRecommendViewController.m

@@ -432,6 +432,7 @@ UIKIT_EXTERN NSString * const kShieldingNotification;
 -(void)xPNewHomePartyTableViewCell:(XPNewHomePartyTableViewCell *_Nullable)cell didSelectChat:(HomePlayRoomModel *_Nonnull)roomModel{
     if(roomModel.inMic == YES){
         [XPRoomViewController openRoom:roomModel.inRoomUid fromNick:roomModel.nick fromType:UserEnterRoomFromType_Follow_User fromUid:roomModel.uid viewController:self];
+
         return;
     }
     

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

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

@@ -104,9 +104,6 @@
 #else
 	isTestEnv = NO;
 #endif
-    if(isEnterprise == NO){
-    [[SudMGP getCfg]setBackgroundMode:NO];
-    }
 	[SudMGP initSDK:KeyWithType(KeyType_SudGameAppID) appKey:KeyWithType(KeyType_SudGameAppKey) isTestEnv:isTestEnv listener:^(int retCode, const NSString *retMsg) {
 		if (retCode == 0) {
 			if (!self.currentmgId) {

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

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

YuMi/zh-Hans.lproj/Localizable.strings

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

YuMi/zh-Hant.lproj/Localizable.strings

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