Commit 2ad9e4a8 authored by 曹云霄's avatar 曹云霄

修改项说明:

parent 048af0e5
......@@ -10,4 +10,48 @@
@interface LearningCenterMainViewController : BaseViewController
/**
当前积分
*/
@property (weak, nonatomic) IBOutlet UILabel *currentScoreLabel;
/**
积分季度排行
*/
@property (weak, nonatomic) IBOutlet UILabel *quarterRankingLabel;
/**
积分年度排行
*/
@property (weak, nonatomic) IBOutlet UILabel *yearRankingLabel;
/**
综合讨论
*/
@property (weak, nonatomic) IBOutlet UIView *comprehensiveDiscussionView;
/**
在线学习
*/
@property (weak, nonatomic) IBOutlet UIView *onlineLearningView;
/**
闯关
*/
@property (weak, nonatomic) IBOutlet UIView *breakthroughView;
@end
......@@ -16,22 +16,12 @@
- (void)viewDidLoad {
[super viewDidLoad];
// Do any additional setup after loading the view.
}
- (void)didReceiveMemoryWarning {
[super didReceiveMemoryWarning];
// Dispose of any resources that can be recreated.
}
/*
#pragma mark - Navigation
// In a storyboard-based application, you will often want to do a little preparation before navigation
- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
// Get the new view controller using [segue destinationViewController].
// Pass the selected object to the new view controller.
}
*/
@end
//
// OnlineLearningTableViewCell.h
// Lighting
//
// Created by 曹云霄 on 2016/11/16.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import <UIKit/UIKit.h>
@interface OnlineLearningTableViewCell : UITableViewCell
@end
//
// OnlineLearningTableViewCell.m
// Lighting
//
// Created by 曹云霄 on 2016/11/16.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import "OnlineLearningTableViewCell.h"
@implementation OnlineLearningTableViewCell
- (void)awakeFromNib {
[super awakeFromNib];
// Initialization code
}
- (void)setSelected:(BOOL)selected animated:(BOOL)animated {
[super setSelected:selected animated:animated];
// Configure the view for the selected state
}
@end
//
// OnlineLearningViewController.h
// Lighting
//
// Created by 曹云霄 on 2016/11/16.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import "BaseViewController.h"
@interface OnlineLearningViewController : BaseViewController
/**
学习模块列表
*/
@property (weak, nonatomic) IBOutlet UICollectionView *onlineLearningCollectionView;
@property (weak, nonatomic) IBOutlet UICollectionViewFlowLayout *onlineLearningFlowLayout;
@end
//
// OnlineLearningViewController.m
// Lighting
//
// Created by 曹云霄 on 2016/11/16.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import "OnlineLearningViewController.h"
@interface OnlineLearningViewController ()<UICollectionViewDelegate,UICollectionViewDataSource>
@end
@implementation OnlineLearningViewController
- (void)viewDidLoad {
[super viewDidLoad];
[self setUpCollectionView];
}
#pragma mark - UICollectionView
- (void)setUpCollectionView
{
}
#pragma mark -
- (void)didReceiveMemoryWarning {
[super didReceiveMemoryWarning];
}
/*
#pragma mark - Navigation
// In a storyboard-based application, you will often want to do a little preparation before navigation
- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
// Get the new view controller using [segue destinationViewController].
// Pass the selected object to the new view controller.
}
*/
@end
......@@ -151,6 +151,8 @@
29C0E73F1DD98335006CCCF9 /* LearningCenter.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 29C0E73E1DD98335006CCCF9 /* LearningCenter.storyboard */; };
29C0E7441DD98943006CCCF9 /* AnnouncementViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29C0E7431DD98943006CCCF9 /* AnnouncementViewController.m */; };
29C30BDB1DDC1EE500CA3E29 /* LearningCenterMainViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29C30BDA1DDC1EE500CA3E29 /* LearningCenterMainViewController.m */; };
29C30BE41DDC3B1300CA3E29 /* OnlineLearningViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29C30BE31DDC3B1300CA3E29 /* OnlineLearningViewController.m */; };
29C30BE71DDC3B4D00CA3E29 /* OnlineLearningTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 29C30BE61DDC3B4D00CA3E29 /* OnlineLearningTableViewCell.m */; };
29C584E91CDA249300C6F677 /* ProductCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 29C584E81CDA249200C6F677 /* ProductCollectionViewCell.m */; };
29C584ED1CDA429500C6F677 /* ProductDetailsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29C584EC1CDA429500C6F677 /* ProductDetailsViewController.m */; };
29CB35421CFF0FB60061A5F3 /* ScreeningCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 29CB35411CFF0FB60061A5F3 /* ScreeningCollectionViewCell.m */; };
......@@ -467,6 +469,10 @@
29C0E7431DD98943006CCCF9 /* AnnouncementViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AnnouncementViewController.m; sourceTree = "<group>"; };
29C30BD91DDC1EE500CA3E29 /* LearningCenterMainViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LearningCenterMainViewController.h; sourceTree = "<group>"; };
29C30BDA1DDC1EE500CA3E29 /* LearningCenterMainViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LearningCenterMainViewController.m; sourceTree = "<group>"; };
29C30BE21DDC3B1300CA3E29 /* OnlineLearningViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OnlineLearningViewController.h; sourceTree = "<group>"; };
29C30BE31DDC3B1300CA3E29 /* OnlineLearningViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OnlineLearningViewController.m; sourceTree = "<group>"; };
29C30BE51DDC3B4D00CA3E29 /* OnlineLearningTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OnlineLearningTableViewCell.h; sourceTree = "<group>"; };
29C30BE61DDC3B4D00CA3E29 /* OnlineLearningTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OnlineLearningTableViewCell.m; sourceTree = "<group>"; };
29C584E71CDA249200C6F677 /* ProductCollectionViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProductCollectionViewCell.h; sourceTree = "<group>"; };
29C584E81CDA249200C6F677 /* ProductCollectionViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ProductCollectionViewCell.m; sourceTree = "<group>"; };
29C584EB1CDA429500C6F677 /* ProductDetailsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProductDetailsViewController.h; sourceTree = "<group>"; };
......@@ -1481,6 +1487,9 @@
29C30BD61DDC0A5000CA3E29 /* OnlineLearning */ = {
isa = PBXGroup;
children = (
29C30BDF1DDC3A8200CA3E29 /* Views */,
29C30BDE1DDC3A7900CA3E29 /* Models */,
29C30BDD1DDC3A6B00CA3E29 /* Controllers */,
);
path = OnlineLearning;
sourceTree = "<group>";
......@@ -1493,12 +1502,61 @@
sourceTree = "<group>";
};
29C30BD81DDC1EB200CA3E29 /* LearningCenterMain */ = {
isa = PBXGroup;
children = (
29C30BE11DDC3A9200CA3E29 /* Views */,
29C30BE01DDC3A8D00CA3E29 /* Models */,
29C30BDC1DDC3A5E00CA3E29 /* Controller */,
);
path = LearningCenterMain;
sourceTree = "<group>";
};
29C30BDC1DDC3A5E00CA3E29 /* Controller */ = {
isa = PBXGroup;
children = (
29C30BD91DDC1EE500CA3E29 /* LearningCenterMainViewController.h */,
29C30BDA1DDC1EE500CA3E29 /* LearningCenterMainViewController.m */,
);
path = LearningCenterMain;
name = Controller;
sourceTree = "<group>";
};
29C30BDD1DDC3A6B00CA3E29 /* Controllers */ = {
isa = PBXGroup;
children = (
29C30BE21DDC3B1300CA3E29 /* OnlineLearningViewController.h */,
29C30BE31DDC3B1300CA3E29 /* OnlineLearningViewController.m */,
);
name = Controllers;
sourceTree = "<group>";
};
29C30BDE1DDC3A7900CA3E29 /* Models */ = {
isa = PBXGroup;
children = (
);
name = Models;
sourceTree = "<group>";
};
29C30BDF1DDC3A8200CA3E29 /* Views */ = {
isa = PBXGroup;
children = (
29C30BE51DDC3B4D00CA3E29 /* OnlineLearningTableViewCell.h */,
29C30BE61DDC3B4D00CA3E29 /* OnlineLearningTableViewCell.m */,
);
name = Views;
sourceTree = "<group>";
};
29C30BE01DDC3A8D00CA3E29 /* Models */ = {
isa = PBXGroup;
children = (
);
name = Models;
sourceTree = "<group>";
};
29C30BE11DDC3A9200CA3E29 /* Views */ = {
isa = PBXGroup;
children = (
);
name = Views;
sourceTree = "<group>";
};
29C584E51CDA246900C6F677 /* controller */ = {
......@@ -1922,6 +1980,7 @@
29BFBD981CE46FDA00C238FB /* MyclientEntityModel.m in Sources */,
29F726041CE1E96E0072FE0E /* ScreeningSecondCollectionReusableView.m in Sources */,
2985AEA11CE72F1500704C91 /* NSArray+ ZXPUnicode.m in Sources */,
29C30BE71DDC3B4D00CA3E29 /* OnlineLearningTableViewCell.m in Sources */,
29EC331F1CE02AFA005F0C13 /* PopoverViewController.m in Sources */,
29BFBD871CE428B200C238FB /* Customermanager.m in Sources */,
299C7F5A1CE21FA800E7D7CB /* AddressViewController.m in Sources */,
......@@ -2025,6 +2084,7 @@
29706DB21CD082990003C412 /* Lighting.xcdatamodeld in Sources */,
2916A74C1D703DFF00644C8C /* PaymentsTableViewCell.m in Sources */,
29E384CB1CE9B0BB00888199 /* HotCollectionViewCell.m in Sources */,
29C30BE41DDC3B1300CA3E29 /* OnlineLearningViewController.m in Sources */,
29834EB91CDF1FB3001A484F /* screeningFirstView.m in Sources */,
29D991DF1DCAE5B700840776 /* LuckyDrawModel.m in Sources */,
299249401CDB4D1D00786B1E /* AddaddressViewController.m in Sources */,
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment