iOS Team / CNLiveCMineModule · Commits

Commit ed215b217c0480759381ee483ed71b33b01ad0b5

Authored by yanglingyu
1 parent e1f4594b

0.5.3

Inline Side-by-side
Showing 5 changed files with 5 additions and 4 deletions
CNLiveCMineModule.podspec
  View file @ed215b2
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 8
9 Pod::Spec.new do |s| 9 Pod::Spec.new do |s|
10 s.name = 'CNLiveCMineModule' 10 s.name = 'CNLiveCMineModule'
11 - s.version = '0.5.2' 11 + s.version = '0.5.3'
12 s.summary = '网家家C端个人中心' 12 s.summary = '网家家C端个人中心'
13 13
14 # This description is used to generate tags and improve search results. 14 # This description is used to generate tags and improve search results.
CNLiveCMineModule/Classes/CNCSubMine/ViewController/CNMineCodeVC.m
  View file @ed215b2
@@ -115,7 +115,7 @@ @@ -115,7 +115,7 @@
115 [self.localLabel mas_makeConstraints:^(MASConstraintMaker *make) { 115 [self.localLabel mas_makeConstraints:^(MASConstraintMaker *make) {
116 make.top.mas_equalTo(weakSelf.nameLabel.mas_bottom).offset(10); 116 make.top.mas_equalTo(weakSelf.nameLabel.mas_bottom).offset(10);
117 make.left.mas_equalTo(weakSelf.iconView.mas_right).offset(10); 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 [self.refreshButton mas_makeConstraints:^(MASConstraintMaker *make) { 121 [self.refreshButton mas_makeConstraints:^(MASConstraintMaker *make) {
CNLiveCMineModule/Classes/Colletion/View/CNMineCollectionCell.m
  View file @ed215b2
@@ -94,7 +94,7 @@ @@ -94,7 +94,7 @@
94 NSString *str = [NSString stringWithFormat:@"%ld",model.time]; 94 NSString *str = [NSString stringWithFormat:@"%ld",model.time];
95 NSTimeInterval time = ceil([str doubleValue] / 1000); 95 NSTimeInterval time = ceil([str doubleValue] / 1000);
96 NSDate *detaildate = [NSDate dateWithTimeIntervalSince1970:time]; 96 NSDate *detaildate = [NSDate dateWithTimeIntervalSince1970:time];
97 - NSString * timeString = [detaildate shortTimeTextOfDate]; 97 + NSString * timeString = [detaildate timeTextOfDate];
98 98
99 self.timeLabel.text = model.icon == nil ? [NSString stringWithFormat:@"%@",timeString]:[NSString stringWithFormat:@"%@ %@",model.icon.nickName,timeString]; 99 self.timeLabel.text = model.icon == nil ? [NSString stringWithFormat:@"%@",timeString]:[NSString stringWithFormat:@"%@ %@",model.icon.nickName,timeString];
100 self.playerView.hidden = [model.videoId isEqualToString:@""]; 100 self.playerView.hidden = [model.videoId isEqualToString:@""];
CNLiveCMineModule/Classes/Colletion/ViewController/CNMineCollectController.m
  View file @ed215b2
@@ -33,6 +33,7 @@ static NSString * const kCNLiveWebViewForCollectionRefreshKey = @"kCNLiveWebView @@ -33,6 +33,7 @@ static NSString * const kCNLiveWebViewForCollectionRefreshKey = @"kCNLiveWebView
33 weakself 33 weakself
34 [CNCCollectionPresent loadCollectionNewsWithPage:_pageNo succeed:^(NSArray *dataArr) { 34 [CNCCollectionPresent loadCollectionNewsWithPage:_pageNo succeed:^(NSArray *dataArr) {
35 [QMUITips hideAllTipsInView:AppKeyWindow]; 35 [QMUITips hideAllTipsInView:AppKeyWindow];
  36 + weakSelf.isRefreshing = NO;
36 if (dataArr.count == 0 && weakSelf.pageNo == 1) { 37 if (dataArr.count == 0 && weakSelf.pageNo == 1) {
37 [weakSelf.data removeAllObjects]; 38 [weakSelf.data removeAllObjects];
38 [weakSelf showEmptyViewWithImage:[UIImage imageNamed:@"c_mine_content_empty"] text:@"您现在没有相关内容哦" detailText:@"" buttonTitle:nil buttonAction:nil]; 39 [weakSelf showEmptyViewWithImage:[UIImage imageNamed:@"c_mine_content_empty"] text:@"您现在没有相关内容哦" detailText:@"" buttonTitle:nil buttonAction:nil];
Example/CNLiveCMineModule/CNLIVEAppDelegate.m
  View file @ed215b2
@@ -28,7 +28,7 @@ @@ -28,7 +28,7 @@
28 28
29 [super application:application didFinishLaunchingWithOptions:launchOptions]; 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 self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds]; 33 self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
34 self.window.backgroundColor = [UIColor whiteColor]; 34 self.window.backgroundColor = [UIColor whiteColor];