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

Class/Announcement/Controllers/AnnountcementDetailViewController.m

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

+//
+//  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

+//
+//  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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -115,7 +115,6 @@
 - (void)viewDidAppear:(BOOL)animated
 {
     [super viewDidAppear:animated];
-    [Notification postNotificationName:PROMPTDRAWINFORMATION object:@(0)];
     [self getRebateDatasFromUser];
 }
 

Lighting.xcodeproj/project.pbxproj

@@ -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

 <?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/Supporting Files/Images.xcassets/3DCenter.imageset/Contents.json

+{
+  "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

@@ -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

@@ -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";
+
+