修改项说明：xcode8.0

Class/CardCollectionViewCell.m

@@ -13,6 +13,7 @@
 
 - (void)awakeFromNib
 {
+    [super awakeFromNib];
     self.layer.shadowColor = [UIColor grayColor].CGColor;
     self.layer.shadowRadius = 4;
     self.layer.shadowOpacity = 0.3;

Class/CardDontUseViewController.m

@@ -245,7 +245,7 @@
 {
     WS(weakSelf);
     NSData *data = UIImageJPEGRepresentation(image, 0.5);
-    [[NetworkRequestClassManager Manager] UploadImageWithURL:SERVERREQUESTURL(UPLOADHEADER) WithRequestType:1 WithImageDatas:data WithParameter:nil WithReturnValueBlock:^(id returnValue) {
+    [[NetworkRequestClassManager Manager] UploadImageWithURL:SERVERREQUESTURL(UPLOADHEADER) WithRequestType:ONE WithImageDatas:data WithParameter:nil WithReturnValueBlock:^(id returnValue) {
         
         if ([returnValue[@"code"] isEqualToNumber:@0]) {
             [weakSelf activationJDECard:returnValue[@"data"]];

Class/Login/authenticateView.m

@@ -21,6 +21,7 @@
 
 - (void)awakeFromNib
 {
+    [super awakeFromNib];
     [self uiConfigAction];
 }
 

Class/PaymentsTableViewCell.m

@@ -12,6 +12,7 @@
 
 - (void)awakeFromNib {
     // Initialization code
+    [super awakeFromNib];
 }
 
 - (void)setSelected:(BOOL)selected animated:(BOOL)animated {

Class/ProductDetailsHeaderView.m

@@ -39,6 +39,7 @@
 #pragma mark -初始化Nib文件
 - (void)awakeFromNib
 {
+    [super awakeFromNib];
     [self uiConfigAction];
 }
 

Class/ProductDetailsViewController.m

@@ -15,7 +15,7 @@
 
 
 
-@interface ProductDetailsViewController ()<UITableViewDelegate,UITableViewDataSource,UITextFieldDelegate>
+@interface ProductDetailsViewController ()<UITableViewDelegate,UITableViewDataSource,UITextFieldDelegate,CAAnimationDelegate>
 
 @property (nonatomic,strong) ProductDetailsHeaderView *headerView;
 

Class/ProductLibraryViewController.m

@@ -15,7 +15,7 @@
 #import "ExperienceCentreViewController.h"
 
 
-@interface ProductLibraryViewController ()<UICollectionViewDelegate,UICollectionViewDataSource,UIGestureRecognizerDelegate,ScreeningButtonClickdelegate,TableviewSelectedIndexdelegate,SelectedCollectionItemDelegate,DZNEmptyDataSetSource,DZNEmptyDataSetDelegate>
+@interface ProductLibraryViewController ()<UICollectionViewDelegate,UICollectionViewDataSource,UIGestureRecognizerDelegate,ScreeningButtonClickdelegate,TableviewSelectedIndexdelegate,SelectedCollectionItemDelegate,DZNEmptyDataSetSource,DZNEmptyDataSetDelegate,CAAnimationDelegate>
 
 /**
  *  筛选背景框View

Class/RightViewController.m

@@ -59,7 +59,7 @@
 {
     if (_dataArray == nil) {
         
-        _dataArray = @[@"体验中心",@"场景库",@"产品库",@"客户管理",@"关于"];
+        _dataArray = @[@"体验中心",@"场景库",@"产品库",@"客户管理",@"学习中心",@"关于"];
     }
     return _dataArray;
 }
@@ -67,7 +67,7 @@
 - (NSArray *)subSectionArray
 {
     if (!_subSectionArray) {
-        _subSectionArray = @[@"所有客户",@"客户订单"];
+        _subSectionArray = @[@"",@"",@"",@[@"所有客户",@"客户订单"],@[@"技能培训",@"技能考核"],@""];
     }
     return _subSectionArray;
 }
@@ -101,7 +101,7 @@
 {
     if (_imageArray == nil) {
         
-        _imageArray = [NSArray arrayWithObjects:@"tiyan",@"changjing",@"chanping",@"kehu",@"guanyu", nil];
+        _imageArray = [NSArray arrayWithObjects:@"tiyan",@"changjing",@"chanping",@"kehu",@"guanyu",@"guanyu", nil];
     }
     return _imageArray;
 }
@@ -149,7 +149,7 @@
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
 {
     RightControlTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"RightControlTableViewCell" forIndexPath:indexPath];
-    cell.sectionTitle.text = self.subSectionArray[indexPath.row];
+    cell.sectionTitle.text = self.subSectionArray[indexPath.section][indexPath.row];
     return cell;
     
 }
@@ -157,8 +157,9 @@
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
 {
     BOOL controlClose = [self.sectionClosedArray[section] boolValue];
-    if (section == 3) {
-        return controlClose?self.subSectionArray.count:0;
+    if (section == 3 || section == 4) {
+        NSArray *subArray = self.subSectionArray[section];
+        return controlClose?subArray.count:0;
     }
     return 0;
 }
@@ -205,13 +206,17 @@
 - (void)sectionClickAction:(UITapGestureRecognizer *)sender
 {
     NSInteger index = sender.view.tag;
-    if (sender.view.tag == 3) {
+    if (index == 3 || 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.rightTableview reloadSections:[NSIndexSet indexSetWithIndex:3] withRowAnimation:UITableViewRowAnimationFade];
+        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]];
     }
     RightControlSectionView *sectionView = (RightControlSectionView *)sender.view;

Class/ScreeningView.m

@@ -21,6 +21,7 @@
 
 - (void)awakeFromNib
 {
+    [super awakeFromNib];
     [self uiConfigAction];
 }
 

Class/Shoppingcart/ModifyShippingAddressView.m

@@ -28,6 +28,7 @@
 
 - (void)awakeFromNib
 {
+    [super awakeFromNib];
     [self uiConfigAction];
 }
 

Class/Tabbar/CustomTabbarController.m

@@ -161,9 +161,17 @@
             
             break;
             
-            //某某用户
+            //公告
         case 101:
             
+        {
+            NSLog(@"公告点击");
+        }
+            break;
+            
+            //某某用户
+        case 102:
+            
         {
             UserViewController *userVC = [[UserViewController alloc]init];
             userVC.delegate = self;
@@ -178,14 +186,14 @@
             break;
             
             //我的客户
-        case 102:
+        case 103:
             
             self.selectedIndex = 2;
             
             break;
             
             //购物车
-        case 103:
+        case 104:
             
             //必须设置当前客户才能跳转到购物车
             if (![Shoppersmanager manager].currentCustomer) {

Class/Tabbar/Toolview.m

@@ -74,10 +74,10 @@
     
     //按钮
     NSString *realName = [[Shoppersmanager manager].Shoppers.employee.realName length]?[Shoppersmanager manager].Shoppers.employee.realName:@"服务导购";
-    NSArray *titleArray = [NSArray arrayWithObjects:@"功能菜单",realName,@"我的客户",@"购物袋", nil];
+    NSArray *titleArray = [NSArray arrayWithObjects:@"功能菜单",@"公告",realName,@"我的客户",@"购物袋", nil];
     //图片
-    NSArray *imageArray = [NSArray arrayWithObjects:@"dial",@"矢量智能对象-1",@"data",@"ablum", nil];
-    for (int i=1; i<5; i++) {
+    NSArray *imageArray = [NSArray arrayWithObjects:@"dial",@"tips",@"矢量智能对象-1",@"data",@"ablum", nil];
+    for (int i=1; i<titleArray.count+1; i++) {
         
         CustomButton *button = [CustomButton buttonWithType:UIButtonTypeCustom];
         button.frame = CGRectMake(ScreenWidth-(i*ButtonWIDTH + Buttoninterval*(i-1)), 10, ButtonWIDTH, ButtonRIGHT);
@@ -87,7 +87,7 @@
         [button addTarget:self action:@selector(ButtonClick:) forControlEvents:UIControlEventTouchUpInside];
         [button setImage:TCImage([imageArray objectAtIndex_opple:i-1]) forState:UIControlStateNormal];
         [self addSubview:button];
-        if (i == 4) {
+        if (i == titleArray.count) {
             
             SHARED_APPDELEGATE.shoppingCarPoint = [self convertPoint:CGPointMake(button.center.x, button.center.y) toView:self.window];
         }
@@ -118,7 +118,7 @@
 #pragma mark -刷新购物车显示数量
 - (void)refreshGoodsNumber:(NSNotification *)object
 {
-    CustomButton *button = (CustomButton *)[self viewWithTag:103];
+    CustomButton *button = (CustomButton *)[self viewWithTag:104];
     NSInteger number = [object.object integerValue];
     if (number) {
         button.instructionsNumber += number;
@@ -130,7 +130,7 @@
 #pragma mark - 重置购物车显示数量
 - (void)resetGoodNumber:(NSNotification *)object
 {
-    CustomButton *button = (CustomButton *)[self viewWithTag:103];
+    CustomButton *button = (CustomButton *)[self viewWithTag:104];
     NSInteger number = [object.object integerValue];
     button.instructionsNumber = number;
 }
@@ -138,7 +138,7 @@
 #pragma mark - 提示抽奖机会
 - (void)promptDrawInformation:(NSNotification *)object
 {
-    CustomButton *button = (CustomButton *)[self viewWithTag:101];
+    CustomButton *button = (CustomButton *)[self viewWithTag:102];
     NSInteger number = [object.object integerValue];
     if (number) {
         button.instructionsNumber += number;
@@ -150,9 +150,9 @@
 #pragma mark -更改当前用户名
 - (void)ChangeCustomerName:(NSNotification *)object
 {
-    UIButton *button = [self viewWithTag:102];
+    UIButton *button = [self viewWithTag:103];
     NSString *userName = object.object;
-    if (userName.length == 0 || !userName) {
+    if ([BaseViewController isBlankString:userName]) {
         userName = @"我的客户";
     }
     [button setTitle:userName forState:UIControlStateNormal];
@@ -161,9 +161,9 @@
 #pragma mark -更改导购名字
 - (void)ChangeShoppersName:(NSNotification *)object
 {
-    UIButton *button = [self viewWithTag:101];
+    UIButton *button = [self viewWithTag:102];
     NSString *userName = object.object;
-    if (userName.length == 0 || !userName) {
+    if ([BaseViewController isBlankString:userName]) {
         userName = @"导购";
     }
     [button setTitle:userName forState:UIControlStateNormal];
@@ -181,8 +181,8 @@
 #pragma mark -按钮事件响应
 - (void)ButtonClick:(UIButton *)button
 {
-    if (button.tag == 102 || button.tag == 103) {
-        if (!(button.tag == 103 && ![Shoppersmanager manager].currentCustomer)) {
+    if (button.tag == 101 || button.tag == 103 || button.tag == 104) {
+        if (!(button.tag == 104 && ![Shoppersmanager manager].currentCustomer)) {
             self.underlineView.hidden = NO;
             //下划线动画
             [UIView animateWithDuration:0.2 delay:0 options:UIViewAnimationOptionCurveEaseOut animations:^{

Class/WithdrawalTableViewCell.m

@@ -12,6 +12,7 @@
 
 - (void)awakeFromNib {
     // Initialization code
+    [super awakeFromNib];
 }
 
 - (void)setSelected:(BOOL)selected animated:(BOOL)animated {

Class/goodsDetailsTableViewCell.m

@@ -17,7 +17,7 @@
 
 - (void)awakeFromNib
 {
-    
+    [super awakeFromNib];
 }
 
 - (void)setSelected:(BOOL)selected animated:(BOOL)animated {

Class/screeningFirstView.m

@@ -24,6 +24,7 @@
 
 - (void)awakeFromNib
 {
+    [super awakeFromNib];
     [self uiConfigAction];
 }
 

Class/screeningSecondView.m

@@ -26,7 +26,7 @@
 
 - (void)awakeFromNib
 {
-//    [self uiConfigAction];
+    [super awakeFromNib];
     self.defaultDatasArray = [NSMutableArray array];
     for (int i=0; i<5; i++) {
         

Lighting.xcodeproj/project.pbxproj

@@ -1730,7 +1730,7 @@
 		29706D991CD082980003C412 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0730;
+				LastUpgradeCheck = 0800;
 				ORGANIZATIONNAME = "上海勾芒科技有限公司";
 				TargetAttributes = {
 					29706DA01CD082980003C412 = {
@@ -2015,6 +2015,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -2025,8 +2026,10 @@
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "";
@@ -2061,6 +2064,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -2071,8 +2075,10 @@
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "";

Lighting.xcodeproj/xcshareddata/xcschemes/Lighting.xcscheme

 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0730"
+   LastUpgradeVersion = "0800"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Lighting/Images.xcassets/tips.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "tips.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "tips@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "tips@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file

Lighting/Info.plist

@@ -47,6 +47,12 @@
 			</array>
 		</dict>
 	</array>
+    <!-- 相册 -->
+    <key>NSPhotoLibraryUsageDescription</key>
+    <string>App需要您的同意,才能访问相册</string>
+    <!-- 相机 -->
+    <key>NSCameraUsageDescription</key>
+    <string>App需要您的同意,才能访问相机</string>
 	<key>CFBundleVersion</key>
 	<string></string>
 	<key>LSApplicationQueriesSchemes</key>

Tools/BaseViewController.h

@@ -66,10 +66,7 @@
  */
 - (void)SHOWPrompttext:(NSString *)Text;
 
-/**
- *  调用无线打印机......成功回调、失败回调
- */
-- (void)callAirprintWithURL:(NSURL *)datasurl SuccessBlock:(void(^)())success ErrorBlock:(void(^)())failed;
+
 
 /**
  *  显示提示图片、文本

Tools/BaseViewController.m

@@ -8,13 +8,10 @@
 
 #import "BaseViewController.h"
 #import "LoginViewController.h"
-#import <WebKit/WebKit.h>
 
-@interface BaseViewController ()<UIPrintInteractionControllerDelegate,UIWebViewDelegate,WKNavigationDelegate>
+@interface BaseViewController ()<UIPrintInteractionControllerDelegate,UIWebViewDelegate>
 
 
-@property (nonatomic,strong) WKWebView *webView;
-
 /**
  *  提示框
  */
@@ -57,18 +54,6 @@
     return _promptView;
 }
 
-
-- (WKWebView *)webView
-{
-    if (_webView == nil) {
-        
-        _webView = [[WKWebView alloc]initWithFrame:CGRectMake(0, 0, ScreenWidth, ScreenHeight)];
-    }
-    return _webView;
-}
-
-
-
 - (void)viewDidLoad {
     [super viewDidLoad];
     // Do any additional setup after loading the view.

Tools/PrefixHeader.pch

@@ -118,7 +118,7 @@
 /**
  *  服务器开发地址
  */
-//#define SERVERREQUESTURL(URL)  [NSString stringWithFormat:@"http://139.196.195.30:8090/opple-web/app%@",URL]
+#define SERVERREQUESTURL(URL)  [NSString stringWithFormat:@"http://139.196.195.30:8090/opple-web/app%@",URL]
 
 
 /**
@@ -129,7 +129,7 @@
 ///**
 // *  服务器正式地址
 // */
-#define SERVERREQUESTURL(URL)  [NSString stringWithFormat:@"http://dg.opple.com/opple-web/app%@",URL]
+//#define SERVERREQUESTURL(URL)  [NSString stringWithFormat:@"http://dg.opple.com/opple-web/app%@",URL]
 
 /**
  *  搜索框输入通知

Tools/SceneViewController.m

@@ -16,7 +16,7 @@
 #import "ProductScreeningCollectionViewCell.h"
 #import "GoodsCategoryModel.h"
 
-@interface SceneViewController ()<UITableViewDelegate,UITableViewDataSource,UIGestureRecognizerDelegate,UICollectionViewDelegate,UICollectionViewDataSource,DZNEmptyDataSetSource,UITextFieldDelegate>
+@interface SceneViewController ()<UITableViewDelegate,UITableViewDataSource,UIGestureRecognizerDelegate,UICollectionViewDelegate,UICollectionViewDataSource,DZNEmptyDataSetSource,UITextFieldDelegate,CAAnimationDelegate>
 
 /**
  *  场景数据源