|
@@ -260,16 +260,29 @@ ShowImageViewDelegate>{
|
|
|
scr_H = SCREEN_W;
|
|
|
}
|
|
|
if ((scr_H - scr_W/w_h_rate - 40.f)/2.f < 0){
|
|
|
- make.height.mas_equalTo(scr_H - 40.f);
|
|
|
- make.width.mas_equalTo((scr_H - 40.f)*w_h_rate);
|
|
|
+ if(fullScreenShow){
|
|
|
+ make.height.mas_equalTo(scr_H);
|
|
|
+ make.width.mas_equalTo(scr_W);
|
|
|
+ }
|
|
|
+ else{
|
|
|
+ make.height.mas_equalTo(scr_H - 40.f);
|
|
|
+ make.width.mas_equalTo((scr_H - 40.f)*w_h_rate);
|
|
|
+ }
|
|
|
+
|
|
|
make.centerX.equalTo(self.mas_centerX);
|
|
|
make.top.mas_equalTo(0);
|
|
|
}
|
|
|
else{
|
|
|
make.left.mas_equalTo(0.f);
|
|
|
- make.height.mas_equalTo(scr_W/w_h_rate);
|
|
|
make.right.mas_equalTo(0.f);
|
|
|
- make.top.mas_equalTo((scr_H - scr_W/w_h_rate - 40.f)/2.f);
|
|
|
+ if(fullScreenShow){
|
|
|
+ make.height.mas_equalTo(scr_H - TABBARHEIGHT);
|
|
|
+ make.top.mas_equalTo(0.f);
|
|
|
+ }
|
|
|
+ else{
|
|
|
+ make.height.mas_equalTo(scr_W/w_h_rate);
|
|
|
+ make.top.mas_equalTo((scr_H - scr_W/w_h_rate - 40.f)/2.f);
|
|
|
+ }
|
|
|
}
|
|
|
}];
|
|
|
|