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

合并几个需求的内容

Browse Source
This commit is contained in:
eggmanQQQ
2024-07-08 17:06:10 +08:00
parent ec16e8626c
commit 8ba415a6b5
3 changed files with 9 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
YuMi.xcodeproj/project.pbxproj
View File

@@ -12872,7 +12872,7 @@
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
MARKETING_VERSION = 20.20.27; MARKETING_VERSION = 20.20.28;
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 = "";
@@ -12914,7 +12914,7 @@
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
MARKETING_VERSION = 20.20.27; MARKETING_VERSION = 20.20.28;
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 = "";

1
YuMi/Modules/YMMessage/View/Session/MSSessionPublicChatHallVC.m
View File

@@ -526,7 +526,6 @@
MessageBaseModel * message = [self.messages xpSafeObjectAtIndex:indexPath.row]; MessageBaseModel * message = [self.messages xpSafeObjectAtIndex:indexPath.row];
MessageHeadlinesTextModel * textModel = (MessageHeadlinesTextModel *)message; MessageHeadlinesTextModel * textModel = (MessageHeadlinesTextModel *)message;
switch (message.messageType) { switch (message.messageType) {
case SessionMessageType_Text: { case SessionMessageType_Text: {
if(textModel.isSelf){ if(textModel.isSelf){

34
YuMi/Modules/YMNewHome/View/XPHomePagingViewController.m
View File

@@ -11,8 +11,6 @@
#import "XPHomeMineViewController.h" #import "XPHomeMineViewController.h"
#import "XPRoomSearchContainerViewController.h" #import "XPRoomSearchContainerViewController.h"
#import "XPWebViewController.h"
@interface XPHomePagingViewController () <UIPageViewControllerDelegate, UIPageViewControllerDataSource> @interface XPHomePagingViewController () <UIPageViewControllerDelegate, UIPageViewControllerDataSource>
@property (nonatomic, strong) UIView *topControlView; @property (nonatomic, strong) UIView *topControlView;
@@ -146,32 +144,6 @@
make.height.mas_equalTo(4); make.height.mas_equalTo(4);
make.centerX.mas_equalTo(self.recommendButton.mas_centerX); 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 { - (void)displayMineTab {
@@ -180,15 +152,12 @@
[_mineButton setTitleColor:UIColorRGBAlpha(0x0c1d18, 1) forState:UIControlStateNormal]; [_mineButton setTitleColor:UIColorRGBAlpha(0x0c1d18, 1) forState:UIControlStateNormal];
[_recommendButton setTitleColor:UIColorRGBAlpha(0x0c1d18, 0.6) forState:UIControlStateNormal]; [_recommendButton setTitleColor:UIColorRGBAlpha(0x0c1d18, 0.6) forState:UIControlStateNormal];
// [UIView animateWithDuration:0.25 animations:^{
[self.tabMarks mas_remakeConstraints:^(MASConstraintMaker *make) { [self.tabMarks mas_remakeConstraints:^(MASConstraintMaker *make) {
make.bottom.mas_equalTo(self.topControlView).offset(-8); make.bottom.mas_equalTo(self.topControlView).offset(-8);
make.width.mas_equalTo(14); make.width.mas_equalTo(14);
make.height.mas_equalTo(4); make.height.mas_equalTo(4);
make.centerX.mas_equalTo(self.mineButton.mas_centerX); make.centerX.mas_equalTo(self.mineButton.mas_centerX);
}]; }];
// [self.view setNeedsLayout];
// }];
} }
- (void)displayRecommendTab { - (void)displayRecommendTab {
@@ -197,15 +166,12 @@
[_recommendButton setTitleColor:UIColorRGBAlpha(0x0c1d18, 1) forState:UIControlStateNormal]; [_recommendButton setTitleColor:UIColorRGBAlpha(0x0c1d18, 1) forState:UIControlStateNormal];
[_mineButton setTitleColor:UIColorRGBAlpha(0x0c1d18, 0.6) forState:UIControlStateNormal]; [_mineButton setTitleColor:UIColorRGBAlpha(0x0c1d18, 0.6) forState:UIControlStateNormal];
// [UIView animateWithDuration:0.25 animations:^{
[self.tabMarks mas_remakeConstraints:^(MASConstraintMaker *make) { [self.tabMarks mas_remakeConstraints:^(MASConstraintMaker *make) {
make.bottom.mas_equalTo(self.topControlView).offset(-8); make.bottom.mas_equalTo(self.topControlView).offset(-8);
make.width.mas_equalTo(14); make.width.mas_equalTo(14);
make.height.mas_equalTo(4); make.height.mas_equalTo(4);
make.centerX.mas_equalTo(self.recommendButton.mas_centerX); make.centerX.mas_equalTo(self.recommendButton.mas_centerX);
}]; }];
// [self.view setNeedsLayout];
// }];
} }
#pragma mark - #pragma mark -