Commit f2c5518d authored by 曹云霄's avatar 曹云霄

测试虚拟文件夹直接转实体文件夹

parent 78548095
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#import "MessageTableViewCell.h" #import "MessageTableViewCell.h"
#import "UITableView+FDTemplateLayoutCell.h" #import "UITableView+FDTemplateLayoutCell.h"
@interface MessageViewController ()<UITableViewDelegate,UITableViewDataSource> @interface MessageViewController ()<UITableViewDelegate,UITableViewDataSource,DZNEmptyDataSetSource,DZNEmptyDataSetDelegate>
/** /**
...@@ -84,6 +84,8 @@ ...@@ -84,6 +84,8 @@
[HTTP networkRequestWithURL:SERVERREQUESTURL(MESSAGELIST) withRequestType:0 withParameter:self.messageModel withReturnValueBlock:^(id returnValue) { [HTTP networkRequestWithURL:SERVERREQUESTURL(MESSAGELIST) withRequestType:0 withParameter:self.messageModel withReturnValueBlock:^(id returnValue) {
[XBLoadingView hideHUDViewWithDefault]; [XBLoadingView hideHUDViewWithDefault];
weakSelf.meesageTableView.emptyDataSetSource = weakSelf;
weakSelf.meesageTableView.emptyDataSetDelegate = weakSelf;
[weakSelf endRefreshingForTableView:weakSelf.meesageTableView]; [weakSelf endRefreshingForTableView:weakSelf.meesageTableView];
if (RESULT(returnValue)) { if (RESULT(returnValue)) {
if (isRemove) { if (isRemove) {
...@@ -92,6 +94,8 @@ ...@@ -92,6 +94,8 @@
weakSelf.resultModel = [[NoticeResponse alloc] initWithDictionary:returnValue[@"data"] error:nil]; weakSelf.resultModel = [[NoticeResponse alloc] initWithDictionary:returnValue[@"data"] error:nil];
[weakSelf.messageArray addObjectsFromArray:weakSelf.resultModel.noticeEntity]; [weakSelf.messageArray addObjectsFromArray:weakSelf.resultModel.noticeEntity];
[weakSelf.meesageTableView reloadData]; [weakSelf.meesageTableView reloadData];
}else {
[XBLoadingView showHUDViewWithText:returnValue[@"message"]];
} }
} withFailureBlock:^(NSError *error) { } withFailureBlock:^(NSError *error) {
...@@ -174,10 +178,26 @@ ...@@ -174,10 +178,26 @@
- (void)timeOrderClickAction:(UIButton *)sender - (void)timeOrderClickAction:(UIButton *)sender
{ {
sender.selected = !sender.selected; sender.selected = !sender.selected;
self.messageModel.page.order = sender.selected?SORTDIRECTION_DESC:SORTDIRECTION_ASC; self.messageModel.order = sender.selected?SORTDIRECTION_ASC:SORTDIRECTION_DESC;
[self.meesageTableView.mj_header beginRefreshing]; [self.meesageTableView.mj_header beginRefreshing];
} }
#pragma mark -友好界面
- (UIImage *)imageForEmptyDataSet:(UIScrollView *)scrollView
{
return kNoDataImage;
}
- (BOOL)emptyDataSetShouldAllowScroll:(UIScrollView *)scrollView
{
return YES;
}
- (NSAttributedString *)titleForEmptyDataSet:(UIScrollView *)scrollView
{
return [[NSAttributedString alloc]initWithString:@"暂无数据" attributes:nil];
}
#pragma mark -lazy #pragma mark -lazy
- (NoticeCondition *)messageModel - (NoticeCondition *)messageModel
{ {
...@@ -186,9 +206,9 @@ ...@@ -186,9 +206,9 @@
DataPage *page = [[DataPage alloc] init]; DataPage *page = [[DataPage alloc] init];
page.page = ZERO; page.page = ZERO;
page.rows = KROWS; page.rows = KROWS;
page.sort = SORTDIRECTION_DESC; _messageModel.sort = @"createDate";
_messageModel.order = SORTDIRECTION_DESC;
_messageModel.page = page; _messageModel.page = page;
_messageModel.employeeId = [Shoppersmanager manager].Shoppers.employee.fid; _messageModel.employeeId = [Shoppersmanager manager].Shoppers.employee.fid;
} }
return _messageModel; return _messageModel;
......
...@@ -343,7 +343,8 @@ ...@@ -343,7 +343,8 @@
{ {
WS(weakSelf); WS(weakSelf);
[XBLoadingView showHUDViewWithDefault]; [XBLoadingView showHUDViewWithDefault];
[HTTP networkWithDictionaryRequestWithURL:[NSString stringWithFormat:@"%@%@",SERVERREQUESTURL(BARCODESEARCH),_barcode] withRequestType:ONE withParameter:nil withReturnValueBlock:^(id returnValue) { NSString *urlString = [NSString stringWithFormat:@"%@%@",SERVERREQUESTURL(BARCODESEARCH),self.barcode];
[HTTP networkWithDictionaryRequestWithURL:[self returnUrlString:urlString] withRequestType:ONE withParameter:nil withReturnValueBlock:^(id returnValue) {
[weakSelf endRefreshingForTableView:self.productCollectionView]; [weakSelf endRefreshingForTableView:self.productCollectionView];
[XBLoadingView hideHUDViewWithDefault]; [XBLoadingView hideHUDViewWithDefault];
......
...@@ -289,9 +289,10 @@ ...@@ -289,9 +289,10 @@
QRViewController *qrVC = [[QRViewController alloc] initWithScanCompleteHandler:^(NSString *url) { QRViewController *qrVC = [[QRViewController alloc] initWithScanCompleteHandler:^(NSString *url) {
[weakSelf dismissViewControllerAnimated:YES completion:^{ [weakSelf dismissViewControllerAnimated:YES completion:^{
ProductLibraryViewController *product = [SHARED_APPDELEGATE.allControllerArray objectAtIndex_opple:4]; ProductLibraryViewController *product = [SHARED_APPDELEGATE.allControllerArray objectAtIndex_opple:8];
product.barcode = url; product.barcode = url;
weakSelf.selectedIndex = 3; SHARED_APPDELEGATE.lineView.hidden = YES;
weakSelf.selectedIndex = 8;
}]; }];
}]; }];
dispatch_async(dispatch_get_main_queue(), ^{ dispatch_async(dispatch_get_main_queue(), ^{
......
...@@ -1053,6 +1053,7 @@ ...@@ -1053,6 +1053,7 @@
2928F7DD1CD085430036D761 /* Class */ = { 2928F7DD1CD085430036D761 /* Class */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
29CA910E1E665F38002EA601 /* Home */,
29AB91DA1E553A31003A3A08 /* Message */, 29AB91DA1E553A31003A3A08 /* Message */,
29AB91E61E553B7C003A3A08 /* PerfectInformation */, 29AB91E61E553B7C003A3A08 /* PerfectInformation */,
29C0E7411DD98917006CCCF9 /* Announcement */, 29C0E7411DD98917006CCCF9 /* Announcement */,
...@@ -2244,6 +2245,29 @@ ...@@ -2244,6 +2245,29 @@
name = view; name = view;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
29CA910E1E665F38002EA601 /* Home */ = {
isa = PBXGroup;
children = (
29CA910F1E665F38002EA601 /* Cells */,
29CA91101E665F38002EA601 /* Controllers */,
);
path = Home;
sourceTree = "<group>";
};
29CA910F1E665F38002EA601 /* Cells */ = {
isa = PBXGroup;
children = (
);
path = Cells;
sourceTree = "<group>";
};
29CA91101E665F38002EA601 /* Controllers */ = {
isa = PBXGroup;
children = (
);
path = Controllers;
sourceTree = "<group>";
};
29D260EF1CEEAA5000A9787D /* FullScreen */ = { 29D260EF1CEEAA5000A9787D /* FullScreen */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<key>CFBundleName</key> <key>CFBundleName</key>
<string>欧立方</string> <string>欧立方</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>2.0.4</string> <string>2.0.5</string>
<key>CFBundleURLTypes</key> <key>CFBundleURLTypes</key>
<array> <array>
<dict> <dict>
......
...@@ -2058,9 +2058,20 @@ extern NSString * const GRADEMETHOD_MANUL; ...@@ -2058,9 +2058,20 @@ extern NSString * const GRADEMETHOD_MANUL;
* *
*/ */
@property (nonatomic, copy) NSString *employeeId; @property (nonatomic, copy) NSString *employeeId;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *order;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *sort;
@end /* interface NoticeCondition */ @end /* interface NoticeCondition */
/** /**
* (no documentation provided) * (no documentation provided)
*/ */
......
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