iOS Team / ScioLive · Commits

Commit 1a6a37c8d634ca74d903355c424d26b0f3ec66f6

Authored by yanglingyu
1 parent d00ab602

播放器背景图变形，视频播放图标统一等待解决问题解决

Inline Side-by-side
Showing 8 changed files with 13 additions and 13 deletions
CNLiveScioLive.xcodeproj/project.pbxproj
  View file @1a6a37c
... ... @@ -3176,7 +3176,7 @@
3176 3176 CODE_SIGN_ENTITLEMENTS = CNLiveScioLive/CNLiveScioLive.entitlements;
3177 3177 CODE_SIGN_IDENTITY = "Apple Development";
3178 3178 CODE_SIGN_STYLE = Automatic;
3179   - CURRENT_PROJECT_VERSION = 404;
  3179 + CURRENT_PROJECT_VERSION = 405;
3180 3180 DEVELOPMENT_TEAM = 94X49GG3ZW;
3181 3181 ENABLE_BITCODE = NO;
3182 3182 FRAMEWORK_SEARCH_PATHS = (
... ... @@ -3211,7 +3211,7 @@
3211 3211 "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/ShareSDK/ShareSDK/Support/PlatformSDK/SinaWeiboSDK",
3212 3212 "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/ShareSDK/ShareSDK/Support/PlatformSDK/WeChatSDK",
3213 3213 );
3214   - MARKETING_VERSION = 3.6.7;
  3214 + MARKETING_VERSION = 3.6.9;
3215 3215 PRODUCT_BUNDLE_IDENTIFIER = cn.gov.scio.live1;
3216 3216 PRODUCT_NAME = "$(TARGET_NAME)";
3217 3217 PROVISIONING_PROFILE_SPECIFIER = "";
... ... @@ -3233,7 +3233,7 @@
3233 3233 CODE_SIGN_ENTITLEMENTS = CNLiveScioLive/CNLiveScioLive.entitlements;
3234 3234 CODE_SIGN_IDENTITY = "Apple Development";
3235 3235 CODE_SIGN_STYLE = Automatic;
3236   - CURRENT_PROJECT_VERSION = 404;
  3236 + CURRENT_PROJECT_VERSION = 405;
3237 3237 DEVELOPMENT_TEAM = 94X49GG3ZW;
3238 3238 ENABLE_BITCODE = NO;
3239 3239 FRAMEWORK_SEARCH_PATHS = (
... ... @@ -3268,7 +3268,7 @@
3268 3268 "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/ShareSDK/ShareSDK/Support/PlatformSDK/SinaWeiboSDK",
3269 3269 "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/ShareSDK/ShareSDK/Support/PlatformSDK/WeChatSDK",
3270 3270 );
3271   - MARKETING_VERSION = 3.6.7;
  3271 + MARKETING_VERSION = 3.6.9;
3272 3272 PRODUCT_BUNDLE_IDENTIFIER = cn.gov.scio.live1;
3273 3273 PRODUCT_NAME = "$(TARGET_NAME)";
3274 3274 PROVISIONING_PROFILE_SPECIFIER = "";
... ...
CNLiveScioLive/Pages/Home/外宣要闻/View/CNLiveHeraldedNewsTableViewCell.m
  View file @1a6a37c
... ... @@ -161,8 +161,7 @@
161 161 [_playImage mas_makeConstraints:^(MASConstraintMaker *make) {
162 162 make.left.equalTo(self->_picImage).offset(5);
163 163 make.bottom.equalTo(self->_picImage).offset(-5);
164   - make.width.offset(50);
165   - make.height.offset(50);
  164 + make.width.height.offset(30*MainScale);
166 165  
167 166 }];
168 167  
... ...
CNLiveScioLive/Pages/Home/外宣要闻/View/CNLiveNewsUpPicTableViewCell.m
  View file @1a6a37c
... ... @@ -125,8 +125,7 @@
125 125 [_playImage mas_updateConstraints:^(MASConstraintMaker *make) {
126 126 make.left.equalTo(self->_picImage).offset(5);
127 127 make.bottom.equalTo(self->_picImage).offset(-5);
128   - make.width.offset(50);
129   - make.height.offset(50);
  128 + make.width.height.offset(30*MainScale);
130 129  
131 130 }];
132 131  
... ...
CNLiveScioLive/Pages/Home/新闻详情/OldController/OldVideoDetailViewController.m
  View file @1a6a37c
... ... @@ -274,7 +274,7 @@
274 274 [self.view addSubview:bgView];
275 275 self.liveController = [[CNLivePlayerController alloc] initWithContentURL:[NSURL URLWithString:self -> url]];
276 276 if (!(nil==bgImg)) {
277   - self.liveController.view.contentMode=UIViewContentModeScaleToFill;
  277 + self.liveController.view.contentMode=UIViewContentModeScaleAspectFill;
278 278 self.liveController.view.layer.contents = (__bridge id _Nullable)(self->bgImg.CGImage);
279 279 }
280 280 [[AVAudioSession sharedInstance] setActive:YES error:nil];
... ...
CNLiveScioLive/Pages/Live/Controller/GraphicLiveViewController.m
  View file @1a6a37c
... ... @@ -184,6 +184,8 @@
184 184 - (void)loadMovieView {
185 185 [[NSUserDefaults standardUserDefaults] setObject:@0 forKey:@"GraphicLive_DidLockScreen"];
186 186 imageView = [[UIImageView alloc] initWithFrame:CGRectMake(0, iPhoneX ? 44 : 0, MainScreenWidth, videoHeight)];
  187 + imageView.contentMode = UIViewContentModeScaleAspectFill;
  188 + imageView.clipsToBounds = YES;
187 189 [imageView sd_setImageWithURL:[NSURL URLWithString:_dictionary[@"poster"]] placeholderImage:[UIImage imageNamed:@"cnlive_placeholder"]];
188 190 [self.view addSubview:imageView];
189 191  
... ...
CNLiveScioLive/Pages/Live/Controller/VideoPlayBackViewController.m
  View file @1a6a37c
... ... @@ -293,6 +293,8 @@
293 293 - (void)loadMovieView {
294 294 [[NSUserDefaults standardUserDefaults] setObject:@0 forKey:@"GraphicLive_DidLockScreen"];
295 295 imageView = [[UIImageView alloc] initWithFrame:CGRectMake(0, iPhoneX ? 44 : 0, MainScreenWidth, videoHeight)];
  296 + imageView.contentMode = UIViewContentModeScaleAspectFill;
  297 + imageView.clipsToBounds = YES;
296 298 [imageView sd_setImageWithURL:[NSURL URLWithString:_dictionary[@"img"]] placeholderImage:[UIImage imageNamed:@"cnlive_placeholder"]];
297 299 [self.view addSubview:imageView];
298 300  
... ...
CNLiveScioLive/Pages/Live/View/CNLiveHeaderView.m
  View file @1a6a37c
... ... @@ -136,8 +136,7 @@
136 136 [_playImage mas_makeConstraints:^(MASConstraintMaker *make) {
137 137 make.left.equalTo(self->_backgroundImage).offset(5);
138 138 make.bottom.equalTo(self->_backgroundImage).offset(-5);
139   - make.width.offset(40);
140   - make.height.offset(40);
  139 + make.width.height.offset(30*MainScale);
141 140  
142 141 }];
143 142  
... ...
CNLiveScioLive/Pages/Live/View/CNLiveTableViewCell.m
  View file @1a6a37c
... ... @@ -90,8 +90,7 @@
90 90 [_playImage mas_makeConstraints:^(MASConstraintMaker *make) {
91 91 make.left.equalTo(self->_picImage).offset(5);
92 92 make.bottom.equalTo(self->_picImage).offset(-5);
93   - make.width.offset(30);
94   - make.height.offset(30);
  93 + make.width.height.offset(30*MainScale);
95 94  
96 95 }];
97 96  
... ...