京东卡劵相关处理，28号版本内容基本完成

Class/AllCustomerViewController.m

@@ -374,7 +374,7 @@
     [textField resignFirstResponder];
     self.conditionModel.nameEquals = self.searchTextfield.text;
     self.conditionModel.mobileEquals = self.searchTextfield.text;
-    if (self.searchTextfield.text.length == 0) {
+    if ([BaseViewController isBlankString:self.searchTextfield.text]) {
         self.conditionModel.nameEquals = nil;
         self.conditionModel.mobileEquals = nil;
     }

Class/CardAmplificationViewController.h

@@ -8,6 +8,8 @@
 
 #import "BaseViewController.h"
 
+
+
 @interface CardAmplificationViewController : BaseViewController
 
 /**
@@ -20,6 +22,39 @@
  */
 @property (weak, nonatomic) IBOutlet UIButton *sureButton;
 
+/**
+ *  数据源
+ */
+@property (nonatomic,strong) TOJingdongEcardEntity *cardModel;
 
+/**
+ *  背景图片
+ */
+@property (weak, nonatomic) IBOutlet UIImageView *backgroundImageView;
+
+/**
+ *  卡号
+ */
+@property (weak, nonatomic) IBOutlet UILabel *cardNumberLabel;
+
+/**
+ *  密码
+ */
+@property (weak, nonatomic) IBOutlet UILabel *cardPasswordLabel;
+
+/**
+ *  金额
+ */
+@property (weak, nonatomic) IBOutlet UILabel *amountLabel;
+
+/**
+ *  遮罩层
+ */
+@property (nonatomic,strong) MDScratchImageView *maskView;
+
+/**
+ *  改变京东卡状态后需要刷新
+ */
+@property (nonatomic,copy) void(^refreshJDCardList)();
 
 @end

Class/CardAmplificationViewController.m

@@ -8,7 +8,7 @@
 
 #import "CardAmplificationViewController.h"
 
-@interface CardAmplificationViewController ()
+@interface CardAmplificationViewController ()<MDScratchImageViewDelegate>
 
 @end
 
@@ -16,14 +16,28 @@
 
 - (void)viewDidLoad {
     [super viewDidLoad];
-    // Do any additional setup after loading the view from its nib.
+    
+    [self addMaskView];
 }
 
-- (void)viewWillAppear:(BOOL)animated
+#pragma mark - 添加遮罩层
+- (void)addMaskView
 {
-    self.view.superview.layer.cornerRadius = 0;
+    _maskView = [[MDScratchImageView alloc]init];
+    [self.view addSubview:_maskView];
+    [_maskView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.equalTo(self.cardPasswordLabel);
+        make.top.equalTo(self.cardPasswordLabel);
+        make.size.equalTo(self.cardPasswordLabel);
+    }];
+    _maskView.delegate = self;
+    [_maskView setImage:TCImage(@"mask") radius:10];
 }
 
+- (void)viewWillAppear:(BOOL)animated
+{
+    self.view.superview.layer.cornerRadius = 15;
+}
 
 #pragma mark - 取消
 - (IBAction)cancelButtonClickAction:(UIButton *)sender {
@@ -34,9 +48,49 @@
 #pragma mark - 确认
 - (IBAction)sureButtonClickAction:(UIButton *)sender {
     
+    WS(weakSelf);
+    [self CreateMBProgressHUDLoding];
+    [[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:[NSString stringWithFormat:SERVERREQUESTURL(RECEIVEJDECARD),_cardModel.cardNumber] WithRequestType:Zero WithParameter:nil WithReturnValueBlock:^(id returnValue) {
+        
+        [weakSelf RemoveMBProgressHUDLoding];
+        if ([returnValue[@"code"] isEqualToNumber:@0]) {
+            [weakSelf SHOWPrompttext:@"领取成功"];
+            if (weakSelf.refreshJDCardList) {
+                weakSelf.refreshJDCardList();
+            }
+        }else
+        {
+            [weakSelf ErrorMBProgressView:@"领取失败"];
+        }
+        
+    } WithErrorCodeBlock:^(id errorCodeValue) {
+        [weakSelf RemoveMBProgressHUDLoding];
+        [weakSelf ErrorMBProgressView:NETWORK];
+    } WithFailureBlock:^(NSError *error) {
+        [weakSelf RemoveMBProgressHUDLoding];
+        [weakSelf ErrorMBProgressView:error.localizedDescription];
+    }];
+    [self dismissViewControllerAnimated:YES completion:nil];
 }
 
+- (void)setCardModel:(TOJingdongEcardEntity *)cardModel
+{
+    _cardModel = cardModel;
+    self.backgroundImageView.image = [BaseViewController getCorrespondingPictures:_cardModel.denomation];
+    self.cardNumberLabel.text = _cardModel.cardNumber;
+    self.cardPasswordLabel.text = _cardModel.cardPassword;
+    //是否已查看
+    if ([_cardModel.state isEqualToString:@"looked"]) {
+        [self.maskView removeFromSuperview];
+    }
+    self.amountLabel.text = [NSString stringWithFormat:@"￥%ld",_cardModel.denomation];
+}
 
+#pragma mark - <MDScratchImageViewDelegate>
+- (void)mdScratchImageView:(MDScratchImageView *)scratchImageView didChangeMaskingProgress:(CGFloat)maskingProgress
+{
+    NSLog(@"%f",maskingProgress);
+}
 
 - (void)didReceiveMemoryWarning {
     [super didReceiveMemoryWarning];

Class/CardBeenUseViewController.m

@@ -39,7 +39,7 @@
         page.rows = 10;
         page.order = @"desc";
         _requestModel.guideIdEquals = [Shoppersmanager manager].Shoppers.employee.fid;
-        _requestModel.stateEquals = @"actived";
+        _requestModel.stateEquals = LOOKED;
         _requestModel.page = page;
     }
     return _requestModel;
@@ -86,7 +86,8 @@
     self.beenUseCardCollectionView.mj_footer = footer;
 }
 
-#pragma mark - 获取未使用卡劵
+
+#pragma mark - 获取已激活卡劵
 - (void)getCardDatasAction:(BOOL)isRemove
 {
     WS(weakSelf);
@@ -120,19 +121,28 @@
     self.beenUseLayout.minimumLineSpacing = 20;
     self.beenUseLayout.minimumInteritemSpacing = 20;
     [self.beenUseCardCollectionView registerNib:[UINib nibWithNibName:@"CardOrderInformationReusableView" bundle:nil] forSupplementaryViewOfKind:UICollectionElementKindSectionHeader withReuseIdentifier:@"CardOrderInformationReusableView"];
+    //** 查看京东卡密码后调用 */
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(refreshList:) name:VIEWPASSWORD object:nil];
+}
+
+#pragma mark - 刷新列表
+- (void)refreshList:(NSNotification *)sender
+{
+    [self.beenUseCardCollectionView.mj_header beginRefreshing];
 }
 
 - (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath
 {
-    CardCollectionViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"CardCollectionViewCell" forIndexPath:indexPath];
-    
+    CardCollectionViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"CardCollectionViewCelltwohundred" forIndexPath:indexPath];
+    GroupByOrderNumber *model = self.datasArray[indexPath.section];
+    cell.Cardmodel = model.eCards[indexPath.row];
     return cell;
 }
 
 - (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section
 {
     GroupByOrderNumber *model = self.datasArray[section];
-    return model.ecards.count;
+    return model.eCards.count;
 }
 
 - (UICollectionReusableView *)collectionView:(UICollectionView *)collectionView viewForSupplementaryElementOfKind:(NSString *)kind atIndexPath:(NSIndexPath *)indexPath
@@ -163,6 +173,8 @@
     settlement.modalPresentationStyle = UIModalPresentationFormSheet;
     UIPopoverPresentationController *pop = settlement.popoverPresentationController;
     pop.sourceView = settlement.view;
+    GroupByOrderNumber *model = self.datasArray[indexPath.section];
+    settlement.cardModel = model.eCards[indexPath.row];
     [self presentViewController:settlement animated:YES completion:nil];
 }
 
@@ -187,6 +199,10 @@
     // Dispose of any resources that can be recreated.
 }
 
+- (void)dealloc
+{
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
+}
 
 
 @end

Class/CardCollectionViewCell.h

@@ -15,5 +15,30 @@
  */
 @property (weak, nonatomic) IBOutlet UIImageView *backgroundImageView;
 
+/**
+ *  卡号
+ */
+@property (weak, nonatomic) IBOutlet UILabel *cardNumberLabel;
+
+/**
+ *  密码
+ */
+@property (weak, nonatomic) IBOutlet UILabel *cardPasswordLabel;
+
+/**
+ *  金额
+ */
+@property (weak, nonatomic) IBOutlet UILabel *amountLabel;
+
+/**
+ *  数据源
+ */
+@property (nonatomic,strong)  TOJingdongEcardEntity *Cardmodel;
+
+/**
+ *  遮罩层
+ */
+@property (nonatomic,strong) UIImageView *maskView;
+
 
 @end

Class/CardCollectionViewCell.m

@@ -11,7 +11,30 @@
 @implementation CardCollectionViewCell
 
 
+- (void)awakeFromNib
+{
+    _maskView = [[UIImageView alloc]init];
+    [self.contentView addSubview:_maskView];
+    [_maskView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.equalTo(self.cardPasswordLabel);
+        make.top.equalTo(self.cardPasswordLabel);
+        make.size.equalTo(self.cardPasswordLabel);
+    }];
+    [_maskView setImage:TCImage(@"mask")];
+}
 
 
+- (void)setCardmodel:(TOJingdongEcardEntity *)Cardmodel
+{
+    _Cardmodel = Cardmodel;
+    self.backgroundImageView.image = [BaseViewController getCorrespondingPictures:_Cardmodel.denomation];
+    self.cardNumberLabel.text = _Cardmodel.cardNumber;
+    self.cardPasswordLabel.text = _Cardmodel.cardPassword;
+    //是否已查看
+    if ([_Cardmodel.state isEqualToString:@"looked"]) {
+        [self.maskView removeFromSuperview];
+    }
+    self.amountLabel.text = [NSString stringWithFormat:@"￥%ld",_Cardmodel.denomation];
+}
 
 @end

Class/CardDontUseViewController.m

@@ -46,7 +46,7 @@
         page.rows = 10;
         page.order = @"desc";
         _requestModel.guideIdEquals = [Shoppersmanager manager].Shoppers.employee.fid;
-        _requestModel.stateEquals = @"dispensed";
+        _requestModel.stateEquals = [NSString stringWithFormat:@"%@,%@",DISPENSED,ACTIVED];
         _requestModel.page = page;
     }
     return _requestModel;
@@ -107,16 +107,17 @@
 - (void)getCardDatasAction:(BOOL)isRemove
 {
     WS(weakSelf);
+    NSLog(@"%@",[self.requestModel toDictionary]);
     [[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(CARDINFORMATION) WithRequestType:Zero WithParameter:self.requestModel WithReturnValueBlock:^(id returnValue) {
         
-        weakSelf.dontUseCardCollectionView.emptyDataSetSource = self;
-        weakSelf.dontUseCardCollectionView.emptyDataSetDelegate = self;
+        weakSelf.dontUseCardCollectionView.emptyDataSetSource = weakSelf;
+        weakSelf.dontUseCardCollectionView.emptyDataSetDelegate = weakSelf;
         [weakSelf endRefreshingForTableView:weakSelf.dontUseCardCollectionView];
         if ([returnValue[@"code"] isEqualToNumber:@0]) {
             [weakSelf.datasArray removeAllObjects];
             RsJingDongECardResponse *cardInformation = [[RsJingDongECardResponse alloc]initWithDictionary:returnValue[@"data"] error:nil];
             weakSelf.totalPage = cardInformation.totalpages;
-            [weakSelf.datasArray addObjectsFromArray:cardInformation.list];
+            [weakSelf.datasArray addObjectsFromArray:[NSMutableArray arrayWithArray:cardInformation.list]];
             [weakSelf.dontUseCardCollectionView reloadData];
         }else{
             [weakSelf ErrorMBProgressView:returnValue[@"message"]];
@@ -131,15 +132,16 @@
 
 - (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath
 {
-    CardCollectionViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"CardCollectionViewCell" forIndexPath:indexPath];
-    
+    CardCollectionViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"CardCollectionViewCellonehundred" forIndexPath:indexPath];
+    GroupByOrderNumber *model = self.datasArray[indexPath.section];
+    cell.Cardmodel = model.eCards[indexPath.row];
     return cell;
 }
 
 - (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section
 {
     GroupByOrderNumber *model = self.datasArray[section];
-    return model.ecards.count;
+    return model.eCards.count;
 }
 
 - (UICollectionReusableView *)collectionView:(UICollectionView *)collectionView viewForSupplementaryElementOfKind:(NSString *)kind atIndexPath:(NSIndexPath *)indexPath
@@ -165,11 +167,21 @@
 
 - (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath
 {
+    GroupByOrderNumber *model = self.datasArray[indexPath.section];
+    if ([[self class] isBlankString:model.orderReceiptUrl]) {
+        [self SHOWPrompttext:@"不能查看未激活卡劵,请先上传小票激活卡劵"];return;
+    }
     CardAmplificationViewController *settlement = [[CardAmplificationViewController alloc]init];
     settlement.preferredContentSize = CGSizeMake(500, 370);
     settlement.modalPresentationStyle = UIModalPresentationFormSheet;
     UIPopoverPresentationController *pop = settlement.popoverPresentationController;
     pop.sourceView = settlement.view;
+    settlement.cardModel = model.eCards[indexPath.row];
+    WS(weakSelf);
+    [settlement setRefreshJDCardList:^{
+        [weakSelf.dontUseCardCollectionView.mj_header beginRefreshing];
+        [[NSNotificationCenter defaultCenter] postNotificationName:VIEWPASSWORD object:nil];
+    }];
     [self presentViewController:settlement animated:YES completion:nil];
 }
 
@@ -177,6 +189,7 @@
 #pragma mark - <UploadReceiptsDelegate>
 - (void)startUploadReceipts:(NSInteger)sectionIndex
 {
+    WS(weakSelf);
     self.orderNumber = [self.datasArray[sectionIndex] orderNumber];
     UIAlertController *alertView = [UIAlertController alertControllerWithTitle:nil message:nil preferredStyle:UIAlertControllerStyleAlert];
     UIImagePickerController *PcCamera = [[UIImagePickerController alloc]init];
@@ -187,12 +200,12 @@
         if ([UIImagePickerController isSourceTypeAvailable:UIImagePickerControllerSourceTypeCamera]) {
             [PcCamera setSourceType:UIImagePickerControllerSourceTypeCamera];
             PcCamera.allowsEditing = YES;
-            [self presentViewController:PcCamera animated:YES completion:nil];
+            [weakSelf presentViewController:PcCamera animated:YES completion:nil];
         }
         else
         {
             [DeviceDirectionManager instance].isHorizontal=NO;
-            [self ErrorMBProgressView:@"相机无法使用"];
+            [weakSelf ErrorMBProgressView:@"相机无法使用"];
         }
     }]];
     [alertView addAction:[UIAlertAction actionWithTitle:@"从相册选择" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
@@ -200,12 +213,12 @@
         if ([UIImagePickerController isSourceTypeAvailable:UIImagePickerControllerSourceTypePhotoLibrary]) {
             [PcCamera setSourceType:UIImagePickerControllerSourceTypePhotoLibrary];
             PcCamera.allowsEditing = YES;
-            [self presentViewController:PcCamera animated:YES completion:nil];
+            [weakSelf presentViewController:PcCamera animated:YES completion:nil];
         }
         else
         {
             [DeviceDirectionManager instance].isHorizontal=NO;
-            [self ErrorMBProgressView:@"相册无法打开"];
+            [weakSelf ErrorMBProgressView:@"相册无法打开"];
         }
     }]];
     [alertView addAction:[UIAlertAction actionWithTitle:@"取消" style:UIAlertActionStyleCancel handler:^(UIAlertAction * _Nonnull action) {
@@ -257,6 +270,11 @@
         [weakSelf RemoveMBProgressHUDLoding];
         if ([returnValue[@"code"] isEqualToNumber:@0]) {
             [weakSelf SuccessMBProgressView:@"激活成功"];
+            for (GroupByOrderNumber *order in weakSelf.datasArray) {
+                if ([order.orderNumber isEqualToString:self.orderNumber]) {
+                    order.orderReceiptUrl = imagePath;break;
+                }
+            }
             [[NSNotificationCenter defaultCenter] postNotificationName:UPLOAD_COMPLETE object:nil];
         }else{
             [weakSelf ErrorMBProgressView:returnValue[@"message"]];

Class/CardOrderInformationReusableView.m

@@ -28,6 +28,8 @@
 {
     _model = model;
     self.orderNumberLabel.text = _model.orderNumber;
+    self.orderTimelabel.text = _model.orderTime;
+    self.uploadReceiptsButton.hidden = [BaseViewController isBlankString:_model.orderReceiptUrl]?NO:YES;
 }
 
 #pragma mark - 上传完成隐藏按钮

Class/CardViewController.m

@@ -9,7 +9,7 @@
 #import "CardViewController.h"
 #import "CardCollectionViewCell.h"
 
-@interface CardViewController ()<UICollectionViewDelegate,UICollectionViewDataSource>
+@interface CardViewController ()<UICollectionViewDelegate,UICollectionViewDataSource,DZNEmptyDataSetSource,DZNEmptyDataSetDelegate>
 
 //** 查询最近10张卡劵 */
 @property (nonatomic,strong) RsJingDongECardRequest *requestModel;
@@ -60,11 +60,16 @@
     WS(weakSelf);
     [[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(CARDINFORMATION) WithRequestType:Zero WithParameter:self.requestModel WithReturnValueBlock:^(id returnValue) {
         
+//        weakSelf.cardCollectionView.emptyDataSetSource = self;
+//        weakSelf.cardCollectionView.emptyDataSetDelegate = self;
+        [weakSelf endRefreshingForTableView:weakSelf.cardCollectionView];
         if ([returnValue[@"code"] isEqualToNumber:@0]) {
             [weakSelf.datasArray removeAllObjects];
-            for (NSDictionary *dict in returnValue[@"data"][@"list"]) {
-                RsJingDongECardResponse *cardInformation = [[RsJingDongECardResponse alloc]initWithDictionary:dict error:nil];
-                [weakSelf.datasArray addObject:cardInformation];
+            RsJingDongECardResponse *cardInformation = [[RsJingDongECardResponse alloc]initWithDictionary:returnValue[@"data"] error:nil];
+            for (GroupByOrderNumber *order in cardInformation.list) {
+                for (TOJingdongEcardEntity *model in order.eCards) {
+                    [weakSelf.datasArray addObject:model];
+                }
             }
             [weakSelf.cardCollectionView reloadData];
         }else{
@@ -79,15 +84,33 @@
 }
 
 #pragma mark <UICollectionViewDataSource>
-- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section {
+- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section
+{
     return self.datasArray.count;
 }
 
-- (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath {
-    
-    CardCollectionViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"CardCollectionViewCell" forIndexPath:indexPath];
+- (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath
+{
+    CardCollectionViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"CardCollectionViewCellfifty" forIndexPath:indexPath];
+    cell.Cardmodel = self.datasArray[indexPath.row];
     return cell;
 }
 
 
+#pragma mark -友好界面
+- (UIImage *)imageForEmptyDataSet:(UIScrollView *)scrollView
+{
+    return kNoDataImage;
+}
+
+- (BOOL)emptyDataSetShouldAllowScroll:(UIScrollView *)scrollView
+{
+    return YES;
+}
+
+- (NSAttributedString *)titleForEmptyDataSet:(UIScrollView *)scrollView
+{
+    return [[NSAttributedString alloc]initWithString:@"暂无数据" attributes:nil];
+}
+
 @end

Class/ChangePasswordViewController.m

@@ -59,15 +59,15 @@
 - (IBAction)sureChangeButtonClick:(UIButton *)sender {
     
     [self.view endEditing:YES];
-    if (self.userName.text.length == 0) {
+    if ([BaseViewController isBlankString:self.userName.text]) {
         
         [self ErrorMBProgressView:@"账户名不能为空"];
     }
-    else if (self.oldPassWord.text.length == 0)
+    else if ([BaseViewController isBlankString:self.oldPassWord.text])
     {
         [self ErrorMBProgressView:@"旧密码不能为空"];
     }
-    else if (self.NewPassWord.text.length == 0)
+    else if ([BaseViewController isBlankString:self.NewPassWord.text])
     {
         [self ErrorMBProgressView:@"新密码不能为空"];
     }

Class/ClientViewController.m

@@ -568,12 +568,12 @@
 - (void)addCustomerInformation:(BOOL)isChange
 {
     [self.view endEditing:YES];
-    if (self.customerNameField.text.length == 0) {
+    if ([BaseViewController isBlankString:self.customerNameField.text]) {
         
         [self ErrorMBProgressView:@"客户名不能为空"];
         return;
     }
-    if (self.phoneNumberField.text.length == 0) {
+    if ([BaseViewController isBlankString:self.phoneNumberField.text]) {
         
         [self ErrorMBProgressView:@"手机号码不能为空"];
         return;
@@ -584,7 +584,7 @@
         [self ErrorMBProgressView:@"手机号码格式不正确"];
         return;
     }
-    if (self.customerAddress.text.length == 0) {
+    if ([BaseViewController isBlankString:self.customerAddress.text]) {
         
         [self ErrorMBProgressView:@"地址不能为空"];
         return;
@@ -715,7 +715,7 @@
 #pragma amrk -搜索客户信息
 - (void)searchCustomerInforMation
 {
-    if (self.searchPersonInformationField.text.length == 0) {
+    if ([BaseViewController isBlankString:self.searchPersonInformationField.text]) {
         self.condition.nameEquals = nil;
         self.condition.mobileEquals = nil;
     }else {

Class/ClientdetailsViewController.m

@@ -261,7 +261,6 @@
         OrderdetailsViewController *orderdetails = [[self getStoryboardWithName] instantiateViewControllerWithIdentifier:@"orderdetails"];
         TOOrderEntity *model = (TOOrderEntity *)[[self.orderRecordArray objectAtIndex_opple:indexPath.row] order];
         orderdetails.orderCode = model.orderNumber;
-        orderdetails.isShowattachment = YES;
         if ([model.orderState isEqualToString:@"006"] || [model.orderState isEqualToString:@"002"] || [model.orderState isEqualToString:@"003"]) {
             orderdetails.isShowPrintButton = YES;
             orderdetails.isDelectedButton = NO;

Class/CustomerOrderViewController.m

@@ -202,7 +202,6 @@
     OrderdetailsViewController *orderdetails = [storyboard instantiateViewControllerWithIdentifier:@"orderdetails"];
     TOOrderEntity *model = (TOOrderEntity *)[[self.datasArray objectAtIndex_opple:indexPath.row] order];
     orderdetails.orderCode = model.orderNumber;
-    orderdetails.isShowattachment = YES;
     if ([model.orderState isEqualToString:@"006"] || [model.orderState isEqualToString:@"002"] || [model.orderState isEqualToString:@"003"]) {
         orderdetails.isShowPrintButton = YES;
         orderdetails.isDelectedButton = NO;
@@ -356,7 +355,6 @@
     OrderdetailsViewController *orderdetails = [storyboard instantiateViewControllerWithIdentifier:@"orderdetails"];
     TOOrderEntity *model = (TOOrderEntity *)[[self.datasArray objectAtIndex_opple:cellindex] order];
     orderdetails.orderCode = model.orderNumber;
-    orderdetails.isShowattachment = YES;
     if ([model.orderState isEqualToString:@"006"] || [model.orderState isEqualToString:@"002"] || [model.orderState isEqualToString:@"003"]) {
         orderdetails.isShowPrintButton = YES;
         orderdetails.isDelectedButton = NO;

Class/OrderdetailsViewController.h

@@ -20,11 +20,6 @@
  */
 @property (nonatomic,copy) NSString *orderCode;
 
-/**
- *  是否显示附件信息
- */
-@property (nonatomic,assign) BOOL isShowattachment;
-
 /**
  *  区头显示title
  */

Class/OrderdetailsViewController.m

@@ -26,18 +26,31 @@
 
 NSString *const PROMOTIONALSTRING = @"促销信息";
 
-//** 微信卡劵 */
+/**
+ *  微信卡劵
+ */
 NSString *const WXCardAction = @"WXCardAction";
 
-//** 京东E卡 */
+/**
+ *  京东E卡
+ */
 NSString *const JDECardAction = @"JDECardAction";
 
-//** 折扣金额 */
+/**
+ *  折扣金额
+ */
 NSString *const deductionAction = @"deductionAction";
 
-//** 赠送金额 */
+/**
+ *  赠送金额
+ */
 NSString *const goodsAction = @"goodsAction";
 
+/**
+ *  转盘抽奖
+ */
+NSString *const lotteryAction = @"lotteryAction";
+
 @interface OrderdetailsViewController ()<UITableViewDelegate,UITableViewDataSource,QLPreviewControllerDataSource>
 
 
@@ -52,10 +65,14 @@ NSString *const goodsAction = @"goodsAction";
 @property (nonatomic,copy) NSString *PDFpath;
 
 /**
- *  促销信息
+ *  促销信息<商品、折扣>
  */
 @property (nonatomic,strong) NSMutableArray *promotionalArray;
 
+/**
+ *  促销信息<转盘抽奖、京东E卡>
+ */
+@property (nonatomic,strong) NSMutableArray *luckyDrawAndJDECardArray;
 
 
 @end
@@ -79,6 +96,14 @@ NSString *const goodsAction = @"goodsAction";
     return _sectionTitle;
 }
 
+- (NSMutableArray *)luckyDrawAndJDECardArray
+{
+    if (!_luckyDrawAndJDECardArray) {
+        _luckyDrawAndJDECardArray = [NSMutableArray array];
+    }
+    return _luckyDrawAndJDECardArray;
+}
+
 #pragma mark -渲染完成
 - (void)viewDidAppear:(BOOL)animated
 {
@@ -107,7 +132,7 @@ NSString *const goodsAction = @"goodsAction";
     [super viewDidLoad];
     
     [self uiConfigAction];
-    [self getOrderDetailsData];
+    [self getOrderDetailsData:NO issueJDECard:Zero andGuideId:nil andOrderNumber:nil];
 }
 
 #pragma mark - UI
@@ -125,8 +150,8 @@ NSString *const goodsAction = @"goodsAction";
     }
 }
 
-#pragma mark -获取订单详情、查询促销信息
-- (void)getOrderDetailsData
+#pragma mark -获取订单详情、查询促销信息、领取京东E卡
+- (void)getOrderDetailsData:(BOOL)isReceiveJDECard issueJDECard:(NSInteger)denomation andGuideId:(NSString *)guideId andOrderNumber:(NSString *)orderNumber
 {
     dispatch_group_t group = dispatch_group_create();
     dispatch_group_enter(group);
@@ -160,9 +185,10 @@ NSString *const goodsAction = @"goodsAction";
         }
         if ([returnValue[@"code"] isEqualToNumber:@0]) {
             [weakSelf.promotionalArray removeAllObjects];
+            [weakSelf.luckyDrawAndJDECardArray removeAllObjects];
             for (NSDictionary *dict in promotionalArray) {
                 //** 抵扣金额、京东E卡、微信卡劵 */
-                if ([dict[@"type"] isEqualToString:deductionAction] || [dict[@"type"] isEqualToString:JDECardAction] || [dict[@"type"] isEqualToString:WXCardAction]) {
+                if ([dict[@"type"] isEqualToString:deductionAction]) {
                     PromotionalDeductionModel *deductionModel = [[PromotionalDeductionModel alloc]initWithDictionary:dict error:nil];
                     deductionModel.isSelected = YES;
                     [weakSelf.promotionalArray addObject:deductionModel];
@@ -170,6 +196,9 @@ NSString *const goodsAction = @"goodsAction";
                     PromotionalGoodsModel *goodsModel = [[PromotionalGoodsModel alloc]initWithDictionary:dict error:nil];
                     goodsModel.isSelected = YES;
                     [weakSelf.promotionalArray addObject:goodsModel];
+                }else if ([dict[@"type"] isEqualToString:JDECardAction]){
+                    PromotionalDeductionModel *deductionModel = [[PromotionalDeductionModel alloc]initWithDictionary:dict error:nil];
+                    [weakSelf.luckyDrawAndJDECardArray addObject:deductionModel];
                 }
             }
         }else{
@@ -185,6 +214,26 @@ NSString *const goodsAction = @"goodsAction";
         [weakSelf RemoveMBProgressHUDLoding];
         [weakSelf ErrorMBProgressView:error.localizedDescription];
     }];
+    //** 发放京东E卡 */
+    if (isReceiveJDECard) {
+        dispatch_group_enter(group);
+        [[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:[NSString stringWithFormat:SERVERREQUESTURL(JDECARD),denomation,guideId,orderNumber] WithRequestType:0 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
+            
+            dispatch_group_leave(group);
+            if ([returnValue[@"code"] isEqualToNumber:@0]) {
+                [weakSelf SuccessMBProgressView:@"京东E卡领取成功"];
+            }else{
+                [weakSelf ErrorMBProgressView:@"京东E卡领取失败"];
+            }
+            
+        } WithErrorCodeBlock:^(id errorCodeValue) {
+            dispatch_group_leave(group);
+            [weakSelf ErrorMBProgressView:NETWORK];
+        } WithFailureBlock:^(NSError *error) {
+            dispatch_group_leave(group);
+            [weakSelf ErrorMBProgressView:error.localizedDescription];
+        }];
+    }
     //** 完成后回调 */
     dispatch_group_notify(group, dispatch_get_main_queue(), ^{
        
@@ -196,28 +245,6 @@ NSString *const goodsAction = @"goodsAction";
     });
 }
 
-#pragma mark - 发放京东E卡
-- (void)issueJDECard:(NSInteger)denomation andGuideId:(NSString *)guideId andOrderNumber:(NSString *)orderNumber
-{
-    WS(weakSelf);
-    [self CreateMBProgressHUDLoding];
-    [[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:[NSString stringWithFormat:SERVERREQUESTURL(JDECARD),denomation,guideId,orderNumber] WithRequestType:0 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
-        
-        [weakSelf RemoveMBProgressHUDLoding];
-        if ([returnValue[@"code"] isEqualToNumber:@0]) {
-            NSLog(@"领取成功");
-        }else{
-            [weakSelf ErrorMBProgressView:returnValue[@"message"]];
-        }
-        
-    } WithErrorCodeBlock:^(id errorCodeValue) {
-        [weakSelf RemoveMBProgressHUDLoding];
-        [weakSelf ErrorMBProgressView:NETWORK];
-    } WithFailureBlock:^(NSError *error) {
-        [weakSelf RemoveMBProgressHUDLoding];
-        [weakSelf ErrorMBProgressView:error.localizedDescription];
-    }];
-}
 
 #pragma mark -TableviewHeader------根据不同的订单状态判断是否显示
 - (void)CreateTableviewHeaderView
@@ -298,23 +325,22 @@ NSString *const goodsAction = @"goodsAction";
     [settlement setPaySuccessReturnBlock:^{
         
         weakSelf.isDelectedButton = NO;
-        weakSelf.isShowattachment = YES;
         weakSelf.isUserInteractionEnabled = NO;
         [weakSelf CreateTableviewHeaderView];
-        [weakSelf getOrderDetailsData];
-        weakSelf.orderDetailsTableview.tableFooterView = nil;
-        if (weakSelf.DelecteAndPayButtonBlock) {
-            weakSelf.DelecteAndPayButtonBlock(_cellindex,@"002");
-        }
         //** 京东E卡 */
-        for (id object in self.promotionalArray) {
+        for (id object in self.luckyDrawAndJDECardArray) {
             if ([object isKindOfClass:[PromotionalDeductionModel class]]) {
                 PromotionalDeductionModel *model = (PromotionalDeductionModel *)object;
                 if ([model.type isEqualToString:JDECardAction]) {
-                    [self issueJDECard:model.total andGuideId:[Shoppersmanager manager].Shoppers.employee.fid andOrderNumber:self.orderCode];break;
+                    [weakSelf getOrderDetailsData:YES issueJDECard:model.total andGuideId:[Shoppersmanager manager].Shoppers.employee.fid andOrderNumber:self.orderCode];break;
                 }
             }
         }
+        weakSelf.orderDetailsTableview.tableFooterView = nil;
+        if (weakSelf.DelecteAndPayButtonBlock) {
+            weakSelf.DelecteAndPayButtonBlock(_cellindex,@"002");
+        }
+
     }];
     settlement.preferredContentSize = CGSizeMake(380, 500);
     settlement.goodsArray = self.orderDetails.orderdetailList;
@@ -399,13 +425,10 @@ NSString *const goodsAction = @"goodsAction";
             break;
         case 4://附件信息
         {
-            //是否显示
-            if (_isShowattachment) {
-             
+            
                 AdditionalTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"fifthcell" forIndexPath:indexPath];
                 cell.model = self.orderDetails.order;
                 return cell;
-            }
         }
             break;
         case 5://促销信息
@@ -469,11 +492,6 @@ NSString *const goodsAction = @"goodsAction";
             break;
         case 4:
         {
-            //是否显示附件信息
-            if (!_isShowattachment) {
-                
-                return 0;
-            }
             return 75;
         }
             break;

Class/PayViewController.xib

-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="10117" systemVersion="15F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="10117" systemVersion="16A323" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
     <dependencies>
-        <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
     </dependencies>
     <objects>

Class/PaymentsViewController.m

@@ -172,8 +172,6 @@
     return nil;
 }
 
-
-
 #pragma mark -友好界面
 - (UIImage *)imageForEmptyDataSet:(UIScrollView *)scrollView
 {
@@ -190,5 +188,10 @@
     return [[NSAttributedString alloc]initWithString:@"暂无数据" attributes:nil];
 }
 
+- (CGFloat)verticalOffsetForEmptyDataSet:(UIScrollView *)scrollView
+{
+    return 64;
+}
+
 
 @end

Class/ProductDetailsViewController.m

@@ -88,26 +88,28 @@
 #pragma mark -获取商品详情
 - (void)getGoodsListDetails
 {
+    WS(weakSelf);
     [self CreateMBProgressHUDLoding];
     NSString *url = [NSString stringWithFormat:@"%@%@",SERVERREQUESTURL(GOODSDETAILS),_goodsID];
     [[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:url WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
-        [self RemoveMBProgressHUDLoding];
+        [weakSelf RemoveMBProgressHUDLoding];
         if ([returnValue[@"code"] isEqualToNumber:@0]) {
             
-           self.entity = [[TOGoodsEntity alloc]initWithDictionary:returnValue[@"data"] error:nil];
-            [self HeaderViewAssignment];
+           weakSelf.entity = [[TOGoodsEntity alloc]initWithDictionary:returnValue[@"data"] error:nil];
+            [weakSelf.productDetilsTableview reloadData];
+            [weakSelf HeaderViewAssignment];
         }
         else
         {
-            [self ErrorMBProgressView:returnValue[@"message"]];
+            [weakSelf ErrorMBProgressView:returnValue[@"message"]];
         }
     } WithErrorCodeBlock:^(id errorCodeValue) {
-        [self RemoveMBProgressHUDLoding];
-        [self ErrorMBProgressView:@"无网络"];
+        [weakSelf RemoveMBProgressHUDLoding];
+        [weakSelf ErrorMBProgressView:@"无网络"];
          
     } WithFailureBlock:^(NSError *error) {
-        [self RemoveMBProgressHUDLoding];
-        [self ErrorMBProgressView:error.localizedDescription];
+        [weakSelf RemoveMBProgressHUDLoding];
+        [weakSelf ErrorMBProgressView:error.localizedDescription];
     }];
 }
 
@@ -158,17 +160,19 @@
     self.goodsDetailsArray = [NSMutableArray array];
     WS(weakSelf);
     NSArray *imagesArray = [self.entity.detailedIntro componentsSeparatedByString:@","];
-    //加载图片计算大小
-    [imagesArray enumerateObjectsUsingBlock:^(id  _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
-        [[SDWebImageManager sharedManager] downloadImageWithURL:[NSURL URLWithString:obj] options:SDWebImageProgressiveDownload progress:nil completed:^(UIImage *image, NSError *error, SDImageCacheType cacheType, BOOL finished, NSURL *imageURL) {
-            
-            NSDictionary *dict = @{@"image":obj,@"height":@(image.size.height)};
+    NSMutableArray *array = [NSMutableArray array];
+    for (NSString *imageString in imagesArray) {
+        NSCharacterSet *set = [NSCharacterSet characterSetWithCharactersInString:@","];
+        NSString *string = [imageString stringByTrimmingCharactersInSet:set];
+        [array addObject:string];
+        [[SDWebImageManager sharedManager] downloadImageWithURL:[NSURL URLWithString:string] options:SDWebImageProgressiveDownload progress:nil completed:^(UIImage *image, NSError *error, SDImageCacheType cacheType, BOOL finished, NSURL *imageURL) {
+            NSDictionary *dict = @{@"image":string,@"height":@(image.size.height)};
             [weakSelf.goodsDetailsArray addObject:dict];
             if (weakSelf.goodsDetailsArray.count == imagesArray.count) {
                 [weakSelf.productDetilsTableview reloadData];
             }
         }];
-    }];
+    }
 }
 
 #pragma mark -小图点击手势、切换图片显示

Class/SettlementViewController.m

@@ -316,7 +316,7 @@
             goodDetails.uuid = model.goods.uuid;
             goodDetails.name = model.goods.name;
             goods.goods = goodDetails;
-            goods.promotionNumber = (NSDecimalNumber *)[NSDecimalNumber numberWithInteger:model.count];
+            goods.promotionNumber = [NSNumber numberWithInteger:model.count];
             [goodsArray addObject:goods];
         }
     }
@@ -355,6 +355,7 @@
     }    
     [self CreateMBProgressHUDLoding];
     WS(weakSelf);
+    NSLog(@"%@",[[order toDictionary] JSONString]);
     [[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(CONFIRMPAY) WithRequestType:0 WithParameter:order WithReturnValueBlock:^(id returnValue) {
         
         [weakSelf RemoveMBProgressHUDLoding];

Class/Shoppingcart/AddressViewController.m

@@ -145,11 +145,11 @@
 - (IBAction)addAddressButtonClick:(UIButton *)sender {
     
     NSString *phoneNumber = self.PhoneNumber.text;
-    if (!self.recipientPerson.text.length) {
+    if (![BaseViewController isBlankString:self.recipientPerson.text]) {
         [self ErrorMBProgressView:@"请输入收货人姓名"];
         return;
     }
-    if (phoneNumber.length <= 0) {
+    if ([BaseViewController isBlankString:phoneNumber] <= 0) {
         [self ErrorMBProgressView:@"手机号码不能为空"];
         return;
     }
@@ -158,7 +158,7 @@
         [self ErrorMBProgressView:@"手机号码格式不正确"];
         return;
     }
-    if (!self.detailsAddress.text.length) {
+    if (![BaseViewController isBlankString:self.detailsAddress.text]) {
         [self ErrorMBProgressView:@"请输入详细地址"];
         return;
     }

Class/Shoppingcart/GenerateOrdersViewController.m

@@ -431,7 +431,6 @@
                         }
                         OrderdetailsViewController *orderDetails = [[weakSelf getStoryboardWithName] instantiateViewControllerWithIdentifier:@"orderdetails"];
                         orderDetails.orderCode = returnValue[@"data"];
-                        orderDetails.isShowattachment = YES;
                         orderDetails.isShowPayButton = YES;
                         orderDetails.isUserInteractionEnabled = YES;
                         orderDetails.isSliding = YES;//取消滑动返回

Class/Tabbar/CustomTabbarController.m

@@ -312,7 +312,7 @@
 - (BOOL)textFieldShouldReturn:(UITextField *)textField
 {
     //搜索
-    if (textField.text.length != 0) {
+    if ([BaseViewController isBlankString:textField.text]) {
         
         [textField resignFirstResponder];
         //搜索

Class/WithdrawalViewController.m

@@ -194,6 +194,10 @@
     return [[NSAttributedString alloc]initWithString:@"暂无数据" attributes:nil];
 }
 
+- (CGFloat)verticalOffsetForEmptyDataSet:(UIScrollView *)scrollView
+{
+    return 64;
+}
 
 
 

Lighting.xcodeproj/project.pbxproj

@@ -2026,7 +2026,6 @@
 					"-l\"AFNetworking\"",
 					"-l\"IQKeyboardManager\"",
 					"-l\"MBProgressHUD\"",
-					"-l\"MJExtension\"",
 					"-l\"MJRefresh\"",
 					"-l\"MMDrawerController\"",
 					"-l\"Masonry\"",
@@ -2084,7 +2083,6 @@
 					"-l\"AFNetworking\"",
 					"-l\"IQKeyboardManager\"",
 					"-l\"MBProgressHUD\"",
-					"-l\"MJExtension\"",
 					"-l\"MJRefresh\"",
 					"-l\"MMDrawerController\"",
 					"-l\"Masonry\"",

Lighting/Images.xcassets/fifty.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "fifty.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "fifty@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "fifty@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file

Lighting/Images.xcassets/mask.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "mask.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "mask@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "mask@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file

Lighting/Images.xcassets/onehundred.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "onehundred.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "onehundred@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "onehundred@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file

Lighting/Images.xcassets/twohundred.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "twohundred.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "twohundred@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "twohundred@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file

Podfile.lock

@@ -38,7 +38,6 @@ PODS:
     - SDWebImage/Core (= 3.8.2)
   - SDWebImage/Core (3.8.2)
   - UMengSocial (5.0)
-  - ZYCornerRadius (1.0.1)
 
 DEPENDENCIES:
   - AFNetworking
@@ -53,7 +52,6 @@ DEPENDENCIES:
   - MMDrawerController
   - SDWebImage
   - UMengSocial
-  - ZYCornerRadius (~> 1.0.1)
 
 SPEC CHECKSUMS:
   AFNetworking: 5e0e199f73d8626b11e79750991f5d173d1f8b67
@@ -68,6 +66,5 @@ SPEC CHECKSUMS:
   MMDrawerController: e3a54a5570388463ad3b36975251575b50c4e1a0
   SDWebImage: 098e97e6176540799c27e804c96653ee0833d13c
   UMengSocial: 48b67179c492a8cf7803fbb0438b8f55432e2fc1
-  ZYCornerRadius: 94720e8722acf30de5b73ae185ffe56a2240f6a3
 
 COCOAPODS: 0.39.0

Pods/Headers/Private/ZYCornerRadius/UIImageView+CornerRadius.h

-../../../ZYCornerRadius/ZYCornerRadius/CornerRadiusCategory/UIImageView+CornerRadius.h
\ No newline at end of file

Pods/Headers/Public/ZYCornerRadius/UIImageView+CornerRadius.h

-../../../ZYCornerRadius/ZYCornerRadius/CornerRadiusCategory/UIImageView+CornerRadius.h
\ No newline at end of file

Pods/Manifest.lock

@@ -38,7 +38,6 @@ PODS:
     - SDWebImage/Core (= 3.8.2)
   - SDWebImage/Core (3.8.2)
   - UMengSocial (5.0)
-  - ZYCornerRadius (1.0.1)
 
 DEPENDENCIES:
   - AFNetworking
@@ -53,7 +52,6 @@ DEPENDENCIES:
   - MMDrawerController
   - SDWebImage
   - UMengSocial
-  - ZYCornerRadius (~> 1.0.1)
 
 SPEC CHECKSUMS:
   AFNetworking: 5e0e199f73d8626b11e79750991f5d173d1f8b67
@@ -68,6 +66,5 @@ SPEC CHECKSUMS:
   MMDrawerController: e3a54a5570388463ad3b36975251575b50c4e1a0
   SDWebImage: 098e97e6176540799c27e804c96653ee0833d13c
   UMengSocial: 48b67179c492a8cf7803fbb0438b8f55432e2fc1
-  ZYCornerRadius: 94720e8722acf30de5b73ae185ffe56a2240f6a3
 
 COCOAPODS: 0.39.0

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/UMengSocial" "${PODS_ROOT}/Headers/Public/ZYCornerRadius"
+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/UMengSocial"
 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/UMengSocial" "${PODS_ROOT}/Headers/Public/ZYCornerRadius"
+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/UMengSocial"
 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/UMengSocial" "${PODS_ROOT}/Headers/Public/ZYCornerRadius"
+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/UMengSocial"
 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/UMengSocial" "${PODS_ROOT}/Headers/Public/ZYCornerRadius"
+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/UMengSocial"
 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/UMengSocial" "${PODS_ROOT}/Headers/Public/ZYCornerRadius"
+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/UMengSocial"
 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/UMengSocial" "${PODS_ROOT}/Headers/Public/ZYCornerRadius"
+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/UMengSocial"
 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/UMengSocial" "${PODS_ROOT}/Headers/Public/ZYCornerRadius"
+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/UMengSocial"
 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/UMengSocial" "${PODS_ROOT}/Headers/Public/ZYCornerRadius"
+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/UMengSocial"
 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/UMengSocial" "${PODS_ROOT}/Headers/Public/ZYCornerRadius"
+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/UMengSocial"
 OTHER_LDFLAGS = -framework "Foundation" -framework "UIKit"
 PODS_ROOT = ${SRCROOT}
 SKIP_INSTALL = YES
\ No newline at end of file

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"
 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/UMengSocial" "${PODS_ROOT}/Headers/Public/ZYCornerRadius"
+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/UMengSocial"
 LIBRARY_SEARCH_PATHS = $(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/UMengSocial" -isystem "${PODS_ROOT}/Headers/Public/ZYCornerRadius"
-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"WeChatSDK" -l"WeiboSDK" -l"ZYCornerRadius" -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"
+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/UMengSocial"
+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"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"
 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"
 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/UMengSocial" "${PODS_ROOT}/Headers/Public/ZYCornerRadius"
+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/UMengSocial"
 LIBRARY_SEARCH_PATHS = $(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/UMengSocial" -isystem "${PODS_ROOT}/Headers/Public/ZYCornerRadius"
-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"WeChatSDK" -l"WeiboSDK" -l"ZYCornerRadius" -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"
+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/UMengSocial"
+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"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"
 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/UMengSocial" "${PODS_ROOT}/Headers/Public/ZYCornerRadius"
+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/UMengSocial"
 OTHER_LDFLAGS = -framework "ImageIO"
 PODS_ROOT = ${SRCROOT}
 SKIP_INSTALL = YES
\ No newline at end of file

Pods/Target Support Files/ZYCornerRadius/ZYCornerRadius-dummy.m

-#import <Foundation/Foundation.h>
-@interface PodsDummy_ZYCornerRadius : NSObject
-@end
-@implementation PodsDummy_ZYCornerRadius
-@end

Pods/Target Support Files/ZYCornerRadius/ZYCornerRadius-prefix.pch

-#ifdef __OBJC__
-#import <UIKit/UIKit.h>
-#endif
-

Pods/Target Support Files/ZYCornerRadius/ZYCornerRadius.xcconfig

-GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
-HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Private/ZYCornerRadius" "${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/UMengSocial" "${PODS_ROOT}/Headers/Public/ZYCornerRadius"
-OTHER_LDFLAGS = -framework "UIKit"
-PODS_ROOT = ${SRCROOT}
-SKIP_INSTALL = YES
\ No newline at end of file

Pods/ZYCornerRadius/README.md

-<h1 align="center">
-ZYCornerRadius <br>
-一句代码，圆角风雨无阻
-<h5 align="center">
-A Category to make cornerRadius for UIImageView have no Offscreen-Rendered, be more efficiency  
-避免为UIImageView设置圆角时触发离屏渲染所带来的性能损耗，两种工作方式：Category和UIImageView子类。
-</h5>
-</h1>
-<br>
-<p align="center">
-<img src="https://img.shields.io/badge/pod-v0.9.4-blue.svg" />
-<img src="https://img.shields.io/badge/build-passing-brightgreen.svg" />
-<img src="https://img.shields.io/badge/language-objc-5787e5.svg" />
-<img src="https://img.shields.io/badge/Advantage-Efficient-red.svg" />
-<img src="https://img.shields.io/badge/license-MIT-brightgreen.svg" />
-
-</p>
-<br>
-
-##CocoaPods:  
-```
-pod 'ZYCornerRadius', '~> 0.9.4'
-``` 
-
-<br>
-##性能对比:  
-测试设备6P，屏幕中有40张尺寸为20*20的小图片，使用masksToBounds切角处理时帧率大大下降至20+，使用ZYCornerRadius时帧率保持在57+，性能接近0损耗。  
-![](https://raw.githubusercontent.com/liuzhiyi1992/MyStore/master/ZYCornerRadius/ZYCornerRadius%E6%80%A7%E8%83%BD%E5%AF%B9%E6%AF%94.png)    
-
-内存使用对比:  
-![](https://raw.githubusercontent.com/liuzhiyi1992/MyStore/master/ZYCornerRadius/%E5%86%85%E5%AD%98%E4%BD%BF%E7%94%A8%E5%AF%B9%E6%AF%94.jpg)  
-
-![](https://raw.githubusercontent.com/liuzhiyi1992/MyStore/master/ZYCornerRadius/zycornerRadius%E6%96%B0demo%E6%BC%94%E7%A4%BA%E5%9B%BE%E7%89%87.jpg)   
-
-
-
-<br>
-##Usage:  
-
-导入头文件  
-```objc
-#import "UIImageView+CornerRadius.h"
-```
-创建圆角半径为6的UIImageView(两种种方式)：  
-```objc
-//1
-UIImageView *imageView = [[UIImageView alloc] initWithCornerRadiusAdvance:6.0f rectCornerType:UIRectCornerAllCorners];
-
-//2
-UIImageView *imageView = [[UIImageView alloc] init];
-[imageView zy_cornerRadiusAdvance:6.0f rectCornerType:UIRectCornerAllCorners];
-```
-创建圆形的UIImageView(两种方式)：  
-```objc
-//1
-UIImageView *imageView = [[UIImageView alloc] initWithRoundingRectImageView];
-
-//2
-UIImageView *imageView = [[UIImageView alloc] init];
-[imageView zy_cornerRadiusRoundingRect];
-```  
-可为UIImageView的图片附加边框：
-```objc
-[imageView zy_attachBorderWidth:1.f color:[UIColor redColor]];
-```
-按你的需要完成配置后，任何时候对UIImageView setImage，效果都会生效
-```objc
-//anytime 
-imageView.image = [UIImage imageNamed:@"mac_dog"];
-```
-
-
-<br>  
-##iteration:  
-0.9.4 - 处理多个swizzleMethod的问题   
-0.9.3 - 处理上版本制造的bug  
-0.9.2 - 处理ContentMode无效问题  
-0.9.1 - 处理 setImage发生在 frame计算之前(Masonry) 导致圆角无效的问题，此版本删除ZYImageView，统一使用UIImageView+CornerRadius  
-0.8.1 - 解决更新图片时图片内容闪动问题。  
-0.7.1 - 去除部分api，保持使用简洁的设计理念，加入带边框功能  
-0.6.1 - 解决在TableViewCell被selected后，其中UIImageView的image被重置的问题  
-0.5.1 - 解决SDWebImage使用placeholder为nil时发生的crash  
-0.4.1 - 发布第一个较完善版本
-
-
-<br>
-##Relation:  
-[@liuzhiyi1992](https://github.com/liuzhiyi1992) on Github  
-[@Blog](http://zyden.vicp.cc/)  Welcome
-
-<br>
-##License:  
-ZYCornerRadius is released under the MIT license. See LICENSE for details.

Pods/ZYCornerRadius/ZYCornerRadius/CornerRadiusCategory/UIImageView+CornerRadius.h

-//
-//  UIImageView+CornerRadius.h
-//  MyPractise
-//
-//  Created by lzy on 16/3/1.
-//  Copyright © 2016年 lzy. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import <UIKit/UIKit.h>
-
-@interface UIImageView (CornerRadius)
-
-
-- (instancetype)initWithCornerRadiusAdvance:(CGFloat)cornerRadius rectCornerType:(UIRectCorner)rectCornerType;
-
-- (void)zy_cornerRadiusAdvance:(CGFloat)cornerRadius rectCornerType:(UIRectCorner)rectCornerType;
-
-- (instancetype)initWithRoundingRectImageView;
-
-- (void)zy_cornerRadiusRoundingRect;
-
-- (void)zy_attachBorderWidth:(CGFloat)width color:(UIColor *)color;
-
-@end

Pods/ZYCornerRadius/ZYCornerRadius/CornerRadiusCategory/UIImageView+CornerRadius.m

-//
-//  UIImageView+CornerRadius.m
-//  MyPractise
-//
-//  Created by lzy on 16/3/1.
-//  Copyright © 2016年 lzy. All rights reserved.
-//
-
-#import "UIImageView+CornerRadius.h"
-#import <objc/runtime.h>
-
-const char kProcessedImage;
-
-@interface UIImageView ()
-
-@property (assign, nonatomic) CGFloat zyRadius;
-@property (assign, nonatomic) UIRectCorner roundingCorners;
-@property (assign, nonatomic) CGFloat zyBorderWidth;
-@property (strong, nonatomic) UIColor *zyBorderColor;
-@property (assign, nonatomic) BOOL zyHadAddObserver;
-@property (assign, nonatomic) BOOL zyIsRounding;
-
-@end
-
-
-
-
-
-@implementation UIImageView (CornerRadius)
-/**
- * @brief init the Rounding UIImageView, no off-screen-rendered
- */
-- (instancetype)initWithRoundingRectImageView {
-    self = [super init];
-    if (self) {
-        [self zy_cornerRadiusRoundingRect];
-    }
-    return self;
-}
-
-/**
- * @brief init the UIImageView with cornerRadius, no off-screen-rendered
- */
-- (instancetype)initWithCornerRadiusAdvance:(CGFloat)cornerRadius rectCornerType:(UIRectCorner)rectCornerType {
-    self = [super init];
-    if (self) {
-        [self zy_cornerRadiusAdvance:cornerRadius rectCornerType:rectCornerType];
-    }
-    return self;
-}
-
-/**
- * @brief attach border for UIImageView with width & color
- */
-- (void)zy_attachBorderWidth:(CGFloat)width color:(UIColor *)color {
-    self.zyBorderWidth = width;
-    self.zyBorderColor = color;
-}
-
-#pragma mark - Kernel
-/**
- * @brief clip the cornerRadius with image, UIImageView must be setFrame before, no off-screen-rendered
- */
-- (void)zy_cornerRadiusWithImage:(UIImage *)image cornerRadius:(CGFloat)cornerRadius rectCornerType:(UIRectCorner)rectCornerType {
-    CGSize size = self.bounds.size;
-    CGFloat scale = [UIScreen mainScreen].scale;
-    CGSize cornerRadii = CGSizeMake(cornerRadius, cornerRadius);
-    
-    UIGraphicsBeginImageContextWithOptions(size, NO, scale);
-    CGContextRef currentContext = UIGraphicsGetCurrentContext();
-    if (nil == currentContext) {
-        return;
-    }
-    UIBezierPath *cornerPath = [UIBezierPath bezierPathWithRoundedRect:self.bounds byRoundingCorners:rectCornerType cornerRadii:cornerRadii];
-    [cornerPath addClip];
-    [self.layer renderInContext:currentContext];
-    [self drawBorder:cornerPath];
-    UIImage *processedImage = UIGraphicsGetImageFromCurrentImageContext();
-    UIGraphicsEndImageContext();
-    objc_setAssociatedObject(processedImage, &kProcessedImage, @(1), OBJC_ASSOCIATION_RETAIN_NONATOMIC);
-    self.image = processedImage;
-}
-
-/**
- * @brief clip the cornerRadius with image, draw the backgroundColor you want, UIImageView must be setFrame before, no off-screen-rendered, no Color Blended layers
- */
-- (void)zy_cornerRadiusWithImage:(UIImage *)image cornerRadius:(CGFloat)cornerRadius rectCornerType:(UIRectCorner)rectCornerType backgroundColor:(UIColor *)backgroundColor {
-    CGSize size = self.bounds.size;
-    CGFloat scale = [UIScreen mainScreen].scale;
-    CGSize cornerRadii = CGSizeMake(cornerRadius, cornerRadius);
-    
-    UIGraphicsBeginImageContextWithOptions(size, YES, scale);
-    CGContextRef currentContext = UIGraphicsGetCurrentContext();
-    if (nil == currentContext) {
-        return;
-    }
-    UIBezierPath *cornerPath = [UIBezierPath bezierPathWithRoundedRect:self.bounds byRoundingCorners:rectCornerType cornerRadii:cornerRadii];
-    UIBezierPath *backgroundRect = [UIBezierPath bezierPathWithRect:self.bounds];
-    [backgroundColor setFill];
-    [backgroundRect fill];
-    [cornerPath addClip];
-    [self.layer renderInContext:currentContext];
-    [self drawBorder:cornerPath];
-    UIImage *processedImage = UIGraphicsGetImageFromCurrentImageContext();
-    UIGraphicsEndImageContext();
-    objc_setAssociatedObject(processedImage, &kProcessedImage, @(1), OBJC_ASSOCIATION_RETAIN_NONATOMIC);
-    self.image = processedImage;
-}
-
-/**
- * @brief set cornerRadius for UIImageView, no off-screen-rendered
- */
-- (void)zy_cornerRadiusAdvance:(CGFloat)cornerRadius rectCornerType:(UIRectCorner)rectCornerType {
-    self.zyRadius = cornerRadius;
-    self.roundingCorners = rectCornerType;
-    self.zyIsRounding = NO;
-    
-    if (!self.zyHadAddObserver) {
-        [[self class] swizzleDealloc];
-        [self addObserver:self forKeyPath:@"image" options:NSKeyValueObservingOptionNew context:nil];
-        self.zyHadAddObserver = YES;
-    }
-}
-
-/**
- * @brief become Rounding UIImageView, no off-screen-rendered
- */
-- (void)zy_cornerRadiusRoundingRect {
-    self.zyIsRounding = YES;
-    
-    if (!self.zyHadAddObserver) {
-        [[self class] swizzleDealloc];
-        [self addObserver:self forKeyPath:@"image" options:NSKeyValueObservingOptionNew context:nil];
-        self.zyHadAddObserver = YES;
-    }
-}
-
-#pragma mark - Private
-- (void)drawBorder:(UIBezierPath *)path {
-    if (0 != self.zyBorderWidth && nil != self.zyBorderColor) {
-        [path setLineWidth:2 * self.zyBorderWidth];
-        [self.zyBorderColor setStroke];
-        [path stroke];
-    }
-}
-
-- (void)zy_dealloc {
-    if (self.zyHadAddObserver) {
-        [self removeObserver:self forKeyPath:@"image"];
-    }
-    [self zy_dealloc];
-}
-
-- (void)validateFrame {
-    if (self.frame.size.width == 0) {
-        [self.class swizzleLayoutSubviews];
-    }
-}
-
-+ (void)swizzleMethod:(SEL)oneSel anotherMethod:(SEL)anotherSel {
-    Method oneMethod = class_getInstanceMethod(self, oneSel);
-    Method anotherMethod = class_getInstanceMethod(self, anotherSel);
-    method_exchangeImplementations(oneMethod, anotherMethod);
-}
-
-+ (void)swizzleDealloc {
-    static dispatch_once_t onceToken;
-    dispatch_once(&onceToken, ^{
-        [self swizzleMethod:NSSelectorFromString(@"dealloc") anotherMethod:@selector(zy_dealloc)];
-    });
-}
-
-+ (void)swizzleLayoutSubviews {
-    static dispatch_once_t onceToken;
-    dispatch_once(&onceToken, ^{
-        [self swizzleMethod:@selector(layoutSubviews) anotherMethod:@selector(zy_LayoutSubviews)];
-    });
-}
-
-- (void)zy_LayoutSubviews {
-    [self zy_LayoutSubviews];
-    if (self.zyIsRounding) {
-        [self zy_cornerRadiusWithImage:self.image cornerRadius:self.frame.size.width/2 rectCornerType:UIRectCornerAllCorners];
-    } else if (0 != self.zyRadius && 0 != self.roundingCorners && nil != self.image) {
-        [self zy_cornerRadiusWithImage:self.image cornerRadius:self.zyRadius rectCornerType:self.roundingCorners];
-    }
-}
-
-#pragma mark - KVO for .image
-- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context {
-    if ([keyPath isEqualToString:@"image"]) {
-        UIImage *newImage = change[NSKeyValueChangeNewKey];
-        if ([newImage isMemberOfClass:[NSNull class]]) {
-            return;
-        } else if ([objc_getAssociatedObject(newImage, &kProcessedImage) intValue] == 1) {
-            return;
-        }
-        [self validateFrame];
-        if (self.zyIsRounding) {
-            [self zy_cornerRadiusWithImage:newImage cornerRadius:self.frame.size.width/2 rectCornerType:UIRectCornerAllCorners];
-        } else if (0 != self.zyRadius && 0 != self.roundingCorners && nil != self.image) {
-            [self zy_cornerRadiusWithImage:newImage cornerRadius:self.zyRadius rectCornerType:self.roundingCorners];
-        }
-    }
-}
-
-#pragma mark property
-- (CGFloat)zyBorderWidth {
-    return [objc_getAssociatedObject(self, _cmd) floatValue];
-}
-
-- (void)setZyBorderWidth:(CGFloat)zyBorderWidth {
-    objc_setAssociatedObject(self, @selector(zyBorderWidth), @(zyBorderWidth), OBJC_ASSOCIATION_RETAIN_NONATOMIC);
-}
-
-- (UIColor *)zyBorderColor {
-    return objc_getAssociatedObject(self, _cmd);
-}
-
-- (void)setZyBorderColor:(UIColor *)zyBorderColor {
-    objc_setAssociatedObject(self, @selector(zyBorderColor), zyBorderColor, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
-}
-
-- (BOOL)zyHadAddObserver {
-    return [objc_getAssociatedObject(self, _cmd) boolValue];
-}
-
-- (void)setZyHadAddObserver:(BOOL)zyHadAddObserver {
-    objc_setAssociatedObject(self, @selector(zyHadAddObserver), @(zyHadAddObserver), OBJC_ASSOCIATION_RETAIN_NONATOMIC);
-}
-
-- (BOOL)zyIsRounding {
-    return [objc_getAssociatedObject(self, _cmd) boolValue];
-}
-
-- (void)setZyIsRounding:(BOOL)zyIsRounding {
-    objc_setAssociatedObject(self, @selector(zyIsRounding), @(zyIsRounding), OBJC_ASSOCIATION_RETAIN_NONATOMIC);
-}
-
-- (UIRectCorner)roundingCorners {
-    return [objc_getAssociatedObject(self, _cmd) unsignedLongValue];
-}
-
-- (void)setRoundingCorners:(UIRectCorner)roundingCorners {
-    objc_setAssociatedObject(self, @selector(roundingCorners), @(roundingCorners), OBJC_ASSOCIATION_RETAIN_NONATOMIC);
-}
-
-- (CGFloat)zyRadius {
-    return [objc_getAssociatedObject(self, _cmd) floatValue];
-}
-
-- (void)setZyRadius:(CGFloat)zyRadius {
-    objc_setAssociatedObject(self, @selector(zyRadius), @(zyRadius), OBJC_ASSOCIATION_RETAIN_NONATOMIC);
-}
-
-
-@end
-
-
-
-
-
-
-
-
-//ZYCornerRadius is available under the MIT license.
-//Please visit https://github.com/liuzhiyi1992/ZYCornerRadius for details.

Tools/BaseViewController.h

@@ -126,5 +126,15 @@
  */
 - (NSString*)getAppVersion;
 
+/**
+ *  通过面额获取相应的图片
+ */
++ (UIImage *)getCorrespondingPictures:(NSInteger)total;
+
+/**
+ *  判断字符串是否为空
+ */
++ (BOOL)isBlankString:(NSString *)string;
+
 
 @end

Tools/BaseViewController.m

@@ -523,6 +523,48 @@
     return [NSString stringWithFormat:@"Version %@",ver];
 }
 
+#pragma mark - 通过面额获取相应的图片
++ (UIImage *)getCorrespondingPictures:(NSInteger)total
+{
+    UIImage *image = nil;
+    switch (total) {
+        case 50:
+        {
+            image = TCImage(@"fifty");
+        }
+            break;
+        case 100:
+        {
+            image = TCImage(@"onehundred");
+        }
+            break;
+        case 200:
+        {
+            image = TCImage(@"twohundred");
+        }
+            break;
+            
+        default:
+            break;
+    }
+    return image;
+}
+
++ (BOOL)isBlankString:(NSString *)string
+{
+    if (string == nil || string == NULL) {
+        return YES;
+    }
+    if ([string isKindOfClass:[NSNull class]]) {
+        return YES;
+    }
+    if ([[string stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]] length]==0) {
+        return YES;
+    }
+    return NO;
+}
+
+
 - (void)dealloc
 {
     NSLog(@"释放%@控制器",self);

Tools/CYConstManager.h

@@ -237,6 +237,11 @@ extern NSString *const JDECARD;
  *  激活京东E卡
  */
 extern NSString *const ACTIVIATIONJDECARD;
+
+/**
+ *  领取京东E卡
+ */
+extern NSString *const  RECEIVEJDECARD;
 /*****************************************接口地址*****************************************/
 
 
@@ -244,3 +249,23 @@ extern NSString *const ACTIVIATIONJDECARD;
  *  通知已上传小票
  */
 extern NSString *const UPLOAD_COMPLETE;
+
+/**
+ *  通知已查看京东卡密码
+ */
+extern NSString *const VIEWPASSWORD;
+
+/**
+ *  京东卡状态<发放>
+ */
+extern NSString *const DISPENSED;
+
+/**
+ *  京东卡状态<激活>
+ */
+extern NSString *const ACTIVED;
+
+/**
+ *  京东卡状态<查看>
+ */
+extern NSString *const LOOKED;

Tools/CYConstManager.m

@@ -236,6 +236,11 @@ NSString *const JDECARD = @"/jingdongecard/dispense?denomation=%ld&guideId=%@&or
  *  激活京东E卡
  */
 NSString *const ACTIVIATIONJDECARD = @"/jingdongecard/active?orderNumber=%@&orderReceiptUrl=%@";
+
+/**
+ *  领取京东E卡
+ */
+NSString *const  RECEIVEJDECARD = @"/jingdongecard/look?cardNumber=%@";
 /*****************************************接口地址*****************************************/
 
 
@@ -244,7 +249,25 @@ NSString *const ACTIVIATIONJDECARD = @"/jingdongecard/active?orderNumber=%@&orde
  */
 NSString *const UPLOAD_COMPLETE = @"UploadToComplete";
 
+/**
+ *  通知已查看京东卡密码
+ */
+NSString *const VIEWPASSWORD = @"viewPassword";
 
+/**
+ *  京东卡状态<发放>
+ */
+NSString *const DISPENSED = @"dispensed";
+
+/**
+ *  京东卡状态<激活>
+ */
+NSString *const ACTIVED = @"actived";
+
+/**
+ *  京东卡状态<查看>
+ */
+NSString *const LOOKED = @"looked";
 
 
 

Tools/PrefixHeader.pch

@@ -35,8 +35,8 @@
 #import "CYConstManager.h"
 #import "UINavigationController+FDFullscreenPopGesture.h"
 #import "UIView+cornerRadius.h"
-#import "UIImageView+CornerRadius.h"
 #import "XLPlainFlowLayout.h"
+#import "MDScratchImageView.h"
 // Include any system framework and library headers here that should be included in all compilation units.
 // You will also need to set the Prefix Header build setting of one or more of your targets to reference this file.
 

Tools/opple_objc_json_client.h

@@ -2567,7 +2567,7 @@ extern NSString * const SORTDIRECTION_DESC;
  * @see TOJingdongEcardEntity
  *
  */
-@property (nonatomic, strong) NSArray<TOJingdongEcardEntity> *ecards;
+@property (nonatomic, strong) NSArray<TOJingdongEcardEntity> *eCards;
 @end /* interface GroupByOrderNumber */
 
 

Tools/opple_objc_json_client.m

@@ -912,7 +912,7 @@ NSString * const SORTDIRECTION_DESC = @"desc";
 @synthesize orderNumber;
 @synthesize orderTime;
 @synthesize orderReceiptUrl;
-@synthesize ecards;
+@synthesize eCards;
 
 +(BOOL)propertyIsOptional:(NSString*)propertyName
 {