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

yanglingyu
1 parent 09c19fd8
Showing 5 changed files with 26 additions and 14 deletions
CNLiveScioLive.xcodeproj/xcshareddata/xcschemes/CNLiveScioLive.xcscheme
CNLiveScioLive/Pages/Home/搜索/View/VideoTableViewCell.m
CNLiveScioLive/Pages/Home/新闻详情/OldController/OldArticleDetailViewController.m
CNLiveScioLive/Pages/Home/新闻详情/OldController/OldVideoDetailViewController.m
CNLiveScioLive/Pages/Home/新闻详情/OldController/SCIOSpecialViewController.m
@@ -60,6 +60,13 @@
             ReferencedContainer = "container:CNLiveScioLive.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
+      <EnvironmentVariables>
+         <EnvironmentVariable
+            key = "OS_ACTIVITY_MODE"
+            value = "disable"
+            isEnabled = "YES">
+         </EnvironmentVariable>
+      </EnvironmentVariables>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
@@ -53,8 +53,8 @@
         frame.size.width += 10;
         frame.size.height+= 6;
         frame.origin.x = MainScreenWidth - frame.size.width - 22;
-        frame.origin.y -= 3;
     }
     [_tagsLabel setFrame:frame];
+    _tagsLabel.centerY = _timeLabel.centerY;
 }
 @end
@@ -33,15 +33,18 @@
         _imageArray = [[ NSMutableArray alloc] init];
         NSString *url = [NSString stringWithFormat:@"%@?from=ios",dictionary[@"pageUrl"]];
-        htmlString = [NSString stringWithContentsOfURL:[NSURL URLWithString:url] encoding:NSUTF8StringEncoding error:nil];
-        //替换掉html页面中的展示js
-        NSString *replace=[htmlString stringByReplacingOccurrencesOfString:@"previewImage.start(obj);" withString:@""];
-        htmlString=replace;
-        htmlUrl=dictionary[@"pageUrl"];
-        if ([htmlString containsString:@"<video"]) {
-            isHaveVideo = YES;
-            [[JGMusicManager shareMusicManager] playStop];
-        }
+        dispatch_async(dispatch_get_global_queue(0, 0), ^{
+            self->htmlString = [NSString stringWithContentsOfURL:[NSURL URLWithString:url] encoding:NSUTF8StringEncoding error:nil];
+            //替换掉html页面中的展示js
+            NSString *replace=[self->htmlString stringByReplacingOccurrencesOfString:@"previewImage.start(obj);" withString:@""];
+            self->htmlString=replace;
+            self->htmlUrl=dictionary[@"pageUrl"];
+            if ([self->htmlString containsString:@"<video"]) {
+                self->isHaveVideo = YES;
+                [[JGMusicManager shareMusicManager] playStop];
+            }
+        });
+       
     }
     return self;
 }
@@ -40,7 +40,8 @@
                     self->bgImg = [UIImage imageWithData:data];
                 dispatch_async(dispatch_get_main_queue(), ^{
                     if (self.liveController && self->bgImg) {
-                        self.liveController.view.contentMode=UIViewContentModeScaleToFill;
+                        self.liveController.view.contentMode=UIViewContentModeScaleAspectFill;
+                        self.liveController.view.clipsToBounds = YES;
                             self.liveController.view.layer.contents = (__bridge id _Nullable) (self->bgImg.CGImage);
                     }
@@ -274,7 +275,8 @@
         [self.view addSubview:bgView];
         self.liveController = [[CNLivePlayerController alloc] initWithContentURL:[NSURL URLWithString:self -> url]];
         if (!(nil==bgImg)) {
-            self.liveController.view.contentMode=UIViewContentModeScaleAspectFill;
+            self.liveController.view.layer.contentsScale=UIViewContentModeScaleAspectFill;
+            self.liveController.view.clipsToBounds = YES;
                 self.liveController.view.layer.contents = (__bridge id _Nullable)(self->bgImg.CGImage);
         }
         [[AVAudioSession sharedInstance] setActive:YES error:nil];
@@ -167,8 +167,8 @@
     //  设置上拉加载
         MJRefreshGifHeader *header = [MJRefreshGifHeader headerWithRefreshingTarget:self refreshingAction:@selector(loadData)];
         NSMutableArray *refreshingImages = [NSMutableArray array];
-        for (NSUInteger i = 1; i <= 4; i++) {
-            UIImage *image = [UIImage imageNamed:[NSString stringWithFormat:@"refresh0%zd", i]];
+        for (NSUInteger i = 1; i < 4; i++) {
+            UIImage *image = [UIImage imageNamed:[NSString stringWithFormat:@"refresh_animation%lu", (unsigned long)i]];
             [refreshingImages addObject:image];
         }
         [header setImages:refreshingImages forState:MJRefreshStateRefreshing];