|
@@ -25,13 +25,13 @@
|
|
|
{
|
|
|
|
|
|
[self.msgHeaderView mas_remakeConstraints:^(MASConstraintMaker *make) {
|
|
|
- make.right.mas_equalTo(-16);
|
|
|
+ make.right.mas_equalTo(-8);
|
|
|
make.top.mas_equalTo(0);
|
|
|
- make.width.height.mas_equalTo(52);
|
|
|
+ make.width.height.mas_equalTo(48);
|
|
|
}];
|
|
|
|
|
|
[self.mikeLabelBgView mas_makeConstraints:^(MASConstraintMaker *make) {
|
|
|
- make.right.equalTo(self.msgHeaderView.mas_left).offset(-10);
|
|
|
+ make.right.equalTo(self.msgHeaderView.mas_left).offset(-8);
|
|
|
make.left.mas_greaterThanOrEqualTo(16);
|
|
|
make.top.mas_equalTo(6);
|
|
|
make.height.mas_equalTo(46);
|
|
@@ -50,8 +50,8 @@
|
|
|
|
|
|
|
|
|
[self.messageLabelBgView mas_remakeConstraints:^(MASConstraintMaker *make) {
|
|
|
- make.right.equalTo(self.msgHeaderView.mas_left).offset(-10);
|
|
|
- make.left.mas_greaterThanOrEqualTo(16);
|
|
|
+ make.right.equalTo(self.msgHeaderView.mas_left).offset(-8);
|
|
|
+ make.left.mas_greaterThanOrEqualTo(56);
|
|
|
make.top.equalTo(self.mikeLabelBgView.mas_bottom).offset(8);
|
|
|
}];
|
|
|
[self.messageLabel mas_remakeConstraints:^(MASConstraintMaker *make) {
|
|
@@ -131,15 +131,15 @@
|
|
|
|
|
|
}];
|
|
|
[self.messageLabelBgView mas_remakeConstraints:^(MASConstraintMaker *make) {
|
|
|
- make.left.equalTo(self.msgHeaderView.mas_right).offset(10);
|
|
|
- make.right.mas_lessThanOrEqualTo(self).offset(-16);
|
|
|
+ make.left.equalTo(self.msgHeaderView.mas_right).offset(8);
|
|
|
+ make.right.mas_lessThanOrEqualTo(self).offset(-56);
|
|
|
make.top.equalTo(self.mikeLabelBgView.mas_bottom).offset(8);
|
|
|
make.height.mas_lessThanOrEqualTo(0.01);
|
|
|
}];
|
|
|
}else {
|
|
|
[self.messageLabelBgView mas_remakeConstraints:^(MASConstraintMaker *make) {
|
|
|
- make.left.equalTo(self.msgHeaderView.mas_right).offset(10);
|
|
|
- make.right.mas_lessThanOrEqualTo(self).offset(-16);
|
|
|
+ make.left.equalTo(self.msgHeaderView.mas_right).offset(8);
|
|
|
+ make.right.mas_lessThanOrEqualTo(self).offset(-56);
|
|
|
make.top.equalTo(self.mikeLabelBgView.mas_bottom).offset(8);
|
|
|
}];
|
|
|
[self.messageLabel mas_remakeConstraints:^(MASConstraintMaker *make) {
|
|
@@ -166,8 +166,8 @@
|
|
|
// NSLog(@"--%f--%f--%f--%f--%f--%f--%f--%f--%f--%f",log(1),log(2),log(5),log(10),log(20),log(30),log(40),log(50),log(100),mikeLabelWidth);
|
|
|
}
|
|
|
[self.mikeLabelBgView mas_remakeConstraints:^(MASConstraintMaker *make) {
|
|
|
- make.left.equalTo(self.msgHeaderView.mas_right).offset(10);
|
|
|
- make.right.mas_lessThanOrEqualTo(self).offset(-16);
|
|
|
+ make.left.equalTo(self.msgHeaderView.mas_right).offset(8);
|
|
|
+ make.right.mas_lessThanOrEqualTo(self).offset(-56);
|
|
|
make.top.mas_equalTo(topMikeBg);
|
|
|
make.height.mas_equalTo(topHeight);
|
|
|
make.width.mas_equalTo(mikeLabelWidth);
|
|
@@ -176,8 +176,8 @@
|
|
|
{
|
|
|
if (self.msgModel.showTrans && !self.msgModel.showMike) {
|
|
|
[self.msgTransLabelBgView mas_remakeConstraints:^(MASConstraintMaker *make) {
|
|
|
- make.left.equalTo(self.msgHeaderView.mas_right).offset(10);
|
|
|
- make.right.mas_lessThanOrEqualTo(self).offset(-16);
|
|
|
+ make.left.equalTo(self.msgHeaderView.mas_right).offset(8);
|
|
|
+ make.right.mas_lessThanOrEqualTo(self).offset(-56);
|
|
|
make.top.equalTo(self.messageLabelBgView.mas_bottom).offset(8);
|
|
|
}];
|
|
|
[self.msgTransLabel mas_remakeConstraints:^(MASConstraintMaker *make) {
|
|
@@ -189,9 +189,9 @@
|
|
|
}
|
|
|
}
|
|
|
[self.msgHeaderView mas_remakeConstraints:^(MASConstraintMaker *make) {
|
|
|
- make.left.mas_equalTo(16);
|
|
|
+ make.left.mas_equalTo(8);
|
|
|
make.top.mas_equalTo(topTimeHeight);
|
|
|
- make.width.height.mas_equalTo(52);
|
|
|
+ make.width.height.mas_equalTo(48);
|
|
|
}];
|
|
|
}else {
|
|
|
// self.messageLabel.textAlignment = NSTextAlignmentRight;
|
|
@@ -211,17 +211,16 @@
|
|
|
// make.right.bottom.equalTo(self.messageLabelBgView).offset(-10);
|
|
|
}];
|
|
|
[self.messageLabelBgView mas_remakeConstraints:^(MASConstraintMaker *make) {
|
|
|
- make.right.equalTo(self.msgHeaderView.mas_left).offset(-10);
|
|
|
- make.left.mas_greaterThanOrEqualTo(16);
|
|
|
+ make.right.equalTo(self.msgHeaderView.mas_left).offset(-8);
|
|
|
+ make.left.mas_greaterThanOrEqualTo(56);
|
|
|
make.top.equalTo(self.mikeLabelBgView.mas_bottom).offset(8);
|
|
|
make.height.mas_lessThanOrEqualTo(0.01);
|
|
|
}];
|
|
|
|
|
|
}else {
|
|
|
- CGFloat msgLeft = msgModel.sendFailure ? 24 : 16;
|
|
|
[self.messageLabelBgView mas_remakeConstraints:^(MASConstraintMaker *make) {
|
|
|
- make.right.equalTo(self.msgHeaderView.mas_left).offset(-10);
|
|
|
- make.left.mas_greaterThanOrEqualTo(msgLeft);
|
|
|
+ make.right.equalTo(self.msgHeaderView.mas_left).offset(-8);
|
|
|
+ make.left.mas_greaterThanOrEqualTo(56);
|
|
|
make.top.equalTo(self.mikeLabelBgView.mas_bottom).offset(8);
|
|
|
}];
|
|
|
[self.messageLabel mas_remakeConstraints:^(MASConstraintMaker *make) {
|
|
@@ -249,8 +248,8 @@
|
|
|
// NSLog(@"--%f--%f--%f--%f--%f--%f--%f--%f--%f--%f",log(1),log(2),log(5),log(10),log(20),log(30),log(40),log(50),log(100),mikeLabelWidth);
|
|
|
}
|
|
|
[self.mikeLabelBgView mas_remakeConstraints:^(MASConstraintMaker *make) {
|
|
|
- make.right.equalTo(self.msgHeaderView.mas_left).offset(-10);
|
|
|
- make.left.mas_greaterThanOrEqualTo(self).offset(16);
|
|
|
+ make.right.equalTo(self.msgHeaderView.mas_left).offset(-8);
|
|
|
+ make.left.mas_greaterThanOrEqualTo(self).offset(56);
|
|
|
make.top.mas_equalTo(topMikeBg);
|
|
|
make.height.mas_equalTo(topHeight);
|
|
|
make.width.mas_equalTo(mikeLabelWidth);
|
|
@@ -274,9 +273,9 @@
|
|
|
}
|
|
|
{
|
|
|
[self.msgHeaderView mas_remakeConstraints:^(MASConstraintMaker *make) {
|
|
|
- make.right.mas_equalTo(-16);
|
|
|
+ make.right.mas_equalTo(-8);
|
|
|
make.top.mas_equalTo(topTimeHeight);
|
|
|
- make.width.height.mas_equalTo(52);
|
|
|
+ make.width.height.mas_equalTo(48);
|
|
|
}];
|
|
|
}
|
|
|
}
|
|
@@ -476,7 +475,7 @@
|
|
|
if (!_msgHeaderView) {
|
|
|
_msgHeaderView = [[UIImageView alloc] initWithFrame:CGRectZero];
|
|
|
_msgHeaderView.image = ImageName(@"icon_ellipse");
|
|
|
- _msgHeaderView.layer.cornerRadius = 26.0f;
|
|
|
+ _msgHeaderView.layer.cornerRadius = 24.0f;
|
|
|
_msgHeaderView.contentMode = UIViewContentModeScaleAspectFill;
|
|
|
_msgHeaderView.clipsToBounds = YES;
|
|
|
[self.contentView addSubview:_msgHeaderView];
|