iOS Team / ScioLive · Commits

Commit 4ae87dc4ad6c5a47303e1c9edacfd8e1518e1f55

Authored by 张旭
2 parents 4f69aa16 69efca88

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

Inline Side-by-side
Showing 4 changed files with 9 additions and 8 deletions
CNLiveScioLive.xcodeproj/project.pbxproj
  View file @4ae87dc
... ... @@ -3600,7 +3600,7 @@
3600 3600 CODE_SIGN_ENTITLEMENTS = CNLiveScioLive/CNLiveScioLive.entitlements;
3601 3601 CODE_SIGN_IDENTITY = "Apple Development";
3602 3602 CODE_SIGN_STYLE = Automatic;
3603   - CURRENT_PROJECT_VERSION = 374;
  3603 + CURRENT_PROJECT_VERSION = 375;
3604 3604 DEVELOPMENT_TEAM = 94X49GG3ZW;
3605 3605 ENABLE_BITCODE = NO;
3606 3606 FRAMEWORK_SEARCH_PATHS = (
... ... @@ -3635,7 +3635,7 @@
3635 3635 "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/ShareSDK/ShareSDK/Support/PlatformSDK/SinaWeiboSDK",
3636 3636 "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/ShareSDK/ShareSDK/Support/PlatformSDK/WeChatSDK",
3637 3637 );
3638   - MARKETING_VERSION = 3.6.0;
  3638 + MARKETING_VERSION = 3.6.1;
3639 3639 PRODUCT_BUNDLE_IDENTIFIER = cn.gov.scio.live1;
3640 3640 PRODUCT_NAME = "$(TARGET_NAME)";
3641 3641 PROVISIONING_PROFILE_SPECIFIER = "";
... ... @@ -3653,7 +3653,7 @@
3653 3653 CODE_SIGN_ENTITLEMENTS = CNLiveScioLive/CNLiveScioLive.entitlements;
3654 3654 CODE_SIGN_IDENTITY = "Apple Development";
3655 3655 CODE_SIGN_STYLE = Automatic;
3656   - CURRENT_PROJECT_VERSION = 374;
  3656 + CURRENT_PROJECT_VERSION = 375;
3657 3657 DEVELOPMENT_TEAM = 94X49GG3ZW;
3658 3658 ENABLE_BITCODE = NO;
3659 3659 FRAMEWORK_SEARCH_PATHS = (
... ... @@ -3688,7 +3688,7 @@
3688 3688 "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/ShareSDK/ShareSDK/Support/PlatformSDK/SinaWeiboSDK",
3689 3689 "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/ShareSDK/ShareSDK/Support/PlatformSDK/WeChatSDK",
3690 3690 );
3691   - MARKETING_VERSION = 3.6.0;
  3691 + MARKETING_VERSION = 3.6.1;
3692 3692 PRODUCT_BUNDLE_IDENTIFIER = cn.gov.scio.live1;
3693 3693 PRODUCT_NAME = "$(TARGET_NAME)";
3694 3694 PROVISIONING_PROFILE_SPECIFIER = "";
... ...
CNLiveScioLive/Pages/Home/外宣要闻/Controller/CNLiveHeraldedNewsViewController.m
  View file @4ae87dc
... ... @@ -379,7 +379,6 @@ static NSString *newsUpPicTableViewCell = @"CNLiveNewsUpPicTableViewCell";
379 379 _tableView.estimatedSectionHeaderHeight = 0;
380 380 _tableView.estimatedSectionFooterHeight = 0;
381 381  
382   -
383 382 [_tableView registerClass:[CNLiveNewsLeftPicTableViewCell class] forCellReuseIdentifier:newsLeftPicTableViewCell];
384 383 [_tableView registerClass:[CNLiveNewsNoPicTableViewCell class] forCellReuseIdentifier:newsNoPicTableViewCell];
385 384 [_tableView registerClass:[CNLiveNewsUpPicTableViewCell class] forCellReuseIdentifier:newsUpPicTableViewCell];
... ...
CNLiveScioLive/Pages/Tools/ZXVideoPlayer/Classes/ZXVideoPlayerControlView.m
  View file @4ae87dc
... ... @@ -127,6 +127,8 @@ static const CGFloat kVideoControlBarAutoFadeOutTimeInterval = 5.0;
127 127  
128 128 self.anchorLabel.center = self.center;
129 129 self.retryButton.center = self.center;
  130 +
  131 + self.shareButton.frame = CGRectMake(CGRectGetWidth(self.bounds)-40, 20, 30, 30);
130 132 }
131 133  
132 134 - (void)didMoveToSuperview
... ... @@ -360,7 +362,7 @@ static const CGFloat kVideoControlBarAutoFadeOutTimeInterval = 5.0;
360 362 _titleLabel = [[UILabel alloc] init];
361 363 _titleLabel.lineBreakMode = NSLineBreakByTruncatingTail;
362 364 _titleLabel.textColor = [UIColor whiteColor];
363   - _titleLabel.textAlignment = NSTextAlignmentCenter;
  365 +// _titleLabel.textAlignment = NSTextAlignmentCenter;
364 366 }
365 367 return _titleLabel;
366 368 }
... ... @@ -369,7 +371,7 @@ static const CGFloat kVideoControlBarAutoFadeOutTimeInterval = 5.0;
369 371 if (!_anchorLabel) {
370 372 _anchorLabel = [[UILabel alloc] init];
371 373 _anchorLabel.textColor = [UIColor whiteColor];
372   - _anchorLabel.textAlignment = NSTextAlignmentCenter;
  374 +// _anchorLabel.textAlignment = NSTextAlignmentCenter;
373 375 _anchorLabel.layer.borderColor = [UIColor whiteColor].CGColor;
374 376 _anchorLabel.font = [UIFont systemFontOfSize:15];
375 377 }
... ...
... ... @@ -23,7 +23,7 @@ target 'CNLiveScioLive' do
23 23 pod 'MJExtension'
24 24 pod 'IQKeyboardManager'
25 25 pod 'SVProgressHUD'
26   - pod 'MBProgressHUD', '~> 1.1.0'
  26 + pod 'MBProgressHUD'
27 27 pod 'TYAttributedLabel', '~> 2.6.2'
28 28 pod 'FMDB'
29 29 pod 'AvoidCrash', '~> 2.5.2'
... ...