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

yanglingyu
1 parent d00ab602
Showing 8 changed files with 13 additions and 13 deletions
CNLiveScioLive.xcodeproj/project.pbxproj
CNLiveScioLive/Pages/Home/外宣要闻/View/CNLiveHeraldedNewsTableViewCell.m
CNLiveScioLive/Pages/Home/外宣要闻/View/CNLiveNewsUpPicTableViewCell.m
CNLiveScioLive/Pages/Home/新闻详情/OldController/OldVideoDetailViewController.m
CNLiveScioLive/Pages/Live/Controller/GraphicLiveViewController.m
CNLiveScioLive/Pages/Live/Controller/VideoPlayBackViewController.m
CNLiveScioLive/Pages/Live/View/CNLiveHeaderView.m
CNLiveScioLive/Pages/Live/View/CNLiveTableViewCell.m
@@ -3176,7 +3176,7 @@
 				CODE_SIGN_ENTITLEMENTS = CNLiveScioLive/CNLiveScioLive.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 404;
+				CURRENT_PROJECT_VERSION = 405;
 				DEVELOPMENT_TEAM = 94X49GG3ZW;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -3211,7 +3211,7 @@
 					"$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/ShareSDK/ShareSDK/Support/PlatformSDK/SinaWeiboSDK",
 					"$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/ShareSDK/ShareSDK/Support/PlatformSDK/WeChatSDK",
 				);
-				MARKETING_VERSION = 3.6.7;
+				MARKETING_VERSION = 3.6.9;
 				PRODUCT_BUNDLE_IDENTIFIER = cn.gov.scio.live1;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -3233,7 +3233,7 @@
 				CODE_SIGN_ENTITLEMENTS = CNLiveScioLive/CNLiveScioLive.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 404;
+				CURRENT_PROJECT_VERSION = 405;
 				DEVELOPMENT_TEAM = 94X49GG3ZW;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -3268,7 +3268,7 @@
 					"$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/ShareSDK/ShareSDK/Support/PlatformSDK/SinaWeiboSDK",
 					"$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/ShareSDK/ShareSDK/Support/PlatformSDK/WeChatSDK",
 				);
-				MARKETING_VERSION = 3.6.7;
+				MARKETING_VERSION = 3.6.9;
 				PRODUCT_BUNDLE_IDENTIFIER = cn.gov.scio.live1;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -161,8 +161,7 @@
     [_playImage mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.equalTo(self->_picImage).offset(5);
         make.bottom.equalTo(self->_picImage).offset(-5);
-        make.width.offset(50);
-        make.height.offset(50);
+        make.width.height.offset(30*MainScale);
     }];
@@ -125,8 +125,7 @@
         [_playImage mas_updateConstraints:^(MASConstraintMaker *make) {
             make.left.equalTo(self->_picImage).offset(5);
             make.bottom.equalTo(self->_picImage).offset(-5);
-            make.width.offset(50);
-            make.height.offset(50);
+            make.width.height.offset(30*MainScale);
         }];
@@ -274,7 +274,7 @@
         [self.view addSubview:bgView];
         self.liveController = [[CNLivePlayerController alloc] initWithContentURL:[NSURL URLWithString:self -> url]];
         if (!(nil==bgImg)) {
-            self.liveController.view.contentMode=UIViewContentModeScaleToFill;
+            self.liveController.view.contentMode=UIViewContentModeScaleAspectFill;
                 self.liveController.view.layer.contents = (__bridge id _Nullable)(self->bgImg.CGImage);
         }
         [[AVAudioSession sharedInstance] setActive:YES error:nil];
@@ -184,6 +184,8 @@
 - (void)loadMovieView {
     [[NSUserDefaults standardUserDefaults] setObject:@0 forKey:@"GraphicLive_DidLockScreen"];
     imageView = [[UIImageView alloc] initWithFrame:CGRectMake(0, iPhoneX ? 44 : 0, MainScreenWidth, videoHeight)];
+    imageView.contentMode = UIViewContentModeScaleAspectFill;
+    imageView.clipsToBounds = YES;
     [imageView sd_setImageWithURL:[NSURL URLWithString:_dictionary[@"poster"]] placeholderImage:[UIImage imageNamed:@"cnlive_placeholder"]];
     [self.view addSubview:imageView];
@@ -293,6 +293,8 @@
 - (void)loadMovieView {
     [[NSUserDefaults standardUserDefaults] setObject:@0 forKey:@"GraphicLive_DidLockScreen"];
     imageView = [[UIImageView alloc] initWithFrame:CGRectMake(0, iPhoneX ? 44 : 0, MainScreenWidth, videoHeight)];
+    imageView.contentMode = UIViewContentModeScaleAspectFill;
+    imageView.clipsToBounds = YES;
     [imageView sd_setImageWithURL:[NSURL URLWithString:_dictionary[@"img"]] placeholderImage:[UIImage imageNamed:@"cnlive_placeholder"]];
     [self.view addSubview:imageView];
@@ -136,8 +136,7 @@
     [_playImage mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.equalTo(self->_backgroundImage).offset(5);
         make.bottom.equalTo(self->_backgroundImage).offset(-5);
-        make.width.offset(40);
-        make.height.offset(40);
+        make.width.height.offset(30*MainScale);
     }];
@@ -90,8 +90,7 @@
     [_playImage mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.equalTo(self->_picImage).offset(5);
         make.bottom.equalTo(self->_picImage).offset(-5);
-        make.width.offset(30);
-        make.height.offset(30);
+        make.width.height.offset(30*MainScale);
     }];