修改项说明：公告

Class/AllCustomerViewController.m

@@ -222,7 +222,7 @@
 
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
 {
-    UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"StoryboardwithCYX" bundle:nil];
+    UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"OppleMain" bundle:nil];
     ClientdetailsViewController *clientdetails = [storyboard instantiateViewControllerWithIdentifier:@"clientdetails"];
     clientdetails.model = [self.CustomerresultArray objectAtIndex_opple:indexPath.row];
     clientdetails.cellindex = indexPath.row;

Class/ClientViewController.m

@@ -246,7 +246,7 @@
 
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
 {
-    UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"StoryboardwithCYX" bundle:nil];
+    UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"OppleMain" bundle:nil];
     ClientdetailsViewController *clientdetails = [storyboard instantiateViewControllerWithIdentifier:@"clientdetails"];
     clientdetails.model = [self.CustomerresultArray objectAtIndex_opple:indexPath.row];
     clientdetails.cellindex = indexPath.row;

Class/CustomerOrderViewController.m

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

Class/FullScreenViewController.m

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

Class/RightViewController.h

@@ -21,6 +21,7 @@
 
 - (void)SelectedControllerWithIndex:(NSString *)Name;
 
+
 @end
 
 @interface RightViewController : BaseViewController

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 *sectionTitleArray = self.subSectionArray[section];
+        return controlClose?sectionTitleArray.count:0;
     }
     return 0;
 }
@@ -168,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
@@ -205,13 +206,17 @@
 - (void)sectionClickAction:(UITapGestureRecognizer *)sender
 {
     NSInteger index = sender.view.tag;
-    if (sender.view.tag == 3) {
+    if (sender.view.tag == 3 || sender.view.tag == 4) {
         BOOL controlClose = [self.sectionClosedArray[index] boolValue];
         self.sectionClosedArray[index] = controlClose?@0:@1;
         [self.rightTableview reloadSections:[NSIndexSet indexSetWithIndex:index] withRowAnimation:UITableViewRowAnimationFade];
-    }else{
+    }else {
         self.sectionClosedArray[3] = @0;
-        [self.rightTableview reloadSections:[NSIndexSet indexSetWithIndex:3] withRowAnimation:UITableViewRowAnimationFade];
+        self.sectionClosedArray[4] = @0;
+        NSMutableIndexSet *sectionSet = [[NSMutableIndexSet alloc]init];
+        [sectionSet addIndex:3];
+        [sectionSet addIndex:4];
+        [self.rightTableview reloadSections:sectionSet withRowAnimation:UITableViewRowAnimationFade];
        [self closeSidebarAndPassEvents:self.dataArray[index]];
     }
     RightControlSectionView *sectionView = (RightControlSectionView *)sender.view;

Class/Shoppingcart/ShoppingViewController.m

@@ -82,7 +82,7 @@
     [self.settlementButton setTitle:@"去结算(0)" forState:UIControlStateNormal];
     self.allSelectedButton.selected = NO;
     self.totalpriceLabe.text = nil;
-    self.discountTextField.text = nil;
+    self.discountTextField.text = self.textField.text;
 }
 
 #pragma mark - UI

Class/Tabbar/CustomTabbarController.m

@@ -122,7 +122,7 @@
 - (void)addViewcontroller
 {
     NSMutableArray *controllerArray = [NSMutableArray array];
-    UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"StoryboardwithCYX" bundle:nil];
+    UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"OppleMain" bundle:nil];
     for (int i=0; i<self.identifierArray.count; i++) {
         BaseViewController *control = [storyboard instantiateViewControllerWithIdentifier:self.identifierArray[i]];
         UINavigationController *nav = [[UINavigationController alloc]initWithRootViewController:control];
@@ -161,9 +161,17 @@
             
             break;
             
-            //某某用户
+            //公告
         case 101:
             
+//            [SHARED_APPDELEGATE.mmdrawer toggleDrawerSide:MMDrawerSideRight animated:YES completion:nil];
+            NSLog(@"公告");
+            
+            break;
+            
+            //某某用户
+        case 102:
+            
         {
             UserViewController *userVC = [[UserViewController alloc]init];
             userVC.delegate = self;
@@ -178,19 +186,19 @@
             break;
             
             //我的客户
-        case 102:
+        case 103:
             
             self.selectedIndex = 2;
             
             break;
             
             //购物车
-        case 103:
+        case 104:
             
             //必须设置当前客户才能跳转到购物车
             if (![Shoppersmanager manager].currentCustomer) {
                 
-                MBProgressHUD *hud = [MBProgressHUD showHUDAddedTo:self.view.window animated:YES];
+                MBProgressHUD *hud = [MBProgressHUD showHUDAddedTo:SHARED_APPDELEGATE.window animated:YES];
                 hud.labelText = @"必须设置当前客户才能访问购物车";
                 hud.margin = 10.f;
                 hud.color = [[UIColor blackColor] colorWithAlphaComponent:0.5];
@@ -338,7 +346,7 @@
         
     }else
     {
-        UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"StoryboardwithCYX" bundle:nil];
+        UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"OppleMain" bundle:nil];
         ExperienceCentreViewController *ExperienceCenter = [storyboard instantiateViewControllerWithIdentifier:@"ExperienceCentre"];
         ExperienceCenter.modalPresentationStyle = UIModalPresentationOverFullScreen;
         UIPopoverPresentationController *popover = ExperienceCenter.popoverPresentationController;

Class/Tabbar/Toolview.m

@@ -56,7 +56,6 @@
     imageview.image = TCImage(@"search");
     [backView addSubview:imageview];
     
-    
     //输入框
     self.inputField = [[UITextField alloc]initWithFrame:CGRectMake(45, 0, 170, 35)];
     self.inputField.borderStyle = UITextBorderStyleNone;
@@ -74,10 +73,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,16 +86,15 @@
         [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 == 5) {
             SHARED_APPDELEGATE.shoppingCarPoint = [self convertPoint:CGPointMake(button.center.x, button.center.y) toView:self.window];
         }
     }
     //创建下划线
-    CustomButton *Newbutton = (CustomButton *)[self viewWithTag:102];
+    CustomButton *Newbutton = (CustomButton *)[self viewWithTag:103];
     self.underlineView = [[UIView alloc]initWithFrame:CGRectMake(Newbutton.frame.origin.x+(ButtonWIDTH-50)/2, ButtonRIGHT+8, 50, 2)];
     SHARED_APPDELEGATE.lineView = self.underlineView;
-    _underlineView.backgroundColor = kMainBlueColor;
+    self.underlineView.backgroundColor = kMainBlueColor;
     [self addSubview:self.underlineView];
 }
 
@@ -118,7 +116,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 +128,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 +136,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;
@@ -181,11 +179,11 @@
 #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:^{
+            [UIView animateWithDuration:0.5 delay:0.1f usingSpringWithDamping:0.5f initialSpringVelocity:0.5f options:UIViewAnimationOptionCurveEaseInOut animations:^{
                 CGRect frame = self.underlineView.frame;
                 frame.origin.x = button.frame.origin.x+(ButtonWIDTH-50)/2;
                 self.underlineView.frame = frame;

Class/UserViewController.m

@@ -215,7 +215,7 @@
                 
                 [Shoppersmanager manager].currentCustomer = NO;
                 [Customermanager manager].model = nil;
-                UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"StoryboardwithCYX" bundle:nil];
+                UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"OppleMain" bundle:nil];
                 LoginViewController *loginVC = [storyboard instantiateViewControllerWithIdentifier:@"Login"];
                 [[NSUserDefaults standardUserDefaults] removeObjectForKey:USERNAME];
                 [[NSUserDefaults standardUserDefaults] removeObjectForKey:PASSWORD];

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 */; };
@@ -146,6 +146,7 @@
 		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 */; };
+		29C528FF1DD41A0400644899 /* LearningCenter.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 29C528FE1DD41A0400644899 /* LearningCenter.storyboard */; };
 		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 */; };
@@ -314,7 +315,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>"; };
@@ -454,6 +455,7 @@
 		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>"; };
+		29C528FE1DD41A0400644899 /* LearningCenter.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = LearningCenter.storyboard; 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>"; };
@@ -1112,7 +1114,8 @@
 			children = (
 				29706DA71CD082990003C412 /* AppDelegate.h */,
 				29706DA81CD082990003C412 /* AppDelegate.m */,
-				294BFDD01D47225A00BFD53F /* StoryboardwithCYX.storyboard */,
+				294BFDD01D47225A00BFD53F /* OppleMain.storyboard */,
+				29C528FE1DD41A0400644899 /* LearningCenter.storyboard */,
 				29706DA41CD082990003C412 /* Supporting Files */,
 			);
 			path = Lighting;
@@ -1761,7 +1764,7 @@
 				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 */,
 				29D260FD1CEED53400A9787D /* goodsDetailsTableViewCell.xib in Resources */,
 				29807C621CD20C2A00F111B8 /* Images.xcassets in Resources */,
@@ -1775,6 +1778,7 @@
 				299C7F5B1CE21FA800E7D7CB /* AddressViewController.xib in Resources */,
 				29706DB41CD082990003C412 /* Assets.xcassets in Resources */,
 				291A37791DBA58D700299F0D /* GetJDCardView.xib in Resources */,
+				29C528FF1DD41A0400644899 /* LearningCenter.storyboard in Resources */,
 				29EC331B1CE023D5005F0C13 /* ChangePasswordViewController.xib in Resources */,
 				29360C311CDDC487002A5D89 /* ScreeningView.xib in Resources */,
 			);
@@ -2090,7 +2094,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = "Brand Assets";
 				CLANG_ENABLE_OBJC_WEAK = YES;
-				CODE_SIGN_IDENTITY = "iPhone Distribution: Shanghai Gomore Information Technology Co.,Ltd";
+				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COMPRESS_PNG_FILES = NO;
 				DEVELOPMENT_TEAM = W54V2VB863;
@@ -2149,7 +2153,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = "Brand Assets";
 				CLANG_ENABLE_OBJC_WEAK = YES;
-				CODE_SIGN_IDENTITY = "iPhone Distribution: Shanghai Gomore Information Technology Co.,Ltd";
+				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COMPRESS_PNG_FILES = NO;
 				DEVELOPMENT_TEAM = W54V2VB863;

Lighting/AppDelegate.m

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

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

@@ -71,9 +71,9 @@
 	<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"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="16B2555" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none">
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
+    </dependencies>
+    <scenes>
+        <!--View Controller-->
+        <scene sceneID="EAB-tP-ufR">
+            <objects>
+                <viewController id="Wsa-lr-3Yi" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="grG-rS-d1s">
+                        <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                    </view>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="04o-Xi-sbn" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="3067" y="9229"/>
+        </scene>
+        <!--Root View Controller-->
+        <scene sceneID="TB4-O7-YXl">
+            <objects>
+                <tableViewController clearsSelectionOnViewWillAppear="NO" id="Idu-Ob-bwA" sceneMemberID="viewController">
+                    <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" id="G25-FO-k71">
+                        <rect key="frame" x="0.0" y="0.0" width="320" height="1024"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                        <prototypes>
+                            <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="VJT-Rd-MME">
+                                <rect key="frame" x="0.0" y="92" width="320" height="44"/>
+                                <autoresizingMask key="autoresizingMask"/>
+                                <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="VJT-Rd-MME" id="g4b-Qx-OOB">
+                                    <rect key="frame" x="0.0" y="0.0" width="320" height="43.5"/>
+                                    <autoresizingMask key="autoresizingMask"/>
+                                </tableViewCellContentView>
+                            </tableViewCell>
+                        </prototypes>
+                        <connections>
+                            <outlet property="dataSource" destination="Idu-Ob-bwA" id="0UP-GV-2Ee"/>
+                            <outlet property="delegate" destination="Idu-Ob-bwA" id="8RK-Tb-mH1"/>
+                        </connections>
+                    </tableView>
+                    <navigationItem key="navigationItem" title="Root View Controller" id="n6B-pr-5vV"/>
+                </tableViewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="N5L-HQ-Hih" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="3383" y="8144"/>
+        </scene>
+        <!--Navigation Controller-->
+        <scene sceneID="SW4-cb-AAR">
+            <objects>
+                <navigationController id="7QR-zR-DF5" sceneMemberID="viewController">
+                    <navigationBar key="navigationBar" contentMode="scaleToFill" id="Shh-gx-xgD">
+                        <rect key="frame" x="0.0" y="0.0" width="768" height="44"/>
+                        <autoresizingMask key="autoresizingMask"/>
+                    </navigationBar>
+                    <connections>
+                        <segue destination="Idu-Ob-bwA" kind="relationship" relationship="rootViewController" id="26v-8l-EIa"/>
+                    </connections>
+                </navigationController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="qO8-6c-v1H" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="2843" y="8144"/>
+        </scene>
+        <!--Split View Controller-->
+        <scene sceneID="AkK-S4-k4Z">
+            <objects>
+                <splitViewController id="fET-6x-pSQ" sceneMemberID="viewController">
+                    <connections>
+                        <segue destination="7QR-zR-DF5" kind="relationship" relationship="masterViewController" id="7lT-yi-zeA"/>
+                        <segue destination="Wsa-lr-3Yi" kind="relationship" relationship="detailViewController" id="hM1-H4-ekL"/>
+                    </connections>
+                </splitViewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="0mb-vm-dDh" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="2079" y="8687"/>
+        </scene>
+    </scenes>
+</document>

Tools/BaseViewController.m

@@ -87,7 +87,7 @@
         [weakSelf dismissViewControllerAnimated:YES completion:nil];
         [Shoppersmanager manager].currentCustomer = NO;
         [Customermanager manager].model = nil;
-        UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"StoryboardwithCYX" bundle:nil];
+        UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"OppleMain" bundle:nil];
         LoginViewController *loginVC = [storyboard instantiateViewControllerWithIdentifier:@"Login"];
         [[NSUserDefaults standardUserDefaults] removeObjectForKey:USERNAME];
         [[NSUserDefaults standardUserDefaults] removeObjectForKey:PASSWORD];
@@ -231,7 +231,7 @@
 #pragma mark -获得我的storyboard对象
 - (UIStoryboard *)getStoryboardWithName
 {
-    UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"StoryboardwithCYX" bundle:nil];
+    UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"OppleMain" bundle:nil];
     return storyboard;
 }
 

Tools/PrefixHeader.pch

@@ -115,17 +115,12 @@
 /**
  *  服务器开发地址
  */
-//#define SERVERREQUESTURL(URL)  [NSString stringWithFormat:@"http://139.196.195.30:8090/opple-web/app%@",URL]
-
-///**
-// *  服务器开发地址
-// */
-//#define SERVERREQUESTURL(URL)  [NSString stringWithFormat:@"http://192.168.199.188:8081/opple-web/app%@",URL]
+#define SERVERREQUESTURL(URL)  [NSString stringWithFormat:@"http://139.196.195.30:8090/opple-web/app%@",URL]
 
 /**
  *  服务器测试地址
  */
-#define SERVERREQUESTURL(URL)  [NSString stringWithFormat:@"http://dg-dev.opple.com/opple-web/app%@",URL]
+//#define SERVERREQUESTURL(URL)  [NSString stringWithFormat:@"http://dg-dev.opple.com/opple-web/app%@",URL]
 
 ///**
 // *  服务器正式地址