Skip to content

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

卡劵改动

parent bae556a2
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 946 additions and 856 deletions
Class/CardAmplificationViewController.h
View file @ cef9c44f
......@@ -12,15 +12,6 @@
@interface CardAmplificationViewController : BaseViewController
/**
* 取消
*/
@property (weak, nonatomic) IBOutlet UIButton *cancelButton;
/**
* 确认
*/
@property (weak, nonatomic) IBOutlet UIButton *sureButton;
/**
* 数据源
......@@ -50,11 +41,21 @@
/**
* 遮罩层
*/
@property (nonatomic,strong) MDScratchImageView *maskView;
@property (weak, nonatomic) IBOutlet MDScratchImageView *maskView;
/**
* 去使用
*/
@property (weak, nonatomic) IBOutlet UIButton *usedingButton;
/**
* 已使用
*/
@property (weak, nonatomic) IBOutlet UIImageView *usedImageView;
/**
* 改变京东卡状态后需要刷新
*/
@property (nonatomic,copy) void(^refreshJDCardList)(BOOL isComplete,NSString *cardNumber);
@property (nonatomic,copy) void(^refreshJDCardList)(NSString *cardNumber);
@end
Class/CardAmplificationViewController.m
View file @ cef9c44f
......@@ -23,82 +23,66 @@
#pragma mark - 添加遮罩层
- (void)addMaskView
{
_maskView = [[MDScratchImageView alloc]init];
[self.view addSubview:_maskView];
[_maskView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(self.cardPasswordLabel);
make.top.equalTo(self.cardPasswordLabel);
make.size.equalTo(self.cardPasswordLabel);
}];
_maskView.delegate = self;
[_maskView setImage:TCImage(@"mask") radius:20];
self.maskView.delegate = self;
[self.maskView setImage:TCImage(@"mask") radius:20];
}
- (void)viewWillAppear:(BOOL)animated
{
[super viewWillAppear:animated];
self.view.superview.layer.cornerRadius = 15;
}
#pragma mark - 取消
- (IBAction)cancelButtonClickAction:(UIButton *)sender {
[self dismissViewControllerAnimated:YES completion:nil];
}
#pragma mark - 确认
#pragma mark - 去使用
- (IBAction)sureButtonClickAction:(UIButton *)sender {
WS(weakSelf);
[self CreateMBProgressHUDLoding];
[[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:[NSString stringWithFormat:SERVERREQUESTURL(RECEIVEJDECARD),self.cardModel.cardNumber] WithRequestType:ZERO WithParameter:nil WithReturnValueBlock:^(id returnValue) {
[weakSelf RemoveMBProgressHUDLoding];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (weakSelf.refreshJDCardList) {
weakSelf.refreshJDCardList(YES,weakSelf.cardModel.cardNumber);
}
}else
{
if (weakSelf.refreshJDCardList) {
weakSelf.refreshJDCardList(NO,weakSelf.cardModel.cardNumber);
}
}
} WithErrorCodeBlock:^(id errorCodeValue) {
[weakSelf RemoveMBProgressHUDLoding];
[weakSelf ErrorMBProgressView:NETWORK];
} WithFailureBlock:^(NSError *error) {
[weakSelf RemoveMBProgressHUDLoding];
[weakSelf ErrorMBProgressView:error.localizedDescription];
}];
[self dismissViewControllerAnimated:YES completion:nil];
if (self.refreshJDCardList) {
self.refreshJDCardList(self.cardModel.cardNumber);
}
}
- (void)setCardModel:(TOJingdongEcardEntity *)cardModel
{
_cardModel = cardModel;
self.backgroundImageView.image = [BaseViewController getCorrespondingPictures:_cardModel.denomation];
self.cardNumberLabel.text = _cardModel.cardNumber;
self.cardPasswordLabel.text = _cardModel.cardPassword;
//是否已查看
if ([_cardModel.state isEqualToString:LOOKED]) {
[self.maskView removeFromSuperview];
self.cardNumberLabel.text = [NSString stringWithFormat:@"卡号: %@",_cardModel.cardNumber];
self.cardPasswordLabel.text = [NSString stringWithFormat:@"密码: %@",_cardModel.cardPassword];
/// 判断状态
BOOL isUsed = [_cardModel.state isEqualToString:LOOKED];
BOOL isActived = [_cardModel.state isEqualToString:ACTIVED];
BOOL isDispensed = [_cardModel.state isEqualToString:DISPENSED];
if (isDispensed) {
self.usedImageView.hidden = YES;
self.maskView.hidden = NO;
self.usedingButton.hidden = NO;
}
if (isActived) {
self.usedImageView.hidden = YES;
self.maskView.hidden = NO;
self.usedingButton.hidden = NO;
}
if (isUsed) {
self.maskView.hidden = YES;
self.usedingButton.hidden = YES;
self.usedImageView.hidden = NO;
}
self.amountLabel.text = [NSString stringWithFormat:@"￥%ld",_cardModel.denomation];
NSString *totalString = [NSString stringWithFormat:@"%ld元",_cardModel.denomation];
NSMutableAttributedString *attributedString = [[NSMutableAttributedString alloc]initWithString:totalString];
[attributedString addAttribute:NSFontAttributeName value:[UIFont fontWithName:@"HelveticaNeue-Bold" size:50] range:NSMakeRange(0, totalString.length-1)];
self.usedingButton.enabled = NO;
self.amountLabel.attributedText = attributedString;
}
#pragma mark - <MDScratchImageViewDelegate>
- (void)mdScratchImageView:(MDScratchImageView *)scratchImageView didChangeMaskingProgress:(CGFloat)maskingProgress
{
NSLog(@"%f",maskingProgress);
if (maskingProgress == 1) {
self.usedingButton.enabled = YES;
self.maskView.hidden = YES;
}
}
- (void)didReceiveMemoryWarning {
[super didReceiveMemoryWarning];
// Dispose of any resources that can be recreated.
}
@end
Class/CardAmplificationViewController.xib
View file @ cef9c44f
This diff is collapsed.
Class/CardBeenUseViewController.h
View file @ cef9c44f
......@@ -12,7 +12,7 @@
/**
* 已使用卡劵
* 已激活卡劵、已使用
*/
@property (weak, nonatomic) IBOutlet UICollectionView *beenUseCardCollectionView;
......@@ -21,4 +21,9 @@
*/
@property (weak, nonatomic) IBOutlet UICollectionViewFlowLayout *beenUseLayout;
/**
* 区分已激活还是已使用
*/
@property (nonatomic,copy) NSString *cardState;
@end
Class/CardBeenUseViewController.m
View file @ cef9c44f
......@@ -15,6 +15,7 @@
@property (nonatomic,strong) RsJingDongECardRequest *requestModel;
@property (nonatomic,strong) WYPopoverController *settingsPopoverController;
/**
* 数据源
......@@ -39,7 +40,7 @@
page.rows = 10;
page.order = @"desc";
_requestModel.guideIdEquals = [Shoppersmanager manager].Shoppers.employee.fid;
_requestModel.stateEquals = LOOKED;
_requestModel.stateEquals = self.cardState;
_requestModel.page = page;
}
return _requestModel;
......@@ -53,6 +54,11 @@
return _datasArray;
}
- (void)viewDidAppear:(BOOL)animated
{
[self.beenUseCardCollectionView.mj_header beginRefreshing];
}
- (void)viewDidLoad {
[super viewDidLoad];
......@@ -72,7 +78,6 @@
headerRefresh.stateLabel.hidden = YES;
headerRefresh.lastUpdatedTimeLabel.hidden = YES;
self.beenUseCardCollectionView.mj_header = headerRefresh;
[self.beenUseCardCollectionView.mj_header beginRefreshing];
MJRefreshAutoNormalFooter *footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{
if (++ weakSelf.requestModel.page.page >= weakSelf.totalPage) {
......@@ -87,7 +92,7 @@
}
#pragma mark - 获取已激活卡劵
#pragma mark - 获取卡劵
- (void)getCardDatasAction:(BOOL)isRemove
{
WS(weakSelf);
......@@ -121,6 +126,46 @@
}];
}
#pragma mark - 使用京东卡劵
- (void)useJDECard:(NSString *)JDECardNumber
{
WS(weakSelf);
[self CreateMBProgressHUDLoding];
NSLog(@"%@",[NSString stringWithFormat:SERVERREQUESTURL(USEJDECARD),JDECardNumber]);
[[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:[NSString stringWithFormat:SERVERREQUESTURL(USEJDECARD),JDECardNumber] WithRequestType:ZERO WithParameter:nil WithReturnValueBlock:^(id returnValue) {
[weakSelf RemoveMBProgressHUDLoding];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
[weakSelf deleteUsedJDECard:JDECardNumber];
}else{
[weakSelf ErrorMBProgressView:returnValue[@"message"]];
}
} WithErrorCodeBlock:^(id errorCodeValue) {
[weakSelf RemoveMBProgressHUDLoding];
[weakSelf ErrorMBProgressView:NETWORK];
} WithFailureBlock:^(NSError *error) {
[weakSelf RemoveMBProgressHUDLoding];
[weakSelf ErrorMBProgressView:error.localizedDescription];
}];
}
#pragma mark - 区分已经使用的E卡
- (void)deleteUsedJDECard:(NSString *)eCardNumber
{
///@property (nonatomic, strong) NSMutableArray<TOJingdongEcardEntity> *eCards;
/// 手动改为可变数组
for (int i=0; i<self.datasArray.count; i++) {
GroupByOrderNumber *order = self.datasArray[i];
for (int j=0; j<order.eCards.count; j++) {
TOJingdongEcardEntity *ecard = order.eCards[j];
if ([eCardNumber isEqualToString:ecard.cardNumber]) {
ecard.state = @"used";
[self.beenUseCardCollectionView reloadItemsAtIndexPaths:@[[NSIndexPath indexPathForItem:j inSection:i]]];
}
}
}
}
#pragma mark - UICollectionView
- (void)setupCollectionView
{
......@@ -129,19 +174,12 @@
self.beenUseLayout.minimumLineSpacing = 20;
self.beenUseLayout.minimumInteritemSpacing = 20;
[self.beenUseCardCollectionView registerNib:[UINib nibWithNibName:@"CardOrderInformationReusableView" bundle:nil] forSupplementaryViewOfKind:UICollectionElementKindSectionHeader withReuseIdentifier:@"CardOrderInformationReusableView"];
//** 查看京东卡密码后调用 */
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(refreshList:) name:VIEWPASSWORD object:nil];
}
#pragma mark - 刷新列表
- (void)refreshList:(NSNotification *)sender
{
[self.beenUseCardCollectionView.mj_header beginRefreshing];
}
- (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath
{
CardCollectionViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"CardCollectionViewCelltwohundred" forIndexPath:indexPath];
CardCollectionViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"CardCollectionViewCell" forIndexPath:indexPath];
GroupByOrderNumber *model = self.datasArray[indexPath.section];
cell.Cardmodel = model.eCards[indexPath.row];
return cell;
......@@ -173,14 +211,24 @@
- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath
{
CardAmplificationViewController *settlement = [[CardAmplificationViewController alloc]init];
settlement.preferredContentSize = CGSizeMake(500, 370);
settlement.modalPresentationStyle = UIModalPresentationFormSheet;
UIPopoverPresentationController *pop = settlement.popoverPresentationController;
pop.sourceView = settlement.view;
CardAmplificationViewController *cardVC = [[CardAmplificationViewController alloc]init];
self.settingsPopoverController = [[WYPopoverController alloc] initWithContentViewController:cardVC];
self.settingsPopoverController.theme.fillBottomColor = [UIColor clearColor];
self.settingsPopoverController.theme.fillTopColor = [UIColor clearColor];
[self.settingsPopoverController presentPopoverAsDialogAnimated:YES
options:WYPopoverAnimationOptionFadeWithScale];
[self.settingsPopoverController beginThemeUpdates];
GroupByOrderNumber *model = self.datasArray[indexPath.section];
settlement.cardModel = model.eCards[indexPath.row];
[self presentViewController:settlement animated:YES completion:nil];
cardVC.cardModel = model.eCards[indexPath.row];
cardVC.preferredContentSize = CGSizeMake(500, 370);
[self.settingsPopoverController endThemeUpdates];
/// 更新E卡状态
WS(weakSelf);
[cardVC setRefreshJDCardList:^(NSString *cardNumber) {
[weakSelf.settingsPopoverController dismissPopoverAnimated:YES completion:^{
[weakSelf useJDECard:cardNumber];
}];
}];
}
#pragma mark -友好界面
......@@ -201,7 +249,6 @@
- (void)didReceiveMemoryWarning {
[super didReceiveMemoryWarning];
// Dispose of any resources that can be recreated.
}
- (void)dealloc
......
Class/CardCollectionViewCell.h
View file @ cef9c44f
......@@ -38,7 +38,23 @@
/**
* 遮罩层
*/
@property (nonatomic,strong) UIImageView *maskView;
@property (weak, nonatomic) IBOutlet UIImageView *maskImageView;
/**
* 已使用imageView
*/
@property (weak, nonatomic) IBOutlet UIImageView *usedImageView;
/**
* 去使用Button
*/
@property (weak, nonatomic) IBOutlet UIButton *useingButton;
/**
* 遮罩层View
*/
@property (weak, nonatomic) IBOutlet UIImageView *maskBackGroundView;
@end
Class/CardCollectionViewCell.m
View file @ cef9c44f
......@@ -13,14 +13,11 @@
- (void)awakeFromNib
{
_maskView = [[UIImageView alloc]init];
[self.contentView addSubview:_maskView];
[_maskView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(self.cardPasswordLabel);
make.top.equalTo(self.cardPasswordLabel);
make.size.equalTo(self.cardPasswordLabel);
}];
[_maskView setImage:TCImage(@"mask")];
self.layer.shadowColor = [UIColor grayColor].CGColor;
self.layer.shadowRadius = 4;
self.layer.shadowOpacity = 0.3;
self.layer.shadowOffset = CGSizeMake(-1, -1);
self.layer.masksToBounds = NO;
}
......@@ -28,13 +25,49 @@
{
_Cardmodel = Cardmodel;
self.backgroundImageView.image = [BaseViewController getCorrespondingPictures:_Cardmodel.denomation];
self.cardNumberLabel.text = _Cardmodel.cardNumber;
self.cardPasswordLabel.text = _Cardmodel.cardPassword;
//是否已查看
if ([_Cardmodel.state isEqualToString:LOOKED]) {
[self.maskView removeFromSuperview];
self.cardNumberLabel.text = [NSString stringWithFormat:@"卡号: %@",_Cardmodel.cardNumber];
self.cardPasswordLabel.text = [NSString stringWithFormat:@"密码: %@",_Cardmodel.cardPassword];
NSString *totalString = [NSString stringWithFormat:@"%ld元",_Cardmodel.denomation];
NSMutableAttributedString *attributedString = [[NSMutableAttributedString alloc]initWithString:totalString];
[attributedString addAttribute:NSFontAttributeName value:[UIFont fontWithName:@"HelveticaNeue-Bold" size:22] range:NSMakeRange(0, totalString.length-1)];
self.self.amountLabel.attributedText = attributedString;
/// 判断状态
BOOL isUsed = [_Cardmodel.state isEqualToString:LOOKED];
BOOL isActived = [_Cardmodel.state isEqualToString:ACTIVED];
BOOL isDispensed = [_Cardmodel.state isEqualToString:DISPENSED];
if (isDispensed) {
self.usedImageView.hidden = YES;
self.maskImageView.hidden = NO;
self.useingButton.hidden = NO;
}
if (isActived) {
self.usedImageView.hidden = YES;
self.maskImageView.hidden = NO;
self.useingButton.hidden = NO;
}
if (isUsed) {
self.maskImageView.hidden = YES;
self.useingButton.hidden = YES;
self.usedImageView.hidden = NO;
}
self.amountLabel.text = [NSString stringWithFormat:@"￥%ld",_Cardmodel.denomation];
}
@end
Class/CardDetailsViewController.h
View file @ cef9c44f
......@@ -12,15 +12,21 @@
/**
* 未使用
* 未领取
*/
@property (weak, nonatomic) IBOutlet UIButton *dontUseButton;
/**
* 已使用
* 已领取
*/
@property (weak, nonatomic) IBOutlet UIButton *beenUseButton;
/**
* 已使用
*/
@property (weak, nonatomic) IBOutlet UIButton *isUsedButton;
/**
* 指示线
*/
......
Class/CardDetailsViewController.m
View file @ cef9c44f
......@@ -30,13 +30,20 @@
#pragma mark - 添加卡劵详情vc
- (void)addChildViewController
{
/// 未领取
CardDontUseViewController *dontUseVc = [[self getStoryboardWithName] instantiateViewControllerWithIdentifier:@"CardDontUseViewController"];
[self addChildViewController:dontUseVc];
/// 已领取
CardBeenUseViewController *beenUseVc = [[self getStoryboardWithName] instantiateViewControllerWithIdentifier:@"CardBeenUseViewController"];
beenUseVc.cardState = ACTIVED;
[self addChildViewController:beenUseVc];
/// 已使用
CardBeenUseViewController *usedVc = [[self getStoryboardWithName] instantiateViewControllerWithIdentifier:@"CardBeenUseViewController"];
usedVc.cardState = LOOKED;
[self addChildViewController:usedVc];
dontUseVc.view.frame = CGRectMake(0, 0, self.cardBackgroundView.mj_w, self.cardBackgroundView.mj_h);
beenUseVc.view.frame = CGRectMake(0, 0, self.cardBackgroundView.mj_w, self.cardBackgroundView.mj_h);
usedVc.view.frame = CGRectMake(0, 0, self.cardBackgroundView.mj_w, self.cardBackgroundView.mj_h);
[self.cardBackgroundView addSubview:dontUseVc.view];
self.currentVC = dontUseVc;
}
......@@ -56,14 +63,31 @@
#pragma mark - 切换ContentController
- (IBAction)paymentsButtonAndWithdrawalButtonClick:(UIButton *)sender {
if ([sender isEqual:self.dontUseButton]) {
sender.selected = YES;
self.beenUseButton.selected = NO;
}else
{
sender.selected = YES;
self.dontUseButton.selected = NO;
switch (sender.tag) {
case 100:
{
self.beenUseButton.selected = NO;
self.isUsedButton.selected = NO;
}
break;
case 101:
{
self.dontUseButton.selected = NO;
self.isUsedButton.selected = NO;
}
break;
case 102:
{
self.dontUseButton.selected = NO;
self.beenUseButton.selected = NO;
}
break;
default:
break;
}
sender.selected = YES;
[self setupInstructionsViewOrigin:sender];
[self switchPaymentsVCAndWithdrawalVC:self.childViewControllers[sender.tag-100]];
}
......
Class/CardDontUseViewController.m
View file @ cef9c44f
......@@ -46,7 +46,7 @@
page.rows = 10;
page.order = @"desc";
_requestModel.guideIdEquals = [Shoppersmanager manager].Shoppers.employee.fid;
_requestModel.stateEquals = [NSString stringWithFormat:@"%@,%@",DISPENSED,ACTIVED];
_requestModel.stateEquals = DISPENSED;
_requestModel.page = page;
}
return _requestModel;
......@@ -60,6 +60,11 @@
return _datasArray;
}
- (void)viewDidAppear:(BOOL)animated
{
[self.dontUseCardCollectionView.mj_header beginRefreshing];
}
- (void)viewDidLoad {
[super viewDidLoad];
......@@ -89,7 +94,6 @@
headerRefresh.stateLabel.hidden = YES;
headerRefresh.lastUpdatedTimeLabel.hidden = YES;
self.dontUseCardCollectionView.mj_header = headerRefresh;
[self.dontUseCardCollectionView.mj_header beginRefreshing];
MJRefreshAutoNormalFooter *footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{
if (++ weakSelf.requestModel.page.page >= weakSelf.totalPage) {
......@@ -139,7 +143,7 @@
- (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath
{
CardCollectionViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"CardCollectionViewCellonehundred" forIndexPath:indexPath];
CardCollectionViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"CardCollectionViewCell" forIndexPath:indexPath];
GroupByOrderNumber *model = self.datasArray[indexPath.section];
cell.Cardmodel = model.eCards[indexPath.row];
return cell;
......@@ -174,31 +178,8 @@
{
GroupByOrderNumber *model = self.datasArray[indexPath.section];
if ([[self class] isBlankString:model.orderReceiptUrl]) {
[self SHOWPrompttext:@"不能查看未激活卡劵,请先上传小票激活卡劵"];return;
[self SHOWPrompttext:@"不能查看未激活卡劵,请先上传小票激活卡劵"];
}
CardAmplificationViewController *settlement = [[CardAmplificationViewController alloc]init];
settlement.preferredContentSize = CGSizeMake(500, 370);
settlement.modalPresentationStyle = UIModalPresentationFormSheet;
UIPopoverPresentationController *pop = settlement.popoverPresentationController;
pop.sourceView = settlement.view;
settlement.cardModel = model.eCards[indexPath.row];
WS(weakSelf);
[settlement setRefreshJDCardList:^(BOOL boolValue,NSString *cardNumber) {
[weakSelf SHOWPrompttext:boolValue?@"领取成功":@"领取失败"];
for (GroupByOrderNumber *model in weakSelf.datasArray) {
for (TOJingdongEcardEntity *cardModel in model.eCards) {
if ([cardModel.cardNumber isEqualToString:cardNumber]) {
NSMutableArray *mutableCard = [NSMutableArray array];
[mutableCard addObjectsFromArray:model.eCards];
[mutableCard removeObject:cardModel];
model.eCards = (NSArray<TOJingdongEcardEntity>*)mutableCard;goto end;
}
}
}
end:NSLog(@"跳出");
[[NSNotificationCenter defaultCenter] postNotificationName:VIEWPASSWORD object:nil];
}];
[self presentViewController:settlement animated:YES completion:nil];
}
......@@ -265,7 +246,7 @@
[weakSelf activationJDECard:returnValue[@"data"]];
}else
{
[self ErrorMBProgressView:returnValue[@"message"]];
[weakSelf ErrorMBProgressView:returnValue[@"message"]];
}
} WithprogressBlock:^(double progress) {
[weakSelf ShowProgressView:progress];
......@@ -286,12 +267,7 @@
[weakSelf RemoveMBProgressHUDLoding];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
[weakSelf SuccessMBProgressView:@"激活成功"];
for (GroupByOrderNumber *order in weakSelf.datasArray) {
if ([order.orderNumber isEqualToString:self.orderNumber]) {
order.orderReceiptUrl = imagePath;
[weakSelf.dontUseCardCollectionView reloadSections:[NSIndexSet indexSetWithIndex:[weakSelf.datasArray indexOfObject:order]]];break;
}
}
}else{
[weakSelf ErrorMBProgressView:returnValue[@"message"]];
}
......
Class/CardViewController.m
View file @ cef9c44f
......@@ -9,6 +9,7 @@
#import "CardViewController.h"
#import "CardCollectionViewCell.h"
#import "CardDetailsViewController.h"
#import "CardAmplificationViewController.h"
@interface CardViewController ()<UICollectionViewDelegate,UICollectionViewDataSource,DZNEmptyDataSetSource,DZNEmptyDataSetDelegate>
......@@ -17,6 +18,7 @@
//** 数据源 */
@property (nonatomic,strong) NSMutableArray *datasArray;
@property (nonatomic,strong) WYPopoverController *settingsPopoverController;
@end
......@@ -82,6 +84,46 @@
}];
}
#pragma mark - 使用京东卡劵
- (void)useJDECard:(NSString *)JDECardNumber
{
WS(weakSelf);
[self CreateMBProgressHUDLoding];
NSLog(@"%@",[NSString stringWithFormat:SERVERREQUESTURL(USEJDECARD),JDECardNumber]);
[[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:[NSString stringWithFormat:SERVERREQUESTURL(USEJDECARD),JDECardNumber] WithRequestType:ZERO WithParameter:nil WithReturnValueBlock:^(id returnValue) {
[weakSelf RemoveMBProgressHUDLoding];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
[weakSelf deleteUsedJDECard:JDECardNumber];
}else{
[weakSelf ErrorMBProgressView:returnValue[@"message"]];
}
} WithErrorCodeBlock:^(id errorCodeValue) {
[weakSelf RemoveMBProgressHUDLoding];
[weakSelf ErrorMBProgressView:NETWORK];
} WithFailureBlock:^(NSError *error) {
[weakSelf RemoveMBProgressHUDLoding];
[weakSelf ErrorMBProgressView:error.localizedDescription];
}];
}
#pragma mark - 区分已经使用的E卡
- (void)deleteUsedJDECard:(NSString *)eCardNumber
{
///@property (nonatomic, strong) NSMutableArray<TOJingdongEcardEntity> *eCards;
/// 手动改为可变数组
for (int i=0; i<self.datasArray.count; i++) {
GroupByOrderNumber *order = self.datasArray[i];
for (int j=0; j<order.eCards.count; j++) {
TOJingdongEcardEntity *ecard = order.eCards[j];
if ([eCardNumber isEqualToString:ecard.cardNumber]) {
ecard.state = @"used";
[self.cardCollectionView reloadItemsAtIndexPaths:@[[NSIndexPath indexPathForItem:j inSection:i]]];
}
}
}
}
#pragma mark <UICollectionViewDataSource>
- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section
{
......@@ -90,15 +132,35 @@
- (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath
{
CardCollectionViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"CardCollectionViewCellfifty" forIndexPath:indexPath];
CardCollectionViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"CardCollectionViewCell" forIndexPath:indexPath];
cell.Cardmodel = self.datasArray[indexPath.row];
return cell;
}
- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath
{
CardDetailsViewController *cardDetails = [[self getStoryboardWithName] instantiateViewControllerWithIdentifier:@"CardDetailsViewController"];
[self.navigationController pushViewController:cardDetails animated:YES];
GroupByOrderNumber *model = self.datasArray[indexPath.section];
if ([[self class] isBlankString:model.orderReceiptUrl]) {
[self SHOWPrompttext:@"不能查看未激活卡劵,请先上传小票激活卡劵"];
}else{
CardAmplificationViewController *cardVC = [[CardAmplificationViewController alloc]init];
self.settingsPopoverController = [[WYPopoverController alloc] initWithContentViewController:cardVC];
self.settingsPopoverController.theme.fillBottomColor = [UIColor clearColor];
self.settingsPopoverController.theme.fillTopColor = [UIColor clearColor];
[self.settingsPopoverController presentPopoverAsDialogAnimated:YES
options:WYPopoverAnimationOptionFadeWithScale];
[self.settingsPopoverController beginThemeUpdates];
cardVC.cardModel = self.datasArray[indexPath.row];
cardVC.preferredContentSize = CGSizeMake(500, 370);
[self.settingsPopoverController endThemeUpdates];
/// 更新E卡状态
WS(weakSelf);
[cardVC setRefreshJDCardList:^(NSString *cardNumber) {
[weakSelf.settingsPopoverController dismissPopoverAnimated:YES completion:^{
[weakSelf useJDECard:cardNumber];
}];
}];
}
}
#pragma mark -友好界面
......
Class/Login/LoginViewController.m
View file @ cef9c44f
......@@ -238,7 +238,7 @@
NSInteger selectedIndex;
if ([Name isEqualToString:@"体验中心"]) {
[[NSNotificationCenter defaultCenter] postNotificationName:@"FollowHeartVC" object:nil];
[[NSNotificationCenter defaultCenter] postNotificationName:OPENFOLLOWHEARTVC object:nil];
return;
}else if ([Name isEqualToString:@"场景库"])
......
Class/OrderdetailsViewController.m
View file @ cef9c44f
......@@ -23,6 +23,7 @@
#import "PromotionalTableViewCell.h"
#import "JDEcardViewController.h"
#import "WYPopoverController.h"
#import "RebateSuccessTableViewController.h"
NSString *const PROMOTIONALSTRING = @"促销信息";
......@@ -237,16 +238,17 @@ NSString *const lotteryAction = @"lotteryAction";
});
}
#pragma mark - 方法京东E卡
#pragma mark - 发放京东E卡
- (void)issueJDECard:(NSInteger)denomation andGuideId:(NSString *)guideId andOrderNumber:(NSString *)orderNumber
{
WS(weakSelf);
[self CreateMBProgressHUDLoding];
NSLog(@"%@",[NSString stringWithFormat:SERVERREQUESTURL(JDECARD),denomation,guideId,orderNumber]);
[[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:[NSString stringWithFormat:SERVERREQUESTURL(JDECARD),denomation,guideId,orderNumber] WithRequestType:0 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
[weakSelf RemoveMBProgressHUDLoding];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
[weakSelf showJDECard];
[weakSelf rebateApplySuccess];
}else{
[weakSelf ErrorMBProgressView:@"京东E卡领取失败"];
}
......@@ -260,6 +262,27 @@ NSString *const lotteryAction = @"lotteryAction";
}];
}
#pragma mark - 卡劵领取成功
- (void)rebateApplySuccess
{
RebateSuccessTableViewController *success = [self.getStoryboardWithName instantiateViewControllerWithIdentifier:@"RebateSuccessTableViewController"];
success.titleArray = @[@"卡劵已发放到你的账户",@"查看账户",@"我知道了"];
[success setClickEvent:^(NSIndexPath *indexPath) {
if (indexPath.row == 1) {
/// 我知道了
}else if (indexPath.row == 0)
{
[[NSNotificationCenter defaultCenter] postNotificationName:OPENCONTROLLER object:@(0)];
}
}];
success.preferredContentSize = CGSizeMake(315, 320);
success.modalPresentationStyle = UIModalPresentationFormSheet;
UIPopoverPresentationController *pop = success.popoverPresentationController;
pop.permittedArrowDirections = UIPopoverArrowDirectionAny;
pop.sourceView = success.view;
[self presentViewController:success animated:YES completion:nil];
}
#pragma mark - 显示京东E卡
- (void)showJDECard
{
......@@ -590,23 +613,30 @@ NSString *const lotteryAction = @"lotteryAction";
#pragma mark -打印订单
- (void)AirprintButtonClick:(UIButton *)button
{
WS(weakSelf);
[self DownloadPDF:^(id Value) {
[weakSelf CreateMBProgressHUDLoding];
[[NetworkRequestClassManager Manager] DownloadPDFdatasWithURL:Value WithReturnValueBlock:^(id returnValue) {
[weakSelf RemoveMBProgressHUDLoding];
[weakSelf callAirprintWithdata:returnValue SuccessBlock:^{
[weakSelf SuccessMBProgressView:@"打印完成"];
} ErrorBlock:^{
[weakSelf ErrorMBProgressView:@"打印失败"];
}];
} WithErrorCodeBlock:^(id errorCodeValue) {
[weakSelf RemoveMBProgressHUDLoding];
[weakSelf ErrorMBProgressView:NETWORK];
} WithFailureBlock:^(NSError *error) {
[weakSelf RemoveMBProgressHUDLoding];
[weakSelf ErrorMBProgressView:error.localizedDescription];
}];
// WS(weakSelf);
// [self DownloadPDF:^(id Value) {
// [weakSelf CreateMBProgressHUDLoding];
// [[NetworkRequestClassManager Manager] DownloadPDFdatasWithURL:Value WithReturnValueBlock:^(id returnValue) {
// [weakSelf RemoveMBProgressHUDLoding];
// [weakSelf callAirprintWithdata:returnValue SuccessBlock:^{
// [weakSelf SuccessMBProgressView:@"打印完成"];
// } ErrorBlock:^{
// [weakSelf ErrorMBProgressView:@"打印失败"];
// }];
// } WithErrorCodeBlock:^(id errorCodeValue) {
// [weakSelf RemoveMBProgressHUDLoding];
// [weakSelf ErrorMBProgressView:NETWORK];
// } WithFailureBlock:^(NSError *error) {
// [weakSelf RemoveMBProgressHUDLoding];
// [weakSelf ErrorMBProgressView:error.localizedDescription];
// }];
// }];
[self callAirprintWithURL:[NSURL URLWithString:@"https://www.baidu.com"] SuccessBlock:^{
} ErrorBlock:^{
}];
}
......@@ -614,22 +644,24 @@ NSString *const lotteryAction = @"lotteryAction";
#pragma mark -下载PDF
- (void)DownloadPDF:(void(^)(id returnValue))success
{
WS(weakSelf);
[self CreateMBProgressHUDLoding];
// NSLog(@"%@",[NSString stringWithFormat:@"%@%@",SERVERREQUESTURL(DOWNLOADPDF),_orderCode]);
[[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:[NSString stringWithFormat:@"%@%@",SERVERREQUESTURL(DOWNLOADPDF),_orderCode] WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
[weakSelf RemoveMBProgressHUDLoding];
NSString *url = [NSString stringWithFormat:@"%@",returnValue[@"data"]];
success(url);
// WS(weakSelf);
// [self CreateMBProgressHUDLoding];
//// NSLog(@"%@",[NSString stringWithFormat:@"%@%@",SERVERREQUESTURL(DOWNLOADPDF),_orderCode]);
// [[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:[NSString stringWithFormat:@"%@%@",SERVERREQUESTURL(DOWNLOADPDF),_orderCode] WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
//
// [weakSelf RemoveMBProgressHUDLoding];
// NSString *url = [NSString stringWithFormat:@"%@",returnValue[@"data"]];
// success(url);
//
// } WithErrorCodeBlock:^(id errorCodeValue) {
// [weakSelf RemoveMBProgressHUDLoding];
// [weakSelf ErrorMBProgressView:NETWORK];
// } WithFailureBlock:^(NSError *error) {
// [weakSelf RemoveMBProgressHUDLoding];
// [weakSelf ErrorMBProgressView:error.localizedDescription];
// }];
success(@"https://www.baidu.com");
} WithErrorCodeBlock:^(id errorCodeValue) {
[weakSelf RemoveMBProgressHUDLoding];
[weakSelf ErrorMBProgressView:NETWORK];
} WithFailureBlock:^(NSError *error) {
[weakSelf RemoveMBProgressHUDLoding];
[weakSelf ErrorMBProgressView:error.localizedDescription];
}];
}
#pragma mark -预览订单、撤销订单
......
Class/PromptHeaderTableViewCell.h 0 → 100644
View file @ cef9c44f
//
// PromptHeaderTableViewCell.h
// Lighting
//
// Created by 曹云霄 on 2016/11/2.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import <UIKit/UIKit.h>
@interface PromptHeaderTableViewCell : UITableViewCell
@property (weak, nonatomic) IBOutlet UILabel *headerViewContentLabel;
@end
Class/PromptHeaderTableViewCell.m 0 → 100644
View file @ cef9c44f
//
// PromptHeaderTableViewCell.m
// Lighting
//
// Created by 曹云霄 on 2016/11/2.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import "PromptHeaderTableViewCell.h"
@implementation PromptHeaderTableViewCell
- (void)awakeFromNib {
[super awakeFromNib];
// Initialization code
}
- (void)setSelected:(BOOL)selected animated:(BOOL)animated {
[super setSelected:selected animated:animated];
// Configure the view for the selected state
}
@end
Class/PromptTableViewCell.h 0 → 100644
View file @ cef9c44f
//
// PromptTableViewCell.h
// Lighting
//
// Created by 曹云霄 on 2016/11/2.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import <UIKit/UIKit.h>
@interface PromptTableViewCell : UITableViewCell
/**
* 显示文本
*/
@property (weak, nonatomic) IBOutlet UILabel *contentLabel;
@end
Class/PromptTableViewCell.m 0 → 100644
View file @ cef9c44f
//
// PromptTableViewCell.m
// Lighting
//
// Created by 曹云霄 on 2016/11/2.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import "PromptTableViewCell.h"
@implementation PromptTableViewCell
- (void)awakeFromNib {
[super awakeFromNib];
// Initialization code
}
- (void)setSelected:(BOOL)selected animated:(BOOL)animated {
[super setSelected:selected animated:animated];
// Configure the view for the selected state
}
@end
Class/RebateDetailsViewController.m
View file @ cef9c44f
......@@ -78,6 +78,7 @@
{
WS(weakSelf);
RebateSuccessTableViewController *success = [self.getStoryboardWithName instantiateViewControllerWithIdentifier:@"RebateSuccessTableViewController"];
success.titleArray = @[@"提现申请已提交，审核中",@"查看详情",@"返回账户"];
[success setClickEvent:^(NSIndexPath *indexPath) {
if (indexPath.row == 1) {
[weakSelf.navigationController popViewControllerAnimated:YES];
......
Class/RebateSuccessTableViewController.h
View file @ cef9c44f
......@@ -15,6 +15,11 @@
*/
@property (nonatomic,copy) void(^ClickEvent)(NSIndexPath *indexPath);
/**
* 数据源
*/
@property (nonatomic,strong) NSArray *titleArray;
@end
Class/RebateSuccessTableViewController.m
View file @ cef9c44f
......@@ -7,13 +7,11 @@
//
#import "RebateSuccessTableViewController.h"
#import "PromptTableViewCell.h"
#import "PromptHeaderTableViewCell.h"
@interface RebateSuccessTableViewController ()
///
@property (weak, nonatomic) IBOutlet UITableViewRowAction *showRebateDetailsCell;
@property (weak, nonatomic) IBOutlet UITableViewRowAction *backAccountCell;
@end
@implementation RebateSuccessTableViewController
......@@ -24,13 +22,42 @@
self.tableView.tableFooterView = [UIView new];
}
- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
{
return self.titleArray.count;
}
- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
{
if (indexPath.row == 0) {
PromptHeaderTableViewCell *headerView = [tableView dequeueReusableCellWithIdentifier:@"PromptHeaderTableViewCell" forIndexPath:indexPath];
headerView.headerViewContentLabel.text = self.titleArray[indexPath.row];
return headerView;
}
PromptTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"PromptTableViewCell" forIndexPath:indexPath];
cell.contentLabel.text = self.titleArray[indexPath.row];
return cell;
}
- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
{
[tableView deselectRowAtIndexPath:indexPath animated:YES];
[self dismissViewControllerAnimated:YES completion:nil];
if (self.ClickEvent) {
self.ClickEvent(indexPath);
if (indexPath.row == 0) {
return;
}
WS(weakSelf);
[self dismissViewControllerAnimated:YES completion:^{
if (weakSelf.ClickEvent) {
weakSelf.ClickEvent([NSIndexPath indexPathForRow:indexPath.row-1 inSection:0]);
}
}];
}
- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
{
if (indexPath.row == 0) {
return 150;
}
return 68;
}
......
Class/Tabbar/CustomTabbarController.m
View file @ cef9c44f
......@@ -106,9 +106,9 @@
self.delegate = self;
[self.tabBar addSubview:self.toolview];
//显示体验中心
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(ShowFollowHeart:) name:@"FollowHeartVC" object:nil];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(ShowFollowHeart:) name:OPENFOLLOWHEARTVC object:nil];
//2016年08月26日15:52:28显示我的账户
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(showMyAccountController:) name:@"ShowMyAccountVC" object:nil];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(openControllerWithIndex:) name:OPENCONTROLLER object:nil];
}
......@@ -334,7 +334,6 @@
}
}
#pragma mark -推出体验中心控制器
- (void)ShowFollowHeart:(NSNotification *)objc
{
......@@ -361,11 +360,12 @@
}
}
#pragma mark - 显示我的账户
- (void)showMyAccountController:(NSNotification *)sender
#pragma mark - 打开相应的控制器
- (void)openControllerWithIndex:(NSNotification *)sender
{
NSInteger index = [sender.object integerValue];
[self dismissViewControllerAnimated:NO completion:nil];
self.selectedIndex = 0;
self.selectedIndex = index;
}
@end
Class/UserViewController.m
View file @ cef9c44f
......@@ -70,7 +70,7 @@
#pragma mark -返利余额点击
- (void)rebateViewClickAction:(UITapGestureRecognizer *)tap
{
[[NSNotificationCenter defaultCenter] postNotificationName:@"ShowMyAccountVC" object:nil];
[[NSNotificationCenter defaultCenter] postNotificationName:OPENCONTROLLER object:@(0)];
}
#pragma mark -用户头像点击
......
Lighting.xcodeproj/project.pbxproj
View file @ cef9c44f
......@@ -19,6 +19,7 @@
04F9EE221CF27B1D00BD729F /* CoreTelephony.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 04F9EE211CF27B1D00BD729F /* CoreTelephony.framework */; };
04FCB1A41CF60A8F0056093B /* DeviceDirectionManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 04FCB1A31CF60A8F0056093B /* DeviceDirectionManager.m */; };
2903F93D1DBE57F4003CC6B1 /* JDEcardViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2903F93C1DBE57F4003CC6B1 /* JDEcardViewController.m */; };
29045F321DCA192700E42A86 /* PromptHeaderTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 29045F311DCA192700E42A86 /* PromptHeaderTableViewCell.m */; };
2904BA431DBEF3A200FB473A /* OrderRecordViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2904BA421DBEF3A200FB473A /* OrderRecordViewController.m */; };
2906B5D71CD89246000849B4 /* ClientDetailsTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 2906B5D61CD89246000849B4 /* ClientDetailsTableViewCell.m */; };
290887061CE58BC2000B7097 /* screeningButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 290887051CE58BC2000B7097 /* screeningButton.m */; };
......@@ -132,6 +133,7 @@
29A938271CDAE31B00F21E54 /* ProductDetailsHeaderView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 29A938261CDAE31B00F21E54 /* ProductDetailsHeaderView.xib */; };
29A974CA1D72F9C80012AFA1 /* RebateSuccessTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29A974C91D72F9C80012AFA1 /* RebateSuccessTableViewController.m */; };
29A9DCAE1CEB643C00A7567A /* PDFViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29A9DCAC1CEB643C00A7567A /* PDFViewController.m */; };
29BAA3AB1DC9FB5B00927D04 /* PromptTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 29BAA3AA1DC9FB5B00927D04 /* PromptTableViewCell.m */; };
29BB27681CD9D38E009A0813 /* AllpriceTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 29BB27671CD9D38E009A0813 /* AllpriceTableViewCell.m */; };
29BB27741CD9DFAC009A0813 /* SceneLibraryViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29BB27731CD9DFAC009A0813 /* SceneLibraryViewController.m */; };
29BB27771CD9DFBA009A0813 /* ProductLibraryViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29BB27761CD9DFBA009A0813 /* ProductLibraryViewController.m */; };
......@@ -201,6 +203,8 @@
075FDF6809C755AD73136F27 /* Pods.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.release.xcconfig; path = "Pods/Target Support Files/Pods/Pods.release.xcconfig"; sourceTree = "<group>"; };
2903F93B1DBE57F4003CC6B1 /* JDEcardViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JDEcardViewController.h; sourceTree = "<group>"; };
2903F93C1DBE57F4003CC6B1 /* JDEcardViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JDEcardViewController.m; sourceTree = "<group>"; };
29045F301DCA192700E42A86 /* PromptHeaderTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PromptHeaderTableViewCell.h; sourceTree = "<group>"; };
29045F311DCA192700E42A86 /* PromptHeaderTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PromptHeaderTableViewCell.m; sourceTree = "<group>"; };
2904BA411DBEF3A200FB473A /* OrderRecordViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OrderRecordViewController.h; sourceTree = "<group>"; };
2904BA421DBEF3A200FB473A /* OrderRecordViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OrderRecordViewController.m; sourceTree = "<group>"; };
2906B5D51CD89246000849B4 /* ClientDetailsTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ClientDetailsTableViewCell.h; sourceTree = "<group>"; };
......@@ -419,6 +423,8 @@
29A974C91D72F9C80012AFA1 /* RebateSuccessTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RebateSuccessTableViewController.m; sourceTree = "<group>"; };
29A9DCAB1CEB643C00A7567A /* PDFViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PDFViewController.h; sourceTree = "<group>"; };
29A9DCAC1CEB643C00A7567A /* PDFViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PDFViewController.m; sourceTree = "<group>"; };
29BAA3A91DC9FB5B00927D04 /* PromptTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PromptTableViewCell.h; sourceTree = "<group>"; };
29BAA3AA1DC9FB5B00927D04 /* PromptTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PromptTableViewCell.m; sourceTree = "<group>"; };
29BB27661CD9D38E009A0813 /* AllpriceTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AllpriceTableViewCell.h; sourceTree = "<group>"; };
29BB27671CD9D38E009A0813 /* AllpriceTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AllpriceTableViewCell.m; sourceTree = "<group>"; };
29BB27721CD9DFAC009A0813 /* SceneLibraryViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SceneLibraryViewController.h; sourceTree = "<group>"; };
......@@ -672,6 +678,10 @@
2916A74B1D703DFF00644C8C /* PaymentsTableViewCell.m */,
2916A74D1D703E4F00644C8C /* WithdrawalTableViewCell.h */,
2916A74E1D703E4F00644C8C /* WithdrawalTableViewCell.m */,
29BAA3A91DC9FB5B00927D04 /* PromptTableViewCell.h */,
29BAA3AA1DC9FB5B00927D04 /* PromptTableViewCell.m */,
29045F301DCA192700E42A86 /* PromptHeaderTableViewCell.h */,
29045F311DCA192700E42A86 /* PromptHeaderTableViewCell.m */,
);
name = Cells;
sourceTree = "<group>";
......@@ -1782,6 +1792,7 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
29045F321DCA192700E42A86 /* PromptHeaderTableViewCell.m in Sources */,
2980AEC51D0D0B10001AA4A3 /* opple_objc_json_client.m in Sources */,
2916A7521D70557400644C8C /* PaymentsDetailsTableViewController.m in Sources */,
29E2D3241DB878F200443170 /* XLPlainFlowLayout.m in Sources */,
......@@ -1855,6 +1866,7 @@
29360C2F1CDDC47E002A5D89 /* ScreeningView.m in Sources */,
2985AEA21CE72F1500704C91 /* NSDictionary+ZXPUnicode.m in Sources */,
29498C601D053B7C004FA79B /* ShoppingBagTableViewCell.m in Sources */,
29BAA3AB1DC9FB5B00927D04 /* PromptTableViewCell.m in Sources */,
29EAAE9C1CDC74CA00C4DBA2 /* AllCustomerViewController.m in Sources */,
2933934F1CD3158B000D997B /* instructionsLabe.m in Sources */,
29F726011CE1D05D0072FE0E /* ScreeningCollectionReusableView.m in Sources */,
......@@ -2029,8 +2041,8 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = "Brand Assets";
CLANG_ENABLE_OBJC_WEAK = YES;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_IDENTITY = "iPhone Developer: 云霄 曹 (WM8ZU7YY98)";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: 云霄 曹 (WM8ZU7YY98)";
COMPRESS_PNG_FILES = NO;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
......@@ -2072,7 +2084,7 @@
);
PRODUCT_BUNDLE_IDENTIFIER = com.gomore.opple;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
PROVISIONING_PROFILE = "ce8104e7-12c7-4aa2-a135-c4d3731e559c";
STRIP_PNG_TEXT = NO;
TARGETED_DEVICE_FAMILY = 2;
USER_HEADER_SEARCH_PATHS = "$(PODS_ROOT)/**";
......@@ -2086,8 +2098,8 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = "Brand Assets";
CLANG_ENABLE_OBJC_WEAK = YES;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_IDENTITY = "iPhone Developer: 云霄 曹 (WM8ZU7YY98)";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: 云霄 曹 (WM8ZU7YY98)";
COMPRESS_PNG_FILES = NO;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
......@@ -2129,7 +2141,7 @@
);
PRODUCT_BUNDLE_IDENTIFIER = com.gomore.opple;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
PROVISIONING_PROFILE = "ce8104e7-12c7-4aa2-a135-c4d3731e559c";
STRIP_PNG_TEXT = NO;
TARGETED_DEVICE_FAMILY = 2;
USER_HEADER_SEARCH_PATHS = "$(PODS_ROOT)/**";
......
Lighting/AppDelegate.m
View file @ cef9c44f
......@@ -20,6 +20,7 @@
- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
// Override point for customization after application launch.
//bug检测
[Bugly startWithAppId:@"900033734"];
//检测版本更新
......
Lighting/Images.xcassets/140046029-MX260-D112-03-星冠-5700K（2）.imageset/Contents.json deleted 100644 → 0
View file @ bae556a2
{
"images" : [
{
"idiom" : "universal",
"filename" : "140046029-MX260-D112-03-星冠-5700K（2）.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Lighting/Images.xcassets/140046029-MX260-D112-03-星冠-5700K（4）.imageset/Contents.json deleted 100644 → 0
View file @ bae556a2
{
"images" : [
{
"idiom" : "universal",
"filename" : "140046029-MX260-D112-03-星冠-5700K（4）.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Lighting/Images.xcassets/Cog.imageset/Contents.json deleted 100644 → 0
View file @ bae556a2
{
"images" : [
{
"idiom" : "universal",
"filename" : "Cog.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "Cog@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Lighting/Images.xcassets/Error.imageset/Contents.json deleted 100644 → 0
View file @ bae556a2
{
"images" : [
{
"idiom" : "universal",
"filename" : "Error.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "Error@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "Error@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Lighting/Images.xcassets/ScannerViewController.imageset/Contents.json deleted 100644 → 0
View file @ bae556a2
{
"images" : [
{
"idiom" : "universal",
"filename" : "ScannerViewController.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "ScannerViewController@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Lighting/Images.xcassets/View.imageset/Contents.json deleted 100644 → 0
View file @ bae556a2
{
"images" : [
{
"idiom" : "universal",
"filename" : "View.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "View@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Lighting/Images.xcassets/bg-img 副本.imageset/Contents.json deleted 100644 → 0
View file @ bae556a2
{
"images" : [
{
"idiom" : "universal",
"filename" : "bg-img 副本.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Lighting/Images.xcassets/0510体验中心图标/backView.imageset/Contents.json → Lighting/Images.xcassets/bg-w.imageset/Contents.json
View file @ cef9c44f
......@@ -2,15 +2,17 @@
"images" : [
{
"idiom" : "universal",
"filename" : "backView.png",
"filename" : "bg-w.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "bg-w@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "bg-w@3x.png",
"scale" : "3x"
}
],
......
Lighting/Images.xcassets/business.imageset/Contents.json deleted 100644 → 0
View file @ bae556a2
{
"images" : [
{
"idiom" : "universal",
"filename" : "business.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "business@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Lighting/Images.xcassets/changjingtubiao.imageset/Contents.json deleted 100644 → 0
View file @ bae556a2
{
"images" : [
{
"idiom" : "universal",
"filename" : "7.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "7@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Lighting/Images.xcassets/data-1.imageset/Contents.json deleted 100644 → 0
View file @ bae556a2
{
"images" : [
{
"idiom" : "universal",
"filename" : "data.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "data@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Lighting/Images.xcassets/icon-副本.imageset/Contents.json deleted 100644 → 0
View file @ bae556a2
{
"images" : [
{
"idiom" : "universal",
"filename" : "icon-副本.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "icon-副本@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Lighting/Images.xcassets/icon.imageset/Contents.json deleted 100644 → 0
View file @ bae556a2
{
"images" : [
{
"idiom" : "universal",
"filename" : "icon.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "icon@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Lighting/Images.xcassets/0510体验中心图标/其他_iPhone_assets/addshopping.imageset/Contents.json → Lighting/Images.xcassets/used.imageset/Contents.json
View file @ cef9c44f
......@@ -2,16 +2,17 @@
"images" : [
{
"idiom" : "universal",
"filename" : "10-副本.png",
"filename" : "used.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "10-副本@2x.png",
"filename" : "used@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "used@3x.png",
"scale" : "3x"
}
],
......
Lighting/Images.xcassets/0510体验中心图标/其他_iPhone_assets/box.imageset/Contents.json → Lighting/Images.xcassets/useing.imageset/Contents.json
View file @ cef9c44f
......@@ -2,16 +2,17 @@
"images" : [
{
"idiom" : "universal",
"filename" : "box.png",
"filename" : "useing.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "box@2x.png",
"filename" : "useing@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "useing@3x.png",
"scale" : "3x"
}
],
......
Lighting/Images.xcassets/¥-副本.imageset/Contents.json deleted 100644 → 0
View file @ bae556a2
{
"images" : [
{
"idiom" : "universal",
"filename" : "¥-副本.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "¥-副本@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Lighting/Images.xcassets/0510体验中心图标/效果一体验中心_iPhone_assets/reBackBtn.imageset/Contents.json → Lighting/Images.xcassets/京东logo.imageset/Contents.json
View file @ cef9c44f
......@@ -2,16 +2,17 @@
"images" : [
{
"idiom" : "universal",
"filename" : "1.png",
"filename" : "京东logo.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "1@2x.png",
"filename" : "京东logo@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "京东logo@3x.png",
"scale" : "3x"
}
],
......
Lighting/Images.xcassets/圆角矩形-2-副本-2.imageset/Contents.json deleted 100644 → 0
View file @ bae556a2
{
"images" : [
{
"idiom" : "universal",
"filename" : "圆角矩形-2-副本-2.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "圆角矩形-2-副本-2@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Lighting/Images.xcassets/圆角矩形-3-副本.imageset/Contents.json deleted 100644 → 0
View file @ bae556a2
{
"images" : [
{
"idiom" : "universal",
"filename" : "圆角矩形-3-副本.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "圆角矩形-3-副本@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Lighting/StoryboardwithCYX.storyboard
View file @ cef9c44f
This diff is collapsed.
Tools/BaseViewController.m
View file @ cef9c44f
This diff is collapsed.
Tools/CYConstManager.h
View file @ cef9c44f
This diff is collapsed.
Tools/CYConstManager.m
View file @ cef9c44f
This diff is collapsed.
Tools/NetworkRequestClassManager.m
View file @ cef9c44f
This diff is collapsed.
Tools/PDFViewController.m
View file @ cef9c44f
This diff is collapsed.
Tools/PrefixHeader.pch
View file @ cef9c44f
This diff is collapsed.
Tools/opple_objc_json_client.h
View file @ cef9c44f
This diff is collapsed.
podfile
View file @ cef9c44f
This diff is collapsed.
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