Commit 17f1e76c authored by admin's avatar admin

修复请求条数bug

parent 58a079fc
...@@ -21,6 +21,8 @@ ...@@ -21,6 +21,8 @@
self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds]; self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
_window.backgroundColor = [UIColor whiteColor]; _window.backgroundColor = [UIColor whiteColor];
[_window makeKeyAndVisible]; [_window makeKeyAndVisible];
[[NSUserDefaults standardUserDefaults] setObject:@(10) forKey:@"requestNumber"];
// 设置根控制器 // 设置根控制器
LoginViewController *loginVC = [[LoginViewController alloc] init]; LoginViewController *loginVC = [[LoginViewController alloc] init];
......
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
#import "PictureViewController.h" #import "PictureViewController.h"
#import "QuestionViewController.h" #import "QuestionViewController.h"
#import "PicCategoryViewController.h" #import "PicCategoryViewController.h"
#import "StandardViewController.h"
@interface FunctionViewController () @interface FunctionViewController ()
@property (nonatomic, strong) UIView *lineView; @property (nonatomic, strong) UIView *lineView;
...@@ -72,21 +73,23 @@ ...@@ -72,21 +73,23 @@
InspectListViewController *inspectListVC = [[InspectListViewController alloc] init]; InspectListViewController *inspectListVC = [[InspectListViewController alloc] init];
nav = [[UINavigationController alloc] initWithRootViewController:inspectListVC]; nav = [[UINavigationController alloc] initWithRootViewController:inspectListVC];
} else if ([item.titleLabel.text isEqualToString:@"口碑标准"]) { } else if ([item.titleLabel.text isEqualToString:@"口碑标准"]) {
UIAlertView *alert = [[UIAlertView alloc] initWithTitle:@"提示" message:@"当前功能正在开发!" delegate:self cancelButtonTitle:nil otherButtonTitles:@"确定", nil]; StandardViewController *standardVC = [[StandardViewController alloc] init];
[alert show]; nav = [[UINavigationController alloc] initWithRootViewController:standardVC];
return;
} else if ([item.titleLabel.text isEqualToString:@"图说口碑"]) { } else if ([item.titleLabel.text isEqualToString:@"图说口碑"]) {
PictureViewController *pictureVC = [[PictureViewController alloc] init]; PicCategoryViewController *pictureVC = [[PicCategoryViewController alloc] init];
nav = [[UINavigationController alloc] initWithRootViewController:pictureVC]; nav = [[UINavigationController alloc] initWithRootViewController:pictureVC];
} else if ([item.titleLabel.text isEqualToString:@"问题与知识"]) {
} else if ([item.titleLabel.text isEqualToString:@"问题知识"]) {
QuestionViewController *questionVC = [[QuestionViewController alloc] init]; QuestionViewController *questionVC = [[QuestionViewController alloc] init];
nav = [[UINavigationController alloc] initWithRootViewController:questionVC]; nav = [[UINavigationController alloc] initWithRootViewController:questionVC];
} else if ([item.titleLabel.text isEqualToString:@"口碑报告"]) { } else if ([item.titleLabel.text isEqualToString:@"口碑报告"]) {
RankingListViewController *rankingListVC = [[RankingListViewController alloc] init]; RankingListViewController *rankingListVC = [[RankingListViewController alloc] init];
nav = [[UINavigationController alloc] initWithRootViewController:rankingListVC]; nav = [[UINavigationController alloc] initWithRootViewController:rankingListVC];
} else if ([item.titleLabel.text isEqualToString:@"商场风采"]) { } else if ([item.titleLabel.text isEqualToString:@"商场风采"]) {
InspectListViewController *inspectListVC = [[InspectListViewController alloc] init]; PictureViewController *pic = [[PictureViewController alloc] init];
nav = [[UINavigationController alloc] initWithRootViewController:inspectListVC]; pic.come = @"首页";
pic.category = @"store";
nav = [[UINavigationController alloc] initWithRootViewController:pic];
} else { } else {
return; return;
} }
......
...@@ -105,9 +105,11 @@ ...@@ -105,9 +105,11 @@
HttpClient *http = [[HttpClient alloc] initWithUrl:[NSString stringWithFormat:@"%@%@", kRedStarURL, kStoreSportcheckURL]]; HttpClient *http = [[HttpClient alloc] initWithUrl:[NSString stringWithFormat:@"%@%@", kRedStarURL, kStoreSportcheckURL]];
// 相关参数 // 相关参数
NSString *user_uuid = [[NSUserDefaults standardUserDefaults] objectForKey:@"user_uuid"]; NSString *user_uuid = [[NSUserDefaults standardUserDefaults] objectForKey:@"user_uuid"];
NSNumber *pageSize = [[NSUserDefaults standardUserDefaults] objectForKey:@"requestNumber"];
NSDictionary *parameters = @{@"userUuid":user_uuid, NSDictionary *parameters = @{@"userUuid":user_uuid,
@"pageNumber":@(0), @"pageNumber":@(0),
@"pageSize":@(10) @"pageSize":pageSize
}; };
[MBProgressHUD showHUDAddedTo:self.view animated:YES]; [MBProgressHUD showHUDAddedTo:self.view animated:YES];
[http getStoreSportCheckListWithParameters:parameters completion:^(id response, NSError *error) { [http getStoreSportCheckListWithParameters:parameters completion:^(id response, NSError *error) {
...@@ -155,9 +157,11 @@ ...@@ -155,9 +157,11 @@
HttpClient *http = [[HttpClient alloc] initWithUrl:[NSString stringWithFormat:@"%@%@", kRedStarURL, kStoreSportcheckURL]]; HttpClient *http = [[HttpClient alloc] initWithUrl:[NSString stringWithFormat:@"%@%@", kRedStarURL, kStoreSportcheckURL]];
// 相关参数 // 相关参数
NSString *user_uuid = [[NSUserDefaults standardUserDefaults] objectForKey:@"user_uuid"]; NSString *user_uuid = [[NSUserDefaults standardUserDefaults] objectForKey:@"user_uuid"];
NSNumber *pageSize = [[NSUserDefaults standardUserDefaults] objectForKey:@"requestNumber"];
NSDictionary *parameters = @{@"userUuid":user_uuid, NSDictionary *parameters = @{@"userUuid":user_uuid,
@"pageNumber":@(_page), @"pageNumber":@(_page),
@"pageSize":@(10) @"pageSize":pageSize
}; };
[MBProgressHUD showHUDAddedTo:self.view animated:YES]; [MBProgressHUD showHUDAddedTo:self.view animated:YES];
[http getStoreSportCheckListWithParameters:parameters completion:^(id response, NSError *error) { [http getStoreSportCheckListWithParameters:parameters completion:^(id response, NSError *error) {
...@@ -352,11 +356,13 @@ ...@@ -352,11 +356,13 @@
- (void)submitClick:(UIButton *)sender - (void)submitClick:(UIButton *)sender
{ {
HttpClient *http = [[HttpClient alloc] initWithUrl:[NSString stringWithFormat:@"%@%@", kRedStarURL, kStoreSportcheckURL]]; HttpClient *http = [[HttpClient alloc] initWithUrl:[NSString stringWithFormat:@"%@%@", kRedStarURL, kStoreSportcheckURL]];
NSNumber *pageSize = [[NSUserDefaults standardUserDefaults] objectForKey:@"requestNumber"];
NSMutableDictionary *parameters = [NSMutableDictionary dictionaryWithObjectsAndKeys: NSMutableDictionary *parameters = [NSMutableDictionary dictionaryWithObjectsAndKeys:
[[NSUserDefaults standardUserDefaults] objectForKey:@"user_uuid"],@"userUuid", [[NSUserDefaults standardUserDefaults] objectForKey:@"user_uuid"],@"userUuid",
@[],@"queryOrders", @[],@"queryOrders",
@(0),@"pageNumber", @(0),@"pageNumber",
@(10),@"pageSize", nil]; pageSize,@"pageSize", nil];
if (_screenView.groupTabBar.selectNumber == 0) { if (_screenView.groupTabBar.selectNumber == 0) {
...@@ -541,9 +547,11 @@ ...@@ -541,9 +547,11 @@
// 相关参数 // 相关参数
NSString *user_uuid = [[NSUserDefaults standardUserDefaults] objectForKey:@"user_uuid"]; NSString *user_uuid = [[NSUserDefaults standardUserDefaults] objectForKey:@"user_uuid"];
NSNumber *pageSize = [[NSUserDefaults standardUserDefaults] objectForKey:@"requestNumber"];
NSDictionary *parameters = @{@"userUuid":user_uuid, NSDictionary *parameters = @{@"userUuid":user_uuid,
@"pageNumber":@(0), @"pageNumber":@(0),
@"pageSize":@(10), @"pageSize":pageSize,
@"queryOrders":queryOrders @"queryOrders":queryOrders
}; };
[MBProgressHUD showHUDAddedTo:self.view animated:YES]; [MBProgressHUD showHUDAddedTo:self.view animated:YES];
......
...@@ -108,11 +108,13 @@ ...@@ -108,11 +108,13 @@
- (void)requestSpotCheckList - (void)requestSpotCheckList
{ {
HttpClient *http = [[HttpClient alloc] initWithUrl:[NSString stringWithFormat:@"%@%@", kRedStarURL, kManageSportcheckURL]]; HttpClient *http = [[HttpClient alloc] initWithUrl:[NSString stringWithFormat:@"%@%@", kRedStarURL, kManageSportcheckURL]];
NSNumber *pageSize = [[NSUserDefaults standardUserDefaults] objectForKey:@"requestNumber"];
// 相关参数 // 相关参数
NSString *user_uuid = [[NSUserDefaults standardUserDefaults] objectForKey:@"user_uuid"]; NSString *user_uuid = [[NSUserDefaults standardUserDefaults] objectForKey:@"user_uuid"];
NSDictionary *parameters = @{@"userUuid":user_uuid, NSDictionary *parameters = @{@"userUuid":user_uuid,
@"pageNumber":@(0), @"pageNumber":@(0),
@"pageSize":@(10) @"pageSize":pageSize
}; };
[MBProgressHUD showHUDAddedTo:self.view animated:YES]; [MBProgressHUD showHUDAddedTo:self.view animated:YES];
[http getManageSportCheckListWithParameters:parameters completion:^(id response, NSError *error) { [http getManageSportCheckListWithParameters:parameters completion:^(id response, NSError *error) {
...@@ -161,9 +163,11 @@ ...@@ -161,9 +163,11 @@
HttpClient *http = [[HttpClient alloc] initWithUrl:[NSString stringWithFormat:@"%@%@", kRedStarURL, kManageSportcheckURL]]; HttpClient *http = [[HttpClient alloc] initWithUrl:[NSString stringWithFormat:@"%@%@", kRedStarURL, kManageSportcheckURL]];
// 相关参数 // 相关参数
NSString *user_uuid = [[NSUserDefaults standardUserDefaults] objectForKey:@"user_uuid"]; NSString *user_uuid = [[NSUserDefaults standardUserDefaults] objectForKey:@"user_uuid"];
NSNumber *pageSize = [[NSUserDefaults standardUserDefaults] objectForKey:@"requestNumber"];
NSDictionary *parameters = @{@"userUuid":user_uuid, NSDictionary *parameters = @{@"userUuid":user_uuid,
@"pageNumber":@(_page), @"pageNumber":@(_page),
@"pageSize":@(10) @"pageSize":pageSize
}; };
[MBProgressHUD showHUDAddedTo:self.view animated:YES]; [MBProgressHUD showHUDAddedTo:self.view animated:YES];
[http getManageSportCheckListWithParameters:parameters completion:^(id response, NSError *error) { [http getManageSportCheckListWithParameters:parameters completion:^(id response, NSError *error) {
...@@ -366,11 +370,13 @@ ...@@ -366,11 +370,13 @@
{ {
NSString *url = [NSString stringWithFormat:@"%@%@", kRedStarURL, kManageSportcheckURL]; NSString *url = [NSString stringWithFormat:@"%@%@", kRedStarURL, kManageSportcheckURL];
HttpClient *httpCilent = [[HttpClient alloc] initWithUrl:url]; HttpClient *httpCilent = [[HttpClient alloc] initWithUrl:url];
NSNumber *pageSize = [[NSUserDefaults standardUserDefaults] objectForKey:@"requestNumber"];
NSMutableDictionary *parameters = [NSMutableDictionary dictionaryWithObjectsAndKeys: NSMutableDictionary *parameters = [NSMutableDictionary dictionaryWithObjectsAndKeys:
[[NSUserDefaults standardUserDefaults] objectForKey:@"user_uuid"],@"userUuid", [[NSUserDefaults standardUserDefaults] objectForKey:@"user_uuid"],@"userUuid",
@[],@"queryOrders", @[],@"queryOrders",
@(0),@"pageNumber", @(0),@"pageNumber",
@(10),@"pageSize", nil]; pageSize,@"pageSize", nil];
if (_screenView.groupTabBar.selectNumber == 0) { if (_screenView.groupTabBar.selectNumber == 0) {
...@@ -519,12 +525,12 @@ ...@@ -519,12 +525,12 @@
@"direction":@"asc"}]; @"direction":@"asc"}];
} }
NSNumber *pageSize = [[NSUserDefaults standardUserDefaults] objectForKey:@"requestNumber"];
// 相关参数 // 相关参数
NSString *user_uuid = [[NSUserDefaults standardUserDefaults] objectForKey:@"user_uuid"]; NSString *user_uuid = [[NSUserDefaults standardUserDefaults] objectForKey:@"user_uuid"];
NSDictionary *parameters = @{@"userUuid":user_uuid, NSDictionary *parameters = @{@"userUuid":user_uuid,
@"pageNumber":@(_page), @"pageNumber":@(_page),
@"pageSize":@(10), @"pageSize":pageSize,
@"queryOrders":queryOrders @"queryOrders":queryOrders
}; };
[MBProgressHUD showHUDAddedTo:self.view animated:YES]; [MBProgressHUD showHUDAddedTo:self.view animated:YES];
......
...@@ -9,5 +9,5 @@ ...@@ -9,5 +9,5 @@
#import <UIKit/UIKit.h> #import <UIKit/UIKit.h>
@interface AddPictureViewController : UIViewController @interface AddPictureViewController : UIViewController
@property (nonatomic, copy) NSString *category;
@end @end
...@@ -127,7 +127,7 @@ ...@@ -127,7 +127,7 @@
NSDictionary *parameters = @{ NSDictionary *parameters = @{
@"title":cell.contentTextView.text, @"title":cell.contentTextView.text,
@"content":cell.titleTextView.text, @"content":cell.titleTextView.text,
@"type":@"store" @"type":self.category
}; };
[http1 savePicturePraiseWithParameters:parameters completion:^(id response, NSError *error) { [http1 savePicturePraiseWithParameters:parameters completion:^(id response, NSError *error) {
NSLog(@"6.1保存图说口碑 resp = %@, error = %@", response, error); NSLog(@"6.1保存图说口碑 resp = %@, error = %@", response, error);
......
...@@ -10,6 +10,9 @@ ...@@ -10,6 +10,9 @@
@interface PictureTextTableCell : UITableViewCell @interface PictureTextTableCell : UITableViewCell
@property (nonatomic, strong) UIImageView *bigImageView; @property (nonatomic, strong) UIImageView *bigImageView;
//@property (nonatomic, strong) UIButton *bigImageView;
@property (nonatomic, strong) UILabel *descriptionLabel; @property (nonatomic, strong) UILabel *descriptionLabel;
@end @end
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
if (!_bigImageView) { if (!_bigImageView) {
_bigImageView = [[UIImageView alloc] init]; _bigImageView = [[UIImageView alloc] init];
_bigImageView.translatesAutoresizingMaskIntoConstraints = NO; _bigImageView.translatesAutoresizingMaskIntoConstraints = NO;
_bigImageView.userInteractionEnabled = YES;
[self.contentView addSubview:_bigImageView]; [self.contentView addSubview:_bigImageView];
// 顶端 // 顶端
...@@ -35,11 +36,41 @@ ...@@ -35,11 +36,41 @@
return _bigImageView; return _bigImageView;
} }
//- (UIButton *)bigImageView
//{
// if (!_bigImageView) {
// _bigImageView = [[UIButton alloc] init];
// _bigImageView.translatesAutoresizingMaskIntoConstraints = NO;
// [self.contentView addSubview:_bigImageView];
//
// // 顶端
// NSLayoutConstraint *titleTop = [NSLayoutConstraint constraintWithItem:_bigImageView attribute:NSLayoutAttributeTop relatedBy:NSLayoutRelationEqual toItem:self.contentView attribute:NSLayoutAttributeTop multiplier:1.0 constant:5];
// [self.contentView addConstraint:titleTop];
//
// // 左边
// NSLayoutConstraint *titleLeft = [NSLayoutConstraint constraintWithItem:_bigImageView attribute:NSLayoutAttributeLeft relatedBy:NSLayoutRelationEqual toItem:self.contentView attribute:NSLayoutAttributeLeft multiplier:1.0 constant:20];
// [self.contentView addConstraint:titleLeft];
//
// // 右边
// NSLayoutConstraint *titleRight = [NSLayoutConstraint constraintWithItem:_bigImageView attribute:NSLayoutAttributeRight relatedBy:NSLayoutRelationEqual toItem:self.contentView attribute:NSLayoutAttributeRight multiplier:1.0 constant:-20];
// [self.contentView addConstraint:titleRight];
//
// // 高度
// NSLayoutConstraint *titleHeight = [NSLayoutConstraint constraintWithItem:_bigImageView attribute:NSLayoutAttributeHeight relatedBy:NSLayoutRelationEqual toItem:nil attribute:NSLayoutAttributeNotAnAttribute multiplier:1.0 constant:170];
// [self.contentView addConstraint:titleHeight];
// }
// return _bigImageView;
//}
- (UILabel *)descriptionLabel - (UILabel *)descriptionLabel
{ {
if (!_descriptionLabel) { if (!_descriptionLabel) {
_descriptionLabel = [[UILabel alloc] init]; _descriptionLabel = [[UILabel alloc] init];
_descriptionLabel.translatesAutoresizingMaskIntoConstraints = NO; _descriptionLabel.translatesAutoresizingMaskIntoConstraints = NO;
_descriptionLabel.font = [UIFont systemFontOfSize:15.0];
_descriptionLabel.textColor = kLightBlack;
[self.contentView addSubview:_descriptionLabel]; [self.contentView addSubview:_descriptionLabel];
// 顶端 // 顶端
......
...@@ -13,12 +13,15 @@ ...@@ -13,12 +13,15 @@
#import "PictureTextTableCell.h" #import "PictureTextTableCell.h"
#import "PictureCommentTableCell.h" #import "PictureCommentTableCell.h"
#import "CheckPicViewController.h"
#import "HttpClient.h" #import "HttpClient.h"
#import "CommentView.h" #import "CommentView.h"
#import <MBProgressHUD.h> #import <MBProgressHUD.h>
#import "CommentModel.h" #import "CommentModel.h"
#import <UIImageView+WebCache.h> #import <UIImageView+WebCache.h>
#import <UIButton+WebCache.h>
#define kPictureDetailTableCell @"PictureDetailTableViewCell" #define kPictureDetailTableCell @"PictureDetailTableViewCell"
#define kPictureTextTableCell @"PictureTextTableViewCell" #define kPictureTextTableCell @"PictureTextTableViewCell"
...@@ -243,6 +246,14 @@ ...@@ -243,6 +246,14 @@
}]; }];
} }
- (void)tapClick:(UIGestureRecognizer *)sender
{
UIImageView *showImageView = (UIImageView *)sender.view;
CheckPicViewController *checkVC = [[CheckPicViewController alloc] init];
checkVC.checkImage = showImageView.image;
[self.navigationController pushViewController:checkVC animated:YES];
}
#pragma mark - UITableView DataSource/Delegate #pragma mark - UITableView DataSource/Delegate
- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
{ {
...@@ -305,13 +316,22 @@ ...@@ -305,13 +316,22 @@
} }
PicTextModel *picText = _picTextArray[indexPath.row]; PicTextModel *picText = _picTextArray[indexPath.row];
NSURL *imageUrl = [NSURL URLWithString:[NSString stringWithFormat:@"%@%@", kRedStarURL ,picText.fileUrl]]; NSURL *imageUrl = [NSURL URLWithString:[NSString stringWithFormat:@"%@%@", kRedStarURL ,picText.fileUrl]];
// UIImageView *imageView = [[UIImageView alloc] init]; UIImageView *imageView = [[UIImageView alloc] init];
// [imageView sd_setImageWithURL:imageUrl placeholderImage:[UIImage imageNamed:@"default_pic"]]; [imageView sd_setImageWithURL:imageUrl placeholderImage:[UIImage imageNamed:@"default_pic"]];
cell.bigImageView.contentMode = UIViewContentModeScaleAspectFit;
// [cell.bigImageView sd_setImageWithURL:imageUrl forState:UIControlStateNormal placeholderImage:[UIImage imageNamed:@"default_pic"]];
[cell.bigImageView sd_setImageWithURL:imageUrl placeholderImage:[UIImage imageNamed:@"default_pic"]];
UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tapClick:)];
[cell.bigImageView addGestureRecognizer:tap];
NSString *str = [NSString stringWithFormat:@"%@", picText.descriptionText];
if (picText.descriptionText == nil || picText.descriptionText == NULL || [picText.descriptionText isEqual:[NSNull null]]) {
cell.descriptionLabel.text = @"";
} else {
cell.descriptionLabel.text = str;
}
[cell.bigImageView sd_setImageWithURL:imageUrl placeholderImage:[UIImage imageNamed:@"default_pic"]];
cell.descriptionLabel.text = [NSString stringWithFormat:@"%@", picText.descriptionText];
cell.selectionStyle = UITableViewCellSelectionStyleNone; cell.selectionStyle = UITableViewCellSelectionStyleNone;
return cell; return cell;
} else { } else {
......
...@@ -54,6 +54,32 @@ ...@@ -54,6 +54,32 @@
[self.commentBtn setTitle:[NSString stringWithFormat:@"%d", pictureList.commentCount] forState:UIControlStateNormal]; [self.commentBtn setTitle:[NSString stringWithFormat:@"%d", pictureList.commentCount] forState:UIControlStateNormal];
} }
//裁剪图片
- (UIImage *)cutImage:(UIImage*)image
{
//压缩图片
CGSize newSize;
CGImageRef imageRef = nil;
if ((image.size.width / image.size.height) < (((kScreenWidth - 20 * 3) / 2) / 90)) {
newSize.width = image.size.width;
newSize.height = image.size.width * 90 / ((kScreenWidth - 20 * 3) / 2);
imageRef = CGImageCreateWithImageInRect([image CGImage], CGRectMake(0, fabs(image.size.height - newSize.height) / 2, newSize.width, newSize.height));
} else {
newSize.height = image.size.height;
newSize.width = image.size.height * ((kScreenWidth - 20 * 3) / 2) / 90;
imageRef = CGImageCreateWithImageInRect([image CGImage], CGRectMake(fabs(image.size.width - newSize.width) / 2, 0, newSize.width, newSize.height));
}
return [UIImage imageWithCGImage:imageRef];
}
#pragma mark - Lazy loading #pragma mark - Lazy loading
- (UIImageView *)titleImageView - (UIImageView *)titleImageView
{ {
......
...@@ -125,6 +125,7 @@ ...@@ -125,6 +125,7 @@
// [alert show]; // [alert show];
AddPictureViewController *addPic = [[AddPictureViewController alloc] init]; AddPictureViewController *addPic = [[AddPictureViewController alloc] init];
addPic.category = self.category;
[self.navigationController pushViewController:addPic animated:YES]; [self.navigationController pushViewController:addPic animated:YES];
} }
...@@ -135,12 +136,14 @@ ...@@ -135,12 +136,14 @@
// 请求地址 // 请求地址
NSString *urlStr = [NSString stringWithFormat:@"%@%@", kRedStarURL, kQueryPicturePraiseURL]; NSString *urlStr = [NSString stringWithFormat:@"%@%@", kRedStarURL, kQueryPicturePraiseURL];
NSString *user_uuid = [[NSUserDefaults standardUserDefaults] objectForKey:@"user_uuid"]; NSString *user_uuid = [[NSUserDefaults standardUserDefaults] objectForKey:@"user_uuid"];
NSNumber *pageSize = [[NSUserDefaults standardUserDefaults] objectForKey:@"requestNumber"];
NSDictionary *parameters = @{ NSDictionary *parameters = @{
@"scope":@"all", @"scope":@"all",
@"user":user_uuid, @"user":user_uuid,
@"type":self.category, @"type":self.category,
@"pageNumber":@(0), @"pageNumber":@(0),
@"pageSize":@(10) @"pageSize":pageSize
}; };
// 发起请求 // 发起请求
...@@ -184,12 +187,14 @@ ...@@ -184,12 +187,14 @@
NSString *urlStr = [NSString stringWithFormat:@"%@%@", kRedStarURL, kQueryPicturePraiseURL]; NSString *urlStr = [NSString stringWithFormat:@"%@%@", kRedStarURL, kQueryPicturePraiseURL];
NSString *user_uuid = [[NSUserDefaults standardUserDefaults] objectForKey:@"user_uuid"]; NSString *user_uuid = [[NSUserDefaults standardUserDefaults] objectForKey:@"user_uuid"];
NSNumber *pageSize = [[NSUserDefaults standardUserDefaults] objectForKey:@"requestNumber"];
NSDictionary *parameters = @{ NSDictionary *parameters = @{
@"scope":@"all", @"scope":@"all",
@"user":user_uuid, @"user":user_uuid,
@"type":self.category, @"type":self.category,
@"pageNumber":@(_page), @"pageNumber":@(_page),
@"pageSize":@(10) @"pageSize":pageSize
}; };
// 发起请求 // 发起请求
...@@ -389,12 +394,12 @@ ...@@ -389,12 +394,12 @@
// 请求地址 // 请求地址
NSString *urlStr = [NSString stringWithFormat:@"%@%@", kRedStarURL, kQueryPicturePraiseURL]; NSString *urlStr = [NSString stringWithFormat:@"%@%@", kRedStarURL, kQueryPicturePraiseURL];
NSString *user_uuid = [[NSUserDefaults standardUserDefaults] objectForKey:@"user_uuid"]; NSString *user_uuid = [[NSUserDefaults standardUserDefaults] objectForKey:@"user_uuid"];
NSNumber *pageSize = [[NSUserDefaults standardUserDefaults] objectForKey:@"requestNumber"];
NSMutableDictionary *parameters = [NSMutableDictionary dictionaryWithObjectsAndKeys: NSMutableDictionary *parameters = [NSMutableDictionary dictionaryWithObjectsAndKeys:
user_uuid,@"user", user_uuid,@"user",
@(0),@"pageNumber", @(0),@"pageNumber",
@(10),@"pageSize", pageSize,@"pageSize",
self.category,@"type", self.category,@"type",
@"all",@"scope", @"all",@"scope",
nil]; nil];
...@@ -564,10 +569,10 @@ ...@@ -564,10 +569,10 @@
queryOrders = @[@{@"field":@"likeCount", queryOrders = @[@{@"field":@"likeCount",
@"direction":@"asc"}]; @"direction":@"asc"}];
} }
NSNumber *pageSize = [[NSUserDefaults standardUserDefaults] objectForKey:@"requestNumber"];
NSDictionary *parameters = @{@"user":user_uuid, NSDictionary *parameters = @{@"user":user_uuid,
@"pageNumber":@(_page), @"pageNumber":@(_page),
@"pageSize":@(10), @"pageSize":pageSize,
@"queryOrders":queryOrders, @"queryOrders":queryOrders,
@"type":self.category, @"type":self.category,
@"scope":@"all" @"scope":@"all"
......
...@@ -156,12 +156,12 @@ ...@@ -156,12 +156,12 @@
// 请求地址 // 请求地址
NSString *urlStr = [NSString stringWithFormat:@"%@%@", kRedStarURL, kQuestionListURL]; NSString *urlStr = [NSString stringWithFormat:@"%@%@", kRedStarURL, kQuestionListURL];
NSString *user_uuid = [[NSUserDefaults standardUserDefaults] objectForKey:@"user_uuid"]; NSString *user_uuid = [[NSUserDefaults standardUserDefaults] objectForKey:@"user_uuid"];
NSNumber *pageSize = [[NSUserDefaults standardUserDefaults] objectForKey:@"requestNumber"];
// 请求参数 // 请求参数
NSDictionary *parameters = @{@"user":user_uuid, NSDictionary *parameters = @{@"user":user_uuid,
@"scope":@"all", @"scope":@"all",
@"pageNumber":@(_page), @"pageNumber":@(_page),
@"pageSize":@(10) @"pageSize":pageSize
}; };
// 发起请求 // 发起请求
...@@ -444,11 +444,11 @@ ...@@ -444,11 +444,11 @@
NSString *urlStr = [NSString stringWithFormat:@"%@%@", kRedStarURL, kQuestionListURL]; NSString *urlStr = [NSString stringWithFormat:@"%@%@", kRedStarURL, kQuestionListURL];
NSString *user_uuid = [[NSUserDefaults standardUserDefaults] objectForKey:@"user_uuid"]; NSString *user_uuid = [[NSUserDefaults standardUserDefaults] objectForKey:@"user_uuid"];
NSNumber *pageSize = [[NSUserDefaults standardUserDefaults] objectForKey:@"requestNumber"];
NSMutableDictionary *parameters = [NSMutableDictionary dictionaryWithObjectsAndKeys: NSMutableDictionary *parameters = [NSMutableDictionary dictionaryWithObjectsAndKeys:
user_uuid,@"user", user_uuid,@"user",
@(0),@"pageNumber", @(0),@"pageNumber",
@(10),@"pageSize", nil]; pageSize,@"pageSize", nil];
// 发起请求 // 发起请求
HttpClient *httpClient = [[HttpClient alloc] initWithUrl:urlStr]; HttpClient *httpClient = [[HttpClient alloc] initWithUrl:urlStr];
......
...@@ -118,11 +118,12 @@ ...@@ -118,11 +118,12 @@
_page++; _page++;
NSString *url = [NSString stringWithFormat:@"%@%@", kRedStarURL, kInspectListURL]; NSString *url = [NSString stringWithFormat:@"%@%@", kRedStarURL, kInspectListURL];
HttpClient *httpCilent = [[HttpClient alloc] initWithUrl:url]; HttpClient *httpCilent = [[HttpClient alloc] initWithUrl:url];
NSNumber *pageSize = [[NSUserDefaults standardUserDefaults] objectForKey:@"requestNumber"];
NSDictionary *parameters = @{ NSDictionary *parameters = @{
@"userUuid":[[NSUserDefaults standardUserDefaults] objectForKey:@"user_uuid"], @"userUuid":[[NSUserDefaults standardUserDefaults] objectForKey:@"user_uuid"],
@"queryOrders":@[@{@"field":@"lastModifyInfo", @"direction":@"desc"}], @"queryOrders":@[@{@"field":@"lastModifyInfo", @"direction":@"desc"}],
@"pageNumber":@(_page), @"pageNumber":@(_page),
@"pageSize":@(10) @"pageSize":pageSize
}; };
[httpCilent getInspectListWithParameters:parameters completion:^(id response, NSError *error) { [httpCilent getInspectListWithParameters:parameters completion:^(id response, NSError *error) {
...@@ -154,11 +155,13 @@ ...@@ -154,11 +155,13 @@
{ {
NSString *url = [NSString stringWithFormat:@"%@%@", kRedStarURL, kInspectListURL]; NSString *url = [NSString stringWithFormat:@"%@%@", kRedStarURL, kInspectListURL];
HttpClient *httpCilent = [[HttpClient alloc] initWithUrl:url]; HttpClient *httpCilent = [[HttpClient alloc] initWithUrl:url];
NSNumber *pageSize = [[NSUserDefaults standardUserDefaults] objectForKey:@"requestNumber"];
NSDictionary *parameters = @{ NSDictionary *parameters = @{
@"userUuid":[[NSUserDefaults standardUserDefaults] objectForKey:@"user_uuid"], @"userUuid":[[NSUserDefaults standardUserDefaults] objectForKey:@"user_uuid"],
@"queryOrders":@[@{@"field":@"lastModifyInfo", @"direction":@"desc"}], @"queryOrders":@[@{@"field":@"lastModifyInfo", @"direction":@"desc"}],
@"pageNumber":@(0), @"pageNumber":@(0),
@"pageSize":@(10) @"pageSize":pageSize
}; };
[MBProgressHUD showHUDAddedTo:self.view animated:YES]; [MBProgressHUD showHUDAddedTo:self.view animated:YES];
...@@ -210,11 +213,13 @@ ...@@ -210,11 +213,13 @@
NSString *url = [NSString stringWithFormat:@"%@%@", kRedStarURL, kInspectListURL]; NSString *url = [NSString stringWithFormat:@"%@%@", kRedStarURL, kInspectListURL];
HttpClient *httpCilent = [[HttpClient alloc] initWithUrl:url]; HttpClient *httpCilent = [[HttpClient alloc] initWithUrl:url];
NSNumber *pageSize = [[NSUserDefaults standardUserDefaults] objectForKey:@"requestNumber"];
NSDictionary *parameters = @{ NSDictionary *parameters = @{
@"userUuid":[[NSUserDefaults standardUserDefaults] objectForKey:@"user_uuid"], @"userUuid":[[NSUserDefaults standardUserDefaults] objectForKey:@"user_uuid"],
@"queryOrders":@[@{@"field":@"lastModifyInfo", @"direction":@"desc"}], @"queryOrders":@[@{@"field":@"lastModifyInfo", @"direction":@"desc"}],
@"pageNumber":@(0), @"pageNumber":@(0),
@"pageSize":@(10) @"pageSize":pageSize
}; };
[MBProgressHUD showHUDAddedTo:self.view animated:YES]; [MBProgressHUD showHUDAddedTo:self.view animated:YES];
...@@ -421,12 +426,12 @@ ...@@ -421,12 +426,12 @@
{ {
NSString *url = [NSString stringWithFormat:@"%@%@", kRedStarURL, kInspectListURL]; NSString *url = [NSString stringWithFormat:@"%@%@", kRedStarURL, kInspectListURL];
HttpClient *httpCilent = [[HttpClient alloc] initWithUrl:url]; HttpClient *httpCilent = [[HttpClient alloc] initWithUrl:url];
NSNumber *pageSize = [[NSUserDefaults standardUserDefaults] objectForKey:@"requestNumber"];
NSMutableDictionary *parameters = [NSMutableDictionary dictionaryWithObjectsAndKeys: NSMutableDictionary *parameters = [NSMutableDictionary dictionaryWithObjectsAndKeys:
[[NSUserDefaults standardUserDefaults] objectForKey:@"user_uuid"],@"userUuid", [[NSUserDefaults standardUserDefaults] objectForKey:@"user_uuid"],@"userUuid",
@[],@"queryOrders", @[],@"queryOrders",
@(0),@"pageNumber", @(0),@"pageNumber",
@(10),@"pageSize", nil]; pageSize,@"pageSize", nil];
if (_screenView.groupTabBar.selectNumber == 0) { if (_screenView.groupTabBar.selectNumber == 0) {
...@@ -606,11 +611,11 @@ ...@@ -606,11 +611,11 @@
queryOrders = @[@{@"field":@"lastModifyInfo", queryOrders = @[@{@"field":@"lastModifyInfo",
@"direction":@"asc"}]; @"direction":@"asc"}];
} }
NSNumber *pageSize = [[NSUserDefaults standardUserDefaults] objectForKey:@"requestNumber"];
NSDictionary *parameters = @{@"userUuid":[[NSUserDefaults standardUserDefaults] objectForKey:@"user_uuid"], NSDictionary *parameters = @{@"userUuid":[[NSUserDefaults standardUserDefaults] objectForKey:@"user_uuid"],
@"queryOrders":queryOrders, @"queryOrders":queryOrders,
@"pageNumber":@(0), @"pageNumber":@(0),
@"pageSize":@(10) @"pageSize":pageSize
}; };
[MBProgressHUD showHUDAddedTo:self.view animated:YES]; [MBProgressHUD showHUDAddedTo:self.view animated:YES];
[httpCilent getInspectListWithParameters:parameters completion:^(id response, NSError *error) { [httpCilent getInspectListWithParameters:parameters completion:^(id response, NSError *error) {
......
...@@ -181,11 +181,13 @@ ...@@ -181,11 +181,13 @@
NSString *url = [NSString stringWithFormat:@"%@%@", kRedStarURL, kRankingListURL]; NSString *url = [NSString stringWithFormat:@"%@%@", kRedStarURL, kRankingListURL];
HttpClient *httpCilent = [[HttpClient alloc] initWithUrl:url]; HttpClient *httpCilent = [[HttpClient alloc] initWithUrl:url];
NSNumber *pageSize = [[NSUserDefaults standardUserDefaults] objectForKey:@"requestNumber"];
NSDictionary *parameters = @{@"keyword":self.customStr, NSDictionary *parameters = @{@"keyword":self.customStr,
@"praiseUuid":@"", @"praiseUuid":@"",
@"statisMode":@(0), @"statisMode":@(0),
@"pageNumber":@(0), @"pageNumber":@(0),
@"pageSize":@(10) @"pageSize":pageSize
}; };
[httpCilent getRankingListWithParameters:parameters completion:^(id response, NSError *error) { [httpCilent getRankingListWithParameters:parameters completion:^(id response, NSError *error) {
...@@ -239,13 +241,13 @@ ...@@ -239,13 +241,13 @@
NSString *url = [NSString stringWithFormat:@"%@%@", kRedStarURL, kInspectListURL]; NSString *url = [NSString stringWithFormat:@"%@%@", kRedStarURL, kInspectListURL];
NSLog(@"uuuurl = %@", url); NSLog(@"uuuurl = %@", url);
HttpClient *httpCilent = [[HttpClient alloc] initWithUrl:url]; HttpClient *httpCilent = [[HttpClient alloc] initWithUrl:url];
NSNumber *pageSize = [[NSUserDefaults standardUserDefaults] objectForKey:@"requestNumber"];
NSDictionary *parameters = @{@"keyword":self.customStr, NSDictionary *parameters = @{@"keyword":self.customStr,
@"userUuid":[[NSUserDefaults standardUserDefaults] objectForKey:@"user_uuid"], @"userUuid":[[NSUserDefaults standardUserDefaults] objectForKey:@"user_uuid"],
@"queryOrders":@[@{@"field":@"lastModifyInfo", @"direction":@"desc"}], @"queryOrders":@[@{@"field":@"lastModifyInfo", @"direction":@"desc"}],
@"pageNumber":@(0), @"pageNumber":@(0),
@"pageSize":@(10) @"pageSize":pageSize
}; };
NSLog(@"parrrrr = %@", parameters); NSLog(@"parrrrr = %@", parameters);
[httpCilent getInspectListWithParameters:parameters completion:^(id response, NSError *error) { [httpCilent getInspectListWithParameters:parameters completion:^(id response, NSError *error) {
...@@ -275,12 +277,12 @@ ...@@ -275,12 +277,12 @@
// 请求地址 // 请求地址
NSString *urlStr = [NSString stringWithFormat:@"%@%@", kRedStarURL, kQuestionListURL]; NSString *urlStr = [NSString stringWithFormat:@"%@%@", kRedStarURL, kQuestionListURL];
NSString *user_uuid = [[NSUserDefaults standardUserDefaults] objectForKey:@"user_uuid"]; NSString *user_uuid = [[NSUserDefaults standardUserDefaults] objectForKey:@"user_uuid"];
// 请求参数 NSNumber *pageSize = [[NSUserDefaults standardUserDefaults] objectForKey:@"requestNumber"];
NSDictionary *parameters = @{@"keyword":self.customStr, NSDictionary *parameters = @{@"keyword":self.customStr,
@"user":user_uuid, @"user":user_uuid,
@"scope":@"all", @"scope":@"all",
@"pageNumber":@(0), @"pageNumber":@(0),
@"pageSize":@(10) @"pageSize":pageSize
}; };
// 发起请求 // 发起请求
HttpClient *httpClient = [[HttpClient alloc] initWithUrl:urlStr]; HttpClient *httpClient = [[HttpClient alloc] initWithUrl:urlStr];
...@@ -312,13 +314,15 @@ ...@@ -312,13 +314,15 @@
// 请求地址 // 请求地址
NSString *urlStr = [NSString stringWithFormat:@"%@%@", kRedStarURL, kQueryPicturePraiseURL]; NSString *urlStr = [NSString stringWithFormat:@"%@%@", kRedStarURL, kQueryPicturePraiseURL];
NSString *user_uuid = [[NSUserDefaults standardUserDefaults] objectForKey:@"user_uuid"]; NSString *user_uuid = [[NSUserDefaults standardUserDefaults] objectForKey:@"user_uuid"];
NSNumber *pageSize = [[NSUserDefaults standardUserDefaults] objectForKey:@"requestNumber"];
NSDictionary *parameters = @{ NSDictionary *parameters = @{
@"keyword":self.customStr, @"keyword":self.customStr,
@"scope":@"all", @"scope":@"all",
@"user":user_uuid, @"user":user_uuid,
@"type":@"store", @"type":@"store",
@"pageNumber":@(0), @"pageNumber":@(0),
@"pageSize":@(10) @"pageSize":pageSize
}; };
// 发起请求 // 发起请求
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
#import "HttpClient.h" #import "HttpClient.h"
@interface MineViewController () <UITableViewDelegate, UITableViewDataSource, UIAlertViewDelegate> @interface MineViewController () <UITableViewDelegate, UITableViewDataSource, UIAlertViewDelegate, UIActionSheetDelegate>
@property (nonatomic, strong) UITableView *tableView; @property (nonatomic, strong) UITableView *tableView;
@property (nonatomic, strong) NSMutableArray *titleArray; @property (nonatomic, strong) NSMutableArray *titleArray;
...@@ -26,6 +26,9 @@ ...@@ -26,6 +26,9 @@
@property (nonatomic, strong) MineTableFooterView *footView; @property (nonatomic, strong) MineTableFooterView *footView;
@property (nonatomic, copy) NSString *jumpURL; @property (nonatomic, copy) NSString *jumpURL;
@property (nonatomic, strong) UIActionSheet *numberActionSheet;
@end @end
@implementation MineViewController @implementation MineViewController
...@@ -194,6 +197,10 @@ ...@@ -194,6 +197,10 @@
} else if (indexPath.row == 1) { } else if (indexPath.row == 1) {
AboutMeViewController *about = [[AboutMeViewController alloc] init]; AboutMeViewController *about = [[AboutMeViewController alloc] init];
[self.navigationController pushViewController:about animated:YES]; [self.navigationController pushViewController:about animated:YES];
} else {
self.numberActionSheet = [[UIActionSheet alloc] initWithTitle:@"请求数量" delegate:self cancelButtonTitle:@"取消" destructiveButtonTitle:nil otherButtonTitles:@"10",@"20",@"30",@"40", @"50", nil];
[_numberActionSheet showInView:self.view];
} }
} }
...@@ -209,6 +216,24 @@ ...@@ -209,6 +216,24 @@
return 20; return 20;
} }
#pragma mark - UIActionSheetDelegate
- (void)actionSheet:(UIActionSheet *)actionSheet didDismissWithButtonIndex:(NSInteger)buttonIndex
{
if (buttonIndex == 0) {
[[NSUserDefaults standardUserDefaults] setObject:@(10) forKey:@"requestNumber"];
} else if (buttonIndex == 1){
[[NSUserDefaults standardUserDefaults] setObject:@(20) forKey:@"requestNumber"];
} else if (buttonIndex == 2){
[[NSUserDefaults standardUserDefaults] setObject:@(30) forKey:@"requestNumber"];
} else if (buttonIndex == 3){
[[NSUserDefaults standardUserDefaults] setObject:@(40) forKey:@"requestNumber"];
} else if (buttonIndex == 4){
[[NSUserDefaults standardUserDefaults] setObject:@(50) forKey:@"requestNumber"];
}
}
#pragma mark - lazy loading #pragma mark - lazy loading
- (UITableView *)tableView - (UITableView *)tableView
{ {
......
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