Commit 15986900 authored by guanghui.shi's avatar guanghui.shi

海报二维码逻辑修改

parent fdf99ec2
...@@ -246,7 +246,6 @@ ...@@ -246,7 +246,6 @@
} }
self.pageControl.numberOfPages = self.posetrs.count; self.pageControl.numberOfPages = self.posetrs.count;
self.pageControl.currentPage = 0; self.pageControl.currentPage = 0;
[self.collectionView reloadData];
/// 下载二维码 /// 下载二维码
[self downLoadQrImage]; [self downLoadQrImage];
...@@ -296,16 +295,14 @@ ...@@ -296,16 +295,14 @@
QGAppCoreModelClickEvent *event = [QGAppCoreModelClickEvent acmcEventWithPage:@"分享好友" path:@"分享操作" name:@"分享海报" detail_name:nil]; QGAppCoreModelClickEvent *event = [QGAppCoreModelClickEvent acmcEventWithPage:@"分享好友" path:@"分享操作" name:@"分享海报" detail_name:nil];
[QGAnalyticsService analyticsTrackWithEvent:event]; [QGAnalyticsService analyticsTrackWithEvent:event];
if (self.currentPageIndex >= self.posetrs.count) { if (self.currentPageIndex >= self.posetrs.count) return;
return;
}
QGSharePosterModel *poster = self.posetrs[self.currentPageIndex]; QGSharePosterModel *poster = self.posetrs[self.currentPageIndex];
SDImageCache *cache = [SDImageCache sharedImageCache]; SDImageCache *cache = [SDImageCache sharedImageCache];
UIImage *image = [cache imageFromCacheForKey:poster.img]; UIImage *image = [cache imageFromCacheForKey:poster.img];
if (!image) { if (!image || !self.qrImage) {
[QGHUDManager showHud:@"图片正在加载..."]; [QGHUDManager showHud:@"图片正在加载..."];
return; return;
} }
...@@ -385,16 +382,14 @@ ...@@ -385,16 +382,14 @@
QGAppCoreModelClickEvent *event = [QGAppCoreModelClickEvent acmcEventWithPage:@"分享好友" path:@"分享操作" name:@"保存图片" detail_name:nil]; QGAppCoreModelClickEvent *event = [QGAppCoreModelClickEvent acmcEventWithPage:@"分享好友" path:@"分享操作" name:@"保存图片" detail_name:nil];
[QGAnalyticsService analyticsTrackWithEvent:event]; [QGAnalyticsService analyticsTrackWithEvent:event];
if (self.currentPageIndex >= self.posetrs.count) { if (self.currentPageIndex >= self.posetrs.count) return;
return;
}
QGSharePosterModel *poster = self.posetrs[self.currentPageIndex]; QGSharePosterModel *poster = self.posetrs[self.currentPageIndex];
SDImageCache *cache = [SDImageCache sharedImageCache]; SDImageCache *cache = [SDImageCache sharedImageCache];
UIImage *image = [cache imageFromCacheForKey:poster.img]; UIImage *image = [cache imageFromCacheForKey:poster.img];
if (!image) { if (!image || !self.qrImage) {
[QGHUDManager showHud:@"图片正在加载..."]; [QGHUDManager showHud:@"图片正在加载..."];
return; return;
} }
...@@ -458,6 +453,9 @@ ...@@ -458,6 +453,9 @@
#pragma mark - 下载合成图片 #pragma mark - 下载合成图片
/// 下载二维码,如果二维码下载下来,则展示
/// 二维码下载失败,整个页面不展示
- (void)downLoadQrImage - (void)downLoadQrImage
{ {
if (self.posetrs.count == 0) return; if (self.posetrs.count == 0) return;
...@@ -465,13 +463,10 @@ ...@@ -465,13 +463,10 @@
SDWebImageManager *manager = [SDWebImageManager sharedManager]; SDWebImageManager *manager = [SDWebImageManager sharedManager];
QGSharePosterModel *firstPoster = [self.posetrs firstObject]; QGSharePosterModel *firstPoster = [self.posetrs firstObject];
/// 下载最新二维码,二维码下载不下来,直接使用默认的二维码 /// 下载最新二维码,二维码下载不下来,直接使用默认的二维码
[manager loadImageWithURL:[NSURL URLWithString:firstPoster.qrImgUrl] options:SDWebImageLowPriority progress:NULL completed:^(UIImage * _Nullable image, NSData * _Nullable data, NSError * _Nullable error, SDImageCacheType cacheType, BOOL finished, NSURL * _Nullable imageURL) { [manager loadImageWithURL:[NSURL URLWithString:firstPoster.qrImgUrl] options:SDWebImageLowPriority progress:NULL completed:^(UIImage * _Nullable image, NSData * _Nullable data, NSError * _Nullable error, SDImageCacheType cacheType, BOOL finished, NSURL * _Nullable imageURL) {
if (error == nil) { if (error == nil) {
self.qrImage = image; self.qrImage = image;
}else{ [self.collectionView reloadData];
/// 使用默认的3倍图
self.qrImage = [UIImage imageNamed:@"default_qr"];
} }
}]; }];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment