add default values

SunriseOYR · Apr 12, 2019 · 4a0dbf0 · 4a0dbf0
1 parent 926359b
commit 4a0dbf0
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 5 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/SKUDataFilter/ORSKUDataFilter.h b/SKUDataFilter/ORSKUDataFilter.h
@@ -90,6 +90,7 @@
 //当前 结果
 @property (nonatomic, strong, readonly) id currentResult;
 
+@property (nonatomic, assign) BOOL needDefaultValue;
 
 //init
 - (instancetype)initWithDataSource:(id<ORSKUDataFilterDataSource>)dataSource;

diff --git a/SKUDataFilter/ORSKUDataFilter.m b/SKUDataFilter/ORSKUDataFilter.m
@@ -14,13 +14,11 @@ @interface ORSKUDataFilter()
 
 @property (nonatomic, strong) NSMutableArray <NSIndexPath *> *selectedIndexPaths;
 
-
 @property (nonatomic, strong) NSMutableSet <NSIndexPath *> *availableIndexPathsSet;
 
 //全可用的
 @property (nonatomic, strong) NSSet <NSIndexPath *> *allAvailableIndexPaths;
 
-
 @property (nonatomic, strong) id currentResult;
 
 @end
@@ -124,6 +122,12 @@ - (void)initPropertiesSkuListData {
  model.properties = [self propertiesWithConditionRawData:conditions];
  model.result = [_dataSource filter:self resultOfConditionForRow:i];
 
+ if (self.selectedIndexPaths.count == 0 && _needDefaultValue) {
+ [model.properties enumerateObjectsUsingBlock:^(ORSKUProperty * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
+ [self didSelectedPropertyWithIndexPath:obj.indexPath];
+ }];
+ }
+
  [modelSet addObject:model];
  }
  _conditions = [modelSet copy];
@@ -317,7 +321,18 @@ - (BOOL)isAvailableWithPropertyIndexPath:(NSIndexPath *)indexPath {
 #pragma mark -- setter
 - (void)setDataSource:(id<ORSKUDataFilterDataSource>)dataSource {
  _dataSource = dataSource;
- [self initPropertiesSkuListData];
+ [self reloadData];
+}
+
+- (void)setNeedDefaultValue:(BOOL)needDefaultValue {
+
+ _needDefaultValue = needDefaultValue;
+
+ if (_selectedIndexPaths.count > 0 || !needDefaultValue) {
+ return;
+ }
+
+ [self reloadData];
 }
 
 @end

diff --git a/SKUDataFilterDemo/SKUDataFilterDemo.xcodeproj/project.pbxproj b/SKUDataFilterDemo/SKUDataFilterDemo.xcodeproj/project.pbxproj
@@ -504,7 +504,7 @@
  buildSettings = {
  ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
  CODE_SIGN_STYLE = Automatic;
- DEVELOPMENT_TEAM = 43WNAPBJGK;
+ DEVELOPMENT_TEAM = 44UDNU83L4;
  INFOPLIST_FILE = SKUDataFilterDemo/Info.plist;
  IPHONEOS_DEPLOYMENT_TARGET = 10.0;
  LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
@@ -519,7 +519,7 @@
  buildSettings = {
  ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
  CODE_SIGN_STYLE = Automatic;
- DEVELOPMENT_TEAM = 43WNAPBJGK;
+ DEVELOPMENT_TEAM = 44UDNU83L4;
  INFOPLIST_FILE = SKUDataFilterDemo/Info.plist;
  IPHONEOS_DEPLOYMENT_TARGET = 10.0;
  LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";

diff --git a/...proj/project.xcworkspace/xcuserdata/ouyangrong.xcuserdatad/UserInterfaceState.xcuserstate b/...proj/project.xcworkspace/xcuserdata/ouyangrong.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/...lterDemo.xcodeproj/xcuserdata/ouyangrong.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/...lterDemo.xcodeproj/xcuserdata/ouyangrong.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Bucket
+ type = "1"
+ version = "2.0">
+</Bucket>
diff --git a/SKUDataFilterDemo/SKUDataFilterDemo/ViewController.m b/SKUDataFilterDemo/SKUDataFilterDemo/ViewController.m
@@ -81,6 +81,15 @@ - (void)viewDidLoad {
  [_filter reloadData];
  [self.collectionView reloadData];
 
+
+ //默认选中
+
+ {
+ _filter.needDefaultValue = YES;
+ [self.collectionView reloadData];
+ [self action_complete:nil];
+ }
+
 }
 
 #pragma mark -- collectionView