iOS Team / ScioLive · Commits

Commit 8bb4dfa09288aa0155e6e555759a8b1a49be0543

Authored by zhangxiaowen
1 parent cfbe931c

no message

Inline Side-by-side
Showing 4 changed files with 18 additions and 11 deletions
CNLiveScioLive/Pages/Base/CNLiveBaseViewController.m
  View file @8bb4dfa
@@ -24,7 +24,7 @@ @@ -24,7 +24,7 @@
24 NSNumber *orientationTarget = [NSNumber numberWithInt:UIInterfaceOrientationMaskPortrait]; 24 NSNumber *orientationTarget = [NSNumber numberWithInt:UIInterfaceOrientationMaskPortrait];
25 [[UIDevice currentDevice] setValue:orientationTarget forKey:@"orientation"]; 25 [[UIDevice currentDevice] setValue:orientationTarget forKey:@"orientation"];
26 26
27 - [[UIApplication sharedApplication] setStatusBarOrientation:UIInterfaceOrientationPortrait]; 27 +// [[UIApplication sharedApplication] setStatusBarOrientation:UIInterfaceOrientationPortrait];
28 28
29 [self setUpNavigationBar]; 29 [self setUpNavigationBar];
30 self.view.backgroundColor = [UIColor whiteColor]; 30 self.view.backgroundColor = [UIColor whiteColor];
CNLiveScioLive/Pages/Home/外宣要闻/View/CNLiveNewsLeftPicTableViewCell.m
  View file @8bb4dfa
@@ -111,7 +111,7 @@ @@ -111,7 +111,7 @@
111 } 111 }
112 - (void)layoutSubviews{ 112 - (void)layoutSubviews{
113 [super layoutSubviews]; 113 [super layoutSubviews];
114 - [_backgroundImage mas_updateConstraints:^(MASConstraintMaker *make) { 114 + [_backgroundImage mas_remakeConstraints:^(MASConstraintMaker *make) {
115 make.left.equalTo(self.mas_left).with.offset(10); 115 make.left.equalTo(self.mas_left).with.offset(10);
116 make.right.equalTo(self.mas_right).with.offset(-10); 116 make.right.equalTo(self.mas_right).with.offset(-10);
117 make.top.equalTo(self.mas_top).with.offset(5); 117 make.top.equalTo(self.mas_top).with.offset(5);
@@ -119,34 +119,34 @@ @@ -119,34 +119,34 @@
119 119
120 }]; 120 }];
121 121
122 - [_picImage mas_updateConstraints:^(MASConstraintMaker *make) { 122 + [_picImage mas_remakeConstraints:^(MASConstraintMaker *make) {
123 make.left.equalTo(self->_backgroundImage.mas_left).with.offset(5); 123 make.left.equalTo(self->_backgroundImage.mas_left).with.offset(5);
124 make.top.equalTo(self->_backgroundImage.mas_top).with.offset(5); 124 make.top.equalTo(self->_backgroundImage.mas_top).with.offset(5);
125 make.width.offset(80*MainScale*16.0/9.0); 125 make.width.offset(80*MainScale*16.0/9.0);
126 make.height.offset(80*MainScale); 126 make.height.offset(80*MainScale);
127 127
128 }]; 128 }];
129 - [_playImage mas_updateConstraints:^(MASConstraintMaker *make) {  
130 - make.centerX.equalTo(self->_picImage.mas_centerX).with.offset(0);  
131 - make.centerY.equalTo(self->_picImage.mas_centerY).with.offset(0); 129 + [_playImage mas_remakeConstraints:^(MASConstraintMaker *make) {
  130 + make.centerX.equalTo(self->_picImage.mas_centerX);
  131 + make.centerY.equalTo(self->_picImage.mas_centerY);
132 make.width.height.offset(30*MainScale); 132 make.width.height.offset(30*MainScale);
133 133
134 }]; 134 }];
135 135
136 - [_titleLabel mas_updateConstraints:^(MASConstraintMaker *make) { 136 + [_titleLabel mas_remakeConstraints:^(MASConstraintMaker *make) {
137 make.left.equalTo(self->_picImage.mas_right).with.offset(5); 137 make.left.equalTo(self->_picImage.mas_right).with.offset(5);
138 make.top.equalTo(self->_backgroundImage.mas_top).with.offset(5); 138 make.top.equalTo(self->_backgroundImage.mas_top).with.offset(5);
139 make.right.equalTo(self->_backgroundImage.mas_right).with.offset(-5); 139 make.right.equalTo(self->_backgroundImage.mas_right).with.offset(-5);
140 140
141 }]; 141 }];
142 142
143 - [_timeLabel mas_updateConstraints:^(MASConstraintMaker *make) { 143 + [_timeLabel mas_remakeConstraints:^(MASConstraintMaker *make) {
144 make.left.equalTo(self->_picImage.mas_right).with.offset(5); 144 make.left.equalTo(self->_picImage.mas_right).with.offset(5);
145 make.right.equalTo(self->_backgroundImage.mas_right).with.offset(-5); 145 make.right.equalTo(self->_backgroundImage.mas_right).with.offset(-5);
146 make.bottom.equalTo(self->_backgroundImage.mas_bottom).with.offset(-5); 146 make.bottom.equalTo(self->_backgroundImage.mas_bottom).with.offset(-5);
147 }]; 147 }];
148 148
149 - [_projectLabel mas_updateConstraints:^(MASConstraintMaker *make) { 149 + [_projectLabel mas_remakeConstraints:^(MASConstraintMaker *make) {
150 make.right.equalTo(self->_backgroundImage.mas_right).with.offset(-10); 150 make.right.equalTo(self->_backgroundImage.mas_right).with.offset(-10);
151 make.bottom.equalTo(self->_backgroundImage.mas_bottom).with.offset(-5); 151 make.bottom.equalTo(self->_backgroundImage.mas_bottom).with.offset(-5);
152 }]; 152 }];
CNLiveScioLive/Pages/Home/新闻详情/OldController/BaseViewController.m
  View file @8bb4dfa
@@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
14 NSNumber *orientationTarget = [NSNumber numberWithInt:UIInterfaceOrientationMaskPortrait]; 14 NSNumber *orientationTarget = [NSNumber numberWithInt:UIInterfaceOrientationMaskPortrait];
15 [[UIDevice currentDevice] setValue:orientationTarget forKey:@"orientation"]; 15 [[UIDevice currentDevice] setValue:orientationTarget forKey:@"orientation"];
16 16
17 - [[UIApplication sharedApplication] setStatusBarOrientation:UIInterfaceOrientationPortrait]; 17 +// [[UIApplication sharedApplication] setStatusBarOrientation:UIInterfaceOrientationPortrait];
18 } 18 }
19 19
20 - (BOOL)shouldAutorotate { 20 - (BOOL)shouldAutorotate {
CNLiveScioLive/Pages/Login/View/CNLiveLoginInputView.m
  View file @8bb4dfa
@@ -82,7 +82,14 @@ @@ -82,7 +82,14 @@
82 _textField.delegate = self; 82 _textField.delegate = self;
83 _textField.backgroundColor = [UIColor whiteColor]; 83 _textField.backgroundColor = [UIColor whiteColor];
84 _textField.font = [UIFont systemFontOfSize:15]; 84 _textField.font = [UIFont systemFontOfSize:15];
85 - [_textField setValue:HEXCOLOR(0xebebeb) forKeyPath:@"_placeholderLabel.textColor"]; 85 +
  86 + if(@available(iOS 13.0, *)){
  87 +// NSMutableAttributedString *arrStr = [[NSMutableAttributedString alloc]initWithString:_textField.placeholder attributes:@{NSForegroundColorAttributeName:HEXCOLOR(0xebebeb),NSFontAttributeName:[UIFont systemFontOfSize:15]}];
  88 +// _textField.attributedPlaceholder = arrStr;
  89 +
  90 + }else{
  91 + [_textField setValue:HEXCOLOR(0xebebeb) forKeyPath:@"_placeholderLabel.textColor"];
  92 + }
86 [self addSubview:_textField]; 93 [self addSubview:_textField];
87 94
88 _show = [UIButton buttonWithType:UIButtonTypeCustom]; 95 _show = [UIButton buttonWithType:UIButtonTypeCustom];