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

阿拉伯语适配

Browse Source
This commit is contained in:
liyuhua
2024-04-11 17:05:27 +08:00
parent c4ac454a15
commit 79a2a69395
492 changed files with 2598 additions and 2245 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
YuMi.xcodeproj/project.pbxproj
View File

@@ -245,6 +245,11 @@
237700CD2BC697A100D661F1 /* pi_app_logo_new_bg.png in Resources */ = {isa = PBXBuildFile; fileRef = 237700CC2BC697A100D661F1 /* pi_app_logo_new_bg.png */; };
237700CF2BC697D500D661F1 /* pi_login_new_logo.png in Resources */ = {isa = PBXBuildFile; fileRef = 237700CE2BC697D400D661F1 /* pi_login_new_logo.png */; };
237700D32BC7CC7C00D661F1 /* NSObject+MJExtension.m in Sources */ = {isa = PBXBuildFile; fileRef = 237700D22BC7CC7C00D661F1 /* NSObject+MJExtension.m */; };
237700D72BC7D51400D661F1 /* UIButton+MSRTL.m in Sources */ = {isa = PBXBuildFile; fileRef = 237700D62BC7D51400D661F1 /* UIButton+MSRTL.m */; };
237700DA2BC7D5EC00D661F1 /* UILabel+MSRTL.m in Sources */ = {isa = PBXBuildFile; fileRef = 237700D92BC7D5EC00D661F1 /* UILabel+MSRTL.m */; };
237700DD2BC7D70E00D661F1 /* UIImage+MSRTL.m in Sources */ = {isa = PBXBuildFile; fileRef = 237700DC2BC7D70E00D661F1 /* UIImage+MSRTL.m */; };
237700E02BC7D78600D661F1 /* MSBaseRTLFlowLayout.m in Sources */ = {isa = PBXBuildFile; fileRef = 237700DF2BC7D78600D661F1 /* MSBaseRTLFlowLayout.m */; };
237700E32BC7D7C000D661F1 /* NSMutableAttributedString+MSRTL.m in Sources */ = {isa = PBXBuildFile; fileRef = 237700E22BC7D7C000D661F1 /* NSMutableAttributedString+MSRTL.m */; };
237B94BC2A984DA7007853E3 /* XPTrumpetPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 237B94AE2A984DA7007853E3 /* XPTrumpetPresenter.m */; };
237B94BD2A984DA7007853E3 /* XPNobleTrumpetModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 237B94B32A984DA7007853E3 /* XPNobleTrumpetModel.m */; };
237B94BE2A984DA7007853E3 /* XPRoomTrumpetViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 237B94B72A984DA7007853E3 /* XPRoomTrumpetViewController.m */; };
@@ -1968,6 +1973,16 @@
237700CE2BC697D400D661F1 /* pi_login_new_logo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = pi_login_new_logo.png; sourceTree = "<group>"; };
237700D12BC7CC7C00D661F1 /* NSObject+MJExtension.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSObject+MJExtension.h"; sourceTree = "<group>"; };
237700D22BC7CC7C00D661F1 /* NSObject+MJExtension.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSObject+MJExtension.m"; sourceTree = "<group>"; };
237700D52BC7D51400D661F1 /* UIButton+MSRTL.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UIButton+MSRTL.h"; sourceTree = "<group>"; };
237700D62BC7D51400D661F1 /* UIButton+MSRTL.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UIButton+MSRTL.m"; sourceTree = "<group>"; };
237700D82BC7D5EC00D661F1 /* UILabel+MSRTL.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UILabel+MSRTL.h"; sourceTree = "<group>"; };
237700D92BC7D5EC00D661F1 /* UILabel+MSRTL.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UILabel+MSRTL.m"; sourceTree = "<group>"; };
237700DB2BC7D70E00D661F1 /* UIImage+MSRTL.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UIImage+MSRTL.h"; sourceTree = "<group>"; };
237700DC2BC7D70E00D661F1 /* UIImage+MSRTL.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UIImage+MSRTL.m"; sourceTree = "<group>"; };
237700DE2BC7D78600D661F1 /* MSBaseRTLFlowLayout.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MSBaseRTLFlowLayout.h; sourceTree = "<group>"; };
237700DF2BC7D78600D661F1 /* MSBaseRTLFlowLayout.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSBaseRTLFlowLayout.m; sourceTree = "<group>"; };
237700E12BC7D7C000D661F1 /* NSMutableAttributedString+MSRTL.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSMutableAttributedString+MSRTL.h"; sourceTree = "<group>"; };
237700E22BC7D7C000D661F1 /* NSMutableAttributedString+MSRTL.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSMutableAttributedString+MSRTL.m"; sourceTree = "<group>"; };
237B94AD2A984DA7007853E3 /* XPTrumpetPresenter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPTrumpetPresenter.h; sourceTree = "<group>"; };
237B94AE2A984DA7007853E3 /* XPTrumpetPresenter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPTrumpetPresenter.m; sourceTree = "<group>"; };
237B94B02A984DA7007853E3 /* XPRoomTrumpetProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPRoomTrumpetProtocol.h; sourceTree = "<group>"; };
@@ -4777,6 +4792,7 @@
189DD56C26DF5B5400AB55B1 /* CustomUI */ = {
isa = PBXGroup;
children = (
237700D42BC7D3DC00D661F1 /* MSRTL */,
E8FE3C292994D0CC0006C6C7 /* SwitchView */,
E81E09C6290F719C00A1F410 /* Adbvertise */,
E80EC74A28ACD84000D133C5 /* InputView */,
@@ -5557,6 +5573,23 @@
path = MJExtension;
sourceTree = "<group>";
};
237700D42BC7D3DC00D661F1 /* MSRTL */ = {
isa = PBXGroup;
children = (
237700D52BC7D51400D661F1 /* UIButton+MSRTL.h */,
237700D62BC7D51400D661F1 /* UIButton+MSRTL.m */,
237700D82BC7D5EC00D661F1 /* UILabel+MSRTL.h */,
237700D92BC7D5EC00D661F1 /* UILabel+MSRTL.m */,
237700DB2BC7D70E00D661F1 /* UIImage+MSRTL.h */,
237700DC2BC7D70E00D661F1 /* UIImage+MSRTL.m */,
237700DE2BC7D78600D661F1 /* MSBaseRTLFlowLayout.h */,
237700DF2BC7D78600D661F1 /* MSBaseRTLFlowLayout.m */,
237700E12BC7D7C000D661F1 /* NSMutableAttributedString+MSRTL.h */,
237700E22BC7D7C000D661F1 /* NSMutableAttributedString+MSRTL.m */,
);
path = MSRTL;
sourceTree = "<group>";
};
237B94AB2A984DA7007853E3 /* NobleTrumpet */ = {
isa = PBXGroup;
children = (
@@ -10919,6 +10952,7 @@
E801275827E347FD00BAC3F2 /* RoomPKRecordModel.m in Sources */,
E8E0DAE0285C20E500566A2F /* MessageContentFindNewGreetView.m in Sources */,
E8A3540128FEAC5E0014A784 /* XPWishGiftTableViewCell.m in Sources */,
237700E32BC7D7C000D661F1 /* NSMutableAttributedString+MSRTL.m in Sources */,
234D821E2AEC57CF0022EFEB /* YYTextAsyncLayer+PITextAsyncLayer.m in Sources */,
23B2AEC12A64E9C200543D17 /* LoginForgetEditView.m in Sources */,
E8EEB90326FC31DC007C6EBA /* XPMineUserInfoProtocol.h in Sources */,
@@ -11053,6 +11087,7 @@
E8B825C726EA0D9A009E8E9F /* LoginVerifCodeProtocol.h in Sources */,
23E9EAAE2A84C9B800B792F2 /* XPMineUserInfoTagView.m in Sources */,
236B2E4E2AA07D06003967A8 /* Api+LittleGame.m in Sources */,
237700E02BC7D78600D661F1 /* MSBaseRTLFlowLayout.m in Sources */,
2331C1B32A60F32D00E1D940 /* XPCandyTreeMoreRuleCell.m in Sources */,
14A6034C29A35EE600D2A6A5 /* XPMineItemTableViewCell.m in Sources */,
9BAC92F528E6E63000147DD8 /* XPRoomInsideOperationCell.m in Sources */,
@@ -11213,6 +11248,7 @@
23194DCE2AD14BF000649F51 /* ContextFilterLogFormatter.m in Sources */,
E8A88D3027E85EEA00CA8837 /* RoomPKInfoModel.m in Sources */,
E85E7B022A4EB0D200B6D00A /* XPSuperAdminManagerRoomPresenter.m in Sources */,
237700DD2BC7D70E00D661F1 /* UIImage+MSRTL.m in Sources */,
E8AB633328AE51470023B0D2 /* XPSailingPrizeView.m in Sources */,
9B2F72D328E45C5A0000E4FA /* XPRoomQuidkMessageCell.m in Sources */,
E85E7B402A4EB0D300B6D00A /* XPGuildPersonIncomeTableViewCell.m in Sources */,
@@ -11502,6 +11538,7 @@
E85E7B082A4EB0D200B6D00A /* XPMineManagerSetPresenter.m in Sources */,
18E7B1B226E8AF980064BC9B /* MainPresenter.m in Sources */,
E81366F626F0C0DF0076364C /* LoginFullInfoPresenter.m in Sources */,
237700DA2BC7D5EC00D661F1 /* UILabel+MSRTL.m in Sources */,
E8A30BEE28534AB1003B4873 /* XPSessionFindNewPresenter.m in Sources */,
9BDA3E7727FD41C200517FE6 /* XPAnchorFansTeamViewController.m in Sources */,
2323E0372ABDAE8F00CCAD2F /* FBSDKSettings+PISDKSettings.m in Sources */,
@@ -11615,6 +11652,7 @@
237B94BF2A984DA7007853E3 /* XPRoomTrumpetView.m in Sources */,
9B335B492925D8A00048A116 /* XPAnchorPKSelectTypeController.m in Sources */,
E8098CAE282E07C00090B9F0 /* XPMonentsEmptyTableViewCell.m in Sources */,
237700D72BC7D51400D661F1 /* UIButton+MSRTL.m in Sources */,
E85E7B4F2A4EB0D300B6D00A /* XPMineExchangeAuthorityVC.m in Sources */,
23FE47DB2BB4171C00F09D23 /* PINobleCenterListView.m in Sources */,
E84A2E932A527EC800D6AF8A /* XPIncomeRecordPresent.m in Sources */,

16
YuMi/Appdelegate/AppDelegate+ThirdConfig.m
View File

@@ -48,7 +48,21 @@ UIKIT_EXTERN NSString * adImageName;
[self configAdjust];
[self configBugly];
[self registerNot];
[self setLanguage];
}
-(void)setLanguage{
if (isMSRTL()) {
[UIView appearance].semanticContentAttribute = UISemanticContentAttributeForceRightToLeft;
[UISearchBar appearance].semanticContentAttribute = UISemanticContentAttributeForceRightToLeft;
[[UINavigationBar appearance] setSemanticContentAttribute:UISemanticContentAttributeForceRightToLeft];
} else {
[UIView appearance].semanticContentAttribute = UISemanticContentAttributeForceLeftToRight;
[UISearchBar appearance].semanticContentAttribute = UISemanticContentAttributeForceLeftToRight;
[[UINavigationBar appearance] setSemanticContentAttribute:UISemanticContentAttributeForceLeftToRight];
}
}
-(void)registerNot{
if (@available(iOS 10.0, *)) {

22
YuMi/Assets.xcassets/yna/Mini/room_mini_background.imageset/Contents.json vendored
View File

@@ -1,22 +0,0 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "room_mini_background@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "room_mini_background@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

BIN
YuMi/Assets.xcassets/yna/Mini/room_mini_background.imageset/room_mini_background@2x.png vendored
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 4.2 KiB

BIN
YuMi/Assets.xcassets/yna/Mini/room_mini_background.imageset/room_mini_background@3x.png vendored
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 7.9 KiB

2
YuMi/CustomUI/InputView/InputView/QInputPhototCell.m
View File

@@ -51,7 +51,7 @@
[self.chooseButton mas_makeConstraints:^(MASConstraintMaker *make) {
make.size.mas_equalTo(CGSizeMake(20, 20));
make.right.top.mas_equalTo(self.contentView).inset(10);
make.trailing.top.mas_equalTo(self.contentView).inset(10);
}];
[self.numberLabel mas_makeConstraints:^(MASConstraintMaker *make) {

8
YuMi/CustomUI/InputView/InputView/QinputPhotoView.m
View File

@@ -65,25 +65,25 @@
- (void)initSubViewConstraints {
[self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.left.right.equalTo(self).offset(0);
make.top.leading.trailing.equalTo(self).offset(0);
make.height.mas_equalTo(138 + 16);
}];
[self.photoButton mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(self).offset(16);
make.leading.mas_equalTo(self).offset(16);
make.top.mas_equalTo(self.collectionView.mas_bottom).offset(1);
}];
[self.originButton mas_makeConstraints:^(MASConstraintMaker *make) {
make.height.mas_equalTo(25);
make.width.mas_equalTo(100);
make.left.mas_equalTo(self.photoButton.mas_right).offset(20);
make.leading.mas_equalTo(self.photoButton.mas_trailing).offset(20);
make.centerY.mas_equalTo(self.photoButton);
}];
[self.sendButton mas_makeConstraints:^(MASConstraintMaker *make) {
make.size.mas_equalTo(CGSizeMake(56, 22));
make.right.mas_equalTo(self).offset(-16);
make.trailing.mas_equalTo(self).offset(-16);
make.centerY.mas_equalTo(self.photoButton);
}];
}

16
YuMi/CustomUI/MSRTL/MSBaseRTLFlowLayout.h Normal file
View File

@@ -0,0 +1,16 @@
//
// MSBaseRTLFlowLayout.h
// YuMi
//
// Created by duoban on 2024/4/11.
//
#import <UIKit/UIKit.h>
NS_ASSUME_NONNULL_BEGIN
@interface MSBaseRTLFlowLayout : UICollectionViewFlowLayout
@end
NS_ASSUME_NONNULL_END

21
YuMi/CustomUI/MSRTL/MSBaseRTLFlowLayout.m Normal file
View File

@@ -0,0 +1,21 @@
//
// MSBaseRTLFlowLayout.m
// YuMi
//
// Created by duoban on 2024/4/11.
//
#import "MSBaseRTLFlowLayout.h"
@implementation MSBaseRTLFlowLayout
- (UIUserInterfaceLayoutDirection)effectiveUserInterfaceLayoutDirection {
if (isMSRTL()) {
return UIUserInterfaceLayoutDirectionRightToLeft;
}
return UIUserInterfaceLayoutDirectionLeftToRight;
}
- (BOOL)flipsHorizontallyInOppositeLayoutDirection{
return YES;
}
@end

22
YuMi/CustomUI/MSRTL/NSMutableAttributedString+MSRTL.h Normal file
View File

@@ -0,0 +1,22 @@
//
// MSRTL.h
// YuMi
//
// Created by duoban on 2024/4/11.
//
#import <Foundation/Foundation.h>
NS_ASSUME_NONNULL_BEGIN
@interface NSMutableAttributedString (MSRTL)
/// 用来改变布局方向，插入此空白字符串，则转化为RTL布局
+ (NSMutableAttributedString *)createBlankAttributeToMSRTL;
/// 用来解决YYText在RTL下的bug，如果昵称是阿语，整个富文本宽度计算会有误，在昵称前插入此空白字符串，可以修正布局。“i”可以是随意字母或中文
+ (NSMutableAttributedString *)createBlankAttributeToMSLTR;
@end
NS_ASSUME_NONNULL_END

27
YuMi/CustomUI/MSRTL/NSMutableAttributedString+MSRTL.m Normal file
View File

@@ -0,0 +1,27 @@
//
// MSRTL.m
// YuMi
//
// Created by duoban on 2024/4/11.
//
#import "NSMutableAttributedString+MSRTL.h"
@implementation NSMutableAttributedString (MSRTL)
/// 用来改变布局方向，插入此空白字符串，则转化为RTL布局
+ (NSMutableAttributedString *)createBlankAttributeToMSRTL {
NSMutableAttributedString *attribute = [[NSMutableAttributedString alloc] initWithString:@"\u202B"];
[attribute addAttributes:@{NSFontAttributeName:[UIFont systemFontOfSize:0], NSForegroundColorAttributeName: UIColor.clearColor} range:NSMakeRange(0, attribute.length)];
return attribute;
}
/// 用来解决YYText在RTL下的bug，如果昵称是阿语，整个富文本宽度计算会有误，在昵称前插入此空白字符串，可以修正布局。“i”可以是随意字母或中文
+ (NSMutableAttributedString *)createBlankAttributeToMSLTR {
NSMutableAttributedString *attribute = [[NSMutableAttributedString alloc] initWithString:@"i"];
[attribute addAttributes:@{NSFontAttributeName:[UIFont systemFontOfSize:0], NSForegroundColorAttributeName: UIColor.clearColor} range:NSMakeRange(0, attribute.length)];
return attribute;
}
@end

16
YuMi/CustomUI/MSRTL/UIButton+MSRTL.h Normal file
View File

@@ -0,0 +1,16 @@
//
// MSRTL.h
// YuMi
//
// Created by duoban on 2024/4/11.
//
#import <UIKit/UIKit.h>
NS_ASSUME_NONNULL_BEGIN
@interface UIButton (MSRTL)
@end
NS_ASSUME_NONNULL_END

52
YuMi/CustomUI/MSRTL/UIButton+MSRTL.m Normal file
View File

@@ -0,0 +1,52 @@
//
// MSRTL.m
// YuMi
//
// Created by duoban on 2024/4/11.
//
#import "UIButton+MSRTL.h"
@implementation UIButton (MSRTL)
UIEdgeInsets RSRTLEdgeInsetsWithInsets(UIEdgeInsets insets) {
if (insets.left != insets.right && isMSRTL()) {
CGFloat temp = insets.left;
insets.left = insets.right;
insets.right = temp;
}
return insets;
}
+ (void)load{
if (isMSRTL()) {
static dispatch_once_t onceToken;
dispatch_once(&onceToken, ^{
Method oldMethod = class_getInstanceMethod(self, @selector(setContentEdgeInsets:));
Method newMethod = class_getInstanceMethod(self, @selector(msrtl_setContentEdgeInsets:));
method_exchangeImplementations(oldMethod, newMethod);
Method oldImageMethod = class_getInstanceMethod(self, @selector(setImageEdgeInsets:));
Method newImageMethod = class_getInstanceMethod(self, @selector(msrtl_setImageEdgeInsets:));
method_exchangeImplementations(oldImageMethod,newImageMethod);
Method oldTitleMethod = class_getInstanceMethod(self, @selector(setTitleEdgeInsets:));
Method newTitleMethod = class_getInstanceMethod(self, @selector(msrtl_setTitleEdgeInsets:));
method_exchangeImplementations(oldTitleMethod,newTitleMethod);
});
}
}
- (void)msrtl_setContentEdgeInsets:(UIEdgeInsets)contentEdgeInsets {
[self msrtl_setContentEdgeInsets:RSRTLEdgeInsetsWithInsets(contentEdgeInsets)];
}
- (void)msrtl_setImageEdgeInsets:(UIEdgeInsets)imageEdgeInsets {
[self msrtl_setImageEdgeInsets:RSRTLEdgeInsetsWithInsets(imageEdgeInsets)];
}
- (void)msrtl_setTitleEdgeInsets:(UIEdgeInsets)titleEdgeInsets {
[self msrtl_setTitleEdgeInsets:RSRTLEdgeInsetsWithInsets(titleEdgeInsets)];
}
@end

20
YuMi/CustomUI/MSRTL/UIImage+MSRTL.h Normal file
View File

@@ -0,0 +1,20 @@
//
// MSRTL.h
// YuMi
//
// Created by duoban on 2024/4/11.
//
#import <UIKit/UIKit.h>
NS_ASSUME_NONNULL_BEGIN
@interface UIImage (MSRTL)
/// 需要阿语翻转的图片
/// [[UIImage imageNamed:@"xxx"] mssetImageForRTL];
- (UIImage *)ms_SetImageForRTL;
@end
NS_ASSUME_NONNULL_END

22
YuMi/CustomUI/MSRTL/UIImage+MSRTL.m Normal file
View File

@@ -0,0 +1,22 @@
//
// MSRTL.m
// YuMi
//
// Created by duoban on 2024/4/11.
//
#import "UIImage+MSRTL.h"
@implementation UIImage (MSRTL)
- (UIImage *)ms_SetImageForRTL {
if (isMSRTL()) {
return [UIImage imageWithCGImage:self.CGImage
scale:self.scale
orientation:UIImageOrientationUpMirrored];
}
return self;
}
@end

16
YuMi/CustomUI/MSRTL/UILabel+MSRTL.h Normal file
View File

@@ -0,0 +1,16 @@
//
// MSRTL.h
// YuMi
//
// Created by duoban on 2024/4/11.
//
#import <UIKit/UIKit.h>
NS_ASSUME_NONNULL_BEGIN
@interface UILabel (MSRTL)
@end
NS_ASSUME_NONNULL_END

43
YuMi/CustomUI/MSRTL/UILabel+MSRTL.m Normal file
View File

@@ -0,0 +1,43 @@
//
// MSRTL.m
// YuMi
//
// Created by duoban on 2024/4/11.
//
#import "UILabel+MSRTL.h"
@implementation UILabel (MSRTL)
+ (void)load {
Method oldInitMethod = class_getInstanceMethod(self,@selector(initWithFrame:));
Method newInitMethod = class_getInstanceMethod(self, @selector(msrtl_initWithFrame:));
method_exchangeImplementations(oldInitMethod, newInitMethod); //交换成功
Method oldTextMethod = class_getInstanceMethod(self,@selector(setTextAlignment:));
Method newTextMethod = class_getInstanceMethod(self, @selector(msrtl_setTextAlignment:));
method_exchangeImplementations(oldTextMethod, newTextMethod); //交换成功
}
- (instancetype)msrtl_initWithFrame:(CGRect)frame {
if ([self msrtl_initWithFrame:frame]) {
self.textAlignment = NSTextAlignmentNatural;
}
return self;
}
- (void)msrtl_setTextAlignment:(NSTextAlignment)textAlignment {
if (isMSRTL()) {
if (textAlignment == NSTextAlignmentNatural || textAlignment == NSTextAlignmentLeft) {
textAlignment = NSTextAlignmentRight;
} else if (textAlignment == NSTextAlignmentRight) {
textAlignment = NSTextAlignmentLeft;
}
}
[self msrtl_setTextAlignment:textAlignment];
}
@end

4
YuMi/CustomUI/ShareView/XPShareView.m
View File

@@ -82,12 +82,12 @@
[self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.mas_equalTo(self);
make.height.mas_equalTo(collectionHeight);
make.left.right.mas_equalTo(self).inset(15);
make.leading.trailing.mas_equalTo(self).inset(15);
}];
[self.cancleButton mas_makeConstraints:^(MASConstraintMaker *make) {
make.height.mas_equalTo(45);
make.left.right.mas_equalTo(self.collectionView);
make.leading.trailing.mas_equalTo(self.collectionView);
make.top.mas_equalTo(self.collectionView.mas_bottom).offset(15);
}];

4
YuMi/CustomUI/TTPopup/View/TTActionSheetView.m
View File

@@ -51,7 +51,7 @@ static NSString *const kSheetViewCellConst = @"kSheetViewCellConst";
- (void)initConstraints {
[self.tableView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.top.mas_equalTo(self);
make.leading.trailing.top.mas_equalTo(self);
make.height.mas_equalTo(self.items.count * kSheetViewCellHeight);
}];
@@ -59,7 +59,7 @@ static NSString *const kSheetViewCellConst = @"kSheetViewCellConst";
// 显示 cancel view
self.cancelButton.hidden = NO;
[self.cancelButton mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.mas_equalTo(self);
make.leading.trailing.mas_equalTo(self);
make.height.mas_equalTo(kSheetViewCellHeight);
make.top.mas_equalTo(self.tableView.mas_bottom).offset(15);
}];

4
YuMi/CustomUI/TTPopup/View/TTAlertView.m
View File

@@ -49,12 +49,12 @@ static CGFloat const kBtnHeight = 38.f;
[self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerX.mas_equalTo(self);
make.top.mas_equalTo(kPadding);
make.left.right.mas_equalTo(self).inset(kPadding);
make.leading.trailing.mas_equalTo(self).inset(kPadding);
}];
[self.messageLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.mas_equalTo(self.titleLabel.mas_bottom).offset(kMargin);
make.left.right.mas_equalTo(self).inset(kPadding);
make.leading.trailing.mas_equalTo(self).inset(kPadding);
}];
[self.stackView mas_makeConstraints:^(MASConstraintMaker *make) {

6
YuMi/CustomUI/TTPopup/View/TTNewAlertView.m
View File

@@ -42,19 +42,19 @@
[self.confirmBtn mas_makeConstraints:^(MASConstraintMaker *make) {
make.width.height.mas_equalTo(kGetScaleWidth(110));
make.height.mas_equalTo(kGetScaleWidth(37));
make.left.mas_equalTo(kGetScaleWidth(31));
make.leading.mas_equalTo(kGetScaleWidth(31));
make.bottom.mas_equalTo(-kGetScaleWidth(31));
}];
[self.cancelBtn mas_makeConstraints:^(MASConstraintMaker *make) {
make.width.height.centerY.equalTo(self.confirmBtn);
make.right.mas_equalTo(-kGetScaleWidth(31));
make.trailing.mas_equalTo(-kGetScaleWidth(31));
}];
[self.messageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.mas_equalTo(kGetScaleWidth(25));
make.centerX.equalTo(self);
make.left.right.equalTo(self).inset(kGetScaleWidth(10));
make.leading.trailing.equalTo(self).inset(kGetScaleWidth(10));
}];

9
YuMi/Global/YUMIMacroUitls.h
View File

@@ -62,4 +62,13 @@ isPhoneXSeries = [[UIApplication sharedApplication] delegate].window.safeAreaIns
#define YMLocalizedString(key) \
[NSBundle ymLocalizedStringForKey:(key)]
#define isMSRTL() [[NSBundle getLanguageText] hasPrefix:@"ar"]
///是否是中文
#define isMSZH() [[NSBundle getLanguageText] hasPrefix:@"zh"]
///是否是英文
#define isMSEN() [[NSBundle getLanguageText] hasPrefix:@"en"]
#endif /* YUMIMacroUitls_h */

6
YuMi/Modules/YMLogin/View/CustomView/LoginVerifCodeView.m
View File

@@ -94,7 +94,7 @@
[label mas_makeConstraints:^(MASConstraintMaker *make) {
make.size.mas_equalTo(CGSizeMake(itemWidth, itemHeight));
make.centerY.mas_equalTo(self);
make.left.mas_equalTo(self).offset((itemWidth + itemSpace)* i);
make.leading.mas_equalTo(self).offset((itemWidth + itemSpace)* i);
}];
[self.lableArray addObject:label];
}
@@ -102,7 +102,7 @@
UILabel * label = [self.lableArray lastObject];
if (label) {
[self mas_makeConstraints:^(MASConstraintMaker *make) {
make.right.mas_equalTo(label.mas_right);
make.trailing.mas_equalTo(label.mas_trailing);
make.height.mas_equalTo(itemHeight);
}];
}
@@ -125,7 +125,7 @@
[label mas_makeConstraints:^(MASConstraintMaker *make) {
make.size.mas_equalTo(CGSizeMake(itemWidth, itemHeight));
make.centerY.mas_equalTo(self);
make.left.mas_equalTo(self).offset((itemWidth + itemSpace)* i);
make.leading.mas_equalTo(self).offset((itemWidth + itemSpace)* i);
}];
[self.lableArray addObject:label];
}

6
YuMi/Modules/YMLogin/View/CustomView/UserPrivacyView.m
View File

@@ -84,14 +84,14 @@ NSString * const kYouMiNumberCountKey = @"kYouMinumbernnagna";
[self.contentLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.mas_equalTo(55);
make.left.mas_equalTo(28);
make.right.mas_equalTo(-28);
make.leading.mas_equalTo(28);
make.trailing.mas_equalTo(-28);
make.bottom.mas_equalTo(-68);
}];
[self.stackView mas_makeConstraints:^(MASConstraintMaker *make) {
make.bottom.mas_equalTo(-20);
make.left.right.mas_equalTo(self).inset(15);
make.leading.trailing.mas_equalTo(self).inset(15);
make.height.mas_equalTo(36);
}];

6
YuMi/Modules/YMLogin/View/LoginBindPhoneViewController.m
View File

@@ -77,13 +77,13 @@
make.height.mas_equalTo(45);
}];
[self.countryLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(10);
make.leading.mas_equalTo(10);
make.top.mas_equalTo(self.bgView).offset(5);
make.width.mas_equalTo(60);
make.height.mas_equalTo(35);
}];
[self.phoneTextField mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(70);
make.leading.mas_equalTo(70);
make.top.mas_equalTo(self.bgView).offset(5);
make.width.mas_equalTo(200);
make.height.mas_equalTo(35);
@@ -98,7 +98,7 @@
[self.backButton mas_makeConstraints:^(MASConstraintMaker *make) {
make.size.mas_equalTo(CGSizeMake(15, 15));
make.left.mas_equalTo(self.view).offset(14);
make.leading.mas_equalTo(self.view).offset(14);
make.top.mas_equalTo(self.view).offset(36 + kSafeAreaTopHeight);
}];
}

24
YuMi/Modules/YMLogin/View/LoginFullInfoViewController.m
View File

@@ -134,7 +134,7 @@
- (void)initSubViewConstraints {
[self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.top.equalTo(self.view);
make.leading.trailing.top.equalTo(self.view);
make.height.mas_equalTo(kGetScaleWidth(418));
}];
@@ -145,19 +145,19 @@
make.height.mas_equalTo(kGetScaleWidth(40));
}];
[self.bgView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.bottom.equalTo(self.view);
make.leading.trailing.bottom.equalTo(self.view);
make.top.mas_equalTo(kGetScaleWidth(192));
}];
[self.remindLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.equalTo(self.bgView).inset(kGetScaleWidth(10));
make.leading.trailing.equalTo(self.bgView).inset(kGetScaleWidth(10));
make.top.mas_equalTo(kGetScaleWidth(48));
}];
[self.sexStackView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(kGetScaleWidth(38));
make.right.mas_equalTo(-kGetScaleWidth(38));
make.leading.mas_equalTo(kGetScaleWidth(38));
make.trailing.mas_equalTo(-kGetScaleWidth(38));
make.top.mas_equalTo(kGetScaleWidth(86));
}];
@@ -170,19 +170,19 @@
}];
[self.nameLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.right.mas_equalTo(-kGetScaleWidth(18));
make.trailing.mas_equalTo(-kGetScaleWidth(18));
make.centerY.equalTo(self.backView);
}];
[self.refreshButton mas_makeConstraints:^(MASConstraintMaker *make) {
make.width.height.mas_equalTo(kGetScaleWidth(18));
make.centerY.equalTo(self.backView);
make.right.equalTo(self.nameLabel.mas_left).mas_offset(-kGetScaleWidth(4));
make.trailing.equalTo(self.nameLabel.mas_leading).mas_offset(-kGetScaleWidth(4));
}];
[self.textField mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(kGetScaleWidth(24));
make.leading.mas_equalTo(kGetScaleWidth(24));
make.top.bottom.equalTo(self.backView);
make.right.equalTo(self.refreshButton.mas_left).mas_offset(-kGetScaleWidth(4));
make.trailing.equalTo(self.refreshButton.mas_leading).mas_offset(-kGetScaleWidth(4));
}];
[self.maleView mas_makeConstraints:^(MASConstraintMaker *make) {
make.width.mas_equalTo(kGetScaleWidth(132));
@@ -195,14 +195,14 @@
[self.codeContainView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.height.mas_equalTo(self.backView);
make.leading.trailing.height.mas_equalTo(self.backView);
make.top.mas_equalTo(self.backView.mas_bottom).offset(kGetScaleWidth(20));
}];
[self.codeTextField mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(self.codeContainView).offset(kGetScaleWidth(24));
make.leading.mas_equalTo(self.codeContainView).offset(kGetScaleWidth(24));
make.top.bottom.mas_equalTo(self.codeContainView);
make.right.mas_equalTo(self.codeContainView).offset(-kGetScaleWidth(18));
make.trailing.mas_equalTo(self.codeContainView).offset(-kGetScaleWidth(18));
}];

16
YuMi/Modules/YMLogin/View/LoginVerifCodeViewController.m
View File

@@ -121,38 +121,38 @@
- (void)initSubViewConstraints {
[self.topBackImgView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.top.mas_equalTo(self.view);
make.leading.trailing.top.mas_equalTo(self.view);
make.height.mas_equalTo(kGetScaleWidth(333));
}];
[self.contentView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.bottom.mas_equalTo(self.view);
make.leading.trailing.bottom.mas_equalTo(self.view);
make.top.equalTo(self.topBackImgView.mas_bottom).mas_offset(-kGetScaleWidth(30));
}];
if(self.type != VerifCodeType_AreaCode){
[self.backBtn mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.mas_equalTo(self.topBackImgView.mas_top).offset(kSafeAreaTopHeight + kGetScaleWidth(52));
make.width.height.mas_equalTo(kGetScaleWidth(20));
make.left.mas_equalTo(kGetScaleWidth(15));
make.leading.mas_equalTo(kGetScaleWidth(15));
}];
}
[self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(self.topBackImgView).offset(kGetScaleWidth(30));
make.leading.mas_equalTo(self.topBackImgView).offset(kGetScaleWidth(30));
make.top.mas_equalTo(self.topBackImgView.mas_top).offset(kSafeAreaTopHeight + kGetScaleWidth(96));
}];
[self.bgCodeView mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.mas_equalTo(kGetScaleWidth(30));
make.right.mas_equalTo(-kGetScaleWidth(33));
make.left.mas_equalTo(kGetScaleWidth(33));
make.trailing.mas_equalTo(-kGetScaleWidth(33));
make.leading.mas_equalTo(kGetScaleWidth(33));
make.height.mas_equalTo(kGetScaleWidth(63));
}];
[self.codeStackView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(kGetScaleWidth(20));
make.right.mas_equalTo(-kGetScaleWidth(20));
make.leading.mas_equalTo(kGetScaleWidth(20));
make.trailing.mas_equalTo(-kGetScaleWidth(20));
make.top.bottom.equalTo(self.bgCodeView);
}];
[self.textField mas_makeConstraints:^(MASConstraintMaker *make) {

4
YuMi/Modules/YMLogin/View/NewLogin/PIUserSexView.m
View File

@@ -47,12 +47,12 @@
[self.sexImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.size.mas_equalTo(CGSizeMake(kGetScaleWidth(16), kGetScaleWidth(16)));
make.right.mas_equalTo(self.backImageView.mas_centerX).offset(-1.5);
make.trailing.mas_equalTo(self.backImageView.mas_centerX).offset(-1.5);
make.top.mas_equalTo(self.logoImageView.mas_bottom).offset(kGetScaleWidth(8));
}];
[self.sexLb mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(self.backImageView.mas_centerX).offset(1.5);
make.leading.mas_equalTo(self.backImageView.mas_centerX).offset(1.5);
make.centerY.mas_equalTo(self.sexImageView);
}];
}

4
YuMi/Modules/YMLogin/View/NewLogin/XPForgetPwdViewController.m
View File

@@ -72,7 +72,7 @@
[self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.top.equalTo(self.view);
make.leading.trailing.top.equalTo(self.view);
make.height.mas_equalTo(kGetScaleWidth(418));
}];
[self.backBnt mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -89,7 +89,7 @@
make.height.mas_equalTo(kGetScaleWidth(40));
}];
[bgView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.bottom.equalTo(self.view);
make.leading.trailing.bottom.equalTo(self.view);
make.top.mas_equalTo(kGetScaleWidth(257));
}];
[self.phoneInputView mas_makeConstraints:^(MASConstraintMaker *make) {

8
YuMi/Modules/YMLogin/View/NewLogin/XPLoginAreaTableViewCell.m
View File

@@ -35,16 +35,16 @@
}
- (void)initSubViewConstraints {
[self.areaVeiw mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(kGetScaleWidth(15));
make.leading.mas_equalTo(kGetScaleWidth(15));
make.centerY.equalTo(self.contentView);
}];
[self.codeView mas_makeConstraints:^(MASConstraintMaker *make) {
make.right.mas_equalTo(-kGetScaleWidth(15));
make.trailing.mas_equalTo(-kGetScaleWidth(15));
make.centerY.equalTo(self.contentView);
}];
[self.clickBtn mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.left.bottom.equalTo(self.contentView);
make.right.mas_equalTo(-kGetScaleWidth(20));
make.top.leading.bottom.equalTo(self.contentView);
make.trailing.mas_equalTo(-kGetScaleWidth(20));
}];
}
-(void)didClickBtnAction{

4
YuMi/Modules/YMLogin/View/NewLogin/XPLoginAuthCodeVC.m
View File

@@ -51,7 +51,7 @@
[self.view addSubview:self.codeInputView];
[self.view addSubview:self.loginBtn];
[self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.top.equalTo(self.view);
make.leading.trailing.top.equalTo(self.view);
make.height.mas_equalTo(kGetScaleWidth(418));
}];
@@ -62,7 +62,7 @@
make.height.mas_equalTo(kGetScaleWidth(40));
}];
[bgView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.bottom.equalTo(self.view);
make.leading.trailing.bottom.equalTo(self.view);
make.top.mas_equalTo(kGetScaleWidth(192));
}];
[self.codeInputView mas_makeConstraints:^(MASConstraintMaker *make) {

4
YuMi/Modules/YMLogin/View/NewLogin/XPLoginInputView.m
View File

@@ -97,8 +97,8 @@
self.smsCodeBtn = smsCodeBtn;
[stackView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(kGetScaleWidth(24));
make.right.mas_equalTo(-kGetScaleWidth(24));
make.leading.mas_equalTo(kGetScaleWidth(24));
make.trailing.mas_equalTo(-kGetScaleWidth(24));
make.top.bottom.mas_equalTo(0);
}];

12
YuMi/Modules/YMLogin/View/NewLogin/XPLoginPhoneViewController.m
View File

@@ -94,7 +94,7 @@
[self.view addSubview:self.loginBtn];
[self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.top.equalTo(self.view);
make.leading.trailing.top.equalTo(self.view);
make.height.mas_equalTo(kGetScaleWidth(418));
}];
[self.backBnt mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -112,7 +112,7 @@
[self.chooseTypeView mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.equalTo(self.titleLabel.mas_bottom).mas_offset(kGetScaleWidth(24));
make.left.right.equalTo(self.view);
make.leading.trailing.equalTo(self.view);
make.height.mas_equalTo(kGetScaleWidth(65));
}];
@@ -120,16 +120,16 @@
make.top.mas_equalTo(kGetScaleWidth(16));
make.height.mas_equalTo(kGetScaleWidth(22));
make.width.mas_equalTo(KScreenWidth/2);
make.left.mas_equalTo(0);
make.leading.mas_equalTo(0);
}];
[self.choosePhoneBtn mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.mas_equalTo(kGetScaleWidth(16));
make.height.mas_equalTo(kGetScaleWidth(22));
make.width.mas_equalTo(KScreenWidth/2);
make.right.mas_equalTo(0);
make.trailing.mas_equalTo(0);
}];
[bgView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.bottom.equalTo(self.view);
make.leading.trailing.bottom.equalTo(self.view);
make.top.equalTo(self.chooseTypeView.mas_bottom);
}];
[self.phoneInputView mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -152,7 +152,7 @@
make.edges.equalTo(self.codeInputView);
}];
[self.forgetBtn mas_makeConstraints:^(MASConstraintMaker *make) {
make.right.mas_equalTo(-kGetScaleWidth(52));
make.trailing.mas_equalTo(-kGetScaleWidth(52));
make.height.mas_equalTo(kGetScaleWidth(17));
make.top.equalTo(self.accountPwdView.mas_bottom).mas_offset(kGetScaleWidth(8));
}];

10
YuMi/Modules/YMLogin/View/NewLogin/XPLoginPwdViewController.m
View File

@@ -61,14 +61,14 @@
make.top.mas_equalTo(146.0/812.0*KScreenHeight);
}];
[self.phoneInputView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(38);
make.right.mas_equalTo(-38);
make.leading.mas_equalTo(38);
make.trailing.mas_equalTo(-38);
make.top.mas_equalTo(self.titleLabel.mas_bottom).offset(41);
make.height.mas_equalTo(66);
}];
[self.pwdInputView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(self.phoneInputView);
make.right.mas_equalTo(self.phoneInputView);
make.leading.mas_equalTo(self.phoneInputView);
make.trailing.mas_equalTo(self.phoneInputView);
make.top.mas_equalTo(self.phoneInputView.mas_bottom).offset(16);
make.height.mas_equalTo(self.phoneInputView);
}];
@@ -82,7 +82,7 @@
make.centerX.mas_equalTo(self.view);
}];
[self.forgetBtn mas_makeConstraints:^(MASConstraintMaker *make) {
make.right.mas_equalTo(self.pwdInputView);
make.trailing.mas_equalTo(self.pwdInputView);
make.top.mas_equalTo(self.pwdInputView.mas_bottom).offset(10);
}];

10
YuMi/Modules/YMLogin/View/NewLogin/XPLoginViewController.m
View File

@@ -178,7 +178,7 @@ NSString * const HadAgreePrivacy = @"HadAgreePrivacy";
[self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.top.equalTo(self.view);
make.leading.trailing.top.equalTo(self.view);
make.height.mas_equalTo(kGetScaleWidth(91));
}];
[self.logoView mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -257,25 +257,25 @@ NSString * const HadAgreePrivacy = @"HadAgreePrivacy";
[self.protocolLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerX.mas_equalTo(self.view).offset(10);
make.right.mas_lessThanOrEqualTo(-10);
make.trailing.mas_lessThanOrEqualTo(-10);
make.height.mas_greaterThanOrEqualTo(22);
make.bottom.mas_equalTo(-kGetScaleWidth(35));
}];
[self.agreeBtn mas_makeConstraints:^(MASConstraintMaker *make) {
make.right.mas_equalTo(self.protocolLabel.mas_left).offset(0);
make.trailing.mas_equalTo(self.protocolLabel.mas_leading).offset(0);
make.top.mas_equalTo(self.protocolLabel.mas_top);
make.width.height.mas_equalTo(22);
}];
[self.authBubbleView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(self.agreeBtn).mas_offset((-16));
make.leading.mas_equalTo(self.agreeBtn).mas_offset((-16));
make.top.mas_equalTo(self.agreeBtn.mas_bottom);
make.width.mas_equalTo(235);
make.height.mas_equalTo(29);
}];
[self.authBubbleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(8);
make.leading.mas_equalTo(8);
make.bottom.mas_equalTo(self.authBubbleView).mas_offset(-6);
}];
if (@available(iOS 13.0, *)) {

2
YuMi/Modules/YMMessage/View/FindNew/View/Cell/XPSessionFindNewEmptyTableViewCell.m
View File

@@ -44,7 +44,7 @@
[self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.mas_equalTo(self.emptyImageView.mas_bottom).offset(20);
make.left.right.mas_equalTo(self.contentView);
make.leading.trailing.mas_equalTo(self.contentView);
}];
}
#pragma mark - Getters And Setters

6
YuMi/Modules/YMMessage/View/FindNew/View/Cell/XPSessionFindNewGreetTableViewCell.m
View File

@@ -40,14 +40,14 @@
- (void)initSubViewConstraints {
[self.chooseButton mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerY.mas_equalTo(self.titleLabel.mas_centerY);
make.left.mas_equalTo(15);
make.leading.mas_equalTo(15);
make.height.width.mas_equalTo(18);
}];
[self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.mas_equalTo(10);
make.left.mas_equalTo(self.chooseButton.mas_right).offset(15);
make.right.mas_lessThanOrEqualTo(-15);
make.leading.mas_equalTo(self.chooseButton.mas_trailing).offset(15);
make.trailing.mas_lessThanOrEqualTo(-15);
}];
}

12
YuMi/Modules/YMMessage/View/FindNew/View/Cell/XPSessionFindNewTableViewCell.m
View File

@@ -64,19 +64,19 @@
[self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.size.mas_equalTo(CGSizeMake(45, 45));
make.centerY.mas_equalTo(self.contentView);
make.left.mas_equalTo(self.contentView).offset(15);
make.leading.mas_equalTo(self.contentView).offset(15);
}];
[self.stackView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(self.avatarImageView.mas_right).offset(10);
make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(10);
make.bottom.mas_equalTo(self.avatarImageView.mas_centerY).offset(-2);
make.right.mas_lessThanOrEqualTo(self.greetButton.mas_left).mas_offset(-4);
make.trailing.mas_lessThanOrEqualTo(self.greetButton.mas_leading).mas_offset(-4);
}];
[self.idLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(self.stackView);
make.leading.mas_equalTo(self.stackView);
make.top.mas_equalTo(self.avatarImageView.mas_centerY).offset(2);
make.right.mas_equalTo(self.greetButton.mas_left).mas_offset(-4);
make.trailing.mas_equalTo(self.greetButton.mas_leading).mas_offset(-4);
}];
[self.sexImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.width.mas_equalTo(28);
@@ -87,7 +87,7 @@
make.width.mas_equalTo(64);
make.height.mas_equalTo(25);
make.centerY.mas_equalTo(self.contentView);
make.right.mas_equalTo(self.contentView).offset(-15);
make.trailing.mas_equalTo(self.contentView).offset(-15);
}];
}

8
YuMi/Modules/YMMessage/View/FindNew/View/View/XPSessionFindNewAlertView.m
View File

@@ -76,24 +76,24 @@
}];
[self.nickLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.mas_equalTo(self).inset(10);
make.leading.trailing.mas_equalTo(self).inset(10);
make.top.mas_equalTo(self.avatarImageView.mas_bottom).offset(15);
}];
[self.messageLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.mas_equalTo(self).inset(40);
make.leading.trailing.mas_equalTo(self).inset(40);
make.top.mas_equalTo(self.nickLabel.mas_bottom).offset(10);
}];
[self.cancelButton mas_makeConstraints:^(MASConstraintMaker *make) {
make.size.mas_equalTo(CGSizeMake(120, 40));
make.right.mas_equalTo(self.mas_centerX).offset(-10);
make.trailing.mas_equalTo(self.mas_centerX).offset(-10);
make.top.mas_equalTo(self.messageLabel.mas_bottom).offset(30);
}];
[self.findButton mas_makeConstraints:^(MASConstraintMaker *make) {
make.size.centerY.mas_equalTo(self.cancelButton);
make.left.mas_equalTo(self.mas_centerX).offset(10);
make.leading.mas_equalTo(self.mas_centerX).offset(10);
}];
}

10
YuMi/Modules/YMMessage/View/FindNew/View/View/XPSessionFindNewFiltrateView.m
View File

@@ -96,31 +96,31 @@
}];
[self.sexLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(self).offset(15);
make.leading.mas_equalTo(self).offset(15);
make.top.mas_equalTo(self.titleLabel.mas_bottom).offset(12);
}];
[self.sexStackView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(self.sexLabel);
make.leading.mas_equalTo(self.sexLabel);
make.top.mas_equalTo(self.sexLabel.mas_bottom).offset(12);
make.height.mas_equalTo(26);
make.width.mas_equalTo(72 * 3 + 20 * 2);
}];
[self.helloLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(self).offset(15);
make.leading.mas_equalTo(self).offset(15);
make.top.mas_equalTo(self.sexStackView.mas_bottom).offset(24);
}];
[self.helloStackView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(self.sexLabel);
make.leading.mas_equalTo(self.sexLabel);
make.top.mas_equalTo(self.helloLabel.mas_bottom).offset(12);
make.height.mas_equalTo(26);
make.width.mas_equalTo(72 * 3 + 20 * 2);
}];
[self.sureButton mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.mas_equalTo(self).inset(57);
make.leading.trailing.mas_equalTo(self).inset(57);
make.height.mas_equalTo(38);
make.bottom.mas_equalTo(self).offset(-45);
}];

8
YuMi/Modules/YMMessage/View/FindNew/View/View/XPSessionFindNewGreetListView.m
View File

@@ -94,11 +94,11 @@
[self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.mas_equalTo(self).offset(17);
make.left.mas_equalTo(15);
make.leading.mas_equalTo(15);
}];
[self.refreshStackView mas_makeConstraints:^(MASConstraintMaker *make) {
make.right.mas_equalTo(self).offset(-15);
make.trailing.mas_equalTo(self).offset(-15);
make.centerY.mas_equalTo(self.titleLabel);
make.height.mas_equalTo(30);
}];
@@ -108,14 +108,14 @@
}];
[self.tableView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.mas_equalTo(self);
make.leading.trailing.mas_equalTo(self);
make.bottom.mas_equalTo(self.sendButton.mas_top);
make.top.mas_equalTo(self.titleLabel.mas_bottom).offset(10);
}];
[self.sendButton mas_makeConstraints:^(MASConstraintMaker *make) {
make.bottom.mas_equalTo(self.mas_bottom).offset(-20);
make.left.right.mas_equalTo(self).inset(57);
make.leading.trailing.mas_equalTo(self).inset(57);
make.height.mas_equalTo(44);
}];
}

4
YuMi/Modules/YMMessage/View/FindNew/View/XPSessionFindNewViewController.m
View File

@@ -72,12 +72,12 @@
}];
[self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.mas_equalTo(self.navView);
make.leading.trailing.mas_equalTo(self.navView);
make.bottom.mas_equalTo(self.navView.mas_centerY).offset(-1);
}];
[self.subTitleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.mas_equalTo(self.navView);
make.leading.trailing.mas_equalTo(self.navView);
make.top.mas_equalTo(self.navView.mas_centerY).offset(1);
}];
}

2
YuMi/Modules/YMMessage/View/SayHello/View/Cell/XPSessionSayHelloEmptyTableViewCell.m
View File

@@ -44,7 +44,7 @@
[self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.mas_equalTo(self.emptyImageView.mas_bottom).offset(20);
make.left.right.mas_equalTo(self.contentView);
make.leading.trailing.mas_equalTo(self.contentView);
}];
}
#pragma mark - Getters And Setters

24
YuMi/Modules/YMMessage/View/SayHello/View/Cell/XPSessionSayHelloTableViewCell.m
View File

@@ -68,63 +68,63 @@
- (void)initSubViewConstraints {
[self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.size.mas_equalTo(CGSizeMake(54, 54));
make.left.mas_equalTo(self.contentView).offset(15);
make.leading.mas_equalTo(self.contentView).offset(15);
make.top.mas_equalTo(self.contentView);
}];
[self.sexImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.size.mas_equalTo(CGSizeMake(28, 14));
make.bottom.mas_equalTo(self.avatarImageView);
make.right.mas_equalTo(self.avatarImageView);
make.trailing.mas_equalTo(self.avatarImageView);
}];
[self.nickLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(self.avatarImageView.mas_right).offset(12);
make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(12);
make.bottom.mas_equalTo(self.avatarImageView.mas_centerY).offset(-2);
make.right.mas_lessThanOrEqualTo(self.contentView).offset(-20);
make.trailing.mas_lessThanOrEqualTo(self.contentView).offset(-20);
}];
[self.levelImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.width.mas_equalTo(20);
make.height.mas_equalTo(20);
make.left.mas_equalTo(self.nickLabel);
make.leading.mas_equalTo(self.nickLabel);
make.top.mas_equalTo(self.avatarImageView.mas_centerY).offset(2);
}];
[self.charmImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.width.mas_equalTo(20);
make.left.mas_equalTo(self.levelImageView.mas_right).offset(2);
make.leading.mas_equalTo(self.levelImageView.mas_trailing).offset(2);
make.centerY.mas_equalTo(self.levelImageView);
}];
[self.timeLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerY.mas_equalTo(self.avatarImageView);
make.right.mas_equalTo(self.contentView).offset(-15);
make.trailing.mas_equalTo(self.contentView).offset(-15);
}];
[self.onLineView mas_makeConstraints:^(MASConstraintMaker *make) {
make.size.mas_equalTo(CGSizeMake(8, 8));
make.centerY.mas_equalTo(self.timeLabel);
make.right.mas_equalTo(self.timeLabel.mas_left).offset(-2);
make.trailing.mas_equalTo(self.timeLabel.mas_leading).offset(-2);
}];
[self.backView mas_makeConstraints:^(MASConstraintMaker *make) {
make.height.mas_equalTo(56);
make.left.right.mas_equalTo(self.contentView).inset(15);
make.leading.trailing.mas_equalTo(self.contentView).inset(15);
make.top.mas_equalTo(self.avatarImageView.mas_bottom).offset(3);
}];
[self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(self.backView).offset(16);
make.leading.mas_equalTo(self.backView).offset(16);
make.top.mas_equalTo(self.backView).offset(23);
make.right.mas_lessThanOrEqualTo(self.backView).offset(-25);
make.trailing.mas_lessThanOrEqualTo(self.backView).offset(-25);
}];
[self.helloButton mas_makeConstraints:^(MASConstraintMaker *make) {
make.size.mas_equalTo(CGSizeMake(56,24));
make.centerY.mas_equalTo(self.titleLabel);
make.right.mas_equalTo(self.backView).offset(-16);
make.trailing.mas_equalTo(self.backView).offset(-16);
}];
}

8
YuMi/Modules/YMMessage/View/SayHello/View/CustomView/XPSessionSayHelloHeaderView.m
View File

@@ -58,7 +58,7 @@
- (void)initSubViewConstraints {
[self.backButton mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(self).mas_offset(10);
make.leading.mas_equalTo(self).mas_offset(10);
make.top.mas_equalTo(statusbarHeight);
make.height.width.mas_equalTo(44);
}];
@@ -75,18 +75,18 @@
}];
[self.currentRateLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(self).offset(15);
make.leading.mas_equalTo(self).offset(15);
make.top.mas_equalTo(self.backButton.mas_bottom).offset(40);
}];
[self.helloLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(self.currentRateLabel);
make.leading.mas_equalTo(self.currentRateLabel);
make.top.mas_equalTo(self.currentRateLabel.mas_bottom).offset(10);
}];
[self.nextLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.mas_equalTo(self.helloLabel.mas_bottom);
make.left.mas_equalTo(self.helloLabel);
make.leading.mas_equalTo(self.helloLabel);
}];
[self.levelImageView mas_makeConstraints:^(MASConstraintMaker *make) {

6
YuMi/Modules/YMMessage/View/SayHello/View/XPSessionSayHelloViewController.m
View File

@@ -107,17 +107,17 @@
}];
[self.headerView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.top.mas_equalTo(self.view);
make.leading.trailing.top.mas_equalTo(self.view);
make.height.mas_equalTo(220 + kSafeAreaTopHeight);
}];
[self.backView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.bottom.mas_equalTo(self.view);
make.leading.trailing.bottom.mas_equalTo(self.view);
make.top.mas_equalTo(self.headerView.mas_bottom);
}];
[self.tableView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.bottom.mas_equalTo(self.backView);
make.leading.trailing.bottom.mas_equalTo(self.backView);
make.top.mas_equalTo(self.backView.mas_top).offset(15);
}];
}

16
YuMi/Modules/YMMessage/View/Session/Cell/MessageCell.m
View File

@@ -97,26 +97,26 @@
- (void)initLayout {
[self.leftAvatar mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.top.mas_equalTo(self).offset(15);
make.leading.top.mas_equalTo(self).offset(15);
make.width.height.mas_equalTo(45);
}];
[self.rightAvatar mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.mas_equalTo(self).offset(15);
make.right.mas_equalTo(self).offset(-15);
make.trailing.mas_equalTo(self).offset(-15);
make.width.height.mas_equalTo(45);
}];
[self.messageBackground mas_makeConstraints:^(MASConstraintMaker *make) {
self.messageBackgroundLeft = make.left.mas_equalTo(self.leftAvatar.mas_right).offset(15);
self.messageBackgroundRight = make.right.mas_equalTo(self.rightAvatar.mas_left).offset(-15);
self.messageBackgroundLeft = make.leading.mas_equalTo(self.leftAvatar.mas_trailing).offset(15);
self.messageBackgroundRight = make.trailing.mas_equalTo(self.rightAvatar.mas_leading).offset(-15);
make.top.mas_equalTo(self).offset(20);
}];
[self.failButton mas_makeConstraints:^(MASConstraintMaker *make) {
make.size.mas_equalTo(CGSizeMake(20, 20));
make.centerY.mas_equalTo(self.messageBackground);
make.left.mas_equalTo(self.messageBackground.mas_right).offset(10);
make.leading.mas_equalTo(self.messageBackground.mas_trailing).offset(10);
}];
}
@@ -244,7 +244,7 @@
}
[self.messageBackground addSubview:self.messageContent];
[self.messageContent mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.top.right.bottom.mas_equalTo(self.messageBackground);
make.leading.top.trailing.bottom.mas_equalTo(self.messageBackground);
}];
if (model.isHiddenAvatar) {
@@ -279,13 +279,13 @@
[self.failButton mas_remakeConstraints:^(MASConstraintMaker *make) {
make.size.mas_equalTo(CGSizeMake(20, 20));
make.centerY.mas_equalTo(self.messageBackground);
make.left.mas_equalTo(self.messageBackground.mas_right).offset(10);
make.leading.mas_equalTo(self.messageBackground.mas_trailing).offset(10);
}];
} else {
[self.failButton mas_remakeConstraints:^(MASConstraintMaker *make) {
make.size.mas_equalTo(CGSizeMake(20, 20));
make.centerY.mas_equalTo(self.messageBackground);
make.right.mas_equalTo(self.messageBackground.mas_left).offset(-10);
make.trailing.mas_equalTo(self.messageBackground.mas_leading).offset(-10);
}];
}
}

6
YuMi/Modules/YMMessage/View/Session/Cell/SessionSettingTableViewCell.m
View File

@@ -52,18 +52,18 @@
- (void)initSubViewConstraints {
[self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(self.contentView).offset(15);
make.leading.mas_equalTo(self.contentView).offset(15);
make.centerY.mas_equalTo(self.contentView);
}];
[self.lineView mas_makeConstraints:^(MASConstraintMaker *make) {
make.bottom.mas_equalTo(self.contentView);
make.height.mas_equalTo(0.5);
make.left.right.mas_equalTo(self.contentView).inset(15);
make.leading.trailing.mas_equalTo(self.contentView).inset(15);
}];
[self.stackView mas_makeConstraints:^(MASConstraintMaker *make) {
make.right.mas_equalTo(self.contentView).offset(-15);
make.trailing.mas_equalTo(self.contentView).offset(-15);
make.centerY.mas_equalTo(self.contentView);
}];

12
YuMi/Modules/YMMessage/View/Session/Cell/SessionUserInfoTableViewCell.m
View File

@@ -131,19 +131,19 @@
- (void)initSubViewConstraints {
[self.stackView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.mas_equalTo(self.contentView).inset(15);
make.leading.trailing.mas_equalTo(self.contentView).inset(15);
make.top.mas_equalTo(self.contentView).offset(10);
}];
[self.backView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.mas_equalTo(self.contentView).inset(15);
make.leading.trailing.mas_equalTo(self.contentView).inset(15);
make.bottom.mas_equalTo(self.stackView.mas_bottom).offset(16);
make.top.mas_equalTo(self.contentView).offset(10);
}];
[self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.size.mas_equalTo(CGSizeMake(56, 56));
make.left.mas_equalTo(self.userView).offset(22);
make.leading.mas_equalTo(self.userView).offset(22);
make.top.mas_equalTo(self.backView).offset(22);
}];
@@ -154,7 +154,7 @@
}];
[self.tagStackView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(self.headWearImageView.mas_right).offset(0);
make.leading.mas_equalTo(self.headWearImageView.mas_trailing).offset(0);
make.width.mas_greaterThanOrEqualTo(kGetScaleWidth(100));
make.bottom.mas_equalTo(self.headWearImageView.mas_centerY).offset(-3);
}];
@@ -172,8 +172,8 @@
}];
[self.signLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(self.tagStackView);
make.right.mas_lessThanOrEqualTo(self.userView).offset(-5);
make.leading.mas_equalTo(self.tagStackView);
make.trailing.mas_lessThanOrEqualTo(self.userView).offset(-5);
make.top.mas_equalTo(self.headWearImageView.mas_centerY).offset(3);
}];

4
YuMi/Modules/YMMessage/View/Session/Content/MessageConentAudioView.m
View File

@@ -57,13 +57,13 @@
}];
[self.timeLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(self.backView).offset(10);
make.leading.mas_equalTo(self.backView).offset(10);
make.centerY.mas_equalTo(self.backView);
}];
[self.audioImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.size.mas_equalTo(CGSizeMake(20, 20));
make.right.mas_equalTo(self.backView).offset(-10);
make.trailing.mas_equalTo(self.backView).offset(-10);
make.centerY.mas_equalTo(self.backView);
}];
}

10
YuMi/Modules/YMMessage/View/Session/Content/MessageContentApplicationShareView.m
View File

@@ -65,25 +65,25 @@
}];
[self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(self.backView).offset(10);
make.right.mas_equalTo(self.avatarImageView.mas_left).offset(-10);
make.leading.mas_equalTo(self.backView).offset(10);
make.trailing.mas_equalTo(self.avatarImageView.mas_leading).offset(-10);
make.top.mas_equalTo(self.backView);
}];
[self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.size.mas_equalTo(CGSizeMake(50, 50));
make.top.mas_equalTo(self.backView);
make.right.mas_equalTo(self.backView);
make.trailing.mas_equalTo(self.backView);
}];
[self.lineView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.mas_equalTo(self.backView).inset(12);
make.leading.trailing.mas_equalTo(self.backView).inset(12);
make.height.mas_equalTo(1);
make.bottom.mas_equalTo(self.enterButton.mas_top);
}];
[self.enterButton mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.bottom.mas_equalTo(self.backView);
make.leading.trailing.bottom.mas_equalTo(self.backView);
make.height.mas_equalTo(40);
}];
}

6
YuMi/Modules/YMMessage/View/Session/Content/MessageContentGiftView.m
View File

@@ -43,17 +43,17 @@
[self.giftImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.size.mas_equalTo(CGSizeMake(60, 60));
make.left.mas_equalTo(self.backView);
make.leading.mas_equalTo(self.backView);
make.centerY.mas_equalTo(self.backView);
}];
[self.giftNameLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(self.giftImageView.mas_right).offset(10);
make.leading.mas_equalTo(self.giftImageView.mas_trailing).offset(10);
make.bottom.mas_equalTo(self.giftImageView.mas_centerY).offset(-3);
}];
[self.giftNumLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(self.giftNameLabel);
make.leading.mas_equalTo(self.giftNameLabel);
make.top.mas_equalTo(self.giftImageView.mas_centerY).offset(3);
}];
}

6
YuMi/Modules/YMMessage/View/Session/Content/MessageContentGuildView.m
View File

@@ -72,7 +72,7 @@
}];
[self.stackView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.top.mas_equalTo(self.backView);
make.leading.trailing.top.mas_equalTo(self.backView);
}];
[self.contentView mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -85,12 +85,12 @@
}];
[self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.mas_equalTo(self.contentView);
make.leading.trailing.mas_equalTo(self.contentView);
make.top.mas_equalTo(self.contentView).offset(20);
}];
[self.contentLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.right.left.mas_equalTo(self.contentView).inset(MESSAGE_TEXT_PADDING);
make.trailing.leading.mas_equalTo(self.contentView).inset(MESSAGE_TEXT_PADDING);
make.top.mas_equalTo(self.titleLabel.mas_bottom).offset(MESSAGE_TEXT_PADDING);
make.bottom.mas_equalTo(self.contentView);
}];

12
YuMi/Modules/YMMessage/View/Session/Content/MessageContentLevelUpgradeView.m
View File

@@ -61,31 +61,31 @@
[self.logoImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.size.mas_equalTo(CGSizeMake(64,64));
make.left.mas_equalTo(self.backView);
make.leading.mas_equalTo(self.backView);
make.top.mas_equalTo(self.backView);
}];
[self.levelLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(self.logoImageView.mas_right).offset(10);
make.right.mas_equalTo(self.backView);
make.leading.mas_equalTo(self.logoImageView.mas_trailing).offset(10);
make.trailing.mas_equalTo(self.backView);
make.top.mas_equalTo(self.logoImageView).offset(10);
}];
[self.lineView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.mas_equalTo(self.backView);
make.leading.trailing.mas_equalTo(self.backView);
make.height.mas_equalTo(0.5);
make.top.mas_equalTo(self.logoImageView.mas_bottom).offset(10);
}];
[self.checkButton mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.mas_equalTo(self.backView);
make.leading.trailing.mas_equalTo(self.backView);
make.height.mas_equalTo(40);
make.top.mas_equalTo(self.lineView.mas_bottom);
}];
[self.arrowImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.size.mas_equalTo(CGSizeMake(6.5, 11));
make.right.mas_equalTo(self.backView);
make.trailing.mas_equalTo(self.backView);
make.centerY.mas_equalTo(self.checkButton);
}];
}

6
YuMi/Modules/YMMessage/View/Session/Content/MessageContentMonentsAutoView.m
View File

@@ -38,17 +38,17 @@
}];
[self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(14.5);
make.leading.mas_equalTo(14.5);
make.top.mas_equalTo(10);
}];
[self.timeLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.right.mas_equalTo(-14.5);
make.trailing.mas_equalTo(-14.5);
make.centerY.mas_equalTo(self.titleLabel);
}];
[self.messageLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.mas_equalTo(self).inset(14.5);
make.leading.trailing.mas_equalTo(self).inset(14.5);
make.top.mas_equalTo(self.titleLabel.mas_bottom).offset(12.5);
}];
}

10
YuMi/Modules/YMMessage/View/Session/Content/MessageContentMonentsView.m
View File

@@ -55,20 +55,20 @@
[self.monentsView mas_makeConstraints:^(MASConstraintMaker *make) {
make.size.mas_equalTo(CGSizeMake(50, 50));
make.left.mas_equalTo(self.backView);
make.leading.mas_equalTo(self.backView);
make.centerY.mas_equalTo(self.backView);
}];
[self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(self.monentsView.mas_right).offset(10);
make.leading.mas_equalTo(self.monentsView.mas_trailing).offset(10);
make.bottom.mas_equalTo(self.monentsView.mas_centerY).offset(-3);
make.right.mas_lessThanOrEqualTo(self.backView).offset(-10);
make.trailing.mas_lessThanOrEqualTo(self.backView).offset(-10);
}];
[self.contentLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(self.titleLabel);
make.leading.mas_equalTo(self.titleLabel);
make.top.mas_equalTo(self.monentsView.mas_centerY).offset(3);
make.right.mas_lessThanOrEqualTo(self.backView).offset(-10);
make.trailing.mas_lessThanOrEqualTo(self.backView).offset(-10);
}];
}

8
YuMi/Modules/YMMessage/View/Session/Content/MessageContentOpenLiveView.m
View File

@@ -76,17 +76,17 @@
[self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.size.mas_equalTo(CGSizeMake(47, 47));
make.centerY.mas_equalTo(self.backView);
make.left.mas_equalTo(self.backView).offset(10);
make.leading.mas_equalTo(self.backView).offset(10);
}];
[self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(self.avatarImageView.mas_right).offset(10);
make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(10);
make.bottom.mas_equalTo(self.avatarImageView.mas_centerY).offset(-2);
make.right.mas_lessThanOrEqualTo(self.backView);
make.trailing.mas_lessThanOrEqualTo(self.backView);
}];
[self.idLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.mas_equalTo(self.titleLabel);
make.leading.trailing.mas_equalTo(self.titleLabel);
make.top.mas_equalTo(self.avatarImageView.mas_centerY).offset(2);
}];
}

14
YuMi/Modules/YMMessage/View/Session/Content/MessageContentRedPacketView.m
View File

@@ -66,34 +66,34 @@
make.width.mas_equalTo(MESSAGE_MAX_WIDTH);
make.top.mas_equalTo(self.backView);
make.height.mas_equalTo(95);
make.left.mas_equalTo(self.backView);
make.leading.mas_equalTo(self.backView);
}];
[self.redPacketImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(self.backView).mas_offset(16);
make.leading.mas_equalTo(self.backView).mas_offset(16);
make.width.mas_equalTo(31);
make.height.mas_equalTo(40);
make.top.mas_equalTo(self.backView).mas_offset(13);
}];
[self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(self.redPacketImageView.mas_right).mas_offset(6);
make.leading.mas_equalTo(self.redPacketImageView.mas_trailing).mas_offset(6);
make.height.mas_equalTo(16);
make.top.mas_equalTo(self.redPacketImageView).mas_offset(12);
}];
[self.subLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(self.titleLabel);
make.leading.mas_equalTo(self.titleLabel);
make.top.mas_equalTo(self.titleLabel.mas_bottom).mas_offset(8);
make.height.mas_equalTo(13);
}];
[self.devideView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(16);
make.right.mas_equalTo(-8);
make.leading.mas_equalTo(16);
make.trailing.mas_equalTo(-8);
make.top.mas_equalTo(self.redPacketImageView.mas_bottom).offset(11);
make.height.mas_equalTo(0.5);
}];
[self.descLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(16);
make.leading.mas_equalTo(16);
make.top.mas_equalTo(self.devideView.mas_bottom).offset(9);
make.height.mas_equalTo(13);
}];

4
YuMi/Modules/YMMessage/View/Session/Content/MessageContentSkillCardView.m
View File

@@ -45,12 +45,12 @@
}];
[self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.mas_equalTo(self.backView);
make.leading.trailing.mas_equalTo(self.backView);
make.top.mas_equalTo(self.backView).offset(MESSAGE_PADDING);
}];
[self.contentLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.right.left.mas_equalTo(self.backView);
make.trailing.leading.mas_equalTo(self.backView);
make.top.mas_equalTo(self.titleLabel.mas_bottom).offset(MESSAGE_PADDING);
make.height.mas_equalTo(15);
}];

6
YuMi/Modules/YMMessage/View/Session/Content/MessageContentTextClickable.m
View File

@@ -67,17 +67,17 @@
make.bottom.mas_equalTo(self.checkButton);
}];
[self.messageText mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.left.right.equalTo(self.backView);
make.top.leading.trailing.equalTo(self.backView);
}];
[self.lineView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.mas_equalTo(self.backView);
make.leading.trailing.mas_equalTo(self.backView);
make.height.mas_equalTo(0.5);
make.top.mas_equalTo(self.messageText.mas_bottom).offset(5);
}];
[self.checkButton mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.mas_equalTo(self.backView);
make.leading.trailing.mas_equalTo(self.backView);
make.top.mas_equalTo(self.lineView.mas_bottom).offset(10);
make.height.mas_equalTo(20);
}];

10
YuMi/Modules/YMMessage/View/Session/Content/MessageContentTreasureFairyView.m
View File

@@ -50,22 +50,22 @@
- (void)initSubViewConstraints {
[super initSubViewConstraints];
[self.backView mas_remakeConstraints:^(MASConstraintMaker *make) {
make.top.bottom.right.equalTo(self);
make.left.mas_equalTo(self).offset(10);
make.top.bottom.trailing.equalTo(self);
make.leading.mas_equalTo(self).offset(10);
make.height.mas_equalTo(78);
make.width.mas_equalTo(235);
}];
[self.ballImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.size.mas_equalTo(CGSizeMake(62, 62));
make.left.mas_equalTo(self.backView);
make.leading.mas_equalTo(self.backView);
make.centerY.mas_equalTo(self.backView);
}];
[self.stackView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(self.ballImageView.mas_right).offset(12);
make.leading.mas_equalTo(self.ballImageView.mas_trailing).offset(12);
make.centerY.mas_equalTo(self.ballImageView);
make.right.mas_equalTo(self.backView).offset(-10);
make.trailing.mas_equalTo(self.backView).offset(-10);
}];
}

18
YuMi/Modules/YMMessage/View/Session/Content/MessageContentTweetView.m
View File

@@ -80,14 +80,14 @@
if ( [redPacketHistory containsObject: model1.message.messageId]) {
self.isNewImageView.hidden = YES;
[self.isNewImageView mas_remakeConstraints:^(MASConstraintMaker *make) {
make.right.mas_equalTo(self.backView);
make.trailing.mas_equalTo(self.backView);
make.centerY.equalTo(self.titleLabel);
make.size.mas_equalTo(CGSizeMake(0, 10));
}];
} else {
self.isNewImageView.hidden = NO;
[self.isNewImageView mas_remakeConstraints:^(MASConstraintMaker *make) {
make.right.mas_equalTo(self.backView);
make.trailing.mas_equalTo(self.backView);
make.centerY.equalTo(self.titleLabel);
make.size.mas_equalTo(CGSizeMake(24, 10));
}];
@@ -121,37 +121,37 @@
make.bottom.mas_equalTo(self.checkButton);
}];
[self.isNewImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.right.mas_equalTo(self.backView);
make.trailing.mas_equalTo(self.backView);
make.centerY.equalTo(self.titleLabel);
make.size.mas_equalTo(CGSizeMake(24, 10));
}];
[self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(self.backView);
make.right.equalTo(self.isNewImageView.mas_left);
make.leading.mas_equalTo(self.backView);
make.trailing.equalTo(self.isNewImageView.mas_leading);
make.top.mas_equalTo(self.backView);
make.height.mas_equalTo(18);
}];
[self.logoImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.mas_equalTo(self.backView);
make.leading.trailing.mas_equalTo(self.backView);
make.top.mas_equalTo(self.titleLabel.mas_bottom).offset(10);
make.height.mas_equalTo(87);
}];
[self.subTitleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.mas_equalTo(self.backView);
make.leading.trailing.mas_equalTo(self.backView);
make.top.mas_equalTo(self.logoImageView.mas_bottom).offset(10);
make.height.mas_equalTo(18);
}];
[self.lineView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.mas_equalTo(self.backView);
make.leading.trailing.mas_equalTo(self.backView);
make.height.mas_equalTo(0.5);
make.top.mas_equalTo(self.subTitleLabel.mas_bottom).offset(5);
}];
[self.checkButton mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.mas_equalTo(self.backView);
make.leading.trailing.mas_equalTo(self.backView);
make.top.mas_equalTo(self.lineView.mas_bottom).offset(10);
make.height.mas_equalTo(20);
}];

22
YuMi/Modules/YMMessage/View/Session/Content/PIMessageContentServiceReplyView.m
View File

@@ -45,33 +45,33 @@
make.edges.equalTo(self.backView);
}];
[self.titleView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(16);
make.leading.mas_equalTo(16);
make.top.mas_equalTo(58);
make.height.mas_equalTo(20);
}];
[self.contentView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(16);
make.right.mas_equalTo(14);
make.leading.mas_equalTo(16);
make.trailing.mas_equalTo(14);
make.top.equalTo(self.titleView.mas_bottom).mas_offset(6);
}];
[self.contentView1 mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(16);
make.right.mas_equalTo(14);
make.leading.mas_equalTo(16);
make.trailing.mas_equalTo(14);
make.top.equalTo(self.contentView.mas_bottom).mas_offset(6);
}];
[self.contentView2 mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(16);
make.right.mas_equalTo(14);
make.leading.mas_equalTo(16);
make.trailing.mas_equalTo(14);
make.top.equalTo(self.contentView1.mas_bottom).mas_offset(4);
}];
[self.contentView3 mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(16);
make.right.mas_equalTo(14);
make.leading.mas_equalTo(16);
make.trailing.mas_equalTo(14);
make.top.equalTo(self.contentView2.mas_bottom).mas_offset(4);
}];
[self.contentView4 mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(16);
make.right.mas_equalTo(14);
make.leading.mas_equalTo(16);
make.trailing.mas_equalTo(14);
make.top.equalTo(self.contentView3.mas_bottom).mas_offset(6);
}];
}

2
YuMi/Modules/YMMessage/View/Session/SessionInfoViewController.m
View File

@@ -57,7 +57,7 @@
- (void)initSubViewConstraints {
[self.tableView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.mas_equalTo(self.view).inset(15);
make.leading.trailing.mas_equalTo(self.view).inset(15);
make.top.mas_equalTo(self.view).offset(12);
make.height.mas_equalTo(50 * 3 + 70);
}];

8
YuMi/Modules/YMMessage/View/Session/SessionViewController.m
View File

@@ -363,7 +363,7 @@
- (void)initLayout {
[self.sessionNavView mas_makeConstraints:^(MASConstraintMaker *make) {
make.height.mas_equalTo(self.openType == SessionListOpenTypeRoom ? 44 : kNavigationHeight);
make.left.top.right.mas_equalTo(self.view);
make.leading.top.trailing.mas_equalTo(self.view);
}];
}
@@ -446,7 +446,7 @@
if (!self.riskAlertView.superview) {
[self.view addSubview:self.riskAlertView];
[self.riskAlertView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.mas_equalTo(self.view);
make.leading.trailing.mas_equalTo(self.view);
make.top.mas_equalTo(self.sessionNavView.mas_bottom);
make.height.mas_equalTo(30);
}];
@@ -465,7 +465,7 @@
if (!self.riskAlertView.superview) {
[self.view addSubview:self.riskAlertView];
[self.riskAlertView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.mas_equalTo(self.view);
make.leading.trailing.mas_equalTo(self.view);
make.top.mas_equalTo(self.sessionNavView.mas_bottom);
make.height.mas_equalTo(30);
}];
@@ -1004,7 +1004,7 @@
[UIView animateWithDuration:0.2 animations:^{
[self.sessionTableView nim_scrollToBottom:NO];
[self.sessionTableView mas_remakeConstraints:^(MASConstraintMaker *make) {
make.left.right.mas_equalTo(self.view);
make.leading.trailing.mas_equalTo(self.view);
make.top.mas_equalTo(self.sessionNavView.mas_bottom);
make.bottom.mas_equalTo(self.view).offset(-wholeInputViewHeight - kSafeAreaBottomHeight);
}];

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

@@ -78,7 +78,7 @@
}];
[self.timeLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.mas_equalTo(self.backView);
make.leading.trailing.mas_equalTo(self.backView);
make.top.mas_equalTo(self.backView).offset(15);
}];
@@ -93,7 +93,7 @@
}];
[self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.mas_equalTo(self.backView);
make.leading.trailing.mas_equalTo(self.backView);
make.top.mas_equalTo(self.logoImageView.mas_bottom).offset(25);
}];
}

2
YuMi/Modules/YMMessage/View/Session/View/SessionChatLimitView.m
View File

@@ -33,7 +33,7 @@
}];
[self.textLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.left.right.bottom.mas_equalTo(self.bgView).insets(UIEdgeInsetsMake(10, 10, 10, 10));
make.top.leading.trailing.bottom.mas_equalTo(self.bgView).insets(UIEdgeInsetsMake(10, 10, 10, 10));
}];
[self initLabel:chatLimit.charmLevel.integerValue wealthLevel:chatLimit.wealthLevel.integerValue];

6
YuMi/Modules/YMMessage/View/Session/View/SessionNavLiveView.m
View File

@@ -41,17 +41,17 @@
[self mas_makeConstraints:^(MASConstraintMaker *make) {
make.height.mas_equalTo(15);
make.right.mas_equalTo(self.liveLabel.mas_right);
make.trailing.mas_equalTo(self.liveLabel.mas_trailing);
}];
[self.liveView mas_makeConstraints:^(MASConstraintMaker *make) {
make.size.mas_equalTo(CGSizeMake(6, 6));
make.centerY.mas_equalTo(self);
make.left.mas_equalTo(self);
make.leading.mas_equalTo(self);
}];
[self.liveLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(self.liveView.mas_right).offset(4);
make.leading.mas_equalTo(self.liveView.mas_trailing).offset(4);
make.centerY.mas_equalTo(self.liveView);
}];
}

6
YuMi/Modules/YMMessage/View/Session/View/SessionNavView.m
View File

@@ -70,7 +70,7 @@
- (void)initSubViewConstraints {
[self.backButton mas_makeConstraints:^(MASConstraintMaker *make) {
make.size.mas_equalTo(CGSizeMake(22, 22));
make.left.mas_equalTo(self).offset(8);
make.leading.mas_equalTo(self).offset(8);
make.top.mas_equalTo(statusbarHeight + 14);
}];
@@ -81,13 +81,13 @@
[self.likeButton mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerY.mas_equalTo(self.reportButton);
make.right.mas_equalTo(self.reportButton.mas_left).offset(-12);
make.trailing.mas_equalTo(self.reportButton.mas_leading).offset(-12);
make.size.mas_equalTo(CGSizeMake(48, 20));
}];
[self.reportButton mas_makeConstraints:^(MASConstraintMaker *make) {
make.size.mas_equalTo(CGSizeMake(30, 30));
make.right.mas_equalTo(self).offset(-15);
make.trailing.mas_equalTo(self).offset(-15);
make.centerY.mas_equalTo(self.backButton);
}];
}

8
YuMi/Modules/YMMessage/View/Session/View/SessionSettingUserView.m
View File

@@ -56,7 +56,7 @@
- (void)initSubViewConstraints {
[self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.size.mas_equalTo(CGSizeMake(43, 43));
make.left.mas_equalTo(self).offset(22);
make.leading.mas_equalTo(self).offset(22);
make.top.mas_equalTo(self).offset(22);
}];
@@ -67,19 +67,19 @@
}];
[self.nickLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(self.avatarImageView.mas_right).offset(12);
make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(12);
make.bottom.mas_equalTo(self.avatarImageView.mas_centerY).offset(-2);
}];
[self.idLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(self.nickLabel);
make.leading.mas_equalTo(self.nickLabel);
make.top.mas_equalTo(self.avatarImageView.mas_centerY).offset(2);
}];
[self.arrowImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.size.mas_equalTo(CGSizeMake(6.5, 11));
make.centerY.mas_equalTo(self.avatarImageView);
make.right.mas_equalTo(self).offset(-15);
make.trailing.mas_equalTo(self).offset(-15);
}];
}

8
YuMi/Modules/YMMessage/View/Session/XPSessionMainViewController.m
View File

@@ -62,24 +62,24 @@
}
- (void)initSubViewConstraints {
[self.headBgImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.top.right.equalTo(self.view);
make.leading.top.trailing.equalTo(self.view);
make.height.mas_equalTo(196);
}];
[self.pagingView mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.left.right.equalTo(self.view);
make.top.leading.trailing.equalTo(self.view);
make.bottom.mas_equalTo(-1);
}];
[self.allCleanBtn mas_makeConstraints:^(MASConstraintMaker *make) {
make.width.height.mas_equalTo(30);
make.top.mas_equalTo(67);
make.right.mas_equalTo(-15);
make.trailing.mas_equalTo(-15);
}];
UIView *lineView = [UIView new];
lineView.backgroundColor = UIColorFromRGB(0xF5F6FA);
[self.view addSubview:lineView];
[lineView mas_makeConstraints:^(MASConstraintMaker *make) {
make.bottom.left.right.equalTo(self.view);
make.bottom.leading.trailing.equalTo(self.view);
make.height.mas_equalTo(1);
}];
}

8
YuMi/Modules/YMMessage/View/SessionList/SessionDiscoverNewTableViewCell.m
View File

@@ -47,19 +47,19 @@
- (void)initSubViewConstraints {
[self.logoImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(15);
make.leading.mas_equalTo(15);
make.height.width.mas_equalTo(45);
make.centerY.mas_equalTo(self.contentView);
}];
[self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerY.mas_equalTo(self.logoImageView.mas_centerY);
make.left.mas_equalTo(self.logoImageView.mas_right).offset(15);
make.leading.mas_equalTo(self.logoImageView.mas_trailing).offset(15);
}];
[self.arrowImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.size.mas_equalTo(CGSizeMake(6.5, 11));
make.right.mas_equalTo(self.contentView).offset(-15);
make.trailing.mas_equalTo(self.contentView).offset(-15);
make.centerY.mas_equalTo(self.contentView);
}];
@@ -68,7 +68,7 @@
[self.dotView mas_makeConstraints:^(MASConstraintMaker *make) {
make.size.mas_equalTo(CGSizeMake(8, 8));
make.centerY.mas_equalTo(self.contentView);
make.right.mas_equalTo(self.arrowImageView.mas_left).offset(-3);
make.trailing.mas_equalTo(self.arrowImageView.mas_leading).offset(-3);
}];
}
#pragma mark - Getters And Setters

14
YuMi/Modules/YMMessage/View/SessionList/SessionListCell.m
View File

@@ -106,29 +106,29 @@
- (void)initLayout {
[self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerY.mas_equalTo(self.contentView);
make.left.mas_equalTo(15);
make.leading.mas_equalTo(15);
make.height.width.mas_equalTo(45);
}];
[self.nameLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.bottom.mas_equalTo(self.avatarImageView.mas_centerY).offset(-2);
make.left.mas_equalTo(self.avatarImageView.mas_right).offset(15);
make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(15);
}];
[self.messageLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(self.nameLabel);
make.leading.mas_equalTo(self.nameLabel);
make.top.mas_equalTo(self.avatarImageView.mas_centerY).offset(2);
make.right.mas_equalTo(self.timeLabel.mas_left).offset(-15);
make.trailing.mas_equalTo(self.timeLabel.mas_leading).offset(-15);
}];
[self.timeLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.bottom.mas_equalTo(self).offset(-15);
make.right.mas_equalTo(self).offset(-15);
make.trailing.mas_equalTo(self).offset(-15);
}];
[self.divider mas_makeConstraints:^(MASConstraintMaker *make) {
make.right.mas_equalTo (-15);
make.left.mas_equalTo(self.nameLabel);
make.trailing.mas_equalTo (-15);
make.leading.mas_equalTo(self.nameLabel);
make.bottom.mas_equalTo(self);
make.height.mas_equalTo(0.5f);
}];

4
YuMi/Modules/YMMessage/View/SessionList/SessionListViewController.m
View File

@@ -115,14 +115,14 @@ NSString * const kMessageShowReadDotKey = @"kMessageShowReadDotKey";
// make.center.mas_equalTo(self.customNavigationBar);
// }];
// [self.allReadButton mas_makeConstraints:^(MASConstraintMaker *make) {
// make.right.mas_equalTo(-16);
// make.trailing.mas_equalTo(-16);
// make.width.height.mas_equalTo(30);
// make.centerY.mas_equalTo(self.customNavigationBar);
// }];
}
[self.sessionListView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.bottom.mas_equalTo(self.view);
make.leading.trailing.bottom.mas_equalTo(self.view);
if (self.openType == SessionListOpenTypeDefault) {
make.top.mas_equalTo(self.view);
} else {

4
YuMi/Modules/YMMessage/View/SessionListHeadView/XPSessionHelloEnterView.m
View File

@@ -55,14 +55,14 @@
[self.subTitleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.mas_equalTo(self.titleLabel.mas_bottom).offset(0);
make.left.right.mas_equalTo(self);
make.leading.trailing.mas_equalTo(self);
}];
[self.lineView mas_makeConstraints:^(MASConstraintMaker *make) {
make.width.mas_equalTo(1);
make.height.mas_equalTo(28);
make.top.mas_equalTo(self.logoImageView).offset(20);
make.right.mas_equalTo(self);
make.trailing.mas_equalTo(self);
}];
}

8
YuMi/Modules/YMMessage/View/SessionListHeadView/XPSessionListHeadFriendCell.m
View File

@@ -63,22 +63,22 @@
make.centerX.mas_equalTo(self);
make.top.mas_equalTo(self.dotView.mas_bottom).mas_offset(2);
make.height.mas_equalTo(17);
make.left.mas_equalTo(0);
make.leading.mas_equalTo(0);
}];
[self.noteBgImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.bottom.mas_equalTo(self.imageView);
make.leading.trailing.bottom.mas_equalTo(self.imageView);
make.height.mas_equalTo(14);
}];
[self.noteImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(self.noteBgImageView).mas_offset(15);
make.leading.mas_equalTo(self.noteBgImageView).mas_offset(15);
make.centerY.mas_equalTo(self.noteBgImageView).mas_offset(-1);
make.height.mas_equalTo(10);
make.width.mas_equalTo(10);
}];
[self.liveLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(self.noteImageView.mas_right).mas_offset(2);
make.leading.mas_equalTo(self.noteImageView.mas_trailing).mas_offset(2);
make.centerY.mas_equalTo(self.noteImageView);
}];
}

2
YuMi/Modules/YMMessage/View/SessionListHeadView/XPSessionListHeadItemView.m
View File

@@ -61,7 +61,7 @@
make.height.mas_equalTo(17);
}];
[self.dotView mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.right.mas_equalTo(self.imageView);
make.top.trailing.mas_equalTo(self.imageView);
make.width.height.mas_equalTo(12);
}];
}

2
YuMi/Modules/YMMessage/View/SessionListHeadView/XPSessionListHeadView.m
View File

@@ -94,7 +94,7 @@ NSString * const kMengXinShowReadDotKey = @"kMengXinShowReadDotKey";
- (void)initContraints {
[self.mainStackView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.top.equalTo(self);
make.leading.trailing.top.equalTo(self);
}];
[self.toolStackView mas_makeConstraints:^(MASConstraintMaker *make) {

8
YuMi/Modules/YMMine/View/Cell/AnchorFansTeam/XPMineAnchorFansTeamTableViewCell.m
View File

@@ -45,21 +45,21 @@
#pragma mark - Constraints
- (void)setUpConstraints {
[self.avaterImgView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(15);
make.leading.mas_equalTo(15);
make.width.height.mas_equalTo(40);
make.centerY.mas_equalTo(self.contentView.mas_centerY);
}];
[self.nickLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(self.avaterImgView.mas_right).mas_offset(10);
make.leading.mas_equalTo(self.avaterImgView.mas_trailing).mas_offset(10);
make.centerY.mas_equalTo(self.contentView.mas_centerY);
make.right.mas_equalTo(self.iconImageView.mas_left);
make.trailing.mas_equalTo(self.iconImageView.mas_leading);
}];
[self.iconImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerY.mas_equalTo(self.nickLabel.mas_centerY);
make.width.mas_equalTo(95);
make.height.mas_equalTo(27);
make.right.mas_equalTo(-15);
make.trailing.mas_equalTo(-15);
}];
}

12
YuMi/Modules/YMMine/View/Cell/FootPrint/XPMineFootPrintTableViewCell.m
View File

@@ -47,32 +47,32 @@
#pragma mark - Constraints
- (void)setUpConstraints {
[self.avaterImgView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(15);
make.leading.mas_equalTo(15);
make.width.height.mas_equalTo(40);
make.centerY.mas_equalTo(self.contentView.mas_centerY);
}];
[self.nickLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(self.avaterImgView.mas_right).mas_offset(8);
make.leading.mas_equalTo(self.avaterImgView.mas_trailing).mas_offset(8);
make.bottom.mas_equalTo(self.avaterImgView.mas_centerY).mas_offset(-4);
make.height.mas_equalTo(14);
}];
[self.memberIdLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.mas_equalTo(self.avaterImgView.mas_centerY).mas_offset(4);
make.left.mas_equalTo(self.nickLabel);
make.leading.mas_equalTo(self.nickLabel);
make.height.mas_equalTo(14);
}];
[self.timeLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.right.mas_equalTo(-15);
make.trailing.mas_equalTo(-15);
make.centerY.mas_equalTo(self.nickLabel.mas_centerY);
make.height.mas_equalTo(14);
}];
[self.lineView mas_makeConstraints:^(MASConstraintMaker *make) {
make.bottom.mas_equalTo(0);
make.left.mas_equalTo(self.avaterImgView);
make.right.mas_equalTo(-15);
make.leading.mas_equalTo(self.avaterImgView);
make.trailing.mas_equalTo(-15);
make.height.mas_equalTo(0.5);
}];
}

12
YuMi/Modules/YMMine/View/Cell/Friend/XPMineAttentionTableViewCell.m
View File

@@ -67,12 +67,12 @@
[self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.size.mas_equalTo(CGSizeMake((50), (50)));
make.centerY.mas_equalTo(self.contentView);
make.left.mas_equalTo(self.contentView).offset((15));
make.leading.mas_equalTo(self.contentView).offset((15));
}];
[self.stackView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(self.avatarImageView.mas_right).offset((10));
make.right.mas_lessThanOrEqualTo(self.findButton.mas_left).mas_offset(-0);
make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset((10));
make.trailing.mas_lessThanOrEqualTo(self.findButton.mas_leading).mas_offset(-0);
make.height.mas_equalTo(((20)));
make.top.equalTo(self.avatarImageView.mas_top).mas_offset((3));
}];
@@ -84,16 +84,16 @@
// make.width.mas_lessThanOrEqualTo((100));
// }];
[self.signLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(self.stackView);
make.leading.mas_equalTo(self.stackView);
make.top.equalTo(self.stackView.mas_bottom).mas_offset((7));
make.right.mas_equalTo(self.findButton.mas_left).mas_offset(-(10));
make.trailing.mas_equalTo(self.findButton.mas_leading).mas_offset(-(10));
}];
[self.findButton mas_makeConstraints:^(MASConstraintMaker *make) {
make.width.mas_equalTo((68));
make.height.mas_equalTo((30));
make.centerY.mas_equalTo(self.contentView);
make.right.mas_equalTo(self.contentView).offset(-(15));
make.trailing.mas_equalTo(self.contentView).offset(-(15));
}];
CGFloat width = 28 * 20 / 14;

12
YuMi/Modules/YMMine/View/Cell/Friend/XPMineFansTableViewCell.m
View File

@@ -68,12 +68,12 @@
[self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.size.mas_equalTo(CGSizeMake((50), (50)));
make.centerY.mas_equalTo(self.contentView);
make.left.mas_equalTo(self.contentView).offset((15));
make.leading.mas_equalTo(self.contentView).offset((15));
}];
[self.stackView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(self.avatarImageView.mas_right).offset((10));
make.right.mas_lessThanOrEqualTo(self.attentionButton.mas_left).mas_offset(-0);
make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset((10));
make.trailing.mas_lessThanOrEqualTo(self.attentionButton.mas_leading).mas_offset(-0);
make.height.mas_equalTo(20);
make.top.equalTo(self.avatarImageView.mas_top).mas_offset((3));
}];
@@ -85,16 +85,16 @@
// make.width.mas_lessThanOrEqualTo((100));
// }];
[self.signLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(self.stackView);
make.leading.mas_equalTo(self.stackView);
make.top.equalTo(self.stackView.mas_bottom).mas_offset((7));
make.right.mas_equalTo(self.attentionButton.mas_left).mas_offset(-(10));
make.trailing.mas_equalTo(self.attentionButton.mas_leading).mas_offset(-(10));
}];
[self.attentionButton mas_makeConstraints:^(MASConstraintMaker *make) {
make.width.mas_equalTo((68));
make.height.mas_equalTo((30));
make.centerY.mas_equalTo(self.contentView);
make.right.mas_equalTo(self.contentView).offset(-(15));
make.trailing.mas_equalTo(self.contentView).offset(-(15));
}];
CGFloat width = 28 * 20 / 14;

2
YuMi/Modules/YMMine/View/Cell/Friend/XPMineFriendEmptyTableViewCell.m
View File

@@ -45,7 +45,7 @@
[self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.mas_equalTo(self.emptyImageView.mas_bottom).offset(20);
make.left.right.mas_equalTo(self.contentView);
make.leading.trailing.mas_equalTo(self.contentView);
}];
}
#pragma mark - Getters And Setters

6
YuMi/Modules/YMMine/View/Cell/Friend/XPMineFriendTableViewCell.m
View File

@@ -61,11 +61,11 @@
[self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.size.mas_equalTo(CGSizeMake(50, 50));
make.centerY.mas_equalTo(self.contentView);
make.left.mas_equalTo(self.contentView).offset(15);
make.leading.mas_equalTo(self.contentView).offset(15);
}];
[self.stackView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(self.avatarImageView.mas_right).offset(10);
make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(10);
make.bottom.mas_equalTo(self.avatarImageView.mas_centerY).offset(-2);
}];
[self.sexImageView mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -73,7 +73,7 @@
make.height.mas_equalTo(14);
}];
[self.signLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(self.stackView);
make.leading.mas_equalTo(self.stackView);
make.top.mas_equalTo(self.stackView.mas_bottom).offset(7);
}];
CGFloat width = 28 * 20 / 14;

32
YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineDataClanTableViewCell.m
View File

@@ -83,19 +83,19 @@
- (void)initSubViewConstraints {
[self.backView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.mas_equalTo(self.contentView).inset(kGetScaleWidth(15));
make.leading.trailing.mas_equalTo(self.contentView).inset(kGetScaleWidth(15));
make.top.mas_equalTo(self.contentView);
make.bottom.mas_equalTo(self.contentView).mas_offset(-kGetScaleWidth(12));
}];
[self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(self.backView).offset(kGetScaleWidth(12));
make.leading.mas_equalTo(self.backView).offset(kGetScaleWidth(12));
make.top.mas_equalTo(self.backView).offset(kGetScaleWidth(10));
make.height.mas_equalTo(kGetScaleWidth(17));
}];
// [self.starView mas_makeConstraints:^(MASConstraintMaker *make) {
// make.left.height.equalTo(self.titleLabel);
// make.leading.height.equalTo(self.titleLabel);
// make.top.equalTo(self.titleLabel.mas_bottom).mas_offset(kGetScaleWidth(12));
//
// }];
@@ -103,31 +103,31 @@
// make.height.mas_equalTo(18);
// make.width.mas_equalTo(46);
// make.centerY.equalTo(self.starView);
// make.left.equalTo(self.starView.mas_right).mas_offset(kGetScaleWidth(10));
// make.leading.equalTo(self.starView.mas_trailing).mas_offset(kGetScaleWidth(10));
// }];
[self.birthdayHeadView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.height.equalTo(self.titleLabel);
make.leading.height.equalTo(self.titleLabel);
make.top.equalTo(self.titleLabel.mas_bottom).mas_offset(kGetScaleWidth(12));
}];
[self.birthdayView mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerY.equalTo(self.birthdayHeadView);
make.left.equalTo(self.birthdayHeadView.mas_right).mas_offset(kGetScaleWidth(10));
make.leading.equalTo(self.birthdayHeadView.mas_trailing).mas_offset(kGetScaleWidth(10));
}];
[self.areaHeadView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.height.equalTo(self.titleLabel);
make.leading.height.equalTo(self.titleLabel);
make.top.mas_equalTo(kGetScaleWidth(62));
}];
[self.areaView mas_makeConstraints:^(MASConstraintMaker *make) {
make.height.centerY.equalTo(self.areaHeadView);
make.left.equalTo(self.birthdayView);
make.leading.equalTo(self.birthdayView);
}];
[self.areaMornBnt mas_makeConstraints:^(MASConstraintMaker *make) {
make.width.mas_equalTo(kGetScaleWidth(25));
make.height.mas_equalTo(kGetScaleWidth(17));
make.left.equalTo(self.areaView.mas_right).mas_offset(kGetScaleWidth(8));
make.leading.equalTo(self.areaView.mas_trailing).mas_offset(kGetScaleWidth(8));
make.centerY.equalTo(self.areaView);
}];
@@ -135,35 +135,35 @@
[self.areaIconView mas_makeConstraints:^(MASConstraintMaker *make) {
make.width.height.mas_equalTo(kGetScaleWidth(20));
make.centerY.equalTo(self.areaView);
make.left.equalTo(self.areaMornBnt.mas_right);
make.leading.equalTo(self.areaMornBnt.mas_trailing);
}];
[self.roomHeadView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.height.equalTo(self.titleLabel);
make.leading.height.equalTo(self.titleLabel);
make.top.mas_equalTo(kGetScaleWidth(84));
}];
[self.roomView mas_makeConstraints:^(MASConstraintMaker *make) {
make.height.centerY.equalTo(self.roomHeadView);
make.left.equalTo(self.birthdayView);
make.leading.equalTo(self.birthdayView);
}];
[self.roomIconView mas_makeConstraints:^(MASConstraintMaker *make) {
make.width.height.mas_equalTo(kGetScaleWidth(20));
make.centerY.equalTo(self.roomHeadView);
make.left.equalTo(self.roomView.mas_right);
make.leading.equalTo(self.roomView.mas_trailing);
}];
[self.clanHeadView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.height.equalTo(self.titleLabel);
make.leading.height.equalTo(self.titleLabel);
make.top.mas_equalTo(kGetScaleWidth(108));
}];
[self.clanView mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerY.equalTo(self.clanHeadView);
make.left.equalTo(self.birthdayView);
make.leading.equalTo(self.birthdayView);
}];
[self.clanIconView mas_makeConstraints:^(MASConstraintMaker *make) {
make.width.height.mas_equalTo(kGetScaleWidth(20));
make.centerY.equalTo(self.clanHeadView);
make.left.equalTo(self.clanView.mas_right);
make.leading.equalTo(self.clanView.mas_trailing);
}];
}

2
YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineDataGiftCollectionViewCell.m
View File

@@ -65,7 +65,7 @@
make.height.mas_equalTo(kGetScaleWidth(14));
}];
[self.levelImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.top.mas_equalTo(kGetScaleWidth(3));
make.leading.top.mas_equalTo(kGetScaleWidth(3));
make.width.height.mas_equalTo(kGetScaleWidth(19));
}];
}

8
YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineDataGiftTableViewCell.m
View File

@@ -61,20 +61,20 @@
- (void)initSubViewConstraints {
[self.backImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.mas_equalTo(self.contentView).inset(15);
make.leading.trailing.mas_equalTo(self.contentView).inset(15);
make.top.mas_equalTo(self.contentView);
make.bottom.mas_equalTo(self.contentView).offset(-15);
}];
// [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
// make.left.mas_equalTo(self.backImageView).offset(12);
// make.leading.mas_equalTo(self.backImageView).offset(12);
// make.top.mas_equalTo(self.backImageView).offset(12);
// }];
//
[self.arrowButton mas_makeConstraints:^(MASConstraintMaker *make) {
make.size.mas_equalTo(CGSizeMake(13, 22));
make.centerY.equalTo(self.titleView);
make.right.mas_equalTo(self.backImageView).offset(-15);
make.trailing.mas_equalTo(self.backImageView).offset(-15);
}];
[self.titleView mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -85,7 +85,7 @@
}];
[self.pi_containerView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.bottom.mas_equalTo(self.backImageView);
make.leading.trailing.bottom.mas_equalTo(self.backImageView);
make.top.mas_equalTo(self.titleView.mas_bottom).offset(kGetScaleWidth(20));
}];

2
YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineUserInfoAlbumCollectionViewCell.m
View File

@@ -51,7 +51,7 @@
[self.deleteButton mas_makeConstraints:^(MASConstraintMaker *make) {
make.size.mas_equalTo(CGSizeMake(25, 25));
make.top.right.mas_equalTo(self.contentView).inset(0);
make.top.trailing.mas_equalTo(self.contentView).inset(0);
}];
}

2
YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineUserInfoEditMainTagView.m
View File

@@ -31,7 +31,7 @@
XPMineUserInfoEditTagView *tagView = [[XPMineUserInfoEditTagView alloc]initWithFrame:CGRectZero];
[self addSubview:tagView];
[tagView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(x);
make.leading.mas_equalTo(x);
make.centerY.equalTo(self);
make.height.mas_equalTo(kGetScaleWidth(18));
make.width.mas_equalTo(model.width);

16
YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineUserInfoEditTableViewCell.m
View File

@@ -109,24 +109,24 @@
[self.stackView mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.mas_equalTo(self.contentView);
make.bottom.mas_equalTo(self.partLineView.mas_top);
make.left.right.mas_equalTo(self.contentView).inset(kGetScaleWidth(16));
make.leading.trailing.mas_equalTo(self.contentView).inset(kGetScaleWidth(16));
}];
[self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.width.mas_equalTo(kGetScaleWidth(65));
}];
[self.subTitleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.right.equalTo(self.arrowImageView.mas_left).mas_offset(-kGetScaleWidth(2));
make.trailing.equalTo(self.arrowImageView.mas_leading).mas_offset(-kGetScaleWidth(2));
}];
[self.partLineView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.mas_equalTo(self.contentView).inset(kGetScaleWidth(16));
make.leading.trailing.mas_equalTo(self.contentView).inset(kGetScaleWidth(16));
make.bottom.mas_equalTo(self.contentView);
make.height.mas_equalTo(kGetScaleWidth(0.5));
}];
[self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.size.mas_equalTo(CGSizeMake(kGetScaleWidth(50), kGetScaleWidth(50)));
make.right.equalTo(self.arrowImageView.mas_left).mas_offset(-kGetScaleWidth(2));
make.trailing.equalTo(self.arrowImageView.mas_leading).mas_offset(-kGetScaleWidth(2));
}];
[self.arrowImageView mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -135,11 +135,11 @@
[self.soundView mas_makeConstraints:^(MASConstraintMaker *make) {
make.width.mas_equalTo(kGetScaleWidth(85));
make.height.mas_equalTo(kGetScaleWidth(28));
make.right.equalTo(self.arrowImageView.mas_left).mas_offset(-kGetScaleWidth(2));
make.trailing.equalTo(self.arrowImageView.mas_leading).mas_offset(-kGetScaleWidth(2));
}];
[self.soundTimeView mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerY.equalTo(self.soundView);
make.left.mas_equalTo(kGetScaleWidth(44));
make.leading.mas_equalTo(kGetScaleWidth(44));
}];
[self.firstPhotoImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.width.height.mas_equalTo(kGetScaleWidth(40));
@@ -153,13 +153,13 @@
make.width.height.mas_equalTo(self.firstPhotoImageView);
}];
[self.reviewView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.bottom.equalTo(self.avatarImageView);
make.leading.trailing.bottom.equalTo(self.avatarImageView);
make.height.mas_equalTo(kGetScaleWidth(15));
}];
[self.editTagView mas_makeConstraints:^(MASConstraintMaker *make) {
make.width.mas_equalTo(kGetScaleWidth(220));
make.right.equalTo(self.arrowImageView.mas_left).mas_offset(kGetScaleWidth(3));
make.trailing.equalTo(self.arrowImageView.mas_leading).mas_offset(kGetScaleWidth(3));
make.centerY.equalTo(self.contentView);
make.height.mas_equalTo(kGetScaleWidth(18));
}];

2
YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineUserInfoEmptyCollectionViewCell.m
View File

@@ -44,7 +44,7 @@
[self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.mas_equalTo(self.emptyImageView.mas_bottom).offset(20);
make.left.right.mas_equalTo(self.contentView);
make.leading.trailing.mas_equalTo(self.contentView);
}];
}
#pragma mark - Getters And Setters

4
YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineUserInfoGiftWallCollectionViewCell.m
View File

@@ -70,10 +70,10 @@
[self.priceView mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerX.equalTo(self.bgView);
make.top.equalTo(self.giftNumberLabel.mas_bottom).mas_offset(kGetScaleWidth(5));
make.left.right.equalTo(self.bgView).inset(kGetScaleWidth(0));
make.leading.trailing.equalTo(self.bgView).inset(kGetScaleWidth(0));
}];
[self.levelImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.top.mas_equalTo(kGetScaleWidth(3));
make.leading.top.mas_equalTo(kGetScaleWidth(3));
make.width.height.mas_equalTo(kGetScaleWidth(19));
}];
}

10
YuMi/Modules/YMMine/View/Cell/Recharge/XPMineRechargeTableViewCell.m
View File

@@ -54,7 +54,7 @@
- (void)initSubViewConstraints {
[self.backView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.mas_equalTo(self.contentView).inset(15);
make.leading.trailing.mas_equalTo(self.contentView).inset(15);
make.top.mas_equalTo(self.contentView).offset(15);
make.bottom.mas_equalTo(self.contentView);
}];
@@ -62,23 +62,23 @@
[self.coinImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.size.mas_equalTo(CGSizeMake(21, 21));
make.centerY.mas_equalTo(self.backView);
make.left.mas_equalTo(self.backView).offset(19);
make.leading.mas_equalTo(self.backView).offset(19);
}];
[self.numberLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerY.mas_equalTo(self.coinImageView);
make.left.mas_equalTo(self.coinImageView.mas_right).offset(6);
make.leading.mas_equalTo(self.coinImageView.mas_trailing).offset(6);
}];
[self.unitLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.bottom.mas_equalTo(self.numberLabel);
make.left.mas_equalTo(self.numberLabel.mas_right).offset(6);
make.leading.mas_equalTo(self.numberLabel.mas_trailing).offset(6);
}];
[self.rechargeButton mas_makeConstraints:^(MASConstraintMaker *make) {
make.size.mas_equalTo(CGSizeMake(54, 24));
make.centerY.mas_equalTo(self.backView);
make.right.mas_equalTo(self.backView).offset(-15);
make.trailing.mas_equalTo(self.backView).offset(-15);
}];
}
#pragma mark - Getters And Setters

2
YuMi/Modules/YMMine/View/Cell/Visitor/XPMineVisitorEmptyTableViewCell.m
View File

@@ -45,7 +45,7 @@
[self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.mas_equalTo(self.emptyImageView.mas_bottom).offset(20);
make.left.right.mas_equalTo(self.contentView);
make.leading.trailing.mas_equalTo(self.contentView);
}];
}
#pragma mark - Getters And Setters

30
YuMi/Modules/YMMine/View/Cell/Visitor/XPMineVisitorTableViewCell.m
View File

@@ -86,49 +86,49 @@
- (void)setUpConstraints {
[self.bgView mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.mas_equalTo(0);
make.right.mas_equalTo(-15);
make.left.mas_equalTo(15);
make.trailing.mas_equalTo(-15);
make.leading.mas_equalTo(15);
make.height.mas_equalTo(70);
make.bottom.mas_equalTo(0);
}];
[self.avaterImgView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(15);
make.leading.mas_equalTo(15);
make.width.height.mas_equalTo(40);
make.centerY.mas_equalTo(self.bgView.mas_centerY);
}];
[self.nickLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(self.avaterImgView.mas_right).mas_offset(10);
make.leading.mas_equalTo(self.avaterImgView.mas_trailing).mas_offset(10);
make.bottom.mas_equalTo(self.avaterImgView.mas_centerY).mas_offset(-4);
}];
[self.genderImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerY.mas_equalTo(self.nickLabel.mas_centerY);
make.height.mas_equalTo(14);
make.width.mas_equalTo(28);
make.left.mas_equalTo(self.nickLabel.mas_right).mas_offset(5);
make.right.mas_lessThanOrEqualTo(self.tagPic.mas_left).mas_offset(-5);
make.leading.mas_equalTo(self.nickLabel.mas_trailing).mas_offset(5);
make.trailing.mas_lessThanOrEqualTo(self.tagPic.mas_leading).mas_offset(-5);
}];
[self.tagPic mas_makeConstraints:^(MASConstraintMaker *make) {
make.bottom.mas_equalTo(self.timeLabel.mas_top).mas_offset((-1));
make.right.mas_equalTo(-15);
make.trailing.mas_equalTo(-15);
make.width.height.mas_equalTo(22);
}];
[self.memberIdLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.mas_equalTo(self.avaterImgView.mas_centerY).mas_offset(4);
make.left.mas_equalTo(self.nickLabel);
make.leading.mas_equalTo(self.nickLabel);
}];
[self.timeLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.right.mas_equalTo(-15);
make.trailing.mas_equalTo(-15);
make.centerY.mas_equalTo(self.memberIdLabel.mas_centerY);
make.height.mas_equalTo(11);
}];
[self.lineView mas_makeConstraints:^(MASConstraintMaker *make) {
make.bottom.mas_equalTo(0);
make.left.mas_equalTo(self.avaterImgView);
make.right.mas_equalTo(-15);
make.leading.mas_equalTo(self.avaterImgView);
make.trailing.mas_equalTo(-15);
make.height.mas_equalTo(0.5);
}];
}
@@ -137,16 +137,16 @@
if (self.isFirstItem) {
[self.bgView mas_updateConstraints:^(MASConstraintMaker *make) {
make.top.mas_equalTo(10);
make.right.mas_equalTo(-15);
make.left.mas_equalTo(15);
make.trailing.mas_equalTo(-15);
make.leading.mas_equalTo(15);
make.height.mas_equalTo(70);
make.bottom.mas_equalTo(0);
}];
} else {
[self.bgView mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.mas_equalTo(0);
make.right.mas_equalTo(-15);
make.left.mas_equalTo(15);
make.trailing.mas_equalTo(-15);
make.leading.mas_equalTo(15);
make.height.mas_equalTo(70);
make.bottom.mas_equalTo(0);
}];

6
YuMi/Modules/YMMine/View/Cell/XPMineBlackListTableViewCell.m
View File

@@ -42,12 +42,12 @@
[self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.size.mas_equalTo(CGSizeMake(40, 40));
make.centerY.mas_equalTo(self.contentView);
make.left.mas_equalTo(self.contentView).offset(15);
make.leading.mas_equalTo(self.contentView).offset(15);
}];
[self.nickLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(self.avatarImageView.mas_right).offset(10);
make.right.mas_lessThanOrEqualTo(self.contentView).offset(-5);
make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(10);
make.trailing.mas_lessThanOrEqualTo(self.contentView).offset(-5);
make.centerY.mas_equalTo(self.contentView);
}];
}

10
YuMi/Modules/YMMine/View/Cell/XPMineGameTableViewCell.m
View File

@@ -48,20 +48,20 @@
- (void)initSubViewConstraints {
[self.mainView mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.bottom.mas_equalTo(0);
make.left.right.mas_equalTo(self.contentView).inset(15);
make.leading.trailing.mas_equalTo(self.contentView).inset(15);
}];
[self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.left.mas_equalTo(12);
make.top.leading.mas_equalTo(12);
make.height.mas_equalTo(18);
}];
[self.titleBgView mas_makeConstraints:^(MASConstraintMaker *make) {
make.right.mas_equalTo(self.titleLabel);
make.trailing.mas_equalTo(self.titleLabel);
make.bottom.mas_equalTo(self.titleLabel).mas_offset(1);
make.size.mas_equalTo(CGSizeMake(41, 10));
}];
[self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.mas_equalTo(self.titleLabel.mas_bottom).mas_offset(14);
make.left.right.mas_equalTo(0);
make.leading.trailing.mas_equalTo(0);
make.height.mas_equalTo(63);
}];
}
@@ -120,7 +120,7 @@
}];
[self.sliderView mas_makeConstraints:^(MASConstraintMaker *make) {
make.size.mas_equalTo(CGSizeMake(12, 4));
make.top.left.bottom.mas_equalTo(self.slideBackView);
make.top.leading.bottom.mas_equalTo(self.slideBackView);
}];
} else {
[self.sliderView removeFromSuperview];

2
YuMi/Modules/YMMine/View/Cell/XPMineHeadItemCollectionViewCell.m
View File

@@ -52,7 +52,7 @@
[self.badgeImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.mas_equalTo(self.contentView);
make.size.mas_equalTo(CGSizeMake(24, 10));
make.centerX.mas_equalTo(self.logoImageView.mas_right);
make.centerX.mas_equalTo(self.logoImageView.mas_trailing);
}];
[self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {

6
YuMi/Modules/YMMine/View/Cell/XPMineHeadItemTableViewCell.m
View File

@@ -45,12 +45,12 @@
- (void)initSubViewConstraints {
[self.mainView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.mas_equalTo(self.contentView).inset(15);
make.leading.trailing.mas_equalTo(self.contentView).inset(15);
make.top.bottom.mas_equalTo(self.contentView);
}];
[self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.mas_equalTo(14);
make.left.right.mas_equalTo(self.mainView);
make.leading.trailing.mas_equalTo(self.mainView);
make.height.mas_equalTo(77+32+17+6);
}];
}
@@ -109,7 +109,7 @@
}];
[self.sliderView mas_makeConstraints:^(MASConstraintMaker *make) {
make.size.mas_equalTo(CGSizeMake(12, 4));
make.top.left.bottom.mas_equalTo(self.slideBackView);
make.top.leading.bottom.mas_equalTo(self.slideBackView);
}];
} else {
[self.sliderView removeFromSuperview];

16
YuMi/Modules/YMMine/View/Cell/XPMineListCell.m
View File

@@ -45,37 +45,37 @@
}
- (void)initSubViewConstraints {
[self.bgView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(15);
make.right.mas_equalTo(-15);
make.leading.mas_equalTo(15);
make.trailing.mas_equalTo(-15);
make.top.bottom.equalTo(self.contentView);
}];
[self.iconView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(11);
make.leading.mas_equalTo(11);
make.width.height.mas_equalTo(25);
make.centerY.equalTo(self.bgView);
}];
[self.badgeImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.bottom.mas_equalTo(self.iconView.mas_top);
make.size.mas_equalTo(CGSizeMake(24, 10));
make.left.mas_equalTo(self.iconView.mas_centerX);
make.leading.mas_equalTo(self.iconView.mas_centerX);
}];
[self.titleVeiw mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(42);
make.leading.mas_equalTo(42);
make.centerY.equalTo(self.bgView);
}];
[self.arrowView mas_makeConstraints:^(MASConstraintMaker *make) {
make.width.mas_offset(20);
make.height.mas_offset(20);
make.centerY.equalTo(self.bgView);
make.right.mas_equalTo(-15);
make.trailing.mas_equalTo(-15);
}];
[self.lineView mas_makeConstraints:^(MASConstraintMaker *make) {
make.height.mas_equalTo(0.5);
make.bottom.equalTo(self.bgView);
make.left.mas_equalTo(15);
make.right.mas_equalTo(-15);
make.leading.mas_equalTo(15);
make.trailing.mas_equalTo(-15);
}];

Some files were not shown because too many files have changed in this diff Show More