Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/ScioLive

张旭
2 parents 4f69aa16 69efca88
Showing 4 changed files with 9 additions and 8 deletions
CNLiveScioLive.xcodeproj/project.pbxproj
CNLiveScioLive/Pages/Home/外宣要闻/Controller/CNLiveHeraldedNewsViewController.m
CNLiveScioLive/Pages/Tools/ZXVideoPlayer/Classes/ZXVideoPlayerControlView.m
Podfile
@@ -3600,7 +3600,7 @@
 				CODE_SIGN_ENTITLEMENTS = CNLiveScioLive/CNLiveScioLive.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 374;
+				CURRENT_PROJECT_VERSION = 375;
 				DEVELOPMENT_TEAM = 94X49GG3ZW;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -3635,7 +3635,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.0;
+				MARKETING_VERSION = 3.6.1;
 				PRODUCT_BUNDLE_IDENTIFIER = cn.gov.scio.live1;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -3653,7 +3653,7 @@
 				CODE_SIGN_ENTITLEMENTS = CNLiveScioLive/CNLiveScioLive.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 374;
+				CURRENT_PROJECT_VERSION = 375;
 				DEVELOPMENT_TEAM = 94X49GG3ZW;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -3688,7 +3688,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.0;
+				MARKETING_VERSION = 3.6.1;
 				PRODUCT_BUNDLE_IDENTIFIER = cn.gov.scio.live1;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -379,7 +379,6 @@ static NSString *newsUpPicTableViewCell = @&quot;CNLiveNewsUpPicTableViewCell&quot;;
         _tableView.estimatedSectionHeaderHeight = 0;
         _tableView.estimatedSectionFooterHeight = 0;
-
         [_tableView registerClass:[CNLiveNewsLeftPicTableViewCell class] forCellReuseIdentifier:newsLeftPicTableViewCell];
         [_tableView registerClass:[CNLiveNewsNoPicTableViewCell class] forCellReuseIdentifier:newsNoPicTableViewCell];
         [_tableView registerClass:[CNLiveNewsUpPicTableViewCell class] forCellReuseIdentifier:newsUpPicTableViewCell];
@@ -127,6 +127,8 @@ static const CGFloat kVideoControlBarAutoFadeOutTimeInterval = 5.0;
     self.anchorLabel.center = self.center;
     self.retryButton.center = self.center;
+    
+    self.shareButton.frame = CGRectMake(CGRectGetWidth(self.bounds)-40, 20, 30, 30);
 }
 - (void)didMoveToSuperview
@@ -360,7 +362,7 @@ static const CGFloat kVideoControlBarAutoFadeOutTimeInterval = 5.0;
         _titleLabel = [[UILabel alloc] init];
         _titleLabel.lineBreakMode = NSLineBreakByTruncatingTail;
         _titleLabel.textColor = [UIColor whiteColor];
-        _titleLabel.textAlignment = NSTextAlignmentCenter;
+//        _titleLabel.textAlignment = NSTextAlignmentCenter;
     }
     return _titleLabel;
 }
@@ -369,7 +371,7 @@ static const CGFloat kVideoControlBarAutoFadeOutTimeInterval = 5.0;
     if (!_anchorLabel) {
         _anchorLabel = [[UILabel alloc] init];
         _anchorLabel.textColor = [UIColor whiteColor];
-        _anchorLabel.textAlignment = NSTextAlignmentCenter;
+//        _anchorLabel.textAlignment = NSTextAlignmentCenter;
         _anchorLabel.layer.borderColor = [UIColor whiteColor].CGColor;
         _anchorLabel.font = [UIFont systemFontOfSize:15];
     }
@@ -23,7 +23,7 @@ target &#39;CNLiveScioLive&#39; do
     pod 'MJExtension'
     pod 'IQKeyboardManager'
     pod 'SVProgressHUD'
-    pod 'MBProgressHUD', '~> 1.1.0'
+    pod 'MBProgressHUD'
     pod 'TYAttributedLabel', '~> 2.6.2'
     pod 'FMDB'
     pod 'AvoidCrash', '~> 2.5.2'