pod JPCategory-OC

baiyidjp · Jan 19, 2021 · b4f2111 · b4f2111
1 parent 50e1152
commit b4f2111
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 405 deletions.
diff --git a/JPTagView.podspec b/JPTagView.podspec
@@ -3,7 +3,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "JPTagView"
-  s.version      = "1.5.1"
+  s.version      = "1.6.0"
   s.summary      = "Customized tag pages."
   s.homepage     = "https://github.com/baiyidjp/JPTagViewDemo"
   s.license      = "MIT"
@@ -13,6 +13,9 @@ Pod::Spec.new do |s|
   s.source_files  = "JPTagView/*.{h,m}"
   s.requires_arc = true
   s.dependency "SDWebImage"
+  # s.dependency 'JPCategory-OC/UIView', '1.2.3'
+  # s.dependency 'JPCategory-OC/UIImage', '1.2.3'
+  s.dependency 'JPCategory-OC/UIView', :git => "https://github.com/baiyidjp/JPCategory-OC.git", :tag => '1.2.3'
+  s.dependency 'JPCategory-OC/UIImage', :git => "https://github.com/baiyidjp/JPCategory-OC.git", :tag => '1.2.3'
 # pod trunk push --allow-warnings
-# 将修改文件copy到JPTagView
 end
diff --git a/JPTagView/JPTagCell.m b/JPTagView/JPTagCell.m
@@ -83,7 +83,7 @@ - (void)setTagModel:(JPTagModel *)tagModel {
 
         } else if (tagModel.tagBackSelectedColor) {
             //只有颜色
-            UIImage *selectedImage = [UIImage imageWithColor:tagModel.tagBackSelectedColor];
+            UIImage *selectedImage = [UIImage jp_imageWithColor:tagModel.tagBackSelectedColor];
             [self p_HandleTagBackImage:selectedImage tagModel:tagModel];
         }
 
@@ -108,7 +108,7 @@ - (void)setTagModel:(JPTagModel *)tagModel {
 
         } else if (tagModel.tagBackNormalColor) {
             //只有颜色
-            UIImage *normalImage = [UIImage imageWithColor:tagModel.tagBackNormalColor];
+            UIImage *normalImage = [UIImage jp_imageWithColor:tagModel.tagBackNormalColor];
             [self p_HandleTagBackImage:normalImage tagModel:tagModel];
         }
 
@@ -179,7 +179,7 @@ - (void)p_HandleTagBackImage:(UIImage *)tagBackImage tagModel:(JPTagModel *)tagM
     //存在图片 根据条件展示
     if (tagModel.isShowTagCornerRadius && tagModel.isShowTagBorder) {
         //圆角+边框
-        [tagBackImage jp_asynCornerBorderImageWithSize:self.tagBackImageButton.bounds.size cornerRadius:tagCornerRadius borderWidth:tagBorderWidth borderColor:tagBorderColor completion:^(UIImage * _Nonnull borderImage) {
+        [tagBackImage jp_asynRoundImageWithSize:self.tagBackImageButton.bounds.size cornerRadius:tagCornerRadius borderWidth:tagBorderWidth borderColor:tagBorderColor completion:^(UIImage * _Nonnull borderImage) {
             [self.tagBackImageButton setBackgroundImage:borderImage forState:UIControlStateNormal];
         }];
     } else if (tagModel.isShowTagCornerRadius) {
@@ -189,7 +189,7 @@ - (void)p_HandleTagBackImage:(UIImage *)tagBackImage tagModel:(JPTagModel *)tagM
         }];
     } else if (tagModel.isShowTagCornerRadius) {
         //边框
-        [tagBackImage jp_asynCornerBorderImageWithSize:self.tagBackImageButton.bounds.size cornerRadius:0 borderWidth:tagBorderWidth borderColor:tagBorderColor completion:^(UIImage * _Nonnull borderImage) {
+        [tagBackImage jp_asynRoundImageWithSize:self.tagBackImageButton.bounds.size cornerRadius:0 borderWidth:tagBorderWidth borderColor:tagBorderColor completion:^(UIImage * _Nonnull borderImage) {
             [self.tagBackImageButton setBackgroundImage:borderImage forState:UIControlStateNormal];
         }];
     } else {

diff --git a/JPTagView/UIImage+JPCategory.h b/JPTagView/UIImage+JPCategory.h
diff --git a/JPTagView/UIImage+JPCategory.m b/JPTagView/UIImage+JPCategory.m
diff --git a/JPTagView/UIView+JPCategory.h b/JPTagView/UIView+JPCategory.h