Skip to content

Commit 6b4edc3

Browse files
committed
Optimizes the method of comparing strings for equality
1 parent 8919389 commit 6b4edc3

1 file changed

Lines changed: 16 additions & 16 deletions

File tree

AAChartKitLib/AAChartConfiger/AAOptions.m

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -120,9 +120,9 @@ + (AAOptions *)configureChartOptionsWithAAChartModel:(AAChartModel *)aaChartMode
120120
.gradientColorEnabledSet(aaChartModel.gradientColorEnabled)//设置主题颜色是否为渐变色
121121
.zoomResetButtonTextSet(aaChartModel.zoomResetButtonText);//设置重置缩放按钮的默认标题
122122

123-
if ( ![aaChartModel.chartType isEqualToString:AAChartTypePie]
124-
&& ![aaChartModel.chartType isEqualToString:AAChartTypePyramid]
125-
&& ![aaChartModel.chartType isEqualToString:AAChartTypeFunnel]) {
123+
if ( aaChartModel.chartType != AAChartTypePie
124+
&& aaChartModel.chartType != AAChartTypePyramid
125+
&& aaChartModel.chartType != AAChartTypeFunnel) {
126126
[self configureAxisContentAndStyleWithAAOptions:aaOptions AAChartModel:aaChartModel];
127127
}
128128

@@ -191,10 +191,10 @@ + (void)configureAxisContentAndStyleWithAAOptions:(AAOptions *)aaOptions AAChart
191191

192192
+ (void)configureTheStyleOfConnectNodeWithChartModel:(AAChartModel *)aaChartModel plotOptions:(AAPlotOptions *)aaPlotOptions {
193193
//数据点标记相关配置,只有线性图(折线图、曲线图、折线区域填充图、曲线区域填充图)才有数据点标记
194-
if ( [aaChartModel.chartType isEqualToString:AAChartTypeArea]
195-
|| [aaChartModel.chartType isEqualToString:AAChartTypeAreaspline]
196-
|| [aaChartModel.chartType isEqualToString:AAChartTypeLine]
197-
|| [aaChartModel.chartType isEqualToString:AAChartTypeSpline]) {
194+
if ( aaChartModel.chartType == AAChartTypeArea
195+
|| aaChartModel.chartType == AAChartTypeAreaspline
196+
|| aaChartModel.chartType == AAChartTypeLine
197+
|| aaChartModel.chartType == AAChartTypeSpline) {
198198
AAMarker *aaMarker = AAObject(AAMarker)
199199
.radiusSet(aaChartModel.markerRadius)//曲线连接点半径,默认是4
200200
.symbolSet(aaChartModel.symbol);//曲线点类型:"circle", "square", "diamond", "triangle","triangle-down",默认是"circle"
@@ -228,7 +228,7 @@ + (AAPlotOptions *)configureTheAAPlotOptionsWithPlotOptions:(AAPlotOptions *)aaP
228228
);
229229
}
230230

231-
if ([chartType isEqualToString:AAChartTypeColumn]) {
231+
if (chartType == AAChartTypeColumn) {
232232
AAColumn *aaColumn = (AAObject(AAColumn)
233233
.borderWidthSet(@0)
234234
//.groupPaddingSet(@0.05)
@@ -239,7 +239,7 @@ + (AAPlotOptions *)configureTheAAPlotOptionsWithPlotOptions:(AAPlotOptions *)aaP
239239
.groupPaddingSet(@0.005);
240240
}
241241
aaPlotOptions.columnSet(aaColumn);
242-
} else if ([chartType isEqualToString:AAChartTypeBar]) {
242+
} else if (chartType == AAChartTypeBar) {
243243
AABar *aaBar = (AAObject(AABar)
244244
.borderWidthSet(@0)
245245
//.groupPaddingSet(@0.1)
@@ -250,19 +250,19 @@ + (AAPlotOptions *)configureTheAAPlotOptionsWithPlotOptions:(AAPlotOptions *)aaP
250250
.groupPaddingSet(@0.005);
251251
}
252252
aaPlotOptions.barSet(aaBar);
253-
} else if ([chartType isEqualToString:AAChartTypeArea]) {
253+
} else if (chartType == AAChartTypeArea) {
254254
aaPlotOptions.areaSet(AAObject(AAArea)
255255
.dataLabelsSet(aaDataLabels));
256-
} else if ([chartType isEqualToString:AAChartTypeAreaspline]) {
256+
} else if (chartType == AAChartTypeAreaspline) {
257257
aaPlotOptions.areasplineSet(AAObject(AAAreaspline)
258258
.dataLabelsSet(aaDataLabels));
259-
} else if ([chartType isEqualToString:AAChartTypeLine]) {
259+
} else if (chartType == AAChartTypeLine) {
260260
aaPlotOptions.lineSet(AAObject(AALine)
261261
.dataLabelsSet(aaDataLabels));
262-
} else if ([chartType isEqualToString:AAChartTypeSpline]) {
262+
} else if (chartType == AAChartTypeSpline) {
263263
aaPlotOptions.splineSet(AAObject(AASpline)
264264
.dataLabelsSet(aaDataLabels));
265-
} else if ([chartType isEqualToString:AAChartTypePie]) {
265+
} else if (chartType == AAChartTypePie) {
266266
AAPie *aaPie = (AAObject(AAPie)
267267
.allowPointSelectSet(true)
268268
.cursorSet(@"pointer")
@@ -278,13 +278,13 @@ + (AAPlotOptions *)configureTheAAPlotOptionsWithPlotOptions:(AAPlotOptions *)aaP
278278
);
279279
}
280280
aaPlotOptions.pieSet(aaPie);
281-
} else if ([chartType isEqualToString:AAChartTypeColumnrange]) {
281+
} else if (chartType == AAChartTypeColumnrange) {
282282
NSMutableDictionary *columnRangeDic = [[NSMutableDictionary alloc]init];
283283
[columnRangeDic setValue:@0 forKey:@"borderRadius"];//The color of the border surrounding each column or bar
284284
[columnRangeDic setValue:@0 forKey:@"borderWidth"];//The corner radius of the border surrounding each column or bar. default:0.
285285
[columnRangeDic setValue:aaDataLabels forKey:@"dataLabels"];
286286
aaPlotOptions.columnrangeSet(columnRangeDic);
287-
} else if ([chartType isEqualToString:AAChartTypeArearange]) {
287+
} else if (chartType == AAChartTypeArearange) {
288288
NSDictionary *areaRangeDic = [[NSMutableDictionary alloc]init];
289289
[areaRangeDic setValue:aaDataLabels forKey:@"dataLabels"];
290290
aaPlotOptions.arearangeSet(areaRangeDic);

0 commit comments

Comments
 (0)