修改计算文本方法加入DSTextView DSGradientView

毕珂
1 parent 21dd9d94
Showing 11 changed files with 128 additions and 24 deletions
DSBaseModuleF.podspec
DSBaseModuleF/Frameworks/DSBaseModule.framework/DSBaseModule
DSBaseModuleF/Frameworks/DSBaseModule.framework/Headers/DSBaseModule-umbrella.h
DSBaseModuleF/Frameworks/DSBaseModule.framework/Headers/DSBaseModule.h
DSBaseModuleF/Frameworks/DSBaseModule.framework/Headers/DSGradientView.h
DSBaseModuleF/Frameworks/DSBaseModule.framework/Headers/DSTextView.h
DSBaseModuleF/Frameworks/DSBaseModule.framework/Headers/NSString+DSBaseModule.h
DSBaseModuleF/Frameworks/DSBaseModule.framework/Headers/UILabel+DSBaseModule.h
DSBaseModuleF/Frameworks/DSBaseModule.framework/Headers/UITextField+DSBaseModule.h
DSBaseModuleF/Frameworks/DSBaseModule.framework/Headers/UITextView+DSBaseModule.h
DSBaseModuleF/Frameworks/DSBaseModule.framework/Info.plist
 Pod::Spec.new do |s|
  
   s.name                   = "DSBaseModuleF"
-  s.version                = "0.0.31"
+  s.version                = "0.0.32"
   s.summary                = "DSBaseModuleF"
   s.homepage               = "http://bj.gitlab.cnlive.com/DSIOSTeam"
   s.authors                = { "DSIOSTeam" => "694092596@qq.com" }
@@ -21,6 +21,7 @@
 #import "DSCollectionView.h"
 #import "DSEmptyView.h"
 #import "UIView+DSEmptyView.h"
+#import "DSGradientView.h"
 #import "DSImageManager.h"
 #import "DSImageView+DSBaseControlsModule.h"
 #import "DSImageView.h"
@@ -40,6 +41,7 @@
 #import "DSTabBarViewController.h"
 #import "DSTableView.h"
 #import "DSTableViewCell.h"
+#import "DSTextView.h"
 #import "MKMapView+DSBaseModule.h"
 #import "NSAttributedString+DSBaseModule.h"
 #import "NSDate+DSBaseModule.h"
@@ -52,6 +54,7 @@
 #import "UILabel+DSBaseModule.h"
 #import "UIScrollView+DSBaseModule.h"
 #import "UITextField+DSBaseModule.h"
+#import "UITextView+DSBaseModule.h"
 #import "UIView+DSBaseModule.h"
  
 FOUNDATION_EXPORT double DSBaseModuleVersionNumber;
@@ -27,6 +27,7 @@
 #import "UIScrollView+DSBaseModule.h"
 #import "UIColor+DSBaseModule.h"
 #import "MKMapView+DSBaseModule.h"
+#import "UITextView+DSBaseModule.h"
  
 #import "DSBaseViewController.h"
 #import "DSTabBarViewController.h"
@@ -49,5 +50,7 @@
 #import "DSRefreshHeader.h"
 #import "DSRefreshFooter.h"
 #import "DSAlertView.h"
+#import "DSGradientView.h"
+#import "DSTextView.h"
  
 #endif /* DSBaseModule_h */
+//
+//  DSGradientView.h
+//  DSCnliveShopSDK
+//
+//  Created by zhaolin on 2019/8/19.
+//  Copyright © 2019 BIKE. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface DSGradientView : UIView
+
+/**
+ 颜色数组
+ */
+@property (nonatomic, copy) NSArray<UIColor*> * colors;
+/**
+ 起点
+ */
+@property (nonatomic, assign) CGPoint startPoint;
+/**
+ 终点
+ */
+@property (nonatomic, assign) CGPoint endPoint;
+/**
+ 透明度
+ */
+@property (nonatomic, assign) float opacity;
+
+@end
+
+NS_ASSUME_NONNULL_END
+//
+//  DSTextView.h
+//  DSCnliveShopSDK
+//
+//  Created by zhaolin on 2018/10/24.
+//
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface DSTextView : UITextView
+
+/// 占位文字
+@property (nonatomic,copy) NSString * placeholder;
+/// 占位文字颜色
+@property (nonatomic,strong) UIColor * placeholderColor;
+
+@end
+
+NS_ASSUME_NONNULL_END
@@ -81,14 +81,33 @@ typedef NS_ENUM(NSUInteger, DSStringAESStyle) {//AES加密方式
 -(CGSize)calculateSizeWithUIWidth:(CGFloat)width font:(UIFont*)font;
  
 /**
+ 计算文本大小(固定宽)
+
+ @param width 固定宽度
+ @param attributes 文字信息
+ @return 文本大小
+ */
+-(CGSize)calculateSizeWithUIWidth:(CGFloat)width attributes:(NSDictionary<NSAttributedStringKey, id> *)attributes;
+
+/**
  计算文本大小(固定高)
  
- @param height 固定宽度
+ @param height 固定高度
  @param font 字体大小
  @return 文本大小
  */
 -(CGSize)calculateSizeWithUIHeight:(CGFloat)height font:(UIFont*)font;
  
+/**
+ 计算文本大小(固定高)
+ 
+ @param height 固定高度
+ @param attributes 文字信息
+ @return 文本大小
+ */
+-(CGSize)calculateSizeWithUIHeight:(CGFloat)height attributes:(NSDictionary<NSAttributedStringKey, id> *)attributes;
+
+
 #pragma mark - 删除小数点后的0
  
 /**
@@ -14,21 +14,19 @@ NS_ASSUME_NONNULL_BEGIN
  
 #pragma mark - 计算文本大小
  
-/**
- 根据行数计算文本的高
- 
- @param count 限制行数
- @return 高度
- */
+/// 计算宽
+-(CGFloat)calculateWidth;
+
+/// 计算高
+-(CGFloat)calculateHeight;
+
+/// 根据行数计算文本的高
+/// @param count 限制行数
 -(CGFloat)calculateHeightWithLimitLineCount:(NSUInteger)count;
  
 #pragma mark - 分行
  
-/**
- 分行
-
- @return 每行的字数组
- */
+/// 分行
 -(NSArray<NSString*>*)separatedLines;
  
 @end
@@ -12,19 +12,21 @@ NS_ASSUME_NONNULL_BEGIN
  
 @interface UITextField (DSBaseModule)
  
-/**
- 获取光标range
- 
- @return range
- */
+#pragma mark - 计算文本大小
+
+/// 计算宽
+-(CGFloat)calculateWidth;
+
+/// 计算高
+-(CGFloat)calculateHeight;
+
+#pragma mark - 光标
+
+/// 获取光标range
 -(NSRange)selectedRange;
  
-/**
- 根据range改变光标位置
- 备注：UITextField必须为第一响应者才有效
- 
- @param range range
- */
+/// 根据range改变光标位置 备注：UITextField必须为第一响应者才有效
+/// @param range 位置
 -(void)setSelectedRange:(NSRange)range;
  
 @end
+//
+//  UITextView+DSBaseModule.h
+//  DSBaseModule
+//
+//  Created by zhaolin on 2020/5/26.
+//
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface UITextView (DSBaseModule)
+
+#pragma mark - 计算文本大小
+
+/// 计算宽
+-(CGFloat)calculateWidth;
+
+/// 计算高
+-(CGFloat)calculateHeight;
+
+@end
+
+NS_ASSUME_NONNULL_END