Commit 30e9f987 authored by 曹云霄's avatar 曹云霄

现金红包增加已拒绝状态、修改“更改成交价接口”、“实时计算促销接口”

parent 137766f3
......@@ -53,7 +53,7 @@
[self setUpiCarouselView];
[self getDatasAction];
[self setUpCollectionView];
// [self perfectDepartInformation];
[self perfectDepartInformation];
}
#pragma mark -获取滚动视图数据
......@@ -166,7 +166,7 @@
{
if (view == nil)
{
view = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, ScreenWidth*0.8, ScreenHeight*0.35-20)];
view = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, ScreenWidth*0.7, ScreenHeight*0.35-20)];
UIImageView *imageView = (UIImageView *)view;
TOBannerEntity *entity = self.homeResponse.list[index];
[imageView sd_setImageWithURL:[NSURL URLWithString:entity.attachment] placeholderImage:REPLACEIMAGE];
......
......@@ -42,7 +42,7 @@
{
_replyEntity = replyEntity;
self.bestView.replyId = _replyEntity.fid;
[self.issuerImageView sd_setImageWithURL:[NSURL URLWithString:_replyEntity.replyerPicture] placeholderImage:CoustomerReplaceImage];
[self.issuerImageView sd_setImageWithURL:[NSURL URLWithString:_replyEntity.replyerPicture] placeholderImage:ReplaceImage];
self.issuerNameLabel.text = [NSString stringWithFormat:@"%@: %@",_replyEntity.replyerPosition,_replyEntity.replyerRealName];
self.issuerDateLabel.text = [BaseViewController formateDate:_replyEntity.replyTime];
self.commentContentLabel.text = _replyEntity.replyContent;
......
......@@ -111,15 +111,12 @@
- (IBAction)LoginButtonClick:(UIButton *)sender {
if ([[self class] isBlankString:self.userName.text]) {
[XBLoadingView showHUDViewWithText:@"用户名不能为空"];
return;
[XBLoadingView showHUDViewWithText:@"用户名不能为空"];return;
}else if ([[self class] isBlankString:self.passWord.text])
{
[XBLoadingView showHUDViewWithText:@"密码不能为空"];
return;
[XBLoadingView showHUDViewWithText:@"密码不能为空"];return;
}
[self judgeUserNameAndPassword];
}
#pragma mark -设置根视图控制器
......@@ -163,6 +160,8 @@
LoginInfo *login = [[LoginInfo alloc]init];
login.username = self.userName.text;
login.password = self.passWord.text;
login.username = [login.username formatString];
login.password = [login.password formatString];
WS(weakSelf);
[HTTP networkRequestWithURL:SERVERREQUESTURL(LOGIN) withRequestType:ZERO withParameter:login withReturnValueBlock:^(id returnValue) {
[XBLoadingView hideHUDViewWithDefault];
......@@ -413,6 +412,7 @@
#pragma mark - 检测更新
- (void)detectionUpdateVersion
{
[XBLoadingView hideHUDViewWithDefault];
NSString *path = [[NSBundle mainBundle]pathForResource:@"Info" ofType:@"plist"];
NSDictionary* content =[NSDictionary dictionaryWithContentsOfFile:path];
NSString *version = [content valueForKey:@"CFBundleShortVersionString"];
......@@ -429,7 +429,6 @@
UIAlertController *alertVC = [UIAlertController alertControllerWithTitle:@"提示" message:[NSString stringWithFormat:@"发现新版本%@,快去更新吧!",dict[@"version"]] preferredStyle:UIAlertControllerStyleAlert];
[alertVC addAction:[UIAlertAction actionWithTitle:@"我知道了" style:UIAlertActionStyleDestructive handler:^(UIAlertAction * _Nonnull action) {
[[UIApplication sharedApplication] openURL:[NSURL URLWithString:dict[@"url"]]];
// [[UIApplication sharedApplication] openURL:[NSURL URLWithString:@"itms-services://?action=download-manifest&url=http://www.pgyer.com/app/plist/95fcb4e47cf3d6c7309a2760ccccde66"]];
}]];
//是否强制更新
if (![dict[@"forceupdate"] isEqualToString:@"1"]) {
......
......@@ -739,7 +739,7 @@
self.nameString = model.name;
self.companyString = model.company;
[self.locationButton setTitle:[NSString stringWithFormat:@"%@-%@-%@",model.province,model.city,model.country] forState:UIControlStateNormal];
[self.customerHeader sd_setImageWithURL:[NSURL URLWithString:model.picture] placeholderImage:CoustomerReplaceImage];
[self.customerHeader sd_setImageWithURL:[NSURL URLWithString:model.picture] placeholderImage:ReplaceImage];
}
#pragma mark -友好界面
......
......@@ -58,7 +58,7 @@
self.shoppingBagButton.backgroundColor = [UIColor whiteColor];
//赋值
[self.customerHeader sd_setImageWithURL:[NSURL URLWithString:self.model.picture] placeholderImage:CoustomerReplaceImage];
[self.customerHeader sd_setImageWithURL:[NSURL URLWithString:self.model.picture] placeholderImage:ReplaceImage];
self.customerName.text = self.model.name;
self.customerPhoneNumber.text = self.model.mobile;
self.companyName.text = self.model.company;
......
......@@ -25,7 +25,7 @@
- (void)setModel:(TOConsumerEntity *)model
{
_model = model;
[self.customerHeader sd_setImageWithURL:[NSURL URLWithString:_model.picture] placeholderImage:CoustomerReplaceImage];
[self.customerHeader sd_setImageWithURL:[NSURL URLWithString:_model.picture] placeholderImage:ReplaceImage];
self.customerName.text = _model.name;
self.companyName.text = _model.company;
self.customerPhoneNumber.text = _model.mobile;
......
......@@ -20,7 +20,7 @@
- (void)setModel:(MyclientEntityModel *)model
{
_model = model;
[self.personHeader sd_setImageWithURL:[NSURL URLWithString:_model.picture] placeholderImage:CoustomerReplaceImage];
[self.personHeader sd_setImageWithURL:[NSURL URLWithString:_model.picture] placeholderImage:ReplaceImage];
self.personName.text = _model.name;
self.personPhoneNumber.text = _model.mobile;
self.recentTime.text = _model.lastVisitedTime;
......
......@@ -19,7 +19,7 @@
- (void)setModel:(MyclientEntityModel *)model
{
_model = model;
[self.customerHeader sd_setImageWithURL:[NSURL URLWithString:_model.picture] placeholderImage:CoustomerReplaceImage];
[self.customerHeader sd_setImageWithURL:[NSURL URLWithString:_model.picture] placeholderImage:ReplaceImage];
self.customerName.text = _model.name;
self.customerPhoneName.text = _model.mobile;
self.serviceName.text = _model.createName;
......
......@@ -43,7 +43,7 @@
self.orderSerialNumber.text = _model.order.orderNumber;
self.shoppersName.text = _model.employee.realName;
self.customerName.text = _model.consumer.name;
[self.customerHeader sd_setImageWithURL:[NSURL URLWithString:_model.consumer.picture] placeholderImage:CoustomerReplaceImage];
[self.customerHeader sd_setImageWithURL:[NSURL URLWithString:_model.consumer.picture] placeholderImage:ReplaceImage];
self.orderStatus.text = _model.order.orderState;
self.consigneeName.text = _model.order.receiverName;
self.consigneePhoneNumber.text = _model.order.receiverMobile;
......
......@@ -489,8 +489,8 @@
[goodsArray enumerateObjectsUsingBlock:^(ShopcarModel * _Nonnull model, NSUInteger idx, BOOL * _Nonnull stop) {
dispatch_group_enter(group);
NSLog(@"%@",[NSString stringWithFormat:@"%@%@/%@/%@/%ld",SERVERREQUESTURL(CHANGESHOPPINGBAGNUMBERPRICE),model.fid,model.goodsId,[model.costPrice stringValue],model.goodsNum]);
[HTTP networkWithDictionaryRequestWithURL:[NSString stringWithFormat:@"%@%@/%@/%@/%ld",SERVERREQUESTURL(CHANGESHOPPINGBAGNUMBERPRICE),model.fid,model.goodsId,[model.costPrice stringValue],model.goodsNum] withRequestType:ONE withParameter:nil withReturnValueBlock:^(id returnValue) {
NSString *urlString = [NSString stringWithFormat:SERVERREQUESTURL(CHANGESHOPPINGBAGNUMBERPRICE),model.fid,[model.costPrice stringValue],model.goodsId,model.goodsNum];
[HTTP networkWithDictionaryRequestWithURL:urlString withRequestType:ZERO withParameter:nil withReturnValueBlock:^(id returnValue) {
dispatch_group_leave(group);
if (RESULT(returnValue)) {
......
......@@ -156,24 +156,12 @@
cell.orderNumberLabel.text = drawEntity.draw.orderNumber;
cell.drawButton.tag = indexPath.row;
[cell.drawButton addTarget:self action:@selector(drawButtonClickAction:) forControlEvents:UIControlEventTouchUpInside];
if (self.drawValue == 0) {
cell.orderNumberTitle.font = [UIFont systemFontOfSize:12];
cell.drawButton.titleLabel.font = [UIFont systemFontOfSize:12];
cell.orderNumberLabel.font = [UIFont systemFontOfSize:12];
}
return cell;
}
UsedDrawTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"UsedDrawTableViewCell" forIndexPath:indexPath];
cell.orderNumber.text = drawEntity.draw.orderNumber;
cell.drawTimeLabel.text = drawEntity.draw.drawDate;
cell.trophyLabel.text = drawEntity.draw.awardDescription;
if (self.drawValue == 0) {
cell.drawTimeLabel.hidden = YES;
cell.drawTimeTitle.hidden = YES;
cell.orderNumberTitle.font = [UIFont systemFontOfSize:12];
cell.trophyLabel.font = [UIFont systemFontOfSize:12];
cell.orderNumber.font = [UIFont systemFontOfSize:12];
}
return cell;
}
......@@ -216,28 +204,20 @@
#pragma mark -友好界面
- (UIImage *)imageForEmptyDataSet:(UIScrollView *)scrollView
- (NSAttributedString *)titleForEmptyDataSet:(UIScrollView *)scrollView
{
if (self.drawValue) {
return kNoDataImage;
}
return nil;
return [[NSAttributedString alloc]initWithString:@"暂无抽奖记录~" attributes:nil];
}
- (BOOL)emptyDataSetShouldAllowScroll:(UIScrollView *)scrollView
- (UIImage *)imageForEmptyDataSet:(UIScrollView *)scrollView
{
return YES;
return kNoDataImage;
}
- (NSAttributedString *)titleForEmptyDataSet:(UIScrollView *)scrollView
- (CGFloat)verticalOffsetForEmptyDataSet:(UIScrollView *)scrollView
{
return [[NSAttributedString alloc]initWithString:@"暂无抽奖记录~" attributes:nil];
return 64;
}
- (void)didReceiveMemoryWarning {
[super didReceiveMemoryWarning];
}
@end
//
// LuckyDrawMainViewController.h
// Lighting
//
// Created by 曹云霄 on 2017/3/28.
// Copyright © 2017年 上海勾芒科技有限公司. All rights reserved.
//
#import "BaseViewController.h"
@interface LuckyDrawMainViewController : BaseViewController
@property (weak, nonatomic) IBOutlet UITableView *luckyDrawMainTableView;
@end
//
// LuckyDrawMainViewController.m
// Lighting
//
// Created by 曹云霄 on 2017/3/28.
// Copyright © 2017年 上海勾芒科技有限公司. All rights reserved.
//
#import "LuckyDrawMainViewController.h"
#import "NotDrawTableViewCell.h"
#import "UsedDrawTableViewCell.h"
#import "CustomWKWebViewController.h"
@interface LuckyDrawMainViewController ()<UITableViewDelegate,UITableViewDataSource,DZNEmptyDataSetSource,DZNEmptyDataSetDelegate>
/**
* 数据源
*/
@property (nonatomic,strong) NSMutableArray *datasArray;
/**
查询抽奖
*/
@property (nonatomic,strong) RsLotteryRequest *drawModel;
@end
@implementation LuckyDrawMainViewController
#pragma mark - lazy
- (NSMutableArray *)datasArray
{
if (!_datasArray) {
_datasArray = [NSMutableArray array];
}
return _datasArray;
}
- (RsLotteryRequest *)drawModel
{
if (!_drawModel) {
_drawModel = [[RsLotteryRequest alloc]init];
_drawModel.winnerIdEquals = [Shoppersmanager manager].shoppers.employee.fid;
DataPage *page = [[DataPage alloc]init];
page.rows = KROWS;
page.page = ONE;
page.order = SORTDIRECTION_DESC;
_drawModel.page = page;
}
return _drawModel;
}
- (void)viewDidAppear:(BOOL)animated
{
[super viewDidAppear:animated];
[self getDrawDatas];
}
- (void)viewDidLoad
{
[super viewDidLoad];
self.luckyDrawMainTableView.tableFooterView = [[UIView alloc] init];
}
#pragma mark - 抽奖数据
- (void)getDrawDatas
{
WS(weakSelf);
[XBLoadingView showHUDViewWithDefaultWithView:self.view];
[HTTP networkRequestWithURL:SERVERREQUESTURL(LOTTERYED) withRequestType:ZERO withParameter:self.drawModel withReturnValueBlock:^(id returnValue) {
weakSelf.luckyDrawMainTableView.emptyDataSetSource = weakSelf;
weakSelf.luckyDrawMainTableView.emptyDataSetDelegate = weakSelf;
[XBLoadingView hideHUDViewWithDefaultWithView:weakSelf.view];
if (RESULT(returnValue)) {
RsLotteryResponse *drawRecord = [[RsLotteryResponse alloc]initWithDictionary:RESPONSE(returnValue) error:nil];
[weakSelf.datasArray addObjectsFromArray:drawRecord.list];
[weakSelf.luckyDrawMainTableView reloadData];
}else {
[XBLoadingView showHUDViewWithText:MESSAGE(returnValue)];
}
} withFailureBlock:^(NSError *error) {
[weakSelf endRefreshingForTableView:weakSelf.luckyDrawMainTableView];
[XBLoadingView hideHUDViewWithDefaultWithView:weakSelf.view];
[XBLoadingView showHUDViewWithText:error.localizedDescription];
}];
}
- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
{
RsAwardDraw *drawEntity = self.datasArray[indexPath.row];
if ([drawEntity.draw.state isEqualToString:@"initial"]) {
NotDrawTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"NotDrawTableViewCell" forIndexPath:indexPath];
cell.orderNumberLabel.text = drawEntity.draw.orderNumber;
cell.drawButton.tag = indexPath.row;
[cell.drawButton addTarget:self action:@selector(drawButtonClickAction:) forControlEvents:UIControlEventTouchUpInside];
return cell;
}
UsedDrawTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"UsedDrawTableViewCell" forIndexPath:indexPath];
cell.orderNumber.text = drawEntity.draw.orderNumber;
cell.drawTimeLabel.text = drawEntity.draw.drawDate;
cell.trophyLabel.text = drawEntity.draw.awardDescription;
return cell;
}
- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
{
return self.datasArray.count;
}
#pragma mark - 去抽奖
- (void)drawButtonClickAction:(UIButton *)sender
{
RsAwardDraw *drawEntity = self.datasArray[sender.tag];
[self showLuckyDrawControl:drawEntity.draw.lotteryId andOrderNumber:drawEntity.draw.orderNumber andDrawid:drawEntity.draw.fid luckyDrawFinish:^(NSDictionary *dict) {
if ([dict isKindOfClass:[NSDictionary class]]) {
if ([BaseViewController isBlankString:dict[@"awardId"]]) {
[XBLoadingView showHUDViewWithText:@"未中奖"];
}else {
[XBLoadingView showHUDViewWithText:[NSString stringWithFormat:@"恭喜你获得了 %@",dict[@"description"]]];
}
}
}];
}
#pragma mark - 抽奖界面
- (void)showLuckyDrawControl:(NSString *)lotteryId andOrderNumber:(NSString *)orderNumber andDrawid:(NSString *)drawid luckyDrawFinish:(void(^)(NSDictionary *dict))complete
{
CustomWKWebViewController *wkWebView = [[CustomWKWebViewController alloc]init];
NSString *server = [NSString stringWithFormat:SERVERREQUESTURL(DRAW),lotteryId,drawid,orderNumber];
NSString *newServer = [server stringByReplacingOccurrencesOfString:@"/app" withString:@""];
wkWebView.urlString = newServer;
[wkWebView setLuckyDrawFinishBlock:^(NSDictionary *result) {
complete(result);
}];
[wkWebView setDismissLuckyDrawController:^{
}];
[self presentViewController:wkWebView animated:YES completion:nil];
}
#pragma mark -友好界面
- (NSAttributedString *)titleForEmptyDataSet:(UIScrollView *)scrollView
{
return [[NSAttributedString alloc]initWithString:@"暂无抽奖记录~" attributes:nil];
}
@end
//
// ReadPacketMainViewController.h
// Lighting
//
// Created by 曹云霄 on 2017/3/28.
// Copyright © 2017年 上海勾芒科技有限公司. All rights reserved.
//
#import "BaseViewController.h"
@interface ReadPacketMainViewController : BaseViewController
@property (weak, nonatomic) IBOutlet UICollectionView *readPacketMainCollectionView;
@property (weak, nonatomic) IBOutlet UICollectionViewFlowLayout *readPacketMainFlowLayout;
@end
//
// ReadPacketMainViewController.m
// Lighting
//
// Created by 曹云霄 on 2017/3/28.
// Copyright © 2017年 上海勾芒科技有限公司. All rights reserved.
//
#import "ReadPacketMainViewController.h"
#import "ReadPacketCollectionViewCell.h"
#import "CardOrderInformationReusableView.h"
#import "DeviceDirectionManager.h"
@interface ReadPacketMainViewController ()<UICollectionViewDelegate,UICollectionViewDataSource,DZNEmptyDataSetSource,DZNEmptyDataSetDelegate,UploadReceiptsDelegate,UIImagePickerControllerDelegate,UINavigationControllerDelegate>
/**
查询红包
*/
@property (nonatomic,strong) RsRedPackageConditions *queryReadPacket;
/**
红包数据
*/
@property (nonatomic,strong) RedPackageResponse *readPacketResult;
/**
数据源
*/
@property (nonatomic,strong) NSMutableArray *readPacketArray;
/**
选中订单号
*/
@property (nonatomic,strong) NSString *orderNumber;
@end
@implementation ReadPacketMainViewController
- (void)viewDidAppear:(BOOL)animated
{
[super viewDidAppear:animated];
[self getReadPacketAction];
}
- (void)viewDidLoad {
[super viewDidLoad];
[self setupCollectionView];
}
#pragma mark - 获取红包信息
- (void)getReadPacketAction
{
WS(weakSelf);
[XBLoadingView showHUDViewWithDefault];
[HTTP networkRequestWithURL:SERVERREQUESTURL(QUERY_REDPACKAGE) withRequestType:ZERO withParameter:self.queryReadPacket withReturnValueBlock:^(id returnValue) {
[XBLoadingView hideHUDViewWithDefault];
weakSelf.readPacketMainCollectionView.emptyDataSetSource = weakSelf;
weakSelf.readPacketMainCollectionView.emptyDataSetDelegate = weakSelf;
[weakSelf endRefreshingForTableView:weakSelf.readPacketMainCollectionView];
if (RESULT(returnValue)) {
weakSelf.readPacketResult = [[RedPackageResponse alloc]initWithDictionary:RESPONSE(returnValue) error:nil];
[weakSelf.readPacketArray addObjectsFromArray:[NSMutableArray arrayWithArray:weakSelf.readPacketResult.list]];
[weakSelf.readPacketMainCollectionView reloadData];
}else{
[XBLoadingView showHUDViewWithText:MESSAGE(returnValue)];
}
}withFailureBlock:^(NSError *error) {
[weakSelf endRefreshingForTableView:weakSelf.readPacketMainCollectionView];
[XBLoadingView showHUDViewWithText:error.localizedDescription];
}];
}
#pragma mark - UICollectionView
- (void)setupCollectionView
{
CGFloat width = (ScreenWidth-6*20)/5.0;
self.readPacketMainFlowLayout.itemSize = CGSizeMake(width, width*0.6+width);
self.readPacketMainFlowLayout.sectionInset = UIEdgeInsetsMake(20, 20, 20, 20);
self.readPacketMainFlowLayout.minimumLineSpacing = 20;
self.readPacketMainFlowLayout.minimumInteritemSpacing = 20;
[self.readPacketMainCollectionView registerNib:[UINib nibWithNibName:@"CardOrderInformationReusableView" bundle:nil] forSupplementaryViewOfKind:UICollectionElementKindSectionHeader withReuseIdentifier:@"CardOrderInformationReusableView"];
}
- (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath
{
ReadPacketCollectionViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"ReadPacketCollectionViewCell" forIndexPath:indexPath];
RedPackageGroupbyOrderNumber *order = self.readPacketArray[indexPath.section];
cell.readPacket = order.draws[indexPath.item];
return cell;
}
- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section
{
RedPackageGroupbyOrderNumber *order = self.readPacketArray[section];
return order.draws.count;
}
- (UICollectionReusableView *)collectionView:(UICollectionView *)collectionView viewForSupplementaryElementOfKind:(NSString *)kind atIndexPath:(NSIndexPath *)indexPath
{
CardOrderInformationReusableView *headerView = [collectionView dequeueReusableSupplementaryViewOfKind:UICollectionElementKindSectionHeader withReuseIdentifier:@"CardOrderInformationReusableView" forIndexPath:indexPath];
[headerView refreshHeaderView:self withEntity:self.readPacketArray[indexPath.section] withSectionIndex:indexPath.section];
return headerView;
}
- (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout referenceSizeForHeaderInSection:(NSInteger)section
{
return CGSizeMake(0, 65);
}
- (NSInteger)numberOfSectionsInCollectionView:(UICollectionView *)collectionView
{
return self.readPacketArray.count;
}
#pragma mark - <UploadReceiptsDelegate>
- (void)startUploadReceipts:(NSInteger)sectionIndex
{
WS(weakSelf);
self.orderNumber = [self.readPacketArray[sectionIndex] orderNumber];
UIAlertController *alertView = [UIAlertController alertControllerWithTitle:nil message:nil preferredStyle:UIAlertControllerStyleAlert];
UIImagePickerController *PcCamera = [[UIImagePickerController alloc]init];
PcCamera.delegate = self;
[DeviceDirectionManager instance].isHorizontal=YES;
[alertView addAction:[UIAlertAction actionWithTitle:@"拍照" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
//拍照
if ([UIImagePickerController isSourceTypeAvailable:UIImagePickerControllerSourceTypeCamera]) {
[PcCamera setSourceType:UIImagePickerControllerSourceTypeCamera];
PcCamera.allowsEditing = YES;
[weakSelf presentViewController:PcCamera animated:YES completion:nil];
}
else
{
[DeviceDirectionManager instance].isHorizontal=NO;
[XBLoadingView showHUDViewWithText:@"相机无法使用"];
}
}]];
[alertView addAction:[UIAlertAction actionWithTitle:@"从相册选择" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
//从相册中选择
if ([UIImagePickerController isSourceTypeAvailable:UIImagePickerControllerSourceTypePhotoLibrary]) {
[PcCamera setSourceType:UIImagePickerControllerSourceTypePhotoLibrary];
PcCamera.allowsEditing = YES;
[weakSelf presentViewController:PcCamera animated:YES completion:nil];
}
else
{
[DeviceDirectionManager instance].isHorizontal=NO;
[XBLoadingView showHUDViewWithText:@"相册无法打开"];
}
}]];
[alertView addAction:[UIAlertAction actionWithTitle:@"取消" style:UIAlertActionStyleCancel handler:^(UIAlertAction * _Nonnull action) {
[DeviceDirectionManager instance].isHorizontal=NO;
[alertView dismissViewControllerAnimated:YES completion:nil];
}]];
[self presentViewController:alertView animated:YES completion:nil];
}
#pragma mark -拍照、从相册选择
#pragma -mark -UIImagePickerControllerDelegate
- (void)imagePickerController:(UIImagePickerController *)picker didFinishPickingMediaWithInfo:(NSDictionary<NSString *,id> *)info
{
[DeviceDirectionManager instance].isHorizontal=NO;
[self dismissViewControllerAnimated:YES completion:nil];
UIImage *Headimage = [info objectForKey:UIImagePickerControllerOriginalImage];
[self uploadReceipts:Headimage];
}
#pragma mark -上传小票
- (void)uploadReceipts:(UIImage *)image
{
WS(weakSelf);
NSData *data = UIImageJPEGRepresentation(image, 0.5);
XBLoadingView *progressView = [XBLoadingView showHUDViewProgressLabel:@"上传小票中"];
[HTTP uploadImageWithURL:SERVERREQUESTURL(UPLOADHEADER) withRequestType:ONE withImageDatas:data withParameter:nil withReturnValueBlock:^(id returnValue) {
if (RESULT(returnValue)) {
[weakSelf activationReadPacket:RESPONSE(returnValue)];
}else
{
[XBLoadingView showHUDViewWithText:MESSAGE(returnValue)];
}
} withprogressBlock:^(double progress) {
if (progress >= 1) {
dispatch_async(dispatch_get_main_queue(), ^{
progressView.labelText = @"上传小票成功";
[progressView hide:YES];
});
}else {
progressView.progress = progress;
}
} withFailureBlock:^(NSError *error) {
[XBLoadingView showHUDViewWithText:error.localizedDescription];
}];
}
#pragma mark - 激活红包
- (void)activationReadPacket:(NSString *)imagePath
{
WS(weakSelf);
[XBLoadingView showHUDViewWithDefault];
[HTTP networkWithDictionaryRequestWithURL:[NSString stringWithFormat:SERVERREQUESTURL(READPACKETPATH),self.orderNumber,imagePath] withRequestType:POST withParameter:nil withReturnValueBlock:^(id returnValue) {
[XBLoadingView hideHUDViewWithDefault];
if (RESULT(returnValue)) {
[XBLoadingView showHUDViewWithSuccessText:@"激活成功" completeBlock:^{
[weakSelf.readPacketMainCollectionView.mj_header beginRefreshing];
}];
}else{
[XBLoadingView showHUDViewWithText:MESSAGE(returnValue)];
}
} withFailureBlock:^(NSError *error) {
[XBLoadingView showHUDViewWithText:error.localizedDescription];
}];
}
#pragma mark -友好界面
- (NSAttributedString *)titleForEmptyDataSet:(UIScrollView *)scrollView
{
return [[NSAttributedString alloc]initWithString:@"暂无红包记录~" attributes:nil];
}
#pragma mark -lazy
- (RsRedPackageConditions *)queryReadPacket
{
if (!_queryReadPacket) {
_queryReadPacket = [[RsRedPackageConditions alloc] init];
_queryReadPacket.guideIdEquals = [Shoppersmanager manager].shoppers.employee.fid;
DataPage *page = [[DataPage alloc] init];
page.page = ZERO;
page.rows = KROWS;
_queryReadPacket.page = page;
}
return _queryReadPacket;
}
- (NSMutableArray *)readPacketArray
{
if (!_readPacketArray) {
_readPacketArray = [NSMutableArray array];
}
return _readPacketArray;
}
@end
......@@ -27,6 +27,11 @@
*/
@property (weak, nonatomic) IBOutlet UIButton *unauditedButton;
/**
已拒绝
*/
@property (weak, nonatomic) IBOutlet UIButton *refusedButton;
/**
已审核
*/
......
......@@ -33,6 +33,10 @@
[self addChildViewController:unauditedVc];
unauditedVc.readPacketState = STUDYTASKSTATE_INITIAL;
[self.controllerBackgroundView addSubview:unauditedVc.view];
/// 已拒绝
ReadPacketViewController *refuseVc = [[[self class] getMainStoryboardClass] instantiateViewControllerWithIdentifier:@"ReadPacketViewController"];
refuseVc.readPacketState = STUDYTASKSTATE_REFUSE;
[self addChildViewController:refuseVc];
/// 已审核
ReadPacketViewController *auditedVc = [[[self class] getMainStoryboardClass] instantiateViewControllerWithIdentifier:@"ReadPacketViewController"];
auditedVc.readPacketState = STUDYTASKSTATE_USED;
......@@ -46,12 +50,15 @@
ReadPacketViewController *unauditedVc = self.childViewControllers[0];
unauditedVc.view.frame = CGRectMake(0, 0, self.controllerBackgroundView.mj_w, self.controllerBackgroundView.mj_h);
ReadPacketViewController *auditedVc = self.childViewControllers[1];
ReadPacketViewController *refuseVc = self.childViewControllers[1];
refuseVc.view.frame = CGRectMake(0, 0, self.controllerBackgroundView.mj_w, self.controllerBackgroundView.mj_h);
ReadPacketViewController *auditedVc = self.childViewControllers[2];
auditedVc.view.frame = CGRectMake(0, 0, self.controllerBackgroundView.mj_w, self.controllerBackgroundView.mj_h);
}
#pragma mark - 切换已使用卡劵、未使用卡劵
#pragma mark - 切换
- (void)switchPaymentsVCAndWithdrawalVC:(UIViewController *)newViewController
{
[self transitionFromViewController:self.currentVC toViewController:newViewController duration:0.5 options:UIViewAnimationOptionTransitionNone animations:nil completion:^(BOOL finished) {
......@@ -73,7 +80,7 @@
#pragma mark - 切换ContentController
#pragma mark -红包状态 tag 100表示未审核,101表示已审核
#pragma mark -红包状态 tag 100表示未审核,101表示已拒绝,102表示已审核
- (IBAction)readPacketStateClickAction:(UIButton *)sender {
for (id object in self.view.subviews) {
......
......@@ -251,19 +251,19 @@
#pragma mark -友好界面
- (UIImage *)imageForEmptyDataSet:(UIScrollView *)scrollView
- (NSAttributedString *)titleForEmptyDataSet:(UIScrollView *)scrollView
{
return kNoDataImage;
return [[NSAttributedString alloc]initWithString:@"暂无数据" attributes:nil];
}
- (BOOL)emptyDataSetShouldAllowScroll:(UIScrollView *)scrollView
- (UIImage *)imageForEmptyDataSet:(UIScrollView *)scrollView
{
return YES;
return kNoDataImage;
}
- (NSAttributedString *)titleForEmptyDataSet:(UIScrollView *)scrollView
- (CGFloat)verticalOffsetForEmptyDataSet:(UIScrollView *)scrollView
{
return [[NSAttributedString alloc]initWithString:@"暂无数据" attributes:nil];
return 64;
}
......@@ -291,20 +291,4 @@
return _readPacketArray;
}
@end
......@@ -17,6 +17,8 @@
#import "BindingBankCARDViewController.h"
#import "ReadPacketViewController.h"
#import "ReadPacketStateViewController.h"
#import "LuckyDrawMainViewController.h"
#import "ReadPacketMainViewController.h"
@interface RebateViewController ()
......@@ -145,9 +147,8 @@
}];
// 我的抽奖
LuckyDrawDetailsViewController *draw = [[[self class] getMainStoryboardClass]instantiateViewControllerWithIdentifier:@"LuckyDrawDetailsViewController"];
LuckyDrawMainViewController *draw = [[[self class] getMainStoryboardClass]instantiateViewControllerWithIdentifier:@"LuckyDrawMainViewController"];
[self addChildViewController:draw];
draw.drawValue = ALLDRAW;
[self.drawBackgroundView addSubview:draw.view];
[draw.view mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(self.drawBackgroundView.mas_left).offset(10);
......@@ -157,7 +158,7 @@
}];
// 红包
ReadPacketViewController *readPacket = [[[self class] getMainStoryboardClass] instantiateViewControllerWithIdentifier:@"ReadPacketViewController"];
ReadPacketMainViewController *readPacket = [[[self class] getMainStoryboardClass] instantiateViewControllerWithIdentifier:@"ReadPacketMainViewController"];
[self addChildViewController:readPacket];
[self.readPacketBackgroundView addSubview:readPacket.view];
[readPacket.view mas_makeConstraints:^(MASConstraintMaker *make) {
......
......@@ -163,6 +163,11 @@
return kNoDataImage;
}
- (CGFloat)verticalOffsetForEmptyDataSet:(UIScrollView *)scrollView
{
return 64;
}
- (BOOL)emptyDataSetShouldAllowScroll:(UIScrollView *)scrollView
{
return YES;
......@@ -173,10 +178,5 @@
return [[NSAttributedString alloc]initWithString:@"暂无数据" attributes:nil];
}
- (CGFloat)verticalOffsetForEmptyDataSet:(UIScrollView *)scrollView
{
return 64;
}
@end
......@@ -27,12 +27,9 @@
290887131CE5DF16000B7097 /* ShopcarModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 290887121CE5DF16000B7097 /* ShopcarModel.m */; };
290E26381E83A1A40036A8B3 /* province_data.xml in Resources */ = {isa = PBXBuildFile; fileRef = 290E26371E83A1A40036A8B3 /* province_data.xml */; };
2912DFE21E012FE80095C576 /* PostPhotoManagerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2912DFE11E012FE80095C576 /* PostPhotoManagerViewController.m */; };
2916A7411D70362000644C8C /* PaymentsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2916A7401D70362000644C8C /* PaymentsViewController.m */; };
2916A7441D70363E00644C8C /* WithdrawalViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2916A7431D70363E00644C8C /* WithdrawalViewController.m */; };
2916A7481D703A1700644C8C /* UIView+cornerRadius.m in Sources */ = {isa = PBXBuildFile; fileRef = 2916A7471D703A1700644C8C /* UIView+cornerRadius.m */; };
2916A74C1D703DFF00644C8C /* PaymentsTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 2916A74B1D703DFF00644C8C /* PaymentsTableViewCell.m */; };
2916A74F1D703E4F00644C8C /* WithdrawalTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 2916A74E1D703E4F00644C8C /* WithdrawalTableViewCell.m */; };
2916A7521D70557400644C8C /* PaymentsDetailsTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2916A7511D70557400644C8C /* PaymentsDetailsTableViewController.m */; };
291A37771DBA58CC00299F0D /* GetJDCardView.m in Sources */ = {isa = PBXBuildFile; fileRef = 291A37761DBA58CC00299F0D /* GetJDCardView.m */; };
291A37791DBA58D700299F0D /* GetJDCardView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 291A37781DBA58D700299F0D /* GetJDCardView.xib */; };
291D118D1E790B0B001E081E /* DiscussMainViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 291D118C1E790B0B001E081E /* DiscussMainViewController.m */; };
......@@ -125,8 +122,6 @@
2962D0811CD1E6010058829D /* UIView+Frame.m in Sources */ = {isa = PBXBuildFile; fileRef = 2962D0801CD1E6010058829D /* UIView+Frame.m */; };
29698D611CE2C11500D72CE7 /* SettlementViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29698D5F1CE2C11500D72CE7 /* SettlementViewController.m */; };
29698D621CE2C11500D72CE7 /* SettlementViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 29698D601CE2C11500D72CE7 /* SettlementViewController.xib */; };
29702B461D727F6200322196 /* WithdrawalTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29702B451D727F6200322196 /* WithdrawalTableViewController.m */; };
29702B631D72EE2E00322196 /* RebateDetailsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29702B621D72EE2E00322196 /* RebateDetailsViewController.m */; };
29706DA61CD082990003C412 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29706DA51CD082990003C412 /* main.m */; };
29706DA91CD082990003C412 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 29706DA81CD082990003C412 /* AppDelegate.m */; };
29706DB41CD082990003C412 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 29706DB31CD082990003C412 /* Assets.xcassets */; };
......@@ -138,10 +133,6 @@
2971E9841DF69F9A00256567 /* CountDownLabel.m in Sources */ = {isa = PBXBuildFile; fileRef = 2971E9831DF69F9A00256567 /* CountDownLabel.m */; };
2971E9891DF6CD7700256567 /* AssessmentQualifiedViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2971E9881DF6CD7700256567 /* AssessmentQualifiedViewController.m */; };
2971E98C1DF6CD9200256567 /* AssessmentUnqualifiedViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2971E98B1DF6CD9200256567 /* AssessmentUnqualifiedViewController.m */; };
297231231E09212200D8CA9B /* BindingBankCARDViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2972311E1E09212200D8CA9B /* BindingBankCARDViewController.m */; };
297231241E09212200D8CA9B /* BindingSuccessViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2972311F1E09212200D8CA9B /* BindingSuccessViewController.m */; };
297231251E09212200D8CA9B /* RebateViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 297231221E09212200D8CA9B /* RebateViewController.m */; };
297231281E0921B700D8CA9B /* PaymentWithdrawalMainViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 297231261E0921B700D8CA9B /* PaymentWithdrawalMainViewController.m */; };
2972312B1E09231C00D8CA9B /* BindingTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 2972312A1E09231C00D8CA9B /* BindingTableViewCell.m */; };
2972312E1E0948A400D8CA9B /* MyBankClass.m in Sources */ = {isa = PBXBuildFile; fileRef = 2972312D1E0948A400D8CA9B /* MyBankClass.m */; };
2973C33B1DBEF2EC00FAC995 /* ClientShoppingCarViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2973C33A1DBEF2EC00FAC995 /* ClientShoppingCarViewController.m */; };
......@@ -226,7 +217,6 @@
29A938221CDADE4700F21E54 /* ProductDetailsTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 29A938211CDADE4700F21E54 /* ProductDetailsTableViewCell.m */; };
29A938251CDAE31200F21E54 /* ProductDetailsHeaderView.m in Sources */ = {isa = PBXBuildFile; fileRef = 29A938241CDAE31200F21E54 /* ProductDetailsHeaderView.m */; };
29A938271CDAE31B00F21E54 /* ProductDetailsHeaderView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 29A938261CDAE31B00F21E54 /* ProductDetailsHeaderView.xib */; };
29A974CA1D72F9C80012AFA1 /* RebateSuccessTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29A974C91D72F9C80012AFA1 /* RebateSuccessTableViewController.m */; };
29A9DCAE1CEB643C00A7567A /* CustomWKWebViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29A9DCAC1CEB643C00A7567A /* CustomWKWebViewController.m */; };
29AB91E41E553AF4003A3A08 /* CustomTabbarController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29AB91E01E553AF4003A3A08 /* CustomTabbarController.m */; };
29AB91E51E553AF4003A3A08 /* Toolview.m in Sources */ = {isa = PBXBuildFile; fileRef = 29AB91E31E553AF4003A3A08 /* Toolview.m */; };
......@@ -273,6 +263,18 @@
29C584E91CDA249300C6F677 /* ProductCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 29C584E81CDA249200C6F677 /* ProductCollectionViewCell.m */; };
29C584ED1CDA429500C6F677 /* ProductDetailsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29C584EC1CDA429500C6F677 /* ProductDetailsViewController.m */; };
29CB35421CFF0FB60061A5F3 /* ScreeningCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 29CB35411CFF0FB60061A5F3 /* ScreeningCollectionViewCell.m */; };
29CC51EC1E8A011E009FBB6A /* PaymentWithdrawalMainViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29CC51D61E8A011E009FBB6A /* PaymentWithdrawalMainViewController.m */; };
29CC51ED1E8A011E009FBB6A /* RebateDetailsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29CC51D81E8A011E009FBB6A /* RebateDetailsViewController.m */; };
29CC51EE1E8A011E009FBB6A /* RebateSuccessTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29CC51DA1E8A011E009FBB6A /* RebateSuccessTableViewController.m */; };
29CC51EF1E8A011E009FBB6A /* RebateViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29CC51DC1E8A011E009FBB6A /* RebateViewController.m */; };
29CC51F01E8A011E009FBB6A /* PaymentsDetailsTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29CC51DF1E8A011E009FBB6A /* PaymentsDetailsTableViewController.m */; };
29CC51F11E8A011E009FBB6A /* PaymentsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29CC51E11E8A011E009FBB6A /* PaymentsViewController.m */; };
29CC51F21E8A011E009FBB6A /* WithdrawalTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29CC51E41E8A011E009FBB6A /* WithdrawalTableViewController.m */; };
29CC51F31E8A011E009FBB6A /* WithdrawalViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29CC51E61E8A011E009FBB6A /* WithdrawalViewController.m */; };
29CC51F41E8A011E009FBB6A /* BindingBankCARDViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29CC51E91E8A011E009FBB6A /* BindingBankCARDViewController.m */; };
29CC51F51E8A011E009FBB6A /* BindingSuccessViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29CC51EB1E8A011E009FBB6A /* BindingSuccessViewController.m */; };
29CC51F81E8A032D009FBB6A /* LuckyDrawMainViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29CC51F71E8A032D009FBB6A /* LuckyDrawMainViewController.m */; };
29CC51FB1E8A0721009FBB6A /* ReadPacketMainViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29CC51FA1E8A0721009FBB6A /* ReadPacketMainViewController.m */; };
29CCA43C1CF7ED6100BC19DD /* SelectedTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 29CCA43B1CF7ED6100BC19DD /* SelectedTableViewCell.m */; };
29CF0EC81DDC564900A37171 /* GuideIntegral.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 29CF0EC71DDC564900A37171 /* GuideIntegral.storyboard */; };
29D260F51CEEAE2800A9787D /* FullScreenViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29D260F41CEEAE2800A9787D /* FullScreenViewController.m */; };
......@@ -363,18 +365,12 @@
290E26371E83A1A40036A8B3 /* province_data.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = province_data.xml; sourceTree = "<group>"; };
2912DFE01E012FE80095C576 /* PostPhotoManagerViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PostPhotoManagerViewController.h; sourceTree = "<group>"; };
2912DFE11E012FE80095C576 /* PostPhotoManagerViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PostPhotoManagerViewController.m; sourceTree = "<group>"; };
2916A73F1D70362000644C8C /* PaymentsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PaymentsViewController.h; sourceTree = "<group>"; };
2916A7401D70362000644C8C /* PaymentsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = PaymentsViewController.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
2916A7421D70363E00644C8C /* WithdrawalViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WithdrawalViewController.h; sourceTree = "<group>"; };
2916A7431D70363E00644C8C /* WithdrawalViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = WithdrawalViewController.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
2916A7461D703A1700644C8C /* UIView+cornerRadius.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIView+cornerRadius.h"; sourceTree = "<group>"; };
2916A7471D703A1700644C8C /* UIView+cornerRadius.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIView+cornerRadius.m"; sourceTree = "<group>"; };
2916A74A1D703DFF00644C8C /* PaymentsTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PaymentsTableViewCell.h; sourceTree = "<group>"; };
2916A74B1D703DFF00644C8C /* PaymentsTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PaymentsTableViewCell.m; sourceTree = "<group>"; };
2916A74D1D703E4F00644C8C /* WithdrawalTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WithdrawalTableViewCell.h; sourceTree = "<group>"; };
2916A74E1D703E4F00644C8C /* WithdrawalTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WithdrawalTableViewCell.m; sourceTree = "<group>"; };
2916A7501D70557400644C8C /* PaymentsDetailsTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PaymentsDetailsTableViewController.h; sourceTree = "<group>"; };
2916A7511D70557400644C8C /* PaymentsDetailsTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PaymentsDetailsTableViewController.m; sourceTree = "<group>"; };
29194B7E1E82547000C841D8 /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
291A37751DBA58CC00299F0D /* GetJDCardView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GetJDCardView.h; sourceTree = "<group>"; };
291A37761DBA58CC00299F0D /* GetJDCardView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GetJDCardView.m; sourceTree = "<group>"; };
......@@ -557,8 +553,6 @@
29698D5F1CE2C11500D72CE7 /* SettlementViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SettlementViewController.m; sourceTree = "<group>"; };
29698D601CE2C11500D72CE7 /* SettlementViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = SettlementViewController.xib; sourceTree = "<group>"; };
296F2AB206FEE715A29133A2 /* Pods-Lighting.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Lighting.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Lighting/Pods-Lighting.debug.xcconfig"; sourceTree = "<group>"; };
29702B441D727F6200322196 /* WithdrawalTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WithdrawalTableViewController.h; sourceTree = "<group>"; };
29702B451D727F6200322196 /* WithdrawalTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WithdrawalTableViewController.m; sourceTree = "<group>"; };
29702B471D72921600322196 /* AFNetworking.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AFNetworking.framework; path = "Pods/../build/Debug-iphoneos/AFNetworking.framework"; sourceTree = "<group>"; };
29702B481D72921600322196 /* DZNEmptyDataSet.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = DZNEmptyDataSet.framework; path = "Pods/../build/Debug-iphoneos/DZNEmptyDataSet.framework"; sourceTree = "<group>"; };
29702B491D72921600322196 /* FDFullscreenPopGesture.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FDFullscreenPopGesture.framework; path = "Pods/../build/Debug-iphoneos/FDFullscreenPopGesture.framework"; sourceTree = "<group>"; };
......@@ -572,8 +566,6 @@
29702B511D72921600322196 /* SDWebImage.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDWebImage.framework; path = "Pods/../build/Debug-iphoneos/SDWebImage.framework"; sourceTree = "<group>"; };
29702B521D72921600322196 /* SVProgressHUD.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SVProgressHUD.framework; path = "Pods/../build/Debug-iphoneos/SVProgressHUD.framework"; sourceTree = "<group>"; };
29702B531D72921600322196 /* YLProgressBar.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = YLProgressBar.framework; path = "Pods/../build/Debug-iphoneos/YLProgressBar.framework"; sourceTree = "<group>"; };
29702B611D72EE2E00322196 /* RebateDetailsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RebateDetailsViewController.h; sourceTree = "<group>"; };
29702B621D72EE2E00322196 /* RebateDetailsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = RebateDetailsViewController.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
29706DA11CD082990003C412 /* Lighting.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Lighting.app; sourceTree = BUILT_PRODUCTS_DIR; };
29706DA51CD082990003C412 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
29706DA71CD082990003C412 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
......@@ -597,14 +589,6 @@
2971E9881DF6CD7700256567 /* AssessmentQualifiedViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AssessmentQualifiedViewController.m; sourceTree = "<group>"; };
2971E98A1DF6CD9200256567 /* AssessmentUnqualifiedViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AssessmentUnqualifiedViewController.h; sourceTree = "<group>"; };
2971E98B1DF6CD9200256567 /* AssessmentUnqualifiedViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AssessmentUnqualifiedViewController.m; sourceTree = "<group>"; };
2972311D1E09212200D8CA9B /* BindingBankCARDViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BindingBankCARDViewController.h; sourceTree = "<group>"; };
2972311E1E09212200D8CA9B /* BindingBankCARDViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BindingBankCARDViewController.m; sourceTree = "<group>"; };
2972311F1E09212200D8CA9B /* BindingSuccessViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BindingSuccessViewController.m; sourceTree = "<group>"; };
297231201E09212200D8CA9B /* RebateViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RebateViewController.h; sourceTree = "<group>"; };
297231211E09212200D8CA9B /* BindingSuccessViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BindingSuccessViewController.h; sourceTree = "<group>"; };
297231221E09212200D8CA9B /* RebateViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RebateViewController.m; sourceTree = "<group>"; };
297231261E0921B700D8CA9B /* PaymentWithdrawalMainViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PaymentWithdrawalMainViewController.m; sourceTree = "<group>"; };
297231271E0921B700D8CA9B /* PaymentWithdrawalMainViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PaymentWithdrawalMainViewController.h; sourceTree = "<group>"; };
297231291E09231C00D8CA9B /* BindingTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BindingTableViewCell.h; sourceTree = "<group>"; };
2972312A1E09231C00D8CA9B /* BindingTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BindingTableViewCell.m; sourceTree = "<group>"; };
2972312C1E0948A400D8CA9B /* MyBankClass.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MyBankClass.h; sourceTree = "<group>"; };
......@@ -765,8 +749,6 @@
29A938231CDAE31200F21E54 /* ProductDetailsHeaderView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProductDetailsHeaderView.h; sourceTree = "<group>"; };
29A938241CDAE31200F21E54 /* ProductDetailsHeaderView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ProductDetailsHeaderView.m; sourceTree = "<group>"; };
29A938261CDAE31B00F21E54 /* ProductDetailsHeaderView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ProductDetailsHeaderView.xib; sourceTree = "<group>"; };
29A974C81D72F9C80012AFA1 /* RebateSuccessTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RebateSuccessTableViewController.h; sourceTree = "<group>"; };
29A974C91D72F9C80012AFA1 /* RebateSuccessTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RebateSuccessTableViewController.m; sourceTree = "<group>"; };
29A9DCAB1CEB643C00A7567A /* CustomWKWebViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CustomWKWebViewController.h; sourceTree = "<group>"; };
29A9DCAC1CEB643C00A7567A /* CustomWKWebViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CustomWKWebViewController.m; sourceTree = "<group>"; };
29AB91DF1E553AF4003A3A08 /* CustomTabbarController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CustomTabbarController.h; sourceTree = "<group>"; };
......@@ -855,6 +837,30 @@
29C584EC1CDA429500C6F677 /* ProductDetailsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ProductDetailsViewController.m; sourceTree = "<group>"; };
29CB35401CFF0FB60061A5F3 /* ScreeningCollectionViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScreeningCollectionViewCell.h; sourceTree = "<group>"; };
29CB35411CFF0FB60061A5F3 /* ScreeningCollectionViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ScreeningCollectionViewCell.m; sourceTree = "<group>"; };
29CC51D51E8A011E009FBB6A /* PaymentWithdrawalMainViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PaymentWithdrawalMainViewController.h; sourceTree = "<group>"; };
29CC51D61E8A011E009FBB6A /* PaymentWithdrawalMainViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PaymentWithdrawalMainViewController.m; sourceTree = "<group>"; };
29CC51D71E8A011E009FBB6A /* RebateDetailsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RebateDetailsViewController.h; sourceTree = "<group>"; };
29CC51D81E8A011E009FBB6A /* RebateDetailsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RebateDetailsViewController.m; sourceTree = "<group>"; };
29CC51D91E8A011E009FBB6A /* RebateSuccessTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RebateSuccessTableViewController.h; sourceTree = "<group>"; };
29CC51DA1E8A011E009FBB6A /* RebateSuccessTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RebateSuccessTableViewController.m; sourceTree = "<group>"; };
29CC51DB1E8A011E009FBB6A /* RebateViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RebateViewController.h; sourceTree = "<group>"; };
29CC51DC1E8A011E009FBB6A /* RebateViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RebateViewController.m; sourceTree = "<group>"; };
29CC51DE1E8A011E009FBB6A /* PaymentsDetailsTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PaymentsDetailsTableViewController.h; sourceTree = "<group>"; };
29CC51DF1E8A011E009FBB6A /* PaymentsDetailsTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PaymentsDetailsTableViewController.m; sourceTree = "<group>"; };
29CC51E01E8A011E009FBB6A /* PaymentsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PaymentsViewController.h; sourceTree = "<group>"; };
29CC51E11E8A011E009FBB6A /* PaymentsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PaymentsViewController.m; sourceTree = "<group>"; };
29CC51E31E8A011E009FBB6A /* WithdrawalTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WithdrawalTableViewController.h; sourceTree = "<group>"; };
29CC51E41E8A011E009FBB6A /* WithdrawalTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WithdrawalTableViewController.m; sourceTree = "<group>"; };
29CC51E51E8A011E009FBB6A /* WithdrawalViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WithdrawalViewController.h; sourceTree = "<group>"; };
29CC51E61E8A011E009FBB6A /* WithdrawalViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WithdrawalViewController.m; sourceTree = "<group>"; };
29CC51E81E8A011E009FBB6A /* BindingBankCARDViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BindingBankCARDViewController.h; sourceTree = "<group>"; };
29CC51E91E8A011E009FBB6A /* BindingBankCARDViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BindingBankCARDViewController.m; sourceTree = "<group>"; };
29CC51EA1E8A011E009FBB6A /* BindingSuccessViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BindingSuccessViewController.h; sourceTree = "<group>"; };
29CC51EB1E8A011E009FBB6A /* BindingSuccessViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BindingSuccessViewController.m; sourceTree = "<group>"; };
29CC51F61E8A032D009FBB6A /* LuckyDrawMainViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LuckyDrawMainViewController.h; sourceTree = "<group>"; };
29CC51F71E8A032D009FBB6A /* LuckyDrawMainViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LuckyDrawMainViewController.m; sourceTree = "<group>"; };
29CC51F91E8A0721009FBB6A /* ReadPacketMainViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReadPacketMainViewController.h; sourceTree = "<group>"; };
29CC51FA1E8A0721009FBB6A /* ReadPacketMainViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ReadPacketMainViewController.m; sourceTree = "<group>"; };
29CCA43A1CF7ED6100BC19DD /* SelectedTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SelectedTableViewCell.h; sourceTree = "<group>"; };
29CCA43B1CF7ED6100BC19DD /* SelectedTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SelectedTableViewCell.m; sourceTree = "<group>"; };
29CD16CB1E5302ED00163796 /* Lighting.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Lighting.entitlements; sourceTree = "<group>"; };
......@@ -1052,27 +1058,11 @@
2916A73B1D70230600644C8C /* RebateVC */ = {
isa = PBXGroup;
children = (
29CC51D41E8A011E009FBB6A /* MainControllers */,
29CC51DD1E8A011E009FBB6A /* Payments */,
29CC51E21E8A011E009FBB6A /* Withdrawal */,
29CC51E71E8A011E009FBB6A /* BankCard */,
2916A7491D703DE300644C8C /* Cells */,
2972311D1E09212200D8CA9B /* BindingBankCARDViewController.h */,
2972311E1E09212200D8CA9B /* BindingBankCARDViewController.m */,
297231211E09212200D8CA9B /* BindingSuccessViewController.h */,
2972311F1E09212200D8CA9B /* BindingSuccessViewController.m */,
297231271E0921B700D8CA9B /* PaymentWithdrawalMainViewController.h */,
297231261E0921B700D8CA9B /* PaymentWithdrawalMainViewController.m */,
2916A7501D70557400644C8C /* PaymentsDetailsTableViewController.h */,
2916A7511D70557400644C8C /* PaymentsDetailsTableViewController.m */,
2916A73F1D70362000644C8C /* PaymentsViewController.h */,
2916A7401D70362000644C8C /* PaymentsViewController.m */,
29702B611D72EE2E00322196 /* RebateDetailsViewController.h */,
29702B621D72EE2E00322196 /* RebateDetailsViewController.m */,
29A974C81D72F9C80012AFA1 /* RebateSuccessTableViewController.h */,
29A974C91D72F9C80012AFA1 /* RebateSuccessTableViewController.m */,
297231201E09212200D8CA9B /* RebateViewController.h */,
297231221E09212200D8CA9B /* RebateViewController.m */,
29702B441D727F6200322196 /* WithdrawalTableViewController.h */,
29702B451D727F6200322196 /* WithdrawalTableViewController.m */,
2916A7421D70363E00644C8C /* WithdrawalViewController.h */,
2916A7431D70363E00644C8C /* WithdrawalViewController.m */,
);
path = RebateVC;
sourceTree = "<group>";
......@@ -2143,6 +2133,8 @@
293163F91DCE3CBA0075129D /* LuckyDrawDetailsViewController.m */,
29B3EE6F1DCE16130065FCCF /* LuckyDrawViewController.h */,
29B3EE701DCE16130065FCCF /* LuckyDrawViewController.m */,
29CC51F61E8A032D009FBB6A /* LuckyDrawMainViewController.h */,
29CC51F71E8A032D009FBB6A /* LuckyDrawMainViewController.m */,
);
path = MyLuckyDraw;
sourceTree = "<group>";
......@@ -2476,6 +2468,55 @@
path = Controllers;
sourceTree = "<group>";
};
29CC51D41E8A011E009FBB6A /* MainControllers */ = {
isa = PBXGroup;
children = (
29CC51D51E8A011E009FBB6A /* PaymentWithdrawalMainViewController.h */,
29CC51D61E8A011E009FBB6A /* PaymentWithdrawalMainViewController.m */,
29CC51D71E8A011E009FBB6A /* RebateDetailsViewController.h */,
29CC51D81E8A011E009FBB6A /* RebateDetailsViewController.m */,
29CC51D91E8A011E009FBB6A /* RebateSuccessTableViewController.h */,
29CC51DA1E8A011E009FBB6A /* RebateSuccessTableViewController.m */,
29CC51DB1E8A011E009FBB6A /* RebateViewController.h */,
29CC51DC1E8A011E009FBB6A /* RebateViewController.m */,
);
name = MainControllers;
path = MianControllers;
sourceTree = "<group>";
};
29CC51DD1E8A011E009FBB6A /* Payments */ = {
isa = PBXGroup;
children = (
29CC51DE1E8A011E009FBB6A /* PaymentsDetailsTableViewController.h */,
29CC51DF1E8A011E009FBB6A /* PaymentsDetailsTableViewController.m */,
29CC51E01E8A011E009FBB6A /* PaymentsViewController.h */,
29CC51E11E8A011E009FBB6A /* PaymentsViewController.m */,
);
path = Payments;
sourceTree = "<group>";
};
29CC51E21E8A011E009FBB6A /* Withdrawal */ = {
isa = PBXGroup;
children = (
29CC51E31E8A011E009FBB6A /* WithdrawalTableViewController.h */,
29CC51E41E8A011E009FBB6A /* WithdrawalTableViewController.m */,
29CC51E51E8A011E009FBB6A /* WithdrawalViewController.h */,
29CC51E61E8A011E009FBB6A /* WithdrawalViewController.m */,
);
path = Withdrawal;
sourceTree = "<group>";
};
29CC51E71E8A011E009FBB6A /* BankCard */ = {
isa = PBXGroup;
children = (
29CC51E81E8A011E009FBB6A /* BindingBankCARDViewController.h */,
29CC51E91E8A011E009FBB6A /* BindingBankCARDViewController.m */,
29CC51EA1E8A011E009FBB6A /* BindingSuccessViewController.h */,
29CC51EB1E8A011E009FBB6A /* BindingSuccessViewController.m */,
);
path = BankCard;
sourceTree = "<group>";
};
29D260EF1CEEAA5000A9787D /* FullScreen */ = {
isa = PBXGroup;
children = (
......@@ -2502,6 +2543,8 @@
29DAF53C1E7B845000D7B970 /* Cells */,
29DAF5361E7B7E6A00D7B970 /* ReadPacketViewController.h */,
29DAF5371E7B7E6A00D7B970 /* ReadPacketViewController.m */,
29CC51F91E8A0721009FBB6A /* ReadPacketMainViewController.h */,
29CC51FA1E8A0721009FBB6A /* ReadPacketMainViewController.m */,
29DAF5391E7B821E00D7B970 /* ReadPacketStateViewController.h */,
29DAF53A1E7B821E00D7B970 /* ReadPacketStateViewController.m */,
);
......@@ -3013,15 +3056,17 @@
buildActionMask = 2147483647;
files = (
293163FA1DCE3CBA0075129D /* LuckyDrawDetailsViewController.m in Sources */,
29CC51ED1E8A011E009FBB6A /* RebateDetailsViewController.m in Sources */,
29045F321DCA192700E42A86 /* PromptHeaderTableViewCell.m in Sources */,
2940AE9B1DE7FE17001164B0 /* OnlineLearningDetailViewController.m in Sources */,
2986B9A31DE1D30700F4A1CF /* PromotionChooseNavigationController.m in Sources */,
29CC51F31E8A011E009FBB6A /* WithdrawalViewController.m in Sources */,
2971E9791DF662A700256567 /* AssessmentHeaderView.m in Sources */,
2940AE831DE7E1D1001164B0 /* VideoHelperViewController.m in Sources */,
296287A21DF7DD230056FDC1 /* CustomTOStudyTopicEntity.m in Sources */,
2916A7521D70557400644C8C /* PaymentsDetailsTableViewController.m in Sources */,
29E2D3241DB878F200443170 /* XLPlainFlowLayout.m in Sources */,
2940AE921DE7FD55001164B0 /* VideoDetailIntroTableViewCell.m in Sources */,
29CC51F21E8A011E009FBB6A /* WithdrawalTableViewController.m in Sources */,
29BFBD981CE46FDA00C238FB /* MyclientEntityModel.m in Sources */,
29F726041CE1E96E0072FE0E /* ScreeningSecondCollectionReusableView.m in Sources */,
2985AEA11CE72F1500704C91 /* NSArray+ ZXPUnicode.m in Sources */,
......@@ -3033,7 +3078,6 @@
298111261DFEB95A00F7EAFF /* CommentListTableViewCell.m in Sources */,
29BFBD871CE428B200C238FB /* Customermanager.m in Sources */,
299C7F5A1CE21FA800E7D7CB /* AddressViewController.m in Sources */,
2916A7411D70362000644C8C /* PaymentsViewController.m in Sources */,
29874AEE1DF55F1D008853A8 /* SpecifiedTableViewCell.m in Sources */,
291D11A21E7923FF001E081E /* TriangleIndicatorView.m in Sources */,
291D6A651D0002AF007891AE /* TOGoodsEntityModel.m in Sources */,
......@@ -3046,7 +3090,6 @@
291D11901E790B45001E081E /* DateCalibrationViewController.m in Sources */,
29DAF5381E7B7E6A00D7B970 /* ReadPacketViewController.m in Sources */,
29E944621DE45654007CD26C /* PrizeExchangeDetailsViewController.m in Sources */,
297231251E09212200D8CA9B /* RebateViewController.m in Sources */,
29D260F51CEEAE2800A9787D /* FullScreenViewController.m in Sources */,
292AD2041DE30A5F003EC56E /* IntegralDetailsTableViewCell.m in Sources */,
2985AEA31CE72F1500704C91 /* NSObject+ZXPUnicode.m in Sources */,
......@@ -3065,6 +3108,7 @@
292A14311CE81D1D00EB4430 /* AddressModel.m in Sources */,
29A938221CDADE4700F21E54 /* ProductDetailsTableViewCell.m in Sources */,
29E384BE1CE9933300888199 /* AdditionalTableViewCell.m in Sources */,
29CC51F11E8A011E009FBB6A /* PaymentsViewController.m in Sources */,
29A419911E812E5E0064E958 /* GDataXMLNode.m in Sources */,
295DEDCB1E681D28007308FF /* opple_objc_json_client.m in Sources */,
2972312E1E0948A400D8CA9B /* MyBankClass.m in Sources */,
......@@ -3077,12 +3121,12 @@
296287A51DF7E3020056FDC1 /* AssessmentShortAnswerTableViewCell.m in Sources */,
29E384C81CE9A8BF00888199 /* SearchCollectionViewCell.m in Sources */,
2992493D1CDB3E8900786B1E /* GenerateOrdersModifyTableViewCell.m in Sources */,
29CC51F41E8A011E009FBB6A /* BindingBankCARDViewController.m in Sources */,
2981111D1DFEA98D00F7EAFF /* ForumItemDetailViewController.m in Sources */,
29BB27741CD9DFAC009A0813 /* SceneLibraryViewController.m in Sources */,
297B143E1DEBF53E009A462A /* BreakThroughViewController.m in Sources */,
29E384D11CE9C65700888199 /* SearchViewController.m in Sources */,
29AB91FF1E553C16003A3A08 /* AnnouncementListTableViewCell.m in Sources */,
29702B461D727F6200322196 /* WithdrawalTableViewController.m in Sources */,
2928F8421CD0ABAC0036D761 /* ShoppingViewController.m in Sources */,
29AB920C1E5542CD003A3A08 /* MessageTableViewCell.m in Sources */,
29698D611CE2C11500D72CE7 /* SettlementViewController.m in Sources */,
......@@ -3124,10 +3168,10 @@
2904BA431DBEF3A200FB473A /* OrderRecordViewController.m in Sources */,
2986B9A41DE1D30700F4A1CF /* PromotionChooseTableViewCell.m in Sources */,
291D11A51E795104001E081E /* CustomTOForumtypeEntity.m in Sources */,
29CC51F01E8A011E009FBB6A /* PaymentsDetailsTableViewController.m in Sources */,
29B78C081DFA89A000C7C6D8 /* ReleasePostViewController.m in Sources */,
29AB92021E553C16003A3A08 /* AnnountcementDetailViewController.m in Sources */,
29F309341DFF93AC00776C7B /* CustomTOForumReplyEntity.m in Sources */,
297231241E09212200D8CA9B /* BindingSuccessViewController.m in Sources */,
2941910D1E7BBFAA005431CF /* PromotionalReadPacketModel.m in Sources */,
2936F28C1D014147007CA67C /* sceneScreeningCollectionViewCell.m in Sources */,
291D118D1E790B0B001E081E /* DiscussMainViewController.m in Sources */,
......@@ -3135,6 +3179,7 @@
29ACDAE31DF966EF003A0634 /* ForumItemListViewController.m in Sources */,
2940AE861DE7FCDB001164B0 /* VideoListViewController.m in Sources */,
291D6A581CFFD45F007891AE /* SceneSectionHeaderView.m in Sources */,
29CC51F51E8A011E009FBB6A /* BindingSuccessViewController.m in Sources */,
2986B9A71DE1D30700F4A1CF /* PromotionLuckDrawResultModel.m in Sources */,
29BFBD8F1CE44BA900C238FB /* goodsDetailsSectionview.m in Sources */,
29CCA43C1CF7ED6100BC19DD /* SelectedTableViewCell.m in Sources */,
......@@ -3190,6 +3235,8 @@
29834EB41CDF1EAA001A484F /* screeningSecondView.m in Sources */,
291D11991E790DFA001E081E /* CalibrationCollectionViewCell.m in Sources */,
29AB91EB1E553B7C003A3A08 /* PerfectInformationTableViewCell.m in Sources */,
29CC51FB1E8A0721009FBB6A /* ReadPacketMainViewController.m in Sources */,
29CC51EF1E8A011E009FBB6A /* RebateViewController.m in Sources */,
29706DA61CD082990003C412 /* main.m in Sources */,
2936F2961D017BBD007CA67C /* GoodsImageView.m in Sources */,
291D119C1E790E16001E081E /* CalibrationDetailCollectionCell.m in Sources */,
......@@ -3202,6 +3249,7 @@
2971E98C1DF6CD9200256567 /* AssessmentUnqualifiedViewController.m in Sources */,
295DEAA71DB756DA006ED4A6 /* CardCollectionViewCell.m in Sources */,
291D6A6B1D000A2A007891AE /* ProductScreeningCollectionViewCell.m in Sources */,
29CC51EC1E8A011E009FBB6A /* PaymentWithdrawalMainViewController.m in Sources */,
297BA2C81DE94D3300474F79 /* VIMediaDownloader.m in Sources */,
299876421CD99E4000C90D0A /* OrderdetailsViewController.m in Sources */,
29EC331A1CE023D5005F0C13 /* ChangePasswordViewController.m in Sources */,
......@@ -3211,7 +3259,6 @@
2962D07D1CD1E4490058829D /* NSArray+Objectwithindex.m in Sources */,
299876391CD9981800C90D0A /* GoodsInformationTableViewCell.m in Sources */,
29DAF53F1E7B846B00D7B970 /* ReadPacketCollectionViewCell.m in Sources */,
29702B631D72EE2E00322196 /* RebateDetailsViewController.m in Sources */,
297BA2C51DE94D3300474F79 /* VICacheSessionManager.m in Sources */,
29C30BDB1DDC1EE500CA3E29 /* LearningCenterMainViewController.m in Sources */,
2949BABD1CD2EFA00049385A /* InformationTableViewCell.m in Sources */,
......@@ -3225,7 +3272,6 @@
291A37771DBA58CC00299F0D /* GetJDCardView.m in Sources */,
295DEAC51DB786C6006ED4A6 /* CardBeenUseViewController.m in Sources */,
2992493A1CDB3E4500786B1E /* GenerateOrdersTableViewCell.m in Sources */,
2916A7441D70363E00644C8C /* WithdrawalViewController.m in Sources */,
298F3ACB1E6E72CA00152375 /* ForumTypeTableViewCell.m in Sources */,
2962D0811CD1E6010058829D /* UIView+Frame.m in Sources */,
295DEDC51E681C8D007308FF /* HomeViewController.m in Sources */,
......@@ -3238,13 +3284,11 @@
0447085E1CD7C06B00555827 /* LoginViewController.m in Sources */,
29E9445C1DE45583007CD26C /* PrizeExchangeSectionTableViewCell.m in Sources */,
297BA2C31DE94D3300474F79 /* VICacheConfiguration.m in Sources */,
297231231E09212200D8CA9B /* BindingBankCARDViewController.m in Sources */,
298534601DD4B0290023BBAE /* AirPrintManager.m in Sources */,
29A7A6991DED154F00B04272 /* GiftInformationView.m in Sources */,
295DEA9C1DB70FB9006ED4A6 /* RightControlTableViewCell.m in Sources */,
29A9DCAE1CEB643C00A7567A /* CustomWKWebViewController.m in Sources */,
2940AE891DE7FCE4001164B0 /* VideoDetailViewController.m in Sources */,
297231281E0921B700D8CA9B /* PaymentWithdrawalMainViewController.m in Sources */,
2971E9761DF6626A00256567 /* AssessmentTableViewCell.m in Sources */,
2940AE8C1DE7FD12001164B0 /* VideoListItemTableViewCell.m in Sources */,
29EAAE8E1CDC3E8E00C4DBA2 /* BillingInfoView.m in Sources */,
......@@ -3257,6 +3301,7 @@
29ACDAE91DF96C50003A0634 /* ForumItemTableViewCell.m in Sources */,
292AD2001DE309C1003EC56E /* IntegralDetailsViewController.m in Sources */,
297BA2CB1DE94D3300474F79 /* VIResourceLoadingRequestWorker.m in Sources */,
29CC51EE1E8A011E009FBB6A /* RebateSuccessTableViewController.m in Sources */,
29E944561DE45529007CD26C /* PrizeExchangeBillTableViewCell.m in Sources */,
297BA2C41DE94D3300474F79 /* VICacheManager.m in Sources */,
29E28CE81CE0B91B00812A55 /* HENLENSONG.m in Sources */,
......@@ -3287,9 +3332,9 @@
2986B9AC1DE1D32C00F4A1CF /* CustomPromotionModel.m in Sources */,
29834EC01CDF5E4E001A484F /* ScreeningFirstCollectionViewCell.m in Sources */,
29834EC51CDF76C1001A484F /* UserViewController.m in Sources */,
29A974CA1D72F9C80012AFA1 /* RebateSuccessTableViewController.m in Sources */,
29E2D3271DB88D8B00443170 /* CardOrderInformationReusableView.m in Sources */,
2971E9841DF69F9A00256567 /* CountDownLabel.m in Sources */,
29CC51F81E8A032D009FBB6A /* LuckyDrawMainViewController.m in Sources */,
2962D06D1CD1A43A0058829D /* ClientViewController.m in Sources */,
29A8D3981CD85A58004D558F /* ClientdetailsViewController.m in Sources */,
29AB91EC1E553B7C003A3A08 /* PerfectInformationViewController.m in Sources */,
......
......@@ -25,7 +25,7 @@
[Bugly startWithAppId:@"900033734"];
[self setUMShare];
[self detectionNetwork];
[self SetIQKeyboardManager];
[self setIQKeyboardManager];
[self RootViewcontroller];
[self setUpJPush:launchOptions];
return YES;
......@@ -85,7 +85,7 @@
}
#pragma mark - 键盘
- (void)SetIQKeyboardManager
- (void)setIQKeyboardManager
{
IQKeyboardManager *manager = [IQKeyboardManager sharedManager];
[[IQKeyboardManager sharedManager]setKeyboardDistanceFromTextField:0];
......
......@@ -63,10 +63,10 @@
</constraints>
</imageView>
<imageView contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="EBV-lP-kNC">
<rect key="frame" x="115" y="125" width="70" height="70"/>
<rect key="frame" x="120" y="130" width="60" height="60"/>
<constraints>
<constraint firstAttribute="width" constant="70" id="34Z-s4-tPU"/>
<constraint firstAttribute="height" constant="70" id="5fy-ce-cQj"/>
<constraint firstAttribute="width" constant="60" id="34Z-s4-tPU"/>
<constraint firstAttribute="height" constant="60" id="5fy-ce-cQj"/>
</constraints>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
......@@ -359,7 +359,7 @@
<rect key="frame" x="0.0" y="28" width="1024" height="90"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="ctQ-16-eCQ" id="DuY-Eq-G4z">
<rect key="frame" x="0.0" y="0.0" width="830" height="89.5"/>
<rect key="frame" x="0.0" y="0.0" width="830" height="89"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="00登录-谭" translatesAutoresizingMaskIntoConstraints="NO" id="jVJ-Bu-xw9">
......@@ -1021,7 +1021,7 @@
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="AssessmentHeaderView" id="UfB-K3-NdF" customClass="AssessmentHeaderView">
<rect key="frame" x="0.0" y="55.5" width="460" height="44"/>
<rect key="frame" x="0.0" y="56" width="460" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="UfB-K3-NdF" id="WGo-Wa-YTq">
<rect key="frame" x="0.0" y="0.0" width="460" height="44"/>
......@@ -1047,7 +1047,7 @@
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="AssessmentTableViewCell" rowHeight="52" id="gIe-bF-XsX" customClass="AssessmentTableViewCell">
<rect key="frame" x="0.0" y="99.5" width="460" height="52"/>
<rect key="frame" x="0.0" y="100" width="460" height="52"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="gIe-bF-XsX" id="Va8-wn-DBM">
<rect key="frame" x="0.0" y="0.0" width="460" height="52"/>
......@@ -1093,7 +1093,7 @@
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="AssessmentShortAnswerTableViewCell" rowHeight="112" id="smV-qr-KgP" customClass="AssessmentShortAnswerTableViewCell">
<rect key="frame" x="0.0" y="151.5" width="460" height="112"/>
<rect key="frame" x="0.0" y="152" width="460" height="112"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="smV-qr-KgP" id="A2f-ek-60T">
<rect key="frame" x="0.0" y="0.0" width="460" height="112"/>
......@@ -1259,8 +1259,8 @@
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="6" translatesAutoresizingMaskIntoConstraints="NO" id="THz-Dz-s93">
<rect key="frame" x="42" y="40" width="70" height="70"/>
<constraints>
<constraint firstAttribute="height" constant="70" id="6hT-Kb-PYl"/>
<constraint firstAttribute="width" constant="70" id="HMx-vh-574"/>
<constraint firstAttribute="width" constant="70" id="6ad-aH-fRm"/>
<constraint firstAttribute="height" constant="70" id="WBX-tx-wgZ"/>
</constraints>
</imageView>
</subviews>
......@@ -1329,7 +1329,7 @@
</collectionViewFlowLayout>
<cells>
<collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="CalibrationDetailCollectionCell" id="dGo-4o-u9g" customClass="CalibrationDetailCollectionCell">
<rect key="frame" x="0.0" y="9.5" width="93" height="41"/>
<rect key="frame" x="0.0" y="10" width="93" height="41"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
<rect key="frame" x="0.0" y="0.0" width="93" height="41"/>
......@@ -1409,7 +1409,7 @@
</collectionViewFlowLayout>
<cells>
<collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="CalibrationCollectionViewCell" id="v20-Kz-8OX" customClass="CalibrationCollectionViewCell">
<rect key="frame" x="0.0" y="4.5" width="50" height="50"/>
<rect key="frame" x="0.0" y="5" width="50" height="50"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
<rect key="frame" x="0.0" y="0.0" width="50" height="50"/>
......@@ -1870,13 +1870,13 @@
</constraints>
</view>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="6" translatesAutoresizingMaskIntoConstraints="NO" id="A9i-5N-FES">
<rect key="frame" x="60" y="20" width="180" height="120"/>
<rect key="frame" x="90" y="40" width="120" height="80"/>
</imageView>
</subviews>
</view>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstItem="A9i-5N-FES" firstAttribute="width" secondItem="R9E-DY-fL9" secondAttribute="width" multiplier="0.6" id="0re-jy-hU1"/>
<constraint firstItem="A9i-5N-FES" firstAttribute="width" secondItem="R9E-DY-fL9" secondAttribute="width" multiplier="0.4" id="0re-jy-hU1"/>
<constraint firstItem="14r-a3-mez" firstAttribute="leading" secondItem="R9E-DY-fL9" secondAttribute="leading" id="1a1-He-gAi"/>
<constraint firstItem="A9i-5N-FES" firstAttribute="centerY" secondItem="R9E-DY-fL9" secondAttribute="centerY" multiplier="0.8" id="285-4B-q1a"/>
<constraint firstItem="14r-a3-mez" firstAttribute="height" secondItem="R9E-DY-fL9" secondAttribute="height" multiplier="0.25" id="2DL-0r-vVx"/>
......@@ -1886,7 +1886,7 @@
<constraint firstAttribute="trailing" secondItem="14r-a3-mez" secondAttribute="trailing" id="SYX-5h-KDK"/>
<constraint firstAttribute="bottom" secondItem="14r-a3-mez" secondAttribute="bottom" id="Zm7-i4-q3a"/>
<constraint firstItem="DWM-hY-5Md" firstAttribute="top" secondItem="R9E-DY-fL9" secondAttribute="top" id="dZG-pG-BJc"/>
<constraint firstItem="A9i-5N-FES" firstAttribute="height" secondItem="R9E-DY-fL9" secondAttribute="height" multiplier="0.6" id="lvH-dm-TU9"/>
<constraint firstItem="A9i-5N-FES" firstAttribute="height" secondItem="R9E-DY-fL9" secondAttribute="height" multiplier="0.4" id="lvH-dm-TU9"/>
<constraint firstItem="A9i-5N-FES" firstAttribute="centerX" secondItem="R9E-DY-fL9" secondAttribute="centerX" id="uQF-kG-Qjg"/>
</constraints>
<size key="customSize" width="300" height="200"/>
......@@ -2113,7 +2113,7 @@
<rect key="frame" x="0.0" y="28" width="1024" height="100"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Qnm-0r-wEL" id="VAA-bT-OlF">
<rect key="frame" x="0.0" y="0.0" width="1024" height="99.5"/>
<rect key="frame" x="0.0" y="0.0" width="1024" height="99"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="课时简介" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="agZ-rF-DnB">
......@@ -2145,7 +2145,7 @@
<rect key="frame" x="0.0" y="128" width="1024" height="130"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="WzB-nZ-wsW" id="Zzv-Yi-ZxT">
<rect key="frame" x="0.0" y="0.0" width="1024" height="129.5"/>
<rect key="frame" x="0.0" y="0.0" width="1024" height="129"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="授课讲师" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="kxK-dX-OAf">
......@@ -2202,7 +2202,7 @@
<rect key="frame" x="0.0" y="258" width="1024" height="100"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="oia-jO-L9n" id="AMF-ag-ZWN">
<rect key="frame" x="0.0" y="0.0" width="1024" height="99.5"/>
<rect key="frame" x="0.0" y="0.0" width="1024" height="99"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" text="针对人员" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="NfI-IM-h1i">
......@@ -2675,7 +2675,7 @@
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="AssessmentHeaderView" rowHeight="60" id="2M5-To-MLj" customClass="AssessmentHeaderView">
<rect key="frame" x="0.0" y="55.5" width="1024" height="60"/>
<rect key="frame" x="0.0" y="56" width="1024" height="60"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="2M5-To-MLj" id="ypf-GL-4CP">
<rect key="frame" x="0.0" y="0.0" width="1024" height="60"/>
......@@ -2701,7 +2701,7 @@
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="AssessmentTableViewCell" rowHeight="50" id="BjI-a1-CRm" customClass="AssessmentTableViewCell">
<rect key="frame" x="0.0" y="115.5" width="1024" height="50"/>
<rect key="frame" x="0.0" y="116" width="1024" height="50"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="BjI-a1-CRm" id="bq8-ly-DcD">
<rect key="frame" x="0.0" y="0.0" width="1024" height="50"/>
......@@ -3052,7 +3052,7 @@
<rect key="frame" x="0.0" y="228" width="1024" height="84"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="sX2-jy-tQ2" id="iVT-bi-RKr">
<rect key="frame" x="0.0" y="0.0" width="1024" height="83.5"/>
<rect key="frame" x="0.0" y="0.0" width="1024" height="83"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="crown" translatesAutoresizingMaskIntoConstraints="NO" id="pyu-Y7-w8M">
......
......@@ -1306,7 +1306,7 @@
<rect key="frame" x="0.0" y="55.5" width="1024" height="182"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Sye-2R-IQf" id="CXs-SR-gHP">
<rect key="frame" x="0.0" y="0.0" width="1024" height="181.5"/>
<rect key="frame" x="0.0" y="0.0" width="1024" height="181"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="2bG-Ip-ptr" userLabel="View1">
......@@ -1370,37 +1370,37 @@
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="应用面积:" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="aap-Lm-e2d">
<rect key="frame" x="20" y="116" width="71.5" height="21"/>
<rect key="frame" x="20" y="116" width="72" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="安装方式:" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="y3W-LS-p34">
<rect key="frame" x="20" y="152" width="71.5" height="21"/>
<rect key="frame" x="20" y="152" width="72" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="规格:" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2HG-A6-myN">
<rect key="frame" x="460.5" y="10" width="43" height="17"/>
<rect key="frame" x="461" y="10" width="43" height="17"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="功率:" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0MW-YH-UQn">
<rect key="frame" x="460.5" y="46" width="43" height="17"/>
<rect key="frame" x="461" y="46" width="43" height="17"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="尺寸:" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="alp-Lq-QHV">
<rect key="frame" x="460.5" y="82" width="43" height="17"/>
<rect key="frame" x="461" y="82" width="43" height="17"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="灯头数量:" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="MhT-BW-9sM">
<rect key="frame" x="460.5" y="154" width="71.5" height="17"/>
<rect key="frame" x="461" y="154" width="72" height="17"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
......@@ -1430,25 +1430,25 @@
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="sadas" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cXK-4f-QSW">
<rect key="frame" x="513.5" y="10" width="38" height="17"/>
<rect key="frame" x="514" y="10" width="38" height="17"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="asdasd" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="us7-nf-XVG">
<rect key="frame" x="513.5" y="46" width="46.5" height="17"/>
<rect key="frame" x="514" y="46" width="47" height="17"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="asdaas" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Zbh-4s-c35">
<rect key="frame" x="513.5" y="82" width="46" height="17"/>
<rect key="frame" x="514" y="82" width="46" height="17"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="asdas" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pQr-oQ-sKI">
<rect key="frame" x="542" y="154" width="38" height="17"/>
<rect key="frame" x="543" y="154" width="38" height="17"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
......@@ -1465,8 +1465,11 @@
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="qwewq" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9cq-dI-Tfp">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="qwewq" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="7" adjustsLetterSpacingToFitWidth="YES" translatesAutoresizingMaskIntoConstraints="NO" id="9cq-dI-Tfp">
<rect key="frame" x="950" y="82" width="54" height="17"/>
<constraints>
<constraint firstAttribute="width" relation="lessThanOrEqual" constant="200" id="HLc-cY-wcc"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
......@@ -1478,13 +1481,13 @@
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="光源类型:" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="uvl-GU-9q3">
<rect key="frame" x="460.5" y="118" width="71.5" height="17"/>
<rect key="frame" x="461" y="118" width="72" height="17"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="qweqw" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="q2b-HN-yQd">
<rect key="frame" x="542" y="118" width="46" height="17"/>
<rect key="frame" x="543" y="118" width="46" height="17"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
......@@ -1508,13 +1511,13 @@
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="qweq" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BVY-on-fsK">
<rect key="frame" x="101.5" y="118" width="35.5" height="17"/>
<rect key="frame" x="102" y="118" width="36" height="17"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="wqewq" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ftZ-fF-eKF">
<rect key="frame" x="101.5" y="154" width="45.5" height="17"/>
<rect key="frame" x="102" y="154" width="46" height="17"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
......@@ -1756,6 +1759,82 @@
</objects>
<point key="canvasLocation" x="3544" y="6328"/>
</scene>
<!--Read Packet Main View Controller-->
<scene sceneID="AcH-99-jOT">
<objects>
<viewController storyboardIdentifier="ReadPacketMainViewController" id="Hey-9b-0yj" customClass="ReadPacketMainViewController" sceneMemberID="viewController">
<layoutGuides>
<viewControllerLayoutGuide type="top" id="aDD-97-ego"/>
<viewControllerLayoutGuide type="bottom" id="xRI-II-fHD"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="hLw-Ro-ENj">
<rect key="frame" x="0.0" y="0.0" width="1024" height="768"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="eu5-iO-QEO">
<rect key="frame" x="0.0" y="20" width="1024" height="748"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="10" minimumInteritemSpacing="10" id="Qhy-Qn-ruu">
<size key="itemSize" width="148" height="171"/>
<size key="headerReferenceSize" width="0.0" height="0.0"/>
<size key="footerReferenceSize" width="0.0" height="0.0"/>
<inset key="sectionInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
</collectionViewFlowLayout>
<cells>
<collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="ReadPacketCollectionViewCell" id="n6C-9o-UxI" customClass="ReadPacketCollectionViewCell">
<rect key="frame" x="0.0" y="0.0" width="148" height="171"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
<rect key="frame" x="0.0" y="0.0" width="148" height="171"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="readpacket" translatesAutoresizingMaskIntoConstraints="NO" id="rDm-h9-Mzk">
<rect key="frame" x="0.0" y="0.0" width="148" height="171"/>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="¥100" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hXc-w5-TRP">
<rect key="frame" x="46" y="125" width="57.5" height="24"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="20"/>
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
</subviews>
</view>
<constraints>
<constraint firstAttribute="trailing" secondItem="rDm-h9-Mzk" secondAttribute="trailing" id="0J0-rC-UdE"/>
<constraint firstAttribute="bottom" secondItem="rDm-h9-Mzk" secondAttribute="bottom" id="CQS-YS-Mv0"/>
<constraint firstItem="rDm-h9-Mzk" firstAttribute="top" secondItem="n6C-9o-UxI" secondAttribute="top" id="Can-ub-Qvw"/>
<constraint firstItem="hXc-w5-TRP" firstAttribute="centerX" secondItem="n6C-9o-UxI" secondAttribute="centerX" id="QfE-k8-KDb"/>
<constraint firstItem="rDm-h9-Mzk" firstAttribute="leading" secondItem="n6C-9o-UxI" secondAttribute="leading" id="ZSV-NA-AEF"/>
<constraint firstItem="hXc-w5-TRP" firstAttribute="centerY" secondItem="n6C-9o-UxI" secondAttribute="centerY" multiplier="1.6" id="vra-Xy-adt"/>
</constraints>
<connections>
<outlet property="readPacketNumberLabel" destination="hXc-w5-TRP" id="eUw-91-Vkq"/>
</connections>
</collectionViewCell>
</cells>
<connections>
<outlet property="dataSource" destination="Hey-9b-0yj" id="ak2-EN-hLx"/>
<outlet property="delegate" destination="Hey-9b-0yj" id="omN-jT-g2R"/>
</connections>
</collectionView>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstAttribute="trailing" secondItem="eu5-iO-QEO" secondAttribute="trailing" id="JVj-aY-YjF"/>
<constraint firstItem="eu5-iO-QEO" firstAttribute="leading" secondItem="hLw-Ro-ENj" secondAttribute="leading" id="MdP-iV-Fw5"/>
<constraint firstItem="eu5-iO-QEO" firstAttribute="top" secondItem="aDD-97-ego" secondAttribute="bottom" id="OcD-Cw-lRA"/>
<constraint firstItem="xRI-II-fHD" firstAttribute="top" secondItem="eu5-iO-QEO" secondAttribute="bottom" id="z2R-sQ-F3H"/>
</constraints>
</view>
<connections>
<outlet property="readPacketMainCollectionView" destination="eu5-iO-QEO" id="Khc-Mp-6f3"/>
<outlet property="readPacketMainFlowLayout" destination="Qhy-Qn-ruu" id="slM-YC-KsM"/>
</connections>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="1Bu-hK-oe5" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="4849" y="6328"/>
</scene>
<!--Client Shopping Car View Controller-->
<scene sceneID="AHI-3D-t6o">
<objects>
......@@ -3936,7 +4015,7 @@
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="w0v-q3-buz">
<rect key="frame" x="914" y="20" width="100" height="30"/>
<rect key="frame" x="924" y="20" width="100" height="30"/>
<constraints>
<constraint firstAttribute="width" constant="100" id="Lia-Ox-h30"/>
<constraint firstAttribute="height" constant="30" id="hCP-T0-4za"/>
......@@ -3957,7 +4036,7 @@
<constraint firstItem="TMg-8t-PNg" firstAttribute="leading" secondItem="900-Pd-b1F" secondAttribute="leading" constant="25" id="5zc-UP-If5"/>
<constraint firstItem="YZ6-qW-0oK" firstAttribute="centerY" secondItem="TMg-8t-PNg" secondAttribute="centerY" id="6eh-1Q-DaU"/>
<constraint firstItem="w0v-q3-buz" firstAttribute="centerY" secondItem="900-Pd-b1F" secondAttribute="centerY" id="Vux-cn-2SJ"/>
<constraint firstAttribute="trailing" secondItem="w0v-q3-buz" secondAttribute="trailing" constant="10" id="c2Z-61-lC1"/>
<constraint firstAttribute="trailing" secondItem="w0v-q3-buz" secondAttribute="trailing" id="c2Z-61-lC1"/>
<constraint firstItem="YZ6-qW-0oK" firstAttribute="leading" secondItem="TMg-8t-PNg" secondAttribute="trailing" constant="10" id="s5x-tK-E1A"/>
<constraint firstItem="TMg-8t-PNg" firstAttribute="centerY" secondItem="900-Pd-b1F" secondAttribute="centerY" id="u0F-u1-BFZ"/>
</constraints>
......@@ -7901,6 +7980,132 @@
</objects>
<point key="canvasLocation" x="7281" y="2529"/>
</scene>
<!--Lucky Draw Main View Controller-->
<scene sceneID="BpC-kI-olc">
<objects>
<viewController storyboardIdentifier="LuckyDrawMainViewController" id="MUu-O5-bez" customClass="LuckyDrawMainViewController" sceneMemberID="viewController">
<layoutGuides>
<viewControllerLayoutGuide type="top" id="l56-wc-39j"/>
<viewControllerLayoutGuide type="bottom" id="vr9-MR-zus"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="B7L-sN-qJ4">
<rect key="frame" x="0.0" y="0.0" width="1024" height="768"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="rvU-34-D3e">
<rect key="frame" x="0.0" y="20" width="1024" height="748"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="NotDrawTableViewCell" rowHeight="70" id="A8c-vp-keu" customClass="NotDrawTableViewCell">
<rect key="frame" x="0.0" y="28" width="1024" height="70"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="A8c-vp-keu" id="bor-pm-4wM">
<rect key="frame" x="0.0" y="0.0" width="1024" height="69"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="订单编号:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="28E-AO-zbH">
<rect key="frame" x="25" y="28" width="53" height="14.5"/>
<fontDescription key="fontDescription" type="system" pointSize="12"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="rSm-4p-Uqs">
<rect key="frame" x="954" y="20" width="70" height="30"/>
<constraints>
<constraint firstAttribute="width" constant="70" id="JgQ-fe-MTl"/>
<constraint firstAttribute="height" constant="30" id="P1u-X9-paN"/>
</constraints>
<fontDescription key="fontDescription" type="system" weight="medium" pointSize="12"/>
<state key="normal" title="去抽奖">
<color key="titleColor" red="0.2901960784" green="0.57254901960000004" blue="0.93725490199999995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</state>
</button>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="12345423232323" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="P0E-Jk-43I">
<rect key="frame" x="88" y="28" width="102.5" height="14.5"/>
<fontDescription key="fontDescription" type="system" pointSize="12"/>
<color key="textColor" red="0.66666666669999997" green="0.66666666669999997" blue="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<constraints>
<constraint firstItem="rSm-4p-Uqs" firstAttribute="centerY" secondItem="bor-pm-4wM" secondAttribute="centerY" id="2RP-g0-UvS"/>
<constraint firstItem="P0E-Jk-43I" firstAttribute="centerY" secondItem="28E-AO-zbH" secondAttribute="centerY" id="E3x-nH-axt"/>
<constraint firstItem="28E-AO-zbH" firstAttribute="leading" secondItem="bor-pm-4wM" secondAttribute="leading" constant="25" id="WFG-m7-VNQ"/>
<constraint firstItem="28E-AO-zbH" firstAttribute="centerY" secondItem="bor-pm-4wM" secondAttribute="centerY" id="ZDV-3E-cQT"/>
<constraint firstAttribute="trailing" secondItem="rSm-4p-Uqs" secondAttribute="trailing" id="mA4-EN-QnR"/>
<constraint firstItem="P0E-Jk-43I" firstAttribute="leading" secondItem="28E-AO-zbH" secondAttribute="trailing" constant="10" id="qAF-kJ-F1X"/>
</constraints>
</tableViewCellContentView>
<connections>
<outlet property="drawButton" destination="rSm-4p-Uqs" id="sRp-eh-0J5"/>
<outlet property="orderNumberLabel" destination="P0E-Jk-43I" id="bnQ-Jp-fUL"/>
<outlet property="orderNumberTitle" destination="28E-AO-zbH" id="nTE-Dt-4fo"/>
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="UsedDrawTableViewCell" rowHeight="70" id="aJ6-RS-988" customClass="UsedDrawTableViewCell">
<rect key="frame" x="0.0" y="98" width="1024" height="70"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="aJ6-RS-988" id="q46-Um-hjN">
<rect key="frame" x="0.0" y="0.0" width="1024" height="69"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="订单编号:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YRX-3g-DLM">
<rect key="frame" x="25" y="28" width="53" height="14.5"/>
<fontDescription key="fontDescription" type="system" pointSize="12"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="12345423232323" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vN1-ms-Jw5">
<rect key="frame" x="88" y="28" width="102.5" height="14.5"/>
<fontDescription key="fontDescription" type="system" pointSize="12"/>
<color key="textColor" red="0.66666666669999997" green="0.66666666669999997" blue="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="100元红包" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dI3-7p-wez">
<rect key="frame" x="956.5" y="28" width="57.5" height="14.5"/>
<fontDescription key="fontDescription" type="system" pointSize="12"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<constraints>
<constraint firstItem="YRX-3g-DLM" firstAttribute="centerY" secondItem="q46-Um-hjN" secondAttribute="centerY" id="3zw-aV-5b0"/>
<constraint firstItem="vN1-ms-Jw5" firstAttribute="leading" secondItem="YRX-3g-DLM" secondAttribute="trailing" constant="10" id="8KU-fe-TTk"/>
<constraint firstItem="dI3-7p-wez" firstAttribute="centerY" secondItem="q46-Um-hjN" secondAttribute="centerY" id="Ibx-NJ-QU5"/>
<constraint firstItem="vN1-ms-Jw5" firstAttribute="centerY" secondItem="YRX-3g-DLM" secondAttribute="centerY" id="fBq-0E-Fkz"/>
<constraint firstAttribute="trailing" secondItem="dI3-7p-wez" secondAttribute="trailing" constant="10" id="lWP-Yx-aNE"/>
<constraint firstItem="YRX-3g-DLM" firstAttribute="leading" secondItem="q46-Um-hjN" secondAttribute="leading" constant="25" id="xp1-PY-Z2y"/>
</constraints>
</tableViewCellContentView>
<connections>
<outlet property="orderNumber" destination="vN1-ms-Jw5" id="ZXF-YJ-Hac"/>
<outlet property="orderNumberTitle" destination="YRX-3g-DLM" id="7Os-SL-JvW"/>
<outlet property="trophyLabel" destination="dI3-7p-wez" id="bIk-OW-hFz"/>
</connections>
</tableViewCell>
</prototypes>
<connections>
<outlet property="dataSource" destination="MUu-O5-bez" id="TP5-pM-gwS"/>
<outlet property="delegate" destination="MUu-O5-bez" id="chd-LN-m5O"/>
</connections>
</tableView>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstItem="vr9-MR-zus" firstAttribute="top" secondItem="rvU-34-D3e" secondAttribute="bottom" id="Qsa-nC-OWg"/>
<constraint firstItem="rvU-34-D3e" firstAttribute="leading" secondItem="B7L-sN-qJ4" secondAttribute="leading" id="ldF-hC-rIs"/>
<constraint firstItem="rvU-34-D3e" firstAttribute="top" secondItem="l56-wc-39j" secondAttribute="bottom" id="pZJ-EN-XdX"/>
<constraint firstAttribute="trailing" secondItem="rvU-34-D3e" secondAttribute="trailing" id="unX-Ja-R31"/>
</constraints>
</view>
<connections>
<outlet property="luckyDrawMainTableView" destination="rvU-34-D3e" id="m7q-yd-rbX"/>
</connections>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="LMX-x1-iE4" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="7281" y="3417"/>
</scene>
<!--Read Packet State View Controller-->
<scene sceneID="EpQ-Fh-J6h">
<objects>
......@@ -7952,6 +8157,23 @@
<constraint firstAttribute="height" constant="30" id="o05-dt-Ifp"/>
</constraints>
<fontDescription key="fontDescription" type="system" weight="medium" pointSize="15"/>
<state key="normal" title="已拒绝">
<color key="titleColor" red="0.66666666669999997" green="0.66666666669999997" blue="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</state>
<state key="selected">
<color key="titleColor" red="0.2156862745" green="0.46274509800000002" blue="0.6705882353" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</state>
<connections>
<action selector="readPacketStateClickAction:" destination="00W-Jm-pOo" eventType="touchUpInside" id="ItF-rz-Jhq"/>
</connections>
</button>
<button opaque="NO" tag="102" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="kYh-Tx-RhO">
<rect key="frame" x="231" y="64" width="88" height="30"/>
<constraints>
<constraint firstAttribute="width" constant="88" id="NqB-Oq-sY2"/>
<constraint firstAttribute="height" constant="30" id="fs7-ga-Q1w"/>
</constraints>
<fontDescription key="fontDescription" type="system" weight="medium" pointSize="15"/>
<state key="normal" title="已审核">
<color key="titleColor" red="0.66666666669999997" green="0.66666666669999997" blue="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</state>
......@@ -7959,16 +8181,18 @@
<color key="titleColor" red="0.2156862745" green="0.46274509800000002" blue="0.6705882353" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</state>
<connections>
<action selector="readPacketStateClickAction:" destination="00W-Jm-pOo" eventType="touchUpInside" id="ip3-mj-hkd"/>
<action selector="readPacketStateClickAction:" destination="00W-Jm-pOo" eventType="touchUpInside" id="Jeo-L6-6ym"/>
</connections>
</button>
</subviews>
<color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.93725490199999995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="kYh-Tx-RhO" firstAttribute="leading" secondItem="Mjr-6b-KrW" secondAttribute="trailing" constant="10" id="69K-f8-dPF"/>
<constraint firstItem="Mjr-6b-KrW" firstAttribute="centerY" secondItem="LKZ-73-9eV" secondAttribute="centerY" id="AAX-rd-lkM"/>
<constraint firstAttribute="trailing" secondItem="XKd-uU-jK7" secondAttribute="trailing" constant="20" id="Be7-5z-qSL"/>
<constraint firstItem="LKZ-73-9eV" firstAttribute="top" secondItem="BLp-Tj-8Xd" secondAttribute="bottom" constant="44" id="D6S-3p-2jY"/>
<constraint firstItem="XKd-uU-jK7" firstAttribute="top" secondItem="3cD-py-A4h" secondAttribute="bottom" constant="4" id="DN8-EC-lVB"/>
<constraint firstItem="kYh-Tx-RhO" firstAttribute="centerY" secondItem="Mjr-6b-KrW" secondAttribute="centerY" id="OHD-Dq-EOQ"/>
<constraint firstItem="XKd-uU-jK7" firstAttribute="leading" secondItem="Y3E-bV-enJ" secondAttribute="leading" constant="20" id="Z9a-Z3-Tmo"/>
<constraint firstItem="3cD-py-A4h" firstAttribute="leading" secondItem="Y3E-bV-enJ" secondAttribute="leading" constant="51" id="jK7-W1-ENa"/>
<constraint firstItem="Mjr-6b-KrW" firstAttribute="leading" secondItem="LKZ-73-9eV" secondAttribute="trailing" constant="10" id="oww-4q-QTZ"/>
......@@ -7978,10 +8202,11 @@
</constraints>
</view>
<connections>
<outlet property="auditedButton" destination="Mjr-6b-KrW" id="iR6-fe-wNO"/>
<outlet property="auditedButton" destination="kYh-Tx-RhO" id="ddv-gX-bDx"/>
<outlet property="controllerBackgroundView" destination="XKd-uU-jK7" id="O8g-6s-Vab"/>
<outlet property="instructionViewConstraint" destination="jK7-W1-ENa" id="HD9-uq-JL2"/>
<outlet property="instructionsLineView" destination="3cD-py-A4h" id="J67-4C-xhO"/>
<outlet property="refusedButton" destination="Mjr-6b-KrW" id="Pmf-Q8-S18"/>
<outlet property="unauditedButton" destination="LKZ-73-9eV" id="2vo-6p-etW"/>
</connections>
</viewController>
......
Lighting/Supporting Files/Images.xcassets/Home/StudyGuides.imageset/StudyGuides.png

22.7 KB | W: 0px | H: 0px

Lighting/Supporting Files/Images.xcassets/Home/StudyGuides.imageset/StudyGuides.png

22.7 KB | W: 0px | H: 0px

Lighting/Supporting Files/Images.xcassets/Home/StudyGuides.imageset/StudyGuides.png
Lighting/Supporting Files/Images.xcassets/Home/StudyGuides.imageset/StudyGuides.png
Lighting/Supporting Files/Images.xcassets/Home/StudyGuides.imageset/StudyGuides.png
Lighting/Supporting Files/Images.xcassets/Home/StudyGuides.imageset/StudyGuides.png
  • 2-up
  • Swipe
  • Onion skin
Lighting/Supporting Files/Images.xcassets/Home/StudyGuides.imageset/StudyGuides@2x.png

43.3 KB | W: 0px | H: 0px

Lighting/Supporting Files/Images.xcassets/Home/StudyGuides.imageset/StudyGuides@2x.png

46.2 KB | W: 0px | H: 0px

Lighting/Supporting Files/Images.xcassets/Home/StudyGuides.imageset/StudyGuides@2x.png
Lighting/Supporting Files/Images.xcassets/Home/StudyGuides.imageset/StudyGuides@2x.png
Lighting/Supporting Files/Images.xcassets/Home/StudyGuides.imageset/StudyGuides@2x.png
Lighting/Supporting Files/Images.xcassets/Home/StudyGuides.imageset/StudyGuides@2x.png
  • 2-up
  • Swipe
  • Onion skin
Lighting/Supporting Files/Images.xcassets/Home/StudyGuides.imageset/StudyGuides@3x.png

70.8 KB | W: 0px | H: 0px

Lighting/Supporting Files/Images.xcassets/Home/StudyGuides.imageset/StudyGuides@3x.png

70.8 KB | W: 0px | H: 0px

Lighting/Supporting Files/Images.xcassets/Home/StudyGuides.imageset/StudyGuides@3x.png
Lighting/Supporting Files/Images.xcassets/Home/StudyGuides.imageset/StudyGuides@3x.png
Lighting/Supporting Files/Images.xcassets/Home/StudyGuides.imageset/StudyGuides@3x.png
Lighting/Supporting Files/Images.xcassets/Home/StudyGuides.imageset/StudyGuides@3x.png
  • 2-up
  • Swipe
  • Onion skin
......@@ -15,7 +15,7 @@
<key>CFBundleName</key>
<string>欧立方</string>
<key>CFBundleShortVersionString</key>
<string>2.0.8</string>
<string>2.0.7</string>
<key>CFBundleURLTypes</key>
<array>
<dict>
......
......@@ -94,14 +94,13 @@ typedef NS_ENUM(NSInteger,COMMENT_PRAISE) {
/**
* 服务器开发地址
*///http://139.196.195.30:8090
//#define SERVERREQUESTURL(URL) [NSString stringWithFormat:@"http://139.196.195.30:8090/opple-web/app%@",URL]
//192.168.199.197:8080
*/
#define SERVERREQUESTURL(URL) [NSString stringWithFormat:@"http://gomoredev:8082/opple-web/app%@",URL]
/**
* 服务器测试地址
*/
#define SERVERREQUESTURL(URL) [NSString stringWithFormat:@"http://dg-dev.opple.com/opple-web/app%@",URL]
//#define SERVERREQUESTURL(URL) [NSString stringWithFormat:@"http://dg-dev.opple.com/opple-web/app%@",URL]
//**
// * 服务器正式地址
......
......@@ -89,7 +89,7 @@ NSString *const REMOVESHOPPINGBAG = @"/shopcart/delete";
/**
* 更改购物车商品数量、价格
*/
NSString *const CHANGESHOPPINGBAGNUMBERPRICE = @"/shopcart/updateCostPrice/";
NSString *const CHANGESHOPPINGBAGNUMBERPRICE = @"/shopcart/updateCostPrice/?cartId=%@&costPrice=%@&goodsId=%@&goodsNum=%ld";
/**
* 添加到购物车
......@@ -99,7 +99,7 @@ NSString *const ADDSHOPPINGBAG = @"/shopcart/save";
/**
* 查询购物车数量
*/
NSString *const QUERYSHOPPINGBAGNUMBER = @"/shopcart/get/";
NSString *const QUERYSHOPPINGBAGNUMBER = @"/shopcart/get?consumerId=%@";
/**
* 查询所有订单
......@@ -237,7 +237,7 @@ NSString *const WITHDRAWALPROGRESSDETAILS = @"/applybill/getDetailState";
/**
* 查询实时促销信息
*/
NSString *const PROMOTIONAL = @"/promotion/calc/%@";
NSString *const PROMOTIONAL = @"/promotion/calc?orderNumber=%@";
/**
* 查询历史促销信息
......
......@@ -31,4 +31,10 @@
- (CGFloat)widthWithFontSize:(CGFloat)fontSize height:(CGFloat)height;
/**
格式化字符串
@param string 去掉前后空格
*/
- (NSString *)formatString;
@end
......@@ -23,4 +23,15 @@
return [self boundingRectWithSize:CGSizeMake(0, height) options:NSStringDrawingTruncatesLastVisibleLine | NSStringDrawingUsesLineFragmentOrigin | NSStringDrawingUsesFontLeading attributes:attrs context:nil].size.width;
}
/**
去掉前后空格
*/
- (NSString *)formatString
{
NSCharacterSet *set = [NSCharacterSet whitespaceAndNewlineCharacterSet];
NSString *string = [self stringByTrimmingCharactersInSet:set];
return string;
}
@end
......@@ -89,6 +89,8 @@ extern NSString * const STUDYTASKSTATE_INITIAL;
extern NSString * const STUDYTASKSTATE_SUBMITTED;
extern NSString * const STUDYTASKSTATE_USED;
extern NSString * const STUDYTASKSTATE_REFUSE;
......
......@@ -1565,6 +1565,7 @@ NSString * const SORTDIRECTION_DESC = @"desc";
NSString * const STUDYTASKSTATE_INITIAL = @"initial";
NSString * const STUDYTASKSTATE_SUBMITTED = @"submitted";
NSString * const STUDYTASKSTATE_USED = @"used";
NSString * const STUDYTASKSTATE_REFUSE = @"refuse";
......
......@@ -15,6 +15,7 @@
static NetworkRequestClassManager *manager = nil;
/**
* 网络请求单例
*
......@@ -48,7 +49,7 @@ static NetworkRequestClassManager *manager = nil;
AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
manager.responseSerializer = [AFJSONResponseSerializer serializer];
manager.requestSerializer = [AFJSONRequestSerializer serializer];
manager.requestSerializer.timeoutInterval = 300.0f;
manager.requestSerializer.timeoutInterval = 30.0f;
[manager.requestSerializer setValue:@"application/json;charset=utf-8" forHTTPHeaderField: @"Content-Type"];
[manager.requestSerializer setValue:[[[NSBundle mainBundle] infoDictionary]
objectForKey:@"CFBundleShortVersionString"] forHTTPHeaderField: @"version"];
......@@ -77,12 +78,22 @@ static NetworkRequestClassManager *manager = nil;
NSLog(@"%@",[[jastorobject toDictionary] JSONString]);
[manager POST:requestURLString parameters:[jastorobject toDictionary] progress:nil success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) {
@try {
//登陆超时
if ([responseObject[@"code"] isEqualToNumber:@1]) {
[XBLoadingView hideHUDViewWithDefault];
[Notification postNotificationName:LOGINTIMEOUT object:nil];
// [XBLoadingView hideHUDViewWithDefault];
// [Notification postNotificationName:LOGINTIMEOUT object:nil];
//调用自动登录
[self automaticLoginWithReturnValueBlock:^(id returnValue) {
[self networkRequestWithURL:requestURLString withRequestType:requestType withParameter:jastorobject withReturnValueBlock:^(id returnValue) {
successBlock(returnValue);
} withFailureBlock:^(NSError *error) {
failureBlock(error);
}];
} withFailureBlock:^(NSError *error) {
failureBlock(error);
}];
}else{
successBlock(responseObject);
}
......@@ -92,9 +103,7 @@ static NetworkRequestClassManager *manager = nil;
}
} failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) {
failureBlock(error);
}];
}else if (requestType == 1){
......@@ -105,8 +114,19 @@ static NetworkRequestClassManager *manager = nil;
@try {
//登陆超时
if ([responseObject[@"code"] isEqualToNumber:@1]) {
[XBLoadingView hideHUDViewWithDefault];
[Notification postNotificationName:LOGINTIMEOUT object:nil];
// [XBLoadingView hideHUDViewWithDefault];
// [Notification postNotificationName:LOGINTIMEOUT object:nil];
//调用自动登录
[self automaticLoginWithReturnValueBlock:^(id returnValue) {
[self networkRequestWithURL:requestURLString withRequestType:requestType withParameter:jastorobject withReturnValueBlock:^(id returnValue) {
successBlock(returnValue);
} withFailureBlock:^(NSError *error) {
failureBlock(error);
}];
} withFailureBlock:^(NSError *error) {
failureBlock(error);
}];
}else{
successBlock(responseObject);
}
......@@ -116,9 +136,7 @@ static NetworkRequestClassManager *manager = nil;
}
} failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) {
failureBlock(error);
}];
}
}
......@@ -147,8 +165,19 @@ static NetworkRequestClassManager *manager = nil;
@try {
//登陆超时
if ([responseObject[@"code"] isEqualToNumber:@1]) {
[XBLoadingView hideHUDViewWithDefault];
[Notification postNotificationName:LOGINTIMEOUT object:nil];
// [XBLoadingView hideHUDViewWithDefault];
// [Notification postNotificationName:LOGINTIMEOUT object:nil];
//自动登录
[self automaticLoginWithReturnValueBlock:^(id returnValue) {
[self networkWithDictionaryRequestWithURL:requestURLString withRequestType:requestType withParameter:parameter withReturnValueBlock:^(id returnValue) {
successBlock(returnValue);
} withFailureBlock:^(NSError *error) {
failureBlock(error);
}];
} withFailureBlock:^(NSError *error) {
failureBlock(error);
}];
}else{
successBlock(responseObject);
}
......@@ -166,8 +195,19 @@ static NetworkRequestClassManager *manager = nil;
@try {
//登陆超时
if ([responseObject[@"code"] isEqualToNumber:@1]) {
[XBLoadingView hideHUDViewWithDefault];
[Notification postNotificationName:LOGINTIMEOUT object:nil];
// [XBLoadingView hideHUDViewWithDefault];
// [Notification postNotificationName:LOGINTIMEOUT object:nil];
//自动登录
[self automaticLoginWithReturnValueBlock:^(id returnValue) {
[self networkWithDictionaryRequestWithURL:requestURLString withRequestType:requestType withParameter:parameter withReturnValueBlock:^(id returnValue) {
successBlock(returnValue);
} withFailureBlock:^(NSError *error) {
failureBlock(error);
}];
} withFailureBlock:^(NSError *error) {
failureBlock(error);
}];
}else{
successBlock(responseObject);
}
......@@ -185,8 +225,19 @@ static NetworkRequestClassManager *manager = nil;
@try {
//登陆超时
if ([responseObject[@"code"] isEqualToNumber:@1]) {
[XBLoadingView hideHUDViewWithDefault];
[Notification postNotificationName:LOGINTIMEOUT object:nil];
// [XBLoadingView hideHUDViewWithDefault];
// [Notification postNotificationName:LOGINTIMEOUT object:nil];
//自动登录
[self automaticLoginWithReturnValueBlock:^(id returnValue) {
[self networkWithDictionaryRequestWithURL:requestURLString withRequestType:requestType withParameter:parameter withReturnValueBlock:^(id returnValue) {
successBlock(returnValue);
} withFailureBlock:^(NSError *error) {
failureBlock(error);
}];
} withFailureBlock:^(NSError *error) {
failureBlock(error);
}];
}else{
successBlock(responseObject);
}
......@@ -202,7 +253,6 @@ static NetworkRequestClassManager *manager = nil;
/**
* 下载PDF
*
......@@ -288,6 +338,35 @@ static NetworkRequestClassManager *manager = nil;
}
/**
自动登录
@param successBlock 登录成功
@param failureBlock 登录失败
*/
- (void)automaticLoginWithReturnValueBlock:(ReturnValueBlock)successBlock
withFailureBlock:(FailureBlock)failureBlock
{
LoginInfo *login = [[LoginInfo alloc]init];
login.username = [Shoppersmanager manager].userNameString;
login.password = [Shoppersmanager manager].passWordString;
[XBLoadingView showHUDViewWithDefault];
[self networkRequestWithURL:SERVERREQUESTURL(LOGIN) withRequestType:ZERO withParameter:login withReturnValueBlock:^(id returnValue) {
[XBLoadingView hideHUDViewWithDefault];
if (RESULT(returnValue)) {
LoginResult *result = [[LoginResult alloc]initWithDictionary:RESPONSE(returnValue) error:nil];
[Shoppersmanager manager].shoppers = result;
successBlock(result);
}else
{
[XBLoadingView showHUDViewWithText:MESSAGE(returnValue)];
}
}withFailureBlock:^(NSError *error) {
[XBLoadingView showHUDViewWithText:error.localizedDescription];
failureBlock(error);
}];
}
......
......@@ -442,7 +442,8 @@
#pragma mark -查询购物车数量
- (void)queryShoppingCarNumber
{
[HTTP networkWithDictionaryRequestWithURL:[NSString stringWithFormat:@"%@%@",SERVERREQUESTURL(QUERYSHOPPINGBAGNUMBER),[Customermanager manager].model.fid] withRequestType:ONE withParameter:nil withReturnValueBlock:^(id returnValue) {
NSString *urlString = [NSString stringWithFormat:SERVERREQUESTURL(QUERYSHOPPINGBAGNUMBER),[Customermanager manager].model.fid];
[HTTP networkWithDictionaryRequestWithURL:urlString withRequestType:ONE withParameter:nil withReturnValueBlock:^(id returnValue) {
if (RESULT(returnValue)) {
NSLog(@"更新购物车数量成功");
......
......@@ -123,10 +123,16 @@
#define GuideReplaceImage [UIImage imageNamed:@"manager"]
/**
* 客户默认显示头像
* 论坛客户默认显示头像
*/
#define CoustomerReplaceImage [UIImage imageNamed:@"user"]
/**
* 客户默认显示头像
*/
#define ReplaceImage [UIImage imageNamed:@"矢量智能对象"]
/**
* 弱引用
*/
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment