From 8ba415a6b5029bbb1cdf2ffefd44006ccd95335a Mon Sep 17 00:00:00 2001 From: eggmanQQQ <3671373519@qq.com> Date: Mon, 8 Jul 2024 17:06:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=87=A0=E4=B8=AA=E9=9C=80?= =?UTF-8?q?=E6=B1=82=E7=9A=84=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- YuMi.xcodeproj/project.pbxproj | 4 +- .../View/Session/MSSessionPublicChatHallVC.m | 1 - .../View/XPHomePagingViewController.m | 48 +++---------------- 3 files changed, 9 insertions(+), 44 deletions(-) diff --git a/YuMi.xcodeproj/project.pbxproj b/YuMi.xcodeproj/project.pbxproj index 987b4a1a..a6458123 100644 --- a/YuMi.xcodeproj/project.pbxproj +++ b/YuMi.xcodeproj/project.pbxproj @@ -12872,7 +12872,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 20.20.27; + MARKETING_VERSION = 20.20.28; PRODUCT_BUNDLE_IDENTIFIER = com.peko.enterprise.ios; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -12914,7 +12914,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 20.20.27; + MARKETING_VERSION = 20.20.28; PRODUCT_BUNDLE_IDENTIFIER = com.peko.enterprise.ios; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; diff --git a/YuMi/Modules/YMMessage/View/Session/MSSessionPublicChatHallVC.m b/YuMi/Modules/YMMessage/View/Session/MSSessionPublicChatHallVC.m index bc010b0a..32160587 100644 --- a/YuMi/Modules/YMMessage/View/Session/MSSessionPublicChatHallVC.m +++ b/YuMi/Modules/YMMessage/View/Session/MSSessionPublicChatHallVC.m @@ -526,7 +526,6 @@ MessageBaseModel * message = [self.messages xpSafeObjectAtIndex:indexPath.row]; MessageHeadlinesTextModel * textModel = (MessageHeadlinesTextModel *)message; - switch (message.messageType) { case SessionMessageType_Text: { if(textModel.isSelf){ diff --git a/YuMi/Modules/YMNewHome/View/XPHomePagingViewController.m b/YuMi/Modules/YMNewHome/View/XPHomePagingViewController.m index f5aee27d..ad5bd4f5 100644 --- a/YuMi/Modules/YMNewHome/View/XPHomePagingViewController.m +++ b/YuMi/Modules/YMNewHome/View/XPHomePagingViewController.m @@ -11,8 +11,6 @@ #import "XPHomeMineViewController.h" #import "XPRoomSearchContainerViewController.h" -#import "XPWebViewController.h" - @interface XPHomePagingViewController () @property (nonatomic, strong) UIView *topControlView; @@ -146,32 +144,6 @@ make.height.mas_equalTo(4); make.centerX.mas_equalTo(self.recommendButton.mas_centerX); }]; - -#if DEBUG - @kWeakify(self); - UIButton *b = [UIButton buttonWithType:UIButtonTypeClose primaryAction:[UIAction actionWithHandler:^(__kindof UIAction * _Nonnull action) { - @kStrongify(self); - [self __testMethod]; - }]]; - [self.topControlView addSubview:b]; - [b mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.mas_equalTo(self.mineButton); - if (isMSRTL()) { - make.left.mas_equalTo(self.topControlView).offset(16); - } else { - make.right.mas_equalTo(self.topControlView).offset(-36); - } - make.width.height.mas_equalTo(36); - }]; -#endif -} - -- (void)__testMethod { -// FeedBackViewController *vc = [[FeedBackViewController alloc] init]; -// [self.navigationController pushViewController:vc animated:YES]; - XPWebViewController *vc = [[XPWebViewController alloc]init]; - vc.url = @"http://beta.api.molistar.xyz/molistar/modules/order/index.html";//[NSURL URLWithString:]; - [self.navigationController pushViewController:vc animated:YES]; } - (void)displayMineTab { @@ -180,15 +152,12 @@ [_mineButton setTitleColor:UIColorRGBAlpha(0x0c1d18, 1) forState:UIControlStateNormal]; [_recommendButton setTitleColor:UIColorRGBAlpha(0x0c1d18, 0.6) forState:UIControlStateNormal]; -// [UIView animateWithDuration:0.25 animations:^{ - [self.tabMarks mas_remakeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(self.topControlView).offset(-8); - make.width.mas_equalTo(14); - make.height.mas_equalTo(4); - make.centerX.mas_equalTo(self.mineButton.mas_centerX); - }]; -// [self.view setNeedsLayout]; -// }]; + [self.tabMarks mas_remakeConstraints:^(MASConstraintMaker *make) { + make.bottom.mas_equalTo(self.topControlView).offset(-8); + make.width.mas_equalTo(14); + make.height.mas_equalTo(4); + make.centerX.mas_equalTo(self.mineButton.mas_centerX); + }]; } - (void)displayRecommendTab { @@ -196,16 +165,13 @@ [_recommendButton.titleLabel setFont:kFontBold(21)]; [_recommendButton setTitleColor:UIColorRGBAlpha(0x0c1d18, 1) forState:UIControlStateNormal]; [_mineButton setTitleColor:UIColorRGBAlpha(0x0c1d18, 0.6) forState:UIControlStateNormal]; - -// [UIView animateWithDuration:0.25 animations:^{ + [self.tabMarks mas_remakeConstraints:^(MASConstraintMaker *make) { make.bottom.mas_equalTo(self.topControlView).offset(-8); make.width.mas_equalTo(14); make.height.mas_equalTo(4); make.centerX.mas_equalTo(self.recommendButton.mas_centerX); }]; -// [self.view setNeedsLayout]; -// }]; } #pragma mark -