iOS Team / ScioLive · Commits

Commit aaa38dcf99e751c1da0592c8307d9c784210298a

Authored by yanglingyu
1 parent 6274dd9f

更改默认图，播放图标放在左下角

Inline Side-by-side
Showing 8 changed files with 14 additions and 14 deletions
CNLiveScioLive/Assets.xcassets/common/placeholder.imageset/91620976418_.pic_hd.jpg 0 → 100644
View file @aaa38dc

58.3 KB
CNLiveScioLive/Assets.xcassets/common/placeholder.imageset/Contents.json
  View file @aaa38dc
@@ -5,8 +5,8 @@ @@ -5,8 +5,8 @@
5 "scale" : "1x" 5 "scale" : "1x"
6 }, 6 },
7 { 7 {
  8 + "filename" : "91620976418_.pic_hd.jpg",
8 "idiom" : "universal", 9 "idiom" : "universal",
9 - "filename" : "placeholder@2x.png",  
10 "scale" : "2x" 10 "scale" : "2x"
11 }, 11 },
12 { 12 {
@@ -15,7 +15,7 @@ @@ -15,7 +15,7 @@
15 } 15 }
16 ], 16 ],
17 "info" : { 17 "info" : {
18 - "version" : 1,  
19 - "author" : "xcode" 18 + "author" : "xcode",
  19 + "version" : 1
20 } 20 }
21 -}  
22 \ No newline at end of file 21 \ No newline at end of file
  22 +}
CNLiveScioLive/Assets.xcassets/common/placeholder.imageset/placeholder@2x.png deleted 100644 → 0
View file @6274dd9

8.35 KB
CNLiveScioLive/Pages/Home/外宣要闻/View/CNLiveHeraldedNewsTableViewCell.m
  View file @aaa38dc
@@ -159,8 +159,8 @@ @@ -159,8 +159,8 @@
159 }]; 159 }];
160 160
161 [_playImage mas_makeConstraints:^(MASConstraintMaker *make) { 161 [_playImage mas_makeConstraints:^(MASConstraintMaker *make) {
162 - make.centerX.offset(self->_picImage.centerX);  
163 - make.centerY.offset(self->_picImage.centerY-40); 162 + make.left.equalTo(self->_picImage).offset(5);
  163 + make.bottom.equalTo(self->_picImage).offset(-5);
164 make.width.offset(50); 164 make.width.offset(50);
165 make.height.offset(50); 165 make.height.offset(50);
166 166
CNLiveScioLive/Pages/Home/外宣要闻/View/CNLiveNewsLeftPicTableViewCell.m
  View file @aaa38dc
@@ -133,8 +133,8 @@ @@ -133,8 +133,8 @@
133 133
134 }]; 134 }];
135 [_playImage mas_remakeConstraints:^(MASConstraintMaker *make) { 135 [_playImage mas_remakeConstraints:^(MASConstraintMaker *make) {
136 - make.centerX.equalTo(self->_picImage.mas_centerX);  
137 - make.centerY.equalTo(self->_picImage.mas_centerY); 136 + make.left.equalTo(self->_picImage).offset(5);
  137 + make.bottom.equalTo(self->_picImage).offset(-5);
138 make.width.height.offset(30*MainScale); 138 make.width.height.offset(30*MainScale);
139 139
140 }]; 140 }];
CNLiveScioLive/Pages/Home/外宣要闻/View/CNLiveNewsUpPicTableViewCell.m
  View file @aaa38dc
@@ -123,8 +123,8 @@ @@ -123,8 +123,8 @@
123 if ([_model.type isEqualToString:@"program"]) { 123 if ([_model.type isEqualToString:@"program"]) {
124 _playImage.hidden = NO; 124 _playImage.hidden = NO;
125 [_playImage mas_updateConstraints:^(MASConstraintMaker *make) { 125 [_playImage mas_updateConstraints:^(MASConstraintMaker *make) {
126 - make.left.equalTo(self->_backgroundImage.mas_left).with.offset((MainScreenWidth-20-50)/2);  
127 - make.top.equalTo(self->_picImage.mas_top).with.offset((200*MainHScale-50)/2); 126 + make.left.equalTo(self->_picImage).offset(5);
  127 + make.bottom.equalTo(self->_picImage).offset(-5);
128 make.width.offset(50); 128 make.width.offset(50);
129 make.height.offset(50); 129 make.height.offset(50);
130 130
CNLiveScioLive/Pages/Live/View/CNLiveHeaderView.m
  View file @aaa38dc
@@ -135,8 +135,8 @@ @@ -135,8 +135,8 @@
135 }]; 135 }];
136 136
137 [_playImage mas_makeConstraints:^(MASConstraintMaker *make) { 137 [_playImage mas_makeConstraints:^(MASConstraintMaker *make) {
138 - make.centerX.offset(self->_backgroundImage.centerX);  
139 - make.centerY.offset(self->_backgroundImage.centerY); 138 + make.left.equalTo(self->_backgroundImage).offset(5);
  139 + make.bottom.equalTo(self->_backgroundImage).offset(-5);
140 make.width.offset(40); 140 make.width.offset(40);
141 make.height.offset(40); 141 make.height.offset(40);
142 142
CNLiveScioLive/Pages/Live/View/CNLiveTableViewCell.m
  View file @aaa38dc
@@ -88,8 +88,8 @@ @@ -88,8 +88,8 @@
88 }]; 88 }];
89 89
90 [_playImage mas_makeConstraints:^(MASConstraintMaker *make) { 90 [_playImage mas_makeConstraints:^(MASConstraintMaker *make) {
91 - make.left.equalTo(self->_picImage.mas_left).with.offset((80*MainScale*16/9.0-30)/2.0);  
92 - make.centerY.offset(self->_picImage.centerY); 91 + make.left.equalTo(self->_picImage).offset(5);
  92 + make.bottom.equalTo(self->_picImage).offset(-5);
93 make.width.offset(30); 93 make.width.offset(30);
94 make.height.offset(30); 94 make.height.offset(30);
95 95