Skip to content

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

修改项说明：修复从订单列表进入订单详情抽奖时，导购促销和消费者促销错乱

parent 54c5c4e2
Hide whitespace changes
Inline Side-by-side
Showing with 4030 additions and 3655 deletions
Class/CustomerOrderViewController.m
View file @ ac511240
...@@ -117,7 +117,7 @@ ...@@ -117,7 +117,7 @@
WS(weakSelf); WS(weakSelf);
MjRefreshHeaderCustom *headerRefresh = [MjRefreshHeaderCustom headerWithRefreshingBlock:^{ MjRefreshHeaderCustom *headerRefresh = [MjRefreshHeaderCustom headerWithRefreshingBlock:^{
self.indexPage = ONE; weakSelf.indexPage = ONE;
DataPage *page = [[DataPage alloc]init]; DataPage *page = [[DataPage alloc]init];
page.page = weakSelf.indexPage; page.page = weakSelf.indexPage;
page.rows = KROWS; page.rows = KROWS;
...@@ -220,6 +220,7 @@ ...@@ -220,6 +220,7 @@
OrderdetailsViewController *orderdetails = [storyboard instantiateViewControllerWithIdentifier:@"orderdetails"]; OrderdetailsViewController *orderdetails = [storyboard instantiateViewControllerWithIdentifier:@"orderdetails"];
TOOrderEntity *model = (TOOrderEntity *)[[self.datasArray objectAtIndex_opple:indexPath.row] order]; TOOrderEntity *model = (TOOrderEntity *)[[self.datasArray objectAtIndex_opple:indexPath.row] order];
orderdetails.orderCode = model.orderNumber; orderdetails.orderCode = model.orderNumber;
orderdetails.consumerId = model.consumerId;
if ([model.orderState isEqualToString:@"006"] || [model.orderState isEqualToString:@"002"] || [model.orderState isEqualToString:@"003"]) { if ([model.orderState isEqualToString:@"006"] || [model.orderState isEqualToString:@"002"] || [model.orderState isEqualToString:@"003"]) {
orderdetails.isShowPrintButton = YES; orderdetails.isShowPrintButton = YES;
orderdetails.isShowPayButton = NO; orderdetails.isShowPayButton = NO;
......
Class/Login/LoginViewController.m
View file @ ac511240
...@@ -126,8 +126,8 @@ ...@@ -126,8 +126,8 @@
self.passWordString = [[NSUserDefaults standardUserDefaults] objectForKey:PASSWORD]; self.passWordString = [[NSUserDefaults standardUserDefaults] objectForKey:PASSWORD];
self.userName.text = self.userNameString; self.userName.text = self.userNameString;
self.passWord.text = self.passWordString; self.passWord.text = self.passWordString;
//版本更新 // //版本更新
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(detectionUpdateVersion) name:UPLOADVERSION object:nil]; // [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(detectionUpdateVersion) name:UPLOADVERSION object:nil];
self.versionlabel.text = [self getAppVersion]; self.versionlabel.text = [self getAppVersion];
[self detectionUpdateVersion]; [self detectionUpdateVersion];
......
Class/OrderdetailsViewController.h
View file @ ac511240
...@@ -60,12 +60,16 @@ ...@@ -60,12 +60,16 @@
*/ */
@property (nonatomic,assign) BOOL isSliding; @property (nonatomic,assign) BOOL isSliding;
/** /**
* 是否开启交互 * 是否开启交互
*/ */
@property (nonatomic,assign) BOOL isUserInteractionEnabled; @property (nonatomic,assign) BOOL isUserInteractionEnabled;
/**
用户ID
*/
@property (nonatomic,copy) NSString *consumerId;
......
Class/OrderdetailsViewController.m
View file @ ac511240
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
#import "PromotionWeChatCardModel.h" #import "PromotionWeChatCardModel.h"
#import "PromotionChooseViewController.h" #import "PromotionChooseViewController.h"
#import "PromotionChooseNavigationController.h" #import "PromotionChooseNavigationController.h"
#import "QRViewController.h"
NSString *const PROMOTIONALSTRING = @"促销信息"; NSString *const PROMOTIONALSTRING = @"促销信息";
...@@ -51,10 +52,6 @@ NSString *const PROMOTIONALSTRING = @"促销信息"; ...@@ -51,10 +52,6 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
*/ */
@property (nonatomic,copy) NSString *PDFpath; @property (nonatomic,copy) NSString *PDFpath;
///**
// * 促销信息<商品、折扣>
// */
//@property (nonatomic,strong) NSMutableArray *promotionalArray;
/** /**
* 已享受促销信息 * 已享受促销信息
...@@ -81,6 +78,11 @@ NSString *const PROMOTIONALSTRING = @"促销信息"; ...@@ -81,6 +78,11 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
*/ */
@property (nonatomic,strong) NSMutableArray *originalCustomerPromotionArray; @property (nonatomic,strong) NSMutableArray *originalCustomerPromotionArray;
/**
微信卡劵
*/
@property (nonatomic,strong) WeChatCardModel *weChatModel;
@end @end
...@@ -120,6 +122,14 @@ NSString *const PROMOTIONALSTRING = @"促销信息"; ...@@ -120,6 +122,14 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
return _customerPromotionArray; return _customerPromotionArray;
} }
- (WeChatCardModel *)weChatModel
{
if (!_weChatModel) {
_weChatModel = [[WeChatCardModel alloc]init];
}
return _weChatModel;
}
#pragma mark -渲染完成 #pragma mark -渲染完成
- (void)viewDidAppear:(BOOL)animated - (void)viewDidAppear:(BOOL)animated
{ {
...@@ -297,11 +307,15 @@ NSString *const PROMOTIONALSTRING = @"促销信息"; ...@@ -297,11 +307,15 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
[weakSelf.promotionInformationArray addObject:model]; [weakSelf.promotionInformationArray addObject:model];
} else if (![BaseViewController isBlankString:[oldPromotion.discountRate stringValue]]) { } else if (![BaseViewController isBlankString:[oldPromotion.discountRate stringValue]]) {
// 抽奖折扣 // 抽奖折扣
PromotionLuckDrawResultModel *model = [[PromotionLuckDrawResultModel alloc]init]; PromotionLuckyDrawModel *model = [[PromotionLuckyDrawModel alloc]init];
model.number = [oldPromotion.discountRate stringValue]; model.descriptionString = [oldPromotion.discountRate stringValue];
model.body = CONSUMER;
[weakSelf.promotionInformationArray addObject:model]; [weakSelf.promotionInformationArray addObject:model];
} }
} }
if (self.promotionInformationArray.count) {
[self.sectionTitle addObject:@"促销信息"];
}
} }
} WithErrorCodeBlock:^(id errorCodeValue) { } WithErrorCodeBlock:^(id errorCodeValue) {
...@@ -322,7 +336,7 @@ NSString *const PROMOTIONALSTRING = @"促销信息"; ...@@ -322,7 +336,7 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
if (!self.isShowPayButton) { if (!self.isShowPayButton) {
queryDrawState.orderNumberEquals = self.orderCode; queryDrawState.orderNumberEquals = self.orderCode;
} }
queryDrawState.winnerIdEquals = [Customermanager manager].model.fid; queryDrawState.winnerIdEquals = self.consumerId?self.consumerId:[Customermanager manager].model.fid;
queryDrawState.stateEquals = self.isShowPayButton?ACCOMPLISHED:USED; queryDrawState.stateEquals = self.isShowPayButton?ACCOMPLISHED:USED;
DataPage *page = [[DataPage alloc]init]; DataPage *page = [[DataPage alloc]init];
page.page = ZERO; page.page = ZERO;
...@@ -349,6 +363,10 @@ NSString *const PROMOTIONALSTRING = @"促销信息"; ...@@ -349,6 +363,10 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
// 有促销未支付情况 // 有促销未支付情况
if (weakSelf.isShowPayButton && [weakSelf.orderDetails.order.orderState isEqualToString:NOTPAY] && weakSelf.customerPromotionArray.count) { if (weakSelf.isShowPayButton && [weakSelf.orderDetails.order.orderState isEqualToString:NOTPAY] && weakSelf.customerPromotionArray.count) {
// 有抽奖结果未使用
if (resultModel.award) {
weakSelf.customerDrawModel = [PromotionLuckDrawResultModel initializeWith:resultModel];
}
PromotionChooseNavigationController *promotionChooseNav = [[weakSelf getStoryboardWithName] instantiateViewControllerWithIdentifier:@"PromotionChooseNavigationController"]; PromotionChooseNavigationController *promotionChooseNav = [[weakSelf getStoryboardWithName] instantiateViewControllerWithIdentifier:@"PromotionChooseNavigationController"];
PromotionChooseViewController *promotionChoose = (PromotionChooseViewController *)promotionChooseNav.visibleViewController; PromotionChooseViewController *promotionChoose = (PromotionChooseViewController *)promotionChooseNav.visibleViewController;
promotionChoose.promotionDelegate = self; promotionChoose.promotionDelegate = self;
...@@ -365,40 +383,9 @@ NSString *const PROMOTIONALSTRING = @"促销信息"; ...@@ -365,40 +383,9 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
[weakSelf payButtonClickAction]; [weakSelf payButtonClickAction];
}else if (![weakSelf.orderDetails.order.orderState isEqualToString:NOTPAY] && resultModel.award) { }else if (![weakSelf.orderDetails.order.orderState isEqualToString:NOTPAY] && resultModel.award) {
// 订单状态不为未支付,且有抽奖结果 // 已支付,且有抽奖结果情况
weakSelf.customerDrawModel = [PromotionLuckDrawResultModel initializeWith:resultModel]; weakSelf.customerDrawModel = [PromotionLuckDrawResultModel initializeWith:resultModel];
} }
// // 消费者抽奖成功后若没有支付，后面支付时可以继续享受奖品折扣
// if ([resultModel.draw.state isEqualToString:ACCOMPLISHED]) {
// weakSelf.customerDrawModel = [PromotionLuckDrawResultModel initializeWith:resultModel];
// }
// // 支付完成后
// if (self.isShowPrintButton && resultModel.award) {
// weakSelf.customerDrawModel = [PromotionLuckDrawResultModel initializeWith:resultModel];
// }
// // 默认弹出支付框
// if (weakSelf.isShowPayButton && [weakSelf.orderDetails.order.orderState isEqualToString:NOTPAY]) {
// // 找出客户抽奖
// for (int i=0;i<weakSelf.luckyDrawAndJDECardArray.count;i++) {
// id object = weakSelf.luckyDrawAndJDECardArray[i];
// if ([object isKindOfClass:[PromotionLuckyDrawModel class]] && !resultModel) {
// PromotionLuckyDrawModel *model = (PromotionLuckyDrawModel *)object;
// if ([model.body isEqualToString:CONSUMER]) {
// [weakSelf queryConsumerLuckyDrawChance:model];
// break;
// }
// }
// // 有促销无抽奖情况
// if (i == weakSelf.luckyDrawAndJDECardArray.count-1) {
// [weakSelf payButtonClickAction];
// }
// }
// // 无促销情况
// if (!weakSelf.luckyDrawAndJDECardArray.count) {
// [weakSelf payButtonClickAction];
// }
// }
if (finish) { if (finish) {
finish(); finish();
} }
...@@ -410,7 +397,7 @@ NSString *const PROMOTIONALSTRING = @"促销信息"; ...@@ -410,7 +397,7 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
- (void)confirmChoosePromotion:(NSArray<CustomPromotionModel *> *)promotionArray - (void)confirmChoosePromotion:(NSArray<CustomPromotionModel *> *)promotionArray
{ {
for (CustomPromotionModel *promotionModel in promotionArray) { for (CustomPromotionModel *promotionModel in promotionArray) {
for (JSONModel *originalModel in self.originalCustomerPromotionArray) { for (JSONModel *originalModel in self.customerPromotionArray) {
//微信卡劵 //微信卡劵
if ([originalModel isMemberOfClass:[PromotionWeChatCardModel class]]) { if ([originalModel isMemberOfClass:[PromotionWeChatCardModel class]]) {
PromotionWeChatCardModel *weChatModel = (PromotionWeChatCardModel *)originalModel; PromotionWeChatCardModel *weChatModel = (PromotionWeChatCardModel *)originalModel;
...@@ -445,18 +432,56 @@ NSString *const PROMOTIONALSTRING = @"促销信息"; ...@@ -445,18 +432,56 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
if (self.promotionInformationArray.count) { if (self.promotionInformationArray.count) {
[self.sectionTitle addObject:@"促销信息"]; [self.sectionTitle addObject:@"促销信息"];
} }
// 如果已选中的促销中有抽奖，优先实行 [self promotionInformationExecutionOrder];
for (int i=0;i<self.promotionInformationArray.count;i++) { }
JSONModel *model = self.promotionInformationArray[i];
#pragma mark - 促销信息执行顺序
- (void)promotionInformationExecutionOrder
{
PromotionLuckyDrawModel *drawModel;
PromotionWeChatCardModel *weChatModel;
for (JSONModel *model in self.promotionInformationArray) {
// 抽奖
if ([model isMemberOfClass:[PromotionLuckyDrawModel class]]) { if ([model isMemberOfClass:[PromotionLuckyDrawModel class]]) {
[self queryConsumerLuckyDrawChance:(PromotionLuckyDrawModel *)model];break; drawModel = (PromotionLuckyDrawModel *)model;
if ([drawModel.body isEqualToString:GUIDE]) {
drawModel = nil;
}
} }
// 微信卡劵支付 // 微信卡劵支付
if ([model isMemberOfClass:[PromotionWeChatCardModel class]]) { if ([model isMemberOfClass:[PromotionWeChatCardModel class]]) {
weChatModel = (PromotionWeChatCardModel *)model;
}
}
//通过促销优先级决定调用顺序
if (drawModel.priority > weChatModel.priority) {
if (!drawModel.isUsed && drawModel) {
drawModel.isUsed = YES;
[self queryConsumerLuckyDrawChance:drawModel];
}else if (!weChatModel.isUsed && weChatModel) {
weChatModel.isUsed = YES;
[self scanWeChatCardNumber:weChatModel];
}else{
[self payButtonClickAction];
} }
// 直接支付 }else if (drawModel.priority < weChatModel.priority) {
if (i == self.promotionInformationArray.count - 1) { if (!weChatModel.isUsed && weChatModel) {
weChatModel.isUsed = YES;
[self scanWeChatCardNumber:weChatModel];;
}else if (!drawModel.isUsed && drawModel) {
drawModel.isUsed = YES;
[self queryConsumerLuckyDrawChance:drawModel];
}else{
[self payButtonClickAction];
}
}else if (drawModel.priority == weChatModel.priority && drawModel && weChatModel) {
if (!drawModel.isUsed && drawModel) {
drawModel.isUsed = YES;
[self queryConsumerLuckyDrawChance:drawModel];
}else if (!weChatModel.isUsed && weChatModel) {
weChatModel.isUsed = YES;
[self scanWeChatCardNumber:weChatModel];
}else{
[self payButtonClickAction]; [self payButtonClickAction];
} }
} }
...@@ -464,6 +489,49 @@ NSString *const PROMOTIONALSTRING = @"促销信息"; ...@@ -464,6 +489,49 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
} }
#pragma mark - 扫描微信卡劵
- (void)scanWeChatCardNumber:(PromotionWeChatCardModel *)weChatModel
{
WS(weakSelf);
QRViewController *qrVC = [[QRViewController alloc] initWithScanCompleteHandler:^(NSString *url) {
[weakSelf dismissViewControllerAnimated:YES completion:^{
weakSelf.weChatModel.wxcardNumber = url;
[weakSelf consumerUseWeChatCard:url andOrderTotal:[weakSelf.orderDetails.order.orderPrice stringValue] andOrderNumber:self.orderCode];
}];
}];
dispatch_async(dispatch_get_main_queue(), ^{
[weakSelf presentViewController:qrVC animated:YES completion:nil];
});
}
#pragma mark - 使用微信卡劵
- (void)consumerUseWeChatCard:(NSString *)number andOrderTotal:(NSString *)orderTotal andOrderNumber:(NSString *)orderNumber
{
WS(weakSelf);
[self CreateMBProgressHUDLoding];
[[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:[NSString stringWithFormat:USEWECHATCARD,number,orderNumber,orderTotal] WithCallClass:weakSelf WithRequestType:ZERO WithParameter:nil WithReturnValueBlock:^(id returnValue) {
[weakSelf RemoveMBProgressHUDLoding];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
weakSelf.weChatModel.wxcardDenomation = [returnValue[@"data"][@"denomation"] integerValue];
weakSelf.weChatModel.payNo = returnValue[@"data"][@"payNo"];
[weakSelf SHOWPrompttext:@"微信卡劵使用成功" ComcpleteBlock:^{
[weakSelf promotionInformationExecutionOrder];
}];
}else{
[weakSelf ErrorMBProgressView:returnValue[@"msg"]];
}
} WithErrorCodeBlock:^(id errorCodeValue) {
[weakSelf RemoveMBProgressHUDLoding];
[weakSelf ErrorMBProgressView:NETWORK];
} WithFailureBlock:^(NSError *error) {
[weakSelf RemoveMBProgressHUDLoding];
[weakSelf ErrorMBProgressView:error.localizedDescription];
}];
}
#pragma mark - 获取关于消费者的所有促销 #pragma mark - 获取关于消费者的所有促销
- (void)getConsumerAllPromotion:(JSONModel *)model withBody:(NSString *)body - (void)getConsumerAllPromotion:(JSONModel *)model withBody:(NSString *)body
{ {
...@@ -584,21 +652,29 @@ NSString *const PROMOTIONALSTRING = @"促销信息"; ...@@ -584,21 +652,29 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
- (void)queryConsumerLuckyDrawChance:(PromotionLuckyDrawModel *)model - (void)queryConsumerLuckyDrawChance:(PromotionLuckyDrawModel *)model
{ {
WS(weakSelf); WS(weakSelf);
[self promptCustomerTitle:@"马上参与" withMessage:@"恭喜您获得一次大转盘抽奖机会!" finish:^{ //判断是否有已抽奖未使用情况
[weakSelf showLuckyDrawControl:model.lottery.uuid andOrderNumber:weakSelf.orderCode luckyDrawFinish:^(NSDictionary *dict) { if (![[self class] isBlankString:self.customerDrawModel.drawId]) {
id json = [NSJSONSerialization JSONObjectWithData:[dict[@"body"] dataUsingEncoding:NSUTF8StringEncoding] options:NSJSONReadingMutableContainers error:nil]; [self promptCustomerTitle:@"我知道了" withMessage:@"您有一个抽奖结果未使用，本次支付会默认使用" finish:^{
if (json) { [weakSelf promotionInformationExecutionOrder];
if ([json isKindOfClass:[NSDictionary class]]) { }];
weakSelf.customerDrawModel = [[PromotionLuckDrawResultModel alloc]initWithDictionary:json error:nil]; }else {
if ([BaseViewController isBlankString:weakSelf.customerDrawModel.awardId]) { [self promptCustomerTitle:@"马上参与" withMessage:@"恭喜您获得一次大转盘抽奖机会!" finish:^{
[weakSelf SHOWPrompttext:@"未中奖"]; [weakSelf showLuckyDrawControl:model.lottery.uuid andOrderNumber:weakSelf.orderCode luckyDrawFinish:^(NSDictionary *dict) {
}else { id json = [NSJSONSerialization JSONObjectWithData:[dict[@"body"] dataUsingEncoding:NSUTF8StringEncoding] options:NSJSONReadingMutableContainers error:nil];
[weakSelf SHOWPrompttext:[NSString stringWithFormat:@"恭喜你获得了 %@",weakSelf.customerDrawModel.descriptionString]]; if (json) {
if ([json isKindOfClass:[NSDictionary class]]) {
[weakSelf promotionInformationExecutionOrder];
weakSelf.customerDrawModel = [[PromotionLuckDrawResultModel alloc]initWithDictionary:json error:nil];
if ([BaseViewController isBlankString:weakSelf.customerDrawModel.awardId]) {
[weakSelf SHOWPrompttext:@"未中奖"];
}else {
[weakSelf SHOWPrompttext:[NSString stringWithFormat:@"恭喜你获得了 %@",weakSelf.customerDrawModel.descriptionString]];
}
} }
} }
} }];
}]; }];
}]; }
} }
#pragma mark - 查询导购抽奖机会 #pragma mark - 查询导购抽奖机会
...@@ -610,7 +686,7 @@ NSString *const PROMOTIONALSTRING = @"促销信息"; ...@@ -610,7 +686,7 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
PromotionLuckyDrawModel *model = (PromotionLuckyDrawModel *)object; PromotionLuckyDrawModel *model = (PromotionLuckyDrawModel *)object;
if ([model.body isEqualToString:GUIDE]) { if ([model.body isEqualToString:GUIDE]) {
finish(); finish();
[self.promotionInformationArray removeObject:object]; // [self.promotionInformationArray removeObject:object];
break; break;
} }
} }
...@@ -626,6 +702,7 @@ NSString *const PROMOTIONALSTRING = @"促销信息"; ...@@ -626,6 +702,7 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
settlement.promotionalArray = self.promotionInformationArray; settlement.promotionalArray = self.promotionInformationArray;
settlement.orderCode = self.orderCode; settlement.orderCode = self.orderCode;
settlement.resultModel = self.customerDrawModel; settlement.resultModel = self.customerDrawModel;
settlement.weChatModel = self.weChatModel;
settlement.modalPresentationStyle = UIModalPresentationFormSheet; settlement.modalPresentationStyle = UIModalPresentationFormSheet;
UIPopoverPresentationController *pop = settlement.popoverPresentationController; UIPopoverPresentationController *pop = settlement.popoverPresentationController;
pop.sourceView = settlement.view; pop.sourceView = settlement.view;
......
Class/PromotionLuckyDrawModel.h
View file @ ac511240
...@@ -34,6 +34,9 @@ ...@@ -34,6 +34,9 @@
// 是否选中 // 是否选中
@property (nonatomic,assign) BOOL isSelected; @property (nonatomic,assign) BOOL isSelected;
// 是否使用
@property (nonatomic,assign) BOOL isUsed;
@end @end
......
Class/PromotionWeChatCardModel.h
View file @ ac511240
...@@ -30,5 +30,26 @@ ...@@ -30,5 +30,26 @@
// 冲突列表 // 冲突列表
@property (nonatomic,strong) NSArray *conflicts; @property (nonatomic,strong) NSArray *conflicts;
// 是否使用
@property (nonatomic,assign) BOOL isUsed;
@end
@interface WeChatCardModel : JSONModel
/**
微信卡劵面额
*/
@property (nonatomic,assign) NSInteger wxcardDenomation;
/**
微信卡劵卡号
*/
@property (nonatomic,copy) NSString *wxcardNumber;
/**
支付流水号
*/
@property (nonatomic,copy) NSString *payNo;
@end @end
Class/PromotionWeChatCardModel.m
View file @ ac511240
...@@ -21,3 +21,13 @@ ...@@ -21,3 +21,13 @@
} }
@end @end
@implementation WeChatCardModel
+ (BOOL)propertyIsOptional:(NSString *)propertyName
{
return YES;
}
@end
Class/PromotionalTableViewCell.m
View file @ ac511240
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
//微信卡劵 //微信卡劵
if ([promotionModel isMemberOfClass:[PromotionWeChatCardModel class]]) { if ([promotionModel isMemberOfClass:[PromotionWeChatCardModel class]]) {
PromotionWeChatCardModel *weChatModel = (PromotionWeChatCardModel *)promotionModel; PromotionWeChatCardModel *weChatModel = (PromotionWeChatCardModel *)promotionModel;
self.promotionalTitleLabel.text = [NSString stringWithFormat:@"使用微信卡劵: %@",weChatModel.descriptionString]; self.promotionalTitleLabel.text = [NSString stringWithFormat:@"微信卡劵: %@",weChatModel.descriptionString];
}else if ([promotionModel isMemberOfClass:[PromotionalDeductionModel class]]) { }else if ([promotionModel isMemberOfClass:[PromotionalDeductionModel class]]) {
//抵扣 //抵扣
PromotionalDeductionModel *deductionModel = (PromotionalDeductionModel *)promotionModel; PromotionalDeductionModel *deductionModel = (PromotionalDeductionModel *)promotionModel;
......
Class/SettlementViewController.h
View file @ ac511240
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
#import "BaseViewController.h" #import "BaseViewController.h"
#import "PromotionLuckDrawResultModel.h" #import "PromotionLuckDrawResultModel.h"
#import "PromotionWeChatCardModel.h"
@interface SettlementViewController : BaseViewController @interface SettlementViewController : BaseViewController
...@@ -124,5 +124,10 @@ ...@@ -124,5 +124,10 @@
*/ */
@property (nonatomic,strong) PromotionLuckDrawResultModel *resultModel; @property (nonatomic,strong) PromotionLuckDrawResultModel *resultModel;
/**
微信卡劵
*/
@property (nonatomic,strong) WeChatCardModel *weChatModel;
@end @end
Class/SettlementViewController.m
View file @ ac511240
...@@ -360,6 +360,11 @@ ...@@ -360,6 +360,11 @@
} }
} }
} }
// 查询是否有微信卡劵促销
if (![[self class] isBlankString:self.weChatModel.wxcardNumber]) {
order.wxcardNumber = self.weChatModel.wxcardNumber;
order.wxcardDenomation = [NSNumber numberWithInteger:self.weChatModel.wxcardDenomation];
}
//支付类型 //支付类型
if (self.payTreasureButton.selected) { if (self.payTreasureButton.selected) {
order.payType = @"005"; order.payType = @"005";
......
Lighting/AppDelegate.m
View file @ ac511240
...@@ -10,6 +10,8 @@ ...@@ -10,6 +10,8 @@
#import "LoginViewController.h" #import "LoginViewController.h"
#import "DeviceDirectionManager.h" #import "DeviceDirectionManager.h"
#import <Bugly/Bugly.h> #import <Bugly/Bugly.h>
#import <PgyUpdate/PgyUpdateManager.h>
@interface AppDelegate () @interface AppDelegate ()
@end @end
...@@ -19,10 +21,8 @@ ...@@ -19,10 +21,8 @@
- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
// Override point for customization after application launch. // Override point for customization after application launch.
//bug检测 [self setUpBuglyAndPgy];
[Bugly startWithAppId:@"900033734"];
//检测版本更新
[self detectionNetwork]; [self detectionNetwork];
[self SetIQKeyboardManager]; [self SetIQKeyboardManager];
[self RootViewcontroller]; [self RootViewcontroller];
...@@ -30,6 +30,14 @@ ...@@ -30,6 +30,14 @@
return YES; return YES;
} }
#pragma mark - 设置bugly和pgy
- (void)setUpBuglyAndPgy
{
[Bugly startWithAppId:@"900033734"];
[[PgyUpdateManager sharedPgyManager] startManagerWithAppId:@"95fcb4e47cf3d6c7309a2760ccccde66"];
[[PgyUpdateManager sharedPgyManager] checkUpdate];
}
- (UIInterfaceOrientationMask)application:(UIApplication *)application supportedInterfaceOrientationsForWindow:(nullable UIWindow *)window - (UIInterfaceOrientationMask)application:(UIApplication *)application supportedInterfaceOrientationsForWindow:(nullable UIWindow *)window
{ {
//判断是否是横屏 //判断是否是横屏
...@@ -112,51 +120,7 @@ ...@@ -112,51 +120,7 @@
}]; }];
} }
/** #pragma mark - 友盟
* 比较版本号
*
* @param v1 第一个版本号
* @param v2 第二个版本号
*
* @return 如果版本号相等，返回 0,
* 如果第一个版本号低于第二个，返回 -1，否则返回 1.
*/
int compare_version(const char *v1, const char *v2)
{
assert(v1);
assert(v2);
const char *p_v1 = v1;
const char *p_v2 = v2;
while (*p_v1 && *p_v2) {
char buf_v1[32] = {0};
char buf_v2[32] = {0};
char *i_v1 = strchr(p_v1, '.');
if (!i_v1) break;
if (i_v1 != p_v1) {
strncpy(buf_v1, p_v1, i_v1 - p_v1);
p_v1 = i_v1;
}
else
p_v1++;
char *i_v2 = strchr(p_v2, '.');
if (!i_v2) break;
if (i_v2 != p_v2) {
strncpy(buf_v2, p_v2, i_v2 - p_v2);
p_v2 = i_v2;
}
else
p_v2++;
int order = atoi(buf_v1) - atoi(buf_v2);
if (order != 0)
return order < 0 ? -1 : 1;
}
double res = atof(p_v1) - atof(p_v2);
if (res < 0) return -1;
if (res > 0) return 1;
return 0;
}
-(void)setUMShare -(void)setUMShare
{ {
// 友盟分享初始化 // 友盟分享初始化
...@@ -189,7 +153,7 @@ int compare_version(const char *v1, const char *v2) ...@@ -189,7 +153,7 @@ int compare_version(const char *v1, const char *v2)
- (void)applicationWillEnterForeground:(UIApplication *)application { - (void)applicationWillEnterForeground:(UIApplication *)application {
// Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background. // Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background.
[self updateVersion]; // [self updateVersion];
} }
- (void)applicationDidBecomeActive:(UIApplication *)application { - (void)applicationDidBecomeActive:(UIApplication *)application {
......
Podfile.lock
View file @ ac511240
...@@ -34,6 +34,8 @@ PODS: ...@@ -34,6 +34,8 @@ PODS:
- MMDrawerController/Core - MMDrawerController/Core
- MMDrawerController/Subclass (0.6.0): - MMDrawerController/Subclass (0.6.0):
- MMDrawerController/Core - MMDrawerController/Core
- Pgyer (2.8.4)
- PgyUpdate (1.2)
- SDWebImage (3.8.2): - SDWebImage (3.8.2):
- SDWebImage/Core (= 3.8.2) - SDWebImage/Core (= 3.8.2)
- SDWebImage/Core (3.8.2) - SDWebImage/Core (3.8.2)
...@@ -52,6 +54,8 @@ DEPENDENCIES: ...@@ -52,6 +54,8 @@ DEPENDENCIES:
- MBProgressHUD (~> 0.9.1) - MBProgressHUD (~> 0.9.1)
- MJRefresh - MJRefresh
- MMDrawerController - MMDrawerController
- Pgyer
- PgyUpdate
- SDWebImage - SDWebImage
- UMengAnalytics (~> 4.1.2) - UMengAnalytics (~> 4.1.2)
- UMengSocial - UMengSocial
...@@ -68,6 +72,8 @@ SPEC CHECKSUMS: ...@@ -68,6 +72,8 @@ SPEC CHECKSUMS:
MBProgressHUD: 1569cf7ace17a8bac47aabfbb8580a49690386d1 MBProgressHUD: 1569cf7ace17a8bac47aabfbb8580a49690386d1
MJRefresh: b96cdb21c4aa75a7b07654311ab2f315c497e806 MJRefresh: b96cdb21c4aa75a7b07654311ab2f315c497e806
MMDrawerController: e3a54a5570388463ad3b36975251575b50c4e1a0 MMDrawerController: e3a54a5570388463ad3b36975251575b50c4e1a0
Pgyer: 26edfcc8da6da6383fabfdbccd2f77c623b9d6eb
PgyUpdate: a42e82cec5ad4e992af390e9d494f6fc62db65e4
SDWebImage: 098e97e6176540799c27e804c96653ee0833d13c SDWebImage: 098e97e6176540799c27e804c96653ee0833d13c
UMengAnalytics: 8d95752776c32f5b954d40edc7f23944882a7c14 UMengAnalytics: 8d95752776c32f5b954d40edc7f23944882a7c14
UMengSocial: 48b67179c492a8cf7803fbb0438b8f55432e2fc1 UMengSocial: 48b67179c492a8cf7803fbb0438b8f55432e2fc1
......
Pods/Headers/Public/PgyUpdate/PgyUpdate/PgyUpdateManager.h 0 → 120000
View file @ ac511240
../../../../PgyUpdate/PgySDK/sdk/PgyUpdate.framework/Headers/PgyUpdateManager.h
\ No newline at end of file
Pods/Headers/Public/Pgyer/PgySDK/PgyManager.h 0 → 120000
View file @ ac511240
../../../../Pgyer/PgySDK/sdk/PgySDK.framework/Headers/PgyManager.h
\ No newline at end of file
Pods/Manifest.lock
View file @ ac511240
...@@ -34,6 +34,8 @@ PODS: ...@@ -34,6 +34,8 @@ PODS:
- MMDrawerController/Core - MMDrawerController/Core
- MMDrawerController/Subclass (0.6.0): - MMDrawerController/Subclass (0.6.0):
- MMDrawerController/Core - MMDrawerController/Core
- Pgyer (2.8.4)
- PgyUpdate (1.2)
- SDWebImage (3.8.2): - SDWebImage (3.8.2):
- SDWebImage/Core (= 3.8.2) - SDWebImage/Core (= 3.8.2)
- SDWebImage/Core (3.8.2) - SDWebImage/Core (3.8.2)
...@@ -52,6 +54,8 @@ DEPENDENCIES: ...@@ -52,6 +54,8 @@ DEPENDENCIES:
- MBProgressHUD (~> 0.9.1) - MBProgressHUD (~> 0.9.1)
- MJRefresh - MJRefresh
- MMDrawerController - MMDrawerController
- Pgyer
- PgyUpdate
- SDWebImage - SDWebImage
- UMengAnalytics (~> 4.1.2) - UMengAnalytics (~> 4.1.2)
- UMengSocial - UMengSocial
...@@ -68,6 +72,8 @@ SPEC CHECKSUMS: ...@@ -68,6 +72,8 @@ SPEC CHECKSUMS:
MBProgressHUD: 1569cf7ace17a8bac47aabfbb8580a49690386d1 MBProgressHUD: 1569cf7ace17a8bac47aabfbb8580a49690386d1
MJRefresh: b96cdb21c4aa75a7b07654311ab2f315c497e806 MJRefresh: b96cdb21c4aa75a7b07654311ab2f315c497e806
MMDrawerController: e3a54a5570388463ad3b36975251575b50c4e1a0 MMDrawerController: e3a54a5570388463ad3b36975251575b50c4e1a0
Pgyer: 26edfcc8da6da6383fabfdbccd2f77c623b9d6eb
PgyUpdate: a42e82cec5ad4e992af390e9d494f6fc62db65e4
SDWebImage: 098e97e6176540799c27e804c96653ee0833d13c SDWebImage: 098e97e6176540799c27e804c96653ee0833d13c
UMengAnalytics: 8d95752776c32f5b954d40edc7f23944882a7c14 UMengAnalytics: 8d95752776c32f5b954d40edc7f23944882a7c14
UMengSocial: 48b67179c492a8cf7803fbb0438b8f55432e2fc1 UMengSocial: 48b67179c492a8cf7803fbb0438b8f55432e2fc1
......
Pods/PgyUpdate/PgySDK/sdk/PgyUpdate.framework/Headers/PgyUpdateManager.h 0 → 100644
View file @ ac511240
//
// PgyUpdateManager.h
// Pods
//
// Created by Scott Lei on 15/9/16.
//
//
#import <Foundation/Foundation.h>
@interface PgyUpdateManager : NSObject
+ (PgyUpdateManager *)sharedPgyManager;
/**
* 启动蒲公英SDK
* @param appId 应用程序ID，从蒲公英网站上获取。
*/
- (void)startManagerWithAppId:(NSString *)appId;
/**
* 检查是否有版本更新。
* 如果开发者在蒲公英上提交了新版本，则调用此方法后会弹出更新提示界面。
*/
- (void)checkUpdate;
/**
* 检查是否有版本更新。
*
* @param delegate 自定义checkUpdateWithDelegete方法的对象
* @param updateMethodWithDictionary 当checkUpdateWithDelegete事件完成时此方法会被调用，包含更新信息的字典也被回传。
* 如果有更新信息，那么字典里就会包含新版本的信息，否则的话字典信息为nil。
*/
- (void)checkUpdateWithDelegete:(id)delegate selector:(SEL)updateMethodWithDictionary;
/**
* 检查更新是根据本地存储的Build号和蒲公英上的最新Build号比较来完成的。如果调用checkUpdateWithDelegete，SDK会获取到最新的
* Build号，但是checkUpdateWithDelegete方法自己不会来更新本地版本号，如果需要更新本地版本号，则需要调用此方法。
*/
- (void)updateLocalBuildNumber;
@end
Pods/Pgyer/PgySDK/sdk/PgySDK.framework/Headers/PgyManager.h 0 → 100755
View file @ ac511240
//
// PgyManager.h
// PgySDK
//
// Created by Scott Lei on 2015-1-7.
// Copyright (c) 2015年 蒲公英. All rights reserved.
// Version: 2.3
#import <Foundation/Foundation.h>
#import <UIKit/UIKit.h>
/**
* 激活反馈功能的方式
*/
typedef NS_ENUM(NSInteger, KPGYFeedbackActiveType){
/**
* 摇晃手机激活用户反馈界面
*/
kPGYFeedbackActiveTypeShake = 0,
/**
* 在界面上三指下滑或者上滑激活用户反馈界面
*/
kPGYFeedbackActiveTypeThreeFingersPan = 1,
};
@interface PgyManager : NSObject
/**
* 是否显示蒲公英SDK的Debug Log，如果遇到SDK无法正常工作的情况可以开启此标志以确认原因，默认为关闭。
*/
@property (nonatomic, assign, getter = isDebugLogEnabled) BOOL enableDebugLog;
/**
* 激活用户反馈的方式，如果不设置的话，则默认为摇一摇激活用户反馈界面。
* 设置激活用户反馈方式需在调用 - (void)startManagerWithAppId:(NSString *)appId 之前。
*/
@property (nonatomic, assign) KPGYFeedbackActiveType feedbackActiveType;
/**
* 开启或关闭用户手势反馈功能，默认为开启。
*/
@property (nonatomic, assign, getter=isFeedbackEnabled) BOOL enableFeedback;
/**
* 设置用户反馈界面的颜色，颜色会影响到Title以及工具栏的背景颜色和录音按钮的边框颜色，默认为黑色。
*/
@property (nonatomic, retain) UIColor *themeColor;
/**
* 激活用户反馈界面的阈值，数字越小灵敏度越高，默认为2.3。
*/
@property (nonatomic, assign) double shakingThreshold;
/**
* 初始化蒲公英SDK
*
* @return PgyManger的单例对象
*/
+ (PgyManager *)sharedPgyManager;
/**
* 启动蒲公英SDK
* 如果需要自定义用户反馈激活模式，则需要在调用此方法之前设置。
* @param appId 应用程序ID，从蒲公英网站上获取。
*/
- (void)startManagerWithAppId:(NSString *)appId;
/**
* 显示用户反馈界面
*/
- (void)showFeedbackView;
/**
* 上报Exception，Exception的name，reason，callStackSymbols会被上报至蒲公英服务器。
*
* @param exception 异常
*/
- (void)reportException:(NSException *)exception;
@end
Pods/Pods.xcodeproj/project.pbxproj
View file @ ac511240
This source diff could not be displayed because it is too large. You can view the blob instead.
Pods/Target Support Files/AFNetworking/AFNetworking.xcconfig
View file @ ac511240
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Private/AFNetworking" "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/AFNetworking" "${PODS_ROOT}/Headers/Public/Bugly" "${PODS_ROOT}/Headers/Public/DZNEmptyDataSet" "${PODS_ROOT}/Headers/Public/FDFullscreenPopGesture" "${PODS_ROOT}/Headers/Public/IQKeyboardManager" "${PODS_ROOT}/Headers/Public/JSONModel" "${PODS_ROOT}/Headers/Public/MBProgressHUD" "${PODS_ROOT}/Headers/Public/MJRefresh" "${PODS_ROOT}/Headers/Public/MMDrawerController" "${PODS_ROOT}/Headers/Public/Masonry" "${PODS_ROOT}/Headers/Public/SDWebImage" "${PODS_ROOT}/Headers/Public/UMengAnalytics" "${PODS_ROOT}/Headers/Public/UMengSocial" "${PODS_ROOT}/Headers/Public/WYPopoverController" HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Private/AFNetworking" "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/AFNetworking" "${PODS_ROOT}/Headers/Public/Bugly" "${PODS_ROOT}/Headers/Public/DZNEmptyDataSet" "${PODS_ROOT}/Headers/Public/FDFullscreenPopGesture" "${PODS_ROOT}/Headers/Public/IQKeyboardManager" "${PODS_ROOT}/Headers/Public/JSONModel" "${PODS_ROOT}/Headers/Public/MBProgressHUD" "${PODS_ROOT}/Headers/Public/MJRefresh" "${PODS_ROOT}/Headers/Public/MMDrawerController" "${PODS_ROOT}/Headers/Public/Masonry" "${PODS_ROOT}/Headers/Public/PgyUpdate" "${PODS_ROOT}/Headers/Public/Pgyer" "${PODS_ROOT}/Headers/Public/SDWebImage" "${PODS_ROOT}/Headers/Public/UMengAnalytics" "${PODS_ROOT}/Headers/Public/UMengSocial" "${PODS_ROOT}/Headers/Public/WYPopoverController"
OTHER_LDFLAGS = -framework "CoreGraphics" -framework "MobileCoreServices" -framework "Security" -framework "SystemConfiguration" OTHER_LDFLAGS = -framework "CoreGraphics" -framework "MobileCoreServices" -framework "Security" -framework "SystemConfiguration"
PODS_ROOT = ${SRCROOT} PODS_ROOT = ${SRCROOT}
SKIP_INSTALL = YES SKIP_INSTALL = YES
\ No newline at end of file
Pods/Target Support Files/DZNEmptyDataSet/DZNEmptyDataSet.xcconfig
View file @ ac511240
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Private/DZNEmptyDataSet" "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/AFNetworking" "${PODS_ROOT}/Headers/Public/Bugly" "${PODS_ROOT}/Headers/Public/DZNEmptyDataSet" "${PODS_ROOT}/Headers/Public/FDFullscreenPopGesture" "${PODS_ROOT}/Headers/Public/IQKeyboardManager" "${PODS_ROOT}/Headers/Public/JSONModel" "${PODS_ROOT}/Headers/Public/MBProgressHUD" "${PODS_ROOT}/Headers/Public/MJRefresh" "${PODS_ROOT}/Headers/Public/MMDrawerController" "${PODS_ROOT}/Headers/Public/Masonry" "${PODS_ROOT}/Headers/Public/SDWebImage" "${PODS_ROOT}/Headers/Public/UMengAnalytics" "${PODS_ROOT}/Headers/Public/UMengSocial" "${PODS_ROOT}/Headers/Public/WYPopoverController" HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Private/DZNEmptyDataSet" "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/AFNetworking" "${PODS_ROOT}/Headers/Public/Bugly" "${PODS_ROOT}/Headers/Public/DZNEmptyDataSet" "${PODS_ROOT}/Headers/Public/FDFullscreenPopGesture" "${PODS_ROOT}/Headers/Public/IQKeyboardManager" "${PODS_ROOT}/Headers/Public/JSONModel" "${PODS_ROOT}/Headers/Public/MBProgressHUD" "${PODS_ROOT}/Headers/Public/MJRefresh" "${PODS_ROOT}/Headers/Public/MMDrawerController" "${PODS_ROOT}/Headers/Public/Masonry" "${PODS_ROOT}/Headers/Public/PgyUpdate" "${PODS_ROOT}/Headers/Public/Pgyer" "${PODS_ROOT}/Headers/Public/SDWebImage" "${PODS_ROOT}/Headers/Public/UMengAnalytics" "${PODS_ROOT}/Headers/Public/UMengSocial" "${PODS_ROOT}/Headers/Public/WYPopoverController"
OTHER_LDFLAGS = -framework "UIKit" OTHER_LDFLAGS = -framework "UIKit"
PODS_ROOT = ${SRCROOT} PODS_ROOT = ${SRCROOT}
SKIP_INSTALL = YES SKIP_INSTALL = YES
\ No newline at end of file
Pods/Target Support Files/FDFullscreenPopGesture/FDFullscreenPopGesture.xcconfig
View file @ ac511240
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Private/FDFullscreenPopGesture" "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/AFNetworking" "${PODS_ROOT}/Headers/Public/Bugly" "${PODS_ROOT}/Headers/Public/DZNEmptyDataSet" "${PODS_ROOT}/Headers/Public/FDFullscreenPopGesture" "${PODS_ROOT}/Headers/Public/IQKeyboardManager" "${PODS_ROOT}/Headers/Public/JSONModel" "${PODS_ROOT}/Headers/Public/MBProgressHUD" "${PODS_ROOT}/Headers/Public/MJRefresh" "${PODS_ROOT}/Headers/Public/MMDrawerController" "${PODS_ROOT}/Headers/Public/Masonry" "${PODS_ROOT}/Headers/Public/SDWebImage" "${PODS_ROOT}/Headers/Public/UMengAnalytics" "${PODS_ROOT}/Headers/Public/UMengSocial" "${PODS_ROOT}/Headers/Public/WYPopoverController" HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Private/FDFullscreenPopGesture" "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/AFNetworking" "${PODS_ROOT}/Headers/Public/Bugly" "${PODS_ROOT}/Headers/Public/DZNEmptyDataSet" "${PODS_ROOT}/Headers/Public/FDFullscreenPopGesture" "${PODS_ROOT}/Headers/Public/IQKeyboardManager" "${PODS_ROOT}/Headers/Public/JSONModel" "${PODS_ROOT}/Headers/Public/MBProgressHUD" "${PODS_ROOT}/Headers/Public/MJRefresh" "${PODS_ROOT}/Headers/Public/MMDrawerController" "${PODS_ROOT}/Headers/Public/Masonry" "${PODS_ROOT}/Headers/Public/PgyUpdate" "${PODS_ROOT}/Headers/Public/Pgyer" "${PODS_ROOT}/Headers/Public/SDWebImage" "${PODS_ROOT}/Headers/Public/UMengAnalytics" "${PODS_ROOT}/Headers/Public/UMengSocial" "${PODS_ROOT}/Headers/Public/WYPopoverController"
PODS_ROOT = ${SRCROOT} PODS_ROOT = ${SRCROOT}
SKIP_INSTALL = YES SKIP_INSTALL = YES
\ No newline at end of file
Pods/Target Support Files/IQKeyboardManager/IQKeyboardManager.xcconfig
View file @ ac511240
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Private/IQKeyboardManager" "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/AFNetworking" "${PODS_ROOT}/Headers/Public/Bugly" "${PODS_ROOT}/Headers/Public/DZNEmptyDataSet" "${PODS_ROOT}/Headers/Public/FDFullscreenPopGesture" "${PODS_ROOT}/Headers/Public/IQKeyboardManager" "${PODS_ROOT}/Headers/Public/JSONModel" "${PODS_ROOT}/Headers/Public/MBProgressHUD" "${PODS_ROOT}/Headers/Public/MJRefresh" "${PODS_ROOT}/Headers/Public/MMDrawerController" "${PODS_ROOT}/Headers/Public/Masonry" "${PODS_ROOT}/Headers/Public/SDWebImage" "${PODS_ROOT}/Headers/Public/UMengAnalytics" "${PODS_ROOT}/Headers/Public/UMengSocial" "${PODS_ROOT}/Headers/Public/WYPopoverController" HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Private/IQKeyboardManager" "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/AFNetworking" "${PODS_ROOT}/Headers/Public/Bugly" "${PODS_ROOT}/Headers/Public/DZNEmptyDataSet" "${PODS_ROOT}/Headers/Public/FDFullscreenPopGesture" "${PODS_ROOT}/Headers/Public/IQKeyboardManager" "${PODS_ROOT}/Headers/Public/JSONModel" "${PODS_ROOT}/Headers/Public/MBProgressHUD" "${PODS_ROOT}/Headers/Public/MJRefresh" "${PODS_ROOT}/Headers/Public/MMDrawerController" "${PODS_ROOT}/Headers/Public/Masonry" "${PODS_ROOT}/Headers/Public/PgyUpdate" "${PODS_ROOT}/Headers/Public/Pgyer" "${PODS_ROOT}/Headers/Public/SDWebImage" "${PODS_ROOT}/Headers/Public/UMengAnalytics" "${PODS_ROOT}/Headers/Public/UMengSocial" "${PODS_ROOT}/Headers/Public/WYPopoverController"
OTHER_LDFLAGS = -framework "CoreGraphics" -framework "Foundation" -framework "UIKit" OTHER_LDFLAGS = -framework "CoreGraphics" -framework "Foundation" -framework "UIKit"
PODS_ROOT = ${SRCROOT} PODS_ROOT = ${SRCROOT}
SKIP_INSTALL = YES SKIP_INSTALL = YES
\ No newline at end of file
Pods/Target Support Files/JSONModel/JSONModel.xcconfig
View file @ ac511240
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Private/JSONModel" "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/AFNetworking" "${PODS_ROOT}/Headers/Public/Bugly" "${PODS_ROOT}/Headers/Public/DZNEmptyDataSet" "${PODS_ROOT}/Headers/Public/FDFullscreenPopGesture" "${PODS_ROOT}/Headers/Public/IQKeyboardManager" "${PODS_ROOT}/Headers/Public/JSONModel" "${PODS_ROOT}/Headers/Public/MBProgressHUD" "${PODS_ROOT}/Headers/Public/MJRefresh" "${PODS_ROOT}/Headers/Public/MMDrawerController" "${PODS_ROOT}/Headers/Public/Masonry" "${PODS_ROOT}/Headers/Public/SDWebImage" "${PODS_ROOT}/Headers/Public/UMengAnalytics" "${PODS_ROOT}/Headers/Public/UMengSocial" "${PODS_ROOT}/Headers/Public/WYPopoverController" HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Private/JSONModel" "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/AFNetworking" "${PODS_ROOT}/Headers/Public/Bugly" "${PODS_ROOT}/Headers/Public/DZNEmptyDataSet" "${PODS_ROOT}/Headers/Public/FDFullscreenPopGesture" "${PODS_ROOT}/Headers/Public/IQKeyboardManager" "${PODS_ROOT}/Headers/Public/JSONModel" "${PODS_ROOT}/Headers/Public/MBProgressHUD" "${PODS_ROOT}/Headers/Public/MJRefresh" "${PODS_ROOT}/Headers/Public/MMDrawerController" "${PODS_ROOT}/Headers/Public/Masonry" "${PODS_ROOT}/Headers/Public/PgyUpdate" "${PODS_ROOT}/Headers/Public/Pgyer" "${PODS_ROOT}/Headers/Public/SDWebImage" "${PODS_ROOT}/Headers/Public/UMengAnalytics" "${PODS_ROOT}/Headers/Public/UMengSocial" "${PODS_ROOT}/Headers/Public/WYPopoverController"
PODS_ROOT = ${SRCROOT} PODS_ROOT = ${SRCROOT}
SKIP_INSTALL = YES SKIP_INSTALL = YES
\ No newline at end of file
Pods/Target Support Files/MBProgressHUD/MBProgressHUD.xcconfig
View file @ ac511240
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Private/MBProgressHUD" "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/AFNetworking" "${PODS_ROOT}/Headers/Public/Bugly" "${PODS_ROOT}/Headers/Public/DZNEmptyDataSet" "${PODS_ROOT}/Headers/Public/FDFullscreenPopGesture" "${PODS_ROOT}/Headers/Public/IQKeyboardManager" "${PODS_ROOT}/Headers/Public/JSONModel" "${PODS_ROOT}/Headers/Public/MBProgressHUD" "${PODS_ROOT}/Headers/Public/MJRefresh" "${PODS_ROOT}/Headers/Public/MMDrawerController" "${PODS_ROOT}/Headers/Public/Masonry" "${PODS_ROOT}/Headers/Public/SDWebImage" "${PODS_ROOT}/Headers/Public/UMengAnalytics" "${PODS_ROOT}/Headers/Public/UMengSocial" "${PODS_ROOT}/Headers/Public/WYPopoverController" HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Private/MBProgressHUD" "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/AFNetworking" "${PODS_ROOT}/Headers/Public/Bugly" "${PODS_ROOT}/Headers/Public/DZNEmptyDataSet" "${PODS_ROOT}/Headers/Public/FDFullscreenPopGesture" "${PODS_ROOT}/Headers/Public/IQKeyboardManager" "${PODS_ROOT}/Headers/Public/JSONModel" "${PODS_ROOT}/Headers/Public/MBProgressHUD" "${PODS_ROOT}/Headers/Public/MJRefresh" "${PODS_ROOT}/Headers/Public/MMDrawerController" "${PODS_ROOT}/Headers/Public/Masonry" "${PODS_ROOT}/Headers/Public/PgyUpdate" "${PODS_ROOT}/Headers/Public/Pgyer" "${PODS_ROOT}/Headers/Public/SDWebImage" "${PODS_ROOT}/Headers/Public/UMengAnalytics" "${PODS_ROOT}/Headers/Public/UMengSocial" "${PODS_ROOT}/Headers/Public/WYPopoverController"
OTHER_LDFLAGS = -framework "CoreGraphics" OTHER_LDFLAGS = -framework "CoreGraphics"
PODS_ROOT = ${SRCROOT} PODS_ROOT = ${SRCROOT}
SKIP_INSTALL = YES SKIP_INSTALL = YES
\ No newline at end of file
Pods/Target Support Files/MJRefresh/MJRefresh.xcconfig
View file @ ac511240
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Private/MJRefresh" "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/AFNetworking" "${PODS_ROOT}/Headers/Public/Bugly" "${PODS_ROOT}/Headers/Public/DZNEmptyDataSet" "${PODS_ROOT}/Headers/Public/FDFullscreenPopGesture" "${PODS_ROOT}/Headers/Public/IQKeyboardManager" "${PODS_ROOT}/Headers/Public/JSONModel" "${PODS_ROOT}/Headers/Public/MBProgressHUD" "${PODS_ROOT}/Headers/Public/MJRefresh" "${PODS_ROOT}/Headers/Public/MMDrawerController" "${PODS_ROOT}/Headers/Public/Masonry" "${PODS_ROOT}/Headers/Public/SDWebImage" "${PODS_ROOT}/Headers/Public/UMengAnalytics" "${PODS_ROOT}/Headers/Public/UMengSocial" "${PODS_ROOT}/Headers/Public/WYPopoverController" HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Private/MJRefresh" "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/AFNetworking" "${PODS_ROOT}/Headers/Public/Bugly" "${PODS_ROOT}/Headers/Public/DZNEmptyDataSet" "${PODS_ROOT}/Headers/Public/FDFullscreenPopGesture" "${PODS_ROOT}/Headers/Public/IQKeyboardManager" "${PODS_ROOT}/Headers/Public/JSONModel" "${PODS_ROOT}/Headers/Public/MBProgressHUD" "${PODS_ROOT}/Headers/Public/MJRefresh" "${PODS_ROOT}/Headers/Public/MMDrawerController" "${PODS_ROOT}/Headers/Public/Masonry" "${PODS_ROOT}/Headers/Public/PgyUpdate" "${PODS_ROOT}/Headers/Public/Pgyer" "${PODS_ROOT}/Headers/Public/SDWebImage" "${PODS_ROOT}/Headers/Public/UMengAnalytics" "${PODS_ROOT}/Headers/Public/UMengSocial" "${PODS_ROOT}/Headers/Public/WYPopoverController"
PODS_ROOT = ${SRCROOT} PODS_ROOT = ${SRCROOT}
SKIP_INSTALL = YES SKIP_INSTALL = YES
\ No newline at end of file
Pods/Target Support Files/MMDrawerController/MMDrawerController.xcconfig
View file @ ac511240
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Private/MMDrawerController" "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/AFNetworking" "${PODS_ROOT}/Headers/Public/Bugly" "${PODS_ROOT}/Headers/Public/DZNEmptyDataSet" "${PODS_ROOT}/Headers/Public/FDFullscreenPopGesture" "${PODS_ROOT}/Headers/Public/IQKeyboardManager" "${PODS_ROOT}/Headers/Public/JSONModel" "${PODS_ROOT}/Headers/Public/MBProgressHUD" "${PODS_ROOT}/Headers/Public/MJRefresh" "${PODS_ROOT}/Headers/Public/MMDrawerController" "${PODS_ROOT}/Headers/Public/Masonry" "${PODS_ROOT}/Headers/Public/SDWebImage" "${PODS_ROOT}/Headers/Public/UMengAnalytics" "${PODS_ROOT}/Headers/Public/UMengSocial" "${PODS_ROOT}/Headers/Public/WYPopoverController" HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Private/MMDrawerController" "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/AFNetworking" "${PODS_ROOT}/Headers/Public/Bugly" "${PODS_ROOT}/Headers/Public/DZNEmptyDataSet" "${PODS_ROOT}/Headers/Public/FDFullscreenPopGesture" "${PODS_ROOT}/Headers/Public/IQKeyboardManager" "${PODS_ROOT}/Headers/Public/JSONModel" "${PODS_ROOT}/Headers/Public/MBProgressHUD" "${PODS_ROOT}/Headers/Public/MJRefresh" "${PODS_ROOT}/Headers/Public/MMDrawerController" "${PODS_ROOT}/Headers/Public/Masonry" "${PODS_ROOT}/Headers/Public/PgyUpdate" "${PODS_ROOT}/Headers/Public/Pgyer" "${PODS_ROOT}/Headers/Public/SDWebImage" "${PODS_ROOT}/Headers/Public/UMengAnalytics" "${PODS_ROOT}/Headers/Public/UMengSocial" "${PODS_ROOT}/Headers/Public/WYPopoverController"
OTHER_LDFLAGS = -framework "QuartzCore" OTHER_LDFLAGS = -framework "QuartzCore"
PODS_ROOT = ${SRCROOT} PODS_ROOT = ${SRCROOT}
SKIP_INSTALL = YES SKIP_INSTALL = YES
\ No newline at end of file
Pods/Target Support Files/Masonry/Masonry.xcconfig
View file @ ac511240
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Private/Masonry" "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/AFNetworking" "${PODS_ROOT}/Headers/Public/Bugly" "${PODS_ROOT}/Headers/Public/DZNEmptyDataSet" "${PODS_ROOT}/Headers/Public/FDFullscreenPopGesture" "${PODS_ROOT}/Headers/Public/IQKeyboardManager" "${PODS_ROOT}/Headers/Public/JSONModel" "${PODS_ROOT}/Headers/Public/MBProgressHUD" "${PODS_ROOT}/Headers/Public/MJRefresh" "${PODS_ROOT}/Headers/Public/MMDrawerController" "${PODS_ROOT}/Headers/Public/Masonry" "${PODS_ROOT}/Headers/Public/SDWebImage" "${PODS_ROOT}/Headers/Public/UMengAnalytics" "${PODS_ROOT}/Headers/Public/UMengSocial" "${PODS_ROOT}/Headers/Public/WYPopoverController" HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Private/Masonry" "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/AFNetworking" "${PODS_ROOT}/Headers/Public/Bugly" "${PODS_ROOT}/Headers/Public/DZNEmptyDataSet" "${PODS_ROOT}/Headers/Public/FDFullscreenPopGesture" "${PODS_ROOT}/Headers/Public/IQKeyboardManager" "${PODS_ROOT}/Headers/Public/JSONModel" "${PODS_ROOT}/Headers/Public/MBProgressHUD" "${PODS_ROOT}/Headers/Public/MJRefresh" "${PODS_ROOT}/Headers/Public/MMDrawerController" "${PODS_ROOT}/Headers/Public/Masonry" "${PODS_ROOT}/Headers/Public/PgyUpdate" "${PODS_ROOT}/Headers/Public/Pgyer" "${PODS_ROOT}/Headers/Public/SDWebImage" "${PODS_ROOT}/Headers/Public/UMengAnalytics" "${PODS_ROOT}/Headers/Public/UMengSocial" "${PODS_ROOT}/Headers/Public/WYPopoverController"
OTHER_LDFLAGS = -framework "Foundation" -framework "UIKit" OTHER_LDFLAGS = -framework "Foundation" -framework "UIKit"
PODS_ROOT = ${SRCROOT} PODS_ROOT = ${SRCROOT}
SKIP_INSTALL = YES SKIP_INSTALL = YES
\ No newline at end of file
Pods/Target Support Files/Pods/Pods-acknowledgements.markdown
View file @ ac511240
...@@ -213,6 +213,16 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, ...@@ -213,6 +213,16 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. THE SOFTWARE.
## PgyUpdate
Copyright 2015 pgyer.com. All rights reserved.
## Pgyer
Copyright 2015 pgyer.com. All rights reserved.
## SDWebImage ## SDWebImage
Copyright (c) 2016 Olivier Poitrey rs@dailymotion.com Copyright (c) 2016 Olivier Poitrey rs@dailymotion.com
......
Pods/Target Support Files/Pods/Pods-acknowledgements.plist
View file @ ac511240
...@@ -264,6 +264,24 @@ THE SOFTWARE.</string> ...@@ -264,6 +264,24 @@ THE SOFTWARE.</string>
<key>Type</key> <key>Type</key>
<string>PSGroupSpecifier</string> <string>PSGroupSpecifier</string>
</dict> </dict>
<dict>
<key>FooterText</key>
<string>Copyright 2015 pgyer.com. All rights reserved.
</string>
<key>Title</key>
<string>PgyUpdate</string>
<key>Type</key>
<string>PSGroupSpecifier</string>
</dict>
<dict>
<key>FooterText</key>
<string>Copyright 2015 pgyer.com. All rights reserved.
</string>
<key>Title</key>
<string>Pgyer</string>
<key>Type</key>
<string>PSGroupSpecifier</string>
</dict>
<dict> <dict>
<key>FooterText</key> <key>FooterText</key>
<string>Copyright (c) 2016 Olivier Poitrey rs@dailymotion.com <string>Copyright (c) 2016 Olivier Poitrey rs@dailymotion.com
......
Pods/Target Support Files/Pods/Pods.debug.xcconfig
View file @ ac511240
FRAMEWORK_SEARCH_PATHS = $(inherited) $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/TencentOpenAPI/ $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/Facebook/ $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/Twitter/ "${PODS_ROOT}/Bugly" "${PODS_ROOT}/UMengAnalytics/umsdk_IOS_analyics_idfa_v4.1.2" FRAMEWORK_SEARCH_PATHS = $(inherited) $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/TencentOpenAPI/ $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/Facebook/ $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/Twitter/ "${PODS_ROOT}/Bugly" "${PODS_ROOT}/PgyUpdate/PgySDK/sdk" "${PODS_ROOT}/Pgyer/PgySDK/sdk" "${PODS_ROOT}/UMengAnalytics/umsdk_IOS_analyics_idfa_v4.1.2"
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/AFNetworking" "${PODS_ROOT}/Headers/Public/Bugly" "${PODS_ROOT}/Headers/Public/DZNEmptyDataSet" "${PODS_ROOT}/Headers/Public/FDFullscreenPopGesture" "${PODS_ROOT}/Headers/Public/IQKeyboardManager" "${PODS_ROOT}/Headers/Public/JSONModel" "${PODS_ROOT}/Headers/Public/MBProgressHUD" "${PODS_ROOT}/Headers/Public/MJRefresh" "${PODS_ROOT}/Headers/Public/MMDrawerController" "${PODS_ROOT}/Headers/Public/Masonry" "${PODS_ROOT}/Headers/Public/SDWebImage" "${PODS_ROOT}/Headers/Public/UMengAnalytics" "${PODS_ROOT}/Headers/Public/UMengSocial" "${PODS_ROOT}/Headers/Public/WYPopoverController" HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/AFNetworking" "${PODS_ROOT}/Headers/Public/Bugly" "${PODS_ROOT}/Headers/Public/DZNEmptyDataSet" "${PODS_ROOT}/Headers/Public/FDFullscreenPopGesture" "${PODS_ROOT}/Headers/Public/IQKeyboardManager" "${PODS_ROOT}/Headers/Public/JSONModel" "${PODS_ROOT}/Headers/Public/MBProgressHUD" "${PODS_ROOT}/Headers/Public/MJRefresh" "${PODS_ROOT}/Headers/Public/MMDrawerController" "${PODS_ROOT}/Headers/Public/Masonry" "${PODS_ROOT}/Headers/Public/PgyUpdate" "${PODS_ROOT}/Headers/Public/Pgyer" "${PODS_ROOT}/Headers/Public/SDWebImage" "${PODS_ROOT}/Headers/Public/UMengAnalytics" "${PODS_ROOT}/Headers/Public/UMengSocial" "${PODS_ROOT}/Headers/Public/WYPopoverController"
LIBRARY_SEARCH_PATHS = "$(PODS_ROOT)/UMengAnalytics/**" $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_5.0/** $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/TencentOpenAPI/ $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/Wechat/** $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/AlipayShare/** $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/SinaSSO/** $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/Line/** $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/Whatsapp/** $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/Instagram/** $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/Tumblr/** $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/LaiWang/** $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/Twitter/** $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/Facebook/** LIBRARY_SEARCH_PATHS = "$(PODS_ROOT)/UMengAnalytics/**" $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_5.0/** $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/TencentOpenAPI/ $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/Wechat/** $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/AlipayShare/** $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/SinaSSO/** $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/Line/** $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/Whatsapp/** $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/Instagram/** $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/Tumblr/** $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/LaiWang/** $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/Twitter/** $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/Facebook/**
OTHER_CFLAGS = $(inherited) -isystem "${PODS_ROOT}/Headers/Public" -isystem "${PODS_ROOT}/Headers/Public/AFNetworking" -isystem "${PODS_ROOT}/Headers/Public/Bugly" -isystem "${PODS_ROOT}/Headers/Public/DZNEmptyDataSet" -isystem "${PODS_ROOT}/Headers/Public/FDFullscreenPopGesture" -isystem "${PODS_ROOT}/Headers/Public/IQKeyboardManager" -isystem "${PODS_ROOT}/Headers/Public/JSONModel" -isystem "${PODS_ROOT}/Headers/Public/MBProgressHUD" -isystem "${PODS_ROOT}/Headers/Public/MJRefresh" -isystem "${PODS_ROOT}/Headers/Public/MMDrawerController" -isystem "${PODS_ROOT}/Headers/Public/Masonry" -isystem "${PODS_ROOT}/Headers/Public/SDWebImage" -isystem "${PODS_ROOT}/Headers/Public/UMengAnalytics" -isystem "${PODS_ROOT}/Headers/Public/UMengSocial" -isystem "${PODS_ROOT}/Headers/Public/WYPopoverController" OTHER_CFLAGS = $(inherited) -isystem "${PODS_ROOT}/Headers/Public" -isystem "${PODS_ROOT}/Headers/Public/AFNetworking" -isystem "${PODS_ROOT}/Headers/Public/Bugly" -isystem "${PODS_ROOT}/Headers/Public/DZNEmptyDataSet" -isystem "${PODS_ROOT}/Headers/Public/FDFullscreenPopGesture" -isystem "${PODS_ROOT}/Headers/Public/IQKeyboardManager" -isystem "${PODS_ROOT}/Headers/Public/JSONModel" -isystem "${PODS_ROOT}/Headers/Public/MBProgressHUD" -isystem "${PODS_ROOT}/Headers/Public/MJRefresh" -isystem "${PODS_ROOT}/Headers/Public/MMDrawerController" -isystem "${PODS_ROOT}/Headers/Public/Masonry" -isystem "${PODS_ROOT}/Headers/Public/PgyUpdate" -isystem "${PODS_ROOT}/Headers/Public/Pgyer" -isystem "${PODS_ROOT}/Headers/Public/SDWebImage" -isystem "${PODS_ROOT}/Headers/Public/UMengAnalytics" -isystem "${PODS_ROOT}/Headers/Public/UMengSocial" -isystem "${PODS_ROOT}/Headers/Public/WYPopoverController"
OTHER_LDFLAGS = $(inherited) -ObjC -l"AFNetworking" -l"APOpenSdk" -l"DZNEmptyDataSet" -l"FDFullscreenPopGesture" -l"IQKeyboardManager" -l"JSONModel" -l"LWApiSDK" -l"MBProgressHUD" -l"MJRefresh" -l"MMDrawerController" -l"Masonry" -l"SDWebImage" -l"SocialAlipayShare" -l"SocialFacebook" -l"SocialInstagram" -l"SocialLaiWang" -l"SocialLine" -l"SocialQQ" -l"SocialSinaSSO" -l"SocialTumblr" -l"SocialTwitter" -l"SocialWechat" -l"SocialWhatsapp" -l"UMSocial_Sdk_5.0" -l"UMSocial_Sdk_Comment_5.0" -l"WYPopoverController" -l"WeChatSDK" -l"WeiboSDK" -l"c++" -l"iconv" -l"sqlite3" -l"stdc++" -l"z" -framework "Accounts" -framework "Bugly" -framework "CoreData" -framework "CoreGraphics" -framework "CoreTelephony" -framework "FBSDKCoreKit" -framework "FBSDKLoginKit" -framework "FBSDKShareKit" -framework "Fabric" -framework "Foundation" -framework "ImageIO" -framework "MobileCoreServices" -framework "QuartzCore" -framework "Security" -framework "Social" -framework "SystemConfiguration" -framework "TencentOpenAPI" -framework "TwitterCore" -framework "TwitterKit" -framework "UIKit" -framework "UMMobClick" OTHER_LDFLAGS = $(inherited) -ObjC -l"AFNetworking" -l"APOpenSdk" -l"DZNEmptyDataSet" -l"FDFullscreenPopGesture" -l"IQKeyboardManager" -l"JSONModel" -l"LWApiSDK" -l"MBProgressHUD" -l"MJRefresh" -l"MMDrawerController" -l"Masonry" -l"SDWebImage" -l"SocialAlipayShare" -l"SocialFacebook" -l"SocialInstagram" -l"SocialLaiWang" -l"SocialLine" -l"SocialQQ" -l"SocialSinaSSO" -l"SocialTumblr" -l"SocialTwitter" -l"SocialWechat" -l"SocialWhatsapp" -l"UMSocial_Sdk_5.0" -l"UMSocial_Sdk_Comment_5.0" -l"WYPopoverController" -l"WeChatSDK" -l"WeiboSDK" -l"c++" -l"iconv" -l"sqlite3" -l"stdc++" -l"z" -framework "Accounts" -framework "AudioToolbox" -framework "AvFoundation" -framework "Bugly" -framework "CoreData" -framework "CoreGraphics" -framework "CoreMotion" -framework "CoreTelephony" -framework "FBSDKCoreKit" -framework "FBSDKLoginKit" -framework "FBSDKShareKit" -framework "Fabric" -framework "Foundation" -framework "ImageIO" -framework "MobileCoreServices" -framework "OpenGLES" -framework "PgySDK" -framework "PgyUpdate" -framework "QuartzCore" -framework "Security" -framework "Social" -framework "SystemConfiguration" -framework "TencentOpenAPI" -framework "TwitterCore" -framework "TwitterKit" -framework "UIKit" -framework "UMMobClick"
PODS_ROOT = ${SRCROOT}/Pods PODS_ROOT = ${SRCROOT}/Pods
\ No newline at end of file
Pods/Target Support Files/Pods/Pods.release.xcconfig
View file @ ac511240
FRAMEWORK_SEARCH_PATHS = $(inherited) $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/TencentOpenAPI/ $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/Facebook/ $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/Twitter/ "${PODS_ROOT}/Bugly" "${PODS_ROOT}/UMengAnalytics/umsdk_IOS_analyics_idfa_v4.1.2" FRAMEWORK_SEARCH_PATHS = $(inherited) $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/TencentOpenAPI/ $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/Facebook/ $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/Twitter/ "${PODS_ROOT}/Bugly" "${PODS_ROOT}/PgyUpdate/PgySDK/sdk" "${PODS_ROOT}/Pgyer/PgySDK/sdk" "${PODS_ROOT}/UMengAnalytics/umsdk_IOS_analyics_idfa_v4.1.2"
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/AFNetworking" "${PODS_ROOT}/Headers/Public/Bugly" "${PODS_ROOT}/Headers/Public/DZNEmptyDataSet" "${PODS_ROOT}/Headers/Public/FDFullscreenPopGesture" "${PODS_ROOT}/Headers/Public/IQKeyboardManager" "${PODS_ROOT}/Headers/Public/JSONModel" "${PODS_ROOT}/Headers/Public/MBProgressHUD" "${PODS_ROOT}/Headers/Public/MJRefresh" "${PODS_ROOT}/Headers/Public/MMDrawerController" "${PODS_ROOT}/Headers/Public/Masonry" "${PODS_ROOT}/Headers/Public/SDWebImage" "${PODS_ROOT}/Headers/Public/UMengAnalytics" "${PODS_ROOT}/Headers/Public/UMengSocial" "${PODS_ROOT}/Headers/Public/WYPopoverController" HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/AFNetworking" "${PODS_ROOT}/Headers/Public/Bugly" "${PODS_ROOT}/Headers/Public/DZNEmptyDataSet" "${PODS_ROOT}/Headers/Public/FDFullscreenPopGesture" "${PODS_ROOT}/Headers/Public/IQKeyboardManager" "${PODS_ROOT}/Headers/Public/JSONModel" "${PODS_ROOT}/Headers/Public/MBProgressHUD" "${PODS_ROOT}/Headers/Public/MJRefresh" "${PODS_ROOT}/Headers/Public/MMDrawerController" "${PODS_ROOT}/Headers/Public/Masonry" "${PODS_ROOT}/Headers/Public/PgyUpdate" "${PODS_ROOT}/Headers/Public/Pgyer" "${PODS_ROOT}/Headers/Public/SDWebImage" "${PODS_ROOT}/Headers/Public/UMengAnalytics" "${PODS_ROOT}/Headers/Public/UMengSocial" "${PODS_ROOT}/Headers/Public/WYPopoverController"
LIBRARY_SEARCH_PATHS = "$(PODS_ROOT)/UMengAnalytics/**" $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_5.0/** $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/TencentOpenAPI/ $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/Wechat/** $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/AlipayShare/** $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/SinaSSO/** $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/Line/** $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/Whatsapp/** $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/Instagram/** $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/Tumblr/** $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/LaiWang/** $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/Twitter/** $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/Facebook/** LIBRARY_SEARCH_PATHS = "$(PODS_ROOT)/UMengAnalytics/**" $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_5.0/** $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/TencentOpenAPI/ $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/Wechat/** $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/AlipayShare/** $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/SinaSSO/** $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/Line/** $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/Whatsapp/** $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/Instagram/** $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/Tumblr/** $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/LaiWang/** $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/Twitter/** $(PODS_ROOT)/UmengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/Facebook/**
OTHER_CFLAGS = $(inherited) -isystem "${PODS_ROOT}/Headers/Public" -isystem "${PODS_ROOT}/Headers/Public/AFNetworking" -isystem "${PODS_ROOT}/Headers/Public/Bugly" -isystem "${PODS_ROOT}/Headers/Public/DZNEmptyDataSet" -isystem "${PODS_ROOT}/Headers/Public/FDFullscreenPopGesture" -isystem "${PODS_ROOT}/Headers/Public/IQKeyboardManager" -isystem "${PODS_ROOT}/Headers/Public/JSONModel" -isystem "${PODS_ROOT}/Headers/Public/MBProgressHUD" -isystem "${PODS_ROOT}/Headers/Public/MJRefresh" -isystem "${PODS_ROOT}/Headers/Public/MMDrawerController" -isystem "${PODS_ROOT}/Headers/Public/Masonry" -isystem "${PODS_ROOT}/Headers/Public/SDWebImage" -isystem "${PODS_ROOT}/Headers/Public/UMengAnalytics" -isystem "${PODS_ROOT}/Headers/Public/UMengSocial" -isystem "${PODS_ROOT}/Headers/Public/WYPopoverController" OTHER_CFLAGS = $(inherited) -isystem "${PODS_ROOT}/Headers/Public" -isystem "${PODS_ROOT}/Headers/Public/AFNetworking" -isystem "${PODS_ROOT}/Headers/Public/Bugly" -isystem "${PODS_ROOT}/Headers/Public/DZNEmptyDataSet" -isystem "${PODS_ROOT}/Headers/Public/FDFullscreenPopGesture" -isystem "${PODS_ROOT}/Headers/Public/IQKeyboardManager" -isystem "${PODS_ROOT}/Headers/Public/JSONModel" -isystem "${PODS_ROOT}/Headers/Public/MBProgressHUD" -isystem "${PODS_ROOT}/Headers/Public/MJRefresh" -isystem "${PODS_ROOT}/Headers/Public/MMDrawerController" -isystem "${PODS_ROOT}/Headers/Public/Masonry" -isystem "${PODS_ROOT}/Headers/Public/PgyUpdate" -isystem "${PODS_ROOT}/Headers/Public/Pgyer" -isystem "${PODS_ROOT}/Headers/Public/SDWebImage" -isystem "${PODS_ROOT}/Headers/Public/UMengAnalytics" -isystem "${PODS_ROOT}/Headers/Public/UMengSocial" -isystem "${PODS_ROOT}/Headers/Public/WYPopoverController"
OTHER_LDFLAGS = $(inherited) -ObjC -l"AFNetworking" -l"APOpenSdk" -l"DZNEmptyDataSet" -l"FDFullscreenPopGesture" -l"IQKeyboardManager" -l"JSONModel" -l"LWApiSDK" -l"MBProgressHUD" -l"MJRefresh" -l"MMDrawerController" -l"Masonry" -l"SDWebImage" -l"SocialAlipayShare" -l"SocialFacebook" -l"SocialInstagram" -l"SocialLaiWang" -l"SocialLine" -l"SocialQQ" -l"SocialSinaSSO" -l"SocialTumblr" -l"SocialTwitter" -l"SocialWechat" -l"SocialWhatsapp" -l"UMSocial_Sdk_5.0" -l"UMSocial_Sdk_Comment_5.0" -l"WYPopoverController" -l"WeChatSDK" -l"WeiboSDK" -l"c++" -l"iconv" -l"sqlite3" -l"stdc++" -l"z" -framework "Accounts" -framework "Bugly" -framework "CoreData" -framework "CoreGraphics" -framework "CoreTelephony" -framework "FBSDKCoreKit" -framework "FBSDKLoginKit" -framework "FBSDKShareKit" -framework "Fabric" -framework "Foundation" -framework "ImageIO" -framework "MobileCoreServices" -framework "QuartzCore" -framework "Security" -framework "Social" -framework "SystemConfiguration" -framework "TencentOpenAPI" -framework "TwitterCore" -framework "TwitterKit" -framework "UIKit" -framework "UMMobClick" OTHER_LDFLAGS = $(inherited) -ObjC -l"AFNetworking" -l"APOpenSdk" -l"DZNEmptyDataSet" -l"FDFullscreenPopGesture" -l"IQKeyboardManager" -l"JSONModel" -l"LWApiSDK" -l"MBProgressHUD" -l"MJRefresh" -l"MMDrawerController" -l"Masonry" -l"SDWebImage" -l"SocialAlipayShare" -l"SocialFacebook" -l"SocialInstagram" -l"SocialLaiWang" -l"SocialLine" -l"SocialQQ" -l"SocialSinaSSO" -l"SocialTumblr" -l"SocialTwitter" -l"SocialWechat" -l"SocialWhatsapp" -l"UMSocial_Sdk_5.0" -l"UMSocial_Sdk_Comment_5.0" -l"WYPopoverController" -l"WeChatSDK" -l"WeiboSDK" -l"c++" -l"iconv" -l"sqlite3" -l"stdc++" -l"z" -framework "Accounts" -framework "AudioToolbox" -framework "AvFoundation" -framework "Bugly" -framework "CoreData" -framework "CoreGraphics" -framework "CoreMotion" -framework "CoreTelephony" -framework "FBSDKCoreKit" -framework "FBSDKLoginKit" -framework "FBSDKShareKit" -framework "Fabric" -framework "Foundation" -framework "ImageIO" -framework "MobileCoreServices" -framework "OpenGLES" -framework "PgySDK" -framework "PgyUpdate" -framework "QuartzCore" -framework "Security" -framework "Social" -framework "SystemConfiguration" -framework "TencentOpenAPI" -framework "TwitterCore" -framework "TwitterKit" -framework "UIKit" -framework "UMMobClick"
PODS_ROOT = ${SRCROOT}/Pods PODS_ROOT = ${SRCROOT}/Pods
\ No newline at end of file
Pods/Target Support Files/SDWebImage/SDWebImage.xcconfig
View file @ ac511240
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Private/SDWebImage" "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/AFNetworking" "${PODS_ROOT}/Headers/Public/Bugly" "${PODS_ROOT}/Headers/Public/DZNEmptyDataSet" "${PODS_ROOT}/Headers/Public/FDFullscreenPopGesture" "${PODS_ROOT}/Headers/Public/IQKeyboardManager" "${PODS_ROOT}/Headers/Public/JSONModel" "${PODS_ROOT}/Headers/Public/MBProgressHUD" "${PODS_ROOT}/Headers/Public/MJRefresh" "${PODS_ROOT}/Headers/Public/MMDrawerController" "${PODS_ROOT}/Headers/Public/Masonry" "${PODS_ROOT}/Headers/Public/SDWebImage" "${PODS_ROOT}/Headers/Public/UMengAnalytics" "${PODS_ROOT}/Headers/Public/UMengSocial" "${PODS_ROOT}/Headers/Public/WYPopoverController" HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Private/SDWebImage" "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/AFNetworking" "${PODS_ROOT}/Headers/Public/Bugly" "${PODS_ROOT}/Headers/Public/DZNEmptyDataSet" "${PODS_ROOT}/Headers/Public/FDFullscreenPopGesture" "${PODS_ROOT}/Headers/Public/IQKeyboardManager" "${PODS_ROOT}/Headers/Public/JSONModel" "${PODS_ROOT}/Headers/Public/MBProgressHUD" "${PODS_ROOT}/Headers/Public/MJRefresh" "${PODS_ROOT}/Headers/Public/MMDrawerController" "${PODS_ROOT}/Headers/Public/Masonry" "${PODS_ROOT}/Headers/Public/PgyUpdate" "${PODS_ROOT}/Headers/Public/Pgyer" "${PODS_ROOT}/Headers/Public/SDWebImage" "${PODS_ROOT}/Headers/Public/UMengAnalytics" "${PODS_ROOT}/Headers/Public/UMengSocial" "${PODS_ROOT}/Headers/Public/WYPopoverController"
OTHER_LDFLAGS = -framework "ImageIO" OTHER_LDFLAGS = -framework "ImageIO"
PODS_ROOT = ${SRCROOT} PODS_ROOT = ${SRCROOT}
SKIP_INSTALL = YES SKIP_INSTALL = YES
\ No newline at end of file
Pods/Target Support Files/WYPopoverController/WYPopoverController.xcconfig
View file @ ac511240
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Private/WYPopoverController" "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/AFNetworking" "${PODS_ROOT}/Headers/Public/Bugly" "${PODS_ROOT}/Headers/Public/DZNEmptyDataSet" "${PODS_ROOT}/Headers/Public/FDFullscreenPopGesture" "${PODS_ROOT}/Headers/Public/IQKeyboardManager" "${PODS_ROOT}/Headers/Public/JSONModel" "${PODS_ROOT}/Headers/Public/MBProgressHUD" "${PODS_ROOT}/Headers/Public/MJRefresh" "${PODS_ROOT}/Headers/Public/MMDrawerController" "${PODS_ROOT}/Headers/Public/Masonry" "${PODS_ROOT}/Headers/Public/SDWebImage" "${PODS_ROOT}/Headers/Public/UMengAnalytics" "${PODS_ROOT}/Headers/Public/UMengSocial" "${PODS_ROOT}/Headers/Public/WYPopoverController" HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Private/WYPopoverController" "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/AFNetworking" "${PODS_ROOT}/Headers/Public/Bugly" "${PODS_ROOT}/Headers/Public/DZNEmptyDataSet" "${PODS_ROOT}/Headers/Public/FDFullscreenPopGesture" "${PODS_ROOT}/Headers/Public/IQKeyboardManager" "${PODS_ROOT}/Headers/Public/JSONModel" "${PODS_ROOT}/Headers/Public/MBProgressHUD" "${PODS_ROOT}/Headers/Public/MJRefresh" "${PODS_ROOT}/Headers/Public/MMDrawerController" "${PODS_ROOT}/Headers/Public/Masonry" "${PODS_ROOT}/Headers/Public/PgyUpdate" "${PODS_ROOT}/Headers/Public/Pgyer" "${PODS_ROOT}/Headers/Public/SDWebImage" "${PODS_ROOT}/Headers/Public/UMengAnalytics" "${PODS_ROOT}/Headers/Public/UMengSocial" "${PODS_ROOT}/Headers/Public/WYPopoverController"
OTHER_LDFLAGS = -framework "CoreGraphics" -framework "QuartzCore" -framework "UIKit" OTHER_LDFLAGS = -framework "CoreGraphics" -framework "QuartzCore" -framework "UIKit"
PODS_ROOT = ${SRCROOT} PODS_ROOT = ${SRCROOT}
SKIP_INSTALL = YES SKIP_INSTALL = YES
\ No newline at end of file
Tools/CYConstManager.h
View file @ ac511240
...@@ -277,6 +277,11 @@ extern NSString *const ORDERDETAILSURL; ...@@ -277,6 +277,11 @@ extern NSString *const ORDERDETAILSURL;
* 抽奖结果查询 * 抽奖结果查询
*/ */
extern NSString *const LOTTERYED; extern NSString *const LOTTERYED;
/**
* 使用微信卡劵
*/
extern NSString *const USEWECHATCARD;
/*****************************************接口地址*****************************************/ /*****************************************接口地址*****************************************/
......
Tools/CYConstManager.m
View file @ ac511240
...@@ -271,6 +271,11 @@ NSString *const ORDERDETAILSURL = @"/tOOrderController.do?htmlOfPdf&reseller_id= ...@@ -271,6 +271,11 @@ NSString *const ORDERDETAILSURL = @"/tOOrderController.do?htmlOfPdf&reseller_id=
* 抽奖结果查询 * 抽奖结果查询
*/ */
NSString *const LOTTERYED = @"/lottery/query"; NSString *const LOTTERYED = @"/lottery/query";
/**
* 使用微信卡劵
*/
NSString *const USEWECHATCARD = @"http://wxcard.opple.com/api/Pay?voucherNo=%@&orderNum=%@&orderTotal=%@";
/*****************************************接口地址*****************************************/ /*****************************************接口地址*****************************************/
......
Tools/PrefixHeader.pch
View file @ ac511240
...@@ -55,6 +55,16 @@ ...@@ -55,6 +55,16 @@
//#define debugMethod() //#define debugMethod()
//#endif //#endif
#ifdef DEBUG
#define NSSLog(FORMAT, ...) fprintf(stderr,"%s:%d\t%s\n",[[[NSString stringWithUTF8String:__FILE__] lastPathComponent] UTF8String], __LINE__, [[NSString stringWithFormat:FORMAT, ##__VA_ARGS__] UTF8String]);
#else
#define NSSLog(...)
#endif
/** /**
* AppDelegate代理 * AppDelegate代理
......
Tools/opple_objc_json_client.h
View file @ ac511240
...@@ -798,6 +798,20 @@ extern NSString * const SORTDIRECTION_DESC; ...@@ -798,6 +798,20 @@ extern NSString * const SORTDIRECTION_DESC;
* *
*/ */
@property (nonatomic, strong) NSNumber *promotionMoney; @property (nonatomic, strong) NSNumber *promotionMoney;
/**
* 微信卡券卡号
*
*
*/
@property (nonatomic, copy) NSString *wxcardNumber;
/**
* 微信卡券面额
*
*
*/
@property (nonatomic, strong) NSNumber *wxcardDenomation;
@end /* interface OrderPayRequest */ @end /* interface OrderPayRequest */
......
Tools/opple_objc_json_client.m
View file @ ac511240
...@@ -267,6 +267,8 @@ ...@@ -267,6 +267,8 @@
@synthesize promotionGoods; @synthesize promotionGoods;
@synthesize jdCardDenomation; @synthesize jdCardDenomation;
@synthesize promotionMoney; @synthesize promotionMoney;
@synthesize wxcardNumber;
@synthesize wxcardDenomation;
+(BOOL)propertyIsOptional:(NSString*)propertyName +(BOOL)propertyIsOptional:(NSString*)propertyName
{ {
......
podfile
View file @ ac511240
...@@ -13,4 +13,5 @@ pod 'JSONModel', '~> 1.2.0' ...@@ -13,4 +13,5 @@ pod 'JSONModel', '~> 1.2.0'
pod 'UMengSocial' pod 'UMengSocial'
pod 'DZNEmptyDataSet' pod 'DZNEmptyDataSet'
pod 'Bugly' pod 'Bugly'
pod 'PgyUpdate'
pod 'UMengAnalytics', '~> 4.1.2' pod 'UMengAnalytics', '~> 4.1.2'
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