Merge branch 'master' into learningCenter

# Conflicts:
#	Class/CardDetailsViewController.m
#	Class/CardViewController.m
#	Class/LuckyDrawViewController.m
#	Class/OrderdetailsViewController.m
#	Class/RebateViewController.m
#	Class/Tabbar/CustomTabbarController.m
#	Lighting.xcodeproj/project.pbxproj
#	Lighting/OppleMain.storyboard
#	Tools/BaseViewController.h
#	Tools/BaseViewController.m

Class/AllpriceTableViewCell.h

@@ -7,10 +7,14 @@
 //
 
 #import <UIKit/UIKit.h>
-#import "LuckDrawResultModel.h"
+#import "PromotionLuckDrawResultModel.h"
 #import "ShopcarModel.h"
 #import "PromotionalDeductionModel.h"
 #import "PromotionalGoodsModel.h"
+#import "PromotionLuckyDrawModel.h"
+#import "PromotionalGoodsModel.h"
+#import "PromotionalDeductionModel.h"
+#import "PromotionWeChatCardModel.h"
 
 @interface AllpriceTableViewCell : UITableViewCell
 
@@ -41,11 +45,17 @@
 /**
  *  抽奖折扣
  */
-@property (nonatomic,copy) LuckDrawResultModel *model;
+@property (nonatomic,copy) PromotionLuckDrawResultModel *model;
 
 /**
  *  促销金额
  */
 @property (nonatomic,copy) NSArray *promotionalArray;
 
+/**
+ 微信卡劵
+ */
+@property (nonatomic,strong) WeChatCardModel *weChatModel;
+
+
 @end

Class/AllpriceTableViewCell.m

@@ -8,6 +8,7 @@
 
 #import "AllpriceTableViewCell.h"
 
+
 @implementation AllpriceTableViewCell
 
 - (void)awakeFromNib {
@@ -30,61 +31,120 @@
 }
 
 
-
 #pragma mark -数据源赋值
 - (void)setGoodsArray:(NSArray *)goodsArray
 {
     _goodsArray = goodsArray;
     NSInteger allNumber = 0;//总数量
     CGFloat allPrice = 0;//总价格
-    CGFloat newPrice = 0;//折后价格
-    CGFloat deductionPrice = 0;//抵扣金额
+    NSDictionary *deductionPrice = nil;//抵扣金额
+    NSDictionary *weChatPrice = nil;//微信卡劵
+    NSDictionary *drawPrice = nil;//转盘抽奖
     for (TOOrderdetailEntity *model in _goodsArray) {
         allNumber += [model.goodsNum integerValue];
-        allPrice += [model.goodsPrice floatValue]*[model.goodsNum intValue];
+        allPrice += [model.goodsPrice floatValue]*[model.goodsNum floatValue];
     }
-    newPrice = allPrice;
-    /// 抽奖折扣
-    if ([self.model.number length]) {
-        newPrice = allPrice * ([self.model.number integerValue]/100.0);
-    }
-    /// 全局抵扣
-    if (self.promotionalArray) {
-        for (id object in self.promotionalArray) {
-            if ([object isKindOfClass:[PromotionalDeductionModel class]]) {
-                PromotionalDeductionModel *model = (PromotionalDeductionModel *)object;
-                if ([model.type isEqualToString:@"deductionAction"] && model.isSelected) {
-                    deductionPrice = model.total;
-                }
-            }
+     //促销列表
+    for (JSONModel *model in self.promotionalArray) {
+            //微信卡劵
+        if ([model isMemberOfClass:[PromotionWeChatCardModel class]]) {
+            PromotionWeChatCardModel *newWeChatModel = (PromotionWeChatCardModel *)model;
+            weChatPrice = @{@"price":[NSString stringWithFormat:@"%ld",self.weChatModel.wxcardDenomation],@"priority":@(newWeChatModel.priority)};
+
+        }else if ([model isMemberOfClass:[PromotionalDeductionModel class]]) {
+            //抵扣
+            PromotionalDeductionModel *deductionModel = (PromotionalDeductionModel *)model;
+            deductionPrice = @{@"price":[NSString stringWithFormat:@"%ld",deductionModel.total],@"priority":@(deductionModel.priority)};
+
+        }else if ([model isMemberOfClass:[PromotionLuckyDrawModel class]]) {
+            //抽奖
+            PromotionLuckyDrawModel *drawModel = (PromotionLuckyDrawModel *)model;
+            drawPrice = @{@"price":[NSString stringWithFormat:@"%@",self.model.number],@"priority":@(drawModel.priority)};
+
+        }else if ([model isMemberOfClass:[PromotionalGoodsModel class]]) {
+            //送商品
+//            PromotionalGoodsModel *goodsModel = (PromotionalGoodsModel *)model;
         }
     }
-    NSString *goodsAllPriceString = nil;
-    if (deductionPrice && newPrice != allPrice) {
-        goodsAllPriceString = [NSString stringWithFormat:@"￥%.2f  (%.2f x %@ - %.2f)",newPrice-deductionPrice,allPrice,self.model.descriptionString,deductionPrice];
-        
-    }else if (newPrice == allPrice && !deductionPrice){
-        goodsAllPriceString = [NSString stringWithFormat:@"￥%.2f",newPrice];
-        
-    }else if (newPrice == allPrice && deductionPrice){
-        goodsAllPriceString = [NSString stringWithFormat:@"￥%.2f  (%.2f - %.2f)",newPrice-deductionPrice,allPrice,deductionPrice];
-
-    }else if (newPrice != allPrice && !deductionPrice){
-        goodsAllPriceString = [NSString stringWithFormat:@"￥%.2f  (%.2f x %@)",newPrice-deductionPrice,allPrice,self.model.descriptionString];
-    }
+    NSString *goodsAllPriceString = [self promotionSorting:deductionPrice andWeChatPrice:weChatPrice andDrawPrice:drawPrice andAllPrice:allPrice];
     self.goodsAllNumber.text = [NSString stringWithFormat:@"%ld",allNumber];
     self.goodsAllPrice.text = goodsAllPriceString;
 }
 
+#pragma mark - 通过优先级排列促销项
+- (NSString *)promotionSorting:(NSDictionary *)deductionPrice andWeChatPrice:(NSDictionary *)weChatPrice andDrawPrice:(NSDictionary *)drawPrice andAllPrice:(CGFloat)allPrice
+{
+    NSMutableArray *array = [NSMutableArray array];
+    if (deductionPrice) {
+        [array addObject:deductionPrice];
+    }
+    if (weChatPrice) {
+        [array addObject:weChatPrice];
+    }
+    if (drawPrice) {
+        [array addObject:drawPrice];
+    }
+    //安装权限降序排列
+    NSArray *chooseArray = [array sortedArrayUsingComparator:^NSComparisonResult(NSDictionary *obj1, NSDictionary *obj2) {
+        if (obj1[@"priority"] < obj2[@"priority"]) {
+            return NSOrderedAscending;
+        }
+        if (obj1[@"priority"] < obj2[@"priority"]) {
+            return NSOrderedDescending;
+        }
+        return NSOrderedSame;
+    }];
+    //计算促销后的价格
+    CGFloat newPrice = allPrice;
+    NSMutableString *priceString = [NSMutableString string];
+    for (NSDictionary *dict in chooseArray) {
+        if ([dict isEqual:deductionPrice]) {
+            CGFloat deduction = [dict[@"price"] floatValue];
+            newPrice = newPrice - deduction;
+            [priceString appendString:[NSString stringWithFormat:@" - %.2f",deduction]];
+            
+        }else if ([dict isEqual:weChatPrice]){
+           CGFloat weChat = [dict[@"price"] floatValue];
+           newPrice = newPrice - weChat;
+            [priceString appendString:[NSString stringWithFormat:@" - %.2f",weChat]];
+            
+        }else if ([dict isEqual:drawPrice]){
+            CGFloat draw = [self.model.number floatValue]/100.0;
+            newPrice = newPrice * draw;
+            [priceString appendString:[NSString stringWithFormat:@" x %@",self.model.descriptionString]];
+        }
+    }
+    //判断促销是否为空
+    if (chooseArray.count) {
+        if (newPrice < 0) {
+            newPrice = 0;
+        }
+        [priceString insertString:[NSString stringWithFormat:@"￥%.2f(%.2f",newPrice,allPrice] atIndex:0];
+        [priceString appendString:@")"];
+    }else{
+        priceString = [NSMutableString stringWithString:[NSString stringWithFormat:@"￥%.2f",allPrice]];
+    }
+    return priceString;
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
 
 
-- (void)setSelected:(BOOL)selected animated:(BOOL)animated {
-    [super setSelected:selected animated:animated];
 
-    // Configure the view for the selected state
-}
 
 @end

Class/CardAmplificationViewController.m

@@ -41,7 +41,7 @@
     self.backgroundImageView.image = [BaseViewController getCorrespondingPictures:_cardModel.denomation];
     self.cardNumberLabel.text = [NSString stringWithFormat:@"卡号:   %@",_cardModel.cardNumber];
     self.cardPasswordLabel.text = [NSString stringWithFormat:@"密码:   %@",_cardModel.cardPassword];
-    /// 判断状态
+    // 判断状态
     BOOL isUsed = [_cardModel.state isEqualToString:USED];
     BOOL isActived = [_cardModel.state isEqualToString:ACTIVED];
     BOOL isDispensed = [_cardModel.state isEqualToString:DISPENSED];

Class/CardBeenUseViewController.m

@@ -152,14 +152,14 @@
 #pragma mark - 区分已经使用的E卡
 - (void)deleteUsedJDECard:(NSString *)eCardNumber
 {
-    ///@property (nonatomic, strong) NSMutableArray<TOJingdongEcardEntity> *eCards;
-    /// 手动改为可变数组
+    //@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";
+                ecard.state = USED;
                 [self.beenUseCardCollectionView reloadItemsAtIndexPaths:@[[NSIndexPath indexPathForItem:j inSection:i]]];
             }
         }
@@ -222,7 +222,7 @@
     cardVC.cardModel = model.eCards[indexPath.row];
     cardVC.preferredContentSize = CGSizeMake(500, 370);
     [self.settingsPopoverController endThemeUpdates];
-    /// 更新E卡状态
+    // 更新E卡状态
     WS(weakSelf);
     [cardVC setRefreshJDCardList:^(NSString *cardNumber) {
         [weakSelf.settingsPopoverController dismissPopoverAnimated:YES completion:^{

Class/CardCollectionViewCell.m

@@ -34,7 +34,7 @@
     [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:USED];
     BOOL isActived = [_Cardmodel.state isEqualToString:ACTIVED];
     BOOL isDispensed = [_Cardmodel.state isEqualToString:DISPENSED];

Class/CustomPromotionModel.h

+//
+//  CustomPromotionModel.h
+//  Lighting
+//
+//  Created by 曹云霄 on 2016/11/15.
+//  Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
+//
+
+#import <JSONModel/JSONModel.h>
+#import <Foundation/Foundation.h>
+
+@interface CustomPromotionModel : JSONModel
+
+// 奖品描述
+@property (nonatomic,copy) NSString *descriptionString;
+// 是否选中
+@property (nonatomic,assign) BOOL isSelected;
+// 优先级
+@property (nonatomic,assign) NSInteger priority;
+// 冲突列表
+@property (nonatomic,strong) NSArray *conflicts;
+// 促销对象
+@property (nonatomic, copy) NSString *body;
+// 类型
+@property (nonatomic, copy) NSString *type;
+
+- (instancetype)initCustomPromotionModel:(JSONModel *)model;
+
+@end

Class/CustomPromotionModel.m

+//
+//  CustomPromotionModel.m
+//  Lighting
+//
+//  Created by 曹云霄 on 2016/11/15.
+//  Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
+//
+
+#import "CustomPromotionModel.h"
+#import "PromotionLuckyDrawModel.h"
+#import "PromotionalGoodsModel.h"
+#import "PromotionalDeductionModel.h"
+#import "PromotionWeChatCardModel.h"
+
+@implementation CustomPromotionModel
+
+
+- (instancetype)initCustomPromotionModel:(JSONModel *)model
+{
+    if (self = [super init]) {
+            //微信卡劵
+        if ([model isMemberOfClass:[PromotionWeChatCardModel class]]) {
+            PromotionWeChatCardModel *weChatModel = (PromotionWeChatCardModel *)model;
+            self.descriptionString = weChatModel.descriptionString;
+            self.type = weChatModel.type;
+            self.body = weChatModel.body;
+            self.conflicts = weChatModel.conflicts;
+            self.priority = weChatModel.priority;
+        }else if ([model isMemberOfClass:[PromotionalDeductionModel class]]) {
+            //抵扣
+            PromotionalDeductionModel *deductionModel = (PromotionalDeductionModel *)model;
+            self.descriptionString = deductionModel.descriptionString;
+            self.type = deductionModel.type;
+            self.body = deductionModel.body;
+            self.conflicts = deductionModel.conflicts;
+            self.priority = deductionModel.priority;
+        }else if ([model isMemberOfClass:[PromotionLuckyDrawModel class]]) {
+            //抽奖
+            PromotionLuckyDrawModel *drawModel = (PromotionLuckyDrawModel *)model;
+            self.descriptionString = drawModel.descriptionString;
+            self.type = drawModel.type;
+            self.body = drawModel.body;
+            self.conflicts = drawModel.conflicts;
+            self.priority = drawModel.priority;
+        }else if ([model isMemberOfClass:[PromotionalGoodsModel class]]) {
+            //送商品
+            PromotionalGoodsModel *goodsModel = (PromotionalGoodsModel *)model;
+            self.descriptionString = goodsModel.descriptionString;
+            self.type = goodsModel.type;
+            self.body = goodsModel.body;
+            self.conflicts = goodsModel.conflicts;
+            self.priority = goodsModel.priority;
+        }
+    }
+    return self;
+}
+
+@end

Class/CustomerOrderTableViewCell.m

@@ -49,7 +49,7 @@
     self.consigneePhoneNumber.text = _model.order.receiverMobile;
     self.phoneNumber.text = _model.consumer.mobile;
     self.consigneeAddress.text = _model.order.receiverAddress;
-    /// 商品个数
+    // 商品个数
     NSInteger goodsAllnum = 0;
     self.orderTotalPrice.text = [NSString stringWithFormat:@"￥%.2f",[_model.order.orderPrice floatValue]];
     for (TOOrderdetailEntity *model in _model.orderdetailList) {

Class/CustomerOrderViewController.m

@@ -68,11 +68,29 @@
     return _model;
 }
 
+#pragma mark -渲染完成
+- (void)viewDidAppear:(BOOL)animated
+{
+    [super viewDidAppear:animated];
+    self.navigationController.fd_fullscreenPopGestureRecognizer.enabled = NO;
+    if ([self.navigationController respondsToSelector:@selector(interactivePopGestureRecognizer)]) {
+        self.navigationController.interactivePopGestureRecognizer.enabled = NO;
+    }
+}
+
+#pragma mark -视图即将消失
+- (void)viewWillDisappear:(BOOL)animated
+{
+    [super viewWillDisappear:animated];
+    self.navigationController.fd_fullscreenPopGestureRecognizer.enabled = YES;
+    if ([self.navigationController respondsToSelector:@selector(interactivePopGestureRecognizer)]) {
+        self.navigationController.interactivePopGestureRecognizer.enabled = YES;
+    }
+}
+
 - (void)viewDidLoad {
     [super viewDidLoad];
-    // Do any additional setup after loading the view.
     [self uiConfigAction];
-   
 }
 
 
@@ -96,10 +114,10 @@
     //经销商代码
     self.model.resellerCodeEquals = [[Shoppersmanager manager].Shoppers.employee.currentDepart  orgCode];
     //下拉刷新
-    __weak typeof(self) weakSelf = self;
+    WS(weakSelf);
     MjRefreshHeaderCustom *headerRefresh = [MjRefreshHeaderCustom headerWithRefreshingBlock:^{
         
-        self.indexPage = 1;
+        weakSelf.indexPage = ONE;
         DataPage *page = [[DataPage alloc]init];
         page.page = weakSelf.indexPage;
         page.rows = KROWS;

Class/Login/LoginViewController.m

@@ -127,8 +127,8 @@
     self.passWordString = [[NSUserDefaults standardUserDefaults] objectForKey:PASSWORD];
     self.userName.text = self.userNameString;
     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 detectionUpdateVersion];

Class/LuckyDrawDetailsViewController.h

@@ -8,6 +8,20 @@
 
 #import "BaseViewController.h"
 
+
+/**
+ 抽奖状态
+
+ - ALLDRAW:  所有状态
+ - NOTDRAW:  未抽奖
+ - USEDDRAW: 已抽奖
+ */
+typedef NS_ENUM(NSInteger, DRAWSTATE) {
+    ALLDRAW = 0,
+    NOTDRAW,
+    USEDDRAW
+};
+
 @interface LuckyDrawDetailsViewController : BaseViewController
 
 

Class/LuckyDrawDetailsViewController.m

@@ -10,7 +10,7 @@
 #import "NotDrawTableViewCell.h"
 #import "CustomWKWebViewController.h"
 #import "UsedDrawTableViewCell.h"
-#import "LuckDrawResultModel.h"
+#import "PromotionLuckDrawResultModel.h"
 
 
 @interface LuckyDrawDetailsViewController ()<UITableViewDataSource,UITableViewDelegate,DZNEmptyDataSetSource,DZNEmptyDataSetDelegate>
@@ -44,22 +44,21 @@
         page.order = SORTDIRECTION_DESC;
         _drawModel.page = page;
         switch (self.drawValue) {
-            case 0:
+            case ALLDRAW:
             {
                 _drawModel.stateEquals = nil;
             }
                 break;
-            case 1:
+            case NOTDRAW:
             {
                 _drawModel.stateEquals = INITIAL;
             }
                 break;
-            case 2:
+            case USEDDRAW:
             {
                 _drawModel.stateEquals = ACCOMPLISHED;
             }
                 break;
-                
             default:
                 break;
         }
@@ -129,7 +128,6 @@
 {
     WS(weakSelf);
     [self CreateMBProgressHUDLoding];
-    NSLog(@"%@",[self.drawModel toDictionary]);
     [[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(LOTTERYED) WithCallClass:weakSelf WithRequestType:ZERO WithParameter:self.drawModel WithReturnValueBlock:^(id returnValue) {
         
         [weakSelf RemoveMBProgressHUDLoding];

Class/OrderdetailsViewController.h

@@ -60,14 +60,13 @@
  */
 @property (nonatomic,assign) BOOL isSliding;
 
-
 /**
  *  是否开启交互
  */
 @property (nonatomic,assign) BOOL isUserInteractionEnabled;
 
-/**
- 消费者ID
+/*
+ 用户ID
  */
 @property (nonatomic,copy) NSString *consumerID;
 

Class/PromotionChooseNavigationController.h

+//
+//  PromotionChooseNavigationController.h
+//  Lighting
+//
+//  Created by 曹云霄 on 2016/11/14.
+//  Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface PromotionChooseNavigationController : UINavigationController
+
+@end

Class/PromotionChooseNavigationController.m

+//
+//  PromotionChooseNavigationController.m
+//  Lighting
+//
+//  Created by 曹云霄 on 2016/11/14.
+//  Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
+//
+
+#import "PromotionChooseNavigationController.h"
+
+@interface PromotionChooseNavigationController ()
+
+@end
+
+@implementation PromotionChooseNavigationController
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    // Do any additional setup after loading the view.
+    self.navigationBar.translucent = NO;
+}
+
+- (void)didReceiveMemoryWarning {
+    [super didReceiveMemoryWarning];
+    // Dispose of any resources that can be recreated.
+}
+
+/*
+#pragma mark - Navigation
+
+// In a storyboard-based application, you will often want to do a little preparation before navigation
+- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
+    // Get the new view controller using [segue destinationViewController].
+    // Pass the selected object to the new view controller.
+}
+*/
+
+@end

Class/PromotionChooseTableViewCell.h

+//
+//  PromotionChooseTableViewCell.h
+//  Lighting
+//
+//  Created by 曹云霄 on 2016/11/14.
+//  Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+#import "CustomPromotionModel.h"
+@interface PromotionChooseTableViewCell : UITableViewCell
+
+
+/**
+ 促销模型
+ */
+@property (nonatomic,strong) CustomPromotionModel *promotionModel;
+
+@end

Class/PromotionChooseTableViewCell.m

+//
+//  PromotionChooseTableViewCell.m
+//  Lighting
+//
+//  Created by 曹云霄 on 2016/11/14.
+//  Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
+//
+
+#import "PromotionChooseTableViewCell.h"
+#import "PromotionWeChatCardModel.h"
+#import "PromotionalGoodsModel.h"
+#import "PromotionalDeductionModel.h"
+#import "PromotionLuckyDrawModel.h"
+
+@implementation PromotionChooseTableViewCell
+
+- (void)awakeFromNib {
+    [super awakeFromNib];
+    
+    self.textLabel.font = [UIFont systemFontOfSize:12];
+}
+
+
+- (void)setPromotionModel:(CustomPromotionModel *)promotionModel
+{
+    self.textLabel.text = promotionModel.descriptionString;
+}
+
+
+
+
+
+
+- (void)setSelected:(BOOL)selected animated:(BOOL)animated {
+    [super setSelected:selected animated:animated];
+}
+
+@end

Class/PromotionChooseViewController.h

+//
+//  PromotionChooseViewController.h
+//  Lighting
+//
+//  Created by 曹云霄 on 2016/11/14.
+//  Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
+//
+
+#import "BaseViewController.h"
+#import "CustomPromotionModel.h"
+
+
+/**
+ 确认选择促销条件后
+ */
+@protocol confirmPromotionDelegate <NSObject>
+
+@optional
+- (void)confirmChoosePromotion:(NSArray<CustomPromotionModel *>*)promotionArray;
+
+@end
+
+@interface PromotionChooseViewController : BaseViewController
+
+@property (nonatomic,weak) id<confirmPromotionDelegate>promotionDelegate;
+
+/**
+ 选择促销
+ */
+@property (weak, nonatomic) IBOutlet UITableView *promotionChooseTableView;
+
+
+/**
+ 消费者促销列表
+ */
+@property (nonatomic,copy) NSArray <JSONModel*>*promotionDatasArray;
+
+@end

Class/PromotionChooseViewController.m

+//
+//  PromotionChooseViewController.m
+//  Lighting
+//
+//  Created by 曹云霄 on 2016/11/14.
+//  Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
+//
+
+#import "PromotionChooseViewController.h"
+#import "PromotionChooseTableViewCell.h"
+#import "PromotionWeChatCardModel.h"
+#import "PromotionalGoodsModel.h"
+#import "PromotionalDeductionModel.h"
+#import "PromotionLuckyDrawModel.h"
+
+@interface PromotionChooseViewController ()<UITableViewDelegate,UITableViewDataSource>
+
+
+/**
+ 自定义促销列表
+ */
+@property (nonatomic,strong) NSMutableArray *customPromotionDatas;
+
+@end
+
+@implementation PromotionChooseViewController
+
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    
+    [self setUpTableView];
+}
+
+#pragma mark - 数据源
+- (void)setPromotionDatasArray:(NSArray<JSONModel *> *)promotionDatasArray
+{
+    _promotionDatasArray = promotionDatasArray;
+    NSMutableArray *promotionArray = [NSMutableArray array];
+    [_promotionDatasArray enumerateObjectsUsingBlock:^(JSONModel * _Nonnull model, NSUInteger index, BOOL * _Nonnull stop) {
+        CustomPromotionModel *promotionModel = [[CustomPromotionModel alloc]initCustomPromotionModel:model];
+        [promotionArray addObject:promotionModel];
+    }];
+    //促销列表按降序排列
+    self.customPromotionDatas = [NSMutableArray arrayWithArray:[promotionArray sortedArrayUsingComparator:^NSComparisonResult(CustomPromotionModel *obj1, CustomPromotionModel *obj2) {
+        if (obj1.priority < obj2.priority) {
+            return NSOrderedAscending;
+        }
+        if (obj1.priority < obj2.priority) {
+            return NSOrderedDescending;
+        }
+        return NSOrderedSame;
+    }]];
+    [self calculatedPromotionConflicts:0];
+}
+
+#pragma mark - 选择促销后计算是否存在冲突
+- (void)calculatedPromotionConflicts:(NSInteger)cellIndex
+{
+    WS(weakSelf);
+    //默认选中最高级别促销及衍生促销
+    CustomPromotionModel *promotionModel = self.customPromotionDatas[cellIndex];
+    if (promotionModel.isSelected) {
+        return;
+    }else {
+        for (CustomPromotionModel *model in self.customPromotionDatas) {
+            model.isSelected = NO;
+        }
+        promotionModel.isSelected = YES;
+    }
+    [self.customPromotionDatas enumerateObjectsUsingBlock:^(CustomPromotionModel *model1, NSUInteger index, BOOL * _Nonnull stop) {
+        if (![promotionModel.conflicts containsObject:model1.type] && ![model1.conflicts containsObject:promotionModel.type]) {
+            for (int i=0;i<weakSelf.customPromotionDatas.count;i++) {
+                CustomPromotionModel *model2 = weakSelf.customPromotionDatas[i];
+                if (![model2.conflicts containsObject:model1.type] && ![model1.conflicts containsObject:model2.type] && ![model2 isEqual:promotionModel]) {
+                    model1.isSelected = YES;
+                }
+            }
+        }else {
+            model1.isSelected = NO;
+        }
+    }];
+    [self.promotionChooseTableView reloadData];
+}
+
+#pragma mark - UITableview
+- (void)setUpTableView
+{
+    self.promotionChooseTableView.tableFooterView = [UIView new];
+}
+
+#pragma mark - <UITableViewDelegate,UITableViewDataSource>
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    PromotionChooseTableViewCell *chooseCell = [tableView dequeueReusableCellWithIdentifier:@"PromotionChooseTableViewCell" forIndexPath:indexPath];
+    CustomPromotionModel *model = self.customPromotionDatas[indexPath.row];
+    chooseCell.promotionModel = model;
+    chooseCell.accessoryType = model.isSelected?UITableViewCellAccessoryCheckmark:UITableViewCellAccessoryNone;
+    chooseCell.selectionStyle = UITableViewCellSelectionStyleNone;
+    return chooseCell;
+}
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
+{
+    return self.customPromotionDatas.count;
+}
+
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    [self calculatedPromotionConflicts:indexPath.row];
+}
+
+#pragma mark - 退出促销条件选择
+- (IBAction)dismissPromotionChooseNavigation:(UIBarButtonItem *)sender {
+    [self dismissViewControllerAnimated:YES completion:nil];
+}
+
+#pragma mark - 确认促销条件选择
+- (IBAction)confirmPromotionChoose:(UIBarButtonItem *)sender {
+    [self dismissViewControllerAnimated:YES completion:nil];
+    if ([self.promotionDelegate respondsToSelector:@selector(confirmChoosePromotion:)]) {
+        NSMutableArray *chooseArray = [NSMutableArray array];
+        for (CustomPromotionModel *model in self.customPromotionDatas) {
+            if (model.isSelected) {
+                [chooseArray addObject:model];
+            }
+        }
+        [self.promotionDelegate confirmChoosePromotion:chooseArray];
+    }
+}
+
+- (void)didReceiveMemoryWarning {
+    [super didReceiveMemoryWarning];
+}
+
+
+@end

Class/PromotionJDECardModel.h

+//
+//  PromotionJDECardModel.h
+//  Lighting
+//
+//  Created by 曹云霄 on 2016/11/14.
+//  Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
+//
+
+#import <JSONModel/JSONModel.h>
+
+@interface PromotionJDECardModel : JSONModel
+
+//** 促销对象 */
+@property (nonatomic, copy) NSString *body;
+
+//** 类型 */
+@property (nonatomic, copy) NSString *type;
+
+//** 抵扣金额 */
+@property (nonatomic, assign) NSInteger total;
+
+//** 描述 */
+@property (nonatomic, copy) NSString *descriptionString;
+
+//** 是否选中 */
+@property (nonatomic,assign) BOOL isSelected;
+
+// 优先级
+@property (nonatomic,assign) NSInteger priority;
+
+// 冲突列表
+@property (nonatomic,strong) NSArray *conflicts;
+
+@end

Class/PromotionJDECardModel.m

+//
+//  PromotionJDECardModel.m
+//  Lighting
+//
+//  Created by 曹云霄 on 2016/11/14.
+//  Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
+//
+
+#import "PromotionJDECardModel.h"
+
+@implementation PromotionJDECardModel
+
+
++ (BOOL)propertyIsOptional:(NSString *)propertyName
+{
+    return YES;
+}
+
++ (JSONKeyMapper *)keyMapper
+{
+    return [[JSONKeyMapper alloc]initWithDictionary:@{@"description":@"descriptionString"}];
+}
+
+@end

Class/LuckDrawResultModel.h → Class/PromotionLuckDrawResultModel.h

 //
-//  LuckDrawResultModel.h
+//  PromotionLuckDrawResultModel.h
 //  Lighting
 //
 //  Created by 曹云霄 on 2016/11/5.
@@ -8,7 +8,7 @@
 
 #import <Foundation/Foundation.h>
 
-@interface LuckDrawResultModel : JSONModel
+@interface PromotionLuckDrawResultModel : JSONModel
 
 
 
@@ -45,6 +45,6 @@
 /**
  *  通过抽奖列表结果初始化抽奖结果
  */
-+ (LuckDrawResultModel *)initializeWith:(RsAwardDraw *)rsAwardDrawModel;
++ (PromotionLuckDrawResultModel *)initializeWith:(RsAwardDraw *)rsAwardDrawModel;
 
 @end

Class/LuckDrawResultModel.m → Class/PromotionLuckDrawResultModel.m

 //
-//  LuckDrawResultModel.m
+//  PromotionLuckDrawResultModel.m
 //  Lighting
 //
 //  Created by 曹云霄 on 2016/11/5.
 //  Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
 //
 
-#import "LuckDrawResultModel.h"
+#import "PromotionLuckDrawResultModel.h"
 
-@implementation LuckDrawResultModel
+@implementation PromotionLuckDrawResultModel
 
 
 +(BOOL)propertyIsOptional:(NSString *)propertyName
@@ -21,9 +21,9 @@
     return [[JSONKeyMapper alloc]initWithDictionary:@{@"description":@"descriptionString"}];
 }
 
-+ (LuckDrawResultModel *)initializeWith:(RsAwardDraw *)rsAwardDrawModel
++ (PromotionLuckDrawResultModel *)initializeWith:(RsAwardDraw *)rsAwardDrawModel
 {
-    LuckDrawResultModel *model = [[LuckDrawResultModel alloc]init];
+    PromotionLuckDrawResultModel *model = [[PromotionLuckDrawResultModel alloc]init];
     model.lotteryId = rsAwardDrawModel.draw.lotteryId;
     model.type = rsAwardDrawModel.award.type;
     model.number = [rsAwardDrawModel.award.number stringValue];

Class/LuckyDrawModel.h → Class/PromotionLuckyDrawModel.h

 //
-//  LuckyDrawModel.h
+//  PromotionLuckyDrawModel.h
 //  Lighting
 //
 //  Created by 曹云霄 on 2016/11/3.
@@ -12,24 +12,31 @@
 @protocol lottery @end
 
 
-@interface LuckyDrawModel : JSONModel
+@interface PromotionLuckyDrawModel : JSONModel
 
-//** 促销对象 */
+// 促销对象
 @property (nonatomic, copy) NSString *body;
 
-//** 类型 */
+// 类型
 @property (nonatomic, copy) NSString *type;
 
-/// 抽奖ID
+// 抽奖ID
 @property (nonatomic, copy) lottery *lottery;
 
-//** 描述 */
+// 描述
 @property (nonatomic, copy) NSString *descriptionString;
 
-/// 优先
-@property (nonatomic,copy) NSString *priority;
+// 优先级
+@property (nonatomic,assign) NSInteger priority;
 
+// 冲突列表
+@property (nonatomic,strong) NSArray *conflicts;
 
+// 是否选中
+@property (nonatomic,assign) BOOL isSelected;
+
+// 是否使用
+@property (nonatomic,assign) BOOL isUsed;
 @end
 
 

Class/LuckyDrawModel.m → Class/PromotionLuckyDrawModel.m

 //
-//  LuckyDrawModel.m
+//  PromotionLuckyDrawModel.m
 //  Lighting
 //
 //  Created by 曹云霄 on 2016/11/3.
 //  Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
 //
 
-#import "LuckyDrawModel.h"
+#import "PromotionLuckyDrawModel.h"
 
-@implementation LuckyDrawModel
+@implementation PromotionLuckyDrawModel
 
 + (JSONKeyMapper *)keyMapper
 {

Class/PromotionWeChatCardModel.h

+//
+//  PromotionWeChatCardModel.h
+//  Lighting
+//
+//  Created by 曹云霄 on 2016/11/14.
+//  Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
+//
+
+#import <JSONModel/JSONModel.h>
+
+@interface PromotionWeChatCardModel : JSONModel
+
+//** 促销对象 */
+@property (nonatomic, copy) NSString *body;
+
+//** 类型 */
+@property (nonatomic, copy) NSString *type;
+
+// 卡劵面额
+@property (nonatomic, assign) NSInteger total;
+
+//** 描述 */
+@property (nonatomic, copy) NSString *descriptionString;
+
+// 是否选中
+@property (nonatomic,assign) BOOL isSelected;
+
+// 优先级
+@property (nonatomic,assign) NSInteger priority;
+
+// 冲突列表
+@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

Class/PromotionWeChatCardModel.m

+//
+//  PromotionWeChatCardModel.m
+//  Lighting
+//
+//  Created by 曹云霄 on 2016/11/14.
+//  Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
+//
+
+#import "PromotionWeChatCardModel.h"
+
+@implementation PromotionWeChatCardModel
+
++ (BOOL)propertyIsOptional:(NSString *)propertyName
+{
+    return YES;
+}
+
++ (JSONKeyMapper *)keyMapper
+{
+    return [[JSONKeyMapper alloc]initWithDictionary:@{@"description":@"descriptionString"}];
+}
+
+@end
+
+
+@implementation WeChatCardModel
+
++ (BOOL)propertyIsOptional:(NSString *)propertyName
+{
+    return YES;
+}
+
+@end

Class/PromotionalDeductionModel.h

@@ -8,7 +8,6 @@
 
 #import <Foundation/Foundation.h>
 
-/// 京东Eka,折扣金额
 @interface PromotionalDeductionModel : JSONModel
 
 //** 促销对象 */
@@ -26,4 +25,10 @@
 //** 是否选中 */
 @property (nonatomic,assign) BOOL isSelected;
 
+// 优先级
+@property (nonatomic,assign) NSInteger priority;
+
+// 冲突列表
+@property (nonatomic,strong) NSArray *conflicts;
+
 @end

Class/PromotionalGoodsModel.h

@@ -28,9 +28,15 @@
 //** 描述 */
 @property (nonatomic, copy) NSString *descriptionString;
 
+// 优先级
+@property (nonatomic,assign) NSInteger priority;
+
 //** 是否选中 */
 @property (nonatomic,assign) BOOL isSelected;
 
+// 冲突列表
+@property (nonatomic,strong) NSArray *conflicts;
+
 @end
 
 @interface Goods : JSONModel

Class/PromotionalTableViewCell.h

@@ -7,7 +7,7 @@
 //
 
 #import <UIKit/UIKit.h>
-
+#import "PromotionLuckDrawResultModel.h"
 @interface PromotionalTableViewCell : UITableViewCell
 
 
@@ -16,4 +16,16 @@
  */
 @property (weak, nonatomic) IBOutlet UILabel *promotionalTitleLabel;
 
+
+/**
+ 促销信息
+ */
+@property (nonatomic,copy) JSONModel *promotionModel;
+
+
+/**
+ *  抽奖结果
+ */
+@property (nonatomic,copy) PromotionLuckDrawResultModel *model;
+
 @end

Class/PromotionalTableViewCell.m

@@ -7,6 +7,10 @@
 //
 
 #import "PromotionalTableViewCell.h"
+#import "PromotionLuckyDrawModel.h"
+#import "PromotionalGoodsModel.h"
+#import "PromotionalDeductionModel.h"
+#import "PromotionWeChatCardModel.h"
 
 @implementation PromotionalTableViewCell
 
@@ -15,10 +19,30 @@
     // Initialization code
 }
 
-- (void)setSelected:(BOOL)selected animated:(BOOL)animated {
-    [super setSelected:selected animated:animated];
-
-    // Configure the view for the selected state
+- (void)setPromotionModel:(JSONModel *)promotionModel
+{
+    _promotionModel = promotionModel;
+        //微信卡劵
+    if ([promotionModel isMemberOfClass:[PromotionWeChatCardModel class]]) {
+        PromotionWeChatCardModel *weChatModel = (PromotionWeChatCardModel *)promotionModel;
+        self.promotionalTitleLabel.text = [NSString stringWithFormat:@"微信卡劵: %ld",weChatModel.total];
+    }else if ([promotionModel isMemberOfClass:[PromotionalDeductionModel class]]) {
+        //抵扣
+        PromotionalDeductionModel *deductionModel = (PromotionalDeductionModel *)promotionModel;
+        self.promotionalTitleLabel.text = [NSString stringWithFormat:@"抵扣: %@",deductionModel.descriptionString];
+    }else if ([promotionModel isMemberOfClass:[PromotionLuckyDrawModel class]]) {
+        //抽奖
+        self.promotionalTitleLabel.text = [NSString stringWithFormat:@"转盘抽奖: %@",self.model.descriptionString];
+    }else if ([promotionModel isMemberOfClass:[PromotionalGoodsModel class]]) {
+        //送商品
+        PromotionalGoodsModel *goodsModel = (PromotionalGoodsModel *)promotionModel;
+        self.promotionalTitleLabel.text = [NSString stringWithFormat:@"赠送商品: %@",goodsModel.goods.name];
+    }
+    self.accessoryType = UITableViewCellAccessoryCheckmark;
 }
 
+
+
+
+
 @end

Class/SceneLibraryViewController.m

@@ -123,7 +123,7 @@
     //下拉刷新
     MjRefreshHeaderCustom *headerRefresh = [MjRefreshHeaderCustom headerWithRefreshingBlock:^{
         //默认数据
-        self.indexPage = 1;
+        self.indexPage = ONE;
         DataPage *page = [[DataPage alloc]init];
         page.page = self.indexPage;
         page.rows = KROWS;
@@ -159,7 +159,7 @@
 - (void)getdatasAction
 {
     WS(weakSelf);
-    [[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(SCENESCREENING) WithCallClass:weakSelf WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
+    [[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(SCENESCREENING) WithCallClass:weakSelf WithRequestType:ONE WithParameter:nil WithReturnValueBlock:^(id returnValue) {
         
         if ([returnValue[@"code"] isEqualToNumber:@0]) {
             
@@ -184,7 +184,7 @@
 {
     [self CreateMBProgressHUDLoding];
     WS(weakSelf);
-    [[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(SCENELIST) WithCallClass:weakSelf WithRequestType:0 WithParameter:condition WithReturnValueBlock:^(id returnValue) {
+    [[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(SCENELIST) WithCallClass:weakSelf WithRequestType:ZERO WithParameter:condition WithReturnValueBlock:^(id returnValue) {
         
         weakSelf.seceneLibararyCollectionView.emptyDataSetSource = weakSelf;
         weakSelf.seceneLibararyCollectionView.emptyDataSetDelegate = weakSelf;
@@ -252,7 +252,6 @@
 #pragma mark -筛选风格
 - (void)screeningStyleButtonClick:(UIButton *)sender {
 
-
     NSMutableArray *styleArray = [NSMutableArray arrayWithArray:self.filter.styles];
     DataDict *style = [[DataDict alloc]init];
     style.typeName = @"全部";

Class/SettlementViewController.h

@@ -7,8 +7,8 @@
 //
 
 #import "BaseViewController.h"
-#import "LuckDrawResultModel.h"
-
+#import "PromotionLuckDrawResultModel.h"
+#import "PromotionWeChatCardModel.h"
 @interface SettlementViewController : BaseViewController
 
 
@@ -20,15 +20,10 @@
 @property (nonatomic,strong) NSArray *goodsArray;
 
 /**
- *  促销信息（赠送商品、抵扣）
+ *  促销信息
  */
 @property (nonatomic,strong) NSArray *promotionalArray;
 
-/**
- *  促销信息（京东E卡、抽奖）
- */
-@property (nonatomic,strong) NSArray *luckyDrawAndJDECardArray;
-
 /**
  *  商品总数量
  */
@@ -74,56 +69,46 @@
  */
 @property (weak, nonatomic) IBOutlet UIButton *ISinvoiceButton;
 
-
 /**
  *  发票类型
  */
 @property (weak, nonatomic) IBOutlet UIButton *invoiceType;
 
-
 /**
  *  发票抬头
  */
 @property (weak, nonatomic) IBOutlet UITextField *invoiceHeader;
 
-
 /**
  *  发票抬头背景
  */
 @property (weak, nonatomic) IBOutlet UIView *invoiceBackView;
 
-
 /**
  *  取消
  */
 @property (weak, nonatomic) IBOutlet UIButton *cancelButton;
 
-
 /**
  *  确认
  */
 @property (weak, nonatomic) IBOutlet UIButton *sureButton;
 
-
 /**
  *  订单编号
  */
 @property (nonatomic,copy) NSString *orderCode;
 
-
 /**
  *  京东E卡总额度
  */
 @property (nonatomic,assign) NSInteger jdCardDenomation;
 
-
-
 /**
  *  支付成功回调
  */
 @property (nonatomic,copy) void(^PaySuccessReturnBlock)();
 
-
 /**
  * 背景Scrollview 
  */
@@ -132,7 +117,12 @@
 /**
  *  客户抽奖结果
  */
-@property (nonatomic,strong) LuckDrawResultModel *resultModel;
+@property (nonatomic,strong) PromotionLuckDrawResultModel *resultModel;
+
+/**
+ 微信卡劵
+ */
+@property (nonatomic,strong) WeChatCardModel *weChatModel;
 
 
 @end

Class/SettlementViewController.m

@@ -10,7 +10,9 @@
 #import "PayViewController.h"
 #import "PromotionalDeductionModel.h"
 #import "PromotionalGoodsModel.h"
-#import "LuckyDrawModel.h"
+#import "PromotionLuckyDrawModel.h"
+#import "PromotionWeChatCardModel.h"
+#import "PromotionJDECardModel.h"
 
 @interface SettlementViewController ()<ReturnTableviewcellIndexpathdelegate,UITextFieldDelegate>
 
@@ -85,32 +87,90 @@
 - (void)setGoodsArray
 {
     NSInteger goodsAllNumber = 0;//总数量
-    CGFloat goodAllprice = 0;//总价格
     for (TOOrderdetailEntity *model in _goodsArray) {
         goodsAllNumber += [model.goodsNum integerValue];
-        goodAllprice += [model.goodsPrice floatValue]*[model.goodsNum integerValue];
     }
-    /// 促销金额大于商品金额情况
-    goodAllprice = (goodAllprice<0)?0:goodAllprice;
-    /// 抽奖结果<打折>
-    if ([self.resultModel.type isEqualToString:@"discount"]) {
-        goodAllprice = goodAllprice*([self.resultModel.number integerValue]/100.0);
+    CGFloat allPrice = 0;//实际支付金额
+    NSDictionary *deductionPrice = nil;//抵扣金额
+    NSDictionary *weChatPrice = nil;//微信卡劵
+    NSDictionary *drawPrice = nil;//转盘抽奖
+    for (TOOrderdetailEntity *model in _goodsArray) {
+        allPrice += [model.goodsPrice floatValue]*[model.goodsNum floatValue];
     }
-    //** 促销金额 */
-    NSInteger totalNumber = 0;
-    for (id object in self.promotionalArray) {
-        if ([object isKindOfClass:[PromotionalDeductionModel class]]) {
-            PromotionalDeductionModel *model = (PromotionalDeductionModel *)object;
-            if (model.isSelected) {
-                totalNumber += model.total;
-            }
+    //促销列表
+    for (JSONModel *model in self.promotionalArray) {
+        //微信卡劵
+        if ([model isMemberOfClass:[PromotionWeChatCardModel class]]) {
+            PromotionWeChatCardModel *weChatModel = (PromotionWeChatCardModel *)model;
+            weChatPrice = @{@"price":[NSString stringWithFormat:@"%ld",self.weChatModel.wxcardDenomation],@"priority":@(weChatModel.priority)};
+            
+        }else if ([model isMemberOfClass:[PromotionalDeductionModel class]]) {
+            //抵扣
+            PromotionalDeductionModel *deductionModel = (PromotionalDeductionModel *)model;
+            deductionPrice = @{@"price":[NSString stringWithFormat:@"%ld",deductionModel.total],@"priority":@(deductionModel.priority)};
+            
+        }else if ([model isMemberOfClass:[PromotionLuckyDrawModel class]]) {
+            //抽奖
+            PromotionLuckyDrawModel *drawModel = (PromotionLuckyDrawModel *)model;
+            drawPrice = @{@"price":[NSString stringWithFormat:@"%@",self.resultModel.number],@"priority":@(drawModel.priority)};
+            
+        }else if ([model isMemberOfClass:[PromotionalGoodsModel class]]) {
+            //送商品
+            //            PromotionalGoodsModel *goodsModel = (PromotionalGoodsModel *)model;
         }
     }
-    goodAllprice -= totalNumber;
+    CGFloat goodsAllPrice = [self promotionSorting:deductionPrice andWeChatPrice:weChatPrice andDrawPrice:drawPrice andAllPrice:allPrice];
     self.goodsAllNumber.text = [NSString stringWithFormat:@"%ld",goodsAllNumber];
-    self.goodsAllPrice.text = [NSString stringWithFormat:@"￥%.2f",goodAllprice];
+    self.goodsAllPrice.text = [NSString stringWithFormat:@"￥%.2f",goodsAllPrice];
 }
 
+#pragma mark - 通过优先级排列促销项
+- (CGFloat)promotionSorting:(NSDictionary *)deductionPrice andWeChatPrice:(NSDictionary *)weChatPrice andDrawPrice:(NSDictionary *)drawPrice andAllPrice:(CGFloat)allPrice
+{
+    NSMutableArray *array = [NSMutableArray array];
+    if (deductionPrice) {
+        [array addObject:deductionPrice];
+    }
+    if (weChatPrice) {
+        [array addObject:weChatPrice];
+    }
+    if (drawPrice) {
+        [array addObject:drawPrice];
+    }
+    //安装权限降序排列
+    NSArray *chooseArray = [array sortedArrayUsingComparator:^NSComparisonResult(NSDictionary *obj1, NSDictionary *obj2) {
+        if (obj1[@"priority"] < obj2[@"priority"]) {
+            return NSOrderedAscending;
+        }
+        if (obj1[@"priority"] < obj2[@"priority"]) {
+            return NSOrderedDescending;
+        }
+        return NSOrderedSame;
+    }];
+    //计算促销后的价格
+    CGFloat newPrice = allPrice;
+    for (NSDictionary *dict in chooseArray) {
+        if ([dict isEqual:deductionPrice]) {
+            CGFloat deduction = [dict[@"price"] floatValue];
+            newPrice = newPrice - deduction;
+            
+        }else if ([dict isEqual:weChatPrice]){
+            CGFloat weChat = [dict[@"price"] floatValue];
+            newPrice = newPrice - weChat;
+            
+        }else if ([dict isEqual:drawPrice]){
+            CGFloat draw = [self.resultModel.number floatValue]/100.0;
+            newPrice = newPrice * draw;
+        }
+    }
+    //判断促销是否为空
+    if (chooseArray.count) {
+        if (newPrice < 0) {
+            newPrice = 0;
+        }
+    }
+    return newPrice;
+}
 
 #pragma mark -获取经营者支付二维码
 - (void)getPayQrCode
@@ -307,8 +367,7 @@
     order.orderNumber =  self.orderCode;
     order.fnewstate =  PAYSUCCESS;
     order.oldstate =  NOTPAY;
-    order.drawId = self.resultModel.drawId;
-    /// 查询是否有赠送商品促销
+    // 查询是否有赠送商品促销
     order.realAmount = [NSNumber numberWithFloat:[[self.goodsAllPrice.text substringFromIndex:1] floatValue]];
     NSMutableArray *goodsArray = [NSMutableArray array];
     for (id object in self.promotionalArray) {
@@ -327,7 +386,7 @@
         }
     }
     order.promotionGoods = (NSArray<PromotionGoods> *)goodsArray;
-    /// 抵扣金额
+    // 抵扣金额
     CGFloat promotionMoney = 0;
     for (id object in self.promotionalArray) {
         if ([object isKindOfClass:[PromotionalDeductionModel class]]) {
@@ -338,26 +397,34 @@
         }
     }
     order.promotionMoney = @(promotionMoney);
-    /// 查询是否有京东E卡促销
-    NSInteger totalNumber = 0;//促销卡面额
-    for (id object in self.luckyDrawAndJDECardArray) {
-        if ([object isKindOfClass:[PromotionalDeductionModel class]]) {
-            PromotionalDeductionModel *model = (PromotionalDeductionModel *)object;
+    // 查询是否有京东E卡促销
+    NSInteger totalNumber = 0;
+    for (id object in self.promotionalArray) {
+        if ([object isKindOfClass:[PromotionJDECardModel class]]) {
+            PromotionJDECardModel *model = (PromotionJDECardModel *)object;
             if ([model.type isEqualToString:JDECardAction] && [model.body isEqualToString:GUIDE]) {
                 totalNumber += model.total;
             }
         }
     }
     order.jdCardDenomation = totalNumber;
-    /// 查询是否有导购抽奖机会
-    for (id object in self.luckyDrawAndJDECardArray) {
-        if ([object isKindOfClass:[LuckyDrawModel class]]) {
-            LuckyDrawModel *model = (LuckyDrawModel *)object;
+    // 查询是否有导购抽奖和客户抽奖
+    for (id object in self.promotionalArray) {
+        if ([object isKindOfClass:[PromotionLuckyDrawModel class]]) {
+            PromotionLuckyDrawModel *model = (PromotionLuckyDrawModel *)object;
             if ([model.body isEqualToString:GUIDE]) {
                 order.lotteryId = model.lottery.uuid;
             }
+            if ([model.body isEqualToString:CONSUMER]) {
+                order.drawId = self.resultModel.drawId;
+            }
         }
     }
+    // 查询是否有微信卡劵促销
+    if (![[self class] isBlankString:self.weChatModel.wxcardNumber]) {
+        order.wxcardNumber = self.weChatModel.wxcardNumber;
+        order.wxcardDenomation = [NSNumber numberWithInteger:self.weChatModel.wxcardDenomation];
+    }
     //支付类型
     if (self.payTreasureButton.selected) {
        order.payType =  @"005";
@@ -387,6 +454,7 @@
     }
     [self CreateMBProgressHUDLoding];
     WS(weakSelf);
+    NSSLog(@"%@",[order toDictionary]);
     [[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(CONFIRMPAY) WithCallClass:weakSelf WithRequestType:0 WithParameter:order WithReturnValueBlock:^(id returnValue) {
         
         [weakSelf RemoveMBProgressHUDLoding];

Class/Tabbar/CustomTabbarController.m

@@ -22,9 +22,6 @@
 #import "QRViewController.h"
 #import "ExperienceCentreViewController.h"
 #import "RebateViewController.h"
-#import <AVFoundation/AVFoundation.h>
-#import "AnnouncementViewController.h"
-#import "GuideIntegralViewController.H"
 
 @interface CustomTabbarController ()<TabbarButtonClickdelegate,ChangpasswordDelegate,CancelButtondelegate,UITextFieldDelegate>
 
@@ -58,7 +55,7 @@
 {
     if (_identifierArray == nil) {
         
-        _identifierArray = [NSArray arrayWithObjects:@"SearchViewController",@"ShoppingViewController",@"ClientViewController",@"RebateViewController",@"GuideIntegralViewController",@"AnnouncementViewController",@"SceneLibraryViewController",@"ProductLibraryViewController",@"AllCustomerViewController",@"CustomerOrderViewController",@"LearningCenterMainViewController",@"AboutViewController", nil];
+        _identifierArray = [NSArray arrayWithObjects:@"SearchViewController",@"ShoppingViewController",@"ClientViewController",@"RebateViewController",@"SceneLibraryViewController",@"ProductLibraryViewController",@"AllCustomerViewController",@"CustomerOrderViewController",@"AboutViewController", nil];
     }
     return _identifierArray;
 }
@@ -115,6 +112,8 @@
     [self.tabBar addSubview:self.toolview];
     //显示体验中心
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(ShowFollowHeart:) name:OPENFOLLOWHEARTVC object:nil];
+    //打开相应控制器
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(openControllerWithIndex:) name:OPENCONTROLLER object:nil];
 }
 
 
@@ -122,22 +121,8 @@
 - (void)addViewcontroller
 {
     NSMutableArray *controllerArray = [NSMutableArray array];
-    UIStoryboard *storyboard = nil;
+    UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"StoryboardwithCYX" bundle:nil];
     for (int i=0; i<self.identifierArray.count; i++) {
-        
-        NSString *controllString = self.identifierArray[i];
-            // 公告
-        if ([controllString isEqualToString:@"AnnouncementViewController"]) {
-            storyboard = [BaseViewController getAnnouncementStoryboardClass];
-        }else if ([controllString isEqualToString:@"LearningCenterMainViewController"]) {
-            // 学习中心
-            storyboard = [BaseViewController getLearningCenterStoryboardClass];
-        }else if ([controllString isEqualToString:@"GuideIntegralViewController"]) {
-            // 积分
-            storyboard = [BaseViewController getGuideIntegralStoryboardClass];
-        }else {
-            storyboard = [BaseViewController getMainStoryboardClass];
-        }
         BaseViewController *control = [storyboard instantiateViewControllerWithIdentifier:self.identifierArray[i]];
         UINavigationController *nav = [[UINavigationController alloc]initWithRootViewController:control];
         [self.vcArray addObject:nav];
@@ -145,7 +130,6 @@
     }
     self.viewControllers = self.vcArray;
     SHARED_APPDELEGATE.allControllerArray = controllerArray;
-    SHARED_APPDELEGATE.tabBarController = self;
     self.selectedIndex = 2;
 }
 
@@ -176,16 +160,8 @@
             
             break;
             
-            //公告
-        case 101:
-            
-        {
-            self.selectedIndex = 5;
-        }
-            break;
-            
             //某某用户
-        case 102:
+        case 101:
             
         {
             UserViewController *userVC = [[UserViewController alloc]init];
@@ -201,14 +177,14 @@
             break;
             
             //我的客户
-        case 103:
+        case 102:
             
             self.selectedIndex = 2;
             
             break;
             
             //购物车
-        case 104:
+        case 103:
             
             //必须设置当前客户才能跳转到购物车
             if (![Shoppersmanager manager].currentCustomer) {
@@ -275,22 +251,16 @@
 - (void)QrcodeButtonClick
 {
     WS(weakSelf);
-    //判断权限
-    AVAuthorizationStatus status = [AVCaptureDevice authorizationStatusForMediaType:AVMediaTypeVideo];
-    if(status !=AVAuthorizationStatusAuthorized) {
+    // 判断应用是否有使用相机的权限
+    if(![BaseViewController determineCameraPermissions]){
         UIAlertController *alertVC = [UIAlertController alertControllerWithTitle:@"提示" message:@"请在iPad的“设置-隐私-相机”选项中，允许欧立方访问你的相机" preferredStyle:UIAlertControllerStyleAlert];
-        [alertVC addAction:[UIAlertAction actionWithTitle:@"去设置" style:UIAlertActionStyleDestructive handler:^(UIAlertAction * _Nonnull action) {
-            NSURL * url = [NSURL URLWithString:@"prefs:root=com.gomore.opple"];
-            dispatch_after(0.2, dispatch_get_main_queue(), ^{
-                [[UIApplication sharedApplication]openURL:url];
-            });
-        }]];
         [alertVC addAction:[UIAlertAction actionWithTitle:@"知道了" style:UIAlertActionStyleCancel handler:^(UIAlertAction * _Nonnull action) {
-            [weakSelf dismissViewControllerAnimated:YES completion:nil];
+            [[UIApplication sharedApplication]openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString]];
         }]];
         [self presentViewController:alertVC animated:YES completion:nil];
         
     }else {
+        
         QRViewController *qrVC = [[QRViewController alloc] initWithScanCompleteHandler:^(NSString *url) {
             [weakSelf dismissViewControllerAnimated:YES completion:^{
                 
@@ -361,7 +331,8 @@
         
     }else
     {
-        ExperienceCentreViewController *ExperienceCenter = [[BaseViewController getMainStoryboardClass] instantiateViewControllerWithIdentifier:@"ExperienceCentre"];
+        UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"StoryboardwithCYX" bundle:nil];
+        ExperienceCentreViewController *ExperienceCenter = [storyboard instantiateViewControllerWithIdentifier:@"ExperienceCentre"];
         ExperienceCenter.modalPresentationStyle = UIModalPresentationOverFullScreen;
         UIPopoverPresentationController *popover = ExperienceCenter.popoverPresentationController;
         popover.sourceView = ExperienceCenter.view;
@@ -369,5 +340,12 @@
     }
 }
 
+#pragma mark - 打开相应的控制器
+- (void)openControllerWithIndex:(NSNotification *)sender
+{
+    NSInteger index = [sender.object integerValue];
+    [self dismissViewControllerAnimated:NO completion:nil];
+    self.selectedIndex = index;
+}
 
 @end

Lighting.xcodeproj/xcshareddata/xcschemes/Lighting.xcscheme

@@ -42,7 +42,7 @@
       </AdditionalOptions>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Release"
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"

Lighting/AppDelegate.m

@@ -10,6 +10,8 @@
 #import "LoginViewController.h"
 #import "DeviceDirectionManager.h"
 #import <Bugly/Bugly.h>
+#import <PgyUpdate/PgyUpdateManager.h>
+
 @interface AppDelegate ()
 
 @end
@@ -19,10 +21,8 @@
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
     // Override point for customization after application launch.
-    
-    //bug检测
-    [Bugly startWithAppId:@"900033734"];
-    //检测版本更新
+
+    [self setUpBuglyAndPgy];
     [self detectionNetwork];
     [self SetIQKeyboardManager];
     [self RootViewcontroller];
@@ -30,6 +30,14 @@
     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
 {
     //判断是否是横屏
@@ -111,51 +119,7 @@
     }];
 }
 
-/**
- * 比较版本号
- *
- * @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;
-}
-
-
+#pragma mark - 友盟
 -(void)setUMShare
 {
     // 友盟分享初始化
@@ -188,7 +152,7 @@ int compare_version(const char *v1, const char *v2)
 
 - (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.
-    [self updateVersion];
+//    [self updateVersion];
 }
 
 - (void)applicationDidBecomeActive:(UIApplication *)application {

Podfile.lock

@@ -34,6 +34,8 @@ PODS:
     - MMDrawerController/Core
   - MMDrawerController/Subclass (0.6.0):
     - MMDrawerController/Core
+  - Pgyer (2.8.4)
+  - PgyUpdate (1.2)
   - SDWebImage (3.8.2):
     - SDWebImage/Core (= 3.8.2)
   - SDWebImage/Core (3.8.2)
@@ -52,6 +54,8 @@ DEPENDENCIES:
   - MBProgressHUD (~> 0.9.1)
   - MJRefresh
   - MMDrawerController
+  - Pgyer
+  - PgyUpdate
   - SDWebImage
   - UMengAnalytics (~> 4.1.2)
   - UMengSocial
@@ -68,6 +72,8 @@ SPEC CHECKSUMS:
   MBProgressHUD: 1569cf7ace17a8bac47aabfbb8580a49690386d1
   MJRefresh: b96cdb21c4aa75a7b07654311ab2f315c497e806
   MMDrawerController: e3a54a5570388463ad3b36975251575b50c4e1a0
+  Pgyer: 26edfcc8da6da6383fabfdbccd2f77c623b9d6eb
+  PgyUpdate: a42e82cec5ad4e992af390e9d494f6fc62db65e4
   SDWebImage: 098e97e6176540799c27e804c96653ee0833d13c
   UMengAnalytics: 8d95752776c32f5b954d40edc7f23944882a7c14
   UMengSocial: 48b67179c492a8cf7803fbb0438b8f55432e2fc1

Pods/Headers/Public/PgyUpdate/PgyUpdate/PgyUpdateManager.h

+../../../../PgyUpdate/PgySDK/sdk/PgyUpdate.framework/Headers/PgyUpdateManager.h
\ No newline at end of file

Pods/Headers/Public/Pgyer/PgySDK/PgyManager.h

+../../../../Pgyer/PgySDK/sdk/PgySDK.framework/Headers/PgyManager.h
\ No newline at end of file

Pods/Manifest.lock

@@ -34,6 +34,8 @@ PODS:
     - MMDrawerController/Core
   - MMDrawerController/Subclass (0.6.0):
     - MMDrawerController/Core
+  - Pgyer (2.8.4)
+  - PgyUpdate (1.2)
   - SDWebImage (3.8.2):
     - SDWebImage/Core (= 3.8.2)
   - SDWebImage/Core (3.8.2)
@@ -52,6 +54,8 @@ DEPENDENCIES:
   - MBProgressHUD (~> 0.9.1)
   - MJRefresh
   - MMDrawerController
+  - Pgyer
+  - PgyUpdate
   - SDWebImage
   - UMengAnalytics (~> 4.1.2)
   - UMengSocial
@@ -68,6 +72,8 @@ SPEC CHECKSUMS:
   MBProgressHUD: 1569cf7ace17a8bac47aabfbb8580a49690386d1
   MJRefresh: b96cdb21c4aa75a7b07654311ab2f315c497e806
   MMDrawerController: e3a54a5570388463ad3b36975251575b50c4e1a0
+  Pgyer: 26edfcc8da6da6383fabfdbccd2f77c623b9d6eb
+  PgyUpdate: a42e82cec5ad4e992af390e9d494f6fc62db65e4
   SDWebImage: 098e97e6176540799c27e804c96653ee0833d13c
   UMengAnalytics: 8d95752776c32f5b954d40edc7f23944882a7c14
   UMengSocial: 48b67179c492a8cf7803fbb0438b8f55432e2fc1

Pods/PgyUpdate/PgySDK/sdk/PgyUpdate.framework/Headers/PgyUpdateManager.h

+//
+//  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

+//
+//  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/Target Support Files/AFNetworking/AFNetworking.xcconfig

 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"
 PODS_ROOT = ${SRCROOT}
 SKIP_INSTALL = YES
\ No newline at end of file

Pods/Target Support Files/DZNEmptyDataSet/DZNEmptyDataSet.xcconfig

 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"
 PODS_ROOT = ${SRCROOT}
 SKIP_INSTALL = YES
\ No newline at end of file

Pods/Target Support Files/FDFullscreenPopGesture/FDFullscreenPopGesture.xcconfig

 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}
 SKIP_INSTALL = YES
\ No newline at end of file

Pods/Target Support Files/IQKeyboardManager/IQKeyboardManager.xcconfig

 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"
 PODS_ROOT = ${SRCROOT}
 SKIP_INSTALL = YES
\ No newline at end of file

Pods/Target Support Files/JSONModel/JSONModel.xcconfig

 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}
 SKIP_INSTALL = YES
\ No newline at end of file

Pods/Target Support Files/MBProgressHUD/MBProgressHUD.xcconfig

 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"
 PODS_ROOT = ${SRCROOT}
 SKIP_INSTALL = YES
\ No newline at end of file

Pods/Target Support Files/MJRefresh/MJRefresh.xcconfig

 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}
 SKIP_INSTALL = YES
\ No newline at end of file

Pods/Target Support Files/MMDrawerController/MMDrawerController.xcconfig

 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"
 PODS_ROOT = ${SRCROOT}
 SKIP_INSTALL = YES
\ No newline at end of file

Pods/Target Support Files/Masonry/Masonry.xcconfig

 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"
 PODS_ROOT = ${SRCROOT}
 SKIP_INSTALL = YES
\ No newline at end of file

Pods/Target Support Files/Pods/Pods-acknowledgements.markdown

@@ -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
 THE SOFTWARE.
 
+## PgyUpdate
+
+Copyright 2015 pgyer.com. All rights reserved.
+
+
+## Pgyer
+
+Copyright 2015 pgyer.com. All rights reserved.
+
+
 ## SDWebImage
 
 Copyright (c) 2016 Olivier Poitrey rs@dailymotion.com

Pods/Target Support Files/Pods/Pods-acknowledgements.plist

@@ -264,6 +264,24 @@ THE SOFTWARE.</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>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>
 			<key>FooterText</key>
 			<string>Copyright (c) 2016 Olivier Poitrey rs@dailymotion.com

Pods/Target Support Files/Pods/Pods.debug.xcconfig

-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
-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/**
-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_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_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 "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
\ No newline at end of file

Pods/Target Support Files/Pods/Pods.release.xcconfig

-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
-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/**
-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_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_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 "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
\ No newline at end of file

Pods/Target Support Files/SDWebImage/SDWebImage.xcconfig

 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"
 PODS_ROOT = ${SRCROOT}
 SKIP_INSTALL = YES
\ No newline at end of file

Pods/Target Support Files/WYPopoverController/WYPopoverController.xcconfig

 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"
 PODS_ROOT = ${SRCROOT}
 SKIP_INSTALL = YES
\ No newline at end of file

Tools/BaseViewController.m

@@ -8,10 +8,14 @@
 
 #import "BaseViewController.h"
 #import "LoginViewController.h"
+#import <WebKit/WebKit.h>
+#import <AVFoundation/AVFoundation.h>
 
-@interface BaseViewController ()<UIPrintInteractionControllerDelegate,UIWebViewDelegate>
+@interface BaseViewController ()<UIPrintInteractionControllerDelegate,UIWebViewDelegate,WKNavigationDelegate>
 
 
+@property (nonatomic,strong) WKWebView *webView;
+
 /**
  *  提示框
  */
@@ -54,11 +58,22 @@
     return _promptView;
 }
 
+
+- (WKWebView *)webView
+{
+    if (_webView == nil) {
+        
+        _webView = [[WKWebView alloc]initWithFrame:CGRectMake(0, 0, ScreenWidth, ScreenHeight)];
+    }
+    return _webView;
+}
+
+
+
 - (void)viewDidLoad {
     [super viewDidLoad];
-    
+    // Do any additional setup after loading the view.
     self.automaticallyAdjustsScrollViewInsets = NO;
-//    self.navigationController.navigationBar.translucent = NO;
     //检测登陆超时通知
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(logintimeoutNotification:) name:LOGINTIMEOUT object:nil];
 }
@@ -73,7 +88,8 @@
         [weakSelf dismissViewControllerAnimated:YES completion:nil];
         [Shoppersmanager manager].currentCustomer = NO;
         [Customermanager manager].model = nil;
-        LoginViewController *loginVC = [[BaseViewController getMainStoryboardClass] instantiateViewControllerWithIdentifier:@"Login"];
+        UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"StoryboardwithCYX" bundle:nil];
+        LoginViewController *loginVC = [storyboard instantiateViewControllerWithIdentifier:@"Login"];
         [[NSUserDefaults standardUserDefaults] removeObjectForKey:USERNAME];
         [[NSUserDefaults standardUserDefaults] removeObjectForKey:PASSWORD];
         [weakSelf restoreRootViewController:loginVC];
@@ -165,7 +181,7 @@
     UIImage *image = [[UIImage imageNamed:@"Checkmark"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal];
     hud.customView = [[UIImageView alloc] initWithImage:image];
     hud.color = [[UIColor blackColor] colorWithAlphaComponent:0.6];
-    hud.labelFont = [UIFont systemFontOfSize:12];
+    hud.labelFont = [UIFont systemFontOfSize:15];
     hud.labelText = successString;
     [hud hide:YES afterDelay:3];
 }
@@ -214,31 +230,22 @@
 }
 
 #pragma mark -获得我的storyboard对象
-+ (UIStoryboard *)getMainStoryboardClass
-{
-    UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"OppleMain" bundle:nil];
-    return storyboard;
-}
-
-#pragma mark - 获得公告storyboard对象
-+ (UIStoryboard *)getAnnouncementStoryboardClass
+- (UIStoryboard *)getStoryboardWithName
 {
-    UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"Announcement" bundle:nil];
+    UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"StoryboardwithCYX" bundle:nil];
     return storyboard;
 }
 
-#pragma mark - 获得学习中心storyboard对象
-+ (UIStoryboard *)getLearningCenterStoryboardClass
+#pragma mark - 判断相机权限
++ (BOOL)determineCameraPermissions
 {
-    UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"LearningCenter" bundle:nil];
-    return storyboard;
-}
-
-#pragma mark -获得积分storyboard对象
-+ (UIStoryboard *)getGuideIntegralStoryboardClass
-{
-    UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"GuideIntegral" bundle:nil];
-    return storyboard;
+    NSString *mediaType = AVMediaTypeVideo;//读取媒体类型
+    AVAuthorizationStatus authStatus = [AVCaptureDevice authorizationStatusForMediaType:mediaType];//读取设备授权状态
+    if(authStatus == AVAuthorizationStatusRestricted || authStatus == AVAuthorizationStatusDenied){
+        return NO;
+    }else {
+        return YES;
+    }
 }
 
 #pragma mark 调用airPrint无线打印机
@@ -284,10 +291,10 @@
 }
 
 #pragma mark - 提示框
-- (void)promptCustomerTitle:(NSString *)title finish:(void (^)())complete
+- (void)promptCustomerTitle:(NSString *)title withMessage:(NSString *)message finish:(void (^)())complete
 {
-    UIAlertController *alertVC = [UIAlertController alertControllerWithTitle:nil message:title preferredStyle:UIAlertControllerStyleAlert];
-    [alertVC addAction:[UIAlertAction actionWithTitle:@"我知道了" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
+    UIAlertController *alertVC = [UIAlertController alertControllerWithTitle:nil message:message preferredStyle:UIAlertControllerStyleAlert];
+    [alertVC addAction:[UIAlertAction actionWithTitle:title style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
         if (complete) {
             complete();
         }

Tools/CYConstManager.h

@@ -253,6 +253,11 @@ extern NSString *const  RECEIVEJDECARD;
  */
 extern NSString *const QUERYALLJDECARD;
 
+/**
+ *  微信卡劵
+ */
+extern NSString *const WeChatCard;
+
 /**
  *  使用京东E卡
  */
@@ -272,6 +277,11 @@ extern NSString *const ORDERDETAILSURL;
  *  抽奖结果查询
  */
 extern NSString *const LOTTERYED;
+
+/**
+ *  使用微信卡劵
+ */
+extern NSString *const USEWECHATCARD;
 /*****************************************接口地址*****************************************/
 
 

Tools/CYConstManager.m

@@ -271,6 +271,11 @@ NSString *const ORDERDETAILSURL = @"/tOOrderController.do?htmlOfPdf&reseller_id=
  *  抽奖结果查询
  */
 NSString *const LOTTERYED = @"/lottery/query";
+
+/**
+ *  使用微信卡劵
+ */
+NSString *const USEWECHATCARD = @"http://wxcard.opple.com/api/Pay?voucherNo=%@&orderNum=%@&orderTotal=%@";
 /*****************************************接口地址*****************************************/
 
 
@@ -349,6 +354,11 @@ NSString *const goodsAction = @"goodsAction";
  */
 NSString *const lotteryAction = @"lotteryAction";
 
+/**
+ *  微信卡劵
+ */
+NSString *const WeChatCard = @"wxCardAction";
+
 /**
  *  未付款
  */

Tools/Customermanager.h

@@ -19,32 +19,32 @@
 + (Customermanager *)manager;
 
 
-///**
+//**
 // *  客户iD
 // */
 //@property (nonatomic,copy) NSString *customerID;
 //
-///**
+//**
 // *  客户姓名
 // */
 //@property (nonatomic,copy) NSString *customerName;
 //
-///**
+//**
 // *  客户手机号码
 // */
 //@property (nonatomic,copy) NSString *customerPhoneNumber;
 //
-///**
+//**
 // *  客户公司名字
 // */
 //@property (nonatomic,copy) NSString *companyName;
 //
-///**
+//**
 // *  客户地址
 // */
 //@property (nonatomic,copy) NSString *cutomerAddress;
 //
-///**
+//**
 // *  header
 // */
 //@property (nonatomic,copy) NSString *header;

Tools/ExperienceCentreViewController.m

@@ -180,7 +180,7 @@
 
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
 {
-    __weak typeof(self) weakSelf = self;
+    WS(weakSelf);
     ProductScreeningTableViewCell *cell = [tableView cellForRowAtIndexPath:indexPath];
     TOGoodsEntityModel *model = [self.productDatasArray objectAtIndex_opple:indexPath.row];
     CGRect cellRect = [cell convertRect:cell.bounds toView:self.view];
@@ -280,8 +280,6 @@
     popover.sourceView = shareController.view;
     popover.sourceRect =  CGRectMake(sender.mj_x, sender.mj_y-30, sender.mj_w, sender.mj_h);
     [self presentViewController:shareController animated:YES completion:nil];
-    
-
 }
 
 #pragma mark -保存图片到相册

Tools/NetworkRequestClassManager.m

@@ -50,6 +50,8 @@ static NetworkRequestClassManager *manager = nil;
     manager.requestSerializer = [AFJSONRequestSerializer serializer];
     manager.requestSerializer.timeoutInterval = 60.0f;
     [manager.requestSerializer setValue:@"application/json;charset=utf-8" forHTTPHeaderField: @"Content-Type"];
+    [manager.requestSerializer setValue:[[[NSBundle mainBundle] infoDictionary]
+                                         objectForKey:@"CFBundleShortVersionString"] forHTTPHeaderField: @"version"];
     return manager;
 }
 

Tools/PrefixHeader.pch

@@ -55,6 +55,16 @@
 //#define debugMethod()
 //#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代理
@@ -138,7 +148,7 @@
  */
 //#define SERVERREQUESTURL(URL)  [NSString stringWithFormat:@"http://dg-dev.opple.com/opple-web/app%@",URL]
 
-///**
+//**
 // *  服务器正式地址
 // */
 //#define SERVERREQUESTURL(URL)  [NSString stringWithFormat:@"http://dg.opple.com/opple-web/app%@",URL]

Tools/QRViewController.m

@@ -152,13 +152,9 @@
     {
         [_session addOutput:self.output];
     }
-    
     AVCaptureConnection *outputConnection = [_output connectionWithMediaType:AVMediaTypeVideo];
     outputConnection.videoOrientation = [QRUtil videoOrientationFromCurrentDeviceOrientation];
-    
-    
     // 条码类型 AVMetadataObjectTypeQRCode
-//    _output.metadataObjectTypes =@[AVMetadataObjectTypeQRCode];
     _output.metadataObjectTypes = @[AVMetadataObjectTypeEAN13Code,
                                     AVMetadataObjectTypeEAN8Code,
                                     AVMetadataObjectTypeCode128Code,
@@ -169,9 +165,7 @@
     _preview.videoGravity =AVLayerVideoGravityResize;
     _preview.frame =[QRUtil screenBounds];
     [self.view.layer insertSublayer:_preview atIndex:0];
-    
     _preview.connection.videoOrientation = [QRUtil videoOrientationFromCurrentDeviceOrientation];
-    
     [_session startRunning];
 }
 

Tools/SceneViewController.m

@@ -474,7 +474,7 @@
 #pragma mark -获取商品列表数据
 - (void)getGoodsListDatasisRemove:(BOOL)remove Withobject:(GoodsCondition *)conditon
 {
-    __weak typeof(self)weakSelf = self;
+    WS(weakSelf);
     [self getGoodsListdatas:conditon returnResponse:^(GoodsResponse *response) {
         
         weakSelf.sceneOrProductClollectionView.emptyDataSetSource = weakSelf;
@@ -524,7 +524,7 @@
             newModel.pictures = model.pictures;
             newModel.barcode = model.barcode;
             newModel.isSelectedState = NO;
-            newModel.goodsNumber = 1;
+            newModel.goodsNumber = ONE;
             [weakSelf.productDatasArray addObject:newModel];
         }
         for (TOGoodsEntityModel *model in SHARED_APPDELEGATE.productArray) {
@@ -542,7 +542,7 @@
 - (void)getGoodsListdatas:(GoodsCondition *)conditon returnResponse:(void(^)(GoodsResponse *))finish
 {
     WS(weakSelf);
-    [[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(PRODUCTLIST) WithCallClass:weakSelf WithRequestType:0 WithParameter:conditon WithReturnValueBlock:^(id returnValue) {
+    [[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(PRODUCTLIST) WithCallClass:weakSelf WithRequestType:ZERO WithParameter:conditon WithReturnValueBlock:^(id returnValue) {
         
         [weakSelf endRefreshingForTableView:weakSelf.sceneOrProductClollectionView];
         if ([returnValue[@"code"] isEqualToNumber:@0]) {

Tools/ShoppingBagViewController.m

@@ -105,7 +105,7 @@
     cell.clinchTextfield.userInteractionEnabled = NO;
     cell.ClinchPriceBackView.backgroundColor = cell.backgroundColor;
     //cell选中回调
-    __weak typeof(self) weakSelf = self;
+    WS(weakSelf);
     [cell setReturnCellblock:^(NSInteger index) {
         
         [weakSelf setSelectedButton:index];

Tools/opple_objc_json_client.h

@@ -798,6 +798,20 @@ extern NSString * const SORTDIRECTION_DESC;
  *
  */
 @property (nonatomic, strong) NSNumber *promotionMoney;
+
+/**
+ * 微信卡券卡号
+ *
+ *
+ */
+@property (nonatomic, copy) NSString *wxcardNumber;
+/**
+ * 微信卡券面额
+ *
+ *
+ */
+@property (nonatomic, strong) NSNumber *wxcardDenomation;
+
 @end /* interface OrderPayRequest */
 
 

Tools/opple_objc_json_client.m

@@ -267,6 +267,8 @@
 @synthesize promotionGoods;
 @synthesize jdCardDenomation;
 @synthesize promotionMoney;
+@synthesize wxcardNumber;
+@synthesize wxcardDenomation;
 
 +(BOOL)propertyIsOptional:(NSString*)propertyName
 {

podfile

@@ -13,4 +13,5 @@ pod 'JSONModel', '~> 1.2.0'
 pod 'UMengSocial'
 pod 'DZNEmptyDataSet'
 pod 'Bugly'
+pod 'PgyUpdate'
 pod 'UMengAnalytics', '~> 4.1.2'