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

Class/CustomerOrderViewController.m

@@ -117,7 +117,7 @@
     WS(weakSelf);
     MjRefreshHeaderCustom *headerRefresh = [MjRefreshHeaderCustom headerWithRefreshingBlock:^{
         
-        self.indexPage = ONE;
+        weakSelf.indexPage = ONE;
         DataPage *page = [[DataPage alloc]init];
         page.page = weakSelf.indexPage;
         page.rows = KROWS;
@@ -220,6 +220,7 @@
     OrderdetailsViewController *orderdetails = [storyboard instantiateViewControllerWithIdentifier:@"orderdetails"];
     TOOrderEntity *model = (TOOrderEntity *)[[self.datasArray objectAtIndex_opple:indexPath.row] order];
     orderdetails.orderCode = model.orderNumber;
+    orderdetails.consumerId = model.consumerId;
     if ([model.orderState isEqualToString:@"006"] || [model.orderState isEqualToString:@"002"] || [model.orderState isEqualToString:@"003"]) {
         orderdetails.isShowPrintButton = YES;
         orderdetails.isShowPayButton = NO;

Class/Login/LoginViewController.m

@@ -126,8 +126,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/OrderdetailsViewController.h

@@ -60,12 +60,16 @@
  */
 @property (nonatomic,assign) BOOL isSliding;
 
-
 /**
  *  是否开启交互
  */
 @property (nonatomic,assign) BOOL isUserInteractionEnabled;
 
+/**
+ 用户ID
+ */
+@property (nonatomic,copy) NSString *consumerId;
+
 
 
 

Class/PromotionLuckyDrawModel.h

@@ -34,6 +34,9 @@
 
 // 是否选中
 @property (nonatomic,assign) BOOL isSelected;
+
+// 是否使用
+@property (nonatomic,assign) BOOL isUsed;
 @end
 
 

Class/PromotionWeChatCardModel.h

@@ -30,5 +30,26 @@
 
 // 冲突列表
 @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

@@ -21,3 +21,13 @@
 }
 
 @end
+
+
+@implementation WeChatCardModel
+
++ (BOOL)propertyIsOptional:(NSString *)propertyName
+{
+    return YES;
+}
+
+@end

Class/PromotionalTableViewCell.m

@@ -25,7 +25,7 @@
         //微信卡劵
     if ([promotionModel isMemberOfClass:[PromotionWeChatCardModel class]]) {
         PromotionWeChatCardModel *weChatModel = (PromotionWeChatCardModel *)promotionModel;
-        self.promotionalTitleLabel.text = [NSString stringWithFormat:@"使用微信卡劵: %@",weChatModel.descriptionString];
+        self.promotionalTitleLabel.text = [NSString stringWithFormat:@"微信卡劵: %@",weChatModel.descriptionString];
     }else if ([promotionModel isMemberOfClass:[PromotionalDeductionModel class]]) {
         //抵扣
         PromotionalDeductionModel *deductionModel = (PromotionalDeductionModel *)promotionModel;

Class/SettlementViewController.h

@@ -8,7 +8,7 @@
 
 #import "BaseViewController.h"
 #import "PromotionLuckDrawResultModel.h"
-
+#import "PromotionWeChatCardModel.h"
 @interface SettlementViewController : BaseViewController
 
 
@@ -124,5 +124,10 @@
  */
 @property (nonatomic,strong) PromotionLuckDrawResultModel *resultModel;
 
+/**
+ 微信卡劵
+ */
+@property (nonatomic,strong) WeChatCardModel *weChatModel;
+
 
 @end

Class/SettlementViewController.m

@@ -360,6 +360,11 @@
             }
         }
     }
+    // 查询是否有微信卡劵促销
+    if (![[self class] isBlankString:self.weChatModel.wxcardNumber]) {
+        order.wxcardNumber = self.weChatModel.wxcardNumber;
+        order.wxcardDenomation = [NSNumber numberWithInteger:self.weChatModel.wxcardDenomation];
+    }
     //支付类型
     if (self.payTreasureButton.selected) {
        order.payType =  @"005";

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
 {
     //判断是否是横屏
@@ -112,51 +120,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
 {
     // 友盟分享初始化
@@ -189,7 +153,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/CYConstManager.h

@@ -277,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=%@";
 /*****************************************接口地址*****************************************/
 
 

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代理

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'