no message

zhangxiaowen
1 parent 0a024ba9
Showing 8 changed files with 145 additions and 62 deletions
CNLiveCollectionModule.podspec
CNLiveCollectionModule/Classes/Controller/CNLiveCollectionController.m
CNLiveCollectionModule/Classes/Model/CNLiveCollectionModel.h
CNLiveCollectionModule/Classes/Model/CNLiveCollectionModel.m
CNLiveCollectionModule/Classes/View/CNLiveCollectionCell.m
Example/CNLiveCollectionModule.xcodeproj/project.pbxproj
Example/CNLiveCollectionModule/CNLIVEAppDelegate.m
Example/CNLiveCollectionModule/CNLiveCollectionModule-Info.plist
@@ -89,4 +89,7 @@ TODO: 网家家-我的模块.
   #类别
   s.dependency 'CNLiveCategory'
+  #
+  s.dependency 'CNLiveCustomUI'
+  
 end
@@ -8,9 +8,16 @@
 #import "CNLiveCollectionController.h"
 #import "QMUIKit.h"
+#import "MJExtension.h"
 #import <Masonry/Masonry.h>
 #import <SDWebImage/SDWebImage.h>
 #import "CNLiveCategory.h"
+#import "CNLiveNetworking.h"
+#import "CNLiveEnvironment.h"
+#import "CNUserInfoManager.h"
+
+#import "CNLiveRefreshHeader.h"
+#import "CNLiveRrfreshFooter.h"
 #import "CNLiveCollectionNavigationBar.h"
 #import "CNLiveCollectionCell.h"
@@ -22,15 +29,71 @@
 @property (nonatomic, strong) UITableView *tableView;
 @property (nonatomic, strong) NSMutableArray *data;
+@property (nonatomic, assign) NSInteger pageNo;
+@property (nonatomic, assign) BOOL isRefreshing;
+
 @end
 @implementation CNLiveCollectionController
 static const NSInteger margin = 20;
 static const CGFloat timeValue = 1.5;
 #pragma mark - 数据
-- (void)getData{
+- (void)loadData{
+    NSDictionary *params = @{
+                             @"pageSize":@"10",
+                             @"pageNo":[NSString stringWithFormat:@"%ld",_pageNo],
+                             @"appId":AppId,
+                             @"plat":@"i",
+                             @"sid":CNUserShareModel.uid};
+    [CNLiveNetworking setAllowRequestDefaultArgument:YES];
+    [QMUITips showLoadingInView:self.view];
+    [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodGET URLString:CNDarenCollectListDataSourceUrl Param:params CacheType:CNLiveNetworkCacheTypeNetworkOnly CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
+        [QMUITips hideAllTipsInView:self.view];
+        [self hideEmptyView];
+        
+        if (error) {
+            if (self.data.count == 0) {
+                if (error.code == -1001||error.code == -1003||error.code == -1009) {
+                    [self showEmptyViewWithImage:[UIImage imageNamed:@"dd_wlcw"] text:@"无法连接网络" detailText:@"别紧张，试试看刷新页面~" buttonTitle:@"     重试     " buttonAction:@selector(loadData)];
+                    [self setCNAPIErrorEmptyView];
+                    self.tableView.mj_footer.hidden = self.data.count == 0;
+                }
+            }
+            return;
+        }
+        [self.tableView.mj_header endRefreshing];
+        [self.tableView.mj_footer endRefreshing];
+        if ([responseObject isKindOfClass:[NSDictionary class]] && [responseObject[@"errorCode"] isEqualToString:@"0"]) {
+            _isRefreshing = NO;
+            _pageNo++;
+            NSArray *arr = [CNLiveCollectionModel mj_objectArrayWithKeyValuesArray:responseObject[@"data"][@"list"]];
+            [self.data addObjectsFromArray:arr];
+            if (arr.count < 10) {
+                [self.tableView.mj_footer endRefreshingWithNoMoreData];
+                
+            } else {
+                [self.tableView.mj_footer endRefreshing];
+                
+            }
+        }
+
+        if (self.data.count == 0) {//显示empty
+            [self showEmptyViewWithImage:[UIImage imageNamed:@"zhuangtai_kong"] text:@"您现在没有相关内容哦" detailText:@"" buttonTitle:@"" buttonAction:nil];
+            [self setCNNoDataEmptyView];
+            self.tableView.tableFooterView = nil;
+        }
+        self.tableView.mj_footer.hidden = self.data.count == 0;
+        [self.tableView reloadData];
+
+    }];
 }
+- (void)loadMoreData{
+    if(!_isRefreshing){
+        _isRefreshing = YES;
+        [self loadData];
+    }
+}
 #pragma mark - 生命周期
 - (void)viewWillAppear:(BOOL)animated{
@@ -46,7 +109,9 @@ static const CGFloat timeValue = 1.5;
     else {
         self.automaticallyAdjustsScrollViewInsets = NO;
     }
-    [self getData];
+    _pageNo = 1;
+    _isRefreshing = NO;
+    [self loadData];
     [self createSubViews];    
 }
@@ -74,8 +139,8 @@ static const CGFloat timeValue = 1.5;
 #pragma mark - 代理
 #pragma mark - UITableViewDelegate
 - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath{
-    CNLiveCollectionModel *model = self.data[indexPath.row];
-    return model.height;
+//    CNLiveCollectionModel *model = self.data[indexPath.row];
+    return 120.0;
 }
 #pragma mark - UITableViewDataSource
@@ -165,7 +230,7 @@ static const CGFloat timeValue = 1.5;
 }
 - (UITableView *)tableView{
     if(!_tableView){
-        _tableView = [[UITableView alloc] initWithFrame:CGRectMake(0, NavigationContentTop, SCREEN_WIDTH, SCREEN_HEIGHT-NavigationContentTop-50) style:UITableViewStylePlain];
+        _tableView = [[UITableView alloc] initWithFrame:CGRectMake(0, NavigationContentTop, SCREEN_WIDTH, SCREEN_HEIGHT-NavigationContentTop) style:UITableViewStylePlain];
         _tableView.delegate = self;
         _tableView.dataSource = self;
         _tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
@@ -174,6 +239,14 @@ static const CGFloat timeValue = 1.5;
         _tableView.estimatedSectionHeaderHeight = 0;
         _tableView.estimatedSectionFooterHeight = 0;
         [_tableView registerClass:[CNLiveCollectionCell class] forCellReuseIdentifier:kCNLiveCollectionCell];
+        _tableView.mj_header = [CNLiveRefreshHeader headerWithRefreshingBlock:^{
+            _pageNo = 1;
+            [self loadData];
+
+        }];
+        _tableView.mj_footer = [CNLiveRrfreshFooter footerWithRefreshingBlock:^{
+            [self loadMoreData];
+        }];
     }
     return _tableView;
 }
@@ -16,19 +16,39 @@ typedef NS_ENUM(NSInteger, CNLiveCollectionCellType) {
     CNLiveCollectionCellVideo             = 3,
 };
-@interface CNLiveCollectionModel : NSObject
-@property (nonatomic, copy) NSString *name;
-@property (nonatomic, copy) NSString *pic;
+@interface CNLiveIcon
+
+@property (nonatomic, copy) NSString *userId;
+@property (nonatomic, copy) NSString *nickName;
+@property (nonatomic, copy) NSString *extInfo;
+@property (nonatomic, copy) NSString *image;
-@property (nonatomic, copy) NSString *style;
+@property (nonatomic, copy) NSString *state;
+@property (nonatomic, copy) NSString *fansCount;
+@property (nonatomic, copy) NSString *orderCount;
-@property (nonatomic, strong) NSArray *titles;
-@property (nonatomic, strong) NSArray *images;
+@end
-@property (nonatomic, assign) CNLiveCollectionCellType type;
+@interface CNLiveCollectionModel : NSObject
-@property (nonatomic, assign) CGFloat height;
-@property (nonatomic, assign) CGFloat margin;
+@property (nonatomic, copy) NSString *itemId;
+@property (nonatomic, copy) NSString *img;
+@property (nonatomic, strong) CNLiveIcon *icon;
+@property (nonatomic, copy) NSString *imagePath;
+@property (nonatomic, copy) NSString *thumbnailPath;
+@property (nonatomic, copy) NSString *videoImg;
+@property (nonatomic, copy) NSString *text;
+@property (nonatomic, copy) NSString *videoId;
+@property (nonatomic, copy) NSString *videoPlayUrl;
+@property (nonatomic, copy) NSString *collectionId;
+@property (nonatomic, copy) NSString *type;
+@property (nonatomic, assign) NSInteger time;
+@property (nonatomic, copy) NSString *collectionType;
+@property (nonatomic, copy) NSString * shareUrl;
+@property (nonatomic, copy) NSString *channelName;
+@property (nonatomic, copy) NSString *contentId;
+
+@property (nonatomic, copy) NSMutableAttributedString *attributedString;
 @end
@@ -9,53 +9,12 @@
 #import "CNLiveCollectionModel.h"
 @implementation CNLiveCollectionModel
-static const NSInteger margin = 10;
+//static const NSInteger margin = 10;
-- (CNLiveCollectionCellType)type{
-    if([self.style isEqualToString:@"1"]){
-        return CNLiveCollectionCellTextOnly;
-    }
-    else if([self.style isEqualToString:@"2"]){
-        return CNLiveCollectionCellImageOnly;
-        
-    }
-    else if([self.style isEqualToString:@"3"]){
-          return CNLiveCollectionCellImageText;
-          
-      }
-    else if([self.style isEqualToString:@"3"]){
-        return CNLiveCollectionCellVideo;
-        
-    }
-    return CNLiveCollectionCellTextOnly;
-}
-
-- (CGFloat)height{
-    CGFloat titleHeight = 50;
-    CGFloat btnHeight = 60;
-
-    //文字
-    if(self.type == CNLiveCollectionCellTextOnly){
-        return 2*margin+titleHeight+btnHeight+margin;
-    }
-    //图片
-    else if(self.type == CNLiveCollectionCellImageOnly){
-        return 2*margin+titleHeight+ceilf(self.titles.count/4.0)*(btnHeight+margin);
-
-    }
-    //视频
-    else if(self.type == CNLiveCollectionCellImageText){
-        // 电票的高度  80
-        return 2*margin+titleHeight+80+margin;
-        
-    }
-    //视频
-    else if(self.type == CNLiveCollectionCellVideo){
-        // 电票的高度  80
-        return 2*margin+titleHeight+80+margin;
-        
-    }
-    return 0.0000001f;
-}
+//+ (NSDictionary *)mj_objectClassInArray{
+//    return @{
+//             @"icon" : @"CNLiveIcon"
+//             };
+//}
 @end
@@ -81,6 +81,7 @@ static const NSInteger margin = 10;
 #pragma mark - Data
 - (void)setModel:(CNLiveCollectionModel *)model{
     _model = model;
+    [_leftImage sd_setImageWithURL:[NSURL URLWithString:model.imagePath] placeholderImage:nil];
 }
 - (void)awakeFromNib {
@@ -352,6 +352,7 @@
 				"${BUILT_PRODUCTS_DIR}/CNLiveCategory/CNLiveCategory.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveCollectionModule/CNLiveCollectionModule.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveCommonClass/CNLiveCommonClass.framework",
+				"${BUILT_PRODUCTS_DIR}/CNLiveCustomUI/CNLiveCustomUI.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveEnvironment/CNLiveEnvironment.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveManager/CNLiveManager.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveRequestBastKit/CNLiveRequestBastKit.framework",
@@ -362,6 +363,7 @@
 				"${BUILT_PRODUCTS_DIR}/Masonry/Masonry.framework",
 				"${BUILT_PRODUCTS_DIR}/QMUIKit/QMUIKit.framework",
 				"${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework",
+				"${BUILT_PRODUCTS_DIR}/YYKit/YYKit.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
@@ -371,6 +373,7 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCategory.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCollectionModule.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCommonClass.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCustomUI.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveEnvironment.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveManager.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveRequestBastKit.framework",
@@ -381,6 +384,7 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Masonry.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/QMUIKit.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYKit.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
@@ -10,13 +10,31 @@
 #import "CNLiveCollectionController.h"
 #import "CNLiveEnvironment.h"
 #import "CNUserInfoManager.h"
+#import "CNLiveNetworking.h"
 @implementation CNLIVEAppDelegate
+- (void)networkParamAction{
+    NSMutableDictionary * mDict = [[NSMutableDictionary alloc] init];
+    [mDict setValue:@"10514405" forKey:@"loginSid"];
+    [mDict setValue:BundleId forKey:@"platform_id"];
+
+    [mDict setValue:[[[[UIDevice currentDevice] identifierForVendor] UUIDString] stringByReplacingOccurrencesOfString:@"-" withString:@""] forKey:@"uuid"];
+    [mDict setValue:@"i" forKey:@"plat"];
+    [mDict setValue:@"1.7.8.19.10.30.15"forKey:@"ver"];
+    [mDict setObject:AppId forKey:@"appId"];
+    [CNLiveNetworking setupDefaultParam:mDict];
+    [CNLiveNetworking setupShowResult:NO];
+    [CNLiveNetworking setupSignKey:APPKey];
+    [CNLiveNetworking setAllowRequestDefaultArgument:YES];
+    [CNLiveNetworking setResponseSerializerType:CNLiveResponseSerializerJSON];
+    
+}
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
     // Override point for customization after application launch.
-    [CNLiveEnvironmentManager setEnvironment:CNLiveProductionAppStore];
+    [CNLiveEnvironmentManager setEnvironment:CNLiveDebugAppStore];
+    [self networkParamAction];
     self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];//UIScreen mainScreen].bounds个人理解获取屏幕的硬件信息然后设置尺寸大小
     CNLiveCollectionController *vc = [[CNLiveCollectionController alloc] init];
     UINavigationController *nav = [[UINavigationController alloc]initWithRootViewController:vc];
@@ -2,6 +2,11 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+    <key>NSAppTransportSecurity</key>
+    <dict>
+        <key>NSAllowsArbitraryLoads</key>
+        <true/>
+    </dict>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleDisplayName</key>