Merge branch 'master' of ssh://193.112.35.168:29418/fanliquan

重庆迈尖科技有限公司

2018-08-14 02d5ce9e2d6a8a726ae101ab68ef0b606f41b996

Merge branch 'master' of ssh://193.112.35.168:29418/fanliquan

# Conflicts:
#	MIduo.xcworkspace/xcuserdata/mj.xcuserdatad/UserInterfaceState.xcuserstate

 MIduo.xcworkspace/xcuserdata/mj.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -4,22 +4,6 @@
   version = "2.0">
   <Breakpoints>
      <BreakpointProxy
         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
         <BreakpointContent
            shouldBeEnabled = "Yes"
            ignoreCount = "0"
            continueAfterRunningActions = "No"
            filePath = "MIduo/&#x754c;&#x9762;/&#x641c;&#x7d22;/SideSlipPriceTableViewCell.m"
            timestampString = "555308071.195657"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
            startingLineNumber = "123"
            endingLineNumber = "123"
            landmarkName = "-onChangeTextLocation"
            landmarkType = "7">
         </BreakpointContent>
      </BreakpointProxy>
      <BreakpointProxy
         BreakpointExtensionID = "Xcode.Breakpoint.ExceptionBreakpoint">
         <BreakpointContent
            shouldBeEnabled = "Yes"
@@ -27,22 +11,6 @@
            continueAfterRunningActions = "No"
            scope = "0"
            stopOnStyle = "0">
         </BreakpointContent>
      </BreakpointProxy>
      <BreakpointProxy
         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
         <BreakpointContent
            shouldBeEnabled = "Yes"
            ignoreCount = "0"
            continueAfterRunningActions = "No"
            filePath = "MIduo/&#x754c;&#x9762;/&#x7f51;&#x9875;&#x89c6;&#x56fe;/OrderViewController.m"
            timestampString = "555318158.330016"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
            startingLineNumber = "233"
            endingLineNumber = "233"
            landmarkName = "-getTiChengOrderList"
            landmarkType = "7">
         </BreakpointContent>
      </BreakpointProxy>
   </Breakpoints>

 MIduo/Êý¾Ý/Common.h

@@ -64,6 +64,7 @@
#import "FileSignature.h"
#import <SDAutoLayout/SDAutoLayout.h>
#import "CustomProgressHUD.h"
#import "ZYSideSlipFilterManger.h"

//设置里面的web网页链接
#define changjianwenti [NSString stringWithFormat:@"http://video.yeshitv.com:8089/BuWan/api_question_ios.jsp?package=%@",[[NSBundle mainBundle] bundleIdentifier]]//常见问题

 MIduo/Êý¾Ý/lib/ZYSideSlipFilter/ZYSideSlipFilter/Classes/Config/ZYSideSlipFilterManger.h

@@ -10,6 +10,9 @@

@interface ZYSideSlipFilterManger : NSObject

@property (nonatomic, copy, nullable) NSString *minPrice;
@property (nonatomic, copy, nullable) NSString *maxPrice;

+ (instancetype)shareinstance;

@end

 MIduo/Êý¾Ý/lib/ZYSideSlipFilter/ZYSideSlipFilter/Classes/Config/ZYSideSlipFilterManger.m

@@ -33,7 +33,15 @@
    return manager;
}

- (id)copyWithZone:(NSZone *)zone {

    return [ZYSideSlipFilterManger shareinstance];
}

- (id)mutableCopyWithZone:(NSZone *)zone{
    
    return [ZYSideSlipFilterManger shareinstance];
}

// ä½¿ç”¨åŒæ­¥é”ä¿è¯init创建唯一单例 ( ä¸Žonce效果相同 )
- (instancetype)init{

 MIduo/Êý¾Ý/lib/ZYSideSlipFilter/ZYSideSlipFilter/Classes/Controller/ZYSideSlipFilterController.m

@@ -13,9 +13,7 @@
#import "ZYSideSlipFilterConfig.h"
#import "UIColor+hexColor.h"
#import "objc/runtime.h"

#define SCREEN_WIDTH [[UIScreen mainScreen] bounds].size.width
#define SCREEN_HEIGHT [[UIScreen mainScreen] bounds].size.height
#import "Algorithm.h"

#define WIDTH KScreenW * (1 - 0.15)
#define SLIP_ORIGIN_FRAME CGRectMake(SCREEN_WIDTH, 0, SCREEN_WIDTH - _sideSlipLeading, SCREEN_HEIGHT)
@@ -195,6 +193,10 @@
}

- (void)clickResetButton:(id)sender {
    
    [ZYSideSlipFilterManger shareinstance].minPrice = nil;
    [ZYSideSlipFilterManger shareinstance].maxPrice = nil;
    
    _resetBlock(_dataList);
    [[NSNotificationCenter defaultCenter] postNotificationName:FILTER_NOTIFICATION_NAME_DID_RESET_DATA object:nil];
    [_mainTableView reloadData];
@@ -203,6 +205,19 @@
- (void)clickCommitButton:(id)sender {
    _commitBlock(_dataList);
    [[NSNotificationCenter defaultCenter] postNotificationName:FILTER_NOTIFICATION_NAME_DID_COMMIT_DATA object:nil];
    
    if ([ZYSideSlipFilterManger shareinstance].minPrice != 0 && [ZYSideSlipFilterManger shareinstance].maxPrice.length != 0) {
        
        NSString *result = [Algorithm compareSize:[ZYSideSlipFilterManger shareinstance].minPrice count2:[ZYSideSlipFilterManger shareinstance].maxPrice];
        
        if ([result isEqualToString:@"大于"]) {
            
            NSString *temp = [ZYSideSlipFilterManger shareinstance].minPrice;
            [ZYSideSlipFilterManger shareinstance].minPrice = [ZYSideSlipFilterManger shareinstance].maxPrice;
            [ZYSideSlipFilterManger shareinstance].maxPrice = temp;
        }
    }
    
}

- (void)clickBackCover:(id)sender {

 MIduo/½çÃæ/ÎÒµÄ/balance/Ã÷ϸ/BalaDetailViewController.m

@@ -129,12 +129,19 @@
    [_backView addSubview:imageview];
    _backView.hidden = YES;
    
    UILabel *label = [[UILabel alloc]initWithFrame:CGRectMake(0, CGRectGetMaxY(imageview.frame), KScreenW, 30)];
    UILabel *label = [[UILabel alloc] init];
    label.textColor = SJColor(98, 98, 98, 1);
    label.font = [UIFont systemFontOfSize:16];
    label.textAlignment = NSTextAlignmentCenter;
    label.text = @"暂无数据哟～～";
    label.text = @"您的资金目前还没有收支记录，不如咱们先去买买买";
    [_backView addSubview:label];
    
    label.sd_layout
    .leftSpaceToView(_backView, 30)
    .rightSpaceToView(_backView, 30)
    .topSpaceToView(imageview, 10)
    .autoHeightRatio(0);
    
    return _backView;
}
- (void)didReceiveMemoryWarning {

 MIduo/½çÃæ/ÎÒµÄ/message/MineMessageViewController.m

@@ -15,6 +15,7 @@
}
@property (nonatomic, strong) UITableView *messageTableView;
@property (nonatomic, strong) NSMutableArray *datasource;
@property (nonatomic,strong) UIView *backView;

@property (nonatomic, assign) NSInteger count;
@end
@@ -30,6 +31,7 @@
    _pageNumber = 1;
    [self CreatNavigationBar];
    [self.view addSubview:self.messageTableView];
    [self.view addSubview:self.backView];
}
- (void)viewWillAppear:(BOOL)animated{
    
@@ -48,13 +50,22 @@
    [dic setObject:[NSString stringWithFormat:@"%ld",(long)_pageNumber] forKey:@"page"];
    [dic setObject:[[NSUserDefaults standardUserDefaults] objectForKey:@"userId"] forKey:@"uid"];
    [JYNetWorking Post:[NSString stringWithFormat:@"%@/%@",domainHTTP,@"customer/findAccountMessageList"] param:dic success:^(NSDictionary *object) {
        NSLog(@"%@",object);

        NSDictionary *dic = object[@"data"];
        
        self.count = [dic[@"count"] integerValue];

        [self.datasource addObjectsFromArray:dic[@"list"]];
        
        if (self.datasource.count == 0) {
            
            self.backView.hidden  = NO;
            
        } else {
            
            self.backView.hidden  = YES;
        }
        
        [self.messageTableView reloadData];
        [self.messageTableView.mj_header endRefreshing];
        [self.messageTableView.mj_footer endRefreshing];
@@ -79,7 +90,6 @@
    } else {
        
        return 0;
        
    }
}

@@ -156,6 +166,33 @@
    return _messageTableView;
}

- (UIView *)backView{
    if (_backView) {
        return _backView;
    }
    _backView = [[UIView alloc]initWithFrame:CGRectMake(0, 0, KScreenW, KScreenH)];
    _backView.backgroundColor = [UIColor whiteColor];
    UIImageView *imageview = [[UIImageView alloc]initWithFrame:CGRectMake((KScreenW - 170) / 2, 100, 170, 149)];
    imageview.image = [UIImage imageNamed:@"没有数据"];
    [_backView addSubview:imageview];
    _backView.hidden = YES;
    
    UILabel *label = [[UILabel alloc] init];
    label.textColor = SJColor(98, 98, 98, 1);
    label.font = [UIFont systemFontOfSize:16];
    label.textAlignment = NSTextAlignmentCenter;
    label.text = @"您目前还未收到任何消息，空空如也~";
    [_backView addSubview:label];
    
    label.sd_layout
    .leftSpaceToView(_backView, 30)
    .rightSpaceToView(_backView, 30)
    .topSpaceToView(imageview, 10)
    .autoHeightRatio(0);
    
    return _backView;
}

- (void)didReceiveMemoryWarning {
    [super didReceiveMemoryWarning];
    // Dispose of any resources that can be recreated.

 MIduo/½çÃæ/ËÑË÷/SideSlipPriceTableViewCell.m

@@ -12,7 +12,6 @@
#import "ZYSideSlipFilterConfig.h"
#import "Algorithm.h"


#define TEXTFIELD_MAX_LENGTH 6

#define ACCESSORY_VIEW_HEIGHT 34
@@ -48,10 +47,17 @@
    UIView *keyBoardAccessoryView = [self createKeyBoardAccessoryView];
    _minTextField.inputAccessoryView = keyBoardAccessoryView;
    _maxTextField.inputAccessoryView = keyBoardAccessoryView;
    
   
}

- (void)updateCellWithModel:(ZYSideSlipFilterRegionModel *__autoreleasing *)model
                  indexPath:(NSIndexPath *)indexPath {
    
    _minTextField.text = [ZYSideSlipFilterManger shareinstance].minPrice;
    
    _maxTextField.text = [ZYSideSlipFilterManger shareinstance].maxPrice;
    
    self.regionModel = *model;
}

@@ -89,8 +95,10 @@
    PriceRangeModel *model = [[PriceRangeModel alloc] init];
    model.minPrice = [_minTextField.text stringByReplacingOccurrencesOfString:@" " withString:@""];
    model.maxPrice = [_maxTextField.text stringByReplacingOccurrencesOfString:@" " withString:@""];
    self.minPrice = [_minTextField.text stringByReplacingOccurrencesOfString:@" " withString:@""];
    self.maxPrice = [_maxTextField.text stringByReplacingOccurrencesOfString:@" " withString:@""];
    
    [ZYSideSlipFilterManger shareinstance].minPrice = [_minTextField.text stringByReplacingOccurrencesOfString:@" " withString:@""];
    [ZYSideSlipFilterManger shareinstance].maxPrice = [_maxTextField.text stringByReplacingOccurrencesOfString:@" " withString:@""];
    
    NSMutableDictionary *mutDict = [NSMutableDictionary dictionaryWithDictionary:_regionModel.customDict];
    [mutDict setValue:model forKey:PRICE_RANGE_MODEL];
    _regionModel.customDict = [mutDict copy];
@@ -116,23 +124,7 @@
    [_maxTextField resignFirstResponder];
}

- (void)onChangeTextLocation {
    
    if (_minPrice != 0 && _maxPrice.length != 0) {
        
        NSString *result = [Algorithm compareSize:_minPrice count2:_maxPrice];
        
        if ([result isEqualToString:@"大于"]) {
            
            _minTextField.text = _maxPrice;
            _maxTextField.text = _minPrice;
            
            NSString *temp = _minPrice;
            _minPrice = _maxPrice;
            _maxPrice = temp;
        }
    }
}

- (void)awakeFromNib {
    [super awakeFromNib];

 MIduo/½çÃæ/ËÑË÷/searchDetailViewController.m

@@ -205,6 +205,8 @@
    maxPrice=nil;
    _filterData=nil;
    [fastFilterArr removeAllObjects];
    [ZYSideSlipFilterManger shareinstance].minPrice = nil;
    [ZYSideSlipFilterManger shareinstance].maxPrice = nil;
    
    [_searchField.Field resignFirstResponder];
    [_suggestTableview setHidden:YES];
@@ -383,6 +385,7 @@
            break;
        case 608:{//筛选按钮
            [_filterController show];
            [_filterController reloadData];
        }
            break;
        default:
@@ -416,6 +419,9 @@
            maxPrice = temp;
        }
    }
    
    [ZYSideSlipFilterManger shareinstance].minPrice = minPrice;
    [ZYSideSlipFilterManger shareinstance].maxPrice = maxPrice;
    
    [_detailCollectionView.mj_header beginRefreshing];
}
@@ -477,11 +483,21 @@
        if (priceRangeModel) {
            
            [priceRangeString appendFormat:@"%@ - %@", priceRangeModel.minPrice, priceRangeModel.maxPrice];
            self->minPrice = priceRangeModel.minPrice;
            self->maxPrice = priceRangeModel.maxPrice;
            
            self.minPriceTextField.text = priceRangeModel.minPrice;
            self.maxPriceTextField.text = priceRangeModel.maxPrice;
            
            if (priceRangeModel.minPrice != 0 && priceRangeModel.maxPrice != 0) {
                
                NSString *result = [Algorithm compareSize:priceRangeModel.minPrice count2:priceRangeModel.maxPrice];
                
                if ([result isEqualToString:@"大于"]) {
                    
                    self->minPrice = priceRangeModel.maxPrice;
                    self->maxPrice = priceRangeModel.minPrice;
                    
                    self.minPriceTextField.text = priceRangeModel.maxPrice;
                    self.maxPriceTextField.text = priceRangeModel.minPrice;
                }
            }
        }
        NSLog(@"%@", priceRangeString);
        
@@ -510,7 +526,7 @@
            self->pagenumber=0;
            [self->_detailCollectionView.mj_header beginRefreshing];
        }
        [self->_filterController dismiss];
        [self.filterController dismiss];
    }];
    _filterController.animationDuration = .3f;
    _filterController.sideSlipLeading = 0.15*[UIScreen mainScreen].bounds.size.width;
@@ -518,6 +534,7 @@
    [_filterController setTitle:@"筛选"];
}

#pragma mark -商品筛选配置
- (void)packageDataList {
    NSMutableArray *dataArray = [NSMutableArray array];
    [dataArray addObject:[self priceFilterRegionModel]];

 MIduo/½çÃæ/Ê×Ò³/thirdClassificationViewController.m

@@ -248,6 +248,7 @@
            break;
        case 608:{//筛选按钮
            [_filterController show];
            [_filterController reloadData];
        }
            break;
        default:
@@ -281,6 +282,9 @@
            maxPrice = temp;
        }
    }
    
    [ZYSideSlipFilterManger shareinstance].minPrice = minPrice;
    [ZYSideSlipFilterManger shareinstance].maxPrice = maxPrice;
    
    [_detailCollectionView.mj_header beginRefreshing];
}
@@ -339,8 +343,20 @@
        NSMutableString *priceRangeString = [NSMutableString stringWithString:@"\n价格区间: "];
        if (priceRangeModel) {
            [priceRangeString appendFormat:@"%@ - %@", priceRangeModel.minPrice, priceRangeModel.maxPrice];
            self->minPrice = priceRangeModel.minPrice;
            self->maxPrice = priceRangeModel.maxPrice;
            
            if (priceRangeModel.minPrice != 0 && priceRangeModel.maxPrice != 0) {
                
                NSString *result = [Algorithm compareSize:priceRangeModel.minPrice count2:priceRangeModel.maxPrice];
                
                if ([result isEqualToString:@"大于"]) {
                    
                    self->minPrice = priceRangeModel.maxPrice;
                    self->maxPrice = priceRangeModel.minPrice;
                    
                    self.minPriceTextField.text = priceRangeModel.maxPrice;
                    self.maxPriceTextField.text = priceRangeModel.minPrice;
                }
            }
        }
        NSLog(@"%@", priceRangeString);
        
@@ -482,8 +498,8 @@
#pragma mark -商品筛选配置
- (void)packageDataList {
    NSMutableArray *dataArray = [NSMutableArray array];
    [dataArray addObject:[self spaceFilterRegionModel]];
    [dataArray addObject:[self priceFilterRegionModel]];
    [dataArray addObject:[self spaceFilterRegionModel]];
    
    for (int i=0; i<_filterData.count; i++) {
        if ([[_filterData[i] objectForKey:@"selector"] intValue]==0) {