Skip to content

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

修改项说明：

parent f031e85a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 258 additions and 15 deletions
Class/LearningCenter/LearningCenterMain/LearningCenterMainViewController.h 0 → 100644
View file @ 99f59e52
//
// LearningCenterMainViewController.h
// Lighting
//
// Created by 曹云霄 on 2016/11/16.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import "BaseViewController.h"
@interface LearningCenterMainViewController : BaseViewController
@end
Class/LearningCenter/LearningCenterMain/LearningCenterMainViewController.m 0 → 100644
View file @ 99f59e52
//
// LearningCenterMainViewController.m
// Lighting
//
// Created by 曹云霄 on 2016/11/16.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import "LearningCenterMainViewController.h"
@interface LearningCenterMainViewController ()
@end
@implementation LearningCenterMainViewController
- (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/Login/LoginViewController.m
View file @ 99f59e52
......@@ -15,6 +15,7 @@
#import "AllCustomerViewController.h"
#import "CustomerOrderViewController.h"
#import <Bugly/Bugly.h>
#import "LearningCenterMainViewController.h"
@interface LoginViewController ()<RightVCselectedDelegate>
......@@ -285,9 +286,13 @@
customerVC.model.consumerNameOrMobileEquals = nil;
customerVC.model.orderStateEquals = nil;
[customerVC.customerOrderTableView.mj_header beginRefreshing];
}else if ([Name isEqualToString:@"关于"])
}else if ([Name isEqualToString:@"学习中心"])
{
selectedIndex = 9;
}else if ([Name isEqualToString:@"关于"])
{
selectedIndex = 10;
}
self.customtabbar.selectedIndex = selectedIndex;
}
......
Class/OrderdetailsViewController.m
View file @ 99f59e52
......@@ -318,9 +318,16 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
/// 完成后回调
dispatch_group_notify(group, dispatch_get_main_queue(), ^{
/// 消费者抽奖成功后若没有支付，后面支付时可以继续享受奖品折扣
/// 消费者抽奖成功后若没有支付，后面支付时可以继续享受奖品折扣<需满足促销条件>
if ([resultModel.draw.state isEqualToString:ACCOMPLISHED]) {
weakSelf.customerDrawModel = [LuckDrawResultModel initializeWith:resultModel];
for (JSONModel *model in weakSelf.luckyDrawAndJDECardArray) {
if ([model isMemberOfClass:[LuckyDrawModel class]]) {
LuckyDrawModel *consumerModel = (LuckyDrawModel *)model;
if ([consumerModel.body isEqualToString:CONSUMER]) {
weakSelf.customerDrawModel = [LuckDrawResultModel initializeWith:resultModel];break;
}
}
}
}
/// 支付完成后
if (self.isShowPrintButton && resultModel.award) {
......
Class/RightViewController.m
View file @ 99f59e52
......@@ -67,7 +67,7 @@
- (NSArray *)subSectionArray
{
if (!_subSectionArray) {
_subSectionArray = @[@"",@"",@"",@[@"所有客户",@"客户订单"],@[@"技能培训",@"技能考核"],@""];
_subSectionArray = @[@"",@"",@"",@[@"所有客户",@"客户订单"],@"",@""];
}
return _subSectionArray;
}
......@@ -206,16 +206,14 @@
- (void)sectionClickAction:(UITapGestureRecognizer *)sender
{
NSInteger index = sender.view.tag;
if (index == 3 || index == 4) {
if (index == 3 ) {
BOOL controlClose = [self.sectionClosedArray[index] boolValue];
self.sectionClosedArray[index] = controlClose?@0:@1;
[self.rightTableview reloadSections:[NSIndexSet indexSetWithIndex:index] withRowAnimation:UITableViewRowAnimationFade];
}else{
self.sectionClosedArray[3] = @0;
self.sectionClosedArray[4] = @0;
NSMutableIndexSet *indexSet = [[NSMutableIndexSet alloc]init];
[indexSet addIndex:3];
[indexSet addIndex:4];
[self.rightTableview reloadSections:indexSet withRowAnimation:UITableViewRowAnimationFade];
[self closeSidebarAndPassEvents:self.dataArray[index]];
}
......
Class/Tabbar/CustomTabbarController.m
View file @ 99f59e52
......@@ -57,7 +57,7 @@
{
if (_identifierArray == nil) {
_identifierArray = [NSArray arrayWithObjects:@"SearchViewController",@"ShoppingViewController",@"ClientViewController",@"RebateViewController",@"AnnouncementViewController",@"SceneLibraryViewController",@"ProductLibraryViewController",@"AllCustomerViewController",@"CustomerOrderViewController",@"AboutViewController", nil];
_identifierArray = [NSArray arrayWithObjects:@"SearchViewController",@"ShoppingViewController",@"ClientViewController",@"RebateViewController",@"AnnouncementViewController",@"SceneLibraryViewController",@"ProductLibraryViewController",@"AllCustomerViewController",@"CustomerOrderViewController",@"LearningCenterMainViewController",@"AboutViewController", nil];
}
return _identifierArray;
}
......@@ -127,9 +127,12 @@
for (int i=0; i<self.identifierArray.count; i++) {
NSString *controllString = self.identifierArray[i];
/// 公告
// 公告
if ([controllString isEqualToString:@"AnnouncementViewController"]) {
storyboard = [BaseViewController getAnnouncementStoryboardClass];
}else if ([controllString isEqualToString:@"LearningCenterMainViewController"]) {
// 学习中心
storyboard = [BaseViewController getLearningCenterStoryboardClass];
}else {
storyboard = [BaseViewController getMainStoryboardClass];
}
......
Lighting.xcodeproj/project.pbxproj
View file @ 99f59e52
......@@ -150,6 +150,7 @@
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 */; };
29C30BDB1DDC1EE500CA3E29 /* LearningCenterMainViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29C30BDA1DDC1EE500CA3E29 /* LearningCenterMainViewController.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 */; };
......@@ -464,6 +465,8 @@
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>"; };
29C30BD91DDC1EE500CA3E29 /* LearningCenterMainViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LearningCenterMainViewController.h; sourceTree = "<group>"; };
29C30BDA1DDC1EE500CA3E29 /* LearningCenterMainViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LearningCenterMainViewController.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>"; };
......@@ -1451,6 +1454,10 @@
29C0E7401DD9890F006CCCF9 /* LearningCenter */ = {
isa = PBXGroup;
children = (
29C30BD81DDC1EB200CA3E29 /* LearningCenterMain */,
29C30BD71DDC1E8C00CA3E29 /* ComprehensiveDiscussion */,
29C30BD61DDC0A5000CA3E29 /* OnlineLearning */,
29C30BD51DDC0A5000CA3E29 /* SkillsAssessment */,
);
path = LearningCenter;
sourceTree = "<group>";
......@@ -1464,6 +1471,36 @@
path = Announcement;
sourceTree = "<group>";
};
29C30BD51DDC0A5000CA3E29 /* SkillsAssessment */ = {
isa = PBXGroup;
children = (
);
path = SkillsAssessment;
sourceTree = "<group>";
};
29C30BD61DDC0A5000CA3E29 /* OnlineLearning */ = {
isa = PBXGroup;
children = (
);
path = OnlineLearning;
sourceTree = "<group>";
};
29C30BD71DDC1E8C00CA3E29 /* ComprehensiveDiscussion */ = {
isa = PBXGroup;
children = (
);
path = ComprehensiveDiscussion;
sourceTree = "<group>";
};
29C30BD81DDC1EB200CA3E29 /* LearningCenterMain */ = {
isa = PBXGroup;
children = (
29C30BD91DDC1EE500CA3E29 /* LearningCenterMainViewController.h */,
29C30BDA1DDC1EE500CA3E29 /* LearningCenterMainViewController.m */,
);
path = LearningCenterMain;
sourceTree = "<group>";
};
29C584E51CDA246900C6F677 /* controller */ = {
isa = PBXGroup;
children = (
......@@ -1983,6 +2020,7 @@
2962D07D1CD1E4490058829D /* NSArray+Objectwithindex.m in Sources */,
299876391CD9981800C90D0A /* GoodsInformationTableViewCell.m in Sources */,
29702B631D72EE2E00322196 /* RebateDetailsViewController.m in Sources */,
29C30BDB1DDC1EE500CA3E29 /* LearningCenterMainViewController.m in Sources */,
2949BABD1CD2EFA00049385A /* InformationTableViewCell.m in Sources */,
29706DB21CD082990003C412 /* Lighting.xcdatamodeld in Sources */,
2916A74C1D703DFF00644C8C /* PaymentsTableViewCell.m in Sources */,
......
Lighting/LearningCenter.storyboard
View file @ 99f59e52
This diff is collapsed.
Lighting/OppleMain.storyboard
View file @ 99f59e52
......@@ -808,7 +808,7 @@
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="折扣金额" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="iOu-WG-fyV">
<frame key="frameInset" minX="8" minY="12" height="21" maxX="56"/>
<frame key="frameInset" minX="8" minY="12" height="21" maxX="-105"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
......@@ -1752,7 +1752,7 @@
<rect key="frame" x="0.0" y="28" width="972.5" height="80"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="ZT1-XJ-ObI" id="GWp-Jl-7br">
<frame key="frameInset" width="972.5" height="79"/>
<frame key="frameInset" width="972.5" height="79.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="PkJ-eJ-ksY">
......
Tools/BaseViewController.h
View file @ 99f59e52
......@@ -46,6 +46,11 @@
*/
+ (UIStoryboard *)getAnnouncementStoryboardClass;
/**
获得学习中心storyboard对象
*/
+ (UIStoryboard *)getLearningCenterStoryboardClass;
/**
* 调用打印机
*/
......
Tools/BaseViewController.m
View file @ 99f59e52
......@@ -227,6 +227,14 @@
return storyboard;
}
#pragma mark - 获得学习中心storyboard对象
+ (UIStoryboard *)getLearningCenterStoryboardClass
{
UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"LearningCenter" bundle:nil];
return storyboard;
}
#pragma mark 调用airPrint无线打印机
- (void)callAirprintWithdata:(NSString *)PDFpath SuccessBlock:(void(^)())success ErrorBlock:(void(^)())failed
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment