no message

zhangxiaowen
1 parent 9a2dc311
Showing 6 changed files with 15 additions and 55 deletions
CNLivePreloadResources.podspec
CNLivePreloadResources/Classes/CNLivePreloadManager.h
CNLivePreloadResources/Classes/CNLivePreloadManager.m
CNLivePreloadResources/Classes/CNLivePreloadModel.m
Example/CNLivePreloadResources/CNLiveAppDelegate.m
Example/CNLivePreloadResources/CNLiveViewController.m
@@ -41,4 +41,5 @@ TODO: Add long description of the pod here.
   # s.public_header_files = 'Pod/Classes/**/*.h'
   # s.frameworks = 'UIKit', 'MapKit'
   # s.dependency 'AFNetworking', '~> 2.3'
+  
 end
@@ -12,6 +12,16 @@
 NS_ASSUME_NONNULL_BEGIN
 @interface CNLivePreloadManager : NSObject
+/**
+ *  预加载资源
+ *
+ *  @param preloadId 加载标识
+ *  @param type 资源类型
+ *  @param imageNames 资源名字数组
+ *
+ *  @return 模型
+ */
++ (CNLivePreloadModel *)preloadModelForPreloadId:(NSString *)preloadId type:(CNLiveResourceType)type imageNames:(NSArray<NSString *> *)imageNames;
 #pragma mark - 针对具体业务
 /**
@@ -25,7 +35,6 @@ NS_ASSUME_NONNULL_BEGIN
  * 预加载
  */
 + (CNLivePreloadModel *)preloadModelForType:(CNLivePreloadType)type;
-+ (NSArray<CNLiveResourceModel *> *)preloadModelsForType:(CNLivePreloadType)type;
 + (NSArray<UIImage *> *)preloadImagesForType:(CNLivePreloadType)type;
@@ -33,7 +42,6 @@ NS_ASSUME_NONNULL_BEGIN
  * 预加载刷新图片
  */
 + (CNLivePreloadModel *)preloadModelForRefreshImage;
-+ (NSArray<CNLiveResourceModel *> *)preloadModelsForRefreshImage;
 + (NSArray<UIImage *> *)preloadImagesForRefreshImage;
@@ -41,7 +49,6 @@ NS_ASSUME_NONNULL_BEGIN
  * 预加载Gif表情封面
  */
 + (CNLivePreloadModel *)preloadModelForGifCover;
-+ (NSArray<CNLiveResourceModel *> *)preloadModelsForGifCover;
 + (NSArray<UIImage *> *)preloadImagesForGifCover;
@@ -49,7 +56,6 @@ NS_ASSUME_NONNULL_BEGIN
  * 预加载Emotion表情
  */
 + (CNLivePreloadModel *)preloadModelForEmotion;
-+ (NSArray<CNLiveResourceModel *> *)preloadModelsForEmotion;
 + (NSArray<UIImage *> *)preloadImagesForEmotion;
@@ -58,30 +58,6 @@ static NSMutableDictionary *resources;
     return nil;
 }
-+ (NSArray<CNLiveResourceModel *> *)preloadModelsForType:(CNLivePreloadType)type{
-    switch (type) {
-        case CNLivePreloadRefreshImage:// 刷新图片
-        {
-            [self preloadModelsForRefreshImage];
-        }
-            break;
-            
-        case CNLivePreloadGifCover:// Gif封面图片
-        {
-            [self preloadModelsForGifCover];
-        }
-            break;
-            
-        case CNLivePreloadEmotion:// Emotion表情
-        {
-            [self preloadModelsForEmotion];
-        }
-            break;
-            
-    }
-    return nil;
-    
-}
 + (NSArray<UIImage *> *)preloadImagesForType:(CNLivePreloadType)type{
     switch (type) {
         case CNLivePreloadRefreshImage:// 刷新图片
@@ -121,11 +97,6 @@ static NSMutableDictionary *resources;
     return model;
 }
-+ (NSArray<CNLiveResourceModel *> *)preloadModelsForRefreshImage{
-    CNLivePreloadModel *model = [CNLivePreloadManager preloadModelForRefreshImage];
-    return model.models;
-    
-}
 + (NSArray<UIImage *> *)preloadImagesForRefreshImage{
     CNLivePreloadModel *model = [CNLivePreloadManager preloadModelForRefreshImage];
     return model.images;
@@ -146,11 +117,6 @@ static NSMutableDictionary *resources;
     return model;
 }
-+ (NSArray<CNLiveResourceModel *> *)preloadModelsForGifCover{
-    CNLivePreloadModel *model = [CNLivePreloadManager preloadModelForGifCover];
-    return model.models;
-    
-}
 + (NSArray<UIImage *> *)preloadImagesForGifCover{
     CNLivePreloadModel *model = [CNLivePreloadManager preloadModelForGifCover];
     return model.images;
@@ -173,18 +139,12 @@ static NSMutableDictionary *resources;
     return model;
 }
-+ (NSArray<CNLiveResourceModel *> *)preloadModelsForEmotion{
-    CNLivePreloadModel *model = [CNLivePreloadManager preloadModelForEmotion];
-    return model.models;
-    
-}
 + (NSArray<UIImage *> *)preloadImagesForEmotion{
     CNLivePreloadModel *model = [CNLivePreloadManager preloadModelForEmotion];
     return model.images;
 }
-#pragma mark - 私有方法
 /**
  *  预加载资源
  *
@@ -235,6 +195,7 @@ static NSMutableDictionary *resources;
     return model;
 }
+#pragma mark - 私有方法
 /**
  *  在子线程预加载
  *
@@ -11,12 +11,10 @@
 @implementation CNLivePreloadModel
-
 @end
 @implementation CNLiveResourceModel
-
 @end
@@ -14,8 +14,7 @@
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
     // Override point for customization after application launch.
-//    [CNLivePreloadManager preloadAllResources];
-    [CNLivePreloadManager preloadModelForRefreshImage];
+    [CNLivePreloadManager preloadAllResources];
     return YES;
 }
@@ -30,18 +30,13 @@
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(6.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
         NSArray *add1 = [CNLivePreloadManager preloadImagesForRefreshImage];
-//        NSMutableArray *images = [[NSMutableArray alloc] init];
-//        for(CNLivePreloadModel *model in add){
-//            [images addObject:model.image];
-//        }
-//
         image1.animationImages = add1;//将序列帧数组赋给UIImageView的animationImages属性
         image1.animationDuration = 1.0;//设置动画时间
         image1.animationRepeatCount = 0;//设置动画次数 0 表示无限
         [image1 startAnimating];//开始播放动
-//        NSArray *add2 = [CNLivePreloadManager preloadImagesForEmotion];
-//        image2.image = add2[2];
+        NSArray *add2 = [CNLivePreloadManager preloadImagesForEmotion];
+        image2.image = add2[2];
     });
 }