Ver Fonte

BRPicker改本地

桂欢 há 1 ano atrás
pai
commit
25bc4d1c26
49 ficheiros alterados com 1423 adições e 2096 exclusões
  1. 0 1
      SLAiELTS/Podfile
  2. 1 16
      SLAiELTS/Podfile.lock
  3. 0 21
      SLAiELTS/Pods/BRPickerView/LICENSE
  4. 0 530
      SLAiELTS/Pods/BRPickerView/README.md
  5. 1 16
      SLAiELTS/Pods/Manifest.lock
  6. 1272 1338
      SLAiELTS/Pods/Pods.xcodeproj/project.pbxproj
  7. 0 26
      SLAiELTS/Pods/Target Support Files/BRPickerView/BRPickerView-Info.plist
  8. 0 5
      SLAiELTS/Pods/Target Support Files/BRPickerView/BRPickerView-dummy.m
  9. 0 12
      SLAiELTS/Pods/Target Support Files/BRPickerView/BRPickerView-prefix.pch
  10. 0 28
      SLAiELTS/Pods/Target Support Files/BRPickerView/BRPickerView-umbrella.h
  11. 0 12
      SLAiELTS/Pods/Target Support Files/BRPickerView/BRPickerView.debug.xcconfig
  12. 0 6
      SLAiELTS/Pods/Target Support Files/BRPickerView/BRPickerView.modulemap
  13. 0 12
      SLAiELTS/Pods/Target Support Files/BRPickerView/BRPickerView.release.xcconfig
  14. 0 25
      SLAiELTS/Pods/Target Support Files/Pods-SLAiELTS/Pods-SLAiELTS-acknowledgements.markdown
  15. 0 31
      SLAiELTS/Pods/Target Support Files/Pods-SLAiELTS/Pods-SLAiELTS-acknowledgements.plist
  16. 0 1
      SLAiELTS/Pods/Target Support Files/Pods-SLAiELTS/Pods-SLAiELTS-frameworks-Debug-input-files.xcfilelist
  17. 0 1
      SLAiELTS/Pods/Target Support Files/Pods-SLAiELTS/Pods-SLAiELTS-frameworks-Debug-output-files.xcfilelist
  18. 0 1
      SLAiELTS/Pods/Target Support Files/Pods-SLAiELTS/Pods-SLAiELTS-frameworks-Release-input-files.xcfilelist
  19. 0 1
      SLAiELTS/Pods/Target Support Files/Pods-SLAiELTS/Pods-SLAiELTS-frameworks-Release-output-files.xcfilelist
  20. 0 2
      SLAiELTS/Pods/Target Support Files/Pods-SLAiELTS/Pods-SLAiELTS-frameworks.sh
  21. 2 2
      SLAiELTS/Pods/Target Support Files/Pods-SLAiELTS/Pods-SLAiELTS.debug.xcconfig
  22. 2 2
      SLAiELTS/Pods/Target Support Files/Pods-SLAiELTS/Pods-SLAiELTS.release.xcconfig
  23. 112 4
      SLAiELTS/SLAiELTS.xcodeproj/project.pbxproj
  24. 18 0
      SLAiELTS/SLAiELTS/Tool/BRPickerView/AddressPickerView/BRAddressModel.h
  25. 12 0
      SLAiELTS/SLAiELTS/Tool/BRPickerView/AddressPickerView/BRAddressModel.m
  26. 0 0
      SLAiELTS/SLAiELTS/Tool/BRPickerView/AddressPickerView/BRAddressPickerView.bundle/BRCity.json
  27. 0 0
      SLAiELTS/SLAiELTS/Tool/BRPickerView/AddressPickerView/BRAddressPickerView.h
  28. 0 0
      SLAiELTS/SLAiELTS/Tool/BRPickerView/AddressPickerView/BRAddressPickerView.m
  29. 0 0
      SLAiELTS/SLAiELTS/Tool/BRPickerView/BRPickerView.h
  30. 0 0
      SLAiELTS/SLAiELTS/Tool/BRPickerView/Base/BRBaseView.h
  31. 0 0
      SLAiELTS/SLAiELTS/Tool/BRPickerView/Base/BRBaseView.m
  32. 0 0
      SLAiELTS/SLAiELTS/Tool/BRPickerView/Base/BRPickerStyle.h
  33. 3 3
      SLAiELTS/SLAiELTS/Tool/BRPickerView/Base/BRPickerStyle.m
  34. 0 0
      SLAiELTS/SLAiELTS/Tool/BRPickerView/Base/BRPickerView.bundle/en.lproj/Localizable.strings
  35. 0 0
      SLAiELTS/SLAiELTS/Tool/BRPickerView/Base/BRPickerView.bundle/zh-Hans.lproj/Localizable.strings
  36. 0 0
      SLAiELTS/SLAiELTS/Tool/BRPickerView/Base/BRPickerView.bundle/zh-Hant.lproj/Localizable.strings
  37. 0 0
      SLAiELTS/SLAiELTS/Tool/BRPickerView/Base/BRPickerViewMacro.h
  38. 0 0
      SLAiELTS/SLAiELTS/Tool/BRPickerView/Base/NSBundle+BRPickerView.h
  39. 0 0
      SLAiELTS/SLAiELTS/Tool/BRPickerView/Base/NSBundle+BRPickerView.m
  40. 0 0
      SLAiELTS/SLAiELTS/Tool/BRPickerView/DatePickerView/BRDatePickerView+BR.h
  41. 0 0
      SLAiELTS/SLAiELTS/Tool/BRPickerView/DatePickerView/BRDatePickerView+BR.m
  42. 0 0
      SLAiELTS/SLAiELTS/Tool/BRPickerView/DatePickerView/BRDatePickerView.h
  43. 0 0
      SLAiELTS/SLAiELTS/Tool/BRPickerView/DatePickerView/BRDatePickerView.m
  44. 0 0
      SLAiELTS/SLAiELTS/Tool/BRPickerView/DatePickerView/NSDate+BRPickerView.h
  45. 0 0
      SLAiELTS/SLAiELTS/Tool/BRPickerView/DatePickerView/NSDate+BRPickerView.m
  46. 0 0
      SLAiELTS/SLAiELTS/Tool/BRPickerView/StringPickerView/BRResultModel.h
  47. 0 0
      SLAiELTS/SLAiELTS/Tool/BRPickerView/StringPickerView/BRResultModel.m
  48. 0 0
      SLAiELTS/SLAiELTS/Tool/BRPickerView/StringPickerView/BRStringPickerView.h
  49. 0 0
      SLAiELTS/SLAiELTS/Tool/BRPickerView/StringPickerView/BRStringPickerView.m

+ 0 - 1
SLAiELTS/Podfile

@@ -19,7 +19,6 @@ target 'SLAiELTS' do
   pod 'JXCategoryView'
   pod 'ZLPhotoBrowser'
   pod 'WZLBadge'
-  pod 'BRPickerView'
   pod 'SocketRocket'
 
 end

+ 1 - 16
SLAiELTS/Podfile.lock

@@ -14,18 +14,6 @@ PODS:
   - AFNetworking/Serialization (4.0.1)
   - AFNetworking/UIKit (4.0.1):
     - AFNetworking/NSURLSession
-  - BRPickerView (2.8.1):
-    - BRPickerView/AddressPickerView (= 2.8.1)
-    - BRPickerView/Base (= 2.8.1)
-    - BRPickerView/DatePickerView (= 2.8.1)
-    - BRPickerView/StringPickerView (= 2.8.1)
-  - BRPickerView/AddressPickerView (2.8.1):
-    - BRPickerView/Base
-  - BRPickerView/Base (2.8.1)
-  - BRPickerView/DatePickerView (2.8.1):
-    - BRPickerView/Base
-  - BRPickerView/StringPickerView (2.8.1):
-    - BRPickerView/Base
   - IQKeyboardManager (6.5.6)
   - JXCategoryView (1.5.5)
   - Masonry (1.1.0)
@@ -45,7 +33,6 @@ PODS:
 
 DEPENDENCIES:
   - AFNetworking (~> 4.0.1)
-  - BRPickerView
   - IQKeyboardManager
   - JXCategoryView
   - Masonry
@@ -73,13 +60,11 @@ SPEC REPOS:
     - ZLPhotoBrowser
   trunk:
     - AFNetworking
-    - BRPickerView
     - SocketRocket
     - WZLBadge
 
 SPEC CHECKSUMS:
   AFNetworking: 3bd23d814e976cd148d7d44c3ab78017b744cd58
-  BRPickerView: 2531a2d4d0fea0b57a1c738de215af0f88863a2f
   IQKeyboardManager: 2a6e97afdafc7becf0cb17a9a8d795e3a980717f
   JXCategoryView: 0293fcb356f10a5c2e679dac0a1a5f1899ee0c87
   Masonry: 678fab65091a9290e40e2832a55e7ab731aad201
@@ -93,6 +78,6 @@ SPEC CHECKSUMS:
   WZLBadge: 9ec779dcfd94c825518b395e8315fccaabff1bfa
   ZLPhotoBrowser: 3748fdbeb2b28961c2495d15131dbf413082e1b9
 
-PODFILE CHECKSUM: d286348ab8593a507014c9bcde5a3b8d892e6580
+PODFILE CHECKSUM: 4165313ac93dce48782fdb91b63e6f01bbd12bd8
 
 COCOAPODS: 1.12.0

+ 0 - 21
SLAiELTS/Pods/BRPickerView/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2019 91renb
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

+ 0 - 530
SLAiELTS/Pods/BRPickerView/README.md

@@ -1,530 +0,0 @@
-# BRPickerView
-
-BRPickerView 封装的是iOS中常用的选择器组件,主要包括:日期选择器(支持年月日、年月等15种日期样式选择,支持设置星期、至今等)、地址选择器(支持省市区、省市、省三种地区选择)、自定义字符串选择器(支持单列、多列、二级联动、三级联动选择)。支持自定义主题样式,适配深色模式,支持将选择器组件添加到指定容器视图。
-
-【说明】
-
-- 当前最新版本为: `2.8.1` 。
-- 如果不能找到最新版本,请先执行一下 `pod repo update` 更新本地仓库,待更新完成后;再执行 `pod search BRPickerView` 进行搜索,就会看到最新版本。
-
-# 效果演示
-
-查看并运行 `BRPickerViewDemo.xcodeproj`
-
-| ![效果图1](https://github.com/91renb/BRPickerView/blob/master/BRPickerViewDemo/images/a.gif?raw=true) | ![效果图2](https://github.com/91renb/BRPickerView/blob/master/BRPickerViewDemo/images/b.gif?raw=true) |
-| :----------------------------------------------------------: | :----------------------------------------------------------: |
-|                     框架Demo运行效果图1                      |                     框架Demo运行效果图2                      |
-
-# 安装
-
-#### 1. CocoaPods
-
-1. 在 Podfile 中添加 `pod 'BRPickerView'`。
-
-2. 执行 `pod install` 或 `pod update` 。
-
-3. 导入头文件 ` #import <BRPickerView.h>`。
-
-
-#### 2. 手动导入
-
-1. 将与 `README.md` 同级目录下的 `BRPickerView` 文件夹拽入项目中
-
-2. 导入头文件 ` #import "BRPickerView.h"`。
-
-
-# 系统要求
-
-- iOS 8.0+
-- ARC
-
-# 使用
-
-#### 1. 时间选择器:`BRDatePickerView`
-
-​	查看 BRDatePickerView.h 头文件,里面提供了两种使用方式,参见源码。
-
-```objective-c
-/// 日期选择器格式
-typedef NS_ENUM(NSInteger, BRDatePickerMode) {
-    // ----- 以下4种是系统样式(兼容国际化日期格式) -----
-    /** 【yyyy-MM-dd】UIDatePickerModeDate(美式日期:MM-dd-yyyy;英式日期:dd-MM-yyyy)*/
-    BRDatePickerModeDate,
-    /** 【yyyy-MM-dd HH:mm】 UIDatePickerModeDateAndTime */
-    BRDatePickerModeDateAndTime,
-    /** 【HH:mm】UIDatePickerModeTime */
-    BRDatePickerModeTime,
-    /** 【HH:mm】UIDatePickerModeCountDownTimer */
-    BRDatePickerModeCountDownTimer,
-    
-    // ----- 以下14种是自定义样式 -----
-    /** 【yyyy-MM-dd HH:mm:ss】年月日时分秒 */
-    BRDatePickerModeYMDHMS,
-    /** 【yyyy-MM-dd HH:mm】年月日时分 */
-    BRDatePickerModeYMDHM,
-    /** 【yyyy-MM-dd HH】年月日时 */
-    BRDatePickerModeYMDH,
-    /** 【MM-dd HH:mm】月日时分 */
-    BRDatePickerModeMDHM,
-    /** 【yyyy-MM-dd】年月日(兼容国际化日期:dd-MM-yyyy)*/
-    BRDatePickerModeYMD,
-    /** 【yyyy-MM】年月(兼容国际化日期:MM-yyyy)*/
-    BRDatePickerModeYM,
-    /** 【yyyy】年 */
-    BRDatePickerModeY,
-    /** 【MM-dd】月日 */
-    BRDatePickerModeMD,
-    /** 【HH:mm:ss】时分秒 */
-    BRDatePickerModeHMS,
-    /** 【HH:mm】时分 */
-    BRDatePickerModeHM,
-    /** 【mm:ss】分秒 */
-    BRDatePickerModeMS,
-    
-    /** 【yyyy-qq】年季度 */
-    BRDatePickerModeYQ,
-    /** 【yyyy-MM-ww】年月周 */
-    BRDatePickerModeYMW,
-    /** 【yyyy-ww】年周 */
-    BRDatePickerModeYW
-};
-```
-
-- 使用示例(参考Demo):
-
-```objective-c
-// 1.创建日期选择器
-BRDatePickerView *datePickerView = [[BRDatePickerView alloc]init];
-// 2.设置属性
-datePickerView.pickerMode = BRDatePickerModeYMD;
-datePickerView.title = @"选择年月日";
-// datePickerView.selectValue = @"2019-10-30";
-datePickerView.selectDate = [NSDate br_setYear:2019 month:10 day:30];
-datePickerView.minDate = [NSDate br_setYear:1949 month:3 day:12];
-datePickerView.maxDate = [NSDate date];
-datePickerView.isAutoSelect = YES;
-datePickerView.resultBlock = ^(NSDate *selectDate, NSString *selectValue) {
-    NSLog(@"选择的值:%@", selectValue);
-};
-// 设置自定义样式
-BRPickerStyle *customStyle = [[BRPickerStyle alloc]init];
-customStyle.pickerColor = BR_RGB_HEX(0xd9dbdf, 1.0f);
-customStyle.pickerTextColor = [UIColor redColor];
-customStyle.separatorColor = [UIColor redColor];
-datePickerView.pickerStyle = customStyle;
-
-// 3.显示
-[datePickerView show];
-```
-
-**时间选择器显示类型的效果图(默认样式):**
-
-- 以下4种样式是使用 UIDatePicker 类 进行封装的,支持循环滚动
-
-| ![样式1:BRDatePickerModeTime](https://github.com/91renb/BRPickerView/blob/master/BRPickerViewDemo/images/date_type1.png?raw=true) | ![样式2:BRDatePickerModeDate](https://github.com/91renb/BRPickerView/blob/master/BRPickerViewDemo/images/date_type2.png?raw=true) |
-| :----------------------------------------------------------: | :----------------------------------------------------------: |
-|                 样式1:BRDatePickerModeDate                  |              样式2:BRDatePickerModeDateAndTime              |
-|                                                              |                                                              |
-| ![样式3:BRDatePickerModeDateAndTime](https://github.com/91renb/BRPickerView/blob/master/BRPickerViewDemo/images/date_type3.png?raw=true) | ![样式4:BRDatePickerModeCountDownTimer](https://github.com/91renb/BRPickerView/blob/master/BRPickerViewDemo/images/date_type4.png?raw=true) |
-|                 样式3:BRDatePickerModeTime                  |            样式4:BRDatePickerModeCountDownTimer             |
-
-- 以下11种样式是使用 UIPickerView 类进行封装的。
-
-| ![样式5:BRDatePickerModeYMDHMS](https://github.com/91renb/BRPickerView/blob/master/BRPickerViewDemo/images/date_type5.png?raw=true) | ![样式6:BRDatePickerModeYMDHM](https://github.com/91renb/BRPickerView/blob/master/BRPickerViewDemo/images/date_type6.png?raw=true) |
-| :----------------------------------------------------------: | :----------------------------------------------------------: |
-|                样式5:BRDatePickerModeYMDHMS                 |                 样式6:BRDatePickerModeYMDHM                 |
-|                                                              |                                                              |
-| ![样式7:BRDatePickerModeYMDH](https://github.com/91renb/BRPickerView/blob/master/BRPickerViewDemo/images/date_type7.png?raw=true) | ![样式8:BRDatePickerModeMDHM](https://github.com/91renb/BRPickerView/blob/master/BRPickerViewDemo/images/date_type8.png?raw=true) |
-|                 样式7:BRDatePickerModeYMDH                  |                 样式8:BRDatePickerModeMDHM                  |
-|                                                              |                                                              |
-| ![样式9:BRDatePickerModeYMDE](https://github.com/91renb/BRPickerView/blob/master/BRPickerViewDemo/images/date_type9.png?raw=true) | ![样式10:BRDatePickerModeYMD](https://github.com/91renb/BRPickerView/blob/master/BRPickerViewDemo/images/date_type10.png?raw=true) |
-|                  样式9:BRDatePickerModeYMD                  |                  样式10:BRDatePickerModeYM                  |
-|                                                              |                                                              |
-| ![样式11:BRDatePickerModeYM](https://github.com/91renb/BRPickerView/blob/master/BRPickerViewDemo/images/date_type11.png?raw=true) | ![样式12:BRDatePickerModeY](https://github.com/91renb/BRPickerView/blob/master/BRPickerViewDemo/images/date_type12.png?raw=true) |
-|                  样式11:BRDatePickerModeY                   |                  样式12:BRDatePickerModeMD                  |
-|                                                              |                                                              |
-| ![样式13:BRDatePickerModeMD](https://github.com/91renb/BRPickerView/blob/master/BRPickerViewDemo/images/date_type13.png?raw=true) | ![样式14:BRDatePickerModeHMS](https://github.com/91renb/BRPickerView/blob/master/BRPickerViewDemo/images/date_type14.png?raw=true) |
-|                 样式13:BRDatePickerModeHMS                  |                  样式14:BRDatePickerModeHM                  |
-|                                                              |                                                              |
-| ![样式15:BRDatePickerModeHM](https://github.com/91renb/BRPickerView/blob/master/BRPickerViewDemo/images/date_type15.png?raw=true) |                                                              |
-|                  样式15:BRDatePickerModeMS                  |                                                              |
-
-- 其它日期样式
-
-| ![设置显示星期](https://github.com/91renb/BRPickerView/blob/master/BRPickerViewDemo/images/date_type_week1.png?raw=true) | ![设置显示星期](https://github.com/91renb/BRPickerView/blob/master/BRPickerViewDemo/images/date_type_week2.png?raw=true) |
-| ------------------------------------------------------------ | ------------------------------------------------------------ |
-| 设置显示星期:datePickerView.showWeek = YES;                 | 设置显示星期:datePickerView.showWeek = YES;                 |
-|                                                              |                                                              |
-| ![设置添加至今](https://github.com/91renb/BRPickerView/blob/master/BRPickerViewDemo/images/date_type_now.png?raw=true) | ![设置显示今天](https://github.com/91renb/BRPickerView/blob/master/BRPickerViewDemo/images/date_type_today.png?raw=true) |
-| 设置添加至今:datePickerView.addToNow = YES;                 | 设置显示今天:datePickerView.showToday = YES;                |
-|                                                              |                                                              |
-| ![日期单位单行显示样式](https://github.com/91renb/BRPickerView/blob/master/BRPickerViewDemo/images/date_type_unit.png?raw=true) | ![自定义选择器选中行颜色](https://github.com/91renb/BRPickerView/blob/master/BRPickerViewDemo/images/date_type_row.png?raw=true) |
-| 日期单位显示样式:datePickerView.showUnitType = BRShowUnitTypeOnlyCenter; | 设置选择器中间选中行的背景颜色:selectRowColor               |
-
-```objective-c
-// 设置选择器中间选中行的样式
-BRPickerStyle *customStyle = [[BRPickerStyle alloc]init];
-customStyle.selectRowColor = [UIColor blueColor];
-customStyle.selectRowTextFont = [UIFont boldSystemFontOfSize:20.0f];
-customStyle.selectRowTextColor = [UIColor redColor];
-datePickerView.pickerStyle = customStyle;
-```
-
-| ![英式日期年月日](https://github.com/91renb/BRPickerView/blob/master/BRPickerViewDemo/images/date_type_en1.png?raw=true) | ![英式日期年月](https://github.com/91renb/BRPickerView/blob/master/BRPickerViewDemo/images/date_type_en2.png?raw=true) |
-| ------------------------------------------------------------ | ------------------------------------------------------------ |
-| 样式:BRDatePickerModeYMD (默认非中文环境显示英式日期)     | 样式:BRDatePickerModeYM (默认非中文环境显示英式日期)      |
-
-- 几种常见的弹框样式模板
-
-| ![模板样式1](https://github.com/91renb/BRPickerView/blob/master/BRPickerViewDemo/images/template_style1.png?raw=true) | ![模板样式2](https://github.com/91renb/BRPickerView/blob/master/BRPickerViewDemo/images/template_style2.png?raw=true) |
-| ------------------------------------------------------------ | ------------------------------------------------------------ |
-| 弹框样式模板1:datePickerView.pickerStyle = [BRPickerStyle pickerStyleWithThemeColor:[UIColor blueColor]]; | 弹框样式模板2:datePickerView.pickerStyle = [BRPickerStyle pickerStyleWithDoneTextColor:[UIColor blueColor]]; |
-|                                                              |                                                              |
-| ![模板样式3](https://github.com/91renb/BRPickerView/blob/master/BRPickerViewDemo/images/template_style3.png?raw=true) | ![添加选择器的头视图](https://github.com/91renb/BRPickerView/blob/master/BRPickerViewDemo/images/date_type_top.png?raw=true) |
-| 弹框样式模板3:datePickerView.pickerStyle = [BRPickerStyle pickerStyleWithDoneBtnImage:[UIImage imageNamed:@"icon_close"]]; | 添加选择器的头视图:pickerHeaderView                         |
-
-```objective-c
-// 添加选择器头视图(pickerHeaderView)
-UIView *headerView = [[UIView alloc]initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, 36)];
-headerView.backgroundColor = [[UIColor grayColor] colorWithAlphaComponent:0.1f];
-NSArray *unitArr = @[@"年", @"月", @"日"];
-for (NSInteger i = 0; i < unitArr.count; i++) {
-    CGFloat width = SCREEN_WIDTH / unitArr.count;
-    CGFloat orginX = i * (SCREEN_WIDTH / unitArr.count);
-    UILabel *label = [[UILabel alloc]initWithFrame:CGRectMake(orginX, 0, width, 36)];
-    label.backgroundColor = [UIColor clearColor];
-    label.textAlignment = NSTextAlignmentCenter;
-    label.font = [UIFont systemFontOfSize:16.0f];
-    label.textColor = [UIColor darkGrayColor];
-    label.text = unitArr[i];
-    [headerView addSubview:label];
-}
-datePickerView.pickerHeaderView = headerView;
-```
-
-#### 2. 地址选择器:`BRAddressPickerView`
-
-​	查看 BRAddressPickerView.h 头文件,里面提供了两种使用方式,参见源码。
-
-- 使用示例(参考Demo):
-
-```objective-c
-/// 地址选择器
-BRAddressPickerView *addressPickerView = [[BRAddressPickerView alloc]init];
-addressPickerView.pickerMode = BRAddressPickerModeArea;
-addressPickerView.title = @"请选择地区";
-//addressPickerView.selectValues = @[@"浙江省", @"杭州市", @"西湖区"];
-addressPickerView.selectIndexs = @[@10, @0, @4];
-addressPickerView.isAutoSelect = YES;
-addressPickerView.resultBlock = ^(BRProvinceModel *province, BRCityModel *city, BRAreaModel *area) {
-    NSLog(@"选择的值:%@", [NSString stringWithFormat:@"%@ %@ %@", province.name, city.name, area.name]);
-};
-
-[addressPickerView show];
-```
-
-- 地址选择器的3种显示类型(showType 的3个枚举值):
-
-| ![省份](https://github.com/91renb/BRPickerView/blob/master/BRPickerViewDemo/images/BRAddressPickerModeProvince.png?raw=true) | ![城市](https://github.com/91renb/BRPickerView/blob/master/BRPickerViewDemo/images/BRAddressPickerModeCity.png?raw=true) |
-| :----------------------------------------------------------: | :----------------------------------------------------------: |
-|              样式1:BRAddressPickerModeProvince              |                样式2:BRAddressPickerModeCity                |
-|                                                              |                                                              |
-| ![地区](https://github.com/91renb/BRPickerView/blob/master/BRPickerViewDemo/images/BRAddressPickerModeArea.png?raw=true) |                                                              |
-|                样式3:BRAddressPickerModeArea                |                                                              |
-
-#### 3.  自定义字符串选择器:`BRStringPickerView`
-
-​	查看 BRStringPickerView.h 头文件,里面提供了两种使用方式,参见源码。
-
-- 使用示例(参考Demo):
-
-```objective-c
-/// 1.单列字符串选择器(传字符串数组)
-BRStringPickerView *stringPickerView = [[BRStringPickerView alloc]init];
-stringPickerView.pickerMode = BRStringPickerComponentSingle;
-stringPickerView.title = @"学历";
-stringPickerView.dataSourceArr = @[@"大专以下", @"大专", @"本科", @"硕士", @"博士", @"博士后"];
-stringPickerView.selectIndex = 2;
-stringPickerView.resultModelBlock = ^(BRResultModel *resultModel) {
-    NSLog(@"选择的值:%@", resultModel.value);
-};
-
-[stringPickerView show];
-
-
-/// 2.单列字符串选择器(可以传模型数组)
-NSArray *infoArr = @[@{@"key": @"1001", @"value": @"无融资", @"remark": @""},
-                     @{@"key": @"2001", @"value": @"天使轮", @"remark": @""},
-                     @{@"key": @"3001", @"value": @"A轮", @"remark": @""},
-                     @{@"key": @"4001", @"value": @"B轮", @"remark": @""},
-                     @{@"key": @"5001", @"value": @"C轮以后", @"remark": @""},
-                     @{@"key": @"6001", @"value": @"已上市", @"remark": @""}];
-NSMutableArray *modelArr = [[NSMutableArray alloc]init];
-for (NSDictionary *dic in infoArr) {
-    BRResultModel *model = [[BRResultModel alloc]init];
-    model.key = dic[@"key"];
-    model.value = dic[@"value"];
-    model.remark = dic[@"remark"];
-    [modelArr addObject:model];
-}
-BRStringPickerView *stringPickerView = [[BRStringPickerView alloc]init];
-stringPickerView.pickerMode = BRStringPickerComponentSingle;
-stringPickerView.title = @"融资情况";
-stringPickerView.dataSourceArr = [modelArr copy];
-stringPickerView.selectIndex = 2;
-stringPickerView.resultModelBlock = ^(BRResultModel *resultModel) {
-    NSLog(@"选择的索引:%@", @(resultModel.index));
-    NSLog(@"选择的值:%@", resultModel.value);
-};
-
-[stringPickerView show];
-
-
-/// 3.多列字符串选择器
-BRStringPickerView *stringPickerView = [[BRStringPickerView alloc]init];
-stringPickerView.pickerMode = BRStringPickerComponentMulti;
-stringPickerView.title = @"自定义多列字符串";
-stringPickerView.dataSourceArr = @[@[@"语文", @"数学", @"英语", @"物理", @"化学", @"生物"], @[@"优秀", @"良好", @"及格", @"不及格"]];
-stringPickerView.selectIndexs = @[@2, @1];
-stringPickerView.resultModelArrayBlock = ^(NSArray<BRResultModel *> *resultModelArr) {
-    NSLog(@"选择的值:%@", [NSString stringWithFormat:@"%@,%@", resultModelArr[0].value, resultModelArr[1].value]);
-};
-
-// 设置选择器中间选中行的样式
-BRPickerStyle *customStyle = [[BRPickerStyle alloc]init];
-customStyle.selectRowTextFont = [UIFont boldSystemFontOfSize:20.0f];
-customStyle.selectRowTextColor = [UIColor blueColor];
-stringPickerView.pickerStyle = customStyle;
-
-[stringPickerView show];
-```
-
-- 字符串选择器效果图:
-
-| ![自定义单列字符串](https://github.com/91renb/BRPickerView/blob/master/BRPickerViewDemo/images/string_single.png?raw=true) | ![融资情况](https://github.com/91renb/BRPickerView/blob/master/BRPickerViewDemo/images/string_rongzi.png?raw=true) |
-| :----------------------------------------------------------: | :----------------------------------------------------------: |
-|                       单列字符串选择器                       |                       单列字符串选择器                       |
-|                                                              |                                                              |
-| ![多列字符串选择器](https://github.com/91renb/BRPickerView/blob/master/BRPickerViewDemo/images/string_more.png?raw=true) |                                                              |
-|                       多列字符串选择器                       |                                                              |
-
-# 更新记录
-
-#### 2022-07-08(V2.8.0)
-
-- 优化代码。
-
-#### 2022-06-16(V2.7.8)
-
-- 优化代码。
-
-#### 2022-03-30(V2.7.7)
-
-- 优化代码。
-
-#### 2021-10-09(V2.7.6)
-
-- 适配iOS15
-
-#### 2021-05-28(V2.7.5)
-
-- 日期选择器新增属性:`monthNames` 和 `customUnit`
-
-- 解决已知问题:[#232](https://github.com/91renb/BRPickerView/issues/232) 、[#231](https://github.com/91renb/BRPickerView/issues/231)  、[#230](https://github.com/91renb/BRPickerView/issues/230)  、[#227](https://github.com/91renb/BRPickerView/issues/227)  、[#225](https://github.com/91renb/BRPickerView/issues/225) 、[#219](https://github.com/91renb/BRPickerView/issues/219) 、[#206](https://github.com/91renb/BRPickerView/issues/206) 
-
-#### 2020-09-25(V2.7.3)
-
-- 适配选择器iOS14的样式:[#189](https://github.com/91renb/BRPickerView/issues/189) 、[#191](https://github.com/91renb/BRPickerView/issues/191)
-
-#### 2020-09-23(V2.7.2)
-
-- 日期选择器新增添加自定义字符串属性:`firstRowContent` 和 `lastRowContent`
-- 解决日期选择器设置最小日期时,存在的联动不正确的问题:[#184](https://github.com/91renb/BRPickerView/issues/184) 
-
-#### 2020-08-28(V2.7.0)
-
-- 日期选择器添加 `nonSelectableDates` 属性:[#178](https://github.com/91renb/BRPickerView/issues/178) 
-- 优化选中行文本显示:[#177](https://github.com/91renb/BRPickerView/issues/177) 
-
-#### 2020-08-16(V2.6.8)
-
-- 优化代码,适配 iPad 分屏显示
-- 新增 `keyView` 属性(即组件的父视图:可以将组件添加到 自己获取的 keyWindow 上,或页面的 view 上)
-
-#### 2020-08-09(V2.6.7)
-
-- 适配 iOS14
-
-#### 2020-08-06(V2.6.6)
-
-- 修复 [#163](https://github.com/91renb/BRPickerView/issues/163) 和  [#170](https://github.com/91renb/BRPickerView/issues/170) 
-
-#### 2020-07-18(V2.6.5)
-
-- 字符串选择器新增支持多级联动选择
-
-#### 2020-06-24(V2.6.3)
-
-- 日期选择器新增属性:`timeZone` 和 `addCustomString`
-
-#### 2020-05-12(V2.6.2)
-
-- 实现 [#145](#145) 和  [#146](#146) 需求
-
-#### 2020-04-30(V2.6.0)
-
-- 新增样式属性:`selectRowTextColor` 和 `selectRowTextFont`
-- 日期选择器新增数字显示属性:`numberFullName`
-- 优化代码,添加 `BRDatePickerModeYMD` 支持国际化英式日期
-
-- 修复 [#143](#143)
-
-#### 2020-04-27(V2.5.8)
-
-- 修复 [#138](https://github.com/91renb/BRPickerView/issues/138) 和 [#142](https://github.com/91renb/BRPickerView/issues/142)
-- 日期选择器新增 `descending` 属性,支持降序的时间列表
-- 更新地址选择器地区数据源
-
-#### 2020-03-31(V2.5.7)
-
-- 优化代码,解决已知问题
-
-#### 2020-02-26(V2.5.6)
-
-- 优化代码,兼容部分国际化日期样式
-
-#### 2020-02-24(V2.5.5)
-
-- 添加设置选择器选中行背景颜色的功能,新增属性 `selectRowColor`
-
-#### 2020-01-31(V2.5.3)
-
-- 新增属性:`pickerHeaderView`、`pickerFooterView`
-- 新增刷新选择器数据方法:`reloadData`
-
-#### 2020-01-05(V2.5.1)
-
-- 优化代码,添加 `BRDatePickerModeYM` 支持国际化英式日期
-
-#### 2020-01-02(V2.5.0)
-
-- 日期选择器新增属性:`showUnitType`(日期单位显示样式)、`minuteInterval`、`secondInterval`
-- 封装了常用的几种模板样式,使用更加简单便捷
-- 框架内默认适配深色模式显示
-
-#### 2019-12-26(V2.4.6)
-
-- 添加支持动态更新属性 `title` 、 `selectDate`、`pickerMode` 的值
-- 日期选择器添加 `showWeek` 属性,及新增 `BRDatePickerModeMS` 日期类型
-- 优化选择器【用法二】的使用,新增选择器滚动选择时回调的属性
-
-#### 2019-11-28(V2.4.5)
-
-- 日期选择器新增选择 ”至今“ 和 显示 ”今天“ 的功能,见以下两个属性:
-
-  `showToday` :控制是否显示 “今天” ,默认为 NO
-
-  `addToNow`:控制是否添加选择 “至今”,默认为 NO
-
-#### 2019-11-26(V2.4.3)
-
-- 日期选择器新增以下三种选择类型:
-
-  `BRDatePickerModeYMDHMS`(年月日时分秒)、`BRDatePickerModeYMDE`(年月日星期)、`BRDatePickerModeHMS`(时分秒)
-
-- 更新地址选择器地区数据源
-
-#### 2019-11-07(V2.4.2)
-
-- 日期选择器添加:BRDatePickerModeYMDH(yyyy-MM-dd HH)类型
-- 地址选择器添加:selectIndexs 属性,可根据索引去设置默认选择
-- 适配横屏及刘海屏安全区域显示效果
-
-#### 2019-11-04(V2.4.0)
-
-- 优化选择器子目录管理,方便轻量级、模块化集成
-
-  `pod 'BRPickerView'`	// 集成全部的功能
-
-  `pod 'BRPickerView/DatePickerView'`	// 仅集成日期选择器的功能
-
-  `pod 'BRPickerView/AddressPickerView'`	// 仅集成地址选择器的功能
-
-  `pod 'BRPickerView/StringPickerView'`	// 仅集成字符串选择器的功能
-
-#### 2019-11-01(V2.3.8)
-
-- 优化代码,添加更多的自定义样式属性
-
-#### 2019-10-30(V2.3.6)
-
-- 优化代码,添加国际化支持
-
-#### 2019-10-26(V2.3.5)
-
-- 添加传统的创建对象设置属性的使用方式
-- 开放设置选择器颜色及样式,适配深色模式
-- 更新省市区数据源,数据与政府官网最新公布的一致(参见:[行政区划代码](http://www.mca.gov.cn/article/sj/xzqh/2019/))
-- 支持将选择器添加到指定容器视图上(见BaseView.h文件,扩展一方法)
-- 支持将子视图添加到选择器上(见BaseView.h文件,扩展二方法)
-- 优化代码,配置Pod库的层级目录
-
-#### 2018-04-27(V2.2.1):
-
-- 修复bug,适配iPad和横屏显示。
-- 优化代码,提高框架适应性,降低内存消耗。
-
-#### 2018-04-03(V2.2.0)
-
-- 时间选择器新添加了7种显示类型(BRDatePickerMode),可根据自己项目的需求选择性使用。
-- 适配横屏,及 iPhoneX 底部安全区域。
-- 修改了最小时间和最大时间的参数名称(以前版本是传 NSString 类型, 现在传 NSDate 类型)
-- 修复比较时间大小时出现的bug。
-
-#### 2018-03-19(V2.1.3)
-
-- 修改地址选择器确认选择后的回调参数。
-- 现修改如下:可通过省市区的模型获取省市区的 name(名称)、code(id)、index(索引)`resultBlock:^(BRProvinceModel *province, BRCityModel *city, BRAreaModel *area) {}`
-- 去掉第三方依赖库 `MJExtension` ,修改为手动解析地址数据源。
-
-#### 2018-03-11(V2.1.2)
-
-- 重命名了Github用户名,更新项目相关的路径。(提示:pod之前的版本不受影响)
-
-#### 2018-02-28(V2.1.1)
-
-- 修复某些情况下无法用bundle加载本地数据源(BRCity.plist)bug。
-
-#### 2018-01-26(V2.1.0)
-
-- 给地址选择器添加了一个方法(见方法4),提供数据源参数,支持外部传入地区数据源。
-- 提示:要注意数据源格式,参考 BRCity.json。可以把 BRCity.json 文件的内容放到后台去维护,通过后台接口获取地区数据源(即 BRCity.json 文件的内容)。
-
-#### 2018-01-25(V2.0.0)
-
-- 更新了地址数据源(BRCity.plist),地区信息是2018年最新最全的,与微信的地区信息完全一致。
-- 支持自定义默认选择地址(格式:@[@"浙江省", @"杭州市", @"西湖区"]),支持下次点击进入地址选择器时,默认地址为上次选择的结果。
-- 修改了日期选择器、地址选择器、字符串选择器的接口方法(删除了之前的方法2)。
-- 添加了地址选择器显示类型,支持3种显示:只显示省份、显示省份和城市、显示省市区。
-
-#### 2018-01-05(V1.3.0)
-
-- 添加取消选择的回调方法(点击背景或取消按钮会执行 `cancelBlock` )
-- 合并了字符串选择器 数组数据源和plist数据源对应的方法,`dataSource` 参数支持两种类型:
-
-#### 2018-01-02(V1.2.0)
-
-- 添加支持自定义主题颜色的方法。
-
-#### 2017-11-26(V1.1.0)
-
-- 更换第三方依赖库。
-- 用MJExtension 替换了 原来的YYModel,以前没有注意导入YYModel,同时又导入YYKit会导致重复导入而冲突(另外使用YYModel时,手动导入和pod导入 其中的头文件和方法名也不一样,所以很容易出错)。
-
-#### 2017-11-16(V1.0.0)
-
-- 初始版本!
-
-# 许可证
-
-BRPickerView 使用 MIT 许可证,详情见 LICENSE 文件。

+ 1 - 16
SLAiELTS/Pods/Manifest.lock

@@ -14,18 +14,6 @@ PODS:
   - AFNetworking/Serialization (4.0.1)
   - AFNetworking/UIKit (4.0.1):
     - AFNetworking/NSURLSession
-  - BRPickerView (2.8.1):
-    - BRPickerView/AddressPickerView (= 2.8.1)
-    - BRPickerView/Base (= 2.8.1)
-    - BRPickerView/DatePickerView (= 2.8.1)
-    - BRPickerView/StringPickerView (= 2.8.1)
-  - BRPickerView/AddressPickerView (2.8.1):
-    - BRPickerView/Base
-  - BRPickerView/Base (2.8.1)
-  - BRPickerView/DatePickerView (2.8.1):
-    - BRPickerView/Base
-  - BRPickerView/StringPickerView (2.8.1):
-    - BRPickerView/Base
   - IQKeyboardManager (6.5.6)
   - JXCategoryView (1.5.5)
   - Masonry (1.1.0)
@@ -45,7 +33,6 @@ PODS:
 
 DEPENDENCIES:
   - AFNetworking (~> 4.0.1)
-  - BRPickerView
   - IQKeyboardManager
   - JXCategoryView
   - Masonry
@@ -73,13 +60,11 @@ SPEC REPOS:
     - ZLPhotoBrowser
   trunk:
     - AFNetworking
-    - BRPickerView
     - SocketRocket
     - WZLBadge
 
 SPEC CHECKSUMS:
   AFNetworking: 3bd23d814e976cd148d7d44c3ab78017b744cd58
-  BRPickerView: 2531a2d4d0fea0b57a1c738de215af0f88863a2f
   IQKeyboardManager: 2a6e97afdafc7becf0cb17a9a8d795e3a980717f
   JXCategoryView: 0293fcb356f10a5c2e679dac0a1a5f1899ee0c87
   Masonry: 678fab65091a9290e40e2832a55e7ab731aad201
@@ -93,6 +78,6 @@ SPEC CHECKSUMS:
   WZLBadge: 9ec779dcfd94c825518b395e8315fccaabff1bfa
   ZLPhotoBrowser: 3748fdbeb2b28961c2495d15131dbf413082e1b9
 
-PODFILE CHECKSUM: d286348ab8593a507014c9bcde5a3b8d892e6580
+PODFILE CHECKSUM: 4165313ac93dce48782fdb91b63e6f01bbd12bd8
 
 COCOAPODS: 1.12.0

Diff do ficheiro suprimidas por serem muito extensas
+ 1272 - 1338
SLAiELTS/Pods/Pods.xcodeproj/project.pbxproj


+ 0 - 26
SLAiELTS/Pods/Target Support Files/BRPickerView/BRPickerView-Info.plist

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-  <key>CFBundleDevelopmentRegion</key>
-  <string>${PODS_DEVELOPMENT_LANGUAGE}</string>
-  <key>CFBundleExecutable</key>
-  <string>${EXECUTABLE_NAME}</string>
-  <key>CFBundleIdentifier</key>
-  <string>${PRODUCT_BUNDLE_IDENTIFIER}</string>
-  <key>CFBundleInfoDictionaryVersion</key>
-  <string>6.0</string>
-  <key>CFBundleName</key>
-  <string>${PRODUCT_NAME}</string>
-  <key>CFBundlePackageType</key>
-  <string>FMWK</string>
-  <key>CFBundleShortVersionString</key>
-  <string>2.8.1</string>
-  <key>CFBundleSignature</key>
-  <string>????</string>
-  <key>CFBundleVersion</key>
-  <string>${CURRENT_PROJECT_VERSION}</string>
-  <key>NSPrincipalClass</key>
-  <string></string>
-</dict>
-</plist>

+ 0 - 5
SLAiELTS/Pods/Target Support Files/BRPickerView/BRPickerView-dummy.m

@@ -1,5 +0,0 @@
-#import <Foundation/Foundation.h>
-@interface PodsDummy_BRPickerView : NSObject
-@end
-@implementation PodsDummy_BRPickerView
-@end

+ 0 - 12
SLAiELTS/Pods/Target Support Files/BRPickerView/BRPickerView-prefix.pch

@@ -1,12 +0,0 @@
-#ifdef __OBJC__
-#import <UIKit/UIKit.h>
-#else
-#ifndef FOUNDATION_EXPORT
-#if defined(__cplusplus)
-#define FOUNDATION_EXPORT extern "C"
-#else
-#define FOUNDATION_EXPORT extern
-#endif
-#endif
-#endif
-

+ 0 - 28
SLAiELTS/Pods/Target Support Files/BRPickerView/BRPickerView-umbrella.h

@@ -1,28 +0,0 @@
-#ifdef __OBJC__
-#import <UIKit/UIKit.h>
-#else
-#ifndef FOUNDATION_EXPORT
-#if defined(__cplusplus)
-#define FOUNDATION_EXPORT extern "C"
-#else
-#define FOUNDATION_EXPORT extern
-#endif
-#endif
-#endif
-
-#import "BRPickerView.h"
-#import "BRAddressModel.h"
-#import "BRAddressPickerView.h"
-#import "BRBaseView.h"
-#import "BRPickerStyle.h"
-#import "BRPickerViewMacro.h"
-#import "NSBundle+BRPickerView.h"
-#import "BRDatePickerView+BR.h"
-#import "BRDatePickerView.h"
-#import "NSDate+BRPickerView.h"
-#import "BRResultModel.h"
-#import "BRStringPickerView.h"
-
-FOUNDATION_EXPORT double BRPickerViewVersionNumber;
-FOUNDATION_EXPORT const unsigned char BRPickerViewVersionString[];
-

+ 0 - 12
SLAiELTS/Pods/Target Support Files/BRPickerView/BRPickerView.debug.xcconfig

@@ -1,12 +0,0 @@
-CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO
-CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/BRPickerView
-GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
-PODS_BUILD_DIR = ${BUILD_DIR}
-PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
-PODS_DEVELOPMENT_LANGUAGE = ${DEVELOPMENT_LANGUAGE}
-PODS_ROOT = ${SRCROOT}
-PODS_TARGET_SRCROOT = ${PODS_ROOT}/BRPickerView
-PODS_XCFRAMEWORKS_BUILD_DIR = $(PODS_CONFIGURATION_BUILD_DIR)/XCFrameworkIntermediates
-PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier}
-SKIP_INSTALL = YES
-USE_RECURSIVE_SCRIPT_INPUTS_IN_SCRIPT_PHASES = YES

+ 0 - 6
SLAiELTS/Pods/Target Support Files/BRPickerView/BRPickerView.modulemap

@@ -1,6 +0,0 @@
-framework module BRPickerView {
-  umbrella header "BRPickerView-umbrella.h"
-
-  export *
-  module * { export * }
-}

+ 0 - 12
SLAiELTS/Pods/Target Support Files/BRPickerView/BRPickerView.release.xcconfig

@@ -1,12 +0,0 @@
-CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO
-CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/BRPickerView
-GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
-PODS_BUILD_DIR = ${BUILD_DIR}
-PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
-PODS_DEVELOPMENT_LANGUAGE = ${DEVELOPMENT_LANGUAGE}
-PODS_ROOT = ${SRCROOT}
-PODS_TARGET_SRCROOT = ${PODS_ROOT}/BRPickerView
-PODS_XCFRAMEWORKS_BUILD_DIR = $(PODS_CONFIGURATION_BUILD_DIR)/XCFrameworkIntermediates
-PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier}
-SKIP_INSTALL = YES
-USE_RECURSIVE_SCRIPT_INPUTS_IN_SCRIPT_PHASES = YES

+ 0 - 25
SLAiELTS/Pods/Target Support Files/Pods-SLAiELTS/Pods-SLAiELTS-acknowledgements.markdown

@@ -24,31 +24,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 
 
-## BRPickerView
-
-MIT License
-
-Copyright (c) 2019 91renb
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-
 ## IQKeyboardManager
 
 MIT License

+ 0 - 31
SLAiELTS/Pods/Target Support Files/Pods-SLAiELTS/Pods-SLAiELTS-acknowledgements.plist

@@ -45,37 +45,6 @@ THE SOFTWARE.
 			<key>FooterText</key>
 			<string>MIT License
 
-Copyright (c) 2019 91renb
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-</string>
-			<key>License</key>
-			<string>MIT</string>
-			<key>Title</key>
-			<string>BRPickerView</string>
-			<key>Type</key>
-			<string>PSGroupSpecifier</string>
-		</dict>
-		<dict>
-			<key>FooterText</key>
-			<string>MIT License
-
 Copyright (c) 2013-2017 Iftekhar Qurashi
 
 Permission is hereby granted, free of charge, to any person obtaining a copy

+ 0 - 1
SLAiELTS/Pods/Target Support Files/Pods-SLAiELTS/Pods-SLAiELTS-frameworks-Debug-input-files.xcfilelist

@@ -1,6 +1,5 @@
 ${PODS_ROOT}/Target Support Files/Pods-SLAiELTS/Pods-SLAiELTS-frameworks.sh
 ${BUILT_PRODUCTS_DIR}/AFNetworking/AFNetworking.framework
-${BUILT_PRODUCTS_DIR}/BRPickerView/BRPickerView.framework
 ${BUILT_PRODUCTS_DIR}/IQKeyboardManager/IQKeyboardManager.framework
 ${BUILT_PRODUCTS_DIR}/JXCategoryView/JXCategoryView.framework
 ${BUILT_PRODUCTS_DIR}/MBProgressHUD/MBProgressHUD.framework

+ 0 - 1
SLAiELTS/Pods/Target Support Files/Pods-SLAiELTS/Pods-SLAiELTS-frameworks-Debug-output-files.xcfilelist

@@ -1,5 +1,4 @@
 ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AFNetworking.framework
-${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/BRPickerView.framework
 ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/IQKeyboardManager.framework
 ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/JXCategoryView.framework
 ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MBProgressHUD.framework

+ 0 - 1
SLAiELTS/Pods/Target Support Files/Pods-SLAiELTS/Pods-SLAiELTS-frameworks-Release-input-files.xcfilelist

@@ -1,6 +1,5 @@
 ${PODS_ROOT}/Target Support Files/Pods-SLAiELTS/Pods-SLAiELTS-frameworks.sh
 ${BUILT_PRODUCTS_DIR}/AFNetworking/AFNetworking.framework
-${BUILT_PRODUCTS_DIR}/BRPickerView/BRPickerView.framework
 ${BUILT_PRODUCTS_DIR}/IQKeyboardManager/IQKeyboardManager.framework
 ${BUILT_PRODUCTS_DIR}/JXCategoryView/JXCategoryView.framework
 ${BUILT_PRODUCTS_DIR}/MBProgressHUD/MBProgressHUD.framework

+ 0 - 1
SLAiELTS/Pods/Target Support Files/Pods-SLAiELTS/Pods-SLAiELTS-frameworks-Release-output-files.xcfilelist

@@ -1,5 +1,4 @@
 ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AFNetworking.framework
-${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/BRPickerView.framework
 ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/IQKeyboardManager.framework
 ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/JXCategoryView.framework
 ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MBProgressHUD.framework

+ 0 - 2
SLAiELTS/Pods/Target Support Files/Pods-SLAiELTS/Pods-SLAiELTS-frameworks.sh

@@ -177,7 +177,6 @@ code_sign_if_enabled() {
 
 if [[ "$CONFIGURATION" == "Debug" ]]; then
   install_framework "${BUILT_PRODUCTS_DIR}/AFNetworking/AFNetworking.framework"
-  install_framework "${BUILT_PRODUCTS_DIR}/BRPickerView/BRPickerView.framework"
   install_framework "${BUILT_PRODUCTS_DIR}/IQKeyboardManager/IQKeyboardManager.framework"
   install_framework "${BUILT_PRODUCTS_DIR}/JXCategoryView/JXCategoryView.framework"
   install_framework "${BUILT_PRODUCTS_DIR}/MBProgressHUD/MBProgressHUD.framework"
@@ -193,7 +192,6 @@ if [[ "$CONFIGURATION" == "Debug" ]]; then
 fi
 if [[ "$CONFIGURATION" == "Release" ]]; then
   install_framework "${BUILT_PRODUCTS_DIR}/AFNetworking/AFNetworking.framework"
-  install_framework "${BUILT_PRODUCTS_DIR}/BRPickerView/BRPickerView.framework"
   install_framework "${BUILT_PRODUCTS_DIR}/IQKeyboardManager/IQKeyboardManager.framework"
   install_framework "${BUILT_PRODUCTS_DIR}/JXCategoryView/JXCategoryView.framework"
   install_framework "${BUILT_PRODUCTS_DIR}/MBProgressHUD/MBProgressHUD.framework"

Diff do ficheiro suprimidas por serem muito extensas
+ 2 - 2
SLAiELTS/Pods/Target Support Files/Pods-SLAiELTS/Pods-SLAiELTS.debug.xcconfig


Diff do ficheiro suprimidas por serem muito extensas
+ 2 - 2
SLAiELTS/Pods/Target Support Files/Pods-SLAiELTS/Pods-SLAiELTS.release.xcconfig


+ 112 - 4
SLAiELTS/SLAiELTS.xcodeproj/project.pbxproj

@@ -147,6 +147,18 @@
 		3D5083B02A3839A400E1B2E7 /* SLRemidLookView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3D5083B22A3839A400E1B2E7 /* SLRemidLookView.xib */; };
 		3D5083B72A383BD500E1B2E7 /* SLNewMsgBgView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3D5083B92A383BD500E1B2E7 /* SLNewMsgBgView.xib */; };
 		3D5083BE2A38592100E1B2E7 /* SLRecomFriendsCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3D5083C02A38592100E1B2E7 /* SLRecomFriendsCell.xib */; };
+		3D5084212A3AE05800E1B2E7 /* BRResultModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D5084062A3AE05700E1B2E7 /* BRResultModel.m */; };
+		3D5084222A3AE05800E1B2E7 /* BRStringPickerView.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D5084092A3AE05700E1B2E7 /* BRStringPickerView.m */; };
+		3D5084232A3AE05800E1B2E7 /* BRDatePickerView+BR.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D50840C2A3AE05700E1B2E7 /* BRDatePickerView+BR.m */; };
+		3D5084242A3AE05800E1B2E7 /* NSDate+BRPickerView.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D50840E2A3AE05700E1B2E7 /* NSDate+BRPickerView.m */; };
+		3D5084252A3AE05800E1B2E7 /* BRDatePickerView.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D50840F2A3AE05700E1B2E7 /* BRDatePickerView.m */; };
+		3D5084262A3AE05800E1B2E7 /* BRPickerView.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 3D5084152A3AE05700E1B2E7 /* BRPickerView.bundle */; };
+		3D5084272A3AE05800E1B2E7 /* BRPickerStyle.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D5084162A3AE05700E1B2E7 /* BRPickerStyle.m */; };
+		3D5084282A3AE05800E1B2E7 /* BRBaseView.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D5084172A3AE05700E1B2E7 /* BRBaseView.m */; };
+		3D5084292A3AE05800E1B2E7 /* NSBundle+BRPickerView.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D5084182A3AE05700E1B2E7 /* NSBundle+BRPickerView.m */; };
+		3D50842A2A3AE05800E1B2E7 /* BRAddressModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D50841C2A3AE05700E1B2E7 /* BRAddressModel.m */; };
+		3D50842B2A3AE05800E1B2E7 /* BRAddressPickerView.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 3D50841F2A3AE05700E1B2E7 /* BRAddressPickerView.bundle */; };
+		3D50842C2A3AE05800E1B2E7 /* BRAddressPickerView.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D5084202A3AE05700E1B2E7 /* BRAddressPickerView.m */; };
 		3D58825D2A28397D00F1B38E /* SLCitySetVc.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D58825B2A28397D00F1B38E /* SLCitySetVc.m */; };
 		3D58825E2A28397D00F1B38E /* SLCitySetVc.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3D58825C2A28397D00F1B38E /* SLCitySetVc.xib */; };
 		3D58828B2A2976CD00F1B38E /* SLMsgBgSetVc.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D5882892A2976CD00F1B38E /* SLMsgBgSetVc.m */; };
@@ -571,6 +583,30 @@
 		3D5083BF2A38592100E1B2E7 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/SLRecomFriendsCell.xib; sourceTree = "<group>"; };
 		3D5083C22A38592800E1B2E7 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/SLRecomFriendsCell.strings; sourceTree = "<group>"; };
 		3D5083C42A38592A00E1B2E7 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/SLRecomFriendsCell.strings"; sourceTree = "<group>"; };
+		3D5084062A3AE05700E1B2E7 /* BRResultModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BRResultModel.m; sourceTree = "<group>"; };
+		3D5084072A3AE05700E1B2E7 /* BRStringPickerView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BRStringPickerView.h; sourceTree = "<group>"; };
+		3D5084082A3AE05700E1B2E7 /* BRResultModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BRResultModel.h; sourceTree = "<group>"; };
+		3D5084092A3AE05700E1B2E7 /* BRStringPickerView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BRStringPickerView.m; sourceTree = "<group>"; };
+		3D50840A2A3AE05700E1B2E7 /* BRPickerView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BRPickerView.h; sourceTree = "<group>"; };
+		3D50840C2A3AE05700E1B2E7 /* BRDatePickerView+BR.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "BRDatePickerView+BR.m"; sourceTree = "<group>"; };
+		3D50840D2A3AE05700E1B2E7 /* BRDatePickerView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BRDatePickerView.h; sourceTree = "<group>"; };
+		3D50840E2A3AE05700E1B2E7 /* NSDate+BRPickerView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSDate+BRPickerView.m"; sourceTree = "<group>"; };
+		3D50840F2A3AE05700E1B2E7 /* BRDatePickerView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BRDatePickerView.m; sourceTree = "<group>"; };
+		3D5084102A3AE05700E1B2E7 /* BRDatePickerView+BR.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "BRDatePickerView+BR.h"; sourceTree = "<group>"; };
+		3D5084112A3AE05700E1B2E7 /* NSDate+BRPickerView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSDate+BRPickerView.h"; sourceTree = "<group>"; };
+		3D5084132A3AE05700E1B2E7 /* NSBundle+BRPickerView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSBundle+BRPickerView.h"; sourceTree = "<group>"; };
+		3D5084142A3AE05700E1B2E7 /* BRPickerViewMacro.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BRPickerViewMacro.h; sourceTree = "<group>"; };
+		3D5084152A3AE05700E1B2E7 /* BRPickerView.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = BRPickerView.bundle; sourceTree = "<group>"; };
+		3D5084162A3AE05700E1B2E7 /* BRPickerStyle.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BRPickerStyle.m; sourceTree = "<group>"; };
+		3D5084172A3AE05700E1B2E7 /* BRBaseView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BRBaseView.m; sourceTree = "<group>"; };
+		3D5084182A3AE05700E1B2E7 /* NSBundle+BRPickerView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSBundle+BRPickerView.m"; sourceTree = "<group>"; };
+		3D5084192A3AE05700E1B2E7 /* BRBaseView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BRBaseView.h; sourceTree = "<group>"; };
+		3D50841A2A3AE05700E1B2E7 /* BRPickerStyle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BRPickerStyle.h; sourceTree = "<group>"; };
+		3D50841C2A3AE05700E1B2E7 /* BRAddressModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BRAddressModel.m; sourceTree = "<group>"; };
+		3D50841D2A3AE05700E1B2E7 /* BRAddressPickerView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BRAddressPickerView.h; sourceTree = "<group>"; };
+		3D50841E2A3AE05700E1B2E7 /* BRAddressModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BRAddressModel.h; sourceTree = "<group>"; };
+		3D50841F2A3AE05700E1B2E7 /* BRAddressPickerView.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = BRAddressPickerView.bundle; sourceTree = "<group>"; };
+		3D5084202A3AE05700E1B2E7 /* BRAddressPickerView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BRAddressPickerView.m; sourceTree = "<group>"; };
 		3D58825A2A28397D00F1B38E /* SLCitySetVc.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SLCitySetVc.h; sourceTree = "<group>"; };
 		3D58825B2A28397D00F1B38E /* SLCitySetVc.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SLCitySetVc.m; sourceTree = "<group>"; };
 		3D58825C2A28397D00F1B38E /* SLCitySetVc.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SLCitySetVc.xib; sourceTree = "<group>"; };
@@ -1153,6 +1189,7 @@
 		3D2510AF29AF1943000AE530 /* Tool */ = {
 			isa = PBXGroup;
 			children = (
+				3D5084042A3AE05700E1B2E7 /* BRPickerView */,
 				3D50835C2A37038F00E1B2E7 /* Localizable */,
 				3D1F17AF2A0DE60100F030AD /* JZLocationConverter */,
 				3D1F17AB2A0DE55D00F030AD /* GPSLocation */,
@@ -1409,6 +1446,69 @@
 			path = Localizable;
 			sourceTree = "<group>";
 		};
+		3D5084042A3AE05700E1B2E7 /* BRPickerView */ = {
+			isa = PBXGroup;
+			children = (
+				3D5084052A3AE05700E1B2E7 /* StringPickerView */,
+				3D50840A2A3AE05700E1B2E7 /* BRPickerView.h */,
+				3D50840B2A3AE05700E1B2E7 /* DatePickerView */,
+				3D5084122A3AE05700E1B2E7 /* Base */,
+				3D50841B2A3AE05700E1B2E7 /* AddressPickerView */,
+			);
+			path = BRPickerView;
+			sourceTree = "<group>";
+		};
+		3D5084052A3AE05700E1B2E7 /* StringPickerView */ = {
+			isa = PBXGroup;
+			children = (
+				3D5084062A3AE05700E1B2E7 /* BRResultModel.m */,
+				3D5084072A3AE05700E1B2E7 /* BRStringPickerView.h */,
+				3D5084082A3AE05700E1B2E7 /* BRResultModel.h */,
+				3D5084092A3AE05700E1B2E7 /* BRStringPickerView.m */,
+			);
+			path = StringPickerView;
+			sourceTree = "<group>";
+		};
+		3D50840B2A3AE05700E1B2E7 /* DatePickerView */ = {
+			isa = PBXGroup;
+			children = (
+				3D50840C2A3AE05700E1B2E7 /* BRDatePickerView+BR.m */,
+				3D50840D2A3AE05700E1B2E7 /* BRDatePickerView.h */,
+				3D50840E2A3AE05700E1B2E7 /* NSDate+BRPickerView.m */,
+				3D50840F2A3AE05700E1B2E7 /* BRDatePickerView.m */,
+				3D5084102A3AE05700E1B2E7 /* BRDatePickerView+BR.h */,
+				3D5084112A3AE05700E1B2E7 /* NSDate+BRPickerView.h */,
+			);
+			path = DatePickerView;
+			sourceTree = "<group>";
+		};
+		3D5084122A3AE05700E1B2E7 /* Base */ = {
+			isa = PBXGroup;
+			children = (
+				3D5084132A3AE05700E1B2E7 /* NSBundle+BRPickerView.h */,
+				3D5084142A3AE05700E1B2E7 /* BRPickerViewMacro.h */,
+				3D5084152A3AE05700E1B2E7 /* BRPickerView.bundle */,
+				3D5084162A3AE05700E1B2E7 /* BRPickerStyle.m */,
+				3D5084172A3AE05700E1B2E7 /* BRBaseView.m */,
+				3D5084182A3AE05700E1B2E7 /* NSBundle+BRPickerView.m */,
+				3D5084192A3AE05700E1B2E7 /* BRBaseView.h */,
+				3D50841A2A3AE05700E1B2E7 /* BRPickerStyle.h */,
+			);
+			path = Base;
+			sourceTree = "<group>";
+		};
+		3D50841B2A3AE05700E1B2E7 /* AddressPickerView */ = {
+			isa = PBXGroup;
+			children = (
+				3D50841E2A3AE05700E1B2E7 /* BRAddressModel.h */,
+				3D50841C2A3AE05700E1B2E7 /* BRAddressModel.m */,
+				3D50841D2A3AE05700E1B2E7 /* BRAddressPickerView.h */,
+				3D5084202A3AE05700E1B2E7 /* BRAddressPickerView.m */,
+				3D50841F2A3AE05700E1B2E7 /* BRAddressPickerView.bundle */,
+			);
+			path = AddressPickerView;
+			sourceTree = "<group>";
+		};
 		3D58828D2A29B9DB00F1B38E /* Resources */ = {
 			isa = PBXGroup;
 			children = (
@@ -2118,7 +2218,9 @@
 				3D8EBBCE2A14B6EC0008B0C1 /* SLWebViewController.xib in Resources */,
 				3DA5AF6A29B88875009E4925 /* SLLxViewController.xib in Resources */,
 				3D1B986929BEAFEB0008D01A /* SLHorScrBtns.xib in Resources */,
+				3D5084262A3AE05800E1B2E7 /* BRPickerView.bundle in Resources */,
 				3DF3DAFB29BB187D00CAD3AB /* SLHomeTopCollectionViewCell.xib in Resources */,
+				3D50842B2A3AE05800E1B2E7 /* BRAddressPickerView.bundle in Resources */,
 				3DF3DAAE29B9AA3400CAD3AB /* SLMyListCollectionViewCell.xib in Resources */,
 				3D5083512A36F4B200E1B2E7 /* Localizable.strings in Resources */,
 				3DB97D9529D6ABF000B12754 /* MLEmoji_Expression.plist in Resources */,
@@ -2222,6 +2324,7 @@
 				3DB97D4029D6A86E00B12754 /* SDTimeLineCellCommentView.m in Sources */,
 				3D2D8BE929DE55A9009392DA /* NSString+PinYin4Cocoa.m in Sources */,
 				3D1B9D0529C1A14A0008D01A /* UIImagePickerController+YMBlocks.m in Sources */,
+				3D5084282A3AE05800E1B2E7 /* BRBaseView.m in Sources */,
 				3D2DC3C429B0716E0041A729 /* SLNuisdkPlay.m in Sources */,
 				3DF3DAD229BAC90F00CAD3AB /* SLModifyNicknameVc.m in Sources */,
 				3DF3DAF229BB131100CAD3AB /* RDVTabBarItem.m in Sources */,
@@ -2232,6 +2335,7 @@
 				3DF3DAD729BAD1BA00CAD3AB /* SLChangeMobileVc.m in Sources */,
 				3D1B987729BEE6640008D01A /* SLLxTopView.m in Sources */,
 				3D1B9CF329C044AA0008D01A /* SLPickView.m in Sources */,
+				3D5084252A3AE05800E1B2E7 /* BRDatePickerView.m in Sources */,
 				3D25106029AC95A9000AE530 /* SLRetrievePWViewController.m in Sources */,
 				3D25105629AC8FE1000AE530 /* SLRegistViewController.m in Sources */,
 				3DB97D3F29D6A86E00B12754 /* SDTimeLineCellOperationMenu.m in Sources */,
@@ -2241,6 +2345,7 @@
 				3D50834E2A2D6E7200E1B2E7 /* SLWebSocketManager.m in Sources */,
 				3D2DC3ED29B09B3B0041A729 /* UICollectionViewCell+YMHelper.m in Sources */,
 				3DF3DACD29B9D30A00CAD3AB /* UITableView+Extension.m in Sources */,
+				3D50842C2A3AE05800E1B2E7 /* BRAddressPickerView.m in Sources */,
 				3D1B988A29BEF1020008D01A /* SLLxTopCell.m in Sources */,
 				3D25109D29AEEDBE000AE530 /* UIView+Extension.m in Sources */,
 				3DA5AF6929B88875009E4925 /* SLLxViewController.m in Sources */,
@@ -2273,6 +2378,7 @@
 				3DB97D4529D6A86E00B12754 /* SDWeiXinPhotoContainerView.m in Sources */,
 				3D2DC3F429B1E6320041A729 /* SLMikeInputView.m in Sources */,
 				3D2DC3BF29B0709F0041A729 /* NLSRingBuffer.mm in Sources */,
+				3D5084212A3AE05800E1B2E7 /* BRResultModel.m in Sources */,
 				3D25108829ADD46C000AE530 /* SLRoleLabelView.m in Sources */,
 				3D2510D129AF3DC4000AE530 /* SLLoginInfo.m in Sources */,
 				3D8EBBC72A131FA40008B0C1 /* SLHomeMsgTableViewCell.m in Sources */,
@@ -2301,6 +2407,7 @@
 				3DB97DA129D6ABF000B12754 /* NSString+MLExpression.m in Sources */,
 				3D24D41129DEB23C00014D1C /* ZLPhotoBrowerView.m in Sources */,
 				3D25109529AEDD7A000AE530 /* SLRoleCreatSucView.m in Sources */,
+				3D5084272A3AE05800E1B2E7 /* BRPickerStyle.m in Sources */,
 				3DFEE71429B5DCAD000AA7D5 /* SLNuiSpeechRecognizer.m in Sources */,
 				3DB97D4429D6A86E00B12754 /* SDTimeLineRefreshHeader.m in Sources */,
 				3D8515D929CD92A400418BAB /* JXCategoryTitleBackgroundView.m in Sources */,
@@ -2324,6 +2431,7 @@
 				3DB97D4D29D6AAC500B12754 /* UITableView+SDAutoTableViewCellHeight.m in Sources */,
 				3D25107729AD8C13000AE530 /* RoleModel.m in Sources */,
 				3DBC3BC82A0B650300E8C766 /* SLNearbyPeopleCell.m in Sources */,
+				3D5084242A3AE05800E1B2E7 /* NSDate+BRPickerView.m in Sources */,
 				3DB97DA329D6ABF000B12754 /* MLLabel.m in Sources */,
 				3DFEE71729B5E7F9000AA7D5 /* SLAuthorizationManager.m in Sources */,
 				3D2DC3DE29B0991E0041A729 /* YMIMBaseMessageCell.m in Sources */,
@@ -2360,6 +2468,7 @@
 				3D19CBEE29E682C20041A6B8 /* SLChatListModel.m in Sources */,
 				3D5083612A3703A800E1B2E7 /* NSBundle+DAUtils.m in Sources */,
 				3DFEE70E29B5CB01000AA7D5 /* SLMikeSegmentModel.m in Sources */,
+				3D5084222A3AE05800E1B2E7 /* BRStringPickerView.m in Sources */,
 				3D2D8BF829DE5AE4009392DA /* SCIndexViewConfiguration.m in Sources */,
 				3D2510CB29AF3306000AE530 /* SLUserModel.m in Sources */,
 				3D2DC3F129B191C80041A729 /* MessageModel.m in Sources */,
@@ -2381,6 +2490,7 @@
 				3D9961FD29CD2FB00076DBD1 /* SLContentBaseViewController.m in Sources */,
 				3D2D8BEB29DE55A9009392DA /* HanyuPinyinOutputFormat.m in Sources */,
 				3DB97D3E29D6A86E00B12754 /* SDTimeLineCellModel.m in Sources */,
+				3D5084292A3AE05800E1B2E7 /* NSBundle+BRPickerView.m in Sources */,
 				3DFEE71129B5D11E000AA7D5 /* UIButton+TitleAndImageLayout.m in Sources */,
 				3D25108429ADA027000AE530 /* SLInterestView.m in Sources */,
 				3D5BC38F29E3F87100748197 /* SLFriensInfoVc.m in Sources */,
@@ -2397,11 +2507,13 @@
 				3D1B9D0C29C2A1360008D01A /* SLPlaceholderCell.m in Sources */,
 				3DB97D6F29D6ABC100B12754 /* SDRefreshView.m in Sources */,
 				3DF3DAC229B9C6E000CAD3AB /* YMBarButtonItem.m in Sources */,
+				3D50842A2A3AE05800E1B2E7 /* BRAddressModel.m in Sources */,
 				3DFEE70B29B5B298000AA7D5 /* SLMikeSegment.m in Sources */,
 				3D2DC3E429B099B50041A729 /* YMChatBottomView.m in Sources */,
 				3D3BC1C62A25903700AEEE8E /* SLMomentsNewsVc.m in Sources */,
 				3D25106529AC9694000AE530 /* SLBaseNavigationController.m in Sources */,
 				3D24D41229DEB23C00014D1C /* ImageCell.m in Sources */,
+				3D5084232A3AE05800E1B2E7 /* BRDatePickerView+BR.m in Sources */,
 				3DB97D4C29D6AAC500B12754 /* UIView+SDAutoLayout.m in Sources */,
 				3D2DC3DF29B0991E0041A729 /* YMIMHintView.m in Sources */,
 				3DA2C73C29CBE4DD0087CDB4 /* SLRoleappearanceView.m in Sources */,
@@ -2759,8 +2871,6 @@
 					"-framework",
 					"\"AFNetworking\"",
 					"-framework",
-					"\"BRPickerView\"",
-					"-framework",
 					"\"CoreGraphics\"",
 					"-framework",
 					"\"Foundation\"",
@@ -2847,8 +2957,6 @@
 					"-framework",
 					"\"AFNetworking\"",
 					"-framework",
-					"\"BRPickerView\"",
-					"-framework",
 					"\"CoreGraphics\"",
 					"-framework",
 					"\"Foundation\"",

+ 18 - 0
SLAiELTS/Pods/BRPickerView/BRPickerView/AddressPickerView/BRAddressModel.h → SLAiELTS/SLAiELTS/Tool/BRPickerView/AddressPickerView/BRAddressModel.h

@@ -48,4 +48,22 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
+@interface BRAddressModel : NSObject
+
+@property (nullable, nonatomic, copy) NSString *code;
+
+@property (nullable, nonatomic, copy) NSString *name;
+
+@property (nullable, nonatomic, copy) NSString *deep;
+
+@property (nullable, nonatomic, copy) NSString *pinyinPrefix;
+
+@property (nullable, nonatomic, copy) NSString *pinyin;
+
+@property (nullable, nonatomic, copy) NSString *extCode;
+
+@property (nullable, nonatomic, copy) NSString *extName;
+
+@end
+
 NS_ASSUME_NONNULL_END

+ 12 - 0
SLAiELTS/Pods/BRPickerView/BRPickerView/AddressPickerView/BRAddressModel.m → SLAiELTS/SLAiELTS/Tool/BRPickerView/AddressPickerView/BRAddressModel.m

@@ -22,3 +22,15 @@
 @implementation BRAreaModel
 
 @end
+
+@implementation BRAddressModel
+
++ (NSDictionary *)mj_replacedKeyFromPropertyName {
+   return @{
+            @"code" : @"id",
+            @"pinyinPrefix" : @"pinyin_prefix",
+            @"extCode" : @"ext_id",
+            @"extName" : @"ext_name",};
+}
+
+@end

+ 0 - 0
SLAiELTS/Pods/BRPickerView/BRPickerView/AddressPickerView/BRAddressPickerView.bundle/BRCity.json → SLAiELTS/SLAiELTS/Tool/BRPickerView/AddressPickerView/BRAddressPickerView.bundle/BRCity.json


+ 0 - 0
SLAiELTS/Pods/BRPickerView/BRPickerView/AddressPickerView/BRAddressPickerView.h → SLAiELTS/SLAiELTS/Tool/BRPickerView/AddressPickerView/BRAddressPickerView.h


+ 0 - 0
SLAiELTS/Pods/BRPickerView/BRPickerView/AddressPickerView/BRAddressPickerView.m → SLAiELTS/SLAiELTS/Tool/BRPickerView/AddressPickerView/BRAddressPickerView.m


+ 0 - 0
SLAiELTS/Pods/BRPickerView/BRPickerView/BRPickerView.h → SLAiELTS/SLAiELTS/Tool/BRPickerView/BRPickerView.h


+ 0 - 0
SLAiELTS/Pods/BRPickerView/BRPickerView/Base/BRBaseView.h → SLAiELTS/SLAiELTS/Tool/BRPickerView/Base/BRBaseView.h


+ 0 - 0
SLAiELTS/Pods/BRPickerView/BRPickerView/Base/BRBaseView.m → SLAiELTS/SLAiELTS/Tool/BRPickerView/Base/BRBaseView.m


+ 0 - 0
SLAiELTS/Pods/BRPickerView/BRPickerView/Base/BRPickerStyle.h → SLAiELTS/SLAiELTS/Tool/BRPickerView/Base/BRPickerStyle.h


+ 3 - 3
SLAiELTS/Pods/BRPickerView/BRPickerView/Base/BRPickerStyle.m → SLAiELTS/SLAiELTS/Tool/BRPickerView/Base/BRPickerStyle.m

@@ -114,7 +114,7 @@
 
 - (NSString *)cancelBtnTitle {
     if (!_cancelBtnTitle && !_cancelBtnImage) {
-        _cancelBtnTitle = [NSBundle br_localizedStringForKey:NSLocalizedString(@"取消", nil) language:self.language];
+        _cancelBtnTitle = [NSBundle br_localizedStringForKey:@"取消" language:self.language];
     }
     return _cancelBtnTitle;
 }
@@ -192,7 +192,7 @@
 
 - (CGRect)doneBtnFrame {
     if (CGRectEqualToRect(_doneBtnFrame, CGRectZero) || _doneBtnFrame.size.height == 0) {
-        _doneBtnFrame = CGRectMake(BRGetKeyWindow().bounds.size.width - 80 - 5, 8, 80, 28);
+        _doneBtnFrame = CGRectMake(BRGetKeyWindow().bounds.size.width - 60 - 5, 8, 60, 28);
     }
     return _doneBtnFrame;
 }
@@ -321,7 +321,7 @@
         customStyle.doneTextColor = doneTextColor;
         customStyle.doneTextFont = [UIFont boldSystemFontOfSize:18.0f];
         customStyle.doneBtnFrame = CGRectMake(BRGetKeyWindow().bounds.size.width - 60, 4, 60, 40);
-        customStyle.doneBtnTitle = [NSBundle br_localizedStringForKey:NSLocalizedString(@"完成", nil) language:customStyle.language];
+        customStyle.doneBtnTitle = [NSBundle br_localizedStringForKey:@"完成" language:customStyle.language];
         customStyle.selectRowTextColor = doneTextColor;
         customStyle.selectRowTextFont = [UIFont boldSystemFontOfSize:20.0f];
     }

+ 0 - 0
SLAiELTS/Pods/BRPickerView/BRPickerView/Base/BRPickerView.bundle/en.lproj/Localizable.strings → SLAiELTS/SLAiELTS/Tool/BRPickerView/Base/BRPickerView.bundle/en.lproj/Localizable.strings


+ 0 - 0
SLAiELTS/Pods/BRPickerView/BRPickerView/Base/BRPickerView.bundle/zh-Hans.lproj/Localizable.strings → SLAiELTS/SLAiELTS/Tool/BRPickerView/Base/BRPickerView.bundle/zh-Hans.lproj/Localizable.strings


+ 0 - 0
SLAiELTS/Pods/BRPickerView/BRPickerView/Base/BRPickerView.bundle/zh-Hant.lproj/Localizable.strings → SLAiELTS/SLAiELTS/Tool/BRPickerView/Base/BRPickerView.bundle/zh-Hant.lproj/Localizable.strings


+ 0 - 0
SLAiELTS/Pods/BRPickerView/BRPickerView/Base/BRPickerViewMacro.h → SLAiELTS/SLAiELTS/Tool/BRPickerView/Base/BRPickerViewMacro.h


+ 0 - 0
SLAiELTS/Pods/BRPickerView/BRPickerView/Base/NSBundle+BRPickerView.h → SLAiELTS/SLAiELTS/Tool/BRPickerView/Base/NSBundle+BRPickerView.h


+ 0 - 0
SLAiELTS/Pods/BRPickerView/BRPickerView/Base/NSBundle+BRPickerView.m → SLAiELTS/SLAiELTS/Tool/BRPickerView/Base/NSBundle+BRPickerView.m


+ 0 - 0
SLAiELTS/Pods/BRPickerView/BRPickerView/DatePickerView/BRDatePickerView+BR.h → SLAiELTS/SLAiELTS/Tool/BRPickerView/DatePickerView/BRDatePickerView+BR.h


+ 0 - 0
SLAiELTS/Pods/BRPickerView/BRPickerView/DatePickerView/BRDatePickerView+BR.m → SLAiELTS/SLAiELTS/Tool/BRPickerView/DatePickerView/BRDatePickerView+BR.m


+ 0 - 0
SLAiELTS/Pods/BRPickerView/BRPickerView/DatePickerView/BRDatePickerView.h → SLAiELTS/SLAiELTS/Tool/BRPickerView/DatePickerView/BRDatePickerView.h


+ 0 - 0
SLAiELTS/Pods/BRPickerView/BRPickerView/DatePickerView/BRDatePickerView.m → SLAiELTS/SLAiELTS/Tool/BRPickerView/DatePickerView/BRDatePickerView.m


+ 0 - 0
SLAiELTS/Pods/BRPickerView/BRPickerView/DatePickerView/NSDate+BRPickerView.h → SLAiELTS/SLAiELTS/Tool/BRPickerView/DatePickerView/NSDate+BRPickerView.h


+ 0 - 0
SLAiELTS/Pods/BRPickerView/BRPickerView/DatePickerView/NSDate+BRPickerView.m → SLAiELTS/SLAiELTS/Tool/BRPickerView/DatePickerView/NSDate+BRPickerView.m


+ 0 - 0
SLAiELTS/Pods/BRPickerView/BRPickerView/StringPickerView/BRResultModel.h → SLAiELTS/SLAiELTS/Tool/BRPickerView/StringPickerView/BRResultModel.h


+ 0 - 0
SLAiELTS/Pods/BRPickerView/BRPickerView/StringPickerView/BRResultModel.m → SLAiELTS/SLAiELTS/Tool/BRPickerView/StringPickerView/BRResultModel.m


+ 0 - 0
SLAiELTS/Pods/BRPickerView/BRPickerView/StringPickerView/BRStringPickerView.h → SLAiELTS/SLAiELTS/Tool/BRPickerView/StringPickerView/BRStringPickerView.h


+ 0 - 0
SLAiELTS/Pods/BRPickerView/BRPickerView/StringPickerView/BRStringPickerView.m → SLAiELTS/SLAiELTS/Tool/BRPickerView/StringPickerView/BRStringPickerView.m


Alguns ficheiros não foram mostrados porque muitos ficheiros mudaram neste diff