no message

zhangxiaowen
1 parent b14c0f68
Showing 4 changed files with 39 additions and 31 deletions
CNLivePreloadResources/Classes/CNLivePreloadManager.h
CNLivePreloadResources/Classes/CNLivePreloadManager.m
CNLivePreloadResources/Classes/CNLivePreloadModel.h
Example/CNLivePreloadResources/CNLiveViewController.m
@@ -16,13 +16,14 @@ NS_ASSUME_NONNULL_BEGIN
  *  预加载资源
  *
  *  @param preloadId 加载标识
- *  @param type 资源类型
+ *  @param type 资源类型(目前只支持图片类型CNLiveResourceImage)
  *  @param imageNames 资源名字数组
  *
  *  @return 模型
  */
 + (CNLivePreloadModel *)preloadModelForPreloadId:(NSString *)preloadId type:(CNLiveResourceType)type imageNames:(NSArray<NSString *> *)imageNames;
  
+
 #pragma mark - 针对具体业务
 /**
 * 预加载全部资源
@@ -206,36 +206,40 @@ static NSMutableDictionary *resources;
 + (void)asyncLoadResources:(CNLivePreloadModel *)model type:(CNLiveResourceType)type{
     model.isLoading = YES;
     dispatch_async(dispatch_get_global_queue(0, 0), ^{
-        NSMutableArray<UIImage *> *images = [[NSMutableArray alloc] init];
-        for (CNLiveResourceModel *resourceModel in model.models) {
-            if (resourceModel.image == nil) {
-                UIImage *image = nil;
-                switch (type) {
-                    case CNLiveResourceImage:
-                    {
-                        image = [CNLivePreloadManager cn_getImageName:resourceModel.name bundle:@"CNLivePreloadResources.bundle/CNLivePreloadResources" targetClass:[CNLivePreloadManager class]];
+        switch (type) {
+            case CNLiveResourceImage:
+            {
+                NSMutableArray<UIImage *> *images = [[NSMutableArray alloc] init];
+                for (CNLiveResourceModel *resourceModel in model.models) {
+                    if (resourceModel.image == nil) {
+                        UIImage *image = [CNLivePreloadManager cn_getImageName:resourceModel.name bundle:@"CNLivePreloadResources.bundle/CNLivePreloadResources" targetClass:[CNLivePreloadManager class]];;
+                        if (image == nil) {
+                            model.isLoadFailed = YES;
+                        }
+                        else{
+                            resourceModel.image = image;
+                            [images addObject:image];
+                            model.isLoadFailed = NO;
+                        }
                     }
-                        break;
-                        
-                    case CNLiveResourceGif:
-                    {
-                        image = [CNLivePreloadManager cn_getImageName:resourceModel.name bundle:@"CNLivePreloadResources.bundle/CNLivePreloadResources" targetClass:[CNLivePreloadManager class]];
-                    }
-                        break;
-                        
-                }
-                if (image == nil) {
-                    model.isLoadFailed = YES;
-                }
-                else{
-                    resourceModel.image = image;
-                    [images addObject:image];
-                    model.isLoadFailed = NO;
                 }
+                model.images = [NSArray arrayWithArray:images];
+                model.isLoading = NO;
             }
+                break;
+            case CNLiveResourceGif:
+            {
+                
+            }
+                break;
+            case CNLiveResourceText:
+            {
+                
+            }
+                break;
+                
         }
-        model.images = [NSArray arrayWithArray:images];
-        model.isLoading = NO;
+        
     });
  
 }
@@ -18,13 +18,14 @@ typedef NS_ENUM(NSInteger, CNLivePreloadType) {
  
 };
  
-//资源类型
+//资源类型(目前只支持图片类型)
 typedef NS_ENUM(NSInteger, CNLiveResourceType) {
     CNLiveResourceImage,    // 动画图片
-    CNLiveResourceGif       // Gif
-    
+    CNLiveResourceGif,      // Gif
+    CNLiveResourceText      // 文本
 };
  
+// 资源类型(1.图片 2.Gif  3.文本)
 @interface CNLiveResourceModel : NSObject
 // 标识
 @property (nonatomic, copy) NSString *ID;
@@ -41,6 +42,7 @@ typedef NS_ENUM(NSInteger, CNLiveResourceType) {
  
 @end
  
+// 某一种类型的资源(1.刷新图片  2.Gif封面  3.Emotion)
 @interface CNLivePreloadModel : NSObject
 // 是否存在加载失败
 @property (nonatomic, assign) BOOL isLoadFailed;
@@ -50,8 +52,8 @@ typedef NS_ENUM(NSInteger, CNLiveResourceType) {
 @property (nonatomic, copy) NSString *ID;
 // UIImage
 @property (nonatomic, strong) NSArray *images;
+// CNLiveResourceModel数组
 @property (nonatomic, strong) NSArray<CNLiveResourceModel *> *models;
-
 // 类型
 @property (nonatomic, assign) CNLivePreloadType type;
  
@@ -37,6 +37,7 @@
  
         NSArray *add2 = [CNLivePreloadManager preloadImagesForEmotion];
         image2.image = add2[2];
+        
     });
 }