iOS Team / ScioLive · Commits

Commit 3b7f4785fd7a508daf213484288f76500ca75d7e

Authored by yanglingyu
1 parent 09c19fd8

卡线程操作到辅线程操作，更改图片名字

Inline Side-by-side
Showing 5 changed files with 26 additions and 14 deletions
CNLiveScioLive.xcodeproj/xcshareddata/xcschemes/CNLiveScioLive.xcscheme
  View file @3b7f478
... ... @@ -60,6 +60,13 @@
60 60 ReferencedContainer = "container:CNLiveScioLive.xcodeproj">
61 61 </BuildableReference>
62 62 </BuildableProductRunnable>
  63 + <EnvironmentVariables>
  64 + <EnvironmentVariable
  65 + key = "OS_ACTIVITY_MODE"
  66 + value = "disable"
  67 + isEnabled = "YES">
  68 + </EnvironmentVariable>
  69 + </EnvironmentVariables>
63 70 </LaunchAction>
64 71 <ProfileAction
65 72 buildConfiguration = "Release"
... ...
CNLiveScioLive/Pages/Home/搜索/View/VideoTableViewCell.m
  View file @3b7f478
... ... @@ -53,8 +53,8 @@
53 53 frame.size.width += 10;
54 54 frame.size.height+= 6;
55 55 frame.origin.x = MainScreenWidth - frame.size.width - 22;
56   - frame.origin.y -= 3;
57 56 }
58 57 [_tagsLabel setFrame:frame];
  58 + _tagsLabel.centerY = _timeLabel.centerY;
59 59 }
60 60 @end
... ...
CNLiveScioLive/Pages/Home/新闻详情/OldController/OldArticleDetailViewController.m
  View file @3b7f478
... ... @@ -33,15 +33,18 @@
33 33 _imageArray = [[ NSMutableArray alloc] init];
34 34  
35 35 NSString *url = [NSString stringWithFormat:@"%@?from=ios",dictionary[@"pageUrl"]];
36   - htmlString = [NSString stringWithContentsOfURL:[NSURL URLWithString:url] encoding:NSUTF8StringEncoding error:nil];
37   - //替换掉html页面中的展示js
38   - NSString *replace=[htmlString stringByReplacingOccurrencesOfString:@"previewImage.start(obj);" withString:@""];
39   - htmlString=replace;
40   - htmlUrl=dictionary[@"pageUrl"];
41   - if ([htmlString containsString:@"<video"]) {
42   - isHaveVideo = YES;
43   - [[JGMusicManager shareMusicManager] playStop];
44   - }
  36 + dispatch_async(dispatch_get_global_queue(0, 0), ^{
  37 + self->htmlString = [NSString stringWithContentsOfURL:[NSURL URLWithString:url] encoding:NSUTF8StringEncoding error:nil];
  38 + //替换掉html页面中的展示js
  39 + NSString *replace=[self->htmlString stringByReplacingOccurrencesOfString:@"previewImage.start(obj);" withString:@""];
  40 + self->htmlString=replace;
  41 + self->htmlUrl=dictionary[@"pageUrl"];
  42 + if ([self->htmlString containsString:@"<video"]) {
  43 + self->isHaveVideo = YES;
  44 + [[JGMusicManager shareMusicManager] playStop];
  45 + }
  46 + });
  47 +
45 48 }
46 49 return self;
47 50 }
... ...
CNLiveScioLive/Pages/Home/新闻详情/OldController/OldVideoDetailViewController.m
  View file @3b7f478
... ... @@ -40,7 +40,8 @@
40 40 self->bgImg = [UIImage imageWithData:data];
41 41 dispatch_async(dispatch_get_main_queue(), ^{
42 42 if (self.liveController && self->bgImg) {
43   - self.liveController.view.contentMode=UIViewContentModeScaleToFill;
  43 + self.liveController.view.contentMode=UIViewContentModeScaleAspectFill;
  44 + self.liveController.view.clipsToBounds = YES;
44 45 self.liveController.view.layer.contents = (__bridge id _Nullable) (self->bgImg.CGImage);
45 46  
46 47 }
... ... @@ -274,7 +275,8 @@
274 275 [self.view addSubview:bgView];
275 276 self.liveController = [[CNLivePlayerController alloc] initWithContentURL:[NSURL URLWithString:self -> url]];
276 277 if (!(nil==bgImg)) {
277   - self.liveController.view.contentMode=UIViewContentModeScaleAspectFill;
  278 + self.liveController.view.layer.contentsScale=UIViewContentModeScaleAspectFill;
  279 + self.liveController.view.clipsToBounds = YES;
278 280 self.liveController.view.layer.contents = (__bridge id _Nullable)(self->bgImg.CGImage);
279 281 }
280 282 [[AVAudioSession sharedInstance] setActive:YES error:nil];
... ...
CNLiveScioLive/Pages/Home/新闻详情/OldController/SCIOSpecialViewController.m
  View file @3b7f478
... ... @@ -167,8 +167,8 @@
167 167 // 设置上拉加载
168 168 MJRefreshGifHeader *header = [MJRefreshGifHeader headerWithRefreshingTarget:self refreshingAction:@selector(loadData)];
169 169 NSMutableArray *refreshingImages = [NSMutableArray array];
170   - for (NSUInteger i = 1; i <= 4; i++) {
171   - UIImage *image = [UIImage imageNamed:[NSString stringWithFormat:@"refresh0%zd", i]];
  170 + for (NSUInteger i = 1; i < 4; i++) {
  171 + UIImage *image = [UIImage imageNamed:[NSString stringWithFormat:@"refresh_animation%lu", (unsigned long)i]];
172 172 [refreshingImages addObject:image];
173 173 }
174 174 [header setImages:refreshingImages forState:MJRefreshStateRefreshing];
... ...