iOS Team / CNLiveIntegralModule · Commits

Commit 31904dd30ffe9b524839f9333e0ba77d17132114

Authored by zhangxiaowen
1 parent fcd43cd0

no message

Inline Side-by-side
Showing 4 changed files with 8 additions and 11 deletions
CNLiveIntegralModule/Classes/Controller/CNLiveIntegralDetailsController.m
  View file @31904dd
@@ -38,12 +38,9 @@ @@ -38,12 +38,9 @@
38 38
39 #pragma mark - Data 39 #pragma mark - Data
40 - (void)loadData{ 40 - (void)loadData{
41 -// NSDictionary *params = @{@"pageSize":@"10",  
42 -// @"pageNo":[NSString stringWithFormat:@"%ld",_pageNo],  
43 -// @"sid":CNUserShareModel.uid};  
44 NSDictionary *params = @{@"pageSize":@"15", 41 NSDictionary *params = @{@"pageSize":@"15",
45 @"pageNo":[NSString stringWithFormat:@"%ld",_pageNo], 42 @"pageNo":[NSString stringWithFormat:@"%ld",_pageNo],
46 - @"sid":@"10514405",@"appId":AppId}; 43 + @"sid":CNUserShareModel.uid,@"appId":AppId};
47 [CNLiveNetworking setAllowRequestDefaultArgument:YES]; 44 [CNLiveNetworking setAllowRequestDefaultArgument:YES];
48 [CNLiveNetworking setupShowDataResult:NO]; 45 [CNLiveNetworking setupShowDataResult:NO];
49 [QMUITips showLoadingInView:[UIApplication sharedApplication].keyWindow]; 46 [QMUITips showLoadingInView:[UIApplication sharedApplication].keyWindow];
CNLiveIntegralModule/Classes/Controller/CNLiveTaskListController.m
  View file @31904dd
@@ -119,13 +119,12 @@ @@ -119,13 +119,12 @@
119 119
120 #pragma mark - Data 120 #pragma mark - Data
121 - (void)loadData{ 121 - (void)loadData{
122 -// NSDictionary *params = @{@"sid":CNUserShareModel.uid};  
123 - NSDictionary *params = @{@"sid":@"10514405",@"appId":AppId}; 122 + NSDictionary *params = @{@"sid":CNUserShareModel.uid,@"appId":AppId};
124 [CNLiveNetworking setAllowRequestDefaultArgument:YES]; 123 [CNLiveNetworking setAllowRequestDefaultArgument:YES];
125 [CNLiveNetworking setupShowDataResult:NO]; 124 [CNLiveNetworking setupShowDataResult:NO];
126 - [QMUITips showLoadingInView:[UIApplication sharedApplication].keyWindow]; 125 + [QMUITips showLoadingInView:self.view];
127 [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodGET URLString:CNIntegralGetTasksUrl Param:params CacheType:CNLiveNetworkCacheTypeNetworkOnly CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) { 126 [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodGET URLString:CNIntegralGetTasksUrl Param:params CacheType:CNLiveNetworkCacheTypeNetworkOnly CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
128 - [QMUITips hideAllTipsInView:[UIApplication sharedApplication].keyWindow]; 127 + [QMUITips hideAllTipsInView:self.view];
129 [self hideEmptyView]; 128 [self hideEmptyView];
130 if (error) { 129 if (error) {
131 if (self.data.count == 0) { 130 if (self.data.count == 0) {
CNLiveIntegralModule/Classes/View/CNLiveTaskListHeaderView.m
  View file @31904dd
@@ -101,7 +101,8 @@ static const NSInteger margin = 15; @@ -101,7 +101,8 @@ static const NSInteger margin = 15;
101 _headView.layer.masksToBounds = YES; 101 _headView.layer.masksToBounds = YES;
102 _headView.layer.borderColor = [UIColor whiteColor].CGColor; 102 _headView.layer.borderColor = [UIColor whiteColor].CGColor;
103 _headView.layer.borderWidth = 1.5; 103 _headView.layer.borderWidth = 1.5;
104 - [_headView sd_setImageWithURL:[NSURL URLWithString:CNUserShareModel.faceUrl] placeholderImage:nil]; 104 + UIImage *xw_image = [self xw_getImageName:@"default_avatar_f" bundleName:@"CNLiveIntegralModule" targetClass:[self class]];
  105 + [_headView sd_setImageWithURL:[NSURL URLWithString:CNUserShareModel.faceUrl] placeholderImage:xw_image];
105 106
106 } 107 }
107 return _headView; 108 return _headView;
Example/CNLiveIntegralModule/CNLIVEAppDelegate.m
  View file @31904dd
@@ -30,9 +30,9 @@ @@ -30,9 +30,9 @@
30 30
31 self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds]; 31 self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
32 32
33 -// CNLiveTaskListController *vc = [[CNLiveTaskListController alloc] init]; 33 + CNLiveTaskListController *vc = [[CNLiveTaskListController alloc] init];
34 34
35 - CNLIVEViewController *vc = [[CNLIVEViewController alloc] init]; 35 +// CNLIVEViewController *vc = [[CNLIVEViewController alloc] init];
36 36
37 UINavigationController *nav = [[UINavigationController alloc]initWithRootViewController:vc]; 37 UINavigationController *nav = [[UINavigationController alloc]initWithRootViewController:vc];
38 38