0.0.19 把DSAlertView移入base库分页滑动视图修改

毕珂
1 parent c409dd8b
Showing 7 changed files with 4 additions and 74 deletions
DSToolsModuleF.podspec
DSToolsModuleF/Frameworks/DSToolsModule.framework/DSToolsModule
DSToolsModuleF/Frameworks/DSToolsModule.framework/Headers/BKPageControlMenuView.h
DSToolsModuleF/Frameworks/DSToolsModule.framework/Headers/DSAlertView.h
DSToolsModuleF/Frameworks/DSToolsModule.framework/Headers/DSToolsModule-umbrella.h
DSToolsModuleF/Frameworks/DSToolsModule.framework/Headers/DSToolsModule.h
DSToolsModuleF/Frameworks/DSToolsModule.framework/Info.plist
 Pod::Spec.new do |s|
   s.name                   = "DSToolsModuleF"
-  s.version                = "0.0.18"
+  s.version                = "0.0.19"
   s.summary                = "DSToolsModuleF"
   s.homepage               = "http://bj.gitlab.cnlive.com/DSIOSTeam"
   s.authors                = { "DSIOSTeam" => "694092596@qq.com" }
@@ -10,6 +10,7 @@ Pod::Spec.new do |s|
   s.ios.deployment_target  = '9.0'
   s.vendored_frameworks    = "DSToolsModuleF/Frameworks/DSToolsModule.framework"
   s.frameworks             = 'Foundation', 'UIKit', 'CoreLocation', 'MapKit'
+  
   s.dependency 'MJRefresh', '3.2.0'
   s.dependency 'MBProgressHUD', '1.1.0'
   s.dependency 'SDWebImage', '~> 5.2.3'
@@ -117,6 +117,8 @@ NS_ASSUME_NONNULL_BEGIN
  导航内容视图
  */
 @property (nonatomic,strong) UIScrollView * contentView;
+/// 导航内容视图的宽 默认0（实际和导航视图一样宽）
+@property (nonatomic,assign) CGFloat contentViewWidth;
 /**
  导航内容视图底部分割线
  */
-//
-//  DSAlertView.h
-//  zhaolin
-//
-//  Created by 兆林 on 2017/7/21.
-//  Copyright © 2017年 zhaolin. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-@interface DSAlertView : UIView
-
-#pragma mark - 初始化方法
-
-/// 标题
-@property (nonatomic,copy,readonly,nullable) NSString * title;
-/// 内容
-@property (nonatomic,copy,readonly,nullable) NSString * content;
-/// 按钮标题数据
-@property (nonatomic,copy,readonly,nullable) NSArray<NSString*> * actionTitleArr;
-
-/// 初始化方法
-/// @param title 标题
-/// @param content 内容
-/// @param actionTitleArr 按钮
-/// @param actionMethod 按钮事件
--(nonnull instancetype)initWithTitle:(nullable NSString*)title content:(nullable NSString*)content actionTitleArr:(nullable NSArray<NSString*>*)actionTitleArr actionMethod:(nullable void (^)(NSInteger index))actionMethod;
-
-#pragma mark - 富文本初始化方法
-
-/// 标题
-@property (nonatomic,copy,readonly,nullable) NSAttributedString * attrTitle;
-/// 内容
-@property (nonatomic,copy,readonly,nullable) NSAttributedString * attrContent;
-/// 按钮标题数据
-@property (nonatomic,copy,readonly,nullable) NSArray<NSAttributedString*> * attrActionTitleArr;
-
-/// 富文本初始化方法
-/// @param title 标题
-/// @param content 内容
-/// @param actionTitleArr 按钮
-/// @param actionMethod 按钮事件
--(nonnull instancetype)initWithAttrTitle:(nullable NSAttributedString*)title content:(nullable NSAttributedString*)content actionTitleArr:(nullable NSArray<NSAttributedString*>*)actionTitleArr actionMethod:(nullable void (^)(NSInteger index))actionMethod;
-
-#pragma mark - 属性
-
-/// 标题字号(富文本创建无效)
-@property (nonatomic,strong,nullable) UIFont * titleFont;
-/// 标题颜色(富文本创建无效)
-@property (nonatomic,strong,nullable) UIColor * titleColor;
-/// 内容字号(富文本创建无效)
-@property (nonatomic,strong,nullable) UIFont * contentFont;
-/// 内容颜色(富文本创建无效)
-@property (nonatomic,strong,nullable) UIColor * contentColor;
-/// 按钮字号(富文本创建无效)
-@property (nonatomic,strong,nullable) UIFont * actionTitleFont;
-/// 按钮颜色(富文本创建无效) 修改完这个属性actionTitleColors所有颜色统一为actionTitleColor
-@property (nonatomic,strong,nullable) UIColor * actionTitleColor;
-/// 按钮颜色数组(富文本创建无效)
-@property (nonatomic,copy,nonnull,readonly) NSArray<UIColor*> * actionTitleColors;
-/// 线的颜色
-@property (nonatomic,strong,nullable) UIColor * lineColor;
-
-#pragma mark - 方法
-
-/// 修改个别按钮颜色(富文本创建无效)
-/// @param color 按钮颜色
-/// @param index 对应索引
--(void)setActionTitleColor:(nonnull UIColor*)color correspondingIndex:(NSUInteger)index;
-
-@end
@@ -32,7 +32,6 @@
 #import "BKPickerView.h"
 #import "NSDate+BKPickerView.h"
 #import "BKTimer.h"
-#import "DSAlertView.h"
 #import "DSCollectionViewFluidLayout.h"
 #import "DSGradientView.h"
 #import "DSLocationManager.h"
@@ -14,7 +14,6 @@
 #import "BKPageControlView.h"
 #import "BKPickerView.h"
 #import "BKTimer.h"
-#import "DSAlertView.h"
 #import "DSCollectionViewFluidLayout.h"
 #import "DSGradientView.h"
 #import "DSLocationManager.h"