Commit ed215b217c0480759381ee483ed71b33b01ad0b5
1 parent
e1f4594b
0.5.3
Showing
5 changed files
with
5 additions
and
4 deletions
CNLiveCMineModule.podspec
CNLiveCMineModule/Classes/CNCSubMine/ViewController/CNMineCodeVC.m
| ... | ... | @@ -115,7 +115,7 @@ |
| 115 | 115 | [self.localLabel mas_makeConstraints:^(MASConstraintMaker *make) { |
| 116 | 116 | make.top.mas_equalTo(weakSelf.nameLabel.mas_bottom).offset(10); |
| 117 | 117 | make.left.mas_equalTo(weakSelf.iconView.mas_right).offset(10); |
| 118 | - make.right.mas_equalTo(weakSelf.mainView.mas_right).offset(-10); | |
| 118 | + make.right.mas_equalTo(weakSelf.mainView.mas_right).offset(-60); | |
| 119 | 119 | }]; |
| 120 | 120 | |
| 121 | 121 | [self.refreshButton mas_makeConstraints:^(MASConstraintMaker *make) { | ... | ... |
CNLiveCMineModule/Classes/Colletion/View/CNMineCollectionCell.m
| ... | ... | @@ -94,7 +94,7 @@ |
| 94 | 94 | NSString *str = [NSString stringWithFormat:@"%ld",model.time]; |
| 95 | 95 | NSTimeInterval time = ceil([str doubleValue] / 1000); |
| 96 | 96 | NSDate *detaildate = [NSDate dateWithTimeIntervalSince1970:time]; |
| 97 | - NSString * timeString = [detaildate shortTimeTextOfDate]; | |
| 97 | + NSString * timeString = [detaildate timeTextOfDate]; | |
| 98 | 98 | |
| 99 | 99 | self.timeLabel.text = model.icon == nil ? [NSString stringWithFormat:@"%@",timeString]:[NSString stringWithFormat:@"%@ %@",model.icon.nickName,timeString]; |
| 100 | 100 | self.playerView.hidden = [model.videoId isEqualToString:@""]; | ... | ... |
CNLiveCMineModule/Classes/Colletion/ViewController/CNMineCollectController.m
| ... | ... | @@ -33,6 +33,7 @@ static NSString * const kCNLiveWebViewForCollectionRefreshKey = @"kCNLiveWebView |
| 33 | 33 | weakself |
| 34 | 34 | [CNCCollectionPresent loadCollectionNewsWithPage:_pageNo succeed:^(NSArray *dataArr) { |
| 35 | 35 | [QMUITips hideAllTipsInView:AppKeyWindow]; |
| 36 | + weakSelf.isRefreshing = NO; | |
| 36 | 37 | if (dataArr.count == 0 && weakSelf.pageNo == 1) { |
| 37 | 38 | [weakSelf.data removeAllObjects]; |
| 38 | 39 | [weakSelf showEmptyViewWithImage:[UIImage imageNamed:@"c_mine_content_empty"] text:@"您现在没有相关内容哦" detailText:@"" buttonTitle:nil buttonAction:nil]; | ... | ... |
Example/CNLiveCMineModule/CNLIVEAppDelegate.m
| ... | ... | @@ -28,7 +28,7 @@ |
| 28 | 28 | |
| 29 | 29 | [super application:application didFinishLaunchingWithOptions:launchOptions]; |
| 30 | 30 | |
| 31 | - [CNUserInfoManager manager].userInfoModel.uid = @"11174272";//@"10510277";//11174272//12857262 | |
| 31 | + [CNUserInfoManager manager].userInfoModel.uid = @"398926";//@"10510277";//11174272//12857262 | |
| 32 | 32 | |
| 33 | 33 | self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds]; |
| 34 | 34 | self.window.backgroundColor = [UIColor whiteColor]; | ... | ... |