From e62558aff4a5fecc2672044f3d21849d2971450b Mon Sep 17 00:00:00 2001 From: Freelf Date: Thu, 31 Dec 2020 15:25:40 +0800 Subject: [PATCH 1/2] fix: fix can't run in iOS14 --- .../Discover/Example21/CMHExample21ViewController.m | 2 +- .../MainFrame/Example06/CMHExample06ViewController.m | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/MHDevelopExample/MHDevelopExample/Architecture/Discover/Example21/CMHExample21ViewController.m b/MHDevelopExample/MHDevelopExample/Architecture/Discover/Example21/CMHExample21ViewController.m index 40a1fa6..0ea6b39 100644 --- a/MHDevelopExample/MHDevelopExample/Architecture/Discover/Example21/CMHExample21ViewController.m +++ b/MHDevelopExample/MHDevelopExample/Architecture/Discover/Example21/CMHExample21ViewController.m @@ -83,7 +83,7 @@ - (void)configure{ - (id)fetchLocalData{ @weakify(self); - [[YYCache sharedCache] objectForKey:CMHSearchFarmsHistoryCacheKey withBlock:^(NSString * _Nonnull key, NSArray * _Nullable object) { + [[YYCache sharedCache] objectForKey:CMHSearchFarmsHistoryCacheKey withBlock:^(NSString * _Nonnull key, id object) { @strongify(self); // 子线程执行任务（比如获取较大数据） dispatch_async(dispatch_get_main_queue(), ^{ diff --git a/MHDevelopExample/MHDevelopExample/Architecture/MainFrame/Example06/CMHExample06ViewController.m b/MHDevelopExample/MHDevelopExample/Architecture/MainFrame/Example06/CMHExample06ViewController.m index 30fb0df..fd9d0b4 100644 --- a/MHDevelopExample/MHDevelopExample/Architecture/MainFrame/Example06/CMHExample06ViewController.m +++ b/MHDevelopExample/MHDevelopExample/Architecture/MainFrame/Example06/CMHExample06ViewController.m @@ -93,14 +93,15 @@ - (UIImage *)fetchLocalData{ /// sub class can override ，且不用调用 super， 直接重写覆盖 @weakify(self); /// 异步 - [[YYCache sharedCache] objectForKey:CMHExample06RemoteImageCacheKey withBlock:^(NSString * _Nonnull key, UIImage * _Nonnull object) { + [[YYCache sharedCache] objectForKey:CMHExample06RemoteImageCacheKey withBlock:^(NSString * _Nonnull key, id object) { @strongify(self); + UIImage *image = (UIImage *)object; // 子线程执行任务（比如获取较大数据） dispatch_async(dispatch_get_main_queue(), ^{ // 通知主线程刷新 神马的 - self.localView.image = object; + self.localView.image = image; - self.navigationItem.rightBarButtonItem = MHObjectIsNil(object)?nil:self.clearItem; + self.navigationItem.rightBarButtonItem = MHObjectIsNil(image)?nil:self.clearItem; }); }]; From fc6983f65cd99487d2f4662f310ae6a26fb97146 Mon Sep 17 00:00:00 2001 From: Freelf Date: Thu, 31 Dec 2020 15:31:56 +0800 Subject: [PATCH 2/2] fix: fix flow loyout bug --- .../Mode_1/Model/MHCollectionViewHorizontalFlowLayout.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MHDevelopExample/MHDevelopExample/Classes/Horizontal/Mode_1/Model/MHCollectionViewHorizontalFlowLayout.m b/MHDevelopExample/MHDevelopExample/Classes/Horizontal/Mode_1/Model/MHCollectionViewHorizontalFlowLayout.m index 9306043..39053a7 100644 --- a/MHDevelopExample/MHDevelopExample/Classes/Horizontal/Mode_1/Model/MHCollectionViewHorizontalFlowLayout.m +++ b/MHDevelopExample/MHDevelopExample/Classes/Horizontal/Mode_1/Model/MHCollectionViewHorizontalFlowLayout.m @@ -170,7 +170,7 @@ - (nullable UICollectionViewLayoutAttributes *)layoutAttributesForItemAtIndexPat CGFloat itemX = sectionInset.left + (itemW + minimumInteritemSpacing) * (indexPath.item % self.columnCount) + currentPage * width; itemX = sectionHomepageX + itemX; - CGFloat itemY = sectionInset.top + (itemH + minimumLineSpacing) * ((indexPath.item - self.pageSize * currentPage) / self.rowCount); + CGFloat itemY = sectionInset.top + (itemH + minimumLineSpacing) * ((indexPath.item - self.pageSize * currentPage) / self.columnCount); /// 获取原布局 UICollectionViewLayoutAttributes* attributes = [[super layoutAttributesForItemAtIndexPath:indexPath] copy];