修改项说明：

Class/AllCustomerViewController.m

@@ -222,12 +222,11 @@
 
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
 {
-    UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"StoryboardwithCYX" bundle:nil];
-    ClientdetailsViewController *clientdetails = [storyboard instantiateViewControllerWithIdentifier:@"clientdetails"];
+    ClientdetailsViewController *clientdetails = [[[self class] getMainStoryboardClass] instantiateViewControllerWithIdentifier:@"clientdetails"];
     clientdetails.model = [self.CustomerresultArray objectAtIndex_opple:indexPath.row];
     clientdetails.cellindex = indexPath.row;
     //设置当前客户
-    __weak typeof(self) weakSelf = self;
+    WS(weakSelf);
     [clientdetails setCurrentUserBlock:^(NSInteger index,NSString *title) {
         
         NSString *customerID = [[weakSelf.CustomerresultArray objectAtIndex_opple:indexPath.row] fid];

Class/Announcement/AnnouncementViewController.h

+//
+//  AnnouncementViewController.h
+//  Lighting
+//
+//  Created by 曹云霄 on 2016/11/14.
+//  Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
+//
+
+#import "BaseViewController.h"
+
+@interface AnnouncementViewController : BaseViewController
+
+@end

Class/Announcement/AnnouncementViewController.m

+//
+//  AnnouncementViewController.m
+//  Lighting
+//
+//  Created by 曹云霄 on 2016/11/14.
+//  Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
+//
+
+#import "AnnouncementViewController.h"
+
+@interface AnnouncementViewController ()
+
+@end
+
+@implementation AnnouncementViewController
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    // Do any additional setup after loading the view.
+    
+}
+
+- (void)didReceiveMemoryWarning {
+    [super didReceiveMemoryWarning];
+    // Dispose of any resources that can be recreated.
+}
+
+/*
+#pragma mark - Navigation
+
+// In a storyboard-based application, you will often want to do a little preparation before navigation
+- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
+    // Get the new view controller using [segue destinationViewController].
+    // Pass the selected object to the new view controller.
+}
+*/
+
+@end

Class/CardDetailsViewController.m

@@ -31,14 +31,14 @@
 - (void)addChildViewController
 {
     /// 未领取
-    CardDontUseViewController *dontUseVc = [[self getStoryboardWithName] instantiateViewControllerWithIdentifier:@"CardDontUseViewController"];
+    CardDontUseViewController *dontUseVc = [[[self class] getMainStoryboardClass] instantiateViewControllerWithIdentifier:@"CardDontUseViewController"];
     [self addChildViewController:dontUseVc];
     /// 已领取
-    CardBeenUseViewController *beenUseVc = [[self getStoryboardWithName] instantiateViewControllerWithIdentifier:@"CardBeenUseViewController"];
+    CardBeenUseViewController *beenUseVc = [[[self class] getMainStoryboardClass] instantiateViewControllerWithIdentifier:@"CardBeenUseViewController"];
     beenUseVc.cardState = ACTIVED;
     [self addChildViewController:beenUseVc];
     /// 已使用
-    CardBeenUseViewController *usedVc = [[self getStoryboardWithName] instantiateViewControllerWithIdentifier:@"CardBeenUseViewController"];
+    CardBeenUseViewController *usedVc = [[[self class] getMainStoryboardClass] instantiateViewControllerWithIdentifier:@"CardBeenUseViewController"];
     usedVc.cardState = USED;
     [self addChildViewController:usedVc];
     dontUseVc.view.frame = CGRectMake(0, 0, self.cardBackgroundView.mj_w, self.cardBackgroundView.mj_h);

Class/CardViewController.m

@@ -140,7 +140,7 @@
     TOJingdongEcardEntity *model = self.datasArray[indexPath.row];
     if ([[self class] isBlankString:model.orderReceiptUrl]) {
         [self promptCustomerTitle:@"不能查看未激活卡劵,请先上传小票激活卡劵" finish:^{
-            CardDetailsViewController *cardDetails = [[weakSelf getStoryboardWithName] instantiateViewControllerWithIdentifier:@"CardDetailsViewController"];
+            CardDetailsViewController *cardDetails = [[[weakSelf class] getMainStoryboardClass] instantiateViewControllerWithIdentifier:@"CardDetailsViewController"];
             [weakSelf.navigationController pushViewController:cardDetails animated:YES];
         }];
         

Class/ClientShoppingCarViewController.m

@@ -141,7 +141,7 @@
 
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
 {
-    ProductDetailsViewController *productDetails = [[self getStoryboardWithName] instantiateViewControllerWithIdentifier:@"productdetails"];
+    ProductDetailsViewController *productDetails = [[[self class] getMainStoryboardClass] instantiateViewControllerWithIdentifier:@"productdetails"];
     ShopcarModel *model = [self.shopResponseArray objectAtIndex_opple:indexPath.row];
     productDetails.goodsID = model.goods.fid;
     [self.navigationController pushViewController:productDetails animated:YES];

Class/ClientViewController.m

@@ -246,8 +246,7 @@
 
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
 {
-    UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"StoryboardwithCYX" bundle:nil];
-    ClientdetailsViewController *clientdetails = [storyboard instantiateViewControllerWithIdentifier:@"clientdetails"];
+    ClientdetailsViewController *clientdetails = [[[self class] getMainStoryboardClass] instantiateViewControllerWithIdentifier:@"clientdetails"];
     clientdetails.model = [self.CustomerresultArray objectAtIndex_opple:indexPath.row];
     clientdetails.cellindex = indexPath.row;
     //设置当前客户

Class/ClientdetailsViewController.m

@@ -70,14 +70,14 @@
 #pragma mark - 添加子视图
 - (void)addChildViewController
 {
-    self.shoppingCar = [[self getStoryboardWithName] instantiateViewControllerWithIdentifier:@"ClientShoppingCarViewController"];
+    self.shoppingCar = [[[self class] getMainStoryboardClass] instantiateViewControllerWithIdentifier:@"ClientShoppingCarViewController"];
     self.shoppingCar.model = self.model;
     [self addChildViewController:self.shoppingCar];
     self.currentVC = self.shoppingCar;
     self.shoppingCar.view.frame = CGRectMake(self.controllerBackgroundView.mj_x, self.shoppingAndRecordBackview.mj_y + self.shoppingAndRecordBackview.mj_h, self.controllerBackgroundView.mj_w, self.controllerBackgroundView.mj_h-self.shoppingAndRecordBackview.mj_y-self.shoppingAndRecordBackview.mj_h);
     [self.controllerBackgroundView addSubview:self.shoppingCar.view];
     
-    self.orderRecord = [[self getStoryboardWithName] instantiateViewControllerWithIdentifier:@"OrderRecordViewController"];
+    self.orderRecord = [[[self class] getMainStoryboardClass] instantiateViewControllerWithIdentifier:@"OrderRecordViewController"];
     [self addChildViewController:self.orderRecord];
     self.orderRecord.model = self.model;
     self.orderRecord.view.frame = CGRectMake(self.controllerBackgroundView.mj_x, self.shoppingAndRecordBackview.mj_y + self.shoppingAndRecordBackview.mj_h, self.controllerBackgroundView.mj_w, self.controllerBackgroundView.mj_h-self.shoppingAndRecordBackview.mj_y-self.shoppingAndRecordBackview.mj_h);

Class/CustomerOrderViewController.m

@@ -198,8 +198,7 @@
 
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
 {
-    UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"StoryboardwithCYX" bundle:nil];
-    OrderdetailsViewController *orderdetails = [storyboard instantiateViewControllerWithIdentifier:@"orderdetails"];
+    OrderdetailsViewController *orderdetails = [[[self class] getMainStoryboardClass] instantiateViewControllerWithIdentifier:@"orderdetails"];
     TOOrderEntity *model = (TOOrderEntity *)[[self.datasArray objectAtIndex_opple:indexPath.row] order];
     orderdetails.orderCode = model.orderNumber;
     if ([model.orderState isEqualToString:@"006"] || [model.orderState isEqualToString:@"002"] || [model.orderState isEqualToString:@"003"]) {
@@ -349,8 +348,7 @@
 #pragma mark -去支付
 - (void)TopayButtonClick:(NSInteger)cellindex
 {
-    UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"StoryboardwithCYX" bundle:nil];
-    OrderdetailsViewController *orderdetails = [storyboard instantiateViewControllerWithIdentifier:@"orderdetails"];
+    OrderdetailsViewController *orderdetails = [[[self class] getMainStoryboardClass] instantiateViewControllerWithIdentifier:@"orderdetails"];
     TOOrderEntity *model = (TOOrderEntity *)[[self.datasArray objectAtIndex_opple:cellindex] order];
     orderdetails.orderCode = model.orderNumber;
     if ([model.orderState isEqualToString:@"006"] || [model.orderState isEqualToString:@"002"] || [model.orderState isEqualToString:@"003"]) {

Class/FullScreenViewController.m

@@ -110,8 +110,7 @@ static NSString * const reuseIdentifier = @"Cell";
 #pragma mark -体验中心
 - (void)GotoTiYanCenterButtonClick
 {
-    UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"StoryboardwithCYX" bundle:nil];
-    ExperienceCentreViewController *ExperienceCenter = [storyboard instantiateViewControllerWithIdentifier:@"ExperienceCentre"];
+    ExperienceCentreViewController *ExperienceCenter = [[BaseViewController getMainStoryboardClass] instantiateViewControllerWithIdentifier:@"ExperienceCentre"];
     TOSceneEntity *sceneModel = [self.datasArray objectAtIndex_opple:self.currentIndex];
     SceneListModel *model = [[SceneListModel alloc]init];
     model.fid = sceneModel.fid;

Class/Login/LoginViewController.m

@@ -153,7 +153,7 @@
 #pragma mark -设置根视图控制器
 - (void)SetTheRootViewController
 {
-    RightViewController *rightVC = [[self getStoryboardWithName] instantiateViewControllerWithIdentifier:@"RightViewController"];
+    RightViewController *rightVC = [[[self class] getMainStoryboardClass] instantiateViewControllerWithIdentifier:@"RightViewController"];
     rightVC.delegate = self;
     UINavigationController *rightNav = [[UINavigationController alloc]initWithRootViewController:rightVC];
     self.drawerController = [[MMDrawerController alloc]initWithCenterViewController:self.customtabbar rightDrawerViewController:rightNav];
@@ -242,8 +242,8 @@
         
     }else if ([Name isEqualToString:@"场景库"])
     {
-        selectedIndex = 4;
-        SceneLibraryViewController *sceneVC = [SHARED_APPDELEGATE.allControllerArray objectAtIndex_opple:4];
+        selectedIndex = 5;
+        SceneLibraryViewController *sceneVC = [SHARED_APPDELEGATE.allControllerArray objectAtIndex_opple:5];
         sceneVC.conditionModel.styleEquals = nil;
         sceneVC.conditionModel.spaceEquals = nil;
         [sceneVC.StyleButton setTitle:@"风格" forState:UIControlStateNormal];
@@ -252,8 +252,8 @@
        
     }else if ([Name isEqualToString:@"产品库"])
     {
-        selectedIndex = 5;
-        ProductLibraryViewController *productVC = [SHARED_APPDELEGATE.allControllerArray objectAtIndex_opple:5];
+        selectedIndex = 6;
+        ProductLibraryViewController *productVC = [SHARED_APPDELEGATE.allControllerArray objectAtIndex_opple:6];
         //默认加载全部数据
         productVC.barcode = nil;
         productVC.selectedCode = nil;
@@ -267,8 +267,8 @@
         [productVC.productCollectionView.mj_header beginRefreshing];
     }else if ([Name isEqualToString:@"所有客户"])
     {
-        selectedIndex = 6;
-        AllCustomerViewController *AllcustomerVC = [SHARED_APPDELEGATE.allControllerArray objectAtIndex_opple:6];
+        selectedIndex = 7;
+        AllCustomerViewController *AllcustomerVC = [SHARED_APPDELEGATE.allControllerArray objectAtIndex_opple:7];
         AllcustomerVC.searchTextfield.text = nil;
         AllcustomerVC.conditionModel.resellerCodeEquals = nil;
         AllcustomerVC.conditionModel.mobileEquals = nil;
@@ -278,8 +278,8 @@
         [AllcustomerVC.allCustomerTableview.mj_header beginRefreshing];
     }else if ([Name isEqualToString:@"客户订单"])
     {
-        selectedIndex = 7;
-        CustomerOrderViewController *customerVC = [SHARED_APPDELEGATE.allControllerArray objectAtIndex_opple:7];
+        selectedIndex = 8;
+        CustomerOrderViewController *customerVC = [SHARED_APPDELEGATE.allControllerArray objectAtIndex_opple:8];
         customerVC.searchCustomerOrder.text = nil;
         [customerVC.StyleButton setTitle:@"全部订单" forState:UIControlStateNormal];
         customerVC.model.consumerNameOrMobileEquals = nil;
@@ -287,7 +287,7 @@
         [customerVC.customerOrderTableView.mj_header beginRefreshing];
     }else if ([Name isEqualToString:@"关于"])
     {
-        selectedIndex = 8;
+        selectedIndex = 9;
     }
    self.customtabbar.selectedIndex = selectedIndex;
 }

Class/LuckyDrawViewController.m

@@ -27,13 +27,13 @@
 - (void)setupChildrenController
 {
     /// 未抽奖
-    LuckyDrawDetailsViewController *notDrawControl = [[self getStoryboardWithName] instantiateViewControllerWithIdentifier:@"LuckyDrawDetailsViewController"];
+    LuckyDrawDetailsViewController *notDrawControl = [[[self class] getMainStoryboardClass] instantiateViewControllerWithIdentifier:@"LuckyDrawDetailsViewController"];
     [self addChildViewController:notDrawControl];
     notDrawControl.drawValue = 1;
     self.currentVC = notDrawControl;
     
     /// 已抽奖
-    LuckyDrawDetailsViewController *usedDrawControl = [[self getStoryboardWithName] instantiateViewControllerWithIdentifier:@"LuckyDrawDetailsViewController"];
+    LuckyDrawDetailsViewController *usedDrawControl = [[[self class] getMainStoryboardClass] instantiateViewControllerWithIdentifier:@"LuckyDrawDetailsViewController"];
     usedDrawControl.drawValue = 2;
     [self addChildViewController:usedDrawControl];
     

Class/OrderRecordViewController.m

@@ -129,7 +129,7 @@
 
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
 {
-    OrderdetailsViewController *orderdetails = [[self getStoryboardWithName] instantiateViewControllerWithIdentifier:@"orderdetails"];
+    OrderdetailsViewController *orderdetails = [[[self class] getMainStoryboardClass] instantiateViewControllerWithIdentifier:@"orderdetails"];
     TOOrderEntity *model = (TOOrderEntity *)[[self.orderRecordArray objectAtIndex_opple:indexPath.row] order];
     orderdetails.orderCode = model.orderNumber;
     if ([model.orderState isEqualToString:@"006"] || [model.orderState isEqualToString:@"002"] || [model.orderState isEqualToString:@"003"]) {

Class/OrderdetailsViewController.m

@@ -360,7 +360,7 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
 #pragma mark - 卡劵领取成功
 - (void)rebateApplySuccess
 {
-    RebateSuccessTableViewController *success = [self.getStoryboardWithName instantiateViewControllerWithIdentifier:@"RebateSuccessTableViewController"];
+    RebateSuccessTableViewController *success = [[[self class] getMainStoryboardClass] instantiateViewControllerWithIdentifier:@"RebateSuccessTableViewController"];
     success.titleArray = @[@"卡劵已发放到你的账户",@"查看账户",@"我知道了"];
     [success setClickEvent:^(NSIndexPath *indexPath) {
         if (indexPath.row == 1) {
@@ -382,7 +382,7 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
 - (void)showJDECard
 {
     WS(weakSelf);
-    JDEcardViewController *jdeCard = [[self getStoryboardWithName] instantiateViewControllerWithIdentifier:@"JDEcardViewController"];
+    JDEcardViewController *jdeCard = [[[self class] getMainStoryboardClass] instantiateViewControllerWithIdentifier:@"JDEcardViewController"];
     [jdeCard setDismissJDECardBlock:^{
         [weakSelf.settingsPopoverController dismissPopoverAnimated:YES];
     }];

Class/PaymentsViewController.m

@@ -156,7 +156,7 @@
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
 {
     [tableView deselectRowAtIndexPath:indexPath animated:YES];
-    PaymentsDetailsTableViewController *paymentsDetailsVC = [[self getStoryboardWithName] instantiateViewControllerWithIdentifier:@"PaymentsDetailsTableViewController"];
+    PaymentsDetailsTableViewController *paymentsDetailsVC = [[[self class] getMainStoryboardClass] instantiateViewControllerWithIdentifier:@"PaymentsDetailsTableViewController"];
     paymentsDetailsVC.model = self.resultArray[indexPath.row];
     [self.navigationController pushViewController:paymentsDetailsVC animated:YES];
 }

Class/ProductLibraryViewController.m

@@ -507,7 +507,7 @@
 
 - (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath
 {
-    ProductDetailsViewController *productDetails = [[self getStoryboardWithName] instantiateViewControllerWithIdentifier:@"productdetails"];
+    ProductDetailsViewController *productDetails = [[[self class] getMainStoryboardClass] instantiateViewControllerWithIdentifier:@"productdetails"];
     productDetails.goodsID = [[self.datasArray objectAtIndex_opple:indexPath.item] fid];
     [self.navigationController pushViewController:productDetails animated:YES];
 }

Class/RebateDetailsViewController.m

@@ -77,7 +77,7 @@
 - (void)rebateApplySuccess
 {
     WS(weakSelf);
-    RebateSuccessTableViewController *success = [self.getStoryboardWithName instantiateViewControllerWithIdentifier:@"RebateSuccessTableViewController"];
+    RebateSuccessTableViewController *success = [[[self class]getMainStoryboardClass] instantiateViewControllerWithIdentifier:@"RebateSuccessTableViewController"];
     success.titleArray = @[@"提现申请已提交，审核中",@"查看详情",@"返回账户"];
     [success setClickEvent:^(NSIndexPath *indexPath) {
         if (indexPath.row == 1) {

Class/RebateViewController.m

@@ -140,10 +140,10 @@
 #pragma mark - 设置收支明细、提现进度、卡劵包
 - (void)setupChildViewController
 {
-    PaymentsViewController *payments = [[self getStoryboardWithName] instantiateViewControllerWithIdentifier:@"PaymentsViewController"];
+    PaymentsViewController *payments = [[[self class] getMainStoryboardClass] instantiateViewControllerWithIdentifier:@"PaymentsViewController"];
     [self addChildViewController:payments];
     
-    WithdrawalViewController *withdrawal = [[self getStoryboardWithName] instantiateViewControllerWithIdentifier:@"WithdrawalViewController"];
+    WithdrawalViewController *withdrawal = [[[self class] getMainStoryboardClass] instantiateViewControllerWithIdentifier:@"WithdrawalViewController"];
     [self addChildViewController:withdrawal];
     payments.view.frame = CGRectMake(0, 40, self.contentBackgroundView.mj_w, self.contentBackgroundView.mj_h-40);
     withdrawal.view.frame = CGRectMake(0, 40, self.contentBackgroundView.mj_w, self.contentBackgroundView.mj_h-40);
@@ -151,13 +151,13 @@
     self.currentVC = payments;
     
     /// 我的卡劵
-    CardViewController *cardVc = [[self getStoryboardWithName] instantiateViewControllerWithIdentifier:@"CardViewController"];
+    CardViewController *cardVc = [[[self class] getMainStoryboardClass] instantiateViewControllerWithIdentifier:@"CardViewController"];
     [self addChildViewController:cardVc];
     cardVc.view.frame = CGRectMake(10, 40, (self.cardBackgroundView.mj_w-20), self.cardBackgroundView.mj_h-50);
     [self.cardBackgroundView addSubview:cardVc.view];
     
     /// 我的抽奖
-    LuckyDrawDetailsViewController *draw = [[self getStoryboardWithName] instantiateViewControllerWithIdentifier:@"LuckyDrawDetailsViewController"];
+    LuckyDrawDetailsViewController *draw = [[[self class] getMainStoryboardClass] instantiateViewControllerWithIdentifier:@"LuckyDrawDetailsViewController"];
     [self addChildViewController:draw];
     draw.drawValue = 0;
     draw.view.frame = CGRectMake(10, 40, (self.drawBackgroundView.mj_w-20), self.drawBackgroundView.mj_h-50);
@@ -234,10 +234,10 @@
 - (IBAction)withdrawalButtonClickAction:(UIButton *)sender {
     
     WS(weakSelf);
-    RebateDetailsViewController *rebateDetails = [self.getStoryboardWithName instantiateViewControllerWithIdentifier:@"RebateDetailsViewController"];
+    RebateDetailsViewController *rebateDetails = [[[self class] getMainStoryboardClass] instantiateViewControllerWithIdentifier:@"RebateDetailsViewController"];
     rebateDetails.rebateAmount = [self.model.accountTotal floatValue]-[self.model.applytotal floatValue];
     [rebateDetails setShowApplyDetails:^(TOApplyBillEntity *entity) {
-        WithdrawalTableViewController *detailVC = [weakSelf.getStoryboardWithName instantiateViewControllerWithIdentifier:@"WithdrawalTableViewController"];
+        WithdrawalTableViewController *detailVC = [[[self class] getMainStoryboardClass]  instantiateViewControllerWithIdentifier:@"WithdrawalTableViewController"];
         detailVC.model = entity;
         [weakSelf.navigationController pushViewController:detailVC animated:YES];
     }];
@@ -247,14 +247,14 @@
 #pragma mark - 更多卡劵
 - (IBAction)moreCardButtonClickAction:(UIButton *)sender {
     
-    CardDetailsViewController *cardDetails = [[self getStoryboardWithName] instantiateViewControllerWithIdentifier:@"CardDetailsViewController"];
+    CardDetailsViewController *cardDetails = [[[self class] getMainStoryboardClass] instantiateViewControllerWithIdentifier:@"CardDetailsViewController"];
     [self.navigationController pushViewController:cardDetails animated:YES];
 }
 
 #pragma mark - 更多抽奖信息
 - (IBAction)moreDrawButtonClickAction:(UIButton *)sender {
     
-    LuckyDrawViewController *luckDrawDetails = [[self getStoryboardWithName] instantiateViewControllerWithIdentifier:@"LuckyDrawViewController"];
+    LuckyDrawViewController *luckDrawDetails = [[[self class] getMainStoryboardClass] instantiateViewControllerWithIdentifier:@"LuckyDrawViewController"];
     [self.navigationController pushViewController:luckDrawDetails animated:YES];
 }
 

Class/RightViewController.m

@@ -169,7 +169,7 @@
     RightControlTableViewCell *cell = [tableView cellForRowAtIndexPath:indexPath];
     CGPoint point = [cell convertPoint:cell.sectionTitle.mj_origin toView:self.rightTableview];
     [self addInstructionsLine:point.y];
-    [self closeSidebarAndPassEvents:self.subSectionArray[indexPath.row]];
+    [self closeSidebarAndPassEvents:self.subSectionArray[indexPath.section][indexPath.row]];
 }
 
 - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath

Class/SearchViewController.m

@@ -102,7 +102,7 @@
          [self.localSearchArray addObject:not.object];
     }
     //调用商品控制器
-    ProductLibraryViewController *productVC = [[self getStoryboardWithName] instantiateViewControllerWithIdentifier:@"ProductLibraryViewController"];
+    ProductLibraryViewController *productVC = [[[self class] getMainStoryboardClass] instantiateViewControllerWithIdentifier:@"ProductLibraryViewController"];
     productVC.selectedCode = not.object;
     [self.navigationController pushViewController:productVC animated:YES];
 }
@@ -218,7 +218,7 @@
 #pragma mark - 调用商品控制器
 - (void)callProductControl:(NSString *)codeString
 {
-    ProductLibraryViewController *productVC = [[self getStoryboardWithName] instantiateViewControllerWithIdentifier:@"ProductLibraryViewController"];
+    ProductLibraryViewController *productVC = [[[self class] getMainStoryboardClass] instantiateViewControllerWithIdentifier:@"ProductLibraryViewController"];
     productVC.selectedCode = codeString;
     [self.navigationController pushViewController:productVC animated:NO];
 }

Class/Shoppingcart/GenerateOrdersViewController.m

@@ -420,7 +420,7 @@
                         if (weakSelf.DelecteSelectedGoods) {
                             weakSelf.DelecteSelectedGoods(codeArrray);
                         }
-                        OrderdetailsViewController *orderDetails = [[weakSelf getStoryboardWithName] instantiateViewControllerWithIdentifier:@"orderdetails"];
+                        OrderdetailsViewController *orderDetails = [[[weakSelf class] getMainStoryboardClass] instantiateViewControllerWithIdentifier:@"orderdetails"];
                         orderDetails.orderCode = returnValue[@"data"];
                         orderDetails.isShowPayButton = YES;
                         orderDetails.isUserInteractionEnabled = YES;

Class/Shoppingcart/ShoppingViewController.m

@@ -315,7 +315,7 @@
 
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
 {
-    ProductDetailsViewController *productDetails = [[self getStoryboardWithName] instantiateViewControllerWithIdentifier:@"productdetails"];
+    ProductDetailsViewController *productDetails = [[[self class] getMainStoryboardClass] instantiateViewControllerWithIdentifier:@"productdetails"];
     productDetails.goodsID = [[self.shopResponseArray objectAtIndex_opple:indexPath.row] goodsId];
     [self.navigationController pushViewController:productDetails animated:YES];
 }
@@ -365,7 +365,7 @@
     //商品总信息占位
      ShopcarModel*ZhanweiModel = [[ShopcarModel alloc]init];
     [array addObject:ZhanweiModel];
-    GenerateOrdersViewController *generateOrder = [[self getStoryboardWithName] instantiateViewControllerWithIdentifier:@"generateorders"];
+    GenerateOrdersViewController *generateOrder = [[[self class] getMainStoryboardClass] instantiateViewControllerWithIdentifier:@"generateorders"];
     generateOrder.settlementGoodsdatas = array;
     //清除已经生成订单的商品
     [generateOrder setDelecteSelectedGoods:^(NSArray *goodsCode) {

Class/Tabbar/CustomTabbarController.m

@@ -23,6 +23,7 @@
 #import "ExperienceCentreViewController.h"
 #import "RebateViewController.h"
 #import <AVFoundation/AVFoundation.h>
+#import "AnnouncementViewController.h"
 
 @interface CustomTabbarController ()<TabbarButtonClickdelegate,ChangpasswordDelegate,CancelButtondelegate,UITextFieldDelegate>
 
@@ -56,7 +57,7 @@
 {
     if (_identifierArray == nil) {
         
-        _identifierArray = [NSArray arrayWithObjects:@"SearchViewController",@"ShoppingViewController",@"ClientViewController",@"RebateViewController",@"SceneLibraryViewController",@"ProductLibraryViewController",@"AllCustomerViewController",@"CustomerOrderViewController",@"AboutViewController", nil];
+        _identifierArray = [NSArray arrayWithObjects:@"SearchViewController",@"ShoppingViewController",@"ClientViewController",@"RebateViewController",@"AnnouncementViewController",@"SceneLibraryViewController",@"ProductLibraryViewController",@"AllCustomerViewController",@"CustomerOrderViewController",@"AboutViewController", nil];
     }
     return _identifierArray;
 }
@@ -122,8 +123,16 @@
 - (void)addViewcontroller
 {
     NSMutableArray *controllerArray = [NSMutableArray array];
-    UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"StoryboardwithCYX" bundle:nil];
+    UIStoryboard *storyboard = nil;
     for (int i=0; i<self.identifierArray.count; i++) {
+        
+        NSString *controllString = self.identifierArray[i];
+        /// 公告
+        if ([controllString isEqualToString:@"AnnouncementViewController"]) {
+            storyboard = [BaseViewController getAnnouncementStoryboardClass];
+        }else {
+            storyboard = [BaseViewController getMainStoryboardClass];
+        }
         BaseViewController *control = [storyboard instantiateViewControllerWithIdentifier:self.identifierArray[i]];
         UINavigationController *nav = [[UINavigationController alloc]initWithRootViewController:control];
         [self.vcArray addObject:nav];
@@ -165,7 +174,7 @@
         case 101:
             
         {
-            NSLog(@"公告点击");
+            self.selectedIndex = 4;
         }
             break;
             
@@ -346,8 +355,7 @@
         
     }else
     {
-        UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"StoryboardwithCYX" bundle:nil];
-        ExperienceCentreViewController *ExperienceCenter = [storyboard instantiateViewControllerWithIdentifier:@"ExperienceCentre"];
+        ExperienceCentreViewController *ExperienceCenter = [[BaseViewController getMainStoryboardClass] instantiateViewControllerWithIdentifier:@"ExperienceCentre"];
         ExperienceCenter.modalPresentationStyle = UIModalPresentationOverFullScreen;
         UIPopoverPresentationController *popover = ExperienceCenter.popoverPresentationController;
         popover.sourceView = ExperienceCenter.view;

Class/UserViewController.m

@@ -201,7 +201,7 @@
 - (IBAction)cancellationButtonClick:(UIButton *)sender {
     
     UIAlertController *alertVC = [UIAlertController alertControllerWithTitle:@"提示" message:@"切换用户将清空用户数据，是否继续?" preferredStyle:UIAlertControllerStyleAlert];
-    __weak typeof(self) weakSelf = self;
+    WS(weakSelf);
     [alertVC addAction:[UIAlertAction actionWithTitle:@"取消" style:UIAlertActionStyleCancel handler:^(UIAlertAction * _Nonnull action) {
         [weakSelf dismissViewControllerAnimated:YES completion:nil];
     }]];
@@ -215,8 +215,7 @@
                 
                 [Shoppersmanager manager].currentCustomer = NO;
                 [Customermanager manager].model = nil;
-                UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"StoryboardwithCYX" bundle:nil];
-                LoginViewController *loginVC = [storyboard instantiateViewControllerWithIdentifier:@"Login"];
+                LoginViewController *loginVC = [[[self class] getMainStoryboardClass] instantiateViewControllerWithIdentifier:@"Login"];
                 [[NSUserDefaults standardUserDefaults] removeObjectForKey:USERNAME];
                 [[NSUserDefaults standardUserDefaults] removeObjectForKey:PASSWORD];
                 [weakSelf restoreRootViewController:loginVC];

Class/WithdrawalViewController.m

@@ -155,7 +155,7 @@
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
 {
     [tableView deselectRowAtIndexPath:indexPath animated:YES];
-    WithdrawalTableViewController *paymentsDetailsVC = [[self getStoryboardWithName] instantiateViewControllerWithIdentifier:@"WithdrawalTableViewController"];
+    WithdrawalTableViewController *paymentsDetailsVC = [[[self class] getMainStoryboardClass] instantiateViewControllerWithIdentifier:@"WithdrawalTableViewController"];
     paymentsDetailsVC.model = self.resultArray[indexPath.row];
     [self.navigationController pushViewController:paymentsDetailsVC animated:YES];
 }

Lighting.xcodeproj/project.pbxproj

@@ -74,7 +74,7 @@
 		29498C601D053B7C004FA79B /* ShoppingBagTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 29498C5F1D053B7C004FA79B /* ShoppingBagTableViewCell.m */; };
 		2949BABD1CD2EFA00049385A /* InformationTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 2949BABC1CD2EFA00049385A /* InformationTableViewCell.m */; };
 		2949BAC21CD3055A0049385A /* MMExampleDrawerVisualStateManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 2949BAC11CD3055A0049385A /* MMExampleDrawerVisualStateManager.m */; };
-		294BFDD11D47225A00BFD53F /* StoryboardwithCYX.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 294BFDD01D47225A00BFD53F /* StoryboardwithCYX.storyboard */; };
+		294BFDD11D47225A00BFD53F /* OppleMain.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 294BFDD01D47225A00BFD53F /* OppleMain.storyboard */; };
 		294BFDD51D47227900BFD53F /* ExperienceCentreViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 294BFDD41D47227900BFD53F /* ExperienceCentreViewController.m */; };
 		294CF0EC1CEDCF480055F1D8 /* PromptinformationView.m in Sources */ = {isa = PBXBuildFile; fileRef = 294CF0EB1CEDCF480055F1D8 /* PromptinformationView.m */; };
 		294CF0EE1CEDCF540055F1D8 /* PromptinformationView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 294CF0ED1CEDCF540055F1D8 /* PromptinformationView.xib */; };
@@ -147,6 +147,9 @@
 		29BFBD8F1CE44BA900C238FB /* goodsDetailsSectionview.m in Sources */ = {isa = PBXBuildFile; fileRef = 29BFBD8E1CE44BA900C238FB /* goodsDetailsSectionview.m */; };
 		29BFBD911CE44BC200C238FB /* goodsDetailsSectionview.xib in Resources */ = {isa = PBXBuildFile; fileRef = 29BFBD901CE44BC200C238FB /* goodsDetailsSectionview.xib */; };
 		29BFBD981CE46FDA00C238FB /* MyclientEntityModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 29BFBD971CE46FDA00C238FB /* MyclientEntityModel.m */; };
+		29C0E73D1DD9824E006CCCF9 /* Announcement.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 29C0E73C1DD9824E006CCCF9 /* Announcement.storyboard */; };
+		29C0E73F1DD98335006CCCF9 /* LearningCenter.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 29C0E73E1DD98335006CCCF9 /* LearningCenter.storyboard */; };
+		29C0E7441DD98943006CCCF9 /* AnnouncementViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29C0E7431DD98943006CCCF9 /* AnnouncementViewController.m */; };
 		29C584E91CDA249300C6F677 /* ProductCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 29C584E81CDA249200C6F677 /* ProductCollectionViewCell.m */; };
 		29C584ED1CDA429500C6F677 /* ProductDetailsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29C584EC1CDA429500C6F677 /* ProductDetailsViewController.m */; };
 		29CB35421CFF0FB60061A5F3 /* ScreeningCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 29CB35411CFF0FB60061A5F3 /* ScreeningCollectionViewCell.m */; };
@@ -315,7 +318,7 @@
 		2949BABC1CD2EFA00049385A /* InformationTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = InformationTableViewCell.m; sourceTree = "<group>"; };
 		2949BAC01CD3055A0049385A /* MMExampleDrawerVisualStateManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MMExampleDrawerVisualStateManager.h; sourceTree = "<group>"; };
 		2949BAC11CD3055A0049385A /* MMExampleDrawerVisualStateManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MMExampleDrawerVisualStateManager.m; sourceTree = "<group>"; };
-		294BFDD01D47225A00BFD53F /* StoryboardwithCYX.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = StoryboardwithCYX.storyboard; sourceTree = "<group>"; };
+		294BFDD01D47225A00BFD53F /* OppleMain.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = OppleMain.storyboard; sourceTree = "<group>"; };
 		294BFDD41D47227900BFD53F /* ExperienceCentreViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = ExperienceCentreViewController.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
 		294CF0EA1CEDCF480055F1D8 /* PromptinformationView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PromptinformationView.h; sourceTree = "<group>"; };
 		294CF0EB1CEDCF480055F1D8 /* PromptinformationView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PromptinformationView.m; sourceTree = "<group>"; };
@@ -457,6 +460,10 @@
 		29BFBD901CE44BC200C238FB /* goodsDetailsSectionview.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = goodsDetailsSectionview.xib; sourceTree = "<group>"; };
 		29BFBD961CE46FDA00C238FB /* MyclientEntityModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MyclientEntityModel.h; sourceTree = "<group>"; };
 		29BFBD971CE46FDA00C238FB /* MyclientEntityModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MyclientEntityModel.m; sourceTree = "<group>"; };
+		29C0E73C1DD9824E006CCCF9 /* Announcement.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Announcement.storyboard; sourceTree = "<group>"; };
+		29C0E73E1DD98335006CCCF9 /* LearningCenter.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = LearningCenter.storyboard; sourceTree = "<group>"; };
+		29C0E7421DD98943006CCCF9 /* AnnouncementViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AnnouncementViewController.h; sourceTree = "<group>"; };
+		29C0E7431DD98943006CCCF9 /* AnnouncementViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AnnouncementViewController.m; sourceTree = "<group>"; };
 		29C584E71CDA249200C6F677 /* ProductCollectionViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProductCollectionViewCell.h; sourceTree = "<group>"; };
 		29C584E81CDA249200C6F677 /* ProductCollectionViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ProductCollectionViewCell.m; sourceTree = "<group>"; };
 		29C584EB1CDA429500C6F677 /* ProductDetailsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProductDetailsViewController.h; sourceTree = "<group>"; };
@@ -757,6 +764,8 @@
 		2928F7DD1CD085430036D761 /* Class */ = {
 			isa = PBXGroup;
 			children = (
+				29C0E7411DD98917006CCCF9 /* Announcement */,
+				29C0E7401DD9890F006CCCF9 /* LearningCenter */,
 				29D260EF1CEEAA5000A9787D /* FullScreen */,
 				29E384C01CE9A68F00888199 /* SearchController */,
 				29834EC11CDF768C001A484F /* XXuserController */,
@@ -1116,7 +1125,9 @@
 			children = (
 				29706DA71CD082990003C412 /* AppDelegate.h */,
 				29706DA81CD082990003C412 /* AppDelegate.m */,
-				294BFDD01D47225A00BFD53F /* StoryboardwithCYX.storyboard */,
+				294BFDD01D47225A00BFD53F /* OppleMain.storyboard */,
+				29C0E73C1DD9824E006CCCF9 /* Announcement.storyboard */,
+				29C0E73E1DD98335006CCCF9 /* LearningCenter.storyboard */,
 				29706DA41CD082990003C412 /* Supporting Files */,
 			);
 			path = Lighting;
@@ -1437,6 +1448,22 @@
 			name = model;
 			sourceTree = "<group>";
 		};
+		29C0E7401DD9890F006CCCF9 /* LearningCenter */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			path = LearningCenter;
+			sourceTree = "<group>";
+		};
+		29C0E7411DD98917006CCCF9 /* Announcement */ = {
+			isa = PBXGroup;
+			children = (
+				29C0E7421DD98943006CCCF9 /* AnnouncementViewController.h */,
+				29C0E7431DD98943006CCCF9 /* AnnouncementViewController.m */,
+			);
+			path = Announcement;
+			sourceTree = "<group>";
+		};
 		29C584E51CDA246900C6F677 /* controller */ = {
 			isa = PBXGroup;
 			children = (
@@ -1770,12 +1797,14 @@
 				2936F29B1D01868E007CA67C /* ShareGoodsViewController.xib in Resources */,
 				29E384BF1CE9933300888199 /* AdditionalTableViewCell.xib in Resources */,
 				29EAAE901CDC3E9700C4DBA2 /* BillingInfoView.xib 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 */,
-				294BFDD11D47225A00BFD53F /* StoryboardwithCYX.storyboard in Resources */,
+				294BFDD11D47225A00BFD53F /* OppleMain.storyboard in Resources */,
 				29BFBD911CE44BC200C238FB /* goodsDetailsSectionview.xib in Resources */,
+				29C0E73F1DD98335006CCCF9 /* LearningCenter.storyboard in Resources */,
 				29D260FD1CEED53400A9787D /* goodsDetailsTableViewCell.xib in Resources */,
 				29807C621CD20C2A00F111B8 /* Images.xcassets in Resources */,
 				29834EB61CDF1EB6001A484F /* screeningSecondView.xib in Resources */,
@@ -1994,6 +2023,7 @@
 				29E2D3271DB88D8B00443170 /* CardOrderInformationReusableView.m in Sources */,
 				2962D06D1CD1A43A0058829D /* ClientViewController.m in Sources */,
 				29A8D3981CD85A58004D558F /* ClientdetailsViewController.m in Sources */,
+				29C0E7441DD98943006CCCF9 /* AnnouncementViewController.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

Lighting/Announcement.storyboard

+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11201" systemVersion="16B2555" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11161"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <scenes>
+        <!--Announcement View Controller-->
+        <scene sceneID="0GJ-bk-mbi">
+            <objects>
+                <viewController storyboardIdentifier="AnnouncementViewController" id="o85-iD-kdb" customClass="AnnouncementViewController" sceneMemberID="viewController">
+                    <layoutGuides>
+                        <viewControllerLayoutGuide type="top" id="km9-Id-nJS"/>
+                        <viewControllerLayoutGuide type="bottom" id="AM1-kB-vpq"/>
+                    </layoutGuides>
+                    <view key="view" contentMode="scaleToFill" id="K8I-7A-x3V">
+                        <rect key="frame" x="0.0" y="0.0" width="1024" height="768"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="I66-lA-NGI">
+                                <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="50" id="Zal-p3-PBk"/>
+                                </constraints>
+                            </view>
+                        </subviews>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                        <constraints>
+                            <constraint firstAttribute="trailing" secondItem="I66-lA-NGI" secondAttribute="trailing" id="CCE-VM-Bkq"/>
+                            <constraint firstItem="I66-lA-NGI" firstAttribute="leading" secondItem="K8I-7A-x3V" secondAttribute="leading" id="Lxo-bG-8lm"/>
+                            <constraint firstItem="I66-lA-NGI" firstAttribute="top" secondItem="K8I-7A-x3V" secondAttribute="top" id="laY-dc-LVS"/>
+                        </constraints>
+                    </view>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="ZlE-0z-IZL" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="199.8046875" y="-213.28125"/>
+        </scene>
+    </scenes>
+</document>

Lighting/AppDelegate.m

@@ -52,8 +52,7 @@
 #pragma mark -设置根视图
 - (void)RootViewcontroller
 {
-    UIStoryboard *story = [UIStoryboard storyboardWithName:@"StoryboardwithCYX" bundle:nil];
-    LoginViewController *login = [story instantiateViewControllerWithIdentifier:@"Login"];
+    LoginViewController *login = [[BaseViewController getMainStoryboardClass] instantiateViewControllerWithIdentifier:@"Login"];
     self.window.rootViewController = login;
 }
 

Lighting/Info.plist

@@ -47,12 +47,6 @@
 			</array>
 		</dict>
 	</array>
-    <!-- 相册 -->
-    <key>NSPhotoLibraryUsageDescription</key>
-    <string>App需要您的同意,才能访问相册</string>
-    <!-- 相机 -->
-    <key>NSCameraUsageDescription</key>
-    <string>App需要您的同意,才能访问相机</string>
 	<key>CFBundleVersion</key>
 	<string></string>
 	<key>LSApplicationQueriesSchemes</key>
@@ -74,12 +68,16 @@
 		<key>NSAllowsArbitraryLoads</key>
 		<true/>
 	</dict>
+	<key>NSCameraUsageDescription</key>
+	<string>App需要您的同意,才能访问相机</string>
+	<key>NSPhotoLibraryUsageDescription</key>
+	<string>App需要您的同意,才能访问相册</string>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIMainStoryboardFile</key>
-	<string>StoryboardwithCYX</string>
+	<string>OppleMain</string>
 	<key>UIMainStoryboardFile~ipad</key>
-	<string>StoryboardwithCYX</string>
+	<string>OppleMain</string>
 	<key>UIRequiredDeviceCapabilities</key>
 	<array>
 		<string>armv7</string>

Lighting/LearningCenter.storyboard

+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11134" systemVersion="15F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11106"/>
+    </dependencies>
+    <scenes/>
+</document>

Tools/BaseViewController.h

@@ -37,11 +37,14 @@
 - (void)SHOWPrompttext:(NSString *)Text ComcpleteBlock:(void(^)())completed;
 
 /**
- *  获得我的storyboard对象
+ *  获得主体的storyboard对象
  */
-- (UIStoryboard *)getStoryboardWithName;
-
++ (UIStoryboard *)getMainStoryboardClass;
 
+/**
+ 获得公告storyboard对象
+ */
++ (UIStoryboard *)getAnnouncementStoryboardClass;
 
 /**
  *  调用打印机

Tools/BaseViewController.m

@@ -56,8 +56,9 @@
 
 - (void)viewDidLoad {
     [super viewDidLoad];
-    // Do any additional setup after loading the view.
+    
     self.automaticallyAdjustsScrollViewInsets = NO;
+    self.navigationController.navigationBar.translucent = NO;
     //检测登陆超时通知
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(logintimeoutNotification:) name:LOGINTIMEOUT object:nil];
 }
@@ -72,8 +73,7 @@
         [weakSelf dismissViewControllerAnimated:YES completion:nil];
         [Shoppersmanager manager].currentCustomer = NO;
         [Customermanager manager].model = nil;
-        UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"StoryboardwithCYX" bundle:nil];
-        LoginViewController *loginVC = [storyboard instantiateViewControllerWithIdentifier:@"Login"];
+        LoginViewController *loginVC = [[BaseViewController getMainStoryboardClass] instantiateViewControllerWithIdentifier:@"Login"];
         [[NSUserDefaults standardUserDefaults] removeObjectForKey:USERNAME];
         [[NSUserDefaults standardUserDefaults] removeObjectForKey:PASSWORD];
         [weakSelf restoreRootViewController:loginVC];
@@ -214,9 +214,16 @@
 }
 
 #pragma mark -获得我的storyboard对象
-- (UIStoryboard *)getStoryboardWithName
++ (UIStoryboard *)getMainStoryboardClass
+{
+    UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"OppleMain" bundle:nil];
+    return storyboard;
+}
+
+#pragma mark - 获得公告storyboard对象
++ (UIStoryboard *)getAnnouncementStoryboardClass
 {
-    UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"StoryboardwithCYX" bundle:nil];
+    UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"Announcement" bundle:nil];
     return storyboard;
 }
 

Tools/ExperienceCentreViewController.m

@@ -245,7 +245,7 @@
 - (IBAction)ShoppingBagButtonClickAction:(UIButton *)sender {
     
     sender.selected = YES;
-    ShoppingBagViewController *shoppingBag = [[self getStoryboardWithName] instantiateViewControllerWithIdentifier:@"ShoppingBagViewController"];
+    ShoppingBagViewController *shoppingBag = [[[self class] getMainStoryboardClass] instantiateViewControllerWithIdentifier:@"ShoppingBagViewController"];
     [shoppingBag setDismissBlock:^{
         sender.selected = NO;
     }];
@@ -433,7 +433,7 @@
     
     sender.selected = YES;
     [[NSUserDefaults standardUserDefaults] setBool:YES forKey:@"SCENE"];
-    SceneViewController *sceneVC = [[self getStoryboardWithName] instantiateViewControllerWithIdentifier:@"SceneController"];
+    SceneViewController *sceneVC = [[[self class] getMainStoryboardClass] instantiateViewControllerWithIdentifier:@"SceneController"];
     [sceneVC setDismissBlock:^{
         sender.selected = NO;
     }];
@@ -456,7 +456,7 @@
     
     sender.selected = YES;
     [[NSUserDefaults standardUserDefaults] setBool:NO forKey:@"SCENE"];
-    SceneViewController *sceneVC = [[self getStoryboardWithName] instantiateViewControllerWithIdentifier:@"SceneController"];
+    SceneViewController *sceneVC = [[[self class] getMainStoryboardClass] instantiateViewControllerWithIdentifier:@"SceneController"];
     [sceneVC setDismissBlock:^{
         sender.selected = NO;
     }];