Skip to content

Commit 8d5a5b5

Browse files
author
pifupro_iOS_admin
committed
change the db get mothed
1 parent b2cde31 commit 8d5a5b5

File tree

7 files changed

+84
-67
lines changed

7 files changed

+84
-67
lines changed

‎CollectionViewClassifyMenu.xcodeproj/xcuserdata/chenyilong.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

Lines changed: 49 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -100,11 +100,11 @@
100100
moduleName = "CollectionViewClassifyMenu"
101101
usesParentBreakpointCondition = "Yes"
102102
urlString = "file:///Users/chenyilong/Documents/Demo/CollectionViewClassifyMenu/CollectionViewClassifyMenu/Class/ClassifyMenu(%E4%B8%A4%E7%BA%A7%E5%8F%AF%E6%8A%98%E5%8F%A0%E8%8F%9C%E5%8D%95)/Controller/CYLClassifyMenuViewController.m"
103-
timestampString = "452072925.853516"
103+
timestampString = "452539111.365578"
104104
startingColumnNumber = "9223372036854775807"
105105
endingColumnNumber = "9223372036854775807"
106-
startingLineNumber = "436"
107-
endingLineNumber = "436"
106+
startingLineNumber = "435"
107+
endingLineNumber = "435"
108108
offsetFromSymbolStart = "104">
109109
</Location>
110110
<Location
@@ -115,26 +115,26 @@
115115
moduleName = "CollectionViewClassifyMenu"
116116
usesParentBreakpointCondition = "Yes"
117117
urlString = "file:///Users/chenyilong/Documents/Demo/CollectionViewClassifyMenu/CollectionViewClassifyMenu/Class/ClassifyMenu(%E4%B8%A4%E7%BA%A7%E5%8F%AF%E6%8A%98%E5%8F%A0%E8%8F%9C%E5%8D%95)/Controller/CYLClassifyMenuViewController.m"
118-
timestampString = "452072925.854097"
118+
timestampString = "452539111.365758"
119119
startingColumnNumber = "9223372036854775807"
120120
endingColumnNumber = "9223372036854775807"
121-
startingLineNumber = "436"
122-
endingLineNumber = "436"
121+
startingLineNumber = "435"
122+
endingLineNumber = "435"
123123
offsetFromSymbolStart = "112">
124124
</Location>
125125
<Location
126126
shouldBeEnabled = "Yes"
127127
ignoreCount = "0"
128128
continueAfterRunningActions = "No"
129-
symbolName = "__55-[CYLClassifyMenuViewController showLineSwitchClicked:]_block_invoke267"
129+
symbolName = "__55-[CYLClassifyMenuViewController showLineSwitchClicked:]_block_invoke257"
130130
moduleName = "CollectionViewClassifyMenu"
131131
usesParentBreakpointCondition = "Yes"
132132
urlString = "file:///Users/chenyilong/Documents/Demo/CollectionViewClassifyMenu/CollectionViewClassifyMenu/Class/ClassifyMenu(%E4%B8%A4%E7%BA%A7%E5%8F%AF%E6%8A%98%E5%8F%A0%E8%8F%9C%E5%8D%95)/Controller/CYLClassifyMenuViewController.m"
133-
timestampString = "452072925.854286"
133+
timestampString = "452539111.36627"
134134
startingColumnNumber = "9223372036854775807"
135135
endingColumnNumber = "9223372036854775807"
136-
startingLineNumber = "437"
137-
endingLineNumber = "437"
136+
startingLineNumber = "436"
137+
endingLineNumber = "436"
138138
offsetFromSymbolStart = "24">
139139
</Location>
140140
</Locations>
@@ -163,30 +163,62 @@
163163
moduleName = "CollectionViewClassifyMenu"
164164
usesParentBreakpointCondition = "Yes"
165165
urlString = "file:///Users/chenyilong/Documents/Demo/CollectionViewClassifyMenu/CollectionViewClassifyMenu/Class/ClassifyMenu(%E4%B8%A4%E7%BA%A7%E5%8F%AF%E6%8A%98%E5%8F%A0%E8%8F%9C%E5%8D%95)/Controller/CYLClassifyMenuViewController.m"
166-
timestampString = "452072925.855558"
166+
timestampString = "452539111.45367"
167167
startingColumnNumber = "9223372036854775807"
168168
endingColumnNumber = "9223372036854775807"
169-
startingLineNumber = "252"
170-
endingLineNumber = "252"
169+
startingLineNumber = "253"
170+
endingLineNumber = "253"
171171
offsetFromSymbolStart = "476">
172172
</Location>
173173
<Location
174174
shouldBeEnabled = "Yes"
175175
ignoreCount = "0"
176176
continueAfterRunningActions = "No"
177-
symbolName = "__64-[CYLClassifyMenuViewController judgeMoreBtnShowWhenShowTwoLine]_block_invoke153"
177+
symbolName = "__64-[CYLClassifyMenuViewController judgeMoreBtnShowWhenShowTwoLine]_block_invoke141"
178178
moduleName = "CollectionViewClassifyMenu"
179179
usesParentBreakpointCondition = "Yes"
180180
urlString = "file:///Users/chenyilong/Documents/Demo/CollectionViewClassifyMenu/CollectionViewClassifyMenu/Class/ClassifyMenu(%E4%B8%A4%E7%BA%A7%E5%8F%AF%E6%8A%98%E5%8F%A0%E8%8F%9C%E5%8D%95)/Controller/CYLClassifyMenuViewController.m"
181-
timestampString = "452072925.85576"
181+
timestampString = "452539111.453835"
182182
startingColumnNumber = "9223372036854775807"
183183
endingColumnNumber = "9223372036854775807"
184-
startingLineNumber = "252"
185-
endingLineNumber = "252"
184+
startingLineNumber = "253"
185+
endingLineNumber = "253"
186186
offsetFromSymbolStart = "72">
187187
</Location>
188188
</Locations>
189189
</BreakpointContent>
190190
</BreakpointProxy>
191+
<BreakpointProxy
192+
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
193+
<BreakpointContent
194+
shouldBeEnabled = "No"
195+
ignoreCount = "0"
196+
continueAfterRunningActions = "No"
197+
filePath = "CollectionViewClassifyMenu/Class/Other/Tool/CYLDBManager.m"
198+
timestampString = "452539886.318811"
199+
startingColumnNumber = "9223372036854775807"
200+
endingColumnNumber = "9223372036854775807"
201+
startingLineNumber = "74"
202+
endingLineNumber = "74"
203+
landmarkName = "+allTags"
204+
landmarkType = "5">
205+
</BreakpointContent>
206+
</BreakpointProxy>
207+
<BreakpointProxy
208+
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
209+
<BreakpointContent
210+
shouldBeEnabled = "Yes"
211+
ignoreCount = "0"
212+
continueAfterRunningActions = "No"
213+
filePath = "CollectionViewClassifyMenu/Class/Other/Tool/CYLDBManager.m"
214+
timestampString = "452539098.591385"
215+
startingColumnNumber = "9223372036854775807"
216+
endingColumnNumber = "9223372036854775807"
217+
startingLineNumber = "50"
218+
endingLineNumber = "50"
219+
landmarkName = "+dataSource"
220+
landmarkType = "5">
221+
</BreakpointContent>
222+
</BreakpointProxy>
191223
</Breakpoints>
192224
</Bucket>

‎CollectionViewClassifyMenu/Class/ClassifyMenu(两级可折叠菜单)/Controller/CYLClassifyMenuViewController.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ - (void)initData {
123123
self.firstLineCellCountArray = nil;
124124
self.collectionHeaderMoreBtnHideBoolArray = nil;
125125
self.rowLine = 0;
126-
self.dataSource = [NSArray arrayWithArray:[[CYLDBManager sharedCYLDBManager] getDataSource]];
126+
self.dataSource = [NSArray arrayWithArray:[CYLDBManager dataSource]];
127127
}
128128

129129
- (float)checkCellLimitWidth:(float)cellWidth isLimitWidth:(ISLimitWidth)isLimitWidth {

‎CollectionViewClassifyMenu/Class/MultipleFilter(侧边栏多项筛选)/Controller/CYLMultipleFilterController.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ - (NSUInteger)secondSectionTagsCount
5252
{
5353
if (_secondSectionTagsCount == 0) {
5454
NSMutableArray *types = [NSMutableArray arrayWithObject:@"全部"];
55-
[types addObjectsFromArray:[[CYLDBManager sharedCYLDBManager] getAllSkillTags]];
55+
[types addObjectsFromArray:[CYLDBManager allTags]];
5656
_secondSectionTagsCount = [types count];
5757
}
5858
return _secondSectionTagsCount;
@@ -255,7 +255,7 @@ - (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSe
255255
{
256256
if (section == 1) {
257257
NSMutableArray *types = [NSMutableArray arrayWithObject:@"全部"];
258-
[types addObjectsFromArray:[[CYLDBManager sharedCYLDBManager] getAllSkillTags]];
258+
[types addObjectsFromArray:[CYLDBManager allTags]];
259259
return [types count];
260260
}
261261
return 2;

‎CollectionViewClassifyMenu/Class/MultipleFilter(侧边栏多项筛选)/Other/Tool/CYLFilterParamsTool.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ - (NSMutableArray *)filterParamsArray
6565
if (_filterParamsArray == nil) {
6666
NSMutableArray *state = [NSMutableArray arrayWithObjects:@1, @0,nil];
6767
NSMutableArray *types = [NSMutableArray arrayWithObject:@(1)];
68-
NSArray *symptoms = [[CYLDBManager sharedCYLDBManager] getAllSkillTags];
68+
NSArray *symptoms = [CYLDBManager allTags];
6969
[symptoms enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) {
7070
[types addObject:@0];
7171
}];
@@ -105,7 +105,7 @@ - (NSArray *)dataSources
105105

106106
NSMutableArray *hospitals = [NSMutableArray arrayWithObjects:@"全部", @"请选择", nil];
107107
NSMutableArray *skillTypes = [NSMutableArray arrayWithObject:@"全部"];
108-
[skillTypes addObjectsFromArray:[[CYLDBManager sharedCYLDBManager] getAllSkillTags]];
108+
[skillTypes addObjectsFromArray:[CYLDBManager allTags]];
109109
_dataSources = [[NSArray alloc] initWithObjects:hospitals,skillTypes,nil];
110110
}
111111
return _dataSources;

‎CollectionViewClassifyMenu/Class/Other/Symtem/AppDelegate.m

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ @interface AppDelegate ()
1616

1717
@implementation AppDelegate
1818

19+
1920
- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
2021
//work in application:didFinishLaunchingWithOptions
2122
if([UINavigationBar conformsToProtocol:@protocol(UIAppearanceContainer)]) {

‎CollectionViewClassifyMenu/Class/Other/Tool/CYLDBManager.h

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,7 @@ extern NSString *const kDataSourceCellPictureKey;
1414

1515
@interface CYLDBManager : NSObject
1616

17-
- (NSMutableArray *)dataSource;
18-
- (NSMutableArray *)allSkills;
19-
+ (id)sharedCYLDBManager;
20-
- (NSArray *)getAllSkillTags;
21-
- (NSArray *)getDataSource;
17+
+ (NSMutableArray *)dataSource;
18+
+ (NSMutableArray *)allTags;
2219

2320
@end

‎CollectionViewClassifyMenu/Class/Other/Tool/CYLDBManager.m

Lines changed: 27 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -15,72 +15,59 @@
1515
@interface CYLDBManager()
1616

1717
@property (nonatomic, strong) NSMutableArray *dataSource;
18-
@property (nonatomic, strong) NSMutableArray *allSkills;
18+
@property (nonatomic, strong) NSMutableArray *allTags;
1919

2020
@end
2121

2222
@implementation CYLDBManager
2323

2424
@synthesize dataSource = _dataSource;
25-
@synthesize allSkills = _allSkills;
25+
@synthesize allTags = _allTags;
2626

27-
+ (id)sharedCYLDBManager
28-
{
29-
static dispatch_once_t onceQueue;
30-
static CYLDBManager *cYLDBManager = nil;
31-
32-
dispatch_once(&onceQueue, ^{ cYLDBManager = [[self alloc] init]; });
33-
return cYLDBManager;
34-
}
35-
36-
37-
- (NSArray *)getDataSource {
38-
return (NSArray *)self.dataSource;
39-
}
40-
41-
- (NSArray *)getAllSkillTags {
42-
return (NSArray *)self.allSkills;
43-
}
4427
/**
4528
* 懒加载_dataSource
4629
*
4730
* @return NSMutableArray
4831
*/
49-
- (NSMutableArray *)dataSource
32+
+ (NSMutableArray *)dataSource
5033
{
51-
if (_dataSource == nil) {
52-
_dataSource = [[NSMutableArray alloc] init];
53-
NSString *filePath = [[NSBundle mainBundle] pathForResource:@"data.json" ofType:nil];
54-
NSData *data = [[NSFileManager defaultManager] contentsAtPath:filePath];
55-
NSError *error;
56-
if (data) {
57-
_dataSource = [NSJSONSerialization JSONObjectWithData:data options:kNilOptions error:&error];
58-
}
59-
}
60-
return _dataSource;
34+
static NSMutableArray *dataSource = nil;
35+
static dispatch_once_t dataSourceOnceToken;
36+
dispatch_once(&dataSourceOnceToken,^{
37+
NSString *filePath = [[NSBundle mainBundle] pathForResource:@"data.json" ofType:nil];
38+
NSData *data = [[NSFileManager defaultManager] contentsAtPath:filePath];
39+
NSError *error;
40+
if (data) {
41+
dataSource = [NSJSONSerialization JSONObjectWithData:data options:kNilOptions error:&error];
42+
}
43+
});
44+
45+
return dataSource;
46+
6147
}
6248

6349
/**
64-
* 懒加载_allSkills
50+
* 懒加载_allTags
6551
*
6652
* @return NSMutableArray
6753
*/
68-
- (NSMutableArray *)allSkills
54+
+ (NSMutableArray *)allTags
6955
{
70-
if (_allSkills == nil) {
71-
_allSkills = [[NSMutableArray alloc] init];
72-
__weak __typeof(self) weakSelf = self;
73-
[self.dataSource enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) {
56+
static NSMutableArray *allTags = nil;
57+
static dispatch_once_t allTagsOnceToken;
58+
dispatch_once(&allTagsOnceToken,^{
59+
allTags = [NSMutableArray array];
60+
[[[self class] dataSource] enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) {
7461
@autoreleasepool {
7562
NSArray *symptoms = [NSArray arrayWithArray:[obj objectForKey:kDataSourceSectionKey]];
7663
[symptoms enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) {
77-
__strong typeof(self) strongSelf = weakSelf;
78-
[strongSelf->_allSkills addObject:[obj objectForKey:kDataSourceCellTextKey]];
64+
[allTags addObject:[obj objectForKey:kDataSourceCellTextKey]];
7965
}];
8066
}
8167
}];
82-
}
83-
return _allSkills;
68+
});
69+
70+
return allTags;
8471
}
8572

8673
@end

0 commit comments

Comments
 (0)