Skip to content

O
Opple-iOS
Commit 2739ee41 authored by 曹云霄's avatar 曹云霄
Browse files
Options

修改项说明：jenkins测试

parent aa4e0c0f
Show whitespace changes
Inline Side-by-side
Showing with 706 additions and 224 deletions
Class/Announcement/AnnouncementViewController.m
View file @ 2739ee41
......@@ -258,7 +258,7 @@
_afficheModel.page = page;
_afficheModel.dayCountEquals = 20;
_afficheModel.sort = @"createDate";
_afficheModel.order = SORTDIRECTION_ASC;
_afficheModel.order = SORTDIRECTION_DESC;
_afficheModel.departIdEquals = [Shoppersmanager manager].Shoppers.employee.departid;
_afficheModel.employeeId = [Shoppersmanager manager].Shoppers.employee.fid;
}
......
Class/Announcement/AnnountcementDetailViewController.h
View file @ 2739ee41
......@@ -16,7 +16,7 @@
/**
公告
*/
@property (nonatomic,strong) TOAfficheEntity *announcementEntity;
@property (nonatomic,strong) CustomTOAfficheEntity *announcementEntity;
/**
已读
......
Class/Announcement/AnnountcementDetailViewController.m
View file @ 2739ee41
......@@ -48,7 +48,7 @@
/**
公告数据源
*/
@property (nonatomic,strong) TOAfficheEntity *afficheResult;
@property (nonatomic,strong) CustomTOAfficheEntity *afficheResult;
......@@ -73,9 +73,10 @@
}
#pragma mark - 设置HeaderView
- (void)setUpTableViewHeaderView:(TOAfficheEntity *)entity
- (void)setUpTableViewHeaderView:(CustomTOAfficheEntity *)entity
{
self.annountcementTitleLabel.text = entity.title;
self.announcementHeaderView.height = entity.titleHeight + 44;
self.annountcementTimeLabel.text = entity.createDate;
self.annountcementTypeLabel.customText = entity.afficheType;
self.annountcementReadCountLabel.text = [NSString stringWithFormat:@"%ld",entity.attachmentUrls.count];
......@@ -104,7 +105,7 @@
[XBLoadingView hideHUDViewWithDefault];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
weakSelf.afficheResult = [[TOAfficheEntity alloc]initWithDictionary:returnValue[@"data"] error:nil];
weakSelf.afficheResult = [[CustomTOAfficheEntity alloc]initWithDictionary:returnValue[@"data"] error:nil];
WkWebViewViewController *webView = [weakSelf.childViewControllers firstObject];
webView.htmlString = weakSelf.afficheResult.content;
[weakSelf setUpTableViewHeaderView:weakSelf.afficheResult];
......
Class/Announcement/CustomTOAfficheEntity.h 0 → 100644
View file @ 2739ee41
//
// CustomTOAfficheEntity.h
// Lighting
//
// Created by 曹云霄 on 2016/12/23.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import "opple_objc_json_client.h"
@interface CustomTOAfficheEntity : TOAfficheEntity
/**
公告标题高度
*/
@property (nonatomic,assign) CGFloat titleHeight;
@end
Class/Announcement/CustomTOAfficheEntity.m 0 → 100644
View file @ 2739ee41
//
// CustomTOAfficheEntity.m
// Lighting
//
// Created by 曹云霄 on 2016/12/23.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import "CustomTOAfficheEntity.h"
@implementation CustomTOAfficheEntity
- (CGFloat)titleHeight
{
if (!_titleHeight) {
_titleHeight = [self.title heightWithFontSize:17 width:ScreenWidth-28*2];
}
return _titleHeight;
}
@end
Class/LearningCenter/ComprehensiveDiscussion/ContentTableViewCell.h
View file @ 2739ee41
......@@ -55,6 +55,6 @@ typedef NS_ENUM(NSInteger,ItemIndex){
/**
内容
*/
@property (weak, nonatomic) IBOutlet UITextView *contentTextView;
@property (weak, nonatomic) IBOutlet ICRPlaceholderTextView *contentTextView;
@end
Class/LearningCenter/ComprehensiveDiscussion/ContentTableViewCell.m
View file @ 2739ee41
......@@ -23,6 +23,7 @@
KeyBoardAccessoryView *toolView = [[KeyBoardAccessoryView alloc] initWithFrame:CGRectMake(0, 0, ScreenWidth, 44)];
toolView.delegate = self;
self.contentTextView.inputAccessoryView = toolView;
self.contentTextView.m_placeHolder = @"请输入内容";
}
#pragma mark - Click
......@@ -74,8 +75,7 @@
#pragma mark - 计算高度
- (CGFloat)calculateStudyIntroductionHeight:(NSString *)content
{
CGSize s = [content boundingRectWithSize:CGSizeMake(ScreenWidth-40, CGFLOAT_MAX) options:NSStringDrawingUsesLineFragmentOrigin | NSStringDrawingUsesFontLeading attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:14]} context:nil].size;
return s.height+20;
return [content heightWithFontSize:14 width:ScreenWidth-40]+20;
}
......
Class/LearningCenter/ComprehensiveDiscussion/CustomTOForumReplyEntity.m
View file @ 2739ee41
......@@ -22,8 +22,7 @@
#pragma mark - 计算高度
- (CGFloat)calculateStudyIntroductionHeight:(NSString *)content
{
CGSize s = [content boundingRectWithSize:CGSizeMake(ScreenWidth-20*2, CGFLOAT_MAX) options:NSStringDrawingUsesLineFragmentOrigin | NSStringDrawingUsesFontLeading attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:13]} context:nil].size;
return s.height;
return [content heightWithFontSize:13 width:ScreenWidth-40];
}
@end
Class/LearningCenter/ComprehensiveDiscussion/CustomTOForumTopicEntity.m
View file @ 2739ee41
......@@ -22,8 +22,7 @@
#pragma mark - 计算高度
- (CGFloat)calculateStudyIntroductionHeight:(NSString *)content
{
CGSize s = [content boundingRectWithSize:CGSizeMake(ScreenWidth-28*2, CGFLOAT_MAX) options:NSStringDrawingUsesLineFragmentOrigin | NSStringDrawingUsesFontLeading attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:13]} context:nil].size;
return s.height;
return [content heightWithFontSize:13 width:ScreenWidth-28*2];
}
@end
Class/LearningCenter/ComprehensiveDiscussion/ForumItemDetailViewController.m
View file @ 2739ee41
......@@ -249,6 +249,9 @@
#pragma mark - 删除帖子
- (IBAction)delecteClickPostAction:(UIButton *)sender
{
[self promptBoxWithMessage:@"确认删除此贴吗？" cancelBlock:^{
NSLog(@"取消");
} sureBlock:^{
[XBLoadingView showHUDViewWithDefault];
WS(weakSelf);
[[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:[NSString stringWithFormat:SERVERREQUESTURL(DELETEPOST),self.topicDetail.fid] WithRequestType:NetworkRequestWithDELETE WithParameter:nil WithReturnValueBlock:^(id returnValue) {
......@@ -268,6 +271,7 @@
[XBLoadingView hideHUDViewWithDefault];
[XBLoadingView showHUDViewWithText:error.localizedDescription];
}];
}];
}
#pragma mark - <TapClickDelegate>
......
Class/LearningCenter/ComprehensiveDiscussion/ReleasePostViewController.m
View file @ 2739ee41
......@@ -360,22 +360,27 @@
- (IBAction)publishButtonClickAction:(UIButton *)sender {
[self.view endEditing:YES];
HeadlineTableViewCell *titleCell = [self.publishTableView cellForRowAtIndexPath:[NSIndexPath indexPathForRow:0 inSection:0]];
ContentTableViewCell *contentCell = [self.publishTableView cellForRowAtIndexPath:[NSIndexPath indexPathForRow:1 inSection:0]];
if ([[self class] isBlankString:titleCell.titleTextField.text]) {
WS(weakSelf);
[self promptBoxWithMessage:@"确认发表吗?" cancelBlock:^{
NSLog(@"取消");
} sureBlock:^{
HeadlineTableViewCell *titleCell = [weakSelf.publishTableView cellForRowAtIndexPath:[NSIndexPath indexPathForRow:0 inSection:0]];
ContentTableViewCell *contentCell = [weakSelf.publishTableView cellForRowAtIndexPath:[NSIndexPath indexPathForRow:1 inSection:0]];
if ([[weakSelf class] isBlankString:titleCell.titleTextField.text]) {
[XBLoadingView showHUDViewWithText:@"标题不能为空"];return;
}
if ([[self class] isBlankString:contentCell.contentTextView.text]) {
if ([[weakSelf class] isBlankString:contentCell.contentTextView.text]) {
[XBLoadingView showHUDViewWithText:@"内容不能为空"];return;
}
WS(weakSelf);
if (self.selectedImageArray.count) {
[self uploadAttachments:^(NSArray *OSSKeys) {
if (weakSelf.selectedImageArray.count) {
[weakSelf uploadAttachments:^(NSArray *OSSKeys) {
[weakSelf submitPost:titleCell.titleTextField.text withContent:contentCell.contentTextView.text withAttachments:OSSKeys];
}];
}else {
[self submitPost:titleCell.titleTextField.text withContent:contentCell.contentTextView.text withAttachments:nil];
[weakSelf submitPost:titleCell.titleTextField.text withContent:contentCell.contentTextView.text withAttachments:nil];
}
}];
}
#pragma mark - 上传图片附件
......
Class/LearningCenter/OnlineLearning/AssessmentViewController.m
View file @ 2739ee41
......@@ -220,6 +220,10 @@
}
studyResult.details = (NSArray<TOStudyResultDetailEntity>*)submitAnswerArray;
studyResult.grade = [NSNumber numberWithInteger:allScore];
//判断考核是否合格
if (self.taskDetails.passGrade < allScore) {
studyResult.examResult = @"1";
}
[XBLoadingView showHUDViewWithDefault];
WS(weakSelf);
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(SUBMITANSWER) WithRequestType:ZERO WithParameter:studyResult WithReturnValueBlock:^(id returnValue) {
......
Class/LearningCenter/OnlineLearning/CustomStudyEntity.m
View file @ 2739ee41
......@@ -54,7 +54,12 @@
NSInteger minute = interval % secondPerHour / secondPerMinute;
// 剩余秒数直接等于秒数对每分钟秒数所取的余数
NSInteger second = interval % secondPerMinute;
return [NSString stringWithFormat:@"%02zd:%02zd:%02zd", hour, minute, second];
NSMutableString *string = [NSMutableString string];
if (hour) {
[string appendString:[NSString stringWithFormat:@"%02zd:",hour]];
}
[string appendString:[NSString stringWithFormat:@"%02zd:%02zd",minute,second]];
return string;
}
return nil;
}
......@@ -63,8 +68,7 @@
#pragma mark - 计算高度
- (CGFloat)calculateStudyIntroductionHeight:(NSString *)content
{
CGSize s = [content boundingRectWithSize:CGSizeMake(ScreenWidth*2/3-28*2, CGFLOAT_MAX) options:NSStringDrawingUsesLineFragmentOrigin | NSStringDrawingUsesFontLeading attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:13]} context:nil].size;
return s.height;
return [content heightWithFontSize:13 width:ScreenWidth*2/3-28*2];
}
......
Class/LearningCenter/OnlineLearning/CustomTOPassLevelTopicEntity.m
View file @ 2739ee41
......@@ -24,8 +24,7 @@
#pragma mark - 计算高度
- (CGFloat)calculateStudyIntroductionHeight:(NSString *)content
{
CGSize s = [content boundingRectWithSize:CGSizeMake(437, CGFLOAT_MAX) options:NSStringDrawingUsesLineFragmentOrigin | NSStringDrawingUsesFontLeading attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:15]} context:nil].size;
return s.height;
return [content heightWithFontSize:15 width:437];
}
@end
Class/LearningCenter/OnlineLearning/CustomTOPassLevelTopicOptionEntity.m
View file @ 2739ee41
......@@ -23,8 +23,7 @@
#pragma mark - 计算高度
- (CGFloat)calculateStudyIntroductionHeight:(NSString *)content
{
CGSize s = [content boundingRectWithSize:CGSizeMake(437, CGFLOAT_MAX) options:NSStringDrawingUsesLineFragmentOrigin | NSStringDrawingUsesFontLeading attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:15]} context:nil].size;
return s.height;
return [content heightWithFontSize:15 width:437];
}
@end
Class/LearningCenter/OnlineLearning/CustomTOStudyTopicEntity.m
View file @ 2739ee41
......@@ -24,8 +24,7 @@
#pragma mark - 计算高度
- (CGFloat)calculateStudyIntroductionHeight:(NSString *)content
{
CGSize s = [content boundingRectWithSize:CGSizeMake(ScreenWidth*2/3-28*2, CGFLOAT_MAX) options:NSStringDrawingUsesLineFragmentOrigin | NSStringDrawingUsesFontLeading attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:13]} context:nil].size;
return s.height;
return [content heightWithFontSize:13 width:ScreenWidth*2/3-28*2];
}
@end
Class/LearningCenter/OnlineLearning/CustomTOStudyTopicOptionEntity.m
View file @ 2739ee41
......@@ -22,8 +22,7 @@
#pragma mark - 计算高度
- (CGFloat)calculateStudyIntroductionHeight:(NSString *)content
{
CGSize s = [content boundingRectWithSize:CGSizeMake(ScreenWidth*2/3-28*2, CGFLOAT_MAX) options:NSStringDrawingUsesLineFragmentOrigin | NSStringDrawingUsesFontLeading attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:13]} context:nil].size;
return s.height;
return [content heightWithFontSize:13 width:ScreenWidth*2/3-28*2];
}
@end
Class/LearningCenter/OnlineLearning/OnlineLearningViewController.m
View file @ 2739ee41
......@@ -35,6 +35,7 @@
self.onlineLearningFlowLayout.sectionInset = UIEdgeInsetsMake(20, 20, 20, 20);
self.onlineLearningFlowLayout.minimumLineSpacing = 20;
self.onlineLearningFlowLayout.minimumInteritemSpacing = 20;
}
#pragma mark - 学习模块数据
......
Class/LearningCenter/OnlineLearning/PPTListItemTableViewCell.h
View file @ 2739ee41
......@@ -21,10 +21,6 @@
*/
@property (weak, nonatomic) IBOutlet UILabel *studyItemTitleLabel;
/**
PPT播放进度
*/
@property (weak, nonatomic) IBOutlet PNCircleChart *seekbarView;
/**
学习时间
......
Class/LearningCenter/OnlineLearning/VideoHelperViewController.h
View file @ 2739ee41
......@@ -8,6 +8,7 @@
#import "BaseViewController.h"
#import <AVFoundation/AVFoundation.h>
#import <MediaPlayer/MediaPlayer.h>
#import "VIMediaCache.h"
@protocol VideoPlayerDelegate <NSObject>
......
Class/LearningCenter/OnlineLearning/VideoHelperViewController.m
View file @ 2739ee41
......@@ -8,9 +8,12 @@
#import "VideoHelperViewController.h"
@interface VideoHelperViewController ()<UIDocumentInteractionControllerDelegate>
{
UISlider* volumeViewSlider;//保存需要改变的量
float systemVolume;//系统音量值
CGPoint startPoint;//起始位置
}
/**
......@@ -34,6 +37,17 @@
self.videoNavigationView.backgroundColor = [[UIColor blackColor] colorWithAlphaComponent:0.5];
self.videoToolView.backgroundColor = [[UIColor blackColor] colorWithAlphaComponent:0.5];
[self.view addGestureRecognizer:[[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(hideOrShowNavigationBarAndToolBar)]];
//获取系统音量
MPVolumeView *volumeView = [[MPVolumeView alloc] init];
volumeViewSlider = nil;
for (UIView *view in [volumeView subviews]){
if ([view.class.description isEqualToString:@"MPVolumeSlider"]){
volumeViewSlider = (UISlider *)view;
break;
}
}
systemVolume = volumeViewSlider.value;
}
......@@ -216,6 +230,7 @@
#pragma mark - 页面消失后释放播放器
- (void)viewDidDisappear:(BOOL)animated
{
[super viewDidDisappear:animated];
[self.customPlayer pause];
[self.customPlayer.currentItem cancelPendingSeeks];
[self.customPlayer.currentItem.asset cancelLoading];
......@@ -241,6 +256,66 @@
[[NSNotificationCenter defaultCenter] removeObserver:self];
}
#pragma mark -开始滑动时
-(void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event{
if(event.allTouches.count == 1){
//保存当前触摸的位置
CGPoint point = [[touches anyObject] locationInView:self.view];
startPoint = point;
}
}
#pragma mark -手势滑动的距离
-(void)touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event{
if(event.allTouches.count == 1){
//计算位移
CGPoint point = [[touches anyObject] locationInView:self.view];
float dy = point.y - startPoint.y;
int index = (int)dy;
//20是因为排除横向滑动时的偏差
if(index > 20){
if(index%5==0){//每10个像素声音减一格
if(systemVolume > 0.1){
systemVolume = systemVolume-0.05;
[volumeViewSlider setValue:systemVolume animated:YES];
[volumeViewSlider sendActionsForControlEvents:UIControlEventTouchUpInside];
}
}
}else if (index < -20){
if(index%5==0){//每10个像素声音增加一格
if(systemVolume>=0 && systemVolume<1){
systemVolume = systemVolume+0.05;
[volumeViewSlider setValue:systemVolume animated:YES];
[volumeViewSlider sendActionsForControlEvents:UIControlEventTouchUpInside];
}
}
}
//音量调节
[self volumeSet:volumeViewSlider];
}
}
#pragma mark -调节音量
- (void)volumeSet:(UISlider *)slider
{
NSArray *audioTracks = [self.playerItem.asset tracksWithMediaType:AVMediaTypeAudio];
NSMutableArray *allAudioParams = [NSMutableArray array];
for (AVAssetTrack *track in audioTracks) {
AVMutableAudioMixInputParameters *audioInputParams =
[AVMutableAudioMixInputParameters audioMixInputParameters];
[audioInputParams setVolume:slider.value atTime:kCMTimeZero];
[audioInputParams setTrackID:[track trackID]];
[allAudioParams addObject:audioInputParams];
}
AVMutableAudioMix *audioMix = [AVMutableAudioMix audioMix];
[audioMix setInputParameters:allAudioParams];
[self.playerItem setAudioMix:audioMix];
}
- (void)dealloc
{
[self customDealloc];
......
Class/LearningCenter/OnlineLearning/VideoListItemTableViewCell.h
View file @ 2739ee41
......@@ -24,7 +24,7 @@
/**
播放进度
*/
@property (weak, nonatomic) IBOutlet PNCircleChart *seekbarView;
@property (weak, nonatomic) IBOutlet UIView *seekbarView;
/**
学习时间
......@@ -36,4 +36,9 @@
*/
@property (nonatomic,strong) CustomStudyEntity *model;
/**
* 学习进度
*/
@property (nonatomic,strong) PNCircleChart *studyProgressView;
@end
Class/LearningCenter/OnlineLearning/VideoListItemTableViewCell.m
View file @ 2739ee41
......@@ -13,6 +13,12 @@
- (void)awakeFromNib {
[super awakeFromNib];
// Initialization code
self.studyProgressView = [[PNCircleChart alloc]initWithFrame:CGRectMake(0, 0, 30, 30) total:@100 current:@0 clockwise:YES shadow:YES shadowColor:[UIColor lightGrayColor] displayCountingLabel:YES overrideLineWidth:@2];
[self.studyProgressView setStrokeColor:[UIColor colorWithHue:0.00 saturation:0.50 brightness:0.93 alpha:1.00]];
[self.studyProgressView strokeChart];
self.studyProgressView.countingLabel.font = [UIFont systemFontOfSize:8];
[self.seekbarView addSubview:self.studyProgressView];
}
......@@ -21,6 +27,7 @@
_model = model;
self.studyItemTitleLabel.text = _model.title;
self.studyItemTimeLabel.text = _model.videoLength;
[self.studyProgressView updateChartByCurrent:@50];
}
@end
Class/LearningCenter/SkillsAssessment/EmigratedMainViewController.m
View file @ 2739ee41
......@@ -96,6 +96,8 @@
- (void)selectApplicableAction:(UITapGestureRecognizer *)sender
{
TOPassLevelEntity *entity = self.emigratedResponse.passLevelEntity[sender.view.tag];
AnswerViewController *answer = [[[self class] getLearningCenterStoryboardClass] instantiateViewControllerWithIdentifier:@"AnswerViewController"];
answer.delegate = self;
answer.passLevelId = entity.fid;
......
Class/RightViewController.m
View file @ 2739ee41
......@@ -59,9 +59,9 @@
{
if (_dataArray == nil) {
_dataArray = [NSMutableArray arrayWithObjects:@"体验中心",@"场景库",@"产品库",@"客户管理",@"学习中心",@"关于", nil];
// if (![[Shoppersmanager manager].Shoppers.employee.userKey isEqualToString:@"学习人员"]) {
// [_dataArray removeObject:@"学习中心"];
// }
if (![[Shoppersmanager manager].Shoppers.employee.userKey isEqualToString:@"学习人员"]) {
[_dataArray removeObject:@"学习中心"];
}
}
return _dataArray;
}
......
Lighting.xcodeproj/project.pbxproj
View file @ 2739ee41
......@@ -111,9 +111,7 @@
29702B631D72EE2E00322196 /* RebateDetailsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29702B621D72EE2E00322196 /* RebateDetailsViewController.m */; };
29706DA61CD082990003C412 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29706DA51CD082990003C412 /* main.m */; };
29706DA91CD082990003C412 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 29706DA81CD082990003C412 /* AppDelegate.m */; };
29706DB21CD082990003C412 /* Lighting.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 29706DB01CD082990003C412 /* Lighting.xcdatamodeld */; };
29706DB41CD082990003C412 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 29706DB31CD082990003C412 /* Assets.xcassets */; };
29706DB71CD082990003C412 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 29706DB51CD082990003C412 /* LaunchScreen.storyboard */; };
2971E9731DF6623400256567 /* AssessmentViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2971E9721DF6623400256567 /* AssessmentViewController.m */; };
2971E9761DF6626A00256567 /* AssessmentTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 2971E9751DF6626A00256567 /* AssessmentTableViewCell.m */; };
2971E9791DF662A700256567 /* AssessmentHeaderView.m in Sources */ = {isa = PBXBuildFile; fileRef = 2971E9781DF662A700256567 /* AssessmentHeaderView.m */; };
......@@ -247,6 +245,9 @@
29D260FB1CEECDFF00A9787D /* goodsDetailsTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 29D260FA1CEECDFF00A9787D /* goodsDetailsTableViewCell.m */; };
29D260FD1CEED53400A9787D /* goodsDetailsTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 29D260FC1CEED53400A9787D /* goodsDetailsTableViewCell.xib */; };
29D261001CEEF16D00A9787D /* MjRefreshHeaderCustom.m in Sources */ = {isa = PBXBuildFile; fileRef = 29D260FF1CEEF16D00A9787D /* MjRefreshHeaderCustom.m */; };
29D4C2991E0CE90800D256C0 /* CustomTOAfficheEntity.m in Sources */ = {isa = PBXBuildFile; fileRef = 29D4C2981E0CE90800D256C0 /* CustomTOAfficheEntity.m */; };
29D4C29C1E0CEA2300D256C0 /* NSString+Category.m in Sources */ = {isa = PBXBuildFile; fileRef = 29D4C29B1E0CEA2300D256C0 /* NSString+Category.m */; };
29D4C2A01E0CEF5800D256C0 /* ICRPlaceholderTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = 29D4C29F1E0CEF5800D256C0 /* ICRPlaceholderTextView.m */; };
29E28CE81CE0B91B00812A55 /* HENLENSONG.m in Sources */ = {isa = PBXBuildFile; fileRef = 29E28CE71CE0B91B00812A55 /* HENLENSONG.m */; };
29E2D3201DB8737000443170 /* CardViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29E2D31F1DB8737000443170 /* CardViewController.m */; };
29E2D3241DB878F200443170 /* XLPlainFlowLayout.m in Sources */ = {isa = PBXBuildFile; fileRef = 29E2D3231DB878F200443170 /* XLPlainFlowLayout.m */; };
......@@ -507,9 +508,7 @@
29706DA51CD082990003C412 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
29706DA71CD082990003C412 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
29706DA81CD082990003C412 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
29706DB11CD082990003C412 /* Lighting.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = Lighting.xcdatamodel; sourceTree = "<group>"; };
29706DB31CD082990003C412 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
29706DB61CD082990003C412 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
29706DB81CD082990003C412 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
2971E9711DF6623400256567 /* AssessmentViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AssessmentViewController.h; sourceTree = "<group>"; };
2971E9721DF6623400256567 /* AssessmentViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AssessmentViewController.m; sourceTree = "<group>"; };
......@@ -762,6 +761,12 @@
29D260FC1CEED53400A9787D /* goodsDetailsTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = goodsDetailsTableViewCell.xib; sourceTree = "<group>"; };
29D260FE1CEEF16D00A9787D /* MjRefreshHeaderCustom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MjRefreshHeaderCustom.h; sourceTree = "<group>"; };
29D260FF1CEEF16D00A9787D /* MjRefreshHeaderCustom.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MjRefreshHeaderCustom.m; sourceTree = "<group>"; };
29D4C2971E0CE90800D256C0 /* CustomTOAfficheEntity.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CustomTOAfficheEntity.h; sourceTree = "<group>"; };
29D4C2981E0CE90800D256C0 /* CustomTOAfficheEntity.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CustomTOAfficheEntity.m; sourceTree = "<group>"; };
29D4C29A1E0CEA2300D256C0 /* NSString+Category.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSString+Category.h"; sourceTree = "<group>"; };
29D4C29B1E0CEA2300D256C0 /* NSString+Category.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSString+Category.m"; sourceTree = "<group>"; };
29D4C29E1E0CEF5800D256C0 /* ICRPlaceholderTextView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ICRPlaceholderTextView.h; sourceTree = "<group>"; };
29D4C29F1E0CEF5800D256C0 /* ICRPlaceholderTextView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ICRPlaceholderTextView.m; sourceTree = "<group>"; };
29E28CE61CE0B91B00812A55 /* HENLENSONG.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HENLENSONG.h; sourceTree = "<group>"; };
29E28CE71CE0B91B00812A55 /* HENLENSONG.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HENLENSONG.m; sourceTree = "<group>"; };
29E2D31E1DB8737000443170 /* CardViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CardViewController.h; sourceTree = "<group>"; };
......@@ -1087,6 +1092,7 @@
2928F7DE1CD085430036D761 /* Tools */ = {
isa = PBXGroup;
children = (
29D4C29D1E0CEF5800D256C0 /* TextView */,
2972312F1E0948BE00D8CA9B /* Bank */,
298111131DFE6DFC00F7EAFF /* Category */,
2981110B1DFE5FFB00F7EAFF /* OSSHelper */,
......@@ -1450,9 +1456,7 @@
isa = PBXGroup;
children = (
29706DB31CD082990003C412 /* Assets.xcassets */,
29706DB51CD082990003C412 /* LaunchScreen.storyboard */,
29706DB81CD082990003C412 /* Info.plist */,
29706DB01CD082990003C412 /* Lighting.xcdatamodeld */,
29807C611CD20C2A00F111B8 /* Images.xcassets */,
29706DA51CD082990003C412 /* main.m */,
);
......@@ -1651,6 +1655,8 @@
298111111DFE674600F7EAFF /* UIImage+Fit.m */,
298111141DFE6E5000F7EAFF /* NSDate+Formatting.h */,
298111151DFE6E5000F7EAFF /* NSDate+Formatting.m */,
29D4C29A1E0CEA2300D256C0 /* NSString+Category.h */,
29D4C29B1E0CEA2300D256C0 /* NSString+Category.m */,
);
path = Category;
sourceTree = "<group>";
......@@ -2006,6 +2012,7 @@
29FF55441DE5F29400406852 /* AnnountcementDetailViewController.m */,
29ABA6E81DE686D5007D8012 /* WkWebViewViewController.h */,
29ABA6E91DE686D5007D8012 /* WkWebViewViewController.m */,
29D4C2961E0CE8F000D256C0 /* Models */,
29837B521DE598E8009CF614 /* Cells */,
29837B511DE598C9009CF614 /* CustomLabels */,
);
......@@ -2193,6 +2200,24 @@
name = FullScreen;
sourceTree = "<group>";
};
29D4C2961E0CE8F000D256C0 /* Models */ = {
isa = PBXGroup;
children = (
29D4C2971E0CE90800D256C0 /* CustomTOAfficheEntity.h */,
29D4C2981E0CE90800D256C0 /* CustomTOAfficheEntity.m */,
);
name = Models;
sourceTree = "<group>";
};
29D4C29D1E0CEF5800D256C0 /* TextView */ = {
isa = PBXGroup;
children = (
29D4C29E1E0CEF5800D256C0 /* ICRPlaceholderTextView.h */,
29D4C29F1E0CEF5800D256C0 /* ICRPlaceholderTextView.m */,
);
path = TextView;
sourceTree = "<group>";
};
29E28CE51CE0B90600812A55 /* Regularexpressions */ = {
isa = PBXGroup;
children = (
......@@ -2551,7 +2576,6 @@
29EAAE901CDC3E9700C4DBA2 /* BillingInfoView.xib in Resources */,
29B78C241DFA9BB900C7C6D8 /* emoji.json in Resources */,
29C0E73D1DD9824E006CCCF9 /* Announcement.storyboard in Resources */,
29706DB71CD082990003C412 /* LaunchScreen.storyboard in Resources */,
29E2D3291DB8918100443170 /* CardOrderInformationReusableView.xib in Resources */,
29E2D33D1DB8BE7F00443170 /* CardAmplificationViewController.xib in Resources */,
29698D621CE2C11500D72CE7 /* SettlementViewController.xib in Resources */,
......@@ -2749,6 +2773,7 @@
2978CEFE1DF815DD0063CBEA /* CustomTOPassLevelTopicOptionEntity.m in Sources */,
297E12361DF8FEAF00C57D90 /* EmigratedFinishViewController.m in Sources */,
29CB35421CFF0FB60061A5F3 /* ScreeningCollectionViewCell.m in Sources */,
29D4C2991E0CE90800D256C0 /* CustomTOAfficheEntity.m in Sources */,
2994C0151CFBE793005A80AF /* PayViewController.m in Sources */,
2981110E1DFE5FFB00F7EAFF /* OSSHelper.m in Sources */,
2925D03D1CFEE5D7008879BC /* ScreeningTableViewCell.m in Sources */,
......@@ -2811,7 +2836,9 @@
29BAA3AB1DC9FB5B00927D04 /* PromptTableViewCell.m in Sources */,
29EAAE9C1CDC74CA00C4DBA2 /* AllCustomerViewController.m in Sources */,
297BA2C71DE94D3300474F79 /* VIContentInfo.m in Sources */,
29D4C2A01E0CEF5800D256C0 /* ICRPlaceholderTextView.m in Sources */,
2972312B1E09231C00D8CA9B /* BindingTableViewCell.m in Sources */,
29D4C29C1E0CEA2300D256C0 /* NSString+Category.m in Sources */,
29E944421DE3EC7C007CD26C /* PrizeMainViewController.m in Sources */,
2933934F1CD3158B000D997B /* instructionsLabe.m in Sources */,
29F726011CE1D05D0072FE0E /* ScreeningCollectionReusableView.m in Sources */,
......@@ -2848,7 +2875,6 @@
29837B591DE59E09009CF614 /* AnnouncementTableViewCell.m in Sources */,
29C30BDB1DDC1EE500CA3E29 /* LearningCenterMainViewController.m in Sources */,
2949BABD1CD2EFA00049385A /* InformationTableViewCell.m in Sources */,
29706DB21CD082990003C412 /* Lighting.xcdatamodeld in Sources */,
2916A74C1D703DFF00644C8C /* PaymentsTableViewCell.m in Sources */,
29E384CB1CE9B0BB00888199 /* HotCollectionViewCell.m in Sources */,
2986B9A51DE1D30700F4A1CF /* PromotionChooseViewController.m in Sources */,
......@@ -2929,17 +2955,6 @@
};
/* End PBXSourcesBuildPhase section */
/* Begin PBXVariantGroup section */
29706DB51CD082990003C412 /* LaunchScreen.storyboard */ = {
isa = PBXVariantGroup;
children = (
29706DB61CD082990003C412 /* Base */,
);
name = LaunchScreen.storyboard;
sourceTree = "<group>";
};
/* End PBXVariantGroup section */
/* Begin XCBuildConfiguration section */
29706DB91CD082990003C412 /* Debug */ = {
isa = XCBuildConfiguration;
......@@ -3038,7 +3053,7 @@
baseConfigurationReference = 296F2AB206FEE715A29133A2 /* Pods-Lighting.debug.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = "Brand Assets";
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
CLANG_ENABLE_OBJC_WEAK = YES;
CODE_SIGN_IDENTITY = "iPhone Developer: 云霄 曹 (WM8ZU7YY98)";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
......@@ -3098,7 +3113,7 @@
baseConfigurationReference = 76F03CC259F648C692EA812D /* Pods-Lighting.release.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = "Brand Assets";
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
CLANG_ENABLE_OBJC_WEAK = YES;
CODE_SIGN_IDENTITY = "iPhone Developer: 云霄 曹 (WM8ZU7YY98)";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
......@@ -3175,19 +3190,6 @@
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */
/* Begin XCVersionGroup section */
29706DB01CD082990003C412 /* Lighting.xcdatamodeld */ = {
isa = XCVersionGroup;
children = (
29706DB11CD082990003C412 /* Lighting.xcdatamodel */,
);
currentVersion = 29706DB11CD082990003C412 /* Lighting.xcdatamodel */;
path = Lighting.xcdatamodeld;
sourceTree = "<group>";
versionGroupType = wrapper.xcdatamodel;
};
/* End XCVersionGroup section */
};
rootObject = 29706D991CD082980003C412 /* Project object */;
}
Lighting/Announcement.storyboard
View file @ 2739ee41
......@@ -2,6 +2,7 @@
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11201" systemVersion="16B2555" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11161"/>
<capability name="Constraints to layout margins" minToolsVersion="6.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
......@@ -24,7 +25,7 @@
<rect key="frame" x="0.0" y="28" width="768" height="80"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="JBe-hh-kVA" id="xVc-uc-PDl">
<frame key="frameInset" width="702" height="79.5"/>
<frame key="frameInset" width="702" height="79"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="品牌咨询" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="uFh-Bz-DRu" customClass="CustomBorderLabel">
......@@ -36,7 +37,7 @@
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vAA-od-PUc">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="asdasd ]" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vAA-od-PUc">
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
......@@ -55,6 +56,7 @@
<constraint firstItem="BYW-aT-dKb" firstAttribute="centerY" secondItem="vAA-od-PUc" secondAttribute="centerY" id="Mab-nh-kQV"/>
<constraint firstItem="uFh-Bz-DRu" firstAttribute="leading" secondItem="xVc-uc-PDl" secondAttribute="leading" constant="30" id="OiS-2m-KgZ"/>
<constraint firstItem="vAA-od-PUc" firstAttribute="centerY" secondItem="uFh-Bz-DRu" secondAttribute="centerY" id="gkM-Tm-POO"/>
<constraint firstAttribute="trailingMargin" relation="greaterThanOrEqual" secondItem="vAA-od-PUc" secondAttribute="trailing" constant="40" id="gpH-0L-xvx"/>
<constraint firstItem="BYW-aT-dKb" firstAttribute="leading" secondItem="vAA-od-PUc" secondAttribute="trailing" constant="10" id="q0T-Hj-pYL"/>
<constraint firstItem="cUg-l9-anJ" firstAttribute="leading" secondItem="uFh-Bz-DRu" secondAttribute="leading" id="qps-Gp-LAB"/>
</constraints>
......@@ -118,7 +120,7 @@
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="ZlE-0z-IZL" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="255" y="-364"/>
<point key="canvasLocation" x="149" y="-394"/>
</scene>
<!--Annountcement Detail View Controller-->
<scene sceneID="PAg-Vx-GQr">
......@@ -138,37 +140,32 @@
<rect key="frame" x="0.0" y="0.0" width="536" height="80"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="t4k-fa-t7j">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="啊实打实的啊实打实的啊实" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="t4k-fa-t7j">
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8Ae-Oz-bjL" customClass="CustomBorderLabel">
<constraints>
<constraint firstAttribute="width" constant="60" id="7I8-X3-qWy"/>
<constraint firstAttribute="height" constant="20" id="At8-nH-Hlq"/>
<constraint firstAttribute="width" constant="60" id="LpT-46-xYu"/>
<constraint firstAttribute="height" constant="20" id="S7k-wA-dqR"/>
</constraints>
<fontDescription key="fontDescription" type="system" weight="medium" pointSize="12"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gDl-gb-obg">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="但是" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gDl-gb-obg">
<fontDescription key="fontDescription" type="system" pointSize="12"/>
<color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="read" translatesAutoresizingMaskIntoConstraints="NO" id="J6n-Aw-3EN">
<constraints>
<constraint firstAttribute="height" constant="15" id="6vl-HP-Quh"/>
<constraint firstAttribute="width" constant="15" id="YOD-1b-qms"/>
</constraints>
</imageView>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="read" translatesAutoresizingMaskIntoConstraints="NO" id="J6n-Aw-3EN"/>
<view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="8EW-gp-rKg">
<frame key="frameInset" height="1" maxX="-0.5"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
<color key="backgroundColor" red="0.92941176469999998" green="0.93333333330000001" blue="0.93725490199999995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9he-pL-hOf">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9he-pL-hOf">
<fontDescription key="fontDescription" type="system" pointSize="12"/>
<color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
......@@ -176,17 +173,17 @@
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstItem="8Ae-Oz-bjL" firstAttribute="leading" secondItem="t4k-fa-t7j" secondAttribute="leading" id="2m0-OM-40q"/>
<constraint firstItem="t4k-fa-t7j" firstAttribute="leading" secondItem="Fm8-gj-pKn" secondAttribute="leading" constant="28" id="AR9-SM-eCc"/>
<constraint firstItem="9he-pL-hOf" firstAttribute="leading" secondItem="J6n-Aw-3EN" secondAttribute="trailing" constant="15" id="Gv4-N5-A6U"/>
<constraint firstAttribute="trailing" secondItem="t4k-fa-t7j" secondAttribute="trailing" constant="28" id="RLD-Bi-Idk"/>
<constraint firstItem="t4k-fa-t7j" firstAttribute="centerY" secondItem="Fm8-gj-pKn" secondAttribute="centerY" constant="-12" id="ZKZ-dv-Ebj"/>
<constraint firstItem="9he-pL-hOf" firstAttribute="centerY" secondItem="J6n-Aw-3EN" secondAttribute="centerY" id="hQU-oS-JMg"/>
<constraint firstItem="gDl-gb-obg" firstAttribute="leading" secondItem="8Ae-Oz-bjL" secondAttribute="trailing" constant="15" id="oXD-0n-nDP"/>
<constraint firstItem="J6n-Aw-3EN" firstAttribute="leading" secondItem="gDl-gb-obg" secondAttribute="trailing" constant="40" id="rZa-Av-agw"/>
<constraint firstItem="8Ae-Oz-bjL" firstAttribute="centerY" secondItem="Fm8-gj-pKn" secondAttribute="centerY" constant="12" id="tPB-V5-MQc"/>
<constraint firstItem="J6n-Aw-3EN" firstAttribute="centerY" secondItem="gDl-gb-obg" secondAttribute="centerY" id="uaT-sv-vn9"/>
<constraint firstItem="gDl-gb-obg" firstAttribute="centerY" secondItem="8Ae-Oz-bjL" secondAttribute="centerY" id="wN0-tc-Pv2"/>
<constraint firstItem="J6n-Aw-3EN" firstAttribute="leading" secondItem="gDl-gb-obg" secondAttribute="trailing" constant="40" id="0Xl-eV-DxD"/>
<constraint firstItem="9he-pL-hOf" firstAttribute="leading" secondItem="J6n-Aw-3EN" secondAttribute="trailing" constant="15" id="3hk-2F-o9q"/>
<constraint firstItem="t4k-fa-t7j" firstAttribute="top" secondItem="Fm8-gj-pKn" secondAttribute="top" constant="10" id="7aV-s1-KpH"/>
<constraint firstItem="gDl-gb-obg" firstAttribute="leading" secondItem="8Ae-Oz-bjL" secondAttribute="trailing" constant="15" id="EcA-xx-zHE"/>
<constraint firstItem="t4k-fa-t7j" firstAttribute="leading" secondItem="Fm8-gj-pKn" secondAttribute="leading" constant="28" id="Lah-yA-Hhj"/>
<constraint firstItem="J6n-Aw-3EN" firstAttribute="centerY" secondItem="gDl-gb-obg" secondAttribute="centerY" id="MSt-qC-utw"/>
<constraint firstItem="8Ae-Oz-bjL" firstAttribute="top" secondItem="t4k-fa-t7j" secondAttribute="bottom" constant="3" id="N7v-WA-9P9"/>
<constraint firstAttribute="trailing" secondItem="t4k-fa-t7j" secondAttribute="trailing" constant="28" id="Q0G-nZ-gMn"/>
<constraint firstItem="8Ae-Oz-bjL" firstAttribute="leading" secondItem="t4k-fa-t7j" secondAttribute="leading" id="QDk-gI-XP5"/>
<constraint firstItem="9he-pL-hOf" firstAttribute="centerY" secondItem="J6n-Aw-3EN" secondAttribute="centerY" id="cWD-hE-Xo2"/>
<constraint firstItem="gDl-gb-obg" firstAttribute="centerY" secondItem="8Ae-Oz-bjL" secondAttribute="centerY" id="yLy-7N-qxL"/>
</constraints>
</view>
<prototypes>
......@@ -214,7 +211,7 @@
<nil key="highlightedColor"/>
</label>
<view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ARf-Lp-SSe">
<frame key="frameInset" minX="27" height="1" maxX="-228"/>
<frame key="frameInset" minX="26.5" height="1" maxX="-228"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
<color key="backgroundColor" red="0.92941176469999998" green="0.93333333330000001" blue="0.93725490199999995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</view>
......
Lighting/Images.xcassets/Brand Assets.launchimage/Contents.json → Lighting/Assets.xcassets/LaunchImage.launchimage/Contents.json
View file @ 2739ee41
{
"images" : [
{
"orientation" : "portrait",
"orientation" : "landscape",
"idiom" : "ipad",
"extent" : "full-screen",
"minimum-system-version" : "7.0",
"filename" : "00启动页iPadLandscapeWOSBiOS56_1024x748pt.png",
"extent" : "to-status-bar",
"scale" : "1x"
},
{
"orientation" : "landscape",
"idiom" : "ipad",
"filename" : "00启动页iPadLandscapeiOS56_1024x768pt.png",
"extent" : "full-screen",
"minimum-system-version" : "7.0",
"scale" : "1x"
},
{
"orientation" : "portrait",
"orientation" : "landscape",
"idiom" : "ipad",
"filename" : "00启动页iPadLandscapeWOSBiOS56_1024x748pt@2x.png",
"extent" : "to-status-bar",
"scale" : "2x"
},
{
"orientation" : "landscape",
"idiom" : "ipad",
"filename" : "00启动页iPadLandscapeiOS56_1024x768pt@2x.png",
"extent" : "full-screen",
"minimum-system-version" : "7.0",
"scale" : "2x"
},
{
"extent" : "full-screen",
"idiom" : "iphone",
"subtype" : "736h",
"filename" : "00启动页iPhoneLandscapeiOS89_736x414pt@3x.png",
"minimum-system-version" : "8.0",
"orientation" : "landscape",
"scale" : "3x"
},
{
"orientation" : "landscape",
"idiom" : "ipad",
"filename" : "00启动页iPadLandscapeiOS789_1024x768pt.png",
"extent" : "full-screen",
"minimum-system-version" : "7.0",
"scale" : "1x"
},
{
"orientation" : "landscape",
"idiom" : "ipad",
"filename" : "00启动页iPadLandscapeiOS789_1024x768pt@2x.png",
"extent" : "full-screen",
"minimum-system-version" : "7.0",
"scale" : "2x"
......
Lighting/Base.lproj/LaunchScreen.storyboard deleted 100644 → 0
View file @ aa4e0c0f
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="16B2555" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" initialViewController="01J-lp-oVM">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
<capability name="Constraints to layout margins" minToolsVersion="6.0"/>
</dependencies>
<scenes>
<!--View Controller-->
<scene sceneID="EHf-IW-A2E">
<objects>
<viewController id="01J-lp-oVM" sceneMemberID="viewController">
<layoutGuides>
<viewControllerLayoutGuide type="top" id="Llm-lL-Icb"/>
<viewControllerLayoutGuide type="bottom" id="xb3-aO-Qok"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="00启动页" translatesAutoresizingMaskIntoConstraints="NO" id="xXC-mz-iPM">
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
</imageView>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
<constraints>
<constraint firstAttribute="trailingMargin" secondItem="xXC-mz-iPM" secondAttribute="trailing" constant="-20" id="L0G-Ig-b2y"/>
<constraint firstItem="xXC-mz-iPM" firstAttribute="leading" secondItem="Ze5-6b-2t3" secondAttribute="leadingMargin" constant="-20" id="qH8-9x-qeD"/>
<constraint firstItem="xXC-mz-iPM" firstAttribute="top" secondItem="Ze5-6b-2t3" secondAttribute="topMargin" id="rSq-mE-Nly"/>
<constraint firstItem="xb3-aO-Qok" firstAttribute="top" secondItem="xXC-mz-iPM" secondAttribute="bottom" id="yv0-m0-dDV"/>
</constraints>
</view>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="520" y="307"/>
</scene>
</scenes>
<resources>
<image name="00启动页" width="1500" height="1125"/>
</resources>
</document>
Lighting/GuideIntegral.storyboard
View file @ 2739ee41
......@@ -30,7 +30,7 @@
<color key="textColor" red="0.66666666669999997" green="0.66666666669999997" blue="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="12345" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="luv-aV-HGH">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="luv-aV-HGH">
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" red="0.98039215690000003" green="0.32156862749999998" blue="0.050980392159999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
......@@ -67,11 +67,11 @@
<constraint firstAttribute="height" constant="50" id="PcL-VR-NJS"/>
</constraints>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="12" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YJy-KV-6XP">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YJy-KV-6XP">
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="12" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0Eh-Eu-GWV">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0Eh-Eu-GWV">
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="highlightedColor"/>
</label>
......
Lighting/Images.xcassets/00启动页.imageset/Contents.json → Lighting/Images.xcassets/通过.imageset/Contents.json
View file @ 2739ee41
......@@ -2,15 +2,17 @@
"images" : [
{
"idiom" : "universal",
"filename" : "00启动页.jpg",
"filename" : "通过.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "通过@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "通过@3x.png",
"scale" : "3x"
}
],
......
Lighting/Info.plist
View file @ 2739ee41
......@@ -72,8 +72,6 @@
<string>App需要您的同意,才能访问相机</string>
<key>NSPhotoLibraryUsageDescription</key>
<string>App需要您的同意,才能访问相册</string>
<key>UILaunchStoryboardName</key>
<string>LaunchScreen</string>
<key>UIMainStoryboardFile</key>
<string>OppleMain</string>
<key>UIMainStoryboardFile~ipad</key>
......
Lighting/LearningCenter.storyboard
View file @ 2739ee41
......@@ -228,11 +228,11 @@
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="90" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="Ogf-Th-qTY">
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" selectionStyle="none" accessoryType="disclosureIndicator" indentationWidth="10" reuseIdentifier="ForumTableViewCell" rowHeight="90" id="gz9-gD-P6A" customClass="ForumTableViewCell">
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" accessoryType="disclosureIndicator" indentationWidth="10" reuseIdentifier="ForumTableViewCell" rowHeight="90" id="gz9-gD-P6A" customClass="ForumTableViewCell">
<rect key="frame" x="0.0" y="28" width="1024" height="90"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="gz9-gD-P6A" id="4lI-td-FE0">
<frame key="frameInset" width="830" height="89"/>
<frame key="frameInset" width="830" height="89.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="00登录-谭" translatesAutoresizingMaskIntoConstraints="NO" id="tIu-Ox-DXo">
......@@ -428,7 +428,7 @@
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="172" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="mCC-Hw-JZs">
<color key="backgroundColor" red="0.92941176470588238" green="0.93333333333333335" blue="0.93725490196078431" alpha="1" colorSpace="calibratedRGB"/>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="ForumItemTableViewCell" rowHeight="253" id="KPa-ue-ynj" customClass="ForumItemTableViewCell">
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="ForumItemTableViewCell" rowHeight="253" id="KPa-ue-ynj" customClass="ForumItemTableViewCell">
<rect key="frame" x="0.0" y="28" width="1024" height="253"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KPa-ue-ynj" id="fqg-6x-xYw">
......@@ -600,8 +600,8 @@
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" dataMode="prototypes" style="grouped" separatorStyle="none" rowHeight="44" sectionHeaderHeight="18" sectionFooterHeight="18" translatesAutoresizingMaskIntoConstraints="NO" id="4tT-ab-bYE">
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="AssessmentHeaderView" id="UfB-K3-NdF" customClass="AssessmentHeaderView">
<rect key="frame" x="0.0" y="56" width="460" height="44"/>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="AssessmentHeaderView" id="UfB-K3-NdF" customClass="AssessmentHeaderView">
<rect key="frame" x="0.0" y="55.5" width="460" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="UfB-K3-NdF" id="WGo-Wa-YTq">
<frame key="frameInset" width="460" height="44"/>
......@@ -625,14 +625,14 @@
<outlet property="questionLabel" destination="ZuQ-5o-cpC" id="lCa-bf-BcS"/>
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="AssessmentTableViewCell" rowHeight="52" id="gIe-bF-XsX" customClass="AssessmentTableViewCell">
<rect key="frame" x="0.0" y="100" width="460" height="52"/>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="AssessmentTableViewCell" rowHeight="52" id="gIe-bF-XsX" customClass="AssessmentTableViewCell">
<rect key="frame" x="0.0" y="99.5" width="460" height="52"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="gIe-bF-XsX" id="Va8-wn-DBM">
<frame key="frameInset" width="460" height="52"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="H6x-0L-aAT">
<button opaque="NO" userInteractionEnabled="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="H6x-0L-aAT">
<constraints>
<constraint firstAttribute="width" constant="24" id="VLL-vU-Ets"/>
<constraint firstAttribute="height" constant="24" id="eI6-VS-SEs"/>
......@@ -669,8 +669,8 @@
<outlet property="titleNumberButton" destination="H6x-0L-aAT" id="L55-74-WgJ"/>
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="AssessmentShortAnswerTableViewCell" rowHeight="112" id="smV-qr-KgP" customClass="AssessmentShortAnswerTableViewCell">
<rect key="frame" x="0.0" y="152" width="460" height="112"/>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="AssessmentShortAnswerTableViewCell" rowHeight="112" id="smV-qr-KgP" customClass="AssessmentShortAnswerTableViewCell">
<rect key="frame" x="0.0" y="151.5" width="460" height="112"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="smV-qr-KgP" id="A2f-ek-60T">
<frame key="frameInset" width="460" height="112"/>
......@@ -792,7 +792,7 @@
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="HEy-wy-TuV">
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="HeadlineTableViewCell" id="RwU-Te-fXY" customClass="HeadlineTableViewCell">
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="HeadlineTableViewCell" id="RwU-Te-fXY" customClass="HeadlineTableViewCell">
<rect key="frame" x="0.0" y="28" width="1024" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="RwU-Te-fXY" id="GcB-7X-Q0o">
......@@ -827,14 +827,14 @@
<outlet property="titleTextField" destination="QwA-Ps-okZ" id="tdx-q3-9uv"/>
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="ContentTableViewCell" rowHeight="170" id="bcJ-bt-ka6" customClass="ContentTableViewCell">
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="ContentTableViewCell" rowHeight="170" id="bcJ-bt-ka6" customClass="ContentTableViewCell">
<rect key="frame" x="0.0" y="72" width="1024" height="170"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="bcJ-bt-ka6" id="uXN-gY-mO0">
<frame key="frameInset" width="1024" height="170"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" text="内容" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="3Uo-E9-3r0">
<textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="3Uo-E9-3r0" customClass="ICRPlaceholderTextView">
<constraints>
<constraint firstAttribute="height" constant="100" id="Rfy-kg-Rp1"/>
</constraints>
......@@ -852,7 +852,7 @@
</constraints>
</tableViewCellContentView>
<connections>
<outlet property="contentTextView" destination="3Uo-E9-3r0" id="dLw-MZ-agw"/>
<outlet property="contentTextView" destination="3Uo-E9-3r0" id="NCo-N9-5Ey"/>
<outlet property="heightConstraint" destination="Rfy-kg-Rp1" id="Gtf-ZE-6b0"/>
</connections>
</tableViewCell>
......@@ -1260,11 +1260,11 @@ timingFunction 设置动画速度曲线,默认值上面已经给出.下面说它
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="70" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="lXY-sE-fW1">
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="VideoDetailIntroTableViewCell" rowHeight="100" id="Qnm-0r-wEL" customClass="VideoDetailIntroTableViewCell">
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="VideoDetailIntroTableViewCell" rowHeight="100" id="Qnm-0r-wEL" customClass="VideoDetailIntroTableViewCell">
<rect key="frame" x="0.0" y="28" width="1024" height="100"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Qnm-0r-wEL" id="VAA-bT-OlF">
<frame key="frameInset" width="1024" height="99"/>
<frame key="frameInset" width="1024" height="99.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="课时简介" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="agZ-rF-DnB">
......@@ -1290,11 +1290,11 @@ timingFunction 设置动画速度曲线,默认值上面已经给出.下面说它
<outlet property="studyIntroDetailTitleLabel" destination="pIM-cg-VXA" id="qhO-cv-4Hn"/>
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="VideoLecturerTableViewCell" rowHeight="130" id="WzB-nZ-wsW" customClass="VideoLecturerTableViewCell">
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="VideoLecturerTableViewCell" rowHeight="130" id="WzB-nZ-wsW" customClass="VideoLecturerTableViewCell">
<rect key="frame" x="0.0" y="128" width="1024" height="130"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="WzB-nZ-wsW" id="Zzv-Yi-ZxT">
<frame key="frameInset" width="1024" height="129"/>
<frame key="frameInset" width="1024" height="129.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="授课讲师" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="kxK-dX-OAf">
......@@ -1343,11 +1343,11 @@ timingFunction 设置动画速度曲线,默认值上面已经给出.下面说它
<outlet property="lecurerIntroLabel" destination="85S-CZ-3Vl" id="LLr-eD-OYY"/>
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="SpecifiedTableViewCell" rowHeight="100" id="oia-jO-L9n" customClass="SpecifiedTableViewCell">
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="SpecifiedTableViewCell" rowHeight="100" id="oia-jO-L9n" customClass="SpecifiedTableViewCell">
<rect key="frame" x="0.0" y="258" width="1024" height="100"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="oia-jO-L9n" id="AMF-ag-ZWN">
<frame key="frameInset" width="1024" height="99"/>
<frame key="frameInset" width="1024" height="99.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" text="针对人员" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="NfI-IM-h1i">
......@@ -1537,8 +1537,8 @@ timingFunction 设置动画速度曲线,默认值上面已经给出.下面说它
<subviews>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="n7q-60-s3U">
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<view key="tableHeaderView" contentMode="scaleToFill" id="p9i-EO-Sx0">
<rect key="frame" x="0.0" y="0.0" width="500" height="60"/>
<view key="tableHeaderView" contentMode="scaleToFill" misplaced="YES" id="p9i-EO-Sx0">
<rect key="frame" x="0.0" y="0.0" width="0.0" height="60"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="DNW-by-H8X">
......@@ -1554,11 +1554,11 @@ timingFunction 设置动画速度曲线,默认值上面已经给出.下面说它
</constraints>
</view>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="VideoListItemTableViewCell" rowHeight="50" id="YXo-b3-NKo" customClass="VideoListItemTableViewCell">
<rect key="frame" x="0.0" y="88" width="1000" height="50"/>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="VideoListItemTableViewCell" rowHeight="50" id="YXo-b3-NKo" customClass="VideoListItemTableViewCell">
<rect key="frame" x="0.0" y="88" width="500" height="50"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="YXo-b3-NKo" id="Zsh-Nm-SGv">
<frame key="frameInset" width="1000" height="49"/>
<frame key="frameInset" width="500" height="49.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="FNL-Q4-kdY">
......@@ -1579,28 +1579,38 @@ timingFunction 设置动画速度曲线,默认值上面已经给出.下面说它
<color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="BVg-HN-E2s">
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstAttribute="width" constant="30" id="Lmp-s2-7qe"/>
<constraint firstAttribute="height" constant="30" id="xS0-wu-MRb"/>
</constraints>
</view>
</subviews>
<constraints>
<constraint firstItem="0QA-OC-BkN" firstAttribute="leading" secondItem="FNL-Q4-kdY" secondAttribute="trailing" constant="20" id="2Sz-WY-ZYI"/>
<constraint firstItem="Ast-eO-9V0" firstAttribute="centerY" secondItem="FNL-Q4-kdY" secondAttribute="centerY" id="4D8-Yl-tb5"/>
<constraint firstItem="0QA-OC-BkN" firstAttribute="centerY" secondItem="Zsh-Nm-SGv" secondAttribute="centerY" id="7PM-hw-rhe"/>
<constraint firstItem="BVg-HN-E2s" firstAttribute="centerY" secondItem="Ast-eO-9V0" secondAttribute="centerY" id="9w5-mB-anf"/>
<constraint firstItem="FNL-Q4-kdY" firstAttribute="centerY" secondItem="Zsh-Nm-SGv" secondAttribute="centerY" id="DoL-1X-1DZ"/>
<constraint firstItem="FNL-Q4-kdY" firstAttribute="leading" secondItem="Zsh-Nm-SGv" secondAttribute="leading" constant="12" id="IKT-GZ-UfU"/>
<constraint firstItem="0QA-OC-BkN" firstAttribute="centerY" secondItem="FNL-Q4-kdY" secondAttribute="centerY" id="KVJ-bY-0gc"/>
<constraint firstItem="0QA-OC-BkN" firstAttribute="leading" secondItem="FNL-Q4-kdY" secondAttribute="trailing" constant="20" id="Qc4-J9-Joq"/>
<constraint firstAttribute="trailing" secondItem="Ast-eO-9V0" secondAttribute="trailing" constant="15" id="Xih-52-5hy"/>
<constraint firstItem="Ast-eO-9V0" firstAttribute="leading" secondItem="0QA-OC-BkN" secondAttribute="trailing" constant="30" id="xVB-sj-4Yd"/>
<constraint firstItem="Ast-eO-9V0" firstAttribute="leading" secondItem="BVg-HN-E2s" secondAttribute="trailing" constant="10" id="i3G-EM-h4h"/>
<constraint firstItem="BVg-HN-E2s" firstAttribute="leading" secondItem="0QA-OC-BkN" secondAttribute="trailing" constant="20" id="igE-qL-tRe"/>
</constraints>
</tableViewCellContentView>
<connections>
<outlet property="playButton" destination="FNL-Q4-kdY" id="Abd-Au-JQk"/>
<outlet property="seekbarView" destination="BVg-HN-E2s" id="Ngx-Ju-zff"/>
<outlet property="studyItemTimeLabel" destination="Ast-eO-9V0" id="q9C-EN-fp3"/>
<outlet property="studyItemTitleLabel" destination="0QA-OC-BkN" id="1d5-ex-vvU"/>
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="PPTListItemTableViewCell" rowHeight="50" id="OSF-93-RuO" customClass="PPTListItemTableViewCell">
<rect key="frame" x="0.0" y="138" width="1000" height="50"/>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="PPTListItemTableViewCell" rowHeight="50" id="OSF-93-RuO" customClass="PPTListItemTableViewCell">
<rect key="frame" x="0.0" y="138" width="500" height="50"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="OSF-93-RuO" id="IQr-pV-6ZO">
<frame key="frameInset" width="1000" height="49"/>
<frame key="frameInset" width="500" height="49.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="j7R-oP-wMP">
......@@ -1638,11 +1648,11 @@ timingFunction 设置动画速度曲线,默认值上面已经给出.下面说它
<outlet property="studyItemTitleLabel" destination="6O1-Dg-ELo" id="MDq-lB-rxF"/>
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="VideoListSectionHeaderView" rowHeight="60" id="w6E-t4-Q38" customClass="VideoListSectionHeaderView">
<rect key="frame" x="0.0" y="188" width="1000" height="60"/>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="VideoListSectionHeaderView" rowHeight="60" id="w6E-t4-Q38" customClass="VideoListSectionHeaderView">
<rect key="frame" x="0.0" y="188" width="500" height="60"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="w6E-t4-Q38" id="Xwb-Tx-Kw3">
<frame key="frameInset" width="1000" height="59"/>
<frame key="frameInset" width="500" height="59.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2016第一期销售培训" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nNT-PL-RIn">
......@@ -1742,7 +1752,7 @@ timingFunction 设置动画速度曲线,默认值上面已经给出.下面说它
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="AssessmentHeaderView" rowHeight="60" id="2M5-To-MLj" customClass="AssessmentHeaderView">
<rect key="frame" x="0.0" y="56" width="1024" height="60"/>
<rect key="frame" x="0.0" y="55.5" width="1024" height="60"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="2M5-To-MLj" id="ypf-GL-4CP">
<frame key="frameInset" width="1024" height="60"/>
......@@ -1767,7 +1777,7 @@ timingFunction 设置动画速度曲线,默认值上面已经给出.下面说它
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="AssessmentTableViewCell" rowHeight="50" id="BjI-a1-CRm" customClass="AssessmentTableViewCell">
<rect key="frame" x="0.0" y="116" width="1024" height="50"/>
<rect key="frame" x="0.0" y="115.5" width="1024" height="50"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="BjI-a1-CRm" id="bq8-ly-DcD">
<frame key="frameInset" width="1024" height="50"/>
......@@ -2075,10 +2085,10 @@ timingFunction 设置动画速度曲线,默认值上面已经给出.下面说它
</view>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="CommentListTableViewCell" rowHeight="84" id="sX2-jy-tQ2" customClass="CommentListTableViewCell">
<rect key="frame" x="0.0" y="128" width="1024" height="84"/>
<rect key="frame" x="0.0" y="28" width="1024" height="84"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="sX2-jy-tQ2" id="iVT-bi-RKr">
<frame key="frameInset" width="1024" height="83"/>
<frame key="frameInset" width="1024" height="83.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="crown" translatesAutoresizingMaskIntoConstraints="NO" id="pyu-Y7-w8M">
......
Lighting/Lighting.xcdatamodeld/.xccurrentversion
View file @ 2739ee41
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>_XCCurrentVersionName</key>
<string>Lighting.xcdatamodel</string>
</dict>
<dict/>
</plist>
Packaging.sh 0 → 100644
View file @ 2739ee41
#配置以下三项
# 工程名
APP_NAME="Lighting"
# 电脑用户名
USER_NAME="caoyunxiao"
# 证书
CODE_SIGN_DISTRIBUTION="iPhone Distribution: Shanghai Gomore Information Technology Co.,Ltd"
# info.plist路径
project_infoplist_path="./${APP_NAME}/Info.plist"
#取版本号
bundleShortVersion=$(/usr/libexec/PlistBuddy -c "print CFBundleShortVersionString" "${project_infoplist_path}")
#取build值
bundleVersion=$(/usr/libexec/PlistBuddy -c "print CFBundleVersion" "${project_infoplist_path}")
#日期
DATE="$(date +%Y%m%d %H:%M:%S)"
#ipa文件名字
IPANAME="${APP_NAME}_V${bundleShortVersion}_${DATE}"
#xcarchive路径
archivePath="/Users/${USER_NAME}/Desktop/App_IOS/archive/${APP_NAME}.xcarchive"
#IPA路径
ipa_path="/Users/${USER_NAME}/Desktop/App_IOS/archive/${IPANAME}"
#要上传的ipa文件路径
echo ${ipa_path}/"${APP_NAME}.ipa"> text.txt
echo "=================clean================="
xcodebuild -workspace "${APP_NAME}.xcworkspace" -scheme "${APP_NAME}" -configuration 'Release' clean
echo "+++++++++++++++++build+++++++++++++++++"
xcodebuild -workspace "${APP_NAME}.xcworkspace" -scheme "${APP_NAME}" -sdk iphoneos -configuration 'Release' CODE_SIGN_IDENTITY="${CODE_SIGN_DISTRIBUTION}" SYMROOT='$(PWD)'
#打包
xcodebuild -archivePath ${archivePath} -workspace "${APP_NAME}.xcworkspace" -sdk iphoneos -scheme "${APP_NAME}" -configuration "Release" archive
#生成IPA
xcodebuild -exportArchive -archivePath ${archivePath} -exportPath ${ipa_path} -exportOptionsPlist "${project_infoplist_path}"
Podfile.lock
View file @ 2739ee41
......@@ -60,7 +60,7 @@ DEPENDENCIES:
- IQKeyboardManager (~> 4.0.7)
- JSONModel (~> 1.2.0)
- Masonry
- MBProgressHUD (~> 0.9)
- MBProgressHUD (~> 0.9.2)
- MJRefresh (~> 3.1.12)
- MMDrawerController (~> 0.6.0)
- MWPhotoBrowser (~> 2.1.2)
......@@ -93,6 +93,6 @@ SPEC CHECKSUMS:
UMengSocial: 48b67179c492a8cf7803fbb0438b8f55432e2fc1
WYPopoverController: a9db25ac2841a686acdc0f3a99bdb21545db32f4
PODFILE CHECKSUM: 13102f3a6f79974ee3f0d4933cafc5f034442b18
PODFILE CHECKSUM: b9506980b071315afdb6f8ae15c1e65c84ff99fc
COCOAPODS: 1.1.1
Pods/Manifest.lock
View file @ 2739ee41
......@@ -60,7 +60,7 @@ DEPENDENCIES:
- IQKeyboardManager (~> 4.0.7)
- JSONModel (~> 1.2.0)
- Masonry
- MBProgressHUD (~> 0.9)
- MBProgressHUD (~> 0.9.2)
- MJRefresh (~> 3.1.12)
- MMDrawerController (~> 0.6.0)
- MWPhotoBrowser (~> 2.1.2)
......@@ -93,6 +93,6 @@ SPEC CHECKSUMS:
UMengSocial: 48b67179c492a8cf7803fbb0438b8f55432e2fc1
WYPopoverController: a9db25ac2841a686acdc0f3a99bdb21545db32f4
PODFILE CHECKSUM: 13102f3a6f79974ee3f0d4933cafc5f034442b18
PODFILE CHECKSUM: b9506980b071315afdb6f8ae15c1e65c84ff99fc
COCOAPODS: 1.1.1
Tools/BaseViewController.h
View file @ 2739ee41
......@@ -158,4 +158,18 @@
*/
+ (void)deleteAccountAndPassWord;
/**
比较时间大小
@param dateString 时间字符串
@return 是否比当前时间大
*/
+ (BOOL)compareDateString:(NSString *)dateString;
@end
Tools/BaseViewController.m
View file @ 2739ee41
......@@ -566,6 +566,23 @@
}
/**
比较时间大小
@param dateString 时间字符串
@return 是否比当前时间大
*/
//+ (BOOL)compareDateString:(NSString *)dateString
//{
// NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
// [dateFormatter setDateFormat:@"yyyy-MM-dd HH:mm"];
// NSDate *endDate = [dateFormatter dateFromString:end];
// if ([endDate compare:[NSDate date]] == NSOrderedAscending) {
//
// }
//}
- (void)dealloc
{
......
Tools/Category/NSDate+Formatting.h
View file @ 2739ee41
......@@ -20,4 +20,5 @@
- (NSString *)monthString;
- (NSString *)dayString;
@end
Tools/Category/NSString+Category.h 0 → 100644
View file @ 2739ee41
//
// NSString+Category.h
// Lighting
//
// Created by 曹云霄 on 2016/12/23.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import <Foundation/Foundation.h>
@interface NSString (Category)
/**
* 计算文字高度
*
* @param fontSize 字体大小
* @param width 宽度
*
* @return 高度
*/
- (CGFloat)heightWithFontSize:(CGFloat)fontSize width:(CGFloat)width;
/**
* 计算文字宽度度
*
* @param fontSize 字体大小
* @param height 高度
*
* @return 宽度
*/
- (CGFloat)widthWithFontSize:(CGFloat)fontSize height:(CGFloat)height;
@end
Tools/Category/NSString+Category.m 0 → 100644
View file @ 2739ee41
//
// NSString+Category.m
// Lighting
//
// Created by 曹云霄 on 2016/12/23.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import "NSString+Category.h"
@implementation NSString (Category)
-(CGFloat)heightWithFontSize:(CGFloat)fontSize width:(CGFloat)width
{
NSDictionary *attrs = @{NSFontAttributeName:[UIFont systemFontOfSize:fontSize]};
return [self boundingRectWithSize:CGSizeMake(width, 0) options:NSStringDrawingTruncatesLastVisibleLine | NSStringDrawingUsesLineFragmentOrigin | NSStringDrawingUsesFontLeading attributes:attrs context:nil].size.height;
}
-(CGFloat)widthWithFontSize:(CGFloat)fontSize height:(CGFloat)height
{
NSDictionary *attrs = @{NSFontAttributeName:[UIFont systemFontOfSize:fontSize]};
return [self boundingRectWithSize:CGSizeMake(0, height) options:NSStringDrawingTruncatesLastVisibleLine | NSStringDrawingUsesLineFragmentOrigin | NSStringDrawingUsesFontLeading attributes:attrs context:nil].size.width;
}
@end
Tools/CustomWKWebViewController.m
View file @ 2739ee41
......@@ -51,6 +51,7 @@
#pragma mark - 停止播放
-(void) viewDidDisappear:(BOOL)animated{
[super viewDidDisappear:animated];
[self.webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:@"about:blank"]]];
}
......
Tools/HelpController.m
View file @ 2739ee41
......@@ -105,8 +105,7 @@
#pragma mark -计算字符串长度
- (CGFloat)calculateStringLength:(NSString *)string
{
CGSize s = [string boundingRectWithSize:CGSizeMake(999999, 50) options:NSStringDrawingUsesLineFragmentOrigin | NSStringDrawingUsesFontLeading attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:15]} context:nil].size;
return s.width+100;
return [string widthWithFontSize:15 height:50]+100;
}
......
Tools/PrefixHeader.pch
View file @ 2739ee41
......@@ -52,7 +52,10 @@
#import "CustomTOForumTopicEntity.h"
#import "CustomTOForumReplyEntity.h"
#import "SAMKeychain.h"
#import "PNCircleChart.h"
#import "NSString+Category.h"
#import "CustomTOAfficheEntity.h"
#import "ICRPlaceholderTextView.h"
// Include any system framework and library headers here that should be included in all compilation units.
// You will also need to set the Prefix Header build setting of one or more of your targets to reference this file.
......
Tools/TextView/ICRPlaceholderTextView.h 0 → 100644
View file @ 2739ee41
//
// ICRPlaceholderTextView.h
// Cruiser
//
// Created by Lili Wang on 15/4/7.
// Copyright (c) 2015年 Xummer. All rights reserved.
//
#import <UIKit/UIKit.h>
@interface ICRPlaceholderTextView : UITextView
@property (strong, nonatomic) NSString *m_placeHolder;
@property (strong, nonatomic) UIColor *m_realTextColor UI_APPEARANCE_SELECTOR;
@property (strong, nonatomic) UIColor *m_placeholderColor UI_APPEARANCE_SELECTOR;
@end
Tools/TextView/ICRPlaceholderTextView.m 0 → 100644
View file @ 2739ee41
//
// ICRPlaceholderTextView.m
// Cruiser
//
// Created by Lili Wang on 15/4/7.
// Copyright (c) 2015年 Xummer. All rights reserved.
//
#import "ICRPlaceholderTextView.h"
@interface ICRPlaceholderTextView ()
@property (unsafe_unretained, nonatomic, readonly) NSString* realText;
- (void) beginEditing:(NSNotification*) notification;
- (void) endEditing:(NSNotification*) notification;
@end
@implementation ICRPlaceholderTextView
@synthesize m_placeholderColor;
@synthesize m_placeHolder;
@synthesize m_realTextColor;
- (id)initWithFrame:(CGRect)frame {
self = [super initWithFrame:frame];
if (self) {
[self initObserver];
}
return self;
}
- (void)awakeFromNib {
[super awakeFromNib];
[self initObserver];
}
- (void)initObserver {
[[NSNotificationCenter defaultCenter] addObserver:self
selector:@selector(beginEditing:)
name:UITextViewTextDidBeginEditingNotification
object:self];
[[NSNotificationCenter defaultCenter] addObserver:self
selector:@selector(endEditing:)
name:UITextViewTextDidEndEditingNotification
object:self];
self.m_realTextColor = self.textColor;
self.m_placeholderColor = [UIColor lightGrayColor];
}
#pragma mark -
#pragma mark Setter/Getters
- (NSString *)realText {
return [super text];
}
- (void)setTextColor:(UIColor *)textColor {
if ([self.realText isEqualToString:self.m_placeHolder]) {
if ([textColor isEqual:self.m_placeholderColor]){
[super setTextColor:textColor];
} else {
self.m_realTextColor = textColor;
}
}
else {
self.m_realTextColor = textColor;
[super setTextColor:textColor];
}
}
- (void)setM_placeHolder:(NSString *)am_placeHolder {
if ([self.realText isEqualToString:self.m_placeHolder] && ![self isFirstResponder]) {
self.text = am_placeHolder;
}
if (am_placeHolder != self.m_placeHolder) {
m_placeHolder = am_placeHolder;
}
[self endEditing:nil];
}
- (void)setM_placeholderColor:(UIColor *)am_placeholderColor {
m_placeholderColor = am_placeholderColor;
if ([super.text isEqualToString:self.m_placeHolder]) {
self.textColor = self.m_placeholderColor;
}
}
- (NSString *)text {
NSString* text = [super text];
if ([text isEqualToString:self.m_placeHolder]) return @"";
return text;
}
- (void) setText:(NSString *)text {
if (([text isEqualToString:@""] || text == nil) && ![self isFirstResponder]) {
super.text = self.m_placeHolder;
}
else {
super.text = text;
}
if ([text isEqualToString:self.m_placeHolder] || text == nil) {
self.textColor = self.m_placeholderColor;
}
else {
self.textColor = self.m_realTextColor;
}
}
#pragma mark -
#pragma mark - Observer Actions
- (void) beginEditing:(NSNotification*) notification {
if ([self.realText isEqualToString:self.m_placeHolder]) {
super.text = nil;
self.textColor = self.m_realTextColor;
}
}
- (void) endEditing:(NSNotification*) notification {
if ([self.realText isEqualToString:@""] || self.realText == nil) {
super.text = self.m_placeHolder;
self.textColor = self.m_placeholderColor;
}
}
#pragma mark -
#pragma mark Dealloc
- (void)dealloc {
[[NSNotificationCenter defaultCenter] removeObserver:self];
}
@end
Tools/opple_objc_json_client.h
View file @ 2739ee41
......@@ -210,6 +210,7 @@ extern NSString * const GRADEMETHOD_MANUL;
@class RsScoreDetails;
@class RsActionResult;
@class RsPrizeBill;
@class CustomTOAfficheEntity;
@class OrderFilter;
@class Draw;
@class HotFilter;
......@@ -290,6 +291,7 @@ extern NSString * const GRADEMETHOD_MANUL;
@protocol TOBankBindEntity @end
@protocol RsPrizeBillResponse @end
@protocol SceneCondition @end
@protocol CustomTOAfficheEntity @end
@protocol SceneFilter @end
@protocol RsShippingAddrEntity @end
@protocol SaveShoppingCartRequest @end
......@@ -3271,7 +3273,7 @@ extern NSString * const GRADEMETHOD_MANUL;
*
*
*/
@property (nonatomic, assign) NSInteger examResult;
@property (nonatomic, copy) NSString *examResult;
/**
* 考核结果明细
* @see TOStudyResultDetailEntity
......@@ -6428,7 +6430,7 @@ extern NSString * const GRADEMETHOD_MANUL;
* @see TOAfficheEntity
*
*/
@property (nonatomic, strong) NSArray<TOAfficheEntity> *afficheEntity;
@property (nonatomic, strong) NSArray<CustomTOAfficheEntity> *afficheEntity;
@end /* interface AfficheResponse */
......
UploadToPGYER.sh 0 → 100644
View file @ 2739ee41
#蒲公英上的User Key
uKey="a6283ec42bbaf9efc5b6f01a750299f3"
#蒲公英上的API Key
apiKey="f9aefb343ecc7959f8e216ed08db1c83"
#要上传的ipa文件路径
IPA_PATH=$(cat text.txt)
rm -rf text.txt
#执行上传至蒲公英的命令
echo "++++++++++++++upload+++++++++++++"
curl -F "file=@${IPA_PATH}" -F "uKey=${uKey}" -F "_api_key=${apiKey}" http://www.pgyer.com/apiv1/app/upload
podfile
View file @ 2739ee41
......@@ -21,5 +21,6 @@ target 'Lighting' do
pod 'UMengAnalytics', '~> 4.1.2'
pod 'PNChart', '~> 0.8.9'
pod 'AliyunOSSiOS', '~> 2.5.1'
pod 'PNChart', '~> 0.8.9'
end
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