Skip to content

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

论坛详情增加支持富文本，增加3D体验中心功能

parent 0fdbe5b8
Hide whitespace changes
Inline Side-by-side
Showing with 254 additions and 90 deletions
Class/Announcement/Controllers/AnnountcementDetailViewController.m
View file @ d4a4f257
......@@ -88,7 +88,6 @@
WS(weakSelf);
WkWebViewViewController *webView = [[WkWebViewViewController alloc]initWithReturnContentSize:^(CGFloat contentHeight) {
weakSelf.annountcementContentHeigt = contentHeight;
webView.view.frame = CGRectMake(0, 0, ScreenWidth, contentHeight);
[weakSelf.announcementDetailsTableView reloadData];
}];
self.annountcementContentHeigt = 44;//默认值
......
Class/Announcement/Controllers/WkWebViewViewController.h
View file @ d4a4f257
......@@ -9,11 +9,11 @@
#import "BaseViewController.h"
typedef void(^returnContentHeight)(CGFloat height);
typedef void(^ReturnContentHeight)(CGFloat height);
@interface WkWebViewViewController : BaseViewController
@property (nonatomic,strong) UIWebView *contentWebView;
@property (nonatomic,copy) returnContentHeight contentHeight;
@property (nonatomic,copy) ReturnContentHeight contentHeight;
@property (nonatomic,copy) NSString *htmlString;
/**
......
Class/Announcement/Controllers/WkWebViewViewController.m
View file @ d4a4f257
......@@ -21,7 +21,7 @@
- (instancetype)initWithReturnContentSize:(void(^)(CGFloat contentHeight))block
{
if (self = [super init]) {
self.contentWebView = [[UIWebView alloc]initWithFrame:CGRectMake(27, 10, ScreenWidth-27*2, 0.01)];
self.contentWebView = [[UIWebView alloc]initWithFrame:CGRectMake(27, 0, ScreenWidth-27*2, 0.01)];
self.contentWebView.delegate = self;
self.contentWebView.scrollView.scrollEnabled = NO;
self.contentHeight = block;
......@@ -40,8 +40,7 @@
- (void)setHtmlString:(NSString *)htmlString
{
_htmlString = htmlString;
[self.contentWebView loadHTMLString:_htmlString baseURL:nil];
[self.contentWebView loadHTMLString:htmlString baseURL:nil];
}
#pragma mark - <UIWebViewDelegate>
......@@ -52,9 +51,10 @@
- (void)webViewDidFinishLoad:(UIWebView *)webView
{
[XBLoadingView hideHUDViewWithDefaultWithView:self.view];
webView.height = webView.scrollView.contentSize.height;
CGFloat height = webView.scrollView.contentSize.height;
webView.height = height;
if (self.contentHeight) {
self.contentHeight(webView.scrollView.contentSize.height+20);
self.contentHeight(height);
}
}
......
Class/LearningCenter/ComprehensiveDiscussion/Cells/ForumTableViewCell.m
View file @ d4a4f257
......@@ -19,8 +19,8 @@
{
_categoryEntity = categoryEntity;
if (_categoryEntity) {
[self.forumImageView sd_setImageWithURL:[NSURL URLWithString:_categoryEntity.attachmentBg.fileUrl] placeholderImage:CoustomerReplaceImage];
[self.iconImageView sd_setImageWithURL:[NSURL URLWithString:_categoryEntity.attachment.fileUrl] placeholderImage:CoustomerReplaceImage];
[self.forumImageView sd_setImageWithURL:[NSURL URLWithString:_categoryEntity.attachmentBg.fileUrl] placeholderImage:nil];
[self.iconImageView sd_setImageWithURL:[NSURL URLWithString:_categoryEntity.attachment.fileUrl] placeholderImage:nil];
self.forumTitleLabel.text = _categoryEntity.name;
self.forumDetailTitleLabel.text = _categoryEntity.fdescription;
}
......
Class/LearningCenter/ComprehensiveDiscussion/Controllers/ForumItemDetailViewController.m
View file @ d4a4f257
......@@ -10,6 +10,9 @@
#import "CommentListTableViewCell.h"
#import "PostPhotoManagerViewController.h"
#import "ShareGoodsViewController.h"
#import "WkWebViewViewController.h"
#import "AnnouncementContentTableViewCell.h"
#import "ForumDetailPhotoTableViewCell.h"
@interface ForumItemDetailViewController ()<UITableViewDelegate,UITableViewDataSource,UITextFieldDelegate,TapClickDelegate,ReturnTableviewcellIndexpathdelegate>
......@@ -52,10 +55,14 @@
@property (weak, nonatomic) IBOutlet UIButton *deleteButton;
/**
帖子内容
内容高度
*/
@property (weak, nonatomic) IBOutlet UILabel *contentLabel;
@property (nonatomic,assign) CGFloat contentHeigt;
/**
图片附件高度
*/
@property (nonatomic,assign) CGFloat attachmentHeight;
/**
获取回复列表
......@@ -71,7 +78,7 @@
- (NSMutableArray *)commentsArray
{
if (!_commentsArray) {
_commentsArray = [NSMutableArray array];
_commentsArray = [NSMutableArray arrayWithObjects:@"",@"", nil];
}
return _commentsArray;
}
......@@ -93,6 +100,7 @@
[super viewDidLoad];
[self uiConfigAction];
[self addChildWebViewController];
[self getPostDetailAction:NO];
}
......@@ -106,6 +114,33 @@
self.forumDetailTableView.tableFooterView = [UIView new];
BOOL boolValue = ![self.topicDetail.posterId isEqualToString:[Shoppersmanager manager].shoppers.employee.fid];
self.deleteButton.hidden = boolValue;
[self.forumDetailTableView registerClass:[AnnouncementContentTableViewCell class] forCellReuseIdentifier:@"AnnouncementContentTableViewCell"];
[self.forumDetailTableView registerClass:[ForumDetailPhotoTableViewCell class] forCellReuseIdentifier:@"ForumDetailPhotoTableViewCell"];
[self setUpHeaderView];
self.forumDetailTableView.separatorStyle = UITableViewCellSeparatorStyleNone;
}
#pragma mark - WKWebView/photoManager
- (void)addChildWebViewController
{
WS(weakSelf);
WkWebViewViewController *webView = [[WkWebViewViewController alloc]initWithReturnContentSize:^(CGFloat contentHeight) {
weakSelf.contentHeigt = contentHeight;
[weakSelf.forumDetailTableView reloadData];
}];
self.contentHeigt = 44;//默认值
webView.view.frame = CGRectMake(0, 0, ScreenWidth, self.contentHeigt);
[self addChildViewController:webView];
//图片
PostPhotoManagerViewController *photoManager = [[[self class] getLearningCenterStoryboardClass] instantiateViewControllerWithIdentifier:@"PostPhotoManagerViewController"];
[self addChildViewController:photoManager];
NSMutableArray *array = [NSMutableArray array];
for (TOAttachmentEntity *entity in self.topicDetail.attachments) {
[array addObject:entity.fileUrl];
}
self.attachmentHeight = [self calculateImageHeight];
photoManager.view.height = self.attachmentHeight;
photoManager.imageArray = array;
}
#pragma mark - 获取回复列表
......@@ -119,11 +154,11 @@
if (RESULT(returnValue)) {
if (isRemove) {
[weakSelf.commentsArray removeAllObjects];
weakSelf.commentsArray = nil;
}
weakSelf.topicReply = [[ForumReplyResponse alloc] initWithDictionary:RESPONSE(returnValue) error:nil];
[weakSelf.commentsArray addObjectsFromArray:weakSelf.topicReply.forumReplyEntity];
[weakSelf setUpCommentNumber];
[weakSelf setUpHeaderView];
[weakSelf.forumDetailTableView reloadData];
}else {
[XBLoadingView showHUDViewWithText:MESSAGE(returnValue)];
......@@ -137,7 +172,6 @@
- (void)setUpHeaderView
{
self.postTitleLabel.text = self.topicDetail.title;
self.contentLabel.text = self.topicDetail.content;
//系统管理员
if (self.topicDetail.backEnd) {
self.issuerImageView.image = GuideReplaceImage;
......@@ -147,18 +181,7 @@
[self.issuerImageView sd_setImageWithURL:[NSURL URLWithString:self.topicDetail.posterPicture] placeholderImage:CoustomerReplaceImage];
self.issuerNameAndDateLabel.text = [NSString stringWithFormat:@"%@: %@ %@",self.topicDetail.posterPosition,self.topicDetail.posterRealName,[BaseViewController formateDate:self.topicDetail.postTime]];
}
//图片
PostPhotoManagerViewController *photoManager = [[[self class] getLearningCenterStoryboardClass] instantiateViewControllerWithIdentifier:@"PostPhotoManagerViewController"];
[self addChildViewController:photoManager];
NSMutableArray *array = [NSMutableArray array];
for (TOAttachmentEntity *entity in self.topicDetail.attachments) {
[array addObject:entity.fileUrl];
}
CGFloat attachment = [self calculateImageHeight];
photoManager.imageArray = array;
[self.tableViewHeaderView addSubview:photoManager.view];
self.tableViewHeaderView.height = attachment + self.topicDetail.contentHeight + self.contentLabel.top + 10;
photoManager.view.frame = CGRectMake(self.contentLabel.left, self.topicDetail.contentHeight+10+self.contentLabel.top, self.contentLabel.width, attachment);
self.tableViewHeaderView.height = 80;
self.forumDetailTableView.tableHeaderView = self.tableViewHeaderView;
}
......@@ -167,11 +190,30 @@
{
self.commentNumberLabel.text = [NSString stringWithFormat:@"已有%ld条评论",(unsigned long)self.commentsArray.count];
self.praiseButton.selected = !self.topicDetail.canLike;
WkWebViewViewController *webView = [self.childViewControllers firstObject];
webView.htmlString = self.topicDetail.content;
}
#pragma mark - <UITableViewDelegate,UITableViewDataSource>
- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
{
switch (indexPath.row) {
case 0:
{
AnnouncementContentTableViewCell *contentCell = [tableView dequeueReusableCellWithIdentifier:@"AnnouncementContentTableViewCell" forIndexPath:indexPath];
[contentCell.contentView addSubview:self.childViewControllers[0].view];
return contentCell;
}
break;
case 1:
{
ForumDetailPhotoTableViewCell *photoCell = [tableView dequeueReusableCellWithIdentifier:@"ForumDetailPhotoTableViewCell" forIndexPath:indexPath];
[photoCell.contentView addSubview:self.childViewControllers[1].view];
return photoCell;
}
break;
}
CommentListTableViewCell *commentCell = [tableView dequeueReusableCellWithIdentifier:@"CommentListTableViewCell" forIndexPath:indexPath];
commentCell.bestView.delegate = self;
commentCell.indexPath = indexPath;
......@@ -188,6 +230,19 @@
- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
{
switch (indexPath.row) {
case 0:
{
return self.contentHeigt;
}
break;
case 1:
{
return self.attachmentHeight;
}
break;
}
CustomTOForumReplyEntity *replyEntity = self.commentsArray[indexPath.row];
//68为上边距 10为下边距
return replyEntity.replyContentHeight + 68 + 10;
......@@ -195,6 +250,11 @@
- (void)tableView:(UITableView *)tableView didEndDisplayingCell:(UITableViewCell *)cell forRowAtIndexPath:(NSIndexPath *)indexPath
{
switch (indexPath.row) {
case 0:
case 1:
return;
}
CommentListTableViewCell *commentCell = (CommentListTableViewCell *)cell;
commentCell.bestView.width = ZERO;
commentCell.bestView.x = commentCell.optionButton.x;
......
Class/LearningCenter/ComprehensiveDiscussion/Controllers/PostPhotoManagerViewController.m
View file @ d4a4f257
......@@ -43,9 +43,11 @@
- (void)setUpCollectionView
{
//2表示2个间隔20的距离,40 表示左右边距
self.photoManagerFlowLayout.itemSize = CGSizeMake((ScreenWidth-60-2*10)/3.0, (ScreenWidth-60-2*10)/3.0);
CGFloat width = (ScreenWidth-20-27*2)/3.0;
self.photoManagerFlowLayout.itemSize = CGSizeMake(width, width);
self.photoManagerFlowLayout.minimumLineSpacing = 10;
self.photoManagerFlowLayout.minimumInteritemSpacing = 5;
self.photoManagerFlowLayout.minimumInteritemSpacing = 10;
self.photoManagerFlowLayout.sectionInset = UIEdgeInsetsMake(0, 27, 0, 27);
}
#pragma mark - <UICollectionViewDelegate,UICollectionViewDataSource>
......
Class/LearningCenter/ComprehensiveDiscussion/Views/ForumDetailPhotoTableViewCell.h 0 → 100644
View file @ d4a4f257
//
// ForumDetailPhotoTableViewCell.h
// Lighting
//
// Created by 曹云霄 on 2017/3/30.
// Copyright © 2017年 上海勾芒科技有限公司. All rights reserved.
//
#import <UIKit/UIKit.h>
@interface ForumDetailPhotoTableViewCell : UITableViewCell
@end
Class/LearningCenter/ComprehensiveDiscussion/Views/ForumDetailPhotoTableViewCell.m 0 → 100644
View file @ d4a4f257
//
// ForumDetailPhotoTableViewCell.m
// Lighting
//
// Created by 曹云霄 on 2017/3/30.
// Copyright © 2017年 上海勾芒科技有限公司. All rights reserved.
//
#import "ForumDetailPhotoTableViewCell.h"
@implementation ForumDetailPhotoTableViewCell
- (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
Class/LearningCenter/LearningCenterMain/Controller/LearningCenterMainViewController.m
View file @ d4a4f257
......@@ -48,22 +48,25 @@
}
}
- (void)viewDidDisappear:(BOOL)animated
{
[super viewDidDisappear:animated];
}
- (void)viewDidLoad {
[super viewDidLoad];
[self uiConfigAction];
[self setUpGuideRealName];
[self addGestureRecognizer];
[self addNotification];
[self improveCustomerInformation];
}
#pragma mark -UI
- (void)uiConfigAction
- (void)setUpGuideRealName
{
self.guideNameLabel.text = [NSString stringWithFormat:@"用户名: %@",[Shoppersmanager manager].shoppers.employee.realName];
}
#pragma mark -是否需要完善客户信息
- (void)improveCustomerInformation
{
//是否需要完善客户信息
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
if (![Shoppersmanager manager].shoppers.employee.isComplete) {
......@@ -72,6 +75,18 @@
});
}
#pragma mark -监听导购名字修改
- (void)addNotification
{
[Notification addObserver:self selector:@selector(refreshGuideName:) name:CHANGEGUIDENAME object:nil];
}
#pragma mark -修改导购名字
- (void)refreshGuideName:(NSNotification *)object
{
[self setUpGuideRealName];
}
#pragma mark - 添加点击
- (void)addGestureRecognizer
{
......
Class/Login/controller/LoginViewController.m
View file @ d4a4f257
......@@ -198,7 +198,13 @@
[Notification postNotificationName:OPENFOLLOWHEARTVC object:nil];
return;
}else if ([Name isEqualToString:@"场景库"])
}else if ([Name isEqualToString:@"体验中心3D"])
{
[Notification postNotificationName:OPENFOLLOWHEART3DVC object:nil];
return;
}
else if ([Name isEqualToString:@"场景库"])
{
selectedIndex +=1;
SceneLibraryViewController *sceneVC = [SHARED_APPDELEGATE.allControllerArray objectAtIndex_opple:selectedIndex];
......
Class/PerfectInformation/PerfectInformationViewController.m
View file @ d4a4f257
......@@ -183,7 +183,9 @@
[XBLoadingView hideHUDViewWithDefault];
if (RESULT(returnValue)) {
[Shoppersmanager manager].shoppers.employee.realName = employ.employee.realName;
[XBLoadingView showHUDViewWithSuccessText:@"修改成功" completeBlock:^{
[Notification postNotificationName:CHANGEGUIDENAME object:employ.employee.realName];
[weakSelf dismissViewControllerAnimated:YES completion:nil];
}];
}else
......
Class/RIghtVC/Rightcontroller/Control/RightViewController.m
View file @ d4a4f257
......@@ -58,7 +58,8 @@
- (NSMutableArray *)dataArray
{
if (_dataArray == nil) {
_dataArray = [NSMutableArray arrayWithObjects:@"体验中心",@"场景库",@"产品库",@"客户管理",@"学习中心",@"关于", nil];
_dataArray = [NSMutableArray arrayWithObjects:@"体验中心",@"体验中心3D",@"场景库",@"产品库",@"客户管理",@"学习中心",@"关于", nil];
//判断是否有学习中心权限
if ([[Shoppersmanager manager].shoppers.employee.userKey rangeOfString:@"学习人员"].location == NSNotFound) {
[_dataArray removeObject:@"学习中心"];
}
......@@ -69,7 +70,7 @@
- (NSArray *)subSectionArray
{
if (!_subSectionArray) {
_subSectionArray = @[@"",@"",@"",@[@"所有客户",@"客户订单"],@"",@""];
_subSectionArray = @[@"",@"",@"",@"",@[@"所有客户",@"客户订单"],@"",@""];
}
return _subSectionArray;
}
......@@ -103,7 +104,7 @@
{
if (_imageArray == nil) {
_imageArray = [NSArray arrayWithObjects:@"tiyan",@"changjing",@"chanping",@"kehu",@"Learningcenter",@"guanyu", nil];
_imageArray = [NSArray arrayWithObjects:@"tiyan",@"3DCenter",@"changjing",@"chanping",@"kehu",@"Learningcenter",@"guanyu", nil];
}
return _imageArray;
}
......@@ -126,7 +127,6 @@
- (void)createHeaderview
{
UIView *navigationView = [[UIView alloc]initWithFrame:CGRectMake(0, 0, RightWidth, NavigationHeight)];
//阴影
navigationView.layer.shadowColor = [UIColor blackColor].CGColor;
navigationView.layer.shadowRadius = 4;
navigationView.layer.shadowOpacity = 0.5;
......@@ -139,7 +139,6 @@
[navigationView addSubview:label];
label.textAlignment = NSTextAlignmentCenter;
[self.view addSubview:navigationView];
UIView *headerView = [[UIView alloc]initWithFrame:CGRectMake(0, 0, RightWidth, NavigationHeight)];
self.rightTableview.tableHeaderView = headerView;
}
......@@ -156,7 +155,7 @@
- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
{
BOOL controlClose = [self.sectionClosedArray[section] boolValue];
if (section == 3 || section == 4) {
if (section == 4) {
NSArray *subArray = self.subSectionArray[section];
return controlClose?subArray.count:0;
}
......@@ -205,14 +204,14 @@
- (void)sectionClickAction:(UITapGestureRecognizer *)sender
{
NSInteger index = sender.view.tag;
if (index == 3 ) {
if (index == 4) {
BOOL controlClose = [self.sectionClosedArray[index] boolValue];
self.sectionClosedArray[index] = controlClose?@0:@1;
[self.rightTableview reloadSections:[NSIndexSet indexSetWithIndex:index] withRowAnimation:UITableViewRowAnimationFade];
}else{
self.sectionClosedArray[3] = @0;
self.sectionClosedArray[4] = @0;
NSMutableIndexSet *indexSet = [[NSMutableIndexSet alloc]init];
[indexSet addIndex:3];
[indexSet addIndex:4];
[self.rightTableview reloadSections:indexSet withRowAnimation:UITableViewRowAnimationFade];
[self closeSidebarAndPassEvents:self.dataArray[index]];
}
......@@ -224,7 +223,6 @@
#pragma mark - 收起侧边栏并传递事件
- (void)closeSidebarAndPassEvents:(NSString *)name
{
//收起右侧控制器
[SHARED_APPDELEGATE.mmdrawer toggleDrawerSide:MMDrawerSideRight animated:YES completion:nil];
if ([self.delegate respondsToSelector:@selector(selectedControllerWithIndex:)]) {
[self.delegate selectedControllerWithIndex:name];
......
Class/Tabbar/CustomTabbar/CustomTabbarController.m
View file @ d4a4f257
......@@ -27,6 +27,7 @@
#import "AnnouncementViewController.h"
#import "MessageViewController.h"
#import "HomeViewController.h"
#import "CustomWKWebViewController.h"
@interface CustomTabbarController ()<TabbarButtonClickdelegate,ChangpasswordDelegate,CancelButtondelegate,UITextFieldDelegate>
......@@ -124,9 +125,10 @@
{
//显示体验中心
[Notification addObserver:self selector:@selector(showFollowHeart:) name:OPENFOLLOWHEARTVC object:nil];
//显示体验中心3D
[Notification addObserver:self selector:@selector(show3DFollowHeart:) name:OPENFOLLOWHEART3DVC object:nil];
//显示消息界面
[Notification addObserver:self selector:@selector(showMessageController:) name:NSNOTIFICATION_MESSAGE object:nil];
//app未启动点击通知回调
NSDictionary *dict = [UserDefault objectForKey:NSNOTIFICATION_MESSAGE];
if (dict) {
......@@ -351,5 +353,14 @@
[self presentViewController:ExperienceCenter animated:YES completion:nil];
}
#pragma mark -推出3D体验中心控制器
- (void)show3DFollowHeart:(NSNotification *)objc
{
CustomWKWebViewController *webView = [[CustomWKWebViewController alloc] init];
webView.type = Announcement;
webView.urlString = @"http://ysj.zbj.com/oem/100001.html";
[self presentViewController:webView animated:YES completion:nil];
}
@end
Class/Tabbar/CustomToolView/Toolview.m
View file @ d4a4f257
......@@ -115,14 +115,21 @@
[Notification addObserver:self selector:@selector(changeCustomerName:) name:CHANGECUSTOMERNAME object:nil];
//更改导购名
[Notification addObserver:self selector:@selector(changeshoppersName:) name:CHANGEshoppersNAME object:nil];
//提示抽奖信息
[Notification addObserver:self selector:@selector(promptDrawInformation:) name:PROMPTDRAWINFORMATION object:nil];
//提示未读公告
[Notification addObserver:self selector:@selector(notReadAnnouncement:) name:NOTREADANNOUNCEMENT object:nil];
//提示未读消息
[Notification addObserver:self selector:@selector(notReadMessage:) name:MESSAGE_COUNT object:nil];
//显示消息界面
[Notification addObserver:self selector:@selector(showMessageController:) name:NSNOTIFICATION_MESSAGE object:nil];
//导购名字修改
[Notification addObserver:self selector:@selector(refreshGuideName:) name:CHANGEGUIDENAME object:nil];
}
#pragma mark -修改导购名字
- (void)refreshGuideName:(NSNotification *)object
{
CustomButton *button = (CustomButton *)[self viewWithTag:103];
[button setTitle:object.object forState:UIControlStateNormal];
}
#pragma mark -刷新购物车显示数量
......@@ -133,18 +140,6 @@
button.instructionsNumber = number;
}
#pragma mark - 提示抽奖机会
- (void)promptDrawInformation:(NSNotification *)object
{
CustomButton *button = (CustomButton *)[self viewWithTag:103];
NSInteger number = [object.object integerValue];
if (number) {
button.instructionsNumber += number;
}else{
button.instructionsNumber = 0;
}
}
#pragma mark - 未读公告
- (void)notReadAnnouncement:(NSNotification *)object
{
......
Class/XXuserController/RebateVC/MianControllers/RebateViewController.m
View file @ d4a4f257
......@@ -115,7 +115,6 @@
- (void)viewDidAppear:(BOOL)animated
{
[super viewDidAppear:animated];
[Notification postNotificationName:PROMPTDRAWINFORMATION object:@(0)];
[self getRebateDatasFromUser];
}
......
Lighting.xcodeproj/project.pbxproj
View file @ d4a4f257
......@@ -203,6 +203,7 @@
2999B12F1DE6CD730031F79E /* ForumViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2999B12E1DE6CD730031F79E /* ForumViewController.m */; };
299C7F5A1CE21FA800E7D7CB /* AddressViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 299C7F581CE21FA800E7D7CB /* AddressViewController.m */; };
299C7F5B1CE21FA800E7D7CB /* AddressViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 299C7F591CE21FA800E7D7CB /* AddressViewController.xib */; };
299E45C71E8D2C860071A4CF /* ForumDetailPhotoTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 299E45C61E8D2C860071A4CF /* ForumDetailPhotoTableViewCell.m */; };
29A419911E812E5E0064E958 /* GDataXMLNode.m in Sources */ = {isa = PBXBuildFile; fileRef = 29A419821E812E5E0064E958 /* GDataXMLNode.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
29A419921E812E5E0064E958 /* MOFSAddressPickerView.m in Sources */ = {isa = PBXBuildFile; fileRef = 29A419851E812E5E0064E958 /* MOFSAddressPickerView.m */; };
29A419931E812E5E0064E958 /* MOFSDatePicker.m in Sources */ = {isa = PBXBuildFile; fileRef = 29A419871E812E5E0064E958 /* MOFSDatePicker.m */; };
......@@ -724,6 +725,8 @@
299C7F571CE21FA800E7D7CB /* AddressViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AddressViewController.h; sourceTree = "<group>"; };
299C7F581CE21FA800E7D7CB /* AddressViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AddressViewController.m; sourceTree = "<group>"; };
299C7F591CE21FA800E7D7CB /* AddressViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = AddressViewController.xib; sourceTree = "<group>"; };
299E45C51E8D2C860071A4CF /* ForumDetailPhotoTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ForumDetailPhotoTableViewCell.h; sourceTree = "<group>"; };
299E45C61E8D2C860071A4CF /* ForumDetailPhotoTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ForumDetailPhotoTableViewCell.m; sourceTree = "<group>"; };
29A419811E812E5E0064E958 /* GDataXMLNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GDataXMLNode.h; sourceTree = "<group>"; };
29A419821E812E5E0064E958 /* GDataXMLNode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GDataXMLNode.m; sourceTree = "<group>"; };
29A419841E812E5E0064E958 /* MOFSAddressPickerView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MOFSAddressPickerView.h; sourceTree = "<group>"; };
......@@ -2156,6 +2159,8 @@
291D119E1E791342001E081E /* DiscussModuleCollectionViewCell.m */,
291D11A01E7923FF001E081E /* TriangleIndicatorView.h */,
291D11A11E7923FF001E081E /* TriangleIndicatorView.m */,
299E45C51E8D2C860071A4CF /* ForumDetailPhotoTableViewCell.h */,
299E45C61E8D2C860071A4CF /* ForumDetailPhotoTableViewCell.m */,
);
path = Views;
sourceTree = "<group>";
......@@ -3218,6 +3223,7 @@
29AB91E41E553AF4003A3A08 /* CustomTabbarController.m in Sources */,
29D4C2A01E0CEF5800D256C0 /* ICRPlaceholderTextView.m in Sources */,
2972312B1E09231C00D8CA9B /* BindingTableViewCell.m in Sources */,
299E45C71E8D2C860071A4CF /* ForumDetailPhotoTableViewCell.m in Sources */,
29D4C29C1E0CEA2300D256C0 /* NSString+Category.m in Sources */,
29E944421DE3EC7C007CD26C /* PrizeMainViewController.m in Sources */,
2933934F1CD3158B000D997B /* instructionsLabe.m in Sources */,
......
Lighting/Announcement.storyboard
View file @ d4a4f257
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11762" systemVersion="16C67" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11762" systemVersion="16D32" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES">
<device id="ipad9_7" orientation="landscape">
<adaptation id="fullscreen"/>
</device>
......@@ -186,7 +186,7 @@
<rect key="frame" x="0.0" y="0.0" width="1024" height="78.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" layoutMarginsFollowReadableWidth="YES" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Syz-rn-8Ux">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="749" layoutMarginsFollowReadableWidth="YES" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Syz-rn-8Ux">
<rect key="frame" x="20" y="16" width="984" height="21"/>
<string key="text">LabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabelLabel</string>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
......@@ -346,7 +346,7 @@
<nil key="highlightedColor"/>
</label>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ARf-Lp-SSe">
<rect key="frame" x="28" y="79" width="768" height="1"/>
<rect key="frame" x="28" y="79" width="929" height="1"/>
<color key="backgroundColor" red="0.92941176469999998" green="0.93333333330000001" blue="0.93725490199999995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="tTR-36-YKd"/>
......
Lighting/LearningCenter.storyboard
View file @ d4a4f257
......@@ -461,7 +461,7 @@
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="yYt-oe-BR3">
<rect key="frame" x="28" y="13" width="65" height="65"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="00登录-谭" translatesAutoresizingMaskIntoConstraints="NO" id="tIu-Ox-DXo">
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="tIu-Ox-DXo">
<rect key="frame" x="0.0" y="0.0" width="65" height="65"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
......@@ -470,7 +470,7 @@
</userDefinedRuntimeAttributes>
</imageView>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="uBx-pP-QGT">
<rect key="frame" x="10" y="10" width="45.5" height="45.5"/>
<rect key="frame" x="0.5" y="0.5" width="65" height="65"/>
</imageView>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
......@@ -480,10 +480,10 @@
<constraint firstItem="tIu-Ox-DXo" firstAttribute="top" secondItem="yYt-oe-BR3" secondAttribute="top" id="HbH-48-xpU"/>
<constraint firstItem="uBx-pP-QGT" firstAttribute="centerY" secondItem="yYt-oe-BR3" secondAttribute="centerY" id="HiL-2w-nUD"/>
<constraint firstItem="uBx-pP-QGT" firstAttribute="centerX" secondItem="yYt-oe-BR3" secondAttribute="centerX" id="THa-hV-aru"/>
<constraint firstItem="uBx-pP-QGT" firstAttribute="height" secondItem="yYt-oe-BR3" secondAttribute="height" multiplier="0.7" id="Zjw-ir-Dr0"/>
<constraint firstItem="uBx-pP-QGT" firstAttribute="height" secondItem="yYt-oe-BR3" secondAttribute="height" id="Zjw-ir-Dr0"/>
<constraint firstAttribute="trailing" secondItem="tIu-Ox-DXo" secondAttribute="trailing" id="ai7-v8-aSN"/>
<constraint firstItem="tIu-Ox-DXo" firstAttribute="leading" secondItem="yYt-oe-BR3" secondAttribute="leading" id="gCc-jL-9Cu"/>
<constraint firstItem="uBx-pP-QGT" firstAttribute="width" secondItem="yYt-oe-BR3" secondAttribute="width" multiplier="0.7" id="lXj-jb-bNQ"/>
<constraint firstItem="uBx-pP-QGT" firstAttribute="width" secondItem="yYt-oe-BR3" secondAttribute="width" id="lXj-jb-bNQ"/>
<constraint firstAttribute="height" constant="65" id="mVE-WD-2KQ"/>
</constraints>
<userDefinedRuntimeAttributes>
......@@ -2963,11 +2963,11 @@
<rect key="frame" x="0.0" y="0.0" width="1024" height="768"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="118" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="TVZ-eo-sh6">
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="118" sectionHeaderHeight="1" sectionFooterHeight="1" translatesAutoresizingMaskIntoConstraints="NO" id="TVZ-eo-sh6">
<rect key="frame" x="0.0" y="44" width="1024" height="674"/>
<color key="backgroundColor" red="0.96078431372549022" green="0.97647058823529409" blue="0.98039215686274506" alpha="1" colorSpace="calibratedRGB"/>
<view key="tableHeaderView" contentMode="scaleToFill" id="sYW-Jc-Fde">
<rect key="frame" x="0.0" y="0.0" width="1024" height="200"/>
<rect key="frame" x="0.0" y="0.0" width="1024" height="70"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="00登录-谭" translatesAutoresizingMaskIntoConstraints="NO" id="v3R-bc-vx5">
......@@ -2989,12 +2989,6 @@
<color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
<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="v8T-KD-DNZ">
<rect key="frame" x="30" y="58" width="964" height="0.0"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="AMb-KR-bVS">
<rect key="frame" x="754" y="15" width="100" height="35"/>
<color key="backgroundColor" red="0.34901960780000002" green="0.67450980390000004" blue="0.86274509799999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
......@@ -3032,8 +3026,6 @@
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstItem="v8T-KD-DNZ" firstAttribute="leading" secondItem="sYW-Jc-Fde" secondAttribute="leading" constant="30" id="BOq-Tq-pIu"/>
<constraint firstAttribute="trailing" secondItem="v8T-KD-DNZ" secondAttribute="trailing" constant="30" id="BpC-Bn-dsY"/>
<constraint firstItem="AMb-KR-bVS" firstAttribute="centerY" secondItem="Z5m-ce-eoH" secondAttribute="centerY" id="DM2-99-5qv"/>
<constraint firstItem="Z5m-ce-eoH" firstAttribute="leading" secondItem="AMb-KR-bVS" secondAttribute="trailing" constant="40" id="E3W-Dm-C7g"/>
<constraint firstItem="gWN-DJ-u26" firstAttribute="leading" secondItem="v3R-bc-vx5" secondAttribute="trailing" constant="5" id="FUt-74-XXx"/>
......@@ -3041,7 +3033,6 @@
<constraint firstItem="Z5m-ce-eoH" firstAttribute="centerY" secondItem="v3R-bc-vx5" secondAttribute="centerY" id="ScI-vs-7Mg"/>
<constraint firstItem="gWN-DJ-u26" firstAttribute="top" secondItem="v3R-bc-vx5" secondAttribute="top" id="V4A-VG-9e5"/>
<constraint firstItem="v3R-bc-vx5" firstAttribute="leading" secondItem="sYW-Jc-Fde" secondAttribute="leading" constant="30" id="m5z-Lt-G4O"/>
<constraint firstItem="v8T-KD-DNZ" firstAttribute="top" secondItem="Z5m-ce-eoH" secondAttribute="bottom" constant="8" id="n9P-lx-Ckz"/>
<constraint firstAttribute="trailing" secondItem="Z5m-ce-eoH" secondAttribute="trailing" constant="30" id="phU-Dg-qar"/>
<constraint firstItem="Se9-GU-LNv" firstAttribute="leading" secondItem="gWN-DJ-u26" secondAttribute="leading" id="seF-4s-DBQ"/>
<constraint firstItem="Se9-GU-LNv" firstAttribute="bottom" secondItem="v3R-bc-vx5" secondAttribute="bottom" id="y0g-de-dpX"/>
......@@ -3049,10 +3040,10 @@
</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="228" width="1024" height="84"/>
<rect key="frame" x="0.0" y="71" 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">
<rect key="frame" x="0.0" y="0.0" width="1024" height="83"/>
<rect key="frame" x="0.0" y="0.0" width="1024" height="84"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="crown" translatesAutoresizingMaskIntoConstraints="NO" id="pyu-Y7-w8M">
......@@ -3098,9 +3089,17 @@
<action selector="extensionButtonClickAction:" destination="sX2-jy-tQ2" eventType="touchUpInside" id="JKQ-Py-J8z"/>
</connections>
</button>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="qn5-UZ-cM4">
<rect key="frame" x="0.0" y="83" width="1024" height="1"/>
<color key="backgroundColor" red="0.92941176470588238" green="0.93333333333333335" blue="0.93725490196078431" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="fAA-nf-dma"/>
</constraints>
</view>
</subviews>
<constraints>
<constraint firstItem="pyu-Y7-w8M" firstAttribute="centerY" secondItem="iVT-bi-RKr" secondAttribute="centerY" id="0uV-p1-8pa"/>
<constraint firstAttribute="bottom" secondItem="qn5-UZ-cM4" secondAttribute="bottom" id="4pS-CA-0MD"/>
<constraint firstItem="8Th-tT-RVY" firstAttribute="leading" secondItem="iVT-bi-RKr" secondAttribute="leading" constant="20" id="52a-nf-bps"/>
<constraint firstItem="VAs-Wx-TQb" firstAttribute="leading" secondItem="iVT-bi-RKr" secondAttribute="leadingMargin" constant="20" id="A23-1U-p4J"/>
<constraint firstAttribute="bottom" secondItem="8Th-tT-RVY" secondAttribute="bottom" constant="10" id="GHM-g1-aWA"/>
......@@ -3108,8 +3107,10 @@
<constraint firstItem="mfw-jx-1kt" firstAttribute="top" secondItem="VAs-Wx-TQb" secondAttribute="top" id="LZO-yf-dpe"/>
<constraint firstItem="8Th-tT-RVY" firstAttribute="top" secondItem="iVT-bi-RKr" secondAttribute="top" constant="60" id="OyM-WB-gzg"/>
<constraint firstItem="mfw-jx-1kt" firstAttribute="leading" secondItem="VAs-Wx-TQb" secondAttribute="trailing" constant="5" id="TQh-0R-Fcz"/>
<constraint firstItem="qn5-UZ-cM4" firstAttribute="leading" secondItem="iVT-bi-RKr" secondAttribute="leading" id="Ttv-ma-62V"/>
<constraint firstItem="G4o-Xy-Sd4" firstAttribute="centerY" secondItem="VAs-Wx-TQb" secondAttribute="centerY" id="iL8-0n-q90"/>
<constraint firstItem="pyu-Y7-w8M" firstAttribute="centerX" secondItem="iVT-bi-RKr" secondAttribute="centerX" constant="-200" id="ifw-ag-xtC"/>
<constraint firstAttribute="trailing" secondItem="qn5-UZ-cM4" secondAttribute="trailing" id="ndM-Oc-58s"/>
<constraint firstAttribute="trailing" secondItem="G4o-Xy-Sd4" secondAttribute="trailing" constant="30" id="saS-eK-h2C"/>
<constraint firstItem="Nam-PB-SZa" firstAttribute="bottom" secondItem="VAs-Wx-TQb" secondAttribute="bottom" id="tv1-1o-GqD"/>
<constraint firstAttribute="trailing" secondItem="8Th-tT-RVY" secondAttribute="trailing" constant="20" id="vWw-sn-fLV"/>
......@@ -3213,7 +3214,6 @@
<outlet property="commentInputTextFieldView" destination="1kQ-zq-QUc" id="h8H-Mj-usv"/>
<outlet property="commentNumberLabel" destination="JpS-Ui-lUS" id="M67-9M-cQf"/>
<outlet property="commentView" destination="yAy-gW-uWW" id="MJ4-Po-HFM"/>
<outlet property="contentLabel" destination="v8T-KD-DNZ" id="Brq-Ix-7Ee"/>
<outlet property="deleteButton" destination="AMb-KR-bVS" id="19Y-vT-NWb"/>
<outlet property="forumDetailTableView" destination="TVZ-eo-sh6" id="NMh-5q-QMz"/>
<outlet property="issuerImageView" destination="v3R-bc-vx5" id="Fgk-WQ-KKN"/>
......
Lighting/Supporting Files/Images.xcassets/3DCenter.imageset/Contents.json 0 → 100644
View file @ d4a4f257
{
"images" : [
{
"idiom" : "universal",
"filename" : "3DCenter.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "3DCenter@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "3DCenter@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Tools/CYConst/CYConstManager.h
View file @ d4a4f257
......@@ -741,9 +741,9 @@ extern NSString *const CHANGECUSTOMERNAME;
extern NSString *const CHANGEshoppersNAME;
/**
* 提示抽奖信息
* 打开3D体验中心
*/
extern NSString *const PROMPTDRAWINFORMATION;
extern NSString *const OPENFOLLOWHEART3DVC;
/**
* 未读公告
......@@ -874,4 +874,9 @@ extern NSString *const REFRESH_FROUMLIST;
*/
extern NSString *const POSTING;
/**
修改导购名称
*/
extern NSString *const CHANGEGUIDENAME;
Tools/CYConst/CYConstManager.m
View file @ d4a4f257
......@@ -540,6 +540,11 @@ NSString *const SHOPPINGCARGOODS = @"shoppingCar";
*/
NSString *const OPENFOLLOWHEARTVC = @"FollowHeartVC";
/**
* 打开3D体验中心
*/
NSString *const OPENFOLLOWHEART3DVC = @"OPENFOLLOWHEART3DVC";
/**
* 微信卡劵
*/
......@@ -646,11 +651,6 @@ NSString *const CHANGECUSTOMERNAME = @"CHANGECUSTOMERNAME";
*/
NSString *const CHANGEshoppersNAME = @"CHANGEshoppersNAME";
/**
* 提示抽奖信息
*/
NSString *const PROMPTDRAWINFORMATION = @"PROMPTDRAWINFORMATION";
/**
* 未读公告
*/
......@@ -766,4 +766,10 @@ NSString *const REFRESH_FROUMLIST = @"RefreshList";
*/
NSString *const POSTING = @"Posting";
/**
修改导购名字
*/
NSString *const CHANGEGUIDENAME = @"CHANGEGUIDENAME";
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