优化代码

Author: agiapp

BRPickerView/AddressPickerView/BRAddressPickerView.h

@@ -49,7 +49,7 @@ typedef void(^BRAddressResultBlock)(BRProvinceModel * _Nullable province, BRCity
 @property (nullable, nonatomic, copy) BRAddressResultBlock changeBlock;
 
 /**
- *  地区数据源（不传或为nil，默认就获取框架内 BRCity.json 文件的数据）
+ *  地区数据源（不传或为nil，默认就获取本地 BRCity.json 文件的数据）
  *  1.可以传 JSON数组，要注意 层级结构 和 key 要与 BRCity.json 保持一致
  *  2.可以传 模型数组(NSArray <BRProvinceModel *> * 类型)，自己解析数据源 只需要注意层级结构就行
  */

BRPickerView/DatePickerView/BRDatePickerView+BR.h

@@ -62,17 +62,17 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (NSString *)getMDHMSNumber:(NSInteger)number;
 
-- (NSString *)getYearText:(NSString *)yearString;
+- (NSString *)getYearText:(NSArray *)yearArr row:(NSInteger)row;
 
-- (NSString *)getMonthText:(NSString *)monthString monthNames:(NSArray *)monthNames;
+- (NSString *)getMonthText:(NSArray *)monthArr row:(NSInteger)row monthNames:(NSArray *)monthNames;
 
-- (NSString *)getDayText:(NSString *)dayString mSelectDate:(NSDate *)mSelectDate;
+- (NSString *)getDayText:(NSArray *)dayArr row:(NSInteger)row mSelectDate:(NSDate *)mSelectDate;
 
-- (NSString *)getHourText:(NSString *)hourString;
+- (NSString *)getHourText:(NSArray *)hourArr row:(NSInteger)row;
 
-- (NSString *)getMinuteText:(NSString *)minuteString;
+- (NSString *)getMinuteText:(NSArray *)minuteArr row:(NSInteger)row;
 
-- (NSString *)getSecondText:(NSString *)secondString;
+- (NSString *)getSecondText:(NSArray *)secondArr row:(NSInteger)row;
 
 - (NSString *)getAMText;
 

BRPickerView/DatePickerView/BRDatePickerView+BR.m

@@ -484,15 +484,25 @@ - (NSString *)getMDHMSNumber:(NSInteger)number {
     return string;
 }
 
-- (NSString *)getYearText:(NSString *)yearString {
+- (NSString *)getYearText:(NSArray *)yearArr row:(NSInteger)row {
+    NSInteger index = 0;
+    if (row >= 0) {
+        index = MIN(row, yearArr.count - 1);
+    }
+    NSString *yearString = [yearArr objectAtIndex:index];
     if (self.addCustomString && [yearString isEqualToString:self.addCustomString]) {
         return yearString;
     }
     NSString *yearUnit = self.showUnitType == BRShowUnitTypeAll ? [self getYearUnit] : @"";
     return [NSString stringWithFormat:@"%@%@", yearString, yearUnit];
 }
 
-- (NSString *)getMonthText:(NSString *)monthString monthNames:(NSArray *)monthNames {
+- (NSString *)getMonthText:(NSArray *)monthArr row:(NSInteger)row monthNames:(NSArray *)monthNames {
+    NSInteger index = 0;
+    if (row >= 0) {
+        index = MIN(row, monthArr.count - 1);
+    }
+    NSString *monthString = [monthArr objectAtIndex:index];
     if ([self.pickerStyle.language hasPrefix:@"zh"]) {
         self.monthNameType = BRMonthNameTypeNumber;
     }
@@ -507,7 +517,12 @@ - (NSString *)getMonthText:(NSString *)monthString monthNames:(NSArray *)monthNa
     return [NSString stringWithFormat:@"%@%@", monthString, monthUnit];
 }
 
-- (NSString *)getDayText:(NSString *)dayString mSelectDate:(NSDate *)mSelectDate {
+- (NSString *)getDayText:(NSArray *)dayArr row:(NSInteger)row mSelectDate:(NSDate *)mSelectDate {
+    NSInteger index = 0;
+    if (row >= 0) {
+        index = MIN(row, dayArr.count - 1);
+    }
+    NSString *dayString = [dayArr objectAtIndex:index];
     if (self.isShowToday && mSelectDate.br_year == [NSDate date].br_year && mSelectDate.br_month == [NSDate date].br_month && [dayString integerValue] == [NSDate date].br_day) {
         return [NSBundle br_localizedStringForKey:@"今天" language:self.pickerStyle.language];
     }
@@ -521,20 +536,35 @@ - (NSString *)getDayText:(NSString *)dayString mSelectDate:(NSDate *)mSelectDate
     return dayString;
 }
 
-- (NSString *)getHourText:(NSString *)hourString {
+- (NSString *)getHourText:(NSArray *)hourArr row:(NSInteger)row {
+    NSInteger index = 0;
+    if (row >= 0) {
+        index = MIN(row, hourArr.count - 1);
+    }
+    NSString *hourString = [hourArr objectAtIndex:index];
     if (self.addCustomString && [hourString isEqualToString:self.addCustomString]) {
         return hourString;
     }
     NSString *hourUnit = self.showUnitType == BRShowUnitTypeAll ? [self getHourUnit] : @"";
     return [NSString stringWithFormat:@"%@%@", hourString, hourUnit];
 }
 
-- (NSString *)getMinuteText:(NSString *)minuteString {
+- (NSString *)getMinuteText:(NSArray *)minuteArr row:(NSInteger)row {
+    NSInteger index = 0;
+    if (row >= 0) {
+        index = MIN(row, minuteArr.count - 1);
+    }
+    NSString *minuteString = [minuteArr objectAtIndex:index];
     NSString *minuteUnit = self.showUnitType == BRShowUnitTypeAll ? [self getMinuteUnit] : @"";
     return [NSString stringWithFormat:@"%@%@", minuteString, minuteUnit];
 }
 
-- (NSString *)getSecondText:(NSString *)secondString {
+- (NSString *)getSecondText:(NSArray *)secondArr row:(NSInteger)row {
+    NSInteger index = 0;
+    if (row >= 0) {
+        index = MIN(row, secondArr.count - 1);
+    }
+    NSString *secondString = [secondArr objectAtIndex:index];
     NSString *secondUnit = self.showUnitType == BRShowUnitTypeAll ? [self getSecondUnit] : @"";
     return [NSString stringWithFormat:@"%@%@", secondString, secondUnit];
 }